rucio 38.2.0__py3-none-any.whl → 38.4.0__py3-none-any.whl

rucio/gateway/rule.py

@@ -15,7 +15,7 @@
 from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from rucio.common.config import config_get_bool
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_ACTIVITY, DEFAULT_VO
 from rucio.common.exception import AccessDenied
 from rucio.common.schema import validate_schema
 from rucio.common.types import InternalAccount, InternalScope
@@ -97,7 +97,7 @@ def add_replication_rule(
         account = issuer
 
     if activity is None:
-        activity = 'User Subscriptions'
+        activity = DEFAULT_ACTIVITY
 
     kwargs = {'dids': dids, 'copies': copies, 'rse_expression': rse_expression, 'weight': weight, 'lifetime': lifetime,
               'grouping': grouping, 'account': account, 'locked': locked, 'subscription_id': subscription_id,

rucio/rse/protocols/webdav.py

@@ -25,6 +25,7 @@ from requests.adapters import HTTPAdapter
 from urllib3.poolmanager import PoolManager
 
 from rucio.common import exception
+from rucio.common.constants import HTTPMethod
 from rucio.rse.protocols import protocol
 
 
@@ -259,9 +260,11 @@ class Default(protocol.RSEProtocol):
         try:
             # use GET instead of HEAD for presigned urls
             if not using_presigned_urls:
-                result = self.session.request('HEAD', path, verify=False, timeout=self.timeout, cert=self.cert)
+                result = self.session.request(HTTPMethod.HEAD.value, path, verify=False, timeout=self.timeout,
+                                              cert=self.cert)
             else:
-                result = self.session.request('GET', path, verify=False, timeout=self.timeout, cert=self.cert)
+                result = self.session.request(HTTPMethod.GET.value, path, verify=False, timeout=self.timeout,
+                                              cert=self.cert)
             if result.status_code == 200:
                 return True
             elif result.status_code in [401, ]:

rucio/rse/translation.py

@@ -18,7 +18,7 @@ from configparser import NoOptionError, NoSectionError
 from typing import TYPE_CHECKING, Any, Optional
 
 from rucio.common import config
-from rucio.common.constants import DEFAULT_VO, RseAttr
+from rucio.common.constants import DEFAULT_VO, POLICY_ALGORITHM_TYPES_LITERAL, RseAttr
 from rucio.common.exception import ConfigNotFound
 from rucio.common.plugins import PolicyPackageAlgorithms
 
@@ -33,7 +33,7 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
         Translates a pfn dictionary into a scope and name
     """
 
-    _algorithm_type = "pfn2lfn"
+    _algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL = "pfn2lfn"
 
     def __init__(self, vo: str = DEFAULT_VO):
         super().__init__()
@@ -111,7 +111,7 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
     """
 
     _DEFAULT_LFN2PFN = "hash"
-    _algorithm_type = "lfn2pfn"
+    _algorithm_type: POLICY_ALGORITHM_TYPES_LITERAL = "lfn2pfn"
 
     def __init__(
             self,

rucio/transfertool/fts3.py

@@ -76,7 +76,6 @@ BULK_QUERY_COUNTER = METRICS.counter(name='{host}.bulk_query.{state}',
 QUERY_DETAILS_COUNTER = METRICS.counter(name='{host}.query_details.{state}',
                                         documentation='Number of detailed status queries', labelnames=('state', 'host'))
 
-REWRITE_HTTPS_TO_DAVS = config_get_bool('transfers', 'rewrite_https_to_davs', default=False)
 VO_CERTS_PATH = config_get('conveyor', 'vo_certs_path', False, None)
 
 # https://fts3-docs.web.cern.ch/fts3-docs/docs/state_machine.html
@@ -1073,24 +1072,6 @@ class FTS3Transfertool(Transfertool):
             if not transfer_file['sources'] or transfer_file['sources'] == []:
                 raise Exception('No sources defined')
 
-            # TODO: remove the following logic in rucio 1.31
-            if REWRITE_HTTPS_TO_DAVS:
-                new_src_urls = []
-                new_dst_urls = []
-                for url in transfer_file['sources']:
-                    if url.startswith('https'):
-                        new_src_urls.append(':'.join(['davs'] + url.split(':')[1:]))
-                    else:
-                        new_src_urls.append(url)
-                for url in transfer_file['destinations']:
-                    if url.startswith('https'):
-                        new_dst_urls.append(':'.join(['davs'] + url.split(':')[1:]))
-                    else:
-                        new_dst_urls.append(url)
-
-                transfer_file['sources'] = new_src_urls
-                transfer_file['destinations'] = new_dst_urls
-
         transfer_id = None
         expected_transfer_id = None
         if self.deterministic_id:

rucio/transfertool/fts3_plugins.py

@@ -17,7 +17,7 @@ import sys
 from typing import TYPE_CHECKING, Any, Optional, TypeVar
 
 from rucio.common.config import config_get_int
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_VO, POLICY_ALGORITHM_TYPES_LITERAL
 from rucio.common.exception import InvalidRequest
 from rucio.common.plugins import PolicyPackageAlgorithms
 
@@ -33,8 +33,8 @@ class FTS3TapeMetadataPlugin(PolicyPackageAlgorithms):
     Plugins are registered during initialization and called during a transfer with FTS3
     """
 
-    ALGORITHM_NAME = "fts3_tape_metadata_plugins"
-    _INIT_FUNC_NAME = "fts3_plugins_init"
+    ALGORITHM_NAME: POLICY_ALGORITHM_TYPES_LITERAL = "fts3_tape_metadata_plugins"
+    _INIT_FUNC_NAME: POLICY_ALGORITHM_TYPES_LITERAL = "fts3_plugins_init"
     DEFAULT = "def"
 
     def __init__(self, policy_algorithm: str) -> None:

rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '38.2.0',
+    'version': '38.4.0',
     'branch_nick': 'release-38-LTS',
-    'revision_id': 'af0cedfc38c83fa06e4b82991d0c04a1129440a9',
-    'revno': 13963
+    'revision_id': '945ab71be90243fe96148bb3bd13c1c3ae410765',
+    'revno': 14030
 }

rucio/web/rest/flaskapi/v1/accountlimits.py

@@ -16,6 +16,7 @@ from typing import TYPE_CHECKING
 
 from flask import Flask, request
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import AccessDenied, AccountNotFound, RSENotFound
 from rucio.gateway.account_limit import delete_global_account_limit, delete_local_account_limit, set_global_account_limit, set_local_account_limit
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
@@ -219,11 +220,11 @@ def blueprint(with_doc: bool = False) -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('accountlimits', __name__, url_prefix='/accountlimits')
 
     local_account_limit_view = LocalAccountLimit.as_view('local_account_limit')
-    bp.add_url_rule('/local/<account>/<rse>', view_func=local_account_limit_view, methods=['post', 'delete'])
+    bp.add_url_rule('/local/<account>/<rse>', view_func=local_account_limit_view, methods=[HTTPMethod.POST.value, HTTPMethod.DELETE.value])
     if not with_doc:
-        bp.add_url_rule('/<account>/<rse>', view_func=local_account_limit_view, methods=['post', 'delete'])
+        bp.add_url_rule('/<account>/<rse>', view_func=local_account_limit_view, methods=[HTTPMethod.POST.value, HTTPMethod.DELETE.value])
     global_account_limit_view = GlobalAccountLimit.as_view('global_account_limit')
-    bp.add_url_rule('/global/<account>/<rse_expression>', view_func=global_account_limit_view, methods=['post', 'delete'])
+    bp.add_url_rule('/global/<account>/<rse_expression>', view_func=global_account_limit_view, methods=[HTTPMethod.POST.value, HTTPMethod.DELETE.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/accounts.py

@@ -18,7 +18,8 @@ from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 
 from flask import Flask, Response, jsonify, redirect, request
 
-from rucio.common.exception import AccessDenied, AccountNotFound, CounterNotFound, Duplicate, IdentityError, InvalidObject, RSENotFound, RuleNotFound, ScopeNotFound
+from rucio.common.constants import HTTPMethod
+from rucio.common.exception import AccessDenied, AccountNotFound, CounterNotFound, Duplicate, IdentityError, InvalidAccountType, InvalidObject, RSENotFound, RuleNotFound, ScopeNotFound
 from rucio.common.utils import APIEncoder, render_json
 from rucio.gateway.account import add_account, add_account_attribute, del_account, del_account_attribute, get_account_info, get_usage_history, list_account_attributes, list_accounts, list_identities, update_account
 from rucio.gateway.account_limit import get_global_account_limit, get_global_account_usage, get_local_account_limit, get_local_account_usage
@@ -447,7 +448,7 @@ class AccountParameter(ErrorHandlingMethodView):
             return generate_http_error_flask(409, error)
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
-        except InvalidObject as error:
+        except (InvalidObject, InvalidAccountType) as error:
             return generate_http_error_flask(400, error)
 
         return 'Created', 201
@@ -1047,44 +1048,44 @@ def blueprint(with_doc: bool = False) -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('accounts', __name__, url_prefix='/accounts')
 
     attributes_view = Attributes.as_view('attributes')
-    bp.add_url_rule('/<account>/attr/', view_func=attributes_view, methods=['get', ])
-    bp.add_url_rule('/<account>/attr/<key>', view_func=attributes_view, methods=['post', 'delete'])
+    bp.add_url_rule('/<account>/attr/', view_func=attributes_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/attr/<key>', view_func=attributes_view, methods=[HTTPMethod.POST.value, HTTPMethod.DELETE.value])
     scopes_view = Scopes.as_view('scopes')
-    bp.add_url_rule('/<account>/scopes/', view_func=scopes_view, methods=['get', ])
-    bp.add_url_rule('/<account>/scopes/<scope>', view_func=scopes_view, methods=['post', ])
+    bp.add_url_rule('/<account>/scopes/', view_func=scopes_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/scopes/<scope>', view_func=scopes_view, methods=[HTTPMethod.POST.value])
     local_account_limits_view = LocalAccountLimits.as_view('local_account_limit')
-    bp.add_url_rule('/<account>/limits/local', view_func=local_account_limits_view, methods=['get', ])
-    bp.add_url_rule('/<account>/limits', view_func=local_account_limits_view, methods=['get', ])
-    bp.add_url_rule('/<account>/limits/local/<rse>', view_func=local_account_limits_view, methods=['get', ])
-    bp.add_url_rule('/<account>/limits/<rse>', view_func=local_account_limits_view, methods=['get', ])
+    bp.add_url_rule('/<account>/limits/local', view_func=local_account_limits_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/limits', view_func=local_account_limits_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/limits/local/<rse>', view_func=local_account_limits_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/limits/<rse>', view_func=local_account_limits_view, methods=[HTTPMethod.GET.value])
     global_account_limits_view = GlobalAccountLimits.as_view('global_account_limit')
-    bp.add_url_rule('/<account>/limits/global', view_func=global_account_limits_view, methods=['get', ])
-    bp.add_url_rule('/<account>/limits/global/<rse_expression>', view_func=global_account_limits_view, methods=['get', ])
+    bp.add_url_rule('/<account>/limits/global', view_func=global_account_limits_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/limits/global/<rse_expression>', view_func=global_account_limits_view, methods=[HTTPMethod.GET.value])
     identities_view = Identities.as_view('identities')
-    bp.add_url_rule('/<account>/identities', view_func=identities_view, methods=['get', 'post', 'delete'])
+    bp.add_url_rule('/<account>/identities', view_func=identities_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value, HTTPMethod.DELETE.value])
     rules_view = Rules.as_view('rules')
-    bp.add_url_rule('/<account>/rules', view_func=rules_view, methods=['get', ])
+    bp.add_url_rule('/<account>/rules', view_func=rules_view, methods=[HTTPMethod.GET.value])
     usagehistory_view = UsageHistory.as_view('usagehistory')
-    bp.add_url_rule('/<account>/usage/history/<rse>', view_func=usagehistory_view, methods=['get', ])
+    bp.add_url_rule('/<account>/usage/history/<rse>', view_func=usagehistory_view, methods=[HTTPMethod.GET.value])
     usage_view = LocalUsage.as_view('usage')
-    bp.add_url_rule('/<account>/usage/local', view_func=usage_view, methods=['get', ])
-    bp.add_url_rule('/<account>/usage', view_func=usage_view, methods=['get', ])
+    bp.add_url_rule('/<account>/usage/local', view_func=usage_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/usage', view_func=usage_view, methods=[HTTPMethod.GET.value])
     if not with_doc:
         # for backwards-compatibility
         # rule without trailing slash needs to be added before rule with trailing slash
-        bp.add_url_rule('/<account>/usage/', view_func=usage_view, methods=['get', ])
-    bp.add_url_rule('/<account>/usage/local/<rse>', view_func=usage_view, methods=['get', ])
-    bp.add_url_rule('/<account>/usage/<rse>', view_func=usage_view, methods=['get', ])
+        bp.add_url_rule('/<account>/usage/', view_func=usage_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/usage/local/<rse>', view_func=usage_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/usage/<rse>', view_func=usage_view, methods=[HTTPMethod.GET.value])
     global_usage_view = GlobalUsage.as_view('global_usage')
-    bp.add_url_rule('/<account>/usage/global', view_func=global_usage_view, methods=['get', ])
-    bp.add_url_rule('/<account>/usage/global/<rse_expression>', view_func=global_usage_view, methods=['get', ])
+    bp.add_url_rule('/<account>/usage/global', view_func=global_usage_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/<account>/usage/global/<rse_expression>', view_func=global_usage_view, methods=[HTTPMethod.GET.value])
     account_parameter_view = AccountParameter.as_view('account_parameter')
-    bp.add_url_rule('/<account>', view_func=account_parameter_view, methods=['get', 'put', 'post', 'delete'])
+    bp.add_url_rule('/<account>', view_func=account_parameter_view, methods=[HTTPMethod.GET.value, HTTPMethod.PUT.value, HTTPMethod.POST.value, HTTPMethod.DELETE.value])
     account_view = Account.as_view('account')
     if not with_doc:
         # rule without trailing slash needs to be added before rule with trailing slash
-        bp.add_url_rule('', view_func=account_view, methods=['get', ])
-    bp.add_url_rule('/', view_func=account_view, methods=['get', ])
+        bp.add_url_rule('', view_func=account_view, methods=[HTTPMethod.GET.value])
+    bp.add_url_rule('/', view_func=account_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/archives.py

@@ -17,7 +17,7 @@ from typing import TYPE_CHECKING
 
 from flask import Flask, Response, request
 
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_VO, HTTPMethod
 from rucio.gateway.did import list_archive_content
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, parse_scope_name, response_headers, try_stream
@@ -90,7 +90,7 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('archives', __name__, url_prefix='/archives')
 
     archive_view = Archive.as_view('archive')
-    bp.add_url_rule('/<path:scope_name>/files', view_func=archive_view, methods=['get', ])
+    bp.add_url_rule('/<path:scope_name>/files', view_func=archive_view, methods=[HTTPMethod.GET.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/auth.py

@@ -23,6 +23,7 @@ from jinja2.exceptions import TemplateNotFound
 from werkzeug.datastructures import Headers
 
 from rucio.common.config import config_get
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import AccessDenied, CannotAuthenticate, CannotAuthorize, ConfigurationError, IdentityError, IdentityNotFound, InvalidRequest
 from rucio.common.extra import import_extras
 from rucio.common.utils import date_to_str
@@ -1632,31 +1633,31 @@ def blueprint() -> Blueprint:
     bp = Blueprint('auth', __name__, url_prefix='/auth')
 
     user_pass_view = UserPass.as_view('user_pass')
-    bp.add_url_rule('/userpass', view_func=user_pass_view, methods=['get', 'options'])
+    bp.add_url_rule('/userpass', view_func=user_pass_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     gss_view = GSS.as_view('gss')
-    bp.add_url_rule('/gss', view_func=gss_view, methods=['get', 'options'])
+    bp.add_url_rule('/gss', view_func=gss_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     x509_view = x509.as_view('x509')
-    bp.add_url_rule('/x509', view_func=x509_view, methods=['get', 'options'])
-    bp.add_url_rule('/x509/webui', view_func=x509_view, methods=['get', 'options'])
-    bp.add_url_rule('/x509_proxy', view_func=x509_view, methods=['get', 'options'])
+    bp.add_url_rule('/x509', view_func=x509_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
+    bp.add_url_rule('/x509/webui', view_func=x509_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
+    bp.add_url_rule('/x509_proxy', view_func=x509_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     ssh_view = SSH.as_view('ssh')
-    bp.add_url_rule('/ssh', view_func=ssh_view, methods=['get', 'options'])
+    bp.add_url_rule('/ssh', view_func=ssh_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     ssh_challenge_token_view = SSHChallengeToken.as_view('ssh_challenge_token')
-    bp.add_url_rule('/ssh_challenge_token', view_func=ssh_challenge_token_view, methods=['get', 'options'])
+    bp.add_url_rule('/ssh_challenge_token', view_func=ssh_challenge_token_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     saml_view = SAML.as_view('saml')
-    bp.add_url_rule('/saml', view_func=saml_view, methods=['get', 'post', 'options'])
+    bp.add_url_rule('/saml', view_func=saml_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value, HTTPMethod.OPTIONS.value])
     validate_view = Validate.as_view('validate')
-    bp.add_url_rule('/validate', view_func=validate_view, methods=['get', 'options'])
+    bp.add_url_rule('/validate', view_func=validate_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     oidc_view = OIDC.as_view('oidc_view')
-    bp.add_url_rule('/oidc', view_func=oidc_view, methods=['get', 'options'])
+    bp.add_url_rule('/oidc', view_func=oidc_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     token_oidc_view = TokenOIDC.as_view('token_oidc_view')
-    bp.add_url_rule('/oidc_token', view_func=token_oidc_view, methods=['get', 'options'])
+    bp.add_url_rule('/oidc_token', view_func=token_oidc_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     code_oidc_view = CodeOIDC.as_view('code_oidc_view')
-    bp.add_url_rule('/oidc_code', view_func=code_oidc_view, methods=['get', 'options'])
+    bp.add_url_rule('/oidc_code', view_func=code_oidc_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     redirect_oidc_view = RedirectOIDC.as_view('redirect_oidc_view')
-    bp.add_url_rule('/oidc_redirect', view_func=redirect_oidc_view, methods=['get', 'options'])
+    bp.add_url_rule('/oidc_redirect', view_func=redirect_oidc_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     refresh_oidc_view = RefreshOIDC.as_view('refresh_oidc_view')
-    bp.add_url_rule('/oidc_refresh', view_func=refresh_oidc_view, methods=['get', 'options'])
+    bp.add_url_rule('/oidc_refresh', view_func=refresh_oidc_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
 
     return bp
 

rucio/web/rest/flaskapi/v1/common.py

@@ -31,7 +31,7 @@ from werkzeug.exceptions import HTTPException
 from werkzeug.wrappers import Request, Response
 
 from rucio.common import config
-from rucio.common.constants import DEFAULT_VO
+from rucio.common.constants import DEFAULT_VO, HTTPMethod
 from rucio.common.exception import CannotAuthenticate, DatabaseException, IdentityError, RucioException, UnsupportedRequestedContentType
 from rucio.common.schema import get_schema_value
 from rucio.common.utils import generate_uuid, render_json
@@ -66,7 +66,7 @@ class CORSMiddleware:
     def __call__(self, environ: 'WSGIEnvironment', start_response: 'StartResponse') -> 'Iterable[bytes]':
         request: Request = Request(environ)
 
-        if request.environ.get('REQUEST_METHOD') == 'OPTIONS':
+        if request.environ.get('REQUEST_METHOD') == HTTPMethod.OPTIONS.value:
             try:
                 webui_urls = config.config_get_list('webui', 'urls')
             except (NoOptionError, NoSectionError, RuntimeError) as error:
@@ -145,7 +145,7 @@ class ErrorHandlingMethodView(MethodView):
 
 
 def request_auth_env() -> Optional['ResponseReturnValue']:
-    if flask.request.environ.get('REQUEST_METHOD') == 'OPTIONS':
+    if flask.request.environ.get('REQUEST_METHOD') == HTTPMethod.OPTIONS.value:
         return '', 200
 
     auth_token = flask.request.headers.get('X-Rucio-Auth-Token', default=None)
@@ -176,7 +176,7 @@ def response_headers(response: ResponseTypeVar) -> ResponseTypeVar:
     response.headers['Access-Control-Allow-Methods'] = '*'
     response.headers['Access-Control-Allow-Credentials'] = 'true'
 
-    if flask.request.environ.get('REQUEST_METHOD') == 'GET':
+    if flask.request.environ.get('REQUEST_METHOD') == HTTPMethod.GET.value:
         response.headers['Cache-Control'] = 'no-cache, no-store, max-age=0, must-revalidate'
         response.headers['Cache-Control'] = 'post-check=0, pre-check=0'
         response.headers['Pragma'] = 'no-cache'

rucio/web/rest/flaskapi/v1/config.py

@@ -12,20 +12,26 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from typing import TYPE_CHECKING
+
 from flask import Flask, jsonify
 from flask import request as request
 
+from rucio.common.constants import HTTPMethod
 from rucio.common.exception import AccessDenied, ConfigNotFound, ConfigurationError
 from rucio.gateway import config
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
 from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, response_headers
 
+if TYPE_CHECKING:
+    from flask.typing import ResponseReturnValue
+
 
 class Config(ErrorHandlingMethodView):
     """ REST API for full configuration. """
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self):
+    def get(self) -> 'ResponseReturnValue':
         """
         ---
         summary: List
@@ -53,7 +59,7 @@ class Config(ErrorHandlingMethodView):
 
         return jsonify(res), 200
 
-    def post(self):
+    def post(self) -> 'ResponseReturnValue':
         """
         ---
         summary: Create
@@ -97,7 +103,7 @@ class Section(ErrorHandlingMethodView):
     """ REST API for the sections in the configuration. """
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self, section):
+    def get(self, section: str) -> 'ResponseReturnValue':
         """
         ---
         summary: List Sections
@@ -136,25 +142,55 @@ class Section(ErrorHandlingMethodView):
           406:
             description: "Not acceptable"
         """
-        res = {}
-        for item in config.items(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
-            res[item[0]] = item[1]
+        if config.has_section(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
+            res = {}
+            for item in config.items(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
+                res[item[0]] = item[1]
+            return jsonify(res), 200
 
-        if res == {}:
+        else:
             return generate_http_error_flask(
                 status_code=404,
                 exc=ConfigNotFound.__name__,
                 exc_msg=f"No configuration found for section '{section}'"
             )
 
-        return jsonify(res), 200
+    def delete(self, section: str) -> 'ResponseReturnValue':
+        """
+        ---
+        summary: Remove an existing section
+        tags:
+          - Config
+        parameters:
+        - name: section
+          in: path
+          description: "The section."
+        responses:
+          200:
+            description: "OK"
+          401:
+            description: "Invalid Auth Token"
+          404:
+            description: "Config not found"
+          406:
+            description: "Not acceptable"
+        """
+        if config.has_section(section, issuer=request.environ['issuer'], vo=request.environ['vo']):
+            config.remove_section(section, issuer=request.environ['issuer'], vo=request.environ['vo'])
+            return '', 200
+        else:
+            return generate_http_error_flask(
+                status_code=404,
+                exc=ConfigNotFound.__name__,
+                exc_msg=f"No configuration found for section '{section}'"
+            )
 
 
 class OptionGetDel(ErrorHandlingMethodView):
     """ REST API for reading or deleting the options in the configuration. """
 
     @check_accept_header_wrapper_flask(['application/json'])
-    def get(self, section, option):
+    def get(self, section: str, option: str) -> 'ResponseReturnValue':
         """
         ---
         summary: Get option
@@ -197,7 +233,7 @@ class OptionGetDel(ErrorHandlingMethodView):
         except ConfigNotFound as error:
             return generate_http_error_flask(404, error, f"No configuration found for section '{section}' option '{option}'")
 
-    def delete(self, section, option):
+    def delete(self, section: str, option: str) -> 'ResponseReturnValue':
         """
         ---
         summary: Delete option
@@ -223,14 +259,17 @@ class OptionGetDel(ErrorHandlingMethodView):
           401:
             description: "Invalid Auth Token"
         """
-        config.remove_option(section=section, option=option, issuer=request.environ['issuer'], vo=request.environ['vo'])
-        return '', 200
+        if config.has_option(section, option, issuer=request.environ['issuer'], vo=request.environ['vo']):
+            config.remove_option(section=section, option=option, issuer=request.environ['issuer'], vo=request.environ['vo'])
+            return '', 200
+        else:
+            return generate_http_error_flask(404, ConfigNotFound.__name__, f"No configuration found for section '{section}' option '{option}'")
 
 
 class OptionSet(ErrorHandlingMethodView):
     """ REST API for setting the options in the configuration. """
 
-    def put(self, section, option, value):
+    def put(self, section: str, option: str, value: str) -> 'ResponseReturnValue':
         """
         ---
         summary: Create value
@@ -285,13 +324,14 @@ def blueprint() -> AuthenticatedBlueprint:
     bp = AuthenticatedBlueprint('config', __name__, url_prefix='/config')
 
     option_set_view = OptionSet.as_view('option_set')
-    bp.add_url_rule('/<section>/<option>/<value>', view_func=option_set_view, methods=['put', ])
+    bp.add_url_rule('/<section>/<option>/<value>', view_func=option_set_view, methods=[HTTPMethod.PUT.value])
     option_get_del_view = OptionGetDel.as_view('option_get_del')
-    bp.add_url_rule('/<section>/<option>', view_func=option_get_del_view, methods=['get', 'delete'])
+    bp.add_url_rule('/<section>/<option>', view_func=option_get_del_view, methods=[HTTPMethod.GET.value, HTTPMethod.DELETE.value])
     section_view = Section.as_view('section')
-    bp.add_url_rule('/<section>', view_func=section_view, methods=['get', ])
+
+    bp.add_url_rule('/<section>', view_func=section_view, methods=[HTTPMethod.GET.value, HTTPMethod.DELETE.value])
     config_view = Config.as_view('config')
-    bp.add_url_rule('', view_func=config_view, methods=['get', 'post'])
+    bp.add_url_rule('', view_func=config_view, methods=[HTTPMethod.GET.value, HTTPMethod.POST.value])
 
     bp.after_request(response_headers)
     return bp

rucio/web/rest/flaskapi/v1/credentials.py

@@ -17,7 +17,7 @@ from typing import TYPE_CHECKING, cast
 from flask import Flask, request
 from werkzeug.datastructures import Headers
 
-from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_SIGN_URL_SERVICES, SUPPORTED_SIGN_URL_SERVICES_LITERAL
+from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_SIGN_URL_SERVICES, SUPPORTED_SIGN_URL_SERVICES_LITERAL, HTTPMethod
 from rucio.common.exception import CannotAuthenticate
 from rucio.gateway.credential import get_signed_url
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
@@ -203,10 +203,10 @@ def blueprint(with_doc=False):
     bp = AuthenticatedBlueprint('credentials', __name__, url_prefix='/credentials')
 
     signurl_view = SignURL.as_view('signurl')
-    bp.add_url_rule('/signurl', view_func=signurl_view, methods=['get', 'options'])
+    bp.add_url_rule('/signurl', view_func=signurl_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
     if not with_doc:
         # yes, /signur ~= '/signurl?$'
-        bp.add_url_rule('/signur', view_func=signurl_view, methods=['get', 'options'])
+        bp.add_url_rule('/signur', view_func=signurl_view, methods=[HTTPMethod.GET.value, HTTPMethod.OPTIONS.value])
 
     bp.after_request(response_headers)