move RAC to open source

goauthentik · Feb 13, 2025 · 2088aa5 · 2088aa5
1 parent 82d4e8a
commit 2088aa5
Show file tree

Hide file tree

Showing 38 changed files with 48 additions and 48 deletions.
diff --git a/authentik/blueprints/v1/importer.py b/authentik/blueprints/v1/importer.py
@@ -50,7 +50,6 @@
     MicrosoftEntraProviderGroup,
     MicrosoftEntraProviderUser,
 )
-from authentik.enterprise.providers.rac.models import ConnectionToken
 from authentik.enterprise.providers.ssf.models import StreamEvent
 from authentik.enterprise.stages.authenticator_endpoint_gdtc.models import (
     EndpointDevice,
@@ -72,6 +71,7 @@
     DeviceToken,
     RefreshToken,
 )
+from authentik.providers.rac.models import ConnectionToken
 from authentik.providers.scim.models import SCIMProviderGroup, SCIMProviderUser
 from authentik.rbac.models import Role
 from authentik.sources.scim.models import SCIMSourceGroup, SCIMSourceUser

diff --git a/authentik/enterprise/providers/rac/apps.py b/authentik/enterprise/providers/rac/apps.py
diff --git a/authentik/enterprise/settings.py b/authentik/enterprise/settings.py
@@ -16,7 +16,6 @@
     "authentik.enterprise.audit",
     "authentik.enterprise.providers.google_workspace",
     "authentik.enterprise.providers.microsoft_entra",
-    "authentik.enterprise.providers.rac",
     "authentik.enterprise.providers.ssf",
     "authentik.enterprise.stages.authenticator_endpoint_gdtc",
     "authentik.enterprise.stages.source",

diff --git a/authentik/outposts/api/outposts.py b/authentik/outposts/api/outposts.py
@@ -19,7 +19,6 @@
 from authentik.core.api.utils import JSONDictField, ModelSerializer, PassiveSerializer
 from authentik.core.models import Provider
 from authentik.enterprise.license import LicenseKey
-from authentik.enterprise.providers.rac.models import RACProvider
 from authentik.lib.utils.time import timedelta_from_string, timedelta_string_validator
 from authentik.outposts.api.service_connections import ServiceConnectionSerializer
 from authentik.outposts.apps import MANAGED_OUTPOST, MANAGED_OUTPOST_NAME
@@ -31,6 +30,7 @@
 )
 from authentik.providers.ldap.models import LDAPProvider
 from authentik.providers.proxy.models import ProxyProvider
+from authentik.providers.rac.models import RACProvider
 from authentik.providers.radius.models import RadiusProvider
 
 

diff --git a/authentik/outposts/tasks.py b/authentik/outposts/tasks.py
@@ -18,8 +18,6 @@
 from structlog.stdlib import get_logger
 from yaml import safe_load
 
-from authentik.enterprise.providers.rac.controllers.docker import RACDockerController
-from authentik.enterprise.providers.rac.controllers.kubernetes import RACKubernetesController
 from authentik.events.models import TaskStatus
 from authentik.events.system_tasks import SystemTask, prefill_task
 from authentik.lib.config import CONFIG
@@ -41,6 +39,8 @@
 from authentik.providers.ldap.controllers.kubernetes import LDAPKubernetesController
 from authentik.providers.proxy.controllers.docker import ProxyDockerController
 from authentik.providers.proxy.controllers.kubernetes import ProxyKubernetesController
+from authentik.providers.rac.controllers.docker import RACDockerController
+from authentik.providers.rac.controllers.kubernetes import RACKubernetesController
 from authentik.providers.radius.controllers.docker import RadiusDockerController
 from authentik.providers.radius.controllers.kubernetes import RadiusKubernetesController
 from authentik.root.celery import CELERY_APP

diff --git a/...ntik/enterprise/providers/rac/__init__.py → authentik/providers/rac/__init__.py b/...ntik/enterprise/providers/rac/__init__.py → authentik/providers/rac/__init__.py
diff --git a/.../enterprise/providers/rac/api/__init__.py → authentik/providers/rac/api/__init__.py b/.../enterprise/providers/rac/api/__init__.py → authentik/providers/rac/api/__init__.py
diff --git a/...se/providers/rac/api/connection_tokens.py → ...ik/providers/rac/api/connection_tokens.py b/...se/providers/rac/api/connection_tokens.py → ...ik/providers/rac/api/connection_tokens.py
@@ -7,9 +7,9 @@
 from authentik.core.api.used_by import UsedByMixin
 from authentik.core.api.utils import ModelSerializer
 from authentik.enterprise.api import EnterpriseRequiredMixin
-from authentik.enterprise.providers.rac.api.endpoints import EndpointSerializer
-from authentik.enterprise.providers.rac.api.providers import RACProviderSerializer
-from authentik.enterprise.providers.rac.models import ConnectionToken
+from authentik.providers.rac.api.endpoints import EndpointSerializer
+from authentik.providers.rac.api.providers import RACProviderSerializer
+from authentik.providers.rac.models import ConnectionToken
 
 
 class ConnectionTokenSerializer(EnterpriseRequiredMixin, ModelSerializer):

diff --git a/...enterprise/providers/rac/api/endpoints.py → authentik/providers/rac/api/endpoints.py b/...enterprise/providers/rac/api/endpoints.py → authentik/providers/rac/api/endpoints.py
@@ -15,9 +15,9 @@
 from authentik.core.api.utils import ModelSerializer
 from authentik.core.models import Provider
 from authentik.enterprise.api import EnterpriseRequiredMixin
-from authentik.enterprise.providers.rac.api.providers import RACProviderSerializer
-from authentik.enterprise.providers.rac.models import Endpoint
 from authentik.policies.engine import PolicyEngine
+from authentik.providers.rac.api.providers import RACProviderSerializer
+from authentik.providers.rac.models import Endpoint
 from authentik.rbac.filters import ObjectFilter
 
 LOGGER = get_logger()

diff --git a/...se/providers/rac/api/property_mappings.py → ...ik/providers/rac/api/property_mappings.py b/...se/providers/rac/api/property_mappings.py → ...ik/providers/rac/api/property_mappings.py
@@ -10,7 +10,7 @@
 from authentik.core.api.property_mappings import PropertyMappingSerializer
 from authentik.core.api.used_by import UsedByMixin
 from authentik.core.api.utils import JSONDictField
-from authentik.enterprise.providers.rac.models import RACPropertyMapping
+from authentik.providers.rac.models import RACPropertyMapping
 
 
 class RACPropertyMappingSerializer(PropertyMappingSerializer):

diff --git a/...enterprise/providers/rac/api/providers.py → authentik/providers/rac/api/providers.py b/...enterprise/providers/rac/api/providers.py → authentik/providers/rac/api/providers.py
@@ -6,7 +6,7 @@
 from authentik.core.api.providers import ProviderSerializer
 from authentik.core.api.used_by import UsedByMixin
 from authentik.enterprise.api import EnterpriseRequiredMixin
-from authentik.enterprise.providers.rac.models import RACProvider
+from authentik.providers.rac.models import RACProvider
 
 
 class RACProviderSerializer(EnterpriseRequiredMixin, ProviderSerializer):

diff --git a/authentik/providers/rac/apps.py b/authentik/providers/rac/apps.py
@@ -0,0 +1,14 @@
+"""RAC app config"""
+
+from django.apps import AppConfig
+
+
+class AuthentikProviderRAC(AppConfig):
+    """authentik enterprise rac app config"""
+
+    name = "authentik.providers.rac"
+    label = "authentik_providers_rac"
+    verbose_name = "authentik Providers.RAC"
+    default = True
+    mountpoint = ""
+    ws_mountpoint = "authentik.providers.rac.urls"
diff --git a/...terprise/providers/rac/consumer_client.py → authentik/providers/rac/consumer_client.py b/...terprise/providers/rac/consumer_client.py → authentik/providers/rac/consumer_client.py
@@ -7,9 +7,9 @@
 from django.http.request import QueryDict
 from structlog.stdlib import BoundLogger, get_logger
 
-from authentik.enterprise.providers.rac.models import ConnectionToken, RACProvider
 from authentik.outposts.consumer import OUTPOST_GROUP_INSTANCE
 from authentik.outposts.models import Outpost, OutpostState, OutpostType
+from authentik.providers.rac.models import ConnectionToken, RACProvider
 
 # Global broadcast group, which messages are sent to when the outpost connects back
 # to authentik for a specific connection

diff --git a/...erprise/providers/rac/consumer_outpost.py → authentik/providers/rac/consumer_outpost.py b/...erprise/providers/rac/consumer_outpost.py → authentik/providers/rac/consumer_outpost.py
@@ -3,7 +3,7 @@
 from channels.exceptions import ChannelFull
 from channels.generic.websocket import AsyncWebsocketConsumer
 
-from authentik.enterprise.providers.rac.consumer_client import RAC_CLIENT_GROUP
+from authentik.providers.rac.consumer_client import RAC_CLIENT_GROUP
 
 
 class RACOutpostConsumer(AsyncWebsocketConsumer):

diff --git a/...ise/providers/rac/controllers/__init__.py → ...tik/providers/rac/controllers/__init__.py b/...ise/providers/rac/controllers/__init__.py → ...tik/providers/rac/controllers/__init__.py
diff --git a/...prise/providers/rac/controllers/docker.py → ...entik/providers/rac/controllers/docker.py b/...prise/providers/rac/controllers/docker.py → ...entik/providers/rac/controllers/docker.py
diff --git a/...e/providers/rac/controllers/kubernetes.py → ...k/providers/rac/controllers/kubernetes.py b/...e/providers/rac/controllers/kubernetes.py → ...k/providers/rac/controllers/kubernetes.py
diff --git a/.../providers/rac/migrations/0001_initial.py → .../providers/rac/migrations/0001_initial.py b/.../providers/rac/migrations/0001_initial.py → .../providers/rac/migrations/0001_initial.py
diff --git a/...alter_connectiontoken_options_and_more.py → ...alter_connectiontoken_options_and_more.py b/...alter_connectiontoken_options_and_more.py → ...alter_connectiontoken_options_and_more.py
diff --git a/...ions/0002_endpoint_maximum_connections.py → ...ions/0002_endpoint_maximum_connections.py b/...ions/0002_endpoint_maximum_connections.py → ...ions/0002_endpoint_maximum_connections.py
diff --git a/...alter_connectiontoken_options_and_more.py → ...alter_connectiontoken_options_and_more.py b/...alter_connectiontoken_options_and_more.py → ...alter_connectiontoken_options_and_more.py
diff --git a/...ons/0004_alter_connectiontoken_expires.py → ...ons/0004_alter_connectiontoken_expires.py b/...ons/0004_alter_connectiontoken_expires.py → ...ons/0004_alter_connectiontoken_expires.py
diff --git a/.../0005_alter_racpropertymapping_options.py → .../0005_alter_racpropertymapping_options.py b/.../0005_alter_racpropertymapping_options.py → .../0005_alter_racpropertymapping_options.py
diff --git a/...uthentik_p_expires_91f148_idx_and_more.py → ...uthentik_p_expires_91f148_idx_and_more.py b/...uthentik_p_expires_91f148_idx_and_more.py → ...uthentik_p_expires_91f148_idx_and_more.py
diff --git a/...rise/providers/rac/migrations/__init__.py → ...ntik/providers/rac/migrations/__init__.py b/...rise/providers/rac/migrations/__init__.py → ...ntik/providers/rac/migrations/__init__.py
diff --git a/authentik/enterprise/providers/rac/models.py → authentik/providers/rac/models.py b/authentik/enterprise/providers/rac/models.py → authentik/providers/rac/models.py
@@ -74,7 +74,7 @@ def component(self) -> str:
 
     @property
     def serializer(self) -> type[Serializer]:
-        from authentik.enterprise.providers.rac.api.providers import RACProviderSerializer
+        from authentik.providers.rac.api.providers import RACProviderSerializer
 
         return RACProviderSerializer
 
@@ -100,7 +100,7 @@ class Endpoint(SerializerModel, PolicyBindingModel):
 
     @property
     def serializer(self) -> type[Serializer]:
-        from authentik.enterprise.providers.rac.api.endpoints import EndpointSerializer
+        from authentik.providers.rac.api.endpoints import EndpointSerializer
 
         return EndpointSerializer
 
@@ -129,7 +129,7 @@ def component(self) -> str:
 
     @property
     def serializer(self) -> type[Serializer]:
-        from authentik.enterprise.providers.rac.api.property_mappings import (
+        from authentik.providers.rac.api.property_mappings import (
             RACPropertyMappingSerializer,
         )
 

diff --git a/...entik/enterprise/providers/rac/signals.py → authentik/providers/rac/signals.py b/...entik/enterprise/providers/rac/signals.py → authentik/providers/rac/signals.py
@@ -10,12 +10,12 @@
 from django.http import HttpRequest
 
 from authentik.core.models import User
-from authentik.enterprise.providers.rac.api.endpoints import user_endpoint_cache_key
-from authentik.enterprise.providers.rac.consumer_client import (
+from authentik.providers.rac.api.endpoints import user_endpoint_cache_key
+from authentik.providers.rac.consumer_client import (
     RAC_CLIENT_GROUP_SESSION,
     RAC_CLIENT_GROUP_TOKEN,
 )
-from authentik.enterprise.providers.rac.models import ConnectionToken, Endpoint
+from authentik.providers.rac.models import ConnectionToken, Endpoint
 
 
 @receiver(user_logged_out)

diff --git a/...prise/providers/rac/templates/if/rac.html → ...entik/providers/rac/templates/if/rac.html b/...prise/providers/rac/templates/if/rac.html → ...entik/providers/rac/templates/if/rac.html
diff --git a/...nterprise/providers/rac/tests/__init__.py → authentik/providers/rac/tests/__init__.py b/...nterprise/providers/rac/tests/__init__.py → authentik/providers/rac/tests/__init__.py
diff --git a/...nterprise/providers/rac/tests/test_api.py → authentik/providers/rac/tests/test_api.py b/...nterprise/providers/rac/tests/test_api.py → authentik/providers/rac/tests/test_api.py
diff --git a/...providers/rac/tests/test_endpoints_api.py → ...providers/rac/tests/test_endpoints_api.py b/...providers/rac/tests/test_endpoints_api.py → ...providers/rac/tests/test_endpoints_api.py
@@ -5,10 +5,10 @@
 
 from authentik.core.models import Application
 from authentik.core.tests.utils import create_test_admin_user
-from authentik.enterprise.providers.rac.models import Endpoint, Protocols, RACProvider
 from authentik.lib.generators import generate_id
 from authentik.policies.dummy.models import DummyPolicy
 from authentik.policies.models import PolicyBinding
+from authentik.providers.rac.models import Endpoint, Protocols, RACProvider
 
 
 class TestEndpointsAPI(APITestCase):

diff --git a/...rprise/providers/rac/tests/test_models.py → authentik/providers/rac/tests/test_models.py b/...rprise/providers/rac/tests/test_models.py → authentik/providers/rac/tests/test_models.py
@@ -4,14 +4,14 @@
 
 from authentik.core.models import Application, AuthenticatedSession
 from authentik.core.tests.utils import create_test_admin_user
-from authentik.enterprise.providers.rac.models import (
+from authentik.lib.generators import generate_id
+from authentik.providers.rac.models import (
     ConnectionToken,
     Endpoint,
     Protocols,
     RACPropertyMapping,
     RACProvider,
 )
-from authentik.lib.generators import generate_id
 
 
 class TestModels(TransactionTestCase):

diff --git a/...erprise/providers/rac/tests/test_views.py → authentik/providers/rac/tests/test_views.py b/...erprise/providers/rac/tests/test_views.py → authentik/providers/rac/tests/test_views.py
@@ -13,11 +13,11 @@
 from authentik.core.tests.utils import create_test_admin_user, create_test_flow
 from authentik.enterprise.license import LicenseKey
 from authentik.enterprise.models import License
-from authentik.enterprise.providers.rac.models import Endpoint, Protocols, RACProvider
 from authentik.lib.generators import generate_id
 from authentik.policies.denied import AccessDeniedResponse
 from authentik.policies.dummy.models import DummyPolicy
 from authentik.policies.models import PolicyBinding
+from authentik.providers.rac.models import Endpoint, Protocols, RACProvider
 
 
 class TestRACViews(APITestCase):

diff --git a/authentik/enterprise/providers/rac/urls.py → authentik/providers/rac/urls.py b/authentik/enterprise/providers/rac/urls.py → authentik/providers/rac/urls.py
@@ -4,14 +4,14 @@
 from channels.sessions import CookieMiddleware
 from django.urls import path
 
-from authentik.enterprise.providers.rac.api.connection_tokens import ConnectionTokenViewSet
-from authentik.enterprise.providers.rac.api.endpoints import EndpointViewSet
-from authentik.enterprise.providers.rac.api.property_mappings import RACPropertyMappingViewSet
-from authentik.enterprise.providers.rac.api.providers import RACProviderViewSet
-from authentik.enterprise.providers.rac.consumer_client import RACClientConsumer
-from authentik.enterprise.providers.rac.consumer_outpost import RACOutpostConsumer
-from authentik.enterprise.providers.rac.views import RACInterface, RACStartView
 from authentik.outposts.channels import TokenOutpostMiddleware
+from authentik.providers.rac.api.connection_tokens import ConnectionTokenViewSet
+from authentik.providers.rac.api.endpoints import EndpointViewSet
+from authentik.providers.rac.api.property_mappings import RACPropertyMappingViewSet
+from authentik.providers.rac.api.providers import RACProviderViewSet
+from authentik.providers.rac.consumer_client import RACClientConsumer
+from authentik.providers.rac.consumer_outpost import RACOutpostConsumer
+from authentik.providers.rac.views import RACInterface, RACStartView
 from authentik.root.asgi_middleware import SessionMiddleware
 from authentik.root.middleware import ChannelsLoggingMiddleware
 

diff --git a/authentik/enterprise/providers/rac/views.py → authentik/providers/rac/views.py b/authentik/enterprise/providers/rac/views.py → authentik/providers/rac/views.py
@@ -11,7 +11,6 @@
 from authentik.core.models import Application, AuthenticatedSession
 from authentik.core.views.interface import InterfaceView
 from authentik.enterprise.policy import EnterprisePolicyAccessView
-from authentik.enterprise.providers.rac.models import ConnectionToken, Endpoint, RACProvider
 from authentik.events.models import Event, EventAction
 from authentik.flows.challenge import RedirectChallenge
 from authentik.flows.exceptions import FlowNonApplicableException
@@ -20,6 +19,7 @@
 from authentik.flows.stage import RedirectStage
 from authentik.lib.utils.time import timedelta_from_string
 from authentik.policies.engine import PolicyEngine
+from authentik.providers.rac.models import ConnectionToken, Endpoint, RACProvider
 
 
 class RACStartView(EnterprisePolicyAccessView):

diff --git a/authentik/root/settings.py b/authentik/root/settings.py
@@ -87,6 +87,7 @@
     "authentik.providers.ldap",
     "authentik.providers.oauth2",
     "authentik.providers.proxy",
+    "authentik.providers.rac",
     "authentik.providers.radius",
     "authentik.providers.saml",
     "authentik.providers.scim",

diff --git a/blueprints/schema.json b/blueprints/schema.json
@@ -4583,6 +4583,7 @@
                         "authentik.providers.ldap",
                         "authentik.providers.oauth2",
                         "authentik.providers.proxy",
+                        "authentik.providers.rac",
                         "authentik.providers.radius",
                         "authentik.providers.saml",
                         "authentik.providers.scim",
@@ -4622,7 +4623,6 @@
                         "authentik.enterprise.audit",
                         "authentik.enterprise.providers.google_workspace",
                         "authentik.enterprise.providers.microsoft_entra",
-                        "authentik.enterprise.providers.rac",
                         "authentik.enterprise.providers.ssf",
                         "authentik.enterprise.stages.authenticator_endpoint_gdtc",
                         "authentik.enterprise.stages.source",

diff --git a/schema.yml b/schema.yml
@@ -38682,6 +38682,7 @@ components:
       - authentik.providers.ldap
       - authentik.providers.oauth2
       - authentik.providers.proxy
+      - authentik.providers.rac
       - authentik.providers.radius
       - authentik.providers.saml
       - authentik.providers.scim
@@ -38721,7 +38722,6 @@ components:
       - authentik.enterprise.audit
       - authentik.enterprise.providers.google_workspace
       - authentik.enterprise.providers.microsoft_entra
-      - authentik.enterprise.providers.rac
       - authentik.enterprise.providers.ssf
       - authentik.enterprise.stages.authenticator_endpoint_gdtc
       - authentik.enterprise.stages.source