rucio 32.8.6__py3-none-any.whl → 35.8.0__py3-none-any.whl

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +19,7 @@ import re
 from configparser import NoOptionError, NoSectionError
 from functools import wraps
 from time import time
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Literal, Optional, TypeVar, Union
 
 import flask
 from flask.views import MethodView
@@ -28,30 +27,36 @@ from werkzeug.datastructures import Headers
 from werkzeug.exceptions import HTTPException
 from werkzeug.wrappers import Request, Response
 
-from rucio.api.authentication import validate_auth_token
 from rucio.common import config
-from rucio.common.exception import DatabaseException, RucioException, CannotAuthenticate, UnsupportedRequestedContentType
+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
 from rucio.core.vo import map_vo
+from rucio.gateway.authentication import validate_auth_token
+from rucio.gateway.identity import get_default_account, list_accounts_for_identity, verify_identity
 
 if TYPE_CHECKING:
-    from collections.abc import Callable, Iterable, Sequence
-    from typing import Optional, Union, Any
+    from collections.abc import Callable, Iterable
 
-    HeadersType = Union[Headers, dict[str, str], Sequence[tuple[str, str]]]
+    from _typeshed import SupportsIter
+    from _typeshed.wsgi import StartResponse, WSGIApplication, WSGIEnvironment
+    from flask.typing import ResponseReturnValue
 
+    from rucio.web.rest.flaskapi.v1.types import HeadersType
 
-class CORSMiddleware(object):
+ResponseTypeVar = TypeVar('ResponseTypeVar', bound=flask.wrappers.Response)
+
+
+class CORSMiddleware:
     """
     WebUI 2.0 makes preflight requests to the API, which are not handled by the API.
     This middleware intercepts the preflight OPTIONS requests and returns a 200 OK response.
     """
 
-    def __init__(self, app: flask.Flask) -> None:
+    def __init__(self, app: 'WSGIApplication') -> None:
         self.app = app
 
-    def __call__(self, environ: dict, start_response: 'Callable') -> 'Union[Response, Iterable[bytes]]':
+    def __call__(self, environ: 'WSGIEnvironment', start_response: 'StartResponse') -> 'Iterable[bytes]':
         request: Request = Request(environ)
 
         if request.environ.get('REQUEST_METHOD') == 'OPTIONS':
@@ -59,12 +64,12 @@ class CORSMiddleware(object):
                 webui_urls = config.config_get_list('webui', 'urls')
             except (NoOptionError, NoSectionError, RuntimeError) as error:
                 logging.exception('Could not get webui urls from config file')
-                return str(error), 500
+                return str(error), 500  # type: ignore (return type incompatible with Flask middleware)
             if request.origin in webui_urls:
                 response: Response = Response(status=200)
                 response.headers['Access-Control-Allow-Origin'] = request.origin
                 response.headers['Access-Control-Allow-Methods'] = 'GET, POST, PUT, DELETE, OPTIONS'
-                response.headers['Access-Control-Allow-Headers'] = '*'
+                response.headers['Access-Control-Allow-Headers'] = request.environ.get('HTTP_ACCESS_CONTROL_REQUEST_HEADERS')  # type: ignore (value could be None)
                 response.headers['Access-Control-Allow-Credentials'] = 'true'
                 return response(environ, start_response)
             response: Response = Response(status=403)
