Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions casbin_redis_adapter/adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,9 @@ def load_policy(self, model):
model (CasbinRule): CasbinRule object
"""

length = self.client.llen(self.key)
for i in range(length):
line = self.client.lindex(self.key, i)
# Fetch the whole list with a single LRANGE: one round trip instead of
# one LINDEX per rule, and an atomic snapshot of the list.
for line in self.client.lrange(self.key, 0, -1):
line = json.loads(line)
rule = CasbinRule(**line)
persist.load_policy_line(str(rule), model)
Expand Down
19 changes: 19 additions & 0 deletions tests/test_adapter.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from casbin_redis_adapter.adapter import CasbinRule

from unittest import TestCase
from unittest import mock
import redis
import casbin
import os
Expand Down Expand Up @@ -71,6 +72,24 @@ def test_enforcer_basic(self):
self.assertTrue(e.enforce("alice", "data2", "read"))
self.assertTrue(e.enforce("alice", "data2", "write"))

def test_load_policy_single_round_trip(self):
"""
test load_policy reads all rules with one LRANGE, not one LINDEX per rule
"""
e = get_enforcer()
adapter = e.get_adapter()
with mock.patch.object(
adapter.client, "lrange", wraps=adapter.client.lrange
) as lrange, mock.patch.object(
adapter.client, "lindex", side_effect=AssertionError("LINDEX used")
):
e.load_policy()
lrange.assert_called_once_with("casbin_rules", 0, -1)
self.assertEqual(len(e.get_policy()), 4)
self.assertEqual(len(e.get_grouping_policy()), 1)
self.assertTrue(e.enforce("alice", "data1", "read"))
self.assertTrue(e.enforce("alice", "data2", "write"))

def test_add_policy(self):
"""
test add_policy
Expand Down
Loading