diff options
author | Asteroide <thomas.duval@orange.com> | 2018-05-09 09:28:32 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2018-05-09 09:28:32 +0000 |
commit | d28f8e68ac176a15dbbd7873f757f5a9f221d118 (patch) | |
tree | fbb22197b5809c4748aece78c98132504e8f5b10 /moon_manager/moon_manager | |
parent | a89a8e0738ab597d80d29964a137d7f3eb9fb9a5 (diff) | |
parent | 5dffe7e0889dd76885d313c1d44a4b389f4b8667 (diff) |
Merge "continue integrating validation"
Diffstat (limited to 'moon_manager/moon_manager')
-rw-r--r-- | moon_manager/moon_manager/api/assignments.py | 10 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/data.py | 10 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/meta_data.py | 10 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/meta_rules.py | 5 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/models.py | 5 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/pdp.py | 5 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/perimeter.py | 14 | ||||
-rw-r--r-- | moon_manager/moon_manager/api/rules.py | 4 |
8 files changed, 63 insertions, 0 deletions
diff --git a/moon_manager/moon_manager/api/assignments.py b/moon_manager/moon_manager/api/assignments.py index a090aa63..a1d10ccb 100644 --- a/moon_manager/moon_manager/api/assignments.py +++ b/moon_manager/moon_manager/api/assignments.py @@ -12,6 +12,7 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import PolicyManager +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -31,6 +32,7 @@ class SubjectAssignments(Resource): "/policies/<string:uuid>/subject_assignments/<string:perimeter_id>/<string:category_id>/<string:data_id>", ) + @validate_input("get", kwargs_state=[True, False, False,False,False]) @check_auth def get(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -61,6 +63,7 @@ class SubjectAssignments(Resource): "error": str(e)}, 500 return {"subject_assignments": data} + @validate_input("post", kwargs_state=[True, False, False, False, False], body_state=[True, True, True]) @check_auth def post(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -100,6 +103,7 @@ class SubjectAssignments(Resource): "error": str(e)}, 500 return {"subject_assignments": data} + @validate_input("delete", kwargs_state=[True, True, True, True, False]) @check_auth def delete(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -141,6 +145,7 @@ class ObjectAssignments(Resource): "/policies/<string:uuid>/object_assignments/<string:perimeter_id>/<string:category_id>/<string:data_id>", ) + @validate_input("get", kwargs_state=[True, False, False,False,False]) @check_auth def get(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -171,6 +176,7 @@ class ObjectAssignments(Resource): "error": str(e)}, 500 return {"object_assignments": data} + @validate_input("post", kwargs_state=[True, False, False, False, False], body_state=[True, True, True]) @check_auth def post(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -210,6 +216,7 @@ class ObjectAssignments(Resource): "error": str(e)}, 500 return {"object_assignments": data} + @validate_input("delete", kwargs_state=[True, True, True, True, False]) @check_auth def delete(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -251,6 +258,7 @@ class ActionAssignments(Resource): "/policies/<string:uuid>/action_assignments/<string:perimeter_id>/<string:category_id>/<string:data_id>", ) + @validate_input("get", kwargs_state=[True, False, False,False,False]) @check_auth def get(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -281,6 +289,7 @@ class ActionAssignments(Resource): "error": str(e)}, 500 return {"action_assignments": data} + @validate_input("post", kwargs_state=[True, False, False, False, False], body_state=[True, True, True]) @check_auth def post(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): @@ -320,6 +329,7 @@ class ActionAssignments(Resource): "error": str(e)}, 500 return {"action_assignments": data} + @validate_input("delete", kwargs_state=[True, True, True, True, False]) @check_auth def delete(self, uuid, perimeter_id=None, category_id=None, data_id=None, user_id=None): diff --git a/moon_manager/moon_manager/api/data.py b/moon_manager/moon_manager/api/data.py index 05e30236..4b22f9dc 100644 --- a/moon_manager/moon_manager/api/data.py +++ b/moon_manager/moon_manager/api/data.py @@ -12,6 +12,7 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import PolicyManager +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -31,6 +32,7 @@ class SubjectData(Resource): "<string:data_id>", ) + @validate_input("get", kwargs_state=[True, False, False, False]) @check_auth def get(self, uuid, category_id=None, data_id=None, user_id=None): """Retrieve all subject categories or a specific one if data_id is given @@ -63,6 +65,7 @@ class SubjectData(Resource): "error": str(e)}, 500 return {"subject_data": data} + @validate_input("post", kwargs_state=[True, True, False, False], body_state=[True, False]) @check_auth def post(self, uuid, category_id=None, data_id=None, user_id=None): """Create or update a subject. @@ -98,6 +101,7 @@ class SubjectData(Resource): "error": str(e)}, 500 return {"subject_data": data} + @validate_input("delete", kwargs_state=[True, False, False, False]) @check_auth def delete(self, uuid, category_id=None, data_id=None, user_id=None): """Delete a subject for a given policy @@ -136,6 +140,7 @@ class ObjectData(Resource): "<string:data_id>", ) + @validate_input("get", kwargs_state=[True, False, False, False]) @check_auth def get(self, uuid, category_id=None, data_id=None, user_id=None): """Retrieve all object categories or a specific one if sid is given @@ -168,6 +173,7 @@ class ObjectData(Resource): "error": str(e)}, 500 return {"object_data": data} + @validate_input("post", kwargs_state=[True, True, False, False], body_state=[True, False]) @check_auth def post(self, uuid, category_id=None, data_id=None, user_id=None): """Create or update a object. @@ -203,6 +209,7 @@ class ObjectData(Resource): "error": str(e)}, 500 return {"object_data": data} + @validate_input("delete", kwargs_state=[True, False, False, False]) @check_auth def delete(self, uuid, category_id=None, data_id=None, user_id=None): """Delete a object for a given policy @@ -241,6 +248,7 @@ class ActionData(Resource): "<string:data_id>", ) + @validate_input("get", kwargs_state=[True, False, False, False]) @check_auth def get(self, uuid, category_id=None, data_id=None, user_id=None): """Retrieve all action categories or a specific one if sid is given @@ -273,6 +281,7 @@ class ActionData(Resource): "error": str(e)}, 500 return {"action_data": data} + @validate_input("post", kwargs_state=[True, True, False, False], body_state=[True, False]) @check_auth def post(self, uuid, category_id=None, data_id=None, user_id=None): """Create or update a action. @@ -308,6 +317,7 @@ class ActionData(Resource): "error": str(e)}, 500 return {"action_data": data} + @validate_input("delete", kwargs_state=[True, False, False, False]) @check_auth def delete(self, uuid, category_id=None, data_id=None, user_id=None): """Delete a action for a given policy diff --git a/moon_manager/moon_manager/api/meta_data.py b/moon_manager/moon_manager/api/meta_data.py index 3fc18ee3..f3b22d29 100644 --- a/moon_manager/moon_manager/api/meta_data.py +++ b/moon_manager/moon_manager/api/meta_data.py @@ -12,6 +12,7 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import ModelManager +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -29,6 +30,7 @@ class SubjectCategories(Resource): "/subject_categories/<string:category_id>", ) + @validate_input("get",kwargs_state=[False,False]) @check_auth def get(self, category_id=None, user_id=None): """Retrieve all subject categories or a specific one @@ -52,6 +54,7 @@ class SubjectCategories(Resource): "error": str(e)}, 500 return {"subject_categories": data} + @validate_input("post",body_state=[True,False]) @check_auth def post(self, category_id=None, user_id=None): """Create or update a subject category. @@ -79,6 +82,7 @@ class SubjectCategories(Resource): "error": str(e)}, 500 return {"subject_categories": data} + @validate_input("delete",kwargs_state=[True,False]) @check_auth def delete(self, category_id=None, user_id=None): """Delete a subject category @@ -112,6 +116,7 @@ class ObjectCategories(Resource): "/object_categories/<string:category_id>", ) + @validate_input("get",kwargs_state=[False,False]) @check_auth def get(self, category_id=None, user_id=None): """Retrieve all object categories or a specific one @@ -135,6 +140,7 @@ class ObjectCategories(Resource): "error": str(e)}, 500 return {"object_categories": data} + @validate_input("post", body_state=[True, False]) @check_auth def post(self, category_id=None, user_id=None): """Create or update a object category. @@ -162,6 +168,7 @@ class ObjectCategories(Resource): "error": str(e)}, 500 return {"object_categories": data} + @validate_input("delete", kwargs_state=[True, False]) @check_auth def delete(self, category_id=None, user_id=None): """Delete an object category @@ -195,6 +202,7 @@ class ActionCategories(Resource): "/action_categories/<string:category_id>", ) + @validate_input("get", kwargs_state=[False, False]) @check_auth def get(self, category_id=None, user_id=None): """Retrieve all action categories or a specific one @@ -218,6 +226,7 @@ class ActionCategories(Resource): "error": str(e)}, 500 return {"action_categories": data} + @validate_input("post", body_state=[True, False]) @check_auth def post(self, category_id=None, user_id=None): """Create or update an action category. @@ -245,6 +254,7 @@ class ActionCategories(Resource): "error": str(e)}, 500 return {"action_categories": data} + @validate_input("delete", kwargs_state=[True, False]) @check_auth def delete(self, category_id=None, user_id=None): """Delete an action diff --git a/moon_manager/moon_manager/api/meta_rules.py b/moon_manager/moon_manager/api/meta_rules.py index 0728a447..afc11eba 100644 --- a/moon_manager/moon_manager/api/meta_rules.py +++ b/moon_manager/moon_manager/api/meta_rules.py @@ -12,6 +12,7 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import ModelManager +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -30,6 +31,7 @@ class MetaRules(Resource): "/meta_rules/<string:meta_rule_id>/" ) + @validate_input("get", kwargs_state=[False, False]) @check_auth def get(self, meta_rule_id=None, user_id=None): """Retrieve all sub meta rules @@ -58,6 +60,7 @@ class MetaRules(Resource): "error": str(e)}, 500 return {"meta_rules": data} + @validate_input("post", body_state=[True, True, True, True]) @check_auth def post(self, meta_rule_id=None, user_id=None): """Add a meta rule @@ -93,6 +96,7 @@ class MetaRules(Resource): "error": str(e)}, 500 return {"meta_rules": data} + @validate_input("patch", kwargs_state=[True, False], body_state=[True, True, True, True]) @check_auth def patch(self, meta_rule_id, user_id=None): """Update a meta rule @@ -128,6 +132,7 @@ class MetaRules(Resource): "error": str(e)}, 500 return {"meta_rules": data} + @validate_input("delete", kwargs_state=[True, False]) @check_auth def delete(self, meta_rule_id, user_id=None): """Delete a meta rule diff --git a/moon_manager/moon_manager/api/models.py b/moon_manager/moon_manager/api/models.py index 2dec13dc..440a4d2b 100644 --- a/moon_manager/moon_manager/api/models.py +++ b/moon_manager/moon_manager/api/models.py @@ -11,6 +11,7 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import ModelManager +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -29,6 +30,7 @@ class Models(Resource): "/models/<string:uuid>/", ) + @validate_input("get", kwargs_state=[False, False]) @check_auth def get(self, uuid=None, user_id=None): """Retrieve all models @@ -52,6 +54,7 @@ class Models(Resource): "error": str(e)}, 500 return {"models": data} + @validate_input("post", body_state=[True, False, True]) @check_auth def post(self, uuid=None, user_id=None): """Create model. @@ -81,6 +84,7 @@ class Models(Resource): "error": str(e)}, 500 return {"models": data} + @validate_input("delete", kwargs_state=[True, False]) @check_auth def delete(self, uuid, user_id=None): """Delete a model @@ -101,6 +105,7 @@ class Models(Resource): "error": str(e)}, 500 return {"result": True} + @validate_input("patch", kwargs_state=[True, False], body_state=[True, False, True]) @check_auth def patch(self, uuid, user_id=None): """Update a model diff --git a/moon_manager/moon_manager/api/pdp.py b/moon_manager/moon_manager/api/pdp.py index fba5c8ac..fd20c85f 100644 --- a/moon_manager/moon_manager/api/pdp.py +++ b/moon_manager/moon_manager/api/pdp.py @@ -17,6 +17,7 @@ from python_moondb.core import PDPManager from python_moondb.core import PolicyManager from python_moondb.core import ModelManager from python_moonutilities import configuration, exceptions +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -96,6 +97,7 @@ class PDP(Resource): "/pdp/<string:uuid>/", ) + @validate_input("get", kwargs_state=[False, False]) @check_auth def get(self, uuid=None, user_id=None): """Retrieve all pdp @@ -120,6 +122,7 @@ class PDP(Resource): "error": str(e)}, 500 return {"pdps": data} + @validate_input("post", body_state=[True, True, True, False]) @check_auth def post(self, uuid=None, user_id=None): """Create pdp. @@ -161,6 +164,7 @@ class PDP(Resource): "error": str(e)}, 500 return {"pdps": data} + @validate_input("delete", kwargs_state=[True, False]) @check_auth def delete(self, uuid, user_id=None): """Delete a pdp @@ -182,6 +186,7 @@ class PDP(Resource): "error": str(e)}, 500 return {"result": True} + @validate_input("patch", kwargs_state=[True, False], body_state=[True, True, True, False]) @check_auth def patch(self, uuid, user_id=None): """Update a pdp diff --git a/moon_manager/moon_manager/api/perimeter.py b/moon_manager/moon_manager/api/perimeter.py index c69d623c..014aa4b9 100644 --- a/moon_manager/moon_manager/api/perimeter.py +++ b/moon_manager/moon_manager/api/perimeter.py @@ -15,6 +15,8 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import PolicyManager +from python_moonutilities.security_functions import validate_input + __version__ = "4.3.2" @@ -35,6 +37,7 @@ class Subjects(Resource): "/policies/<string:uuid>/subjects/<string:perimeter_id>", ) + @validate_input("get", kwargs_state=[False, False, False]) @check_auth def get(self, uuid=None, perimeter_id=None, user_id=None): """Retrieve all subjects or a specific one if perimeter_id is @@ -64,6 +67,7 @@ class Subjects(Resource): "error": str(e)}, 500 return {"subjects": data} + @validate_input("post", body_state=[True, False, False, False]) @check_auth def post(self, uuid=None, perimeter_id=None, user_id=None): """Create or update a subject. @@ -106,6 +110,7 @@ class Subjects(Resource): "error": str(e)}, 500 return {"subjects": data} + @validate_input("patch", kwargs_state=[False, True, False], body_state=[True, False, False, False]) @check_auth def patch(self, uuid, perimeter_id=None, user_id=None): """Create or update a subject. @@ -148,6 +153,7 @@ class Subjects(Resource): "error": str(e)}, 500 return {"subjects": data} + @validate_input("delete", kwargs_state=[False, True, False]) @check_auth def delete(self, uuid=None, perimeter_id=None, user_id=None): """Delete a subject for a given policy @@ -190,6 +196,7 @@ class Objects(Resource): "/policies/<string:uuid>/objects/<string:perimeter_id>", ) + @validate_input("get", kwargs_state=[False, False, False]) @check_auth def get(self, uuid=None, perimeter_id=None, user_id=None): """Retrieve all objects or a specific one if perimeter_id is @@ -218,6 +225,7 @@ class Objects(Resource): "error": str(e)}, 500 return {"objects": data} + @validate_input("post", body_state=[True, False, False, False]) @check_auth def post(self, uuid=None, perimeter_id=None, user_id=None): """Create or update a object. @@ -253,6 +261,7 @@ class Objects(Resource): "error": str(e)}, 500 return {"objects": data} + @validate_input("patch", kwargs_state=[False, True, False], body_state=[True, False, False, False]) @check_auth def patch(self, uuid, perimeter_id=None, user_id=None): """Create or update a object. @@ -288,6 +297,7 @@ class Objects(Resource): "error": str(e)}, 500 return {"objects": data} + @validate_input("delete", kwargs_state=[False, True, False]) @check_auth def delete(self, uuid=None, perimeter_id=None, user_id=None): """Delete a object for a given policy @@ -327,6 +337,7 @@ class Actions(Resource): "/policies/<string:uuid>/actions/<string:perimeter_id>", ) + @validate_input("get", kwargs_state=[False, False, False]) @check_auth def get(self, uuid=None, perimeter_id=None, user_id=None): """Retrieve all actions or a specific one if perimeter_id @@ -352,6 +363,7 @@ class Actions(Resource): "error": str(e)}, 500 return {"actions": data} + @validate_input("post", body_state=[True, False, False, False]) @check_auth def post(self, uuid=None, perimeter_id=None, user_id=None): """Create or update a action. @@ -387,6 +399,7 @@ class Actions(Resource): "error": str(e)}, 500 return {"actions": data} + @validate_input("patch", kwargs_state=[False, True, False], body_state=[True, False, False, False]) @check_auth def patch(self, uuid, perimeter_id=None, user_id=None): """Create or update a action. @@ -422,6 +435,7 @@ class Actions(Resource): "error": str(e)}, 500 return {"actions": data} + @validate_input("delete", kwargs_state=[False, True, False]) @check_auth def delete(self, uuid=None, perimeter_id=None, user_id=None): """Delete a action for a given policy diff --git a/moon_manager/moon_manager/api/rules.py b/moon_manager/moon_manager/api/rules.py index 507516ed..ecb066d9 100644 --- a/moon_manager/moon_manager/api/rules.py +++ b/moon_manager/moon_manager/api/rules.py @@ -11,6 +11,7 @@ from flask_restful import Resource import logging from python_moonutilities.security_functions import check_auth from python_moondb.core import PolicyManager +from python_moonutilities.security_functions import validate_input __version__ = "4.3.2" @@ -28,6 +29,7 @@ class Rules(Resource): "/policies/<string:uuid>/rules/<string:rule_id>/", ) + @validate_input("get", kwargs_state=[False, False, False]) @check_auth def get(self, uuid=None, rule_id=None, user_id=None): """Retrieve all rules or a specific one @@ -57,6 +59,7 @@ class Rules(Resource): "error": str(e)}, 500 return {"rules": data} + @validate_input("post", kwargs_state=[True, False, False], body_state=[True, False, False, False]) @check_auth def post(self, uuid=None, rule_id=None, user_id=None): """Add a rule to a meta rule @@ -119,6 +122,7 @@ class Rules(Resource): "error": str(e)}, 500 return {"rules": data} + @validate_input("delete", kwargs_state=[True, True, False]) @check_auth def delete(self, uuid=None, rule_id=None, user_id=None): """Delete one rule linked to a specific sub meta rule |