fixed authn token issue

QCDIS · Dec 6, 2024 · 7c4c53d · 7c4c53d
1 parent dfa5834
commit 7c4c53d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/vreapis/auth/simple.py b/vreapis/auth/simple.py
@@ -20,5 +20,5 @@ def authenticate(self, request: HttpRequest):
         access_token: str = request.headers.get('Authorization', '')
         print(access_token == f'Token {settings.NAAVRE_API_TOKEN}')
         if access_token != f'Token {settings.NAAVRE_API_TOKEN}':
-            raise AuthenticationFailed(f'Invalid token')
+            raise AuthenticationFailed(f'Invalid NaaVRE API token')
         return StaticTokenAuthentication.dummy_user, None
diff --git a/vreapis/containerizer/views.py b/vreapis/containerizer/views.py
@@ -43,7 +43,7 @@
 from services.extractor.rextractor import RExtractor
 from services.converter import ConverterReactFlowChart
 import utils.cors
-from auth.simple import StaticTokenAuthentication
+# from auth.simple import StaticTokenAuthentication
 from catalog.models import Cell
 
 import common
@@ -55,7 +55,7 @@ def return_error(err_msg: str = 'Unknown ERROR', e: Optional[Exception] = None,
 
 
 @api_view(['GET'])
-@authentication_classes([StaticTokenAuthentication])
+# @authentication_classes([StaticTokenAuthentication])
 @permission_classes([IsAuthenticated])
 def get_base_images(request):
     url: str = os.getenv('BASE_IMAGE_TAGS_URL', 'https://github.com/QCDIS/NaaVRE-flavors/releases/latest/download/base_image_tags.json')
@@ -70,7 +70,7 @@ def get_base_images(request):
 
 
 class ExtractorHandler(APIView):
-    authentication_classes = [StaticTokenAuthentication]
+    # authentication_classes = [StaticTokenAuthentication]
     permission_classes = [IsAuthenticated]
 
     def extract_cell_by_index(self, notebook: nbformat.notebooknode, cell_index: int) -> nbformat.NotebookNode:
@@ -204,7 +204,7 @@ class CellsHandler(viewsets.ModelViewSet):
     common.logger.debug(f"BASE_PATH: {os.getenv('BASE_PATH')}")
     queryset: QuerySet = Cell.objects.all()
     serializer_class = CellSerializer
-    authentication_classes: list[BaseAuthentication] = [StaticTokenAuthentication]
+    # authentication_classes: list[BaseAuthentication] = [StaticTokenAuthentication]
     permission_classes: list[BasePermission] = [IsAuthenticated]
     cells_path: str = os.path.join(str(Path.home()), 'NaaVRE', 'cells')
     github_url_repos: str = 'https://api.github.com/repos'

diff --git a/vreapis/vreapis/settings/base.py b/vreapis/vreapis/settings/base.py
@@ -22,8 +22,8 @@
 
 ALLOWED_HOSTS = ['*']
 
-# CSRF_TRUSTED_ORIGINS = [os.getenv('TRUSTED_ORIGINS')]
-CSRF_TRUSTED_ORIGINS = os.getenv('TRUSTED_ORIGINS').split(sep=';')
+CSRF_TRUSTED_ORIGINS = [os.getenv('TRUSTED_ORIGINS')]
+# CSRF_TRUSTED_ORIGINS = os.getenv('TRUSTED_ORIGINS').split(sep=';')
 
 CORS_ALLOWED_ORIGIN_REGEXES = [
     r'^http:\/\/localhost:\d+$',
@@ -190,14 +190,14 @@
 
 # CUSTOM VARS # todo. delete default values
 
-API_ENDPOINT: str = os.getenv('API_ENDPOINT', "https://naavre-dev.minikube.test/vre-api-test")
-
-KEYCLOAK_URL: str = os.getenv('KEYCLOAK_URL', 'https://naavre-dev.minikube.test/auth')
-KEYCLOAK_REALM: str = os.getenv('KEYCLOAK_REALM', 'vre')
-KEYCLOAK_LOGIN_URL: str = f'{KEYCLOAK_URL}/realms/{KEYCLOAK_REALM}/protocol/openid-connect/token'
-KEYCLOAK_VERIF_URL: str = f'{KEYCLOAK_URL}/realms/{KEYCLOAK_REALM}/protocol/openid-connect/certs'
-KEYCLOAK_CLIENT_ID: str = os.getenv('KEYCLOAK_CLIENT_ID', 'myclient')
-
-NAAVRE_API_TOKEN: str = os.getenv('NAAVRE_API_TOKEN')
+# API_ENDPOINT: str = os.getenv('API_ENDPOINT', "https://naavre-dev.minikube.test/vre-api-test")
+#
+# KEYCLOAK_URL: str = os.getenv('KEYCLOAK_URL', 'https://naavre-dev.minikube.test/auth')
+# KEYCLOAK_REALM: str = os.getenv('KEYCLOAK_REALM', 'vre')
+# KEYCLOAK_LOGIN_URL: str = f'{KEYCLOAK_URL}/realms/{KEYCLOAK_REALM}/protocol/openid-connect/token'
+# KEYCLOAK_VERIF_URL: str = f'{KEYCLOAK_URL}/realms/{KEYCLOAK_REALM}/protocol/openid-connect/certs'
+# KEYCLOAK_CLIENT_ID: str = os.getenv('KEYCLOAK_CLIENT_ID', 'myclient')
+#
+# NAAVRE_API_TOKEN: str = os.getenv('NAAVRE_API_TOKEN')
 
 VENV_ACTIVATOR: str = os.getenv('VENV_ACTIVATOR', '/opt/venv/bin/activate')