rucio 37.5.0__py3-none-any.whl → 37.7.0__py3-none-any.whl

rucio/gateway/vo.py

@@ -15,6 +15,7 @@
 from typing import Any, Optional
 
 from rucio.common import exception
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.schema import validate_schema
 from rucio.common.types import InternalAccount
 from rucio.core import identity
@@ -24,7 +25,7 @@ from rucio.db.sqla.session import db_session
 from rucio.gateway.permission import has_permission
 
 
-def add_vo(new_vo: str, issuer: str, description: Optional[str] = None, email: Optional[str] = None, vo: str = 'def') -> None:
+def add_vo(new_vo: str, issuer: str, description: Optional[str] = None, email: Optional[str] = None, vo: str = DEFAULT_VO) -> None:
     '''
     Add a new VO.
 
@@ -48,7 +49,7 @@ def add_vo(new_vo: str, issuer: str, description: Optional[str] = None, email: O
         vo_core.add_vo(vo=new_vo, description=description, email=email, session=session)
 
 
-def list_vos(issuer: str, vo: str = 'def') -> list[dict[str, Any]]:
+def list_vos(issuer: str, vo: str = DEFAULT_VO) -> list[dict[str, Any]]:
     '''
     List the VOs.
 
@@ -73,7 +74,7 @@ def recover_vo_root_identity(
     issuer: str,
     default: bool = False,
     password: Optional[str] = None,
-    vo: str = 'def',
+    vo: str = DEFAULT_VO,
 ) -> None:
     """
     Adds a membership association between identity and the root account for given VO.
@@ -101,7 +102,7 @@ def recover_vo_root_identity(
                                              email=email, account=account, password=password, session=session)
 
 
-def update_vo(updated_vo: str, parameters: dict[str, Any], issuer: str, vo: str = 'def') -> None:
+def update_vo(updated_vo: str, parameters: dict[str, Any], issuer: str, vo: str = DEFAULT_VO) -> None:
     """
     Update VO properties (email, description).
 

rucio/rse/__init__.py

@@ -14,7 +14,8 @@
 
 from dogpile.cache import make_region
 
-from rucio.common.client import is_client
+from rucio.common.config import is_client
+from rucio.common.constants import DEFAULT_VO
 from rucio.rse import rsemanager
 
 if is_client():
@@ -25,7 +26,7 @@ else:
     setattr(rsemanager, 'SERVER_MODE', True)
 
 
-def get_rse_client(rse, vo='def', **kwarg):
+def get_rse_client(rse, vo=DEFAULT_VO, **kwarg):
     '''
     get_rse_client
     '''
@@ -34,7 +35,7 @@ def get_rse_client(rse, vo='def', **kwarg):
     return client.get_rse(rse)
 
 
-def get_signed_url_client(rse, service, op, url, vo='def'):
+def get_signed_url_client(rse, service, op, url, vo=DEFAULT_VO):
     '''
     get_signed_url_client
     '''
@@ -42,7 +43,7 @@ def get_signed_url_client(rse, service, op, url, vo='def'):
     return CredentialClient(vo=vo).get_signed_url(rse, service, op, url)
 
 
-def get_signed_url_server(rse, service, op, url, vo='def'):
+def get_signed_url_server(rse, service, op, url, vo=DEFAULT_VO):
     '''
     get_signed_url_server
     '''
@@ -57,7 +58,7 @@ def rse_key_generator(namespace, fn, **kwargs):
     '''
     Key generator for RSE
     '''
-    def generate_key(rse, vo='def', session=None):
+    def generate_key(rse, vo=DEFAULT_VO, session=None):
         '''
         generate_key
         '''
@@ -81,7 +82,7 @@ if rsemanager.SERVER_MODE:   # pylint:disable=no-member
     from rucio.core.rse import get_rse_id, get_rse_protocols
     from rucio.core.vo import map_vo
 
-    def tmp_rse_info(rse=None, vo='def', rse_id=None, session=None):
+    def tmp_rse_info(rse=None, vo=DEFAULT_VO, rse_id=None, session=None):
         if rse_id is None:
             # This can be called directly by client tools if they're co-located on a server
             # i.e. running rucio cli on a server and during the test suite.

rucio/rse/protocols/ngarc.py

