From c10edf3198cda970331bdf6b60166aa8fb611888 Mon Sep 17 00:00:00 2001 From: WuKong Date: Wed, 15 Jul 2015 18:40:14 +0200 Subject: review core.py Change-Id: Icbeed742bdaabefe443696003e74b1a6c4587ae3 Signed-off-by: WuKong --- .../examples/moon/policies/policy_admin/rule.json | 22 ++++++++++++ .../examples/moon/policies/policy_admin/rules.json | 22 ------------ .../examples/moon/policies/policy_admin/scope.json | 6 ++-- .../examples/moon/policies/policy_authz/rule.json | 41 ++++++++++++++++++++++ .../examples/moon/policies/policy_authz/rules.json | 41 ---------------------- .../examples/moon/policies/policy_authz/scope.json | 6 ++-- 6 files changed, 69 insertions(+), 69 deletions(-) create mode 100644 keystone-moon/examples/moon/policies/policy_admin/rule.json delete mode 100644 keystone-moon/examples/moon/policies/policy_admin/rules.json create mode 100644 keystone-moon/examples/moon/policies/policy_authz/rule.json delete mode 100644 keystone-moon/examples/moon/policies/policy_authz/rules.json (limited to 'keystone-moon/examples') diff --git a/keystone-moon/examples/moon/policies/policy_admin/rule.json b/keystone-moon/examples/moon/policies/policy_admin/rule.json new file mode 100644 index 00000000..650405a9 --- /dev/null +++ b/keystone-moon/examples/moon/policies/policy_admin/rule.json @@ -0,0 +1,22 @@ +{ + "rbac_rule":[ + + ["admin" , "ft", "admin", "subjects"], + ["admin" , "ft", "admin", "objects"], + ["admin" , "ft", "admin", "actions"], + ["admin" , "ft", "admin", "subject_categories"], + ["admin" , "ft", "admin", "object_categories"], + ["admin" , "ft", "admin", "action_categories"], + ["admin" , "ft", "admin", "subject_category_scope"], + ["admin" , "ft", "admin", "object_category_scope"], + ["admin" , "ft", "admin", "action_category_scope"], + ["admin" , "ft", "admin", "sub_rules"], + ["admin" , "ft", "admin", "sub_meta_rule"], + ["admin" , "ft", "admin", "subject_assignments"], + ["admin" , "ft", "admin", "object_assignments"], + ["admin" , "ft", "admin", "action_assignments"], + ["admin" , "ft", "admin", "sub_meta_rule_relations"], + ["admin" , "ft", "admin", "aggregation_algorithms"] + + ] +} diff --git a/keystone-moon/examples/moon/policies/policy_admin/rules.json b/keystone-moon/examples/moon/policies/policy_admin/rules.json deleted file mode 100644 index 650405a9..00000000 --- a/keystone-moon/examples/moon/policies/policy_admin/rules.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "rbac_rule":[ - - ["admin" , "ft", "admin", "subjects"], - ["admin" , "ft", "admin", "objects"], - ["admin" , "ft", "admin", "actions"], - ["admin" , "ft", "admin", "subject_categories"], - ["admin" , "ft", "admin", "object_categories"], - ["admin" , "ft", "admin", "action_categories"], - ["admin" , "ft", "admin", "subject_category_scope"], - ["admin" , "ft", "admin", "object_category_scope"], - ["admin" , "ft", "admin", "action_category_scope"], - ["admin" , "ft", "admin", "sub_rules"], - ["admin" , "ft", "admin", "sub_meta_rule"], - ["admin" , "ft", "admin", "subject_assignments"], - ["admin" , "ft", "admin", "object_assignments"], - ["admin" , "ft", "admin", "action_assignments"], - ["admin" , "ft", "admin", "sub_meta_rule_relations"], - ["admin" , "ft", "admin", "aggregation_algorithms"] - - ] -} diff --git a/keystone-moon/examples/moon/policies/policy_admin/scope.json b/keystone-moon/examples/moon/policies/policy_admin/scope.json index ee6f570e..3742a5e4 100644 --- a/keystone-moon/examples/moon/policies/policy_admin/scope.json +++ b/keystone-moon/examples/moon/policies/policy_admin/scope.json @@ -1,5 +1,5 @@ { - "subject_category_scope": { + "subject_scopes": { "role": [ "admin" ], @@ -9,14 +9,14 @@ ] }, - "action_category_scope": { + "action_scopes": { "access": [ "admin", "user" ] }, - "object_category_scope": { + "object_scopes": { "id": [ "subjects", "objects", diff --git a/keystone-moon/examples/moon/policies/policy_authz/rule.json b/keystone-moon/examples/moon/policies/policy_authz/rule.json new file mode 100644 index 00000000..73e791d7 --- /dev/null +++ b/keystone-moon/examples/moon/policies/policy_authz/rule.json @@ -0,0 +1,41 @@ +{ + "mls_rule":[ + ["high", "vm_admin", "medium"], + ["high", "vm_admin", "low"], + ["medium", "vm_admin", "low"], + ["high", "vm_access", "high"], + ["high", "vm_access", "medium"], + ["high", "vm_access", "low"], + ["medium", "vm_access", "medium"], + ["medium", "vm_access", "low"], + ["low", "vm_access", "low"] + ], + "dte_rule":[ + ["ft", "read", "computing"], + ["ft", "write", "computing"], + ["ft", "read", "storage"], + ["ft", "write", "storage"], + ["xx", "read", "storage"] + ], + "rbac_rule":[ + ["dev", "xx", "read", "servers"], + ["dev", "xx", "read", "vm1"], + ["dev", "xx", "read", "vm2"], + ["dev", "xx", "read", "file1"], + ["dev", "xx", "read", "file2"], + ["dev", "xx", "write", "vm1"], + ["dev", "xx", "write", "vm2"], + ["dev", "xx", "write", "file1"], + ["dev", "xx", "write", "file2"], + ["admin", "xx", "read", "servers"], + ["admin", "ft", "read", "servers"], + ["admin", "ft", "read", "vm1"], + ["admin", "ft", "read", "vm2"], + ["admin", "ft", "read", "file1"], + ["admin", "ft", "read", "file2"], + ["admin", "ft", "write", "vm1"], + ["admin", "ft", "write", "vm2"], + ["admin", "ft", "write", "file1"], + ["admin", "ft", "write", "file2"] + ] +} diff --git a/keystone-moon/examples/moon/policies/policy_authz/rules.json b/keystone-moon/examples/moon/policies/policy_authz/rules.json deleted file mode 100644 index 73e791d7..00000000 --- a/keystone-moon/examples/moon/policies/policy_authz/rules.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "mls_rule":[ - ["high", "vm_admin", "medium"], - ["high", "vm_admin", "low"], - ["medium", "vm_admin", "low"], - ["high", "vm_access", "high"], - ["high", "vm_access", "medium"], - ["high", "vm_access", "low"], - ["medium", "vm_access", "medium"], - ["medium", "vm_access", "low"], - ["low", "vm_access", "low"] - ], - "dte_rule":[ - ["ft", "read", "computing"], - ["ft", "write", "computing"], - ["ft", "read", "storage"], - ["ft", "write", "storage"], - ["xx", "read", "storage"] - ], - "rbac_rule":[ - ["dev", "xx", "read", "servers"], - ["dev", "xx", "read", "vm1"], - ["dev", "xx", "read", "vm2"], - ["dev", "xx", "read", "file1"], - ["dev", "xx", "read", "file2"], - ["dev", "xx", "write", "vm1"], - ["dev", "xx", "write", "vm2"], - ["dev", "xx", "write", "file1"], - ["dev", "xx", "write", "file2"], - ["admin", "xx", "read", "servers"], - ["admin", "ft", "read", "servers"], - ["admin", "ft", "read", "vm1"], - ["admin", "ft", "read", "vm2"], - ["admin", "ft", "read", "file1"], - ["admin", "ft", "read", "file2"], - ["admin", "ft", "write", "vm1"], - ["admin", "ft", "write", "vm2"], - ["admin", "ft", "write", "file1"], - ["admin", "ft", "write", "file2"] - ] -} diff --git a/keystone-moon/examples/moon/policies/policy_authz/scope.json b/keystone-moon/examples/moon/policies/policy_authz/scope.json index b22ad2aa..4b69e469 100644 --- a/keystone-moon/examples/moon/policies/policy_authz/scope.json +++ b/keystone-moon/examples/moon/policies/policy_authz/scope.json @@ -1,5 +1,5 @@ { - "subject_category_scope": { + "subject_scopes": { "role": [ "admin", "dev" @@ -15,7 +15,7 @@ ] }, - "action_category_scope": { + "action_scopes": { "resource_action": [ "vm_admin", "vm_access", @@ -28,7 +28,7 @@ ] }, - "object_category_scope": { + "object_scopes": { "object_security_level": [ "high", "medium", -- cgit 1.2.3-korg