@@ -80,11 +85,11 @@ class ErrorHandlingMethodView(MethodView):
     Exceptions for all defined methods automatically.
     """
 
-    def get_headers(self) -> "Optional[HeadersType]":
+    def get_headers(self) -> Optional['HeadersType']:
         """Can be overridden to add headers to generic error responses."""
         return None
 
-    def dispatch_request(self, *args, **kwargs):
+    def dispatch_request(self, *args, **kwargs) -> Union['ResponseReturnValue', flask.wrappers.Response]:
         headers = self.get_headers() or None
         try:
             return super(ErrorHandlingMethodView, self).dispatch_request(*args, **kwargs)
@@ -108,7 +113,7 @@ class ErrorHandlingMethodView(MethodView):
                 return generate_http_error_flask(
                     status_code=500,
                     exc=error.__class__.__name__,
-                    exc_msg='An unknown Database Exception has ocurred.',
+                    exc_msg='An unknown Database Exception has occurred.',
                     headers=headers
                 )
 
@@ -132,7 +137,7 @@ class ErrorHandlingMethodView(MethodView):
                 return str(error), 500
 
 
-def request_auth_env():
+def request_auth_env() -> Optional['ResponseReturnValue']:
     if flask.request.environ.get('REQUEST_METHOD') == 'OPTIONS':
         return '', 200
 
@@ -155,9 +160,9 @@ def request_auth_env():
     flask.request.environ['start_time'] = time()
 
 
-def response_headers(response):
-    response.headers['Access-Control-Allow-Origin'] = flask.request.environ.get('HTTP_ORIGIN')
-    response.headers['Access-Control-Allow-Headers'] = flask.request.environ.get('HTTP_ACCESS_CONTROL_REQUEST_HEADERS')
+def response_headers(response: ResponseTypeVar) -> ResponseTypeVar:
+    response.headers['Access-Control-Allow-Origin'] = flask.request.environ.get('HTTP_ORIGIN')  # type: ignore (value could be None)
+    response.headers['Access-Control-Allow-Headers'] = flask.request.environ.get('HTTP_ACCESS_CONTROL_REQUEST_HEADERS')  # type: ignore (value could be None)
     response.headers['Access-Control-Allow-Methods'] = '*'
     response.headers['Access-Control-Allow-Credentials'] = 'true'
 
@@ -169,7 +174,7 @@ def response_headers(response):
     return response
 
 
-def check_accept_header_wrapper_flask(supported_content_types):
+def check_accept_header_wrapper_flask(supported_content_types: 'Iterable[str]'):
     """ Decorator to check if an endpoint supports the requested content type. """
 
     def wrapper(f):
@@ -195,7 +200,7 @@ def check_accept_header_wrapper_flask(supported_content_types):
     return wrapper
 
 
-def parse_scope_name(scope_name, vo):
+def parse_scope_name(scope_name: str, vo: Optional[str]) -> tuple[str, ...]:
     """
     Parses the given scope_name according to the schema's
     SCOPE_NAME_REGEXP and returns a (scope, name) tuple.
@@ -205,14 +210,20 @@ def parse_scope_name(scope_name, vo):
     :raises ValueError: when scope_name could not be parsed.
     :returns: a (scope, name) tuple.
     """
+    if not vo:
+        vo = 'def'
+
     # why again does that regex start with a slash?
-    scope_name = re.match(get_schema_value('SCOPE_NAME_REGEXP', vo), '/' + scope_name)
-    if scope_name is None:
+    scope_regex = re.match(get_schema_value('SCOPE_NAME_REGEXP', vo), '/' + scope_name)
+    if scope_regex is None:
         raise ValueError('cannot parse scope and name')
-    return scope_name.group(1, 2)
+    return scope_regex.group(1, 2)
 
 
-def try_stream(generator, content_type=None) -> "flask.Response":
+def try_stream(
+        generator: 'SupportsIter',
+        content_type: Optional[str] = None
+) -> flask.Response:
     """
     Peeks at the first element of the passed generator and raises
     an error, if yielding raises. Otherwise returns
@@ -234,15 +245,12 @@ def try_stream(generator, content_type=None) -> "flask.Response":
         return flask.Response('', content_type=content_type)
 
 
-def error_headers(exc_cls: str, exc_msg):
-    def strip_newlines(msg):
-        if msg is None:
-            return None
-
+def error_headers(exc_cls: str, exc_msg: str) -> dict[str, str]:
+    def strip_newlines(msg: str) -> str:
         return msg.replace('\n', ' ').replace('\r', ' ')
 
-    exc_msg = strip_newlines(exc_msg)
     if exc_msg:
+        exc_msg = strip_newlines(exc_msg)
         # Truncate too long exc_msg
         oldlen = len(exc_msg)
         exc_msg = exc_msg[:min(oldlen, 125)]
@@ -254,7 +262,7 @@ def error_headers(exc_cls: str, exc_msg):
     }
 
 
-def _error_response(exc_cls, exc_msg):
+def _error_response(exc_cls: str, exc_msg: str) -> tuple[dict[str, str], dict[str, str]]:
     data = {'ExceptionClass': exc_cls,
             'ExceptionMessage': exc_msg}
     headers = {'Content-Type': 'application/octet-stream'}
@@ -263,12 +271,12 @@ def _error_response(exc_cls, exc_msg):
 
 
 def generate_http_error_flask(
-        status_code: "int",
-        exc: "Union[str, BaseException]",
-        exc_msg: "Optional[str]" = None,
-        headers: "Optional[HeadersType]" = None,
+        status_code: int,
+        exc: Union[str, BaseException],
+        exc_msg: Optional[str] = None,
+        headers: Optional['HeadersType'] = None,
 ) -> "flask.Response":
