remove cors (#887)

Author: zubenkoivan

charts/platform-registry/templates/deployment.yml

@@ -72,10 +72,6 @@ spec:
           value: {{ .Values.upstreamRegistry.maxCatalogEntries | quote }}
         - name: NP_CLUSTER_NAME
           value: {{ .Values.platform.clusterName }}
-        {{- if .Values.cors.origins }}
-        - name: NP_CORS_ORIGINS
-          value: {{ .Values.cors.origins | join ","  | quote }}
-        {{- end }}
         {{- if eq .Values.upstreamRegistry.type "basic" }}
         - name: NP_REGISTRY_UPSTREAM_BASIC_USERNAME
 {{- if .Values.upstreamRegistry.basicUsername }}

charts/platform-registry/values-dev.yaml

@@ -35,10 +35,6 @@ service:
     traefik.ingress.kubernetes.io/service.sticky.cookie: "true"
     traefik.ingress.kubernetes.io/service.sticky.cookie.name: NEURO_REGISTRYAPI_SESSION
 
-cors:
-  origins:
-  - '*'
-
 sentry:
   dsn: https://432bc48cd2444be7afec5efeb1fc03a6@o489136.ingest.sentry.io/5530426
   clusterName: dev

charts/platform-registry/values.yaml

@@ -36,10 +36,6 @@ ingress:
   hosts: []
   annotations: {}
 
-cors:
-  origins:
-  - 'https://app.neu.ro'
-
 service:
   annotations: {}
 

platform_registry_api/api.py

@@ -12,7 +12,6 @@
 
 import aiobotocore.session
 import aiohttp.web
-import aiohttp_cors
 import aiohttp_remotes
 import botocore.exceptions
 import pkg_resources
@@ -38,7 +37,6 @@
     Response,
     StreamResponse,
 )
-from aiohttp_cors import CorsConfig
 from aiohttp_security import check_authorized, check_permission
 from multidict import CIMultiDict, CIMultiDictProxy
 from neuro_auth_client import AuthClient, Permission, User
@@ -61,7 +59,6 @@
 from .basic import BasicUpstream
 from .config import (
     Config,
-    CORSConfig,
     EnvironConfigFactory,
     UpstreamRegistryConfig,
     UpstreamType,
@@ -240,7 +237,7 @@ def _registry_client(self) -> aiohttp.ClientSession:
     def _upstream(self) -> Upstream:
         return self._app["upstream"]
 
-    def register(self, app: aiohttp.web.Application, cors: CorsConfig) -> None:
+    def register(self, app: aiohttp.web.Application) -> None:
         app.add_routes(
             (
                 aiohttp.web.get("/", self.handle_version_check),
@@ -263,9 +260,6 @@ def register(self, app: aiohttp.web.Application, cors: CorsConfig) -> None:
                 METH_PUT,
             )
         )
-        for route in app.router.routes():
-            logger.debug(f"Setting up CORS for {route}")
-            cors.add(route)
 
     def _create_url_factory(self, request: Request) -> URLFactory:
         return URLFactory.from_config(
@@ -932,29 +926,11 @@ def make_tracing_trace_configs(config: Config) -> list[aiohttp.TraceConfig]:
     return trace_configs
 
 
-def _setup_cors(app: aiohttp.web.Application, config: CORSConfig) -> CorsConfig:
-    if not config.allowed_origins:
-        return aiohttp_cors.setup(app)
-
-    logger.info(f"Setting up CORS with allowed origins: {config.allowed_origins}")
-    default_options = aiohttp_cors.ResourceOptions(
-        allow_credentials=True,
-        expose_headers="*",
-        allow_headers="*",
-    )
-    cors = aiohttp_cors.setup(
-        app, defaults={origin: default_options for origin in config.allowed_origins}
-    )
-    return cors
-
-
 async def create_app(config: Config) -> aiohttp.web.Application:
     app = aiohttp.web.Application()
 
     await aiohttp_remotes.setup(app, aiohttp_remotes.XForwardedRelaxed())
 
-    cors = _setup_cors(app, config.cors)
-
     async def _init_app(app: aiohttp.web.Application) -> AsyncIterator[None]:
         async with AsyncExitStack() as exit_stack:
 
@@ -1016,7 +992,7 @@ async def on_request_redirect(
 
     v2_app = aiohttp.web.Application()
     v2_handler = V2Handler(app=v2_app, config=config)
-    v2_handler.register(v2_app, cors)
+    v2_handler.register(v2_app)
 
     app["v2_app"] = v2_app
     app.add_subapp("/v2", v2_app)

platform_registry_api/config.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import os
-from collections.abc import Sequence
 from dataclasses import dataclass, field
 from enum import Enum
 from typing import Any
@@ -76,17 +75,11 @@ class SentryConfig:
     sample_rate: float = 0
 
 
-@dataclass(frozen=True)
-class CORSConfig:
-    allowed_origins: Sequence[str] = ()
-
-
 @dataclass(frozen=True)
 class Config:
     server: ServerConfig
     upstream_registry: UpstreamRegistryConfig
     auth: AuthConfig
-    cors: CORSConfig
     cluster_name: str
     zipkin: ZipkinConfig | None = None
     sentry: SentryConfig | None = None
@@ -165,13 +158,6 @@ def create_auth(self) -> AuthConfig:
         token = self._environ["NP_REGISTRY_AUTH_TOKEN"]
         return AuthConfig(server_endpoint_url=url, service_token=token)
 
-    def create_cors(self) -> CORSConfig:
-        origins: Sequence[str] = CORSConfig.allowed_origins
-        origins_str = self._environ.get("NP_CORS_ORIGINS", "").strip()
-        if origins_str:
-            origins = origins_str.split(",")
-        return CORSConfig(allowed_origins=origins)
-
     def create_zipkin(self) -> ZipkinConfig | None:
         if "NP_ZIPKIN_URL" not in self._environ:
             return None
@@ -200,7 +186,6 @@ def create(self) -> Config:
         server_config = self.create_server()
         upstream_registry_config = self.create_upstream_registry()
         auth_config = self.create_auth()
-        cors_config = self.create_cors()
         zipkin_config = self.create_zipkin()
         sentry_config = self.create_sentry()
         cluster_name = self._environ["NP_CLUSTER_NAME"]
@@ -209,7 +194,6 @@ def create(self) -> Config:
             server=server_config,
             upstream_registry=upstream_registry_config,
             auth=auth_config,
-            cors=cors_config,
             cluster_name=cluster_name,
             zipkin=zipkin_config,
             sentry=sentry_config,

setup.cfg

@@ -17,7 +17,6 @@ platforms = any
 install_requires =
     aiodns==3.2.0
     aiohttp==3.8.6
-    aiohttp-cors==0.7.0
     aiohttp-remotes==1.2.0
     cchardet==2.1.7
     iso8601==2.1.0
@@ -88,9 +87,6 @@ ignore_missing_imports = true
 [mypy-aiohttp_security]
 ignore_missing_imports = true
 
-[mypy-aiohttp_cors]
-ignore_missing_imports = true
-
 [mypy-neuro_auth_client]
 ignore_missing_imports = true
 

tests/integration/test_api.py

@@ -7,7 +7,6 @@
 from platform_registry_api.config import (
     AuthConfig,
     Config,
-    CORSConfig,
     ServerConfig,
     UpstreamRegistryConfig,
 )
@@ -28,12 +27,10 @@ def config(admin_token: str, cluster_name: str) -> Config:
     auth = AuthConfig(
         server_endpoint_url=URL("http://localhost:5003"), service_token=admin_token
     )
-    cors = CORSConfig()
     return Config(
         server=ServerConfig(),
         upstream_registry=upstream_registry,
         auth=auth,
-        cors=cors,
         cluster_name=cluster_name,
     )
 

tests/integration/test_basic.py

@@ -23,7 +23,6 @@
 from platform_registry_api.config import (
     AuthConfig,
     Config,
-    CORSConfig,
     ServerConfig,
     UpstreamRegistryConfig,
     UpstreamType,
@@ -198,7 +197,6 @@ def config(upstream: URL, auth_config: AuthConfig, project: str) -> Config:
         server=ServerConfig(),
         upstream_registry=upstream_registry,
         auth=auth_config,
-        cors=CORSConfig(),
         cluster_name="test-cluster",
     )
 

tests/unit/test_config.py

@@ -3,7 +3,6 @@
 from platform_registry_api.config import (
     AuthConfig,
     Config,
-    CORSConfig,
     EnvironConfigFactory,
     SentryConfig,
     ServerConfig,
@@ -45,7 +44,6 @@ def test_defaults_oauth(self) -> None:
                 server_endpoint_url=None,
                 service_token="test_auth_token",
             ),
-            cors=CORSConfig(),
             cluster_name="test-cluster",
         )
         assert config.upstream_registry.is_oauth
@@ -89,7 +87,6 @@ def test_oauth(self) -> None:
                 server_endpoint_url=URL("https://test_auth"),
                 service_token="test_auth_token",
             ),
-            cors=CORSConfig(),
             cluster_name="test-cluster",
             zipkin=ZipkinConfig(URL("http://zipkin.io:9411/")),
             sentry=SentryConfig(dsn=URL("https://sentry"), cluster_name="test"),
@@ -119,7 +116,6 @@ def test_aws_ecr(self) -> None:
                 server_endpoint_url=URL("https://test_auth"),
                 service_token="test_auth_token",
             ),
-            cors=CORSConfig(),
             cluster_name="test-cluster",
         )
         assert not config.upstream_registry.is_oauth
@@ -147,7 +143,6 @@ def test_defaults_basic(self) -> None:
                 server_endpoint_url=URL("https://test_auth"),
                 service_token="test_auth_token",
             ),
-            cors=CORSConfig(),
             cluster_name="test-cluster",
         )
         assert config.upstream_registry.is_basic
@@ -180,7 +175,6 @@ def test_basic(self) -> None:
                 server_endpoint_url=URL("https://test_auth"),
                 service_token="test_auth_token",
             ),
-            cors=CORSConfig(),
             cluster_name="test-cluster",
         )
         assert config.upstream_registry.is_basic
@@ -214,13 +208,6 @@ def test_create_sentry_none(self) -> None:
 
         assert result is None
 
-    def test_create_cors_custom(self) -> None:
-        env = {"NP_CORS_ORIGINS": "https://domain1.com,http://do.main"}
-
-        result = EnvironConfigFactory(env).create_cors()
-
-        assert result == CORSConfig(["https://domain1.com", "http://do.main"])
-
     def test_create_sentry_default(self) -> None:
         env = {
             "NP_SENTRY_DSN": "https://sentry",