@@ -20,7 +20,7 @@ from rucio.rse.protocols import protocol
 
 try:
     import arc  # pylint: disable=import-error
-except:
+except Exception:
     pass
 
 
@@ -59,7 +59,7 @@ class Default(protocol.RSEProtocol):
         self.cfg = arc.UserConfig()
         try:
             self.cfg.ProxyPath(os.environ['X509_USER_PROXY'])
-        except:
+        except Exception:
             pass
 
     def path2pfn(self, path):

rucio/rse/protocols/srm.py

@@ -101,7 +101,7 @@ class Default(protocol.RSEProtocol):
             # force type conversion
             try:
                 port = int(port)
-            except:
+            except Exception:
                 port = ''
 
             if self.attributes['hostname'] != hostname and\

rucio/rse/protocols/webdav.py

@@ -253,8 +253,15 @@ class Default(protocol.RSEProtocol):
             :raise  ServiceUnavailable, RSEAccessDenied
         """
         path = self.path2pfn(pfn)
+
+        using_presigned_urls = self.rse['sign_url'] is not None
+
         try:
-            result = self.session.request('HEAD', path, verify=False, timeout=self.timeout, cert=self.cert)
+            # 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)
+            else:
+                result = self.session.request('GET', path, verify=False, timeout=self.timeout, cert=self.cert)
             if result.status_code == 200:
                 return True
             elif result.status_code in [401, ]:

rucio/rse/rsemanager.py

@@ -22,6 +22,7 @@ from urllib.parse import urlparse
 from rucio.common import constants, exception, types, utils
 from rucio.common.checksum import GLOBALLY_SUPPORTED_CHECKSUMS
 from rucio.common.config import config_get_int
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.constraints import STRING_TYPES
 from rucio.common.logging import formatted_logger
 from rucio.common.utils import get_transfer_schemas, make_valid_did
@@ -34,7 +35,7 @@ if TYPE_CHECKING:
     from rucio.rse.protocols.protocol import RSEProtocol
 
 
-def get_scope_protocol(vo: str = 'def') -> 'Callable':
+def get_scope_protocol(vo: str = DEFAULT_VO) -> 'Callable':
     """
         Returns the callable protocol to translate the pfn to a name/scope pair
 
@@ -48,7 +49,7 @@ def get_scope_protocol(vo: str = 'def') -> 'Callable':
 
 def get_rse_info(
         rse: Optional[str] = None,
-        vo: str = 'def',
+        vo: str = DEFAULT_VO,
         rse_id: Optional[str] = None,
         session: Optional["Session"] = None
 ) -> types.RSESettingsDict:
@@ -306,7 +307,7 @@ def exists(
         scheme: Optional[str] = None,
         impl: Optional[str] = None,
         auth_token: Optional[str] = None,
-        vo: str = 'def',
+        vo: str = DEFAULT_VO,
         logger: types.LoggerFunction = logging.log
 ) -> Union[bool, list[Union[bool, dict[dict[str, str], bool]]]]:
     """
@@ -381,7 +382,7 @@ def upload(
         delete_existing: bool = False,
         sign_service: Optional[str] = None,
         auth_token: Optional[str] = None,
-        vo: str = 'def',
+        vo: str = DEFAULT_VO,
         logger: types.LoggerFunction = logging.log,
         impl: Optional[str] = None
 ) -> dict[Union[int, str], Union[bool, str, dict[str, Union[Literal[True], Exception]]]]:

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 RseAttr
+from rucio.common.constants import DEFAULT_VO, RseAttr
 from rucio.common.exception import ConfigNotFound
 from rucio.common.plugins import PolicyPackageAlgorithms
 
@@ -35,7 +35,7 @@ class RSEDeterministicScopeTranslation(PolicyPackageAlgorithms):
 
     _algorithm_type = "pfn2lfn"
 
-    def __init__(self, vo: str = 'def'):
+    def __init__(self, vo: str = DEFAULT_VO):
         super().__init__()
 
         logger = logging.getLogger(__name__)

rucio/tests/common.py

@@ -28,6 +28,7 @@ import pytest
 import requests
 
 from rucio.common.config import config_get, config_get_bool, get_config_dirs
+from rucio.common.constants import DEFAULT_VO
 from rucio.common.utils import execute
 from rucio.common.utils import generate_uuid as uuid
 
@@ -77,7 +78,7 @@ def get_long_vo() -> str:
     Don't map the name to a short version.
     :returns: VO name string.
     """
