rucio-clients 34.3.0__tar.gz → 34.4.0__tar.gz

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rucio-clients
-Version: 34.3.0
+Version: 34.4.0
 Summary: Rucio Client Lite Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/client/baseclient.py

@@ -77,8 +77,8 @@ class BaseClient:
 
     AUTH_RETRIES, REQUEST_RETRIES = 2, 3
     TOKEN_PATH_PREFIX = get_tmp_dir() + '/.rucio_'
-    TOKEN_PREFIX = 'auth_token_'
-    TOKEN_EXP_PREFIX = 'auth_token_exp_'
+    TOKEN_PREFIX = 'auth_token_'  # noqa: S105
+    TOKEN_EXP_PREFIX = 'auth_token_exp_'  # noqa: S105
 
     def __init__(self,
                  rucio_host: Optional[str] = None,

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/client/downloadclient.py

@@ -25,6 +25,7 @@ import subprocess
 import time
 from queue import Empty, Queue, deque
 from threading import Thread
+from typing import Any, Optional
 
 from rucio import version
 from rucio.client.client import Client
@@ -174,7 +175,14 @@ class DownloadClient:
         self.extraction_tools.append(BaseExtractionTool('tar', '--version', extract_args, logger=self.logger))
         self.extract_scope_convention = config_get('common', 'extract_scope', False, None)
 
-    def download_pfns(self, items, num_threads=2, trace_custom_fields={}, traces_copy_out=None, deactivate_file_download_exceptions=False):
+    def download_pfns(
+        self,
+        items: list[dict[str, Any]],
+        num_threads: int = 2,
+        trace_custom_fields: Optional[dict[str, Any]] = None,
+        traces_copy_out: Optional[list[dict[str, Any]]] = None,
+        deactivate_file_download_exceptions: bool = False
+    ) -> list[dict[str, Any]]:
         """
         Download items with a given PFN. This function can only download files, no datasets.
 
@@ -202,6 +210,7 @@ class DownloadClient:
         :raises NotAllFilesDownloaded: if not all files could be downloaded
         :raises RucioException: if something unexpected went wrong during the download
         """
+        trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
         trace_custom_fields['uuid'] = generate_uuid()
 
@@ -250,8 +259,15 @@ class DownloadClient:
 
         return self._check_output(output_items, deactivate_file_download_exceptions=deactivate_file_download_exceptions)
 
-    def download_dids(self, items, num_threads=2, trace_custom_fields={}, traces_copy_out=None,
-                      deactivate_file_download_exceptions=False, sort=None):
+    def download_dids(
+        self,
+        items: list[dict[str, Any]],
+        num_threads: int = 2,
+        trace_custom_fields: Optional[dict[str, Any]] = None,
+        traces_copy_out: Optional[list[dict[str, Any]]] = None,
+        deactivate_file_download_exceptions: bool = False,
+        sort: Optional[str] = None
+    ) -> list[dict[str, Any]]:
         """
         Download items with given DIDs. This function can also download datasets and wildcarded DIDs.
 
@@ -286,6 +302,7 @@ class DownloadClient:
         :raises NotAllFilesDownloaded: if not all files could be downloaded
         :raises RucioException: if something unexpected went wrong during the download
         """
+        trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
         trace_custom_fields['uuid'] = generate_uuid()
 
@@ -304,7 +321,15 @@ class DownloadClient:
 
         return self._check_output(output_items, deactivate_file_download_exceptions=deactivate_file_download_exceptions)
 
-    def download_from_metalink_file(self, item, metalink_file_path, num_threads=2, trace_custom_fields={}, traces_copy_out=None, deactivate_file_download_exceptions=False):
+    def download_from_metalink_file(
+        self,
+        item: dict[str, Any],
+        metalink_file_path: str,
+        num_threads: int = 2,
+        trace_custom_fields: Optional[dict[str, Any]] = None,
+        traces_copy_out: Optional[list[dict[str, Any]]] = None,
+        deactivate_file_download_exceptions: bool = False
+    ) -> list[dict[str, Any]]:
         """
         Download items using a given metalink file.
 
@@ -327,6 +352,7 @@ class DownloadClient:
         :raises NotAllFilesDownloaded: if not all files could be downloaded
         :raises RucioException: if something unexpected went wrong during the download
         """
+        trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
 
         logger(logging.INFO, 'Getting sources from metalink file')
@@ -351,7 +377,13 @@ class DownloadClient:
 
         return self._check_output(output_items, deactivate_file_download_exceptions=deactivate_file_download_exceptions)
 
-    def _download_multithreaded(self, input_items, num_threads, trace_custom_fields={}, traces_copy_out=None):
+    def _download_multithreaded(
+        self,
+        input_items: list[dict[str, Any]],
+        num_threads: int,
+        trace_custom_fields: Optional[dict[str, Any]] = None,
+        traces_copy_out: Optional[list[dict[str, Any]]] = None
+    ) -> list[dict[str, Any]]:
         """
         Starts an appropriate number of threads to download items from the input list.
         (This function is meant to be used as class internal only)
@@ -363,6 +395,7 @@ class DownloadClient:
 
         :returns: list with output items as dictionaries
         """
+        trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
 
         num_files = len(input_items)
@@ -730,7 +763,14 @@ class DownloadClient:
 
         return item
 
-    def download_aria2c(self, items, trace_custom_fields={}, filters={}, deactivate_file_download_exceptions=False, sort=None):
+    def download_aria2c(
+        self,
+        items: list[dict[str, Any]],
+        trace_custom_fields: Optional[dict[str, Any]] = None,
+        filters: Optional[dict[str, Any]] = None,
+        deactivate_file_download_exceptions: bool = False,
+        sort: Optional[str] = None
+    ) -> list[dict[str, Any]]:
         """
         Uses aria2c to download the items with given DIDs. This function can also download datasets and wildcarded DIDs.
         It only can download files that are available via https/davs.
@@ -760,6 +800,8 @@ class DownloadClient:
         :raises NotAllFilesDownloaded: if not all files could be downloaded
         :raises RucioException: if something went wrong during the download (e.g. aria2c could not be started)
         """
+        trace_custom_fields = trace_custom_fields or {}
+        filters = filters or {}
         logger = self.logger
         trace_custom_fields['uuid'] = generate_uuid()
 
@@ -860,7 +902,13 @@ class DownloadClient:
             raise RucioException('Failed to initialise rpc proxy!', error)
         return (rpcproc, aria_rpc)
 
-    def _download_items_aria2c(self, items, aria_rpc, rpc_auth, trace_custom_fields={}):
+    def _download_items_aria2c(
+        self,
+        items: list[dict[str, Any]],
+        aria_rpc: Any,
+        rpc_auth: str,
+        trace_custom_fields: Optional[dict[str, Any]] = None
+    ) -> list[dict[str, Any]]:
         """
         Uses aria2c to download the given items. Aria2c needs to be started
         as RPC background process first and a RPC proxy is needed.
@@ -873,6 +921,7 @@ class DownloadClient:
 
         :returns: a list of dictionaries with an entry for each file, containing the input options, the did, and the clientState
         """
+        trace_custom_fields = trace_custom_fields or {}
         logger = self.logger
 
         gid_to_item = {}  # maps an aria2c download id (gid) to the download item

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/client/replicaclient.py

@@ -14,6 +14,7 @@
 
 from datetime import datetime
 from json import dumps, loads
+from typing import Any, Optional
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
@@ -233,7 +234,17 @@ class ReplicaClient(BaseClient):
         exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
         raise exc_cls(exc_msg)
 
-    def add_replica(self, rse, scope, name, bytes_, adler32, pfn=None, md5=None, meta={}):
+    def add_replica(
+        self,
+        rse: str,
+        scope: str,
+        name: str,
+        bytes_: int,
+        adler32: str,
+        pfn: Optional[str] = None,
+        md5: Optional[str] = None,
+        meta: Optional[dict[str, Any]] = None
+    ) -> bool:
         """
         Add file replicas to a RSE.
 
@@ -249,6 +260,7 @@ class ReplicaClient(BaseClient):
         :return: True if files were created successfully.
 
         """
+        meta = meta or {}
         dict_ = {'scope': scope, 'name': name, 'bytes': bytes_, 'meta': meta, 'adler32': adler32}
         if md5:
             dict_['md5'] = md5

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/common/pcache.py

@@ -529,7 +529,7 @@ class Pcache:
 
         # Execute original command, no further action
         if (not (self.dst.startswith(self.scratch_dir) and self.accept(self.src) and (not self.reject(self.src)))):
-            os.execvp(self.copy_util, self.args)
+            os.execvp(self.copy_util, self.args)  # noqa: S606
             os._exit(1)
 
         # XXXX todo:  fast-path - try to acquire lock
@@ -682,7 +682,7 @@ class Pcache:
             self.fail(103)
 
     def get_disk_usage(self):
-        p = os.popen("df -P %s | tail -1" % self.pcache_dir, 'r')
+        p = os.popen("df -P %s | tail -1" % self.pcache_dir, 'r')  # noqa: S605
         data = p.read()
         status = p.close()
         if status:
@@ -772,7 +772,7 @@ class Pcache:
             d = self.pcache_dir + d
             try:
                 os.rename(d, d + ts)
-                os.system("rm -rf %s &" % (d + ts))
+                os.system("rm -rf %s &" % (d + ts))  # noqa: S605
             except OSError as e:
                 if e.errno != errno.ENOENT:
                     self.log(ERROR, "%s: %s", d, e)

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/common/types.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 from collections.abc import Callable
+from datetime import datetime
 from typing import TYPE_CHECKING, Any, Literal, Optional, TypedDict, Union
 
 if TYPE_CHECKING:
@@ -191,3 +192,16 @@ class HopDict(TypedDict):
     dest_rse_id: str
     dest_scheme: "SUPPORTED_PROTOCOLS_LITERAL"
     dest_scheme_priority: int
+
+
+class TokenDict(TypedDict):
+    token: str
+    expires_at: datetime
+
+
+class TokenValidationDict(TypedDict):
+    account: Optional[InternalAccount]
+    identity: Optional[str]
+    lifetime: datetime
+    audience: Optional[str]
+    authz_scope: Optional[str]

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/common/utils.py

@@ -1245,7 +1245,7 @@ def detect_client_location():
             pass
 
     if not ip:
-        ip = '0.0.0.0'
+        ip = '0.0.0.0'  # noqa: S104
 
     site = os.environ.get('SITE_NAME',
                           os.environ.get('ATLAS_SITE_NAME',
@@ -1559,7 +1559,7 @@ def parse_replicas_from_file(path):
     """
     with open(path) as fp:
         try:
-            root = ElementTree.parse(fp).getroot()
+            root = ElementTree.parse(fp).getroot()  # noqa: S314
             return parse_replicas_metalink(root)
         except ElementTree.ParseError as xml_err:
             try:
@@ -1579,7 +1579,7 @@ def parse_replicas_from_string(string):
     :returns: a list with a dictionary for each file
     """
     try:
-        root = ElementTree.fromstring(string)
+        root = ElementTree.fromstring(string)  # noqa: S314
         return parse_replicas_metalink(root)
     except ElementTree.ParseError as xml_err:
         try:

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/rse/protocols/posix.py

@@ -74,7 +74,7 @@ class Default(protocol.RSEProtocol):
             try:  # To check if the error happened local or remote
                 with open(dest, 'wb'):
                     pass
-                call(['rm', '-rf', dest])
+                call(['rm', '-rf', dest])  # noqa: S607
             except OSError as e:
                 if e.errno == 2:
                     raise exception.DestinationNotAccessible(e)

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/rse/protocols/protocol.py

@@ -199,27 +199,6 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
 
         return '%s/%s/%s/%s' % (scope[0:7], scope[4:len(scope)], name.split('-')[0] + "-" + name.split('-')[1], name)
 
-    @staticmethod
-    def __lsst(scope, name, rse, rse_attrs, protocol_attrs):
-        """
-        LFN2PFN algorithm for Rubin-LSST in the ESCAPE project
-
-        Replace convention delimiter '__' by '/'
-        The Escape instance does use the 'generic' Rucio schema.
-
-        :param scope: Scope of the LFN (ignored)
-        :param name: File name of the LFN.
-        :param rse: RSE for PFN (ignored)
-        :param rse_attrs: RSE attributes for PFN (ignored)
-        :param protocol_attrs: RSE protocol attributes for PFN (ignored)
-        :returns: Path for use in the PFN generation.
-        """
-        del scope
-        del rse
-        del rse_attrs
-        del protocol_attrs
-        return name.replace('__', '/')
-
     @classmethod
     def _module_init_(cls):
         """
@@ -230,7 +209,6 @@ class RSEDeterministicTranslation(PolicyPackageAlgorithms):
         cls.register(cls.__ligo, "ligo")
         cls.register(cls.__belleii, "belleii")
         cls.register(cls.__xenon, "xenon")
-        cls.register(cls.__lsst, "lsst")
         policy_module = None
         try:
             policy_module = config.config_get('policy', 'lfn2pfn_module')

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/rse/protocols/srm.py

@@ -173,11 +173,11 @@ class Default(protocol.RSEProtocol):
         :raises RSEAccessDenied: Cannot connect.
         """
 
-        status, lcglscommand = getstatusoutput('which lcg-ls')
+        status, lcglscommand = getstatusoutput('which lcg-ls')  # noqa: S605, S607
         if status:
             raise exception.RSEAccessDenied('Cannot find lcg tools')
         endpoint_basepath = self.path2pfn(self.attributes['prefix'])
-        status, result = getstatusoutput('%s -vv $LCGVO -b --srm-timeout 60 -D srmv2 -l %s' % (lcglscommand, endpoint_basepath))
+        status, result = getstatusoutput('%s -vv $LCGVO -b --srm-timeout 60 -D srmv2 -l %s' % (lcglscommand, endpoint_basepath))  # noqa: S605
         if status:
             if result == '':
                 raise exception.RSEAccessDenied('Endpoint not reachable. lcg-ls failed with status code %s but no further details.' % (str(status)))

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/rse/protocols/storm.py

@@ -155,7 +155,7 @@ class Default(protocol.RSEProtocol):
             if rcode != 207:
                 rcode, etag_meta = davix_etag(pfn, 300)
 
-            p_output = minidom.parseString(etag_meta)
+            p_output = minidom.parseString(etag_meta)  # noqa: S318
             # we need to strip off the quotation marks and the <timestamp> from the etag
             # but since we can have multiple underscores, we have to rely on the uniqueness
             # of the full LFN to make the split

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/rse/protocols/webdav.py

@@ -16,7 +16,7 @@ import os
 import sys
 import xml.etree.ElementTree as ET
 from dataclasses import dataclass
-from typing import Optional
+from typing import Any, Optional
 from urllib.parse import urlparse
 
 import requests
@@ -133,7 +133,7 @@ class _PropfindResponse:
         """
 
         try:
-            xml = ET.fromstring(document)
+            xml = ET.fromstring(document)  # noqa: S314
         except ET.ParseError as ex:
             raise ValueError("Couldn't parse XML document") from ex
 
@@ -151,7 +151,7 @@ class Default(protocol.RSEProtocol):
 
     """ Implementing access to RSEs using the webDAV protocol."""
 
-    def connect(self, credentials={}):
+    def connect(self, credentials: Optional[dict[str, Any]] = None) -> None:
         """ Establishes the actual connection to the referred RSE.
 
             :param credentials: Provides information to establish a connection
@@ -160,6 +160,7 @@ class Default(protocol.RSEProtocol):
 
             :raises RSEAccessDenied
         """
+        credentials = credentials or {}
         try:
             parse_url = urlparse(self.path2pfn(''))
             self.server = f'{parse_url.scheme}://{parse_url.netloc}'
@@ -184,12 +185,15 @@ class Default(protocol.RSEProtocol):
                 # Trying to get the proxy from the default location
                 proxy_path = '/tmp/x509up_u%s' % os.geteuid()
                 if os.path.isfile(proxy_path):
-                    x509 = proxy_path
+                    self.cert = (proxy_path, proxy_path)
                 elif self.auth_token:
+                    # If no proxy is found, we set the cert to None and use the auth_token
+                    self.cert = None
                     pass
                 else:
                     raise exception.RSEAccessDenied('X509_USER_PROXY is not set')
-            self.cert = (x509, x509)
+            else:
+                self.cert = (x509, x509)
 
         try:
             self.timeout = credentials['timeout']
@@ -533,7 +537,7 @@ class Default(protocol.RSEProtocol):
         headers = {'Depth': '0'}
 
         try:
-            root = ET.fromstring(self.session.request('PROPFIND', endpoint_basepath, verify=False, headers=headers, cert=self.session.cert).text)
+            root = ET.fromstring(self.session.request('PROPFIND', endpoint_basepath, verify=False, headers=headers, cert=self.session.cert).text)  # noqa: S314
             usedsize = root[0][1][0].find('{DAV:}quota-used-bytes').text
             try:
                 unusedsize = root[0][1][0].find('{DAV:}quota-available-bytes').text

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio/vcsversion.py

@@ -4,8 +4,8 @@ This file is automatically generated; Do not edit it. :)
 '''
 VERSION_INFO = {
     'final': True,
-    'version': '34.3.0',
+    'version': '34.4.0',
     'branch_nick': 'release-34',
-    'revision_id': '7ad191f4183ca3cddfa4066c9fd251c45413fe3e',
-    'revno': 12833
+    'revision_id': 'e9aff7ed5dc1ba4c1085faa212d61a875d1adbd1',
+    'revno': 12859
 }

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/lib/rucio_clients.egg-info/SOURCES.txt

@@ -63,13 +63,11 @@ lib/rucio/common/utils.py
 lib/rucio/common/schema/__init__.py
 lib/rucio/common/schema/atlas.py
 lib/rucio/common/schema/belleii.py
-lib/rucio/common/schema/cms.py
 lib/rucio/common/schema/domatpc.py
 lib/rucio/common/schema/escape.py
 lib/rucio/common/schema/generic.py
 lib/rucio/common/schema/generic_multi_vo.py
 lib/rucio/common/schema/icecube.py
-lib/rucio/common/schema/lsst.py
 lib/rucio/rse/__init__.py
 lib/rucio/rse/rsemanager.py
 lib/rucio/rse/protocols/__init__.py
@@ -175,7 +173,6 @@ tests/test_rse_protocol_xrootd.py
 tests/test_rse_selector.py
 tests/test_rucio_server.py
 tests/test_rule.py
-tests/test_schema_cms.py
 tests/test_scope.py
 tests/test_subscription.py
 tests/test_throttler.py

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/pyproject.toml

@@ -42,6 +42,7 @@ exclude = [
 [tool.ruff.lint]
 select = [
     "I", # isort
+    "S", # bandit
     "UP", # pyupgrade
     "TID", # flake8-tidy-imports
 ]
@@ -55,6 +56,18 @@ ignore = [
     "UP030", # Use implicit references for positional format fields
     "UP031", # Use format specifiers instead of percent format
     "UP032", # Use f-string instead of `format` call
+    "S101",  # Pending https://github.com/rucio/rucio/issues/6680
+    "S105",  # Pending https://github.com/rucio/rucio/issues/6696
+    "S108",  # Pending https://github.com/rucio/rucio/issues/6655
+    "S110",  # Pending https://github.com/rucio/rucio/issues/6657
+    "S112",  # Pending https://github.com/rucio/rucio/issues/6657
+    "S113",  # Pending https://github.com/rucio/rucio/issues/6654
+    "S310",  # Pending https://github.com/astral-sh/ruff/issues/7918
+    "S324",  # Pending https://github.com/rucio/rucio/issues/6665
+    "S501",  # Pending https://github.com/rucio/rucio/issues/6656
+    "S602",  # Pending https://github.com/astral-sh/ruff/issues/4045
+    "S603",  # Pending https://github.com/astral-sh/ruff/issues/4045
+    "S608",  # Pending https://github.com/rucio/rucio/issues/6669
     "SIM210",
 ]
 
@@ -99,3 +112,21 @@ known-first-party = ["rucio"]
 "typing.Tuple".msg = "Use built-in type `tuple` instead."
 "typing.Type".msg = "Use built-in `type` instead."
 "typing.ValuesView".msg = "Use `collections.abc.ValuesView` instead."
+
+[tool.ruff.lint.per-file-ignores]
+'tests/*.py' = [
+    'S101', # Usage of assert
+    'S105', # Hardcoded password string
+    'S106', # Hardcoded password function argument
+    'S108', # Hardcoded temporary file
+    'S110', # try-except-pass
+    'S113', # Probable use of requests call without timeout
+    'S306', # Use of insecure and deprecated function
+    'S311', # Non-cryptographic random usage
+    'S324', # Probable use of insecure hash function
+    'S605', # Starting a process with a shell
+]
+
+'lib/rucio/db/sqla/migrate_repo/versions/*.py' = [
+    'S608'  # Hardcoded SQL expression
+]

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/tests/test_replica.py

@@ -1209,7 +1209,7 @@ def test_client_list_replicas_streaming_error(content_type, vo, did_client, repl
         assert metalink
         print(metalink)
         with pytest.raises(ElementTree.ParseError):
-            ElementTree.fromstring(metalink)
+            ElementTree.fromstring(metalink)  # noqa: S314
 
     elif content_type == Mime.JSON_STREAM:
         # for the json stream mimetype the API method just returns all mocked replicas on error

{rucio_clients-34.3.0 → rucio_clients-34.4.0}/tests/test_replica_recoverer.py

@@ -520,3 +520,76 @@ class TestReplicaRecoverer:
         assert (self.tmp_file11.name, self.rse4recovery_id, BadFilesStatus.BAD) not in bad_checklist
         assert (self.tmp_file12.name, self.rse4recovery_id, BadFilesStatus.BAD) not in bad_checklist
         assert (self.tmp_file13.name, self.rse4recovery_id, BadFilesStatus.BAD) not in bad_checklist
+
+
+@pytest.mark.parametrize(
+    "file_config_mock", [{"overrides": [
+        ("replicarecoverer", "rule_rse_expression", "type=SCRATCHDISK"),
+        ('replicarecoverer', 'use_file_metadata', 'False'),
+        ('replicarecoverer', 'did_name_expression', '^.*')]}],
+    indirect=True)
+def test_vo_agnostic_rules(file_config_mock, replica_client, rse_factory, scope_factory, file_factory, vo):
+    """
+    Runs only a single time, make sure it makes a new rule with this config.
+
+    Examining files without a datatype, but because the "use_file_metadata" is turned off,
+    files without a datatype can be acted on.
+    """
+    rse4suspicious, rse4suspicious_id = rse_factory.make_posix_rse(deterministic=True, vo=vo)
+    rse4recovery, rse4recovery_id = rse_factory.make_posix_rse(deterministic=True, vo=vo)
+
+    add_rse_attribute(rse4suspicious_id, "enable_suspicious_file_recovery", True)
+    add_rse_attribute(rse4recovery_id, "enable_suspicious_file_recovery", True)
+
+    # Create new scopes
+    _, [scope_declarebad] = scope_factory(vos=[vo])
+
+    tmp_file_delare_bad = file_factory.file_generator()
+
+    replicas_without_types = [{'scope': scope_declarebad, 'name': tmp_file_delare_bad.name, 'type': DIDType.FILE}]
+    for rse in [rse4suspicious, rse4recovery]:
+        cmd = f'rucio -v upload --rse {rse} --scope {scope_declarebad} {tmp_file_delare_bad}'
+        exitcode, _, _ = execute(cmd)
+        assert exitcode == 0
+
+    remove(tmp_file_delare_bad)
+    rse_expression_parser.REGION.invalidate()
+
+    update_replica_state(rse4recovery_id, scope_declarebad, tmp_file_delare_bad.name, ReplicaState.UNAVAILABLE)
+    replical_declare_bad = list(list_replicas(dids=replicas_without_types))
+
+    for replica in replical_declare_bad:
+        suspicious_pfns = replica['rses'][rse4suspicious_id]
+        for _ in range(3):
+            # The reason must contain the word "checksum", so that the replica can be declared bad.
+            replica_client.declare_suspicious_file_replicas([suspicious_pfns[0], ], 'checksum')
+            sleep(1)
+
+    recovery_policy = [{"action": "declare bad", "datatype": [str(tmp_file_delare_bad.name)], "scope": [str(scope_declarebad)]}]
+    recovery_policy_json = "/opt/rucio/etc/test_replica_recoverer_vo_agonistism.json"
+    json.dump(recovery_policy, open(recovery_policy_json, mode="w"))
+
+    try:
+        run(
+            once=True,
+            younger_than=1,
+            nattempts=2,
+            limit_suspicious_files_on_rse=2,
+            json_file_name=recovery_policy_json,
+            sleep_time=0,
+            active_mode=True
+        )
+    except KeyboardInterrupt:
+        stop()
+
+    # dids without types now have a different behavior
+
+    for replica in replicas_without_types:
+        # Files that are now acted on now the datatype can be found.
+        if replica['name'] == tmp_file_delare_bad.name:
+            # tmp_file11 should no longer be ignored.
+            assert not replica.get('states')
+
+    bad_replicas_list = list_bad_replicas_status(rse_id=rse4suspicious_id, vo=vo)
+    bad_checklist = [(badf['name'], badf['rse_id'], badf['state']) for badf in bad_replicas_list]
+    assert (tmp_file_delare_bad.name, rse4suspicious_id, BadFilesStatus.BAD) in bad_checklist