-    """Utitily function to generate a complete HTTP error response.
+    """Utility function to generate a complete HTTP error response.
 
     :param status_code: The HTTP status code to generate a response for.
     :param exc: The name of the exception class or a RucioException object.
@@ -322,13 +330,13 @@ def json_list(json_loads: "Callable[[str], Any]" = json.loads, optional: bool =
 
 
 def json_parse(types: tuple, json_loads: "Callable[[str], Any]" = json.loads, **kwargs):
-    def clstostr(cls):
+    def clstostr(cls) -> str:
         if cls.__name__ == "dict":
             return "dictionary"
         else:
             return cls.__name__
 
-    def typestostr(_types: tuple):
+    def typestostr(_types: tuple) -> str:
         return " or ".join(map(clstostr, _types))
 
     data = flask.request.get_data(as_text=True)
@@ -355,7 +363,7 @@ def json_parse(types: tuple, json_loads: "Callable[[str], Any]" = json.loads, **
         )
 
 
-def param_get(parameters: dict, name: str, **kwargs):
+def param_get(parameters: dict[str, Any], name: str, **kwargs) -> Any:
     if 'default' in kwargs:
         return parameters.get(name, kwargs['default'])
     else:
@@ -370,7 +378,7 @@ def param_get(parameters: dict, name: str, **kwargs):
         return parameters[name]
 
 
-def extract_vo(headers: "HeadersType") -> "str":
+def extract_vo(headers: Headers) -> str:
     """ Extract the VO name from the given request.headers object and
         does any name mapping. Returns the short VO name or raise a
         flask.abort if the VO name doesn't meet the name specification.
@@ -383,3 +391,36 @@ def extract_vo(headers: "HeadersType") -> "str":
     except RucioException as err:
         # VO Name doesn't match allowed spec
         flask.abort(generate_http_error_flask(status_code=400, exc=err))
+
+
+def get_account_from_verified_identity(
+        identity_key: str,
+        id_type: Literal["USERPASS", "X509"],
+        password: Optional[str] = None
+) -> list[str]:
+    """ Verifies the provided identity and tries to return a matching account.
+        If no account is found, raises an IdentityError after trying to verify the identity.
+        If multiple accounts are found, returns the default account if available, otherwise all accounts.
+    :param identity_key: The identity key name. For example x509 DN, or a username.
+    :param id_type: The type of the authentication (x509, USERPASS).
+    :param password: required only if id_type==USERPASS.
+    :raises IdentityError: if no account is found for the identity or if the identity could not be verified.
+    :returns: a list of account names.
+    """
+    accounts = list_accounts_for_identity(identity_key=identity_key, id_type=id_type)
+    if accounts is None or len(accounts) == 0:
+        if id_type == 'USERPASS':
+            verify_identity(identity_key=identity_key, id_type=id_type, password=password)
+        elif id_type == 'X509':
+            verify_identity(identity_key=identity_key, id_type=id_type)
+        else:
+            raise IdentityError('No account found for identity')
+    if len(accounts) > 1:
+        try:
+            default_account = get_default_account(identity_key=identity_key, id_type=id_type)
+            return [default_account]
+        except IdentityError:
+            return accounts
+    else:
+        account = accounts[0]
+        return [account]

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,13 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from flask import Flask, request as request, jsonify
+from flask import Flask, jsonify
+from flask import request as request
 
-from rucio.api import config
-from rucio.common.exception import ConfigurationError, AccessDenied, ConfigNotFound
+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 response_headers, check_accept_header_wrapper_flask, \
-    generate_http_error_flask, ErrorHandlingMethodView, json_parameters
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_parameters, response_headers
 
 
 class Config(ErrorHandlingMethodView):

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,15 +17,15 @@ from typing import TYPE_CHECKING
 from flask import Flask, request
 from werkzeug.datastructures import Headers
 
-from rucio.api.credential import get_signed_url
 from rucio.common.exception import CannotAuthenticate
+from rucio.gateway.credential import get_signed_url
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import check_accept_header_wrapper_flask, extract_vo, \
-    generate_http_error_flask, ErrorHandlingMethodView, response_headers
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, extract_vo, generate_http_error_flask, response_headers
 
 if TYPE_CHECKING:
     from typing import Optional
-    from rucio.web.rest.flaskapi.v1.common import HeadersType
+
+    from rucio.web.rest.flaskapi.v1.types import HeadersType
 
 
 class SignURL(ErrorHandlingMethodView):
@@ -61,7 +60,7 @@ class SignURL(ErrorHandlingMethodView):
               Access-Control-Allow-Headers:
                 schema:
                   type: string
-                description: The http access controll request headers.
+                description: The http access control request headers.
               Access-Control-Allow-Methods:
                 schema:
                   type: string
@@ -76,7 +75,7 @@ class SignURL(ErrorHandlingMethodView):
                 schema:
                   type: string
                   enum: ['X-Rucio-Auth-Token']
-                description: The exposed access controll header.
+                description: The exposed access control header.
           404:
             description: Not found
         """
@@ -117,7 +116,7 @@ class SignURL(ErrorHandlingMethodView):
           required: false
         - name: url
           in: query
-          description: The Url of the authentification.
+          description: The Url of the authentication.
           schema:
             type: string
           required: true

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

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Copyright European Organization for Nuclear Research (CERN) since 2012
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,20 +17,61 @@ from json import dumps
 
 from flask import Flask, Response, request
 
-from rucio.api.did import add_did, add_dids, list_content, list_content_history, list_dids, \
-    list_files, scope_list, get_did, set_metadata, get_metadata, get_metadata_bulk, set_status, attach_dids, \
-    detach_dids, attach_dids_to_dids, get_dataset_by_guid, list_parent_dids, create_did_sample, list_new_dids, \
-    resurrect, get_users_following_did, remove_did_from_followed, add_did_to_followed, delete_metadata, \
-    set_metadata_bulk, set_dids_metadata_bulk
-from rucio.api.rule import list_replication_rules, list_associated_replication_rules_for_file
-from rucio.common.exception import ScopeNotFound, DatabaseException, DataIdentifierNotFound, DataIdentifierAlreadyExists, \
-    DuplicateContent, AccessDenied, KeyNotFound, Duplicate, InvalidValueForKey, UnsupportedStatus, \
-    UnsupportedOperation, RSENotFound, RuleNotFound, InvalidMetadata, InvalidPath, FileAlreadyExists, InvalidObject, FileConsistencyMismatch
-from rucio.common.utils import render_json, APIEncoder
+from rucio.common.exception import (
+    AccessDenied,
+    DatabaseException,
+    DataIdentifierAlreadyExists,
+    DataIdentifierNotFound,
+    Duplicate,
+    DuplicateContent,
+    FileAlreadyExists,
+    FileConsistencyMismatch,
+    InvalidMetadata,
+    InvalidObject,
+    InvalidPath,
+    InvalidValueForKey,
+    KeyNotFound,
+    RSENotFound,
+    RuleNotFound,
+    ScopeNotFound,
+    UnsupportedMetadataPlugin,
+    UnsupportedOperation,
+    UnsupportedStatus,
+)
+from rucio.common.utils import APIEncoder, parse_response, render_json
 from rucio.db.sqla.constants import DIDType
+from rucio.gateway.did import (
+    add_did,
+    add_did_to_followed,
+    add_dids,
+    attach_dids,
+    attach_dids_to_dids,
+    bulk_list_files,
+    create_did_sample,
+    delete_metadata,
+    detach_dids,
+    get_dataset_by_guid,
+    get_did,
+    get_metadata,
+    get_metadata_bulk,
+    get_users_following_did,
+    list_content,
+    list_content_history,
+    list_dids,
+    list_files,
+    list_new_dids,
+    list_parent_dids,
+    remove_did_from_followed,
+    resurrect,
+    scope_list,
+    set_dids_metadata_bulk,
+    set_metadata,
+    set_metadata_bulk,
+    set_status,
+)
+from rucio.gateway.rule import list_associated_replication_rules_for_file, list_replication_rules
 from rucio.web.rest.flaskapi.authenticated_bp import AuthenticatedBlueprint
-from rucio.web.rest.flaskapi.v1.common import response_headers, check_accept_header_wrapper_flask, \
-    parse_scope_name, try_stream, generate_http_error_flask, ErrorHandlingMethodView, json_parameters, json_list, param_get, json_parse
+from rucio.web.rest.flaskapi.v1.common import ErrorHandlingMethodView, check_accept_header_wrapper_flask, generate_http_error_flask, json_list, json_parameters, json_parse, param_get, parse_scope_name, response_headers, try_stream
 
 
 class Scope(ErrorHandlingMethodView):
@@ -69,7 +109,7 @@ class Scope(ErrorHandlingMethodView):
             content:
               application/x-json-stream:
                 schema:
-                  description: Line seperated dictionary of dids.
+                  description: Line separated dictionary of dids.
                   type: array
                   items:
                     type: object
@@ -220,7 +260,7 @@ class Search(ErrorHandlingMethodView):
         if filters is not None:
             filters = ast.literal_eval(filters)
         else:
-            # backwards compatability for created*, length* and name filters passed through as request args
+            # backwards compatibility for created*, length* and name filters passed through as request args
             filters = {}
             for arg, value in request.args.copy().items():
                 if arg not in ['type', 'limit', 'long', 'recursive']:
@@ -414,10 +454,11 @@ class Attachments(ErrorHandlingMethodView):
         if isinstance(parameters, list):
             attachments = parameters
             ignore_duplicate = False
-        else:
-            assert isinstance(parameters, dict)
+        elif isinstance(parameters, dict):
             attachments = param_get(parameters, 'attachments')
             ignore_duplicate = param_get(parameters, 'ignore_duplicate', default=False)
+        else:
+            return generate_http_error_flask(406, exc="Invalid attachment format.")
 
         try:
             attach_dids_to_dids(attachments=attachments, ignore_duplicate=ignore_duplicate, issuer=request.environ.get('issuer'), vo=request.environ.get('vo'))
@@ -742,7 +783,7 @@ class Attachment(ErrorHandlingMethodView):
             content:
               application/x-json-stream:
                 schema:
-                  description: The contents of a did. Items are line seperated.
+                  description: The contents of a did. Items are line separated.
                   type: array
                   items:
                     type: object
@@ -955,7 +996,7 @@ class AttachmentHistory(ErrorHandlingMethodView):
             content:
               application/x-json-stream:
                 schema:
-                  description: The dids with their information and history. Elements are seperated by new line characters.
+                  description: The dids with their information and history. Elements are separated by new line characters.
                   type: array
                   items:
                     type: object
@@ -1063,7 +1104,7 @@ class Files(ErrorHandlingMethodView):
                             description: The adler32 checksum.
                             type: string
                           lumiblocknr:
-                            description: The lumi block nr. Only availabe if `long` is defined in the query.
+                            description: The lumi block nr. Only available if `long` is defined in the query.
                             type: integer
                     - description: All replica information.
                       type: array
@@ -1111,6 +1152,86 @@ class Files(ErrorHandlingMethodView):
             return generate_http_error_flask(404, error)
 
 
+class BulkFiles(ErrorHandlingMethodView):
+
+    @check_accept_header_wrapper_flask(['application/x-json-stream'])
+    def post(self):
+        """
+        ---
+        summary: List files bulk
+        description: List files in multiple dids
+        tags:
+          - Data Identifiers
+        requestBody:
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  description: One did to list files.
+                  type: object
+                  required:
+                    - scope
+                    - name
+                  properties:
+                    scope:
+                      description: The did scope.
+                      type: string
+                    name:
+                      description: The did name.
+                      type: string
+        responses:
+          201:
+            description: OK
+            content:
+              application/x-json-stream:
+                schema:
+                  description: All collections file content.
+                  type: array
+                  items:
+                    description: Collections file content.
+                    type: object
+                    properties:
+                      parent_scope:
+                        description: The scope of the parent did.
+                        type: string
+                      parent_name:
+                        description: The name of the parent did.
+                        type: string
+                      scope:
+                        description: The scope of the did.
+                        type: string
+                      name:
+                        description: The name of the did.
+                        type: string
+                      bytes:
+                        description: The size of the did in bytes.
+                        type: integer
+                      guid:
+                        description: The guid of the did.
+                        type: string
+                      events:
+                        description: The number of events of the did.
+                        type: integer
+                      adler32:
+                        description: The adler32 checksum.
+                        type: string
+          401:
+            description: Invalid Auth Token
+        """
+        parameters = json_parameters(parse_response)
+        dids = param_get(parameters, 'dids', default=[])
+        try:
+            def generate(vo):
+                for did in bulk_list_files(dids=dids, vo=vo):
+                    yield render_json(**did) + '\n'
+
+            return try_stream(generate(vo=request.environ.get('vo')))
+        except AccessDenied as error:
+            return generate_http_error_flask(401, error)
+        return 'Created', 201
+
+
 class Parents(ErrorHandlingMethodView):
 
     @check_accept_header_wrapper_flask(['application/x-json-stream'])
@@ -1199,8 +1320,10 @@ class Meta(ErrorHandlingMethodView):
             content:
               application/json:
                 schema:
-                  description: A data identifer with all attributes.
+                  description: A data identifier with all attributes.
                   type: object
+          400:
+            description: Bad Request - Invalid metadata plugin specified
           401:
             description: Invalid Auth Token
           404:
@@ -1219,6 +1342,8 @@ class Meta(ErrorHandlingMethodView):
             return Response(render_json(**meta), content_type='application/json')
         except DataIdentifierNotFound as error:
             return generate_http_error_flask(404, error)
+        except UnsupportedMetadataPlugin as error:
+            return generate_http_error_flask(400, error)
 
     def post(self, scope_name):
         """
@@ -1243,7 +1368,7 @@ class Meta(ErrorHandlingMethodView):
                 - meta
                 properties:
                   meta:
-                    description: The metadata to add. A dictionary containg the metadata name as key and the value as value.
+                    description: The metadata to add. A dictionary containing the metadata name as key and the value as value.
                     type: object
                   recursive:
                     description: Flag if the metadata should be applied recirsively to children.
@@ -1390,7 +1515,7 @@ class SingleMeta(ErrorHandlingMethodView):
           406:
             description: Not acceptable
           409:
-            description: Matadata already exists
+            description: Metadata already exists
           400:
             description: Invalid key or value
         """
@@ -1526,6 +1651,7 @@ class Rules(ErrorHandlingMethodView):
             scope, name = parse_scope_name(scope_name, request.environ.get('vo'))
 
             def generate(vo):
+                get_did(scope=scope, name=name, vo=vo)
                 for rule in list_replication_rules({'scope': scope, 'name': name}, vo=vo):
                     yield dumps(rule, cls=APIEncoder) + '\n'
 
@@ -1534,6 +1660,8 @@ class Rules(ErrorHandlingMethodView):
             return generate_http_error_flask(400, error)
         except RuleNotFound as error:
             return generate_http_error_flask(404, error)
+        except DataIdentifierNotFound as error:
+            return generate_http_error_flask(404, error)
 
 
 class BulkMeta(ErrorHandlingMethodView):
@@ -1577,7 +1705,7 @@ class BulkMeta(ErrorHandlingMethodView):
             content:
               application/json:
                 schema:
-                  description: A list of metadata identifiers for the dids. Seperated by new lines.
+                  description: A list of metadata identifiers for the dids. Separated by new lines.
                   type: array
                   items:
                     description: The metadata for one did.
@@ -1613,7 +1741,7 @@ class AssociatedRules(ErrorHandlingMethodView):
     def get(self, scope_name):
         """
         ---
-        summary: Get accociated rules
+        summary: Get associated rules
         description: Gets all associated rules for a file.
         tags:
           - Data Identifiers
@@ -1630,7 +1758,7 @@ class AssociatedRules(ErrorHandlingMethodView):
             content:
               application/x-json-stream:
                 schema:
-                  description: All associated rules for a file. Items are seperated by new line character.
+                  description: All associated rules for a file. Items are separated by new line character.
                   type: array
                   items:
                     description: A replication rule associated with the file. Has more fields than listed here.
@@ -1701,7 +1829,7 @@ class GUIDLookup(ErrorHandlingMethodView):
             content:
               application/x-json-stream:
                 schema:
-                  description: A list of all datasets associated with the guid. Items are seperated by new line character.
+                  description: A list of all datasets associated with the guid. Items are separated by new line character.
                   type: array
                   items:
                     description: A dataset associated with a guid.
@@ -1905,7 +2033,7 @@ class NewDIDs(ErrorHandlingMethodView):
             content:
               application/x-json-stream:
                 schema:
-                  description: A list of the recent dids. Items are seperated by new line characters.
+                  description: A list of the recent dids. Items are separated by new line characters.
                   type: array
                   items:
                     description: A did.
@@ -2192,6 +2320,8 @@ def blueprint():
     bp.add_url_rule('/resurrect', view_func=resurrect_view, methods=['post', ])
     bulkmeta_view = BulkMeta.as_view('bulkmeta')
     bp.add_url_rule('/bulkmeta', view_func=bulkmeta_view, methods=['post', ])
+    files_view = BulkFiles.as_view('bulkfiles')
+    bp.add_url_rule('/bulkfiles', view_func=files_view, methods=['post', ])
 
     bp.after_request(response_headers)
     return bp