-    vo_name = 'def'
+    vo_name = DEFAULT_VO
     if config_get_bool('common', 'multi_vo', raise_exception=False, default=False):
         vo = config_get('client', 'vo', raise_exception=False, default=None)
         if vo is not None:
@@ -102,13 +103,13 @@ def scope_name_generator() -> str:
 
 
 def did_name_generator(did_type: str = 'file', name_prefix: str = '', name_suffix: str = '', path: Optional[str] = None) -> str:
-    """ Generate random did name.
+    """ Generate random DID name.
     :param did_type: A string to create a meaningful did_name depending on the did_type (file, dataset, container)
-    :param name_prefix: String to prefix to the did name
-    :param name_suffix: String to append to the did name
+    :param name_prefix: String to prefix to the DID name
+    :param name_suffix: String to append to the DID name
     :param path: If specified, use the path to generate the did_name
 
-    :returns: A random did name
+    :returns: A random DID name
     """
     if os.getenv('POLICY') == 'belleii':
         if path is not None:

rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '37.5.0',
+    'version': '37.7.0',
     'branch_nick': 'release-37',
-    'revision_id': '092cfe864848019a987a3a167120cf5cf7df2f61',
-    'revno': 13761
+    'revision_id': '61ed028cbd532ede88189a81bee971db566fcdec',
+    'revno': 13826
 }

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

@@ -72,7 +72,7 @@ class LocalAccountLimit(ErrorHandlingMethodView):
         parameters = json_parameters()
         bytes_param = param_get(parameters, 'bytes')
         try:
-            set_local_account_limit(account=account, rse=rse, bytes_=bytes_param, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            set_local_account_limit(account=account, rse=rse, bytes_=bytes_param, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except (RSENotFound, AccountNotFound) as error:
@@ -108,7 +108,7 @@ class LocalAccountLimit(ErrorHandlingMethodView):
             description: "No RSE or account found for the given id."
         """
         try:
-            delete_local_account_limit(account=account, rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            delete_local_account_limit(account=account, rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except (AccountNotFound, RSENotFound) as error:
@@ -168,8 +168,8 @@ class GlobalAccountLimit(ErrorHandlingMethodView):
                 account=account,
                 rse_expression=rse_expression,
                 bytes_=bytes_param,
-                issuer=request.environ.get('issuer'),
-                vo=request.environ.get('vo'),
+                issuer=request.environ['issuer'],
+                vo=request.environ['vo'],
             )
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
@@ -206,7 +206,7 @@ class GlobalAccountLimit(ErrorHandlingMethodView):
             description: "No RSE or account found for the given id."
         """
         try:
-            delete_global_account_limit(account=account, rse_expression=rse_expression, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            delete_global_account_limit(account=account, rse_expression=rse_expression, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except (AccountNotFound, RSENotFound) as error:

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

@@ -76,7 +76,7 @@ class Attributes(ErrorHandlingMethodView):
             description: "Not acceptable."
         """
         try:
-            attribs = list_account_attributes(account, vo=request.environ.get('vo'))
+            attribs = list_account_attributes(account, vo=request.environ['vo'])
         except AccountNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -134,7 +134,7 @@ class Attributes(ErrorHandlingMethodView):
         parameters = json_parameters()
         value = param_get(parameters, 'value')
         try:
-            add_account_attribute(key=key, value=value, account=account, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            add_account_attribute(key=key, value=value, account=account, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except Duplicate as error:
@@ -173,7 +173,7 @@ class Attributes(ErrorHandlingMethodView):
             description: "No account found for the given id."
         """
         try:
-            del_account_attribute(account=account, key=key, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            del_account_attribute(account=account, key=key, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except AccountNotFound as error:
@@ -333,10 +333,10 @@ class AccountParameter(ErrorHandlingMethodView):
             frontend = request.headers.get('X-Requested-Host', default=None)
             if frontend:
                 return redirect(f'{frontend}/accounts/{request.environ.get("issuer")}', code=302)
-            return redirect(request.environ.get('issuer'), code=303)  # type: ignore (request.environ.get('issuer') might be None)
+            return redirect(request.environ['issuer'], code=303)
 
         try:
-            acc = get_account_info(account, vo=request.environ.get('vo'))
+            acc = get_account_info(account, vo=request.environ['vo'])
         except AccountNotFound as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:
@@ -383,7 +383,7 @@ class AccountParameter(ErrorHandlingMethodView):
         parameters = json_parameters()
         for key, value in parameters.items():
             try:
-                update_account(account, key=key, value=value, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+                update_account(account, key=key, value=value, issuer=request.environ['issuer'], vo=request.environ['vo'])
             except ValueError:
                 return generate_http_error_flask(400, ValueError.__name__, f'Unknown value {value}')
             except AccessDenied as error:
@@ -442,7 +442,7 @@ class AccountParameter(ErrorHandlingMethodView):
         type_param = param_get(parameters, 'type')
         email = param_get(parameters, 'email')
         try:
-            add_account(account, type_param, email, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            add_account(account, type_param, email, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except Duplicate as error:
             return generate_http_error_flask(409, error)
         except AccessDenied as error:
@@ -475,7 +475,7 @@ class AccountParameter(ErrorHandlingMethodView):
             description: "Account not found"
         """
         try:
-            del_account(account, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            del_account(account, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except AccessDenied as error:
             return generate_http_error_flask(401, error)
         except AccountNotFound as error:
@@ -520,7 +520,7 @@ class Account(ErrorHandlingMethodView):
             for account in list_accounts(filter_=_filter, vo=vo):
                 yield render_json(**account) + "\n"
 
-        return try_stream(generate(_filter=dict(request.args.items(multi=False)), vo=request.environ.get('vo', 'def')))
+        return try_stream(generate(_filter=dict(request.args.items(multi=False)), vo=request.environ['vo']))
 
 
 class LocalAccountLimits(ErrorHandlingMethodView):
@@ -561,7 +561,7 @@ class LocalAccountLimits(ErrorHandlingMethodView):
             description: "Not Acceptable"
         """
         try:
-            limits = get_local_account_limit(account=account, rse=rse, vo=request.environ.get('vo'))
+            limits = get_local_account_limit(account=account, rse=rse, vo=request.environ['vo'])
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -606,7 +606,7 @@ class GlobalAccountLimits(ErrorHandlingMethodView):
             description: "Not Acceptable"
         """
         try:
-            limits = get_global_account_limit(account=account, rse_expression=rse_expression, vo=request.environ.get('vo'))
+            limits = get_global_account_limit(account=account, rse_expression=rse_expression, vo=request.environ['vo'])
         except RSENotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -677,8 +677,8 @@ class Identities(ErrorHandlingMethodView):
         authtype = param_get(parameters, 'authtype')
         email = param_get(parameters, 'email')
 
-        issuer = request.environ.get('issuer')
-        vo = request.environ.get('vo')
+        issuer = request.environ['issuer']
+        vo = request.environ['vo']
 
         if not issuer or not vo:
             return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
@@ -745,7 +745,7 @@ class Identities(ErrorHandlingMethodView):
                 for identity in list_identities(account, vo=vo):
                     yield render_json(**identity) + "\n"
 
-            return try_stream(generate(request.environ.get('vo', 'def')))
+            return try_stream(generate(request.environ['vo']))
         except AccountNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -790,8 +790,8 @@ class Identities(ErrorHandlingMethodView):
         identity = param_get(parameters, 'identity')
         authtype = param_get(parameters, 'authtype')
 
-        issuer = request.environ.get('issuer')
-        vo = request.environ.get('vo')
+        issuer = request.environ['issuer']
+        vo = request.environ['vo']
 
         if not issuer or not vo:
             return generate_http_error_flask(400, ValueError.__name__, 'Issuer and VO must be set.')
@@ -846,7 +846,7 @@ class Rules(ErrorHandlingMethodView):
                 for rule in list_replication_rules(filters=filters, vo=vo):
                     yield dumps(rule, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo', 'def')))
+            return try_stream(generate(vo=request.environ['vo']))
         except RuleNotFound as error:
             return generate_http_error_flask(404, error)
 
@@ -901,7 +901,7 @@ class UsageHistory(ErrorHandlingMethodView):
             description: "Not acceptable"
         """
         try:
-            usage = get_usage_history(account=account, rse=rse, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
+            usage = get_usage_history(account=account, rse=rse, issuer=request.environ['issuer'], vo=request.environ['vo'])
         except (AccountNotFound, CounterNotFound) as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:
@@ -972,7 +972,7 @@ class LocalUsage(ErrorHandlingMethodView):
                 for usage in get_local_account_usage(account=account, rse=rse, issuer=issuer, vo=vo):
                     yield dumps(usage, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(issuer=request.environ.get('issuer'), vo=request.environ.get('vo', 'def')))  # type: ignore (request.environ.get('issuer') could be None)
+            return try_stream(generate(issuer=request.environ['issuer'], vo=request.environ['vo']))
         except (AccountNotFound, RSENotFound) as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:
@@ -1036,7 +1036,7 @@ class GlobalUsage(ErrorHandlingMethodView):
                 for usage in get_global_account_usage(account=account, rse_expression=rse_expression, issuer=issuer, vo=vo):
                     yield dumps(usage, cls=APIEncoder) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo', 'def'), issuer=request.environ.get('issuer')))  # type: ignore (request.environ.get('issuer') could be None)
+            return try_stream(generate(vo=request.environ['vo'], issuer=request.environ['issuer']))
         except (AccountNotFound, RSENotFound) as error:
             return generate_http_error_flask(404, error)
         except AccessDenied as error:

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

@@ -17,6 +17,7 @@ from typing import TYPE_CHECKING
 
 from flask import Flask, Response, request
 
+from rucio.common.constants import DEFAULT_VO
 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
@@ -54,10 +55,10 @@ class Archive(ErrorHandlingMethodView):
                     type: object
                     properties:
                       scope:
-                        description: "The scope of the did."
+                        description: "The scope of the DID."
                         type: string
                       name:
-                        description: "The name of the did."
+                        description: "The name of the DID."
                         type: string
                       bytes:
                         description: "The number of bytes."
@@ -80,7 +81,7 @@ class Archive(ErrorHandlingMethodView):
                 for file in list_archive_content(scope=scope, name=name, vo=vo):
                     yield dumps(file) + '\n'
 
-            return try_stream(generate(vo=request.environ.get('vo', 'def')))
+            return try_stream(generate(vo=request.environ.get('vo', DEFAULT_VO)))
         except ValueError as error:
             return generate_http_error_flask(400, error)
 

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

@@ -30,6 +30,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.exception import CannotAuthenticate, DatabaseException, IdentityError, RucioException, UnsupportedRequestedContentType
 from rucio.common.schema import get_schema_value
 from rucio.common.utils import generate_uuid, render_json
@@ -161,7 +162,7 @@ def request_auth_env() -> Optional['ResponseReturnValue']:
         logging.exception('Internal error in validate_auth_token')
         return 'Internal Error', 500
 
-    flask.request.environ['vo'] = auth.get('vo', 'def')
+    flask.request.environ['vo'] = auth.get('vo', DEFAULT_VO)
     flask.request.environ['issuer'] = auth.get('account')
     flask.request.environ['identity'] = auth.get('identity')
     flask.request.environ['request_id'] = generate_uuid()
@@ -232,9 +233,9 @@ def parse_scope_name(scope_name: str, vo: Optional[str]) -> tuple[str, ...]:
         return scope, name
 
     if not vo:
-        vo = 'def'
+        vo = DEFAULT_VO
 
-    # The ':' in did is replaced by '/', also an '/' is added. Why?
+    # The ':' in DID is replaced by '/', also an '/' is added. Why?
     pattern = get_schema_value('SCOPE_NAME_REGEXP', vo)
     text = '/' + scope_name
 
@@ -413,7 +414,7 @@ def extract_vo(headers: Headers) -> str:
     :returns: a string containing the short VO name.
     """
     try:
-        return map_vo(headers.get('X-Rucio-VO', default='def'))
+        return map_vo(headers.get('X-Rucio-VO', default=DEFAULT_VO))
     except RucioException as err:
         # VO Name doesn't match allowed spec
         flask.abort(generate_http_error_flask(status_code=400, exc=err))