Merge pull request #3 from Xhy-5000/master

Finish the Pymongo adapter for Pycasbin

Author: leeqvip

casbin_pymongo_adapter/adapter.py

@@ -6,16 +6,15 @@ class CasbinRule:
     '''
     CasbinRule model
     '''
-    ptype = None
-    v0 = None
-    v1 = None
-    v2 = None
-    v3 = None
-    v4 = None
-    v5 = None
-
-    def __init__(self, ptype):
+
+    def __init__(self, ptype = None, v0 = None, v1 = None, v2 = None, v3 = None, v4 = None, v5 = None):
         self.ptype = ptype
+        self.v0 = v0
+        self.v1 = v1
+        self.v2 = v2
+        self.v3 = v3
+        self.v4 = v4
+        self.v5 = v5
 
     def dict(self):
         d = {'ptype': self.ptype}
@@ -81,40 +80,24 @@ def _save_policy_line(self, ptype, rule):
             line.v4 = rule[4]
         if len(rule) > 5:
             line.v5 = rule[5]
-        self._collection.insert_one(line.dict)
+        self._collection.insert_one(line.dict())
 
     def save_policy(self, model):
         '''
         implementing add Interface for casbin \n
         save the policy in mongodb \n
         '''
-        # for sec in ["p", "g"]:
-        #     if sec not in model.model.keys():
-        #         continue
-        #     for ptype, ast in model.model[sec].items():
-        #         for rule in ast.policy:
-        #             self._save_policy_line(ptype, rule)
-        # return True
-        self._collection.insert_one(model.dict)
+        for sec in ["p", "g"]:
+            if sec not in model.model.keys():
+                continue
+            for ptype, ast in model.model[sec].items():
+                for rule in ast.policy:
+                    self._save_policy_line(ptype, rule)
+        return True
 
     def add_policy(self, sec, ptype, rule):
         """add policy rules to mongodb"""
-        # self._save_policy_line(ptype, rule)
-        line = CasbinRule(ptype = ptype)
-        if len(rule) > 0:
-            line.v0 = rule[0]
-        if len(rule) > 1:
-            line.v1 = rule[1]
-        if len(rule) > 2:
-            line.v2 = rule[2]
-        if len(rule) > 3:
-            line.v3 = rule[3]
-        if len(rule) > 4:
-            line.v4 = rule[4]
-        if len(rule) > 5:
-            line.v5 = rule[5]
-        self.save_policy(line)
-
+        self._save_policy_line(ptype, rule)
 
     def remove_policy(self, sec, ptype, rule):
         """delete policy rules from mongodb"""

tests/test_adapter.py

@@ -3,7 +3,7 @@
 from unittest import TestCase
 import casbin
 import os
-import simpleeval
+
 
 def get_fixture(path):
     '''
@@ -15,16 +15,28 @@ def get_fixture(path):
 
 def get_enforcer():
     adapter = Adapter('mongodb://localhost:27017', 'casbin_test')
-    c1 = CasbinRule(ptype='p', v0='alice', v1='data1', v2='read')
-    adapter.save_policy(c1)
-    c2 = CasbinRule(ptype='p', v0='bob', v1='data2', v2='write')
-    adapter.save_policy(c2)
-    c3 = CasbinRule(ptype='p', v0='data2_admin', v1='data2', v2='read')
-    adapter.save_policy(c3)
-    c4 = CasbinRule(ptype='p', v0='data2_admin', v1='data2', v2='write')
-    adapter.save_policy(c4)
-    c5 = CasbinRule(ptype='g', v0='alice', v1='data2_admin')
-    adapter.save_policy(c5)
+
+    e = casbin.Enforcer(get_fixture('rbac_model.conf'), adapter, True)
+    model = e.get_model()
+    model.clear_policy()
+    model.add_policy('p', 'p', ['alice', 'data1', 'read'])
+    adapter.save_policy(model)
+
+    model.clear_policy()
+    model.add_policy('p', 'p', ['bob', 'data2', 'write'])
+    adapter.save_policy(model)
+
+    model.clear_policy()
+    model.add_policy('p', 'p', ['data2_admin', 'data2', 'read'])
+    adapter.save_policy(model)
+
+    model.clear_policy()
+    model.add_policy('p', 'p', ['data2_admin', 'data2', 'write'])
+    adapter.save_policy(model)
+
+    model.clear_policy()
+    model.add_policy('g', 'g', ['alice', 'data2_admin'])
+    adapter.save_policy(model)
 
     return casbin.Enforcer(get_fixture('rbac_model.conf'), adapter, True)
 
@@ -39,8 +51,8 @@ def test_enforcer_basic(self):
         test policy
         '''
         e = get_enforcer()
-        self.assertFalse(e.enforce('alice', 'data1', 'write'))
-        self.assertFalse(e.enforce('bob', 'data1', 'read'))
+        self.assertTrue(e.enforce('alice', 'data1', 'read'))
+        self.assertTrue(e.enforce('bob', 'data2', 'write'))
         self.assertTrue(e.enforce('bob', 'data2', 'write'))
         self.assertTrue(e.enforce('alice', 'data2', 'read'))
         self.assertTrue(e.enforce('alice', 'data2', 'write'))
@@ -49,20 +61,9 @@ def test_add_policy(self):
         '''
         test add_policy
         '''
-        adapter = Adapter('mongodb://localhost:27017', 'casbin_test')
+        adapter = Adapter('mongodb://localhost:27017', 'casbin_rule')
         e = casbin.Enforcer(get_fixture('rbac_model.conf'), adapter, True)
 
-        try:
-            self.assertFalse(e.enforce('alice', 'data1', 'write'))
-            self.assertFalse(e.enforce('bob', 'data1', 'read'))
-            self.assertFalse(e.enforce('bob', 'data2', 'write'))
-            self.assertFalse(e.enforce('alice', 'data2', 'read'))
-            self.assertFalse(e.enforce('alice', 'data2', 'write'))
-        except simpleeval.NameNotDefined:
-            # This is caused by an upstream bug when there is no policy loaded
-            # Should be resolved in pycasbin >= 0.3
-            pass
-
         adapter.add_policy(sec=None, ptype='p', rule=['alice', 'data1', 'read'])
         adapter.add_policy(sec=None, ptype='p', rule=['bob', 'data2', 'write'])
         adapter.add_policy(sec=None, ptype='p', rule=['data2_admin', 'data2', 'read'])
@@ -82,23 +83,33 @@ def test_save_policy(self):
         '''
         test save_policy
         '''
-        model = casbin.Enforcer(get_fixture('rbac_model.conf'), get_fixture('rbac_policy.csv')).model
-        adapter = Adapter('mongodb://localhost:27017', 'casbin_test')
+
+        e = get_enforcer()
+        self.assertFalse(e.enforce('alice', 'data4', 'read'))
+
+        model = e.get_model()
+        model.clear_policy()
+
+        model.add_policy('p', 'p', ['alice', 'data4', 'read'])
+
+        adapter = e.get_adapter()
         adapter.save_policy(model)
-        e = casbin.Enforcer(get_fixture('rbac_model.conf'), adapter)
 
-        self.assertFalse(e.enforce('alice', 'data1', 'read'))
-        self.assertFalse(e.enforce('bob', 'data1', 'read'))
-        self.assertTrue(e.enforce('bob', 'data2', 'write'))
-        self.assertTrue(e.enforce('alice', 'data2', 'read'))
-        self.assertTrue(e.enforce('alice', 'data2', 'write'))
+        self.assertTrue(e.enforce('alice', 'data4', 'read'))
 
     def test_str(self):
         '''
         test __str__ function
         '''
         rule = CasbinRule(ptype='p', v0='alice', v1='data1', v2='read')
-        self.assertEqual(str(rule), 'p, alice, data1, read')
+        self.assertEqual(rule.__str__(), 'p, alice, data1, read')
+
+    def test_dict(self):
+        '''
+        test __str__ function
+        '''
+        rule = CasbinRule(ptype='p', v0='alice', v1='data1', v2='read')
+        self.assertEqual(rule.dict(), {"ptype": 'p', "v0": 'alice', "v1": 'data1', "v2": 'read'})
 
     def test_repr(self):
         '''
@@ -107,5 +118,5 @@ def test_repr(self):
         adapter = Adapter('mongodb://localhost:27017', 'casbin_test')
         rule = CasbinRule(ptype='p', v0='alice', v1='data1', v2='read')
         self.assertEqual(repr(rule), '<CasbinRule :"p, alice, data1, read">')
-        adapter.save_policy(rule)
-        self.assertRegex(repr(rule), r'<CasbinRule :"p, alice, data1, read">')
+        # adapter.save_policy(rule)
+        # self.assertRegex(repr(rule), r'<CasbinRule :"p, alice, data1, read">')