fix: use lowercase style for decorators

Co-Authored-By: fstagni <[email protected]>

Author: TaykYoku

src/DIRAC/Core/Tornado/Server/HandlerManager.py

@@ -2,14 +2,7 @@
   This module contains the necessary tools to discover and load
   the handlers for serving HTTPS
 """
-
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
-__RCSID__ = "$Id$"
-
-from tornado.web import url as TornadoURL, RequestHandler
+from tornado.web import RequestHandler
 
 from DIRAC import gConfig, gLogger, S_ERROR, S_OK
 from DIRAC.ConfigurationSystem.Client import PathFinder
@@ -107,8 +100,8 @@ def __load(self, instances, componentType, pathFinder):
         if not instances:
             return S_OK()
 
-        # Extract ports
-        ports, instances = self.__extractPorts(instances)
+        # Extract ports, e.g.: ['Framework/MyService', 'Framework/MyService2:9443]
+        port, instances = self.__extractPorts(instances)
 
         loader = ModuleLoader(componentType, pathFinder, RequestHandler, moduleSuffix="Handler")
 
@@ -137,7 +130,7 @@ def __load(self, instances, componentType, pathFinder):
                     return S_ERROR(f"URL not found for {fullComponentName}")
 
                 # Add new handler routes
-                self.__handlers[fullComponentName] = dict(URLs=list(set(urls)), Port=ports.get(fullComponentName))
+                self.__handlers[fullComponentName] = dict(URLs=list(set(urls)), Port=port.get(fullComponentName))
 
         return result
 

src/DIRAC/Core/Tornado/Server/TornadoREST.py

@@ -17,13 +17,13 @@
 sLog = gLogger.getSubLogger(__name__)
 
 # decorator to determine the path to access the target method
-LOCATION = partial(SETTINGS, "LOCATION")
-LOCATION.__doc__ = """
+location = partial(set_attribute, "location")
+location.__doc__ = """
 Use this decorator to determine the request path to the target method
 
 Example:
 
-    @LOCATION('/test/myAPI')
+    @location('/test/myAPI')
     def post_my_method(self, a, b):
         ''' Usage:
 
@@ -128,8 +128,8 @@ def delete_job(self, jobIDs):
                 '''
                 return self.j_manager.deleteJob(jobIDs)
 
-            @AUTHENTICATION(["VISITOR"])
-            @AUTHORIZATION(["all"])
+            @authentication(["VISITOR"])
+            @authorization(["all"])
             def options_job(self):
                 '''Usage:
 
@@ -196,7 +196,7 @@ def _pre_initialize(cls) -> list:
 
                 # Find target method URL
                 url = os.path.join(
-                    cls.DEFAULT_LOCATION, getattr(mObj, "LOCATION", "" if methodName == "index" else methodName)
+                    cls.DEFAULT_LOCATION, getattr(mObj, "location", "" if methodName == "index" else methodName)
                 )
                 if cls.BASE_URL and cls.BASE_URL.strip("/"):
                     url = cls.BASE_URL.strip("/") + (f"/{url}" if (url := url.strip("/")) else "")
@@ -327,7 +327,7 @@ def _getMethodArgs(self, args: tuple, kwargs: dict) -> tuple:
             # requests.post(url + "/my_api/pos_only_value", data={'standard': standard_value, 'kwd_only': kwd_only_value}, ..
             # requests.post(url + "/my_api", json=[pos_only_value, standard_value, kwd_only_value], ..
 
-            @LOCATION("/my_api")
+            @location("/my_api")
             def post_note(self, pos_only, /, standard, *, kwd_only):
                 ..
 

src/DIRAC/Core/Tornado/Server/private/BaseRequestHandler.py

@@ -35,12 +35,12 @@
 sLog = gLogger.getSubLogger(__name__.split(".")[-1])
 
 
-def SETTINGS(attr, val):
+def set_attribute(attr, val):
     """Decorator to determine target method settings. Set method attribute.
 
     Usage::
 
-        @SETTINGS('my attribure', 'value')
+        @set_attribute('my attribure', 'value')
         def export_myMethod(self):
             pass
     """
@@ -52,24 +52,24 @@ def Inner(func):
     return Inner
 
 
-AUTHENTICATION = partial(SETTINGS, "AUTHENTICATION")
-AUTHENTICATION.__doc__ = """
+authentication = partial(set_attribute, "authentication")
+authentication.__doc__ = """
 Decorator to determine authentication types
 
 Usage::
 
-    @AUTHENTICATION(["SSL", "VISITOR"])
+    @authentication(["SSL", "VISITOR"])
     def export_myMethod(self):
         pass
 """
 
-AUTHORIZATION = partial(SETTINGS, "AUTHORIZATION")
-AUTHORIZATION.__doc__ = """
+authorization = partial(set_attribute, "authorization")
+authorization.__doc__ = """
 Decorator to determine authorization requirements
 
 Usage::
 
-    @AUTHORIZATION(["authenticated"])
+    @authorization(["authenticated"])
     def export_myMethod(self):
         pass
 """
@@ -336,7 +336,7 @@ def __pre_initialize(cls) -> list:
         cls._authManager = AuthManager(cls._getCSAuthorizarionSection(cls._fullComponentName))
 
         if not (urls := cls._pre_initialize()):
-            sLog.warn(f"no one target method found for {cls.__name__}!")
+            sLog.warn(f"no target method found for {cls.__name__}!")
         return urls
 
     @classmethod
@@ -567,7 +567,7 @@ def __getMethodAuthProps(self) -> list:
         There are two ways to define authorization requirements for the target method:
         Use auth_< method name > class value or use `AUTH` decorator:
 
-            @AUTHORIZATION(['authenticated'])
+            @authorization(['authenticated'])
             def export_myMethod(self):
                 # Do something
 
@@ -582,7 +582,7 @@ def export_myMethod(self):
 
         # Define target method authorization requirements
         return getattr(
-            self, "auth_" + self.__methodName, getattr(self.methodObj, "AUTHORIZATION", self.DEFAULT_AUTHORIZATION)
+            self, "auth_" + self.__methodName, getattr(self.methodObj, "authorization", self.DEFAULT_AUTHORIZATION)
         )
 
     async def prepare(self):

src/DIRAC/FrameworkSystem/API/AuthHandler.py

@@ -12,16 +12,14 @@
 from dominate import tags as dom
 
 from DIRAC import gConfig
-from DIRAC.Core.Tornado.Server.TornadoREST import LOCATION, TornadoREST
+from DIRAC.Core.Tornado.Server.TornadoREST import location, TornadoREST
 from DIRAC.ConfigurationSystem.Client.Helpers.Registry import getIdPForGroup, getGroupsForUser
 from DIRAC.FrameworkSystem.private.authorization.AuthServer import AuthServer
 from DIRAC.FrameworkSystem.private.authorization.utils.Requests import createOAuth2Request
 from DIRAC.FrameworkSystem.private.authorization.grants.DeviceFlow import DeviceAuthorizationEndpoint
 from DIRAC.FrameworkSystem.private.authorization.grants.RevokeToken import RevocationEndpoint
 from DIRAC.FrameworkSystem.private.authorization.utils.Utilities import getHTML
 
-__RCSID__ = "$Id$"
-
 
 class AuthHandler(TornadoREST):
     # Authorization access to all methods handled by AuthServer instance
@@ -42,7 +40,7 @@ def initializeRequest(self):
         """Called at every request"""
         self.currentPath = self.request.protocol + "://" + self.request.host + self.request.path
 
-    @LOCATION(".well-known/(oauth-authorization-server|openid-configuration)")
+    @location(".well-known/(oauth-authorization-server|openid-configuration)")
     def get_index(self, **kwargs):
         """Well known endpoint, specified by
         `RFC8414 <https://tools.ietf.org/html/rfc8414#section-3>`_