Merge branch 'master' of https://github.com/cloudforet-io/python-core

Author: Jongmin Kim

src/spaceone/core/service/__init__.py

@@ -1,6 +1,7 @@
+import copy
 import functools
 import logging
-import copy
+import time
 from typing import Generator, Union, Literal
 
 from opentelemetry import trace
@@ -181,6 +182,8 @@ def _pipeline(
 
     try:
         with _TRACER.start_as_current_span("PreProcessing"):
+            start_time = time.time()
+
             # 1. Event - Start
             if event_handler_state:
                 for handler in get_event_handlers():
@@ -239,7 +242,9 @@ def _pipeline(
 
             # 9. Print Response Info Log
             if print_info_log:
-                _LOGGER.info(f"(RESPONSE) => SUCCESS")
+
+                process_time = time.time() - start_time
+                _LOGGER.info(f"(RESPONSE) => SUCCESS (Time = {process_time:.2f}s)")
 
         return response_or_iterator
 

src/spaceone/core/service/utils.py

@@ -22,6 +22,7 @@
     "change_timestamp_value",
     "change_date_value",
     "change_timestamp_filter",
+    "check_query_filter",
 ]
 
 
@@ -420,3 +421,49 @@ def _convert_date_from_string(date_str, key, date_format) -> date:
         return datetime.strptime(date_str, date_format).date()
     except Exception as e:
         raise ERROR_INVALID_PARAMETER_TYPE(key=key, type=date_format)
+
+
+def check_query_filter(keywords=None) -> callable:
+    if keywords is None:
+        keywords = []
+
+    def wrapper(func):
+        @functools.wraps(func)
+        def wrapped_func(cls, params):
+            query = params.get("query", {})
+            if "filter" in query:
+                for filters in query["filter"]:
+                    key = filters.get("key", filters.get("k"))
+                    if key in keywords:
+                        raise ERROR_INVALID_PARAMETER(
+                            key=key, reason="Include secure parameter"
+                        )
+
+            if "group_by" in query:
+                for group_bys in query["group_by"]:
+                    key = group_bys.get("key", group_bys.get("k"))
+                    if key in keywords:
+                        raise ERROR_INVALID_PARAMETER(
+                            key=key, reason="Include secure parameter"
+                        )
+
+            if "fields" in query:
+                value = query["fields"].get("value", query["fields"].get("v"))
+                key = value.get("key", value.get("k"))
+                if key in keywords:
+                    raise ERROR_INVALID_PARAMETER(
+                        key=key, reason="Include secure parameter"
+                    )
+
+            if "distinct" in query:
+                key = query["distinct"]
+                if key in keywords:
+                    raise ERROR_INVALID_PARAMETER(
+                        key=key, reason="Include secure parameter"
+                    )
+
+            return func(cls, params)
+
+        return wrapped_func
+
+    return wrapper