瀏覽代碼

update authentication, use authorization header

Khanh Nguyen 3 月之前
父節點
當前提交
fd925a3638
共有 4 個文件被更改,包括 62 次插入 和 26 次删除
  1. 16 18
      src/config/initialization.py
  2. 2 0
      src/services/client_rest.py
  3. 23 0
      tests/test_client_rest.py
  4. 21 8
      tests/test_initialization.py

+ 16 - 18
src/config/initialization.py

@@ -8,6 +8,7 @@ from functools import lru_cache
 from httpx import Client
 from httpx import Client
 from dotenv import load_dotenv
 from dotenv import load_dotenv
 from urllib.parse import urlparse
 from urllib.parse import urlparse
+import base64
 
 
 @dataclass(frozen=True)
 @dataclass(frozen=True)
 class Settings:
 class Settings:
@@ -15,6 +16,7 @@ class Settings:
 
 
     base_url: str
     base_url: str
     phpsessid: str
     phpsessid: str
+    authorization: str
     timeout_seconds: float = 10.0
     timeout_seconds: float = 10.0
 
 
 
 
@@ -22,29 +24,18 @@ class InitializationError(RuntimeError):
     """Erreur critique de configuration."""
     """Erreur critique de configuration."""
 
 
 
 
-def _parse_base_url(raw: str) -> tuple[str, str]:
-    value = raw.strip().rstrip("/")
-    if "://" not in value:
-        return "https", value
-    parsed = urlparse(value)
-    scheme = parsed.scheme or "https"
-    host = parsed.netloc or parsed.path.split("/")[0]
-    return scheme, host
-
 @lru_cache(maxsize=1)
 @lru_cache(maxsize=1)
 def get_settings() -> Settings:
 def get_settings() -> Settings:
     """Charge le .env et valide la presence des secrets requis."""
     """Charge le .env et valide la presence des secrets requis."""
     load_dotenv()
     load_dotenv()
 
 
-    raw = (os.getenv("BASE_URL") or "").strip().rstrip("/")
+    base_url = (os.getenv("BASE_URL") or "").strip().rstrip("/")
     lwe_username = (os.getenv("LWE_USERNAME") or "").strip()
     lwe_username = (os.getenv("LWE_USERNAME") or "").strip()
     lwe_password = (os.getenv("LWE_PASSWORD") or "").strip()
     lwe_password = (os.getenv("LWE_PASSWORD") or "").strip()
     http_username = (os.getenv("HTTP_USERNAME") or "").strip()
     http_username = (os.getenv("HTTP_USERNAME") or "").strip()
     http_password = (os.getenv("HTTP_PASSWORD") or "").strip()
     http_password = (os.getenv("HTTP_PASSWORD") or "").strip()
 
 
 
 
-    scheme, base_url = _parse_base_url(raw)
-
     missing = [
     missing = [
         name
         name
         for name, value in (
         for name, value in (
@@ -59,18 +50,25 @@ def get_settings() -> Settings:
             f"Variables d'environnement manquantes: {', '.join(missing)}"
             f"Variables d'environnement manquantes: {', '.join(missing)}"
         )
         )
     
     
+    authorization = ""
     if http_username and http_password:
     if http_username and http_password:
-        base_url = f"{scheme}://{http_username}:{http_password}@{base_url}"
-    else:
-        base_url = f"{scheme}://{base_url}"
+        encoded_authorization = base64.b64encode(
+            f"{http_username}:{http_password}".encode("utf-8")
+        ).decode("utf-8")
+        authorization = f"Basic {encoded_authorization}"
 
 
-    try:  
+    try:
         with Client() as client:
         with Client() as client:
-            response = client.post(f"{base_url}/rest/user/login", json={"id": lwe_username, "password": lwe_password})
+            if authorization:
+                client.headers.update({"Authorization": authorization})
+            response = client.post(
+                f"{base_url}/rest/user/login",
+                data={"id": lwe_username, "password": lwe_password},
+            )
             phpsessid = response.cookies.get("PHPSESSID")
             phpsessid = response.cookies.get("PHPSESSID")
             if phpsessid is None:
             if phpsessid is None:
                 raise InitializationError("PHPSESSID non trouvé, veuillez vérifier les identifiants de connexion")
                 raise InitializationError("PHPSESSID non trouvé, veuillez vérifier les identifiants de connexion")
     except Exception as e:
     except Exception as e:
         raise InitializationError(f"Erreur lors de la connexion: {e}")
         raise InitializationError(f"Erreur lors de la connexion: {e}")
 
 
-    return Settings(base_url=base_url, phpsessid=phpsessid)
+    return Settings(base_url=base_url, phpsessid=phpsessid, authorization=authorization)

+ 2 - 0
src/services/client_rest.py

@@ -26,6 +26,8 @@ class ClientRest:
             "Cookie": f"PHPSESSID={self.settings.phpsessid}",
             "Cookie": f"PHPSESSID={self.settings.phpsessid}",
             "Accept": "application/json",
             "Accept": "application/json",
         }
         }
+        if self.settings.authorization:
+            self.headers["Authorization"] = self.settings.authorization
 
 
     def execute(
     def execute(
         self, 
         self, 

+ 23 - 0
tests/test_client_rest.py

@@ -16,6 +16,17 @@ def settings() -> Settings:
     return Settings(
     return Settings(
         base_url="https://api.example.com",
         base_url="https://api.example.com",
         phpsessid="sess_test",
         phpsessid="sess_test",
+        authorization="",
+        timeout_seconds=5.0,
+    )
+
+
+@pytest.fixture
+def settings_with_authorization() -> Settings:
+    return Settings(
+        base_url="https://api.example.com",
+        phpsessid="sess_test",
+        authorization="Basic dXNlcjpwYXNz",
         timeout_seconds=5.0,
         timeout_seconds=5.0,
     )
     )
 
 
@@ -66,6 +77,17 @@ class TestClientRestInit:
             "Accept": "application/json",
             "Accept": "application/json",
         }
         }
 
 
+    def test_init_adds_authorization_header_when_configured(
+        self, settings_with_authorization: Settings
+    ) -> None:
+        client = ClientRest(settings=settings_with_authorization)
+
+        assert client.headers == {
+            "Cookie": "PHPSESSID=sess_test",
+            "Accept": "application/json",
+            "Authorization": "Basic dXNlcjpwYXNz",
+        }
+
 
 
 class TestBuildUrl:
 class TestBuildUrl:
     def test_build_url_adds_leading_slash(self, client: ClientRest) -> None:
     def test_build_url_adds_leading_slash(self, client: ClientRest) -> None:
@@ -166,6 +188,7 @@ class TestExecuteSuccess:
             params={"mandatoryParent": 10000},
             params={"mandatoryParent": 10000},
         )
         )
 
 
+
 class TestExecuteErrors:
 class TestExecuteErrors:
     def test_execute_raises_on_server_http_error(
     def test_execute_raises_on_server_http_error(
         self,
         self,

+ 21 - 8
tests/test_initialization.py

@@ -2,6 +2,7 @@
 
 
 from __future__ import annotations
 from __future__ import annotations
 
 
+import base64
 from unittest.mock import MagicMock, patch
 from unittest.mock import MagicMock, patch
 
 
 import pytest
 import pytest
@@ -34,6 +35,7 @@ def mock_login_success() -> MagicMock:
     mock_response = MagicMock()
     mock_response = MagicMock()
     mock_response.cookies.get.return_value = "sess_xyz789"
     mock_response.cookies.get.return_value = "sess_xyz789"
     mock_client = MagicMock()
     mock_client = MagicMock()
+    mock_client.headers = {}
     mock_client.post.return_value = mock_response
     mock_client.post.return_value = mock_response
     mock_client.__enter__.return_value = mock_client
     mock_client.__enter__.return_value = mock_client
     mock_client.__exit__.return_value = False
     mock_client.__exit__.return_value = False
@@ -55,31 +57,41 @@ def test_get_settings_with_all_environment_variables(
     assert settings == Settings(
     assert settings == Settings(
         base_url="https://api.example.com",
         base_url="https://api.example.com",
         phpsessid="sess_xyz789",
         phpsessid="sess_xyz789",
+        authorization="",
     )
     )
     mock_login_success.post.assert_called_once_with(
     mock_login_success.post.assert_called_once_with(
         "https://api.example.com/rest/user/login",
         "https://api.example.com/rest/user/login",
-        json={"id": "admin", "password": "secret"},
+        data={"id": "admin", "password": "secret"},
     )
     )
+    assert mock_login_success.headers == {}
 
 
 
 
-def test_get_settings_injects_basic_auth_when_lwe_credentials_are_set(
+def test_get_settings_sets_basic_authorization_when_http_credentials_are_set(
     isolated_env: None,
     isolated_env: None,
     monkeypatch: pytest.MonkeyPatch,
     monkeypatch: pytest.MonkeyPatch,
     mock_login_success: MagicMock,
     mock_login_success: MagicMock,
 ) -> None:
 ) -> None:
-    monkeypatch.setenv("BASE_URL", "api.example.com")
+    monkeypatch.setenv("BASE_URL", "https://api.example.com")
     monkeypatch.setenv("LWE_USERNAME", "admin")
     monkeypatch.setenv("LWE_USERNAME", "admin")
     monkeypatch.setenv("LWE_PASSWORD", "secret")
     monkeypatch.setenv("LWE_PASSWORD", "secret")
     monkeypatch.setenv("HTTP_USERNAME", "basic_user")
     monkeypatch.setenv("HTTP_USERNAME", "basic_user")
     monkeypatch.setenv("HTTP_PASSWORD", "basic_pass")
     monkeypatch.setenv("HTTP_PASSWORD", "basic_pass")
 
 
+    expected_token = base64.b64encode(b"basic_user:basic_pass").decode("utf-8")
+    expected_authorization = f"Basic {expected_token}"
+
     with patch("src.config.initialization.Client", return_value=mock_login_success):
     with patch("src.config.initialization.Client", return_value=mock_login_success):
         settings = get_settings()
         settings = get_settings()
 
 
-    assert settings.base_url == "https://basic_user:basic_pass@api.example.com"
+    assert settings == Settings(
+        base_url="https://api.example.com",
+        phpsessid="sess_xyz789",
+        authorization=expected_authorization,
+    )
+    assert mock_login_success.headers == {"Authorization": expected_authorization}
     mock_login_success.post.assert_called_once_with(
     mock_login_success.post.assert_called_once_with(
-        "https://basic_user:basic_pass@api.example.com/rest/user/login",
-        json={"id": "admin", "password": "secret"},
+        "https://api.example.com/rest/user/login",
+        data={"id": "admin", "password": "secret"},
     )
     )
 
 
 
 
@@ -107,8 +119,8 @@ def test_get_settings_raises_when_env_file_is_missing(
     message = str(exc_info.value)
     message = str(exc_info.value)
     assert "Variables d'environnement manquantes" in message
     assert "Variables d'environnement manquantes" in message
     assert "BASE_URL" in message
     assert "BASE_URL" in message
-    assert "USERNAME" in message
-    assert "PASSWORD" in message
+    assert "LWE_USERNAME" in message
+    assert "LWE_PASSWORD" in message
 
 
 
 
 def test_get_settings_raises_when_login_does_not_return_phpsessid(
 def test_get_settings_raises_when_login_does_not_return_phpsessid(
@@ -122,6 +134,7 @@ def test_get_settings_raises_when_login_does_not_return_phpsessid(
     mock_response = MagicMock()
     mock_response = MagicMock()
     mock_response.cookies.get.return_value = None
     mock_response.cookies.get.return_value = None
     mock_client = MagicMock()
     mock_client = MagicMock()
+    mock_client.headers = {}
     mock_client.post.return_value = mock_response
     mock_client.post.return_value = mock_response
     mock_client.__enter__.return_value = mock_client
     mock_client.__enter__.return_value = mock_client
     mock_client.__exit__.return_value = False
     mock_client.__exit__.return_value = False