前后端全面升级

cmdb-api/api/lib/decorator.py

@@ -6,6 +6,8 @@ from functools import wraps
 from flask import abort
 from flask import request
 
+from api.lib.resp_format import CommonErrFormat
+
 
 def kwargs_required(*required_args):
     def decorate(func):
@@ -13,7 +15,8 @@ def kwargs_required(*required_args):
         def wrapper(*args, **kwargs):
             for arg in required_args:
                 if arg not in kwargs:
-                    return abort(400, "Argument <{0}> is required".format(arg))
+                    return abort(400, CommonErrFormat.argument_required.format(arg))
+
             return func(*args, **kwargs)
 
         return wrapper
@@ -21,13 +24,47 @@ def kwargs_required(*required_args):
     return decorate
 
 
-def args_required(*required_args):
+def args_required(*required_args, **value_required):
     def decorate(func):
         @wraps(func)
         def wrapper(*args, **kwargs):
             for arg in required_args:
                 if arg not in request.values:
-                    return abort(400, "Argument <{0}> is required".format(arg))
+                    return abort(400, CommonErrFormat.argument_required.format(arg))
+
+                if value_required.get('value_required', True) and not request.values.get(arg):
+                    return abort(400, CommonErrFormat.argument_value_required.format(arg))
+
+            return func(*args, **kwargs)
+
+        return wrapper
+
+    return decorate
+
+
+def args_validate(model_cls, exclude_args=None):
+    def decorate(func):
+        @wraps(func)
+        def wrapper(*args, **kwargs):
+            for arg in request.values:
+                if hasattr(model_cls, arg):
+                    attr = getattr(model_cls, arg)
+                    if not hasattr(attr, "type"):
+                        continue
+
+                    if exclude_args and arg in exclude_args:
+                        continue
+
+                    if attr.type.python_type == str and attr.type.length and \
+                            len(request.values[arg] or '') > attr.type.length:
+
+                        return abort(400, CommonErrFormat.argument_str_length_limit.format(arg, attr.type.length))
+                    elif attr.type.python_type in (int, float) and request.values[arg]:
+                        try:
+                            int(float(request.values[arg]))
+                        except (TypeError, ValueError):
+                            return abort(400, CommonErrFormat.argument_invalid.format(arg))
+
             return func(*args, **kwargs)
 
         return wrapper