@@ -139,9 +139,7 @@ class SystemWideRoleTests(CasbinEnforcementTestCase):
139139 {
140140 "subject" : make_user_key ("user-1" ),
141141 "action" : make_action_key ("manage" ),
142- "scope" : make_scope_key (
143- "course" , "course-v1:any-org+any-course+any-course-run"
144- ),
142+ "scope" : make_scope_key ("course" , "course-v1:any-org+any-course+any-course-run" ),
145143 "expected_result" : True ,
146144 },
147145 {
@@ -169,19 +167,8 @@ class ActionGroupingTests(CasbinEnforcementTestCase):
169167 """
170168
171169 POLICY = [
172- [
173- "p" ,
174- make_role_key ("role-1" ),
175- make_action_key ("manage" ),
176- make_scope_key ("org" , "*" ),
177- "allow" ,
178- ],
179- [
180- "g" ,
181- make_user_key ("user-1" ),
182- make_role_key ("role-1" ),
183- make_scope_key ("org" , "any-org" ),
184- ],
170+ ["p" , make_role_key ("role-1" ), make_action_key ("manage" ), make_scope_key ("org" , "*" ), "allow" ],
171+ ["g" , make_user_key ("user-1" ), make_role_key ("role-1" ), make_scope_key ("org" , "any-org" )],
185172 ] + COMMON_ACTION_GROUPING
186173
187174 CASES = [
@@ -229,112 +216,29 @@ class RoleAssignmentTests(CasbinEnforcementTestCase):
229216 POLICY = [
230217 # Policies
231218 ["p" , make_role_key ("platform_admin" ), make_action_key ("manage" ), "*" , "allow" ],
232- [
233- "p" ,
234- make_role_key ("org_admin" ),
235- make_action_key ("manage" ),
236- make_scope_key ("org" , "*" ),
237- "allow" ,
238- ],
239- [
240- "p" ,
241- make_role_key ("org_editor" ),
242- make_action_key ("edit" ),
243- make_scope_key ("org" , "*" ),
244- "allow" ,
245- ],
246- [
247- "p" ,
248- make_role_key ("org_author" ),
249- make_action_key ("write" ),
250- make_scope_key ("org" , "*" ),
251- "allow" ,
252- ],
253- [
254- "p" ,
255- make_role_key ("course_admin" ),
256- make_action_key ("manage" ),
257- make_scope_key ("course" , "*" ),
258- "allow" ,
259- ],
260- [
261- "p" ,
262- make_role_key ("library_admin" ),
263- make_action_key ("manage" ),
264- make_scope_key ("lib" , "*" ),
265- "allow" ,
266- ],
267- [
268- "p" ,
269- make_role_key ("library_editor" ),
270- make_action_key ("edit" ),
271- make_scope_key ("lib" , "*" ),
272- "allow" ,
273- ],
274- [
275- "p" ,
276- make_role_key ("library_reviewer" ),
277- make_action_key ("read" ),
278- make_scope_key ("lib" , "*" ),
279- "allow" ,
280- ],
281- [
282- "p" ,
283- make_role_key ("library_author" ),
284- make_action_key ("write" ),
285- make_scope_key ("lib" , "*" ),
286- "allow" ,
287- ],
219+ ["p" , make_role_key ("org_admin" ), make_action_key ("manage" ), make_scope_key ("org" , "*" ), "allow" ],
220+ ["p" , make_role_key ("org_editor" ), make_action_key ("edit" ), make_scope_key ("org" , "*" ), "allow" ],
221+ ["p" , make_role_key ("org_author" ), make_action_key ("write" ), make_scope_key ("org" , "*" ), "allow" ],
222+ ["p" , make_role_key ("course_admin" ), make_action_key ("manage" ), make_scope_key ("course" , "*" ), "allow" ],
223+ ["p" , make_role_key ("library_admin" ), make_action_key ("manage" ), make_scope_key ("lib" , "*" ), "allow" ],
224+ ["p" , make_role_key ("library_editor" ), make_action_key ("edit" ), make_scope_key ("lib" , "*" ), "allow" ],
225+ ["p" , make_role_key ("library_reviewer" ), make_action_key ("read" ), make_scope_key ("lib" , "*" ), "allow" ],
226+ ["p" , make_role_key ("library_author" ), make_action_key ("write" ), make_scope_key ("lib" , "*" ), "allow" ],
288227 # Role assignments
289228 ["g" , make_user_key ("user-1" ), make_role_key ("platform_admin" ), "*" ],
290- [
291- "g" ,
292- make_user_key ("user-2" ),
293- make_role_key ("org_admin" ),
294- make_scope_key ("org" , "any-org" ),
295- ],
296- [
297- "g" ,
298- make_user_key ("user-3" ),
299- make_role_key ("org_editor" ),
300- make_scope_key ("org" , "any-org" ),
301- ],
302- [
303- "g" ,
304- make_user_key ("user-4" ),
305- make_role_key ("org_author" ),
306- make_scope_key ("org" , "any-org" ),
307- ],
229+ ["g" , make_user_key ("user-2" ), make_role_key ("org_admin" ), make_scope_key ("org" , "any-org" )],
230+ ["g" , make_user_key ("user-3" ), make_role_key ("org_editor" ), make_scope_key ("org" , "any-org" )],
231+ ["g" , make_user_key ("user-4" ), make_role_key ("org_author" ), make_scope_key ("org" , "any-org" )],
308232 [
309233 "g" ,
310234 make_user_key ("user-5" ),
311235 make_role_key ("course_admin" ),
312236 make_scope_key ("course" , "course-v1:any-org+any-course+any-course-run" ),
313237 ],
314- [
315- "g" ,
316- make_user_key ("user-6" ),
317- make_role_key ("library_admin" ),
318- make_library_key ("lib@any-org@any-library" ),
319- ],
320- [
321- "g" ,
322- make_user_key ("user-7" ),
323- make_role_key ("library_editor" ),
324- make_library_key ("lib@any-org@any-library" ),
325- ],
326- [
327- "g" ,
328- make_user_key ("user-8" ),
329- make_role_key ("library_reviewer" ),
330- make_library_key ("lib@any-org@any-library" ),
331- ],
332- [
333- "g" ,
334- make_user_key ("user-9" ),
335- make_role_key ("library_author" ),
336- make_library_key ("lib@any-org@any-library" ),
337- ],
238+ ["g" , make_user_key ("user-6" ), make_role_key ("library_admin" ), make_library_key ("lib@any-org@any-library" )],
239+ ["g" , make_user_key ("user-7" ), make_role_key ("library_editor" ), make_library_key ("lib@any-org@any-library" )],
240+ ["g" , make_user_key ("user-8" ), make_role_key ("library_reviewer" ), make_library_key ("lib@any-org@any-library" )],
241+ ["g" , make_user_key ("user-9" ), make_role_key ("library_author" ), make_library_key ("lib@any-org@any-library" )],
338242 ] + COMMON_ACTION_GROUPING
339243
340244 CASES = [
@@ -365,9 +269,7 @@ class RoleAssignmentTests(CasbinEnforcementTestCase):
365269 {
366270 "subject" : make_user_key ("user-5" ),
367271 "action" : make_action_key ("manage" ),
368- "scope" : make_scope_key (
369- "course" , "course-v1:any-org+any-course+any-course-run"
370- ),
272+ "scope" : make_scope_key ("course" , "course-v1:any-org+any-course+any-course-run" ),
371273 "expected_result" : True ,
372274 },
373275 {
@@ -412,13 +314,7 @@ class DeniedAccessTests(CasbinEnforcementTestCase):
412314
413315 POLICY = [
414316 ["p" , make_role_key ("platform_admin" ), make_action_key ("manage" ), "*" , "allow" ],
415- [
416- "p" ,
417- make_role_key ("platform_admin" ),
418- make_action_key ("manage" ),
419- make_scope_key ("org" , "restricted-org" ),
420- "deny" ,
421- ],
317+ ["p" , make_role_key ("platform_admin" ), make_action_key ("manage" ), make_scope_key ("org" , "restricted-org" ), "deny" ],
422318 ["g" , make_user_key ("user-1" ), make_role_key ("platform_admin" ), "*" ],
423319 ] + COMMON_ACTION_GROUPING
424320
@@ -479,27 +375,9 @@ class WildcardScopeTests(CasbinEnforcementTestCase):
479375 POLICY = [
480376 # Policies
481377 ["p" , make_role_key ("platform_admin" ), make_action_key ("manage" ), "*" , "allow" ],
482- [
483- "p" ,
484- make_role_key ("org_admin" ),
485- make_action_key ("manage" ),
486- make_scope_key ("org" , "*" ),
487- "allow" ,
488- ],
489- [
490- "p" ,
491- make_role_key ("course_admin" ),
492- make_action_key ("manage" ),
493- make_scope_key ("course" , "*" ),
494- "allow" ,
495- ],
496- [
497- "p" ,
498- make_role_key ("library_admin" ),
499- make_action_key ("manage" ),
500- make_scope_key ("lib" , "*" ),
501- "allow" ,
502- ],
378+ ["p" , make_role_key ("org_admin" ), make_action_key ("manage" ), make_scope_key ("org" , "*" ), "allow" ],
379+ ["p" , make_role_key ("course_admin" ), make_action_key ("manage" ), make_scope_key ("course" , "*" ), "allow" ],
380+ ["p" , make_role_key ("library_admin" ), make_action_key ("manage" ), make_scope_key ("lib" , "*" ), "allow" ],
503381 # Role assignments
504382 ["g" , make_user_key ("user-1" ), make_role_key ("platform_admin" ), "*" ],
505383 ["g" , make_user_key ("user-2" ), make_role_key ("org_admin" ), "*" ],
0 commit comments