Pārlūkot izejas kodu

update change authentication to username and password

Khanh Nguyen 3 mēneši atpakaļ
vecāks
revīzija
ac6a7c1993

+ 5 - 2
.env.example

@@ -1,3 +1,6 @@
 BASE_URL=https://api.site.local
-LWE_TOKEN=replace_with_token
-PHPSESSID=replace_with_phpsessid
+LWE_USERNAME=replace_with_username
+LWE_PASSWORD=replace_with_password
+# Optionnel : authentification HTTP basic
+HTTP_USERNAME=
+HTTP_PASSWORD=

+ 4 - 3
README.md

@@ -9,7 +9,7 @@ Serveur MCP pour exposer des outils et ressources de pilotage MODX/LWE via API R
 | Couche | Dossier / fichier | Rôle |
 |--------|-------------------|------|
 | Point d'entrée | `src/main.py` | Valide la config, instancie `ClientRest`, lance `FastMCP` en transport stdio |
-| Configuration | `src/config/initialization.py` | Charge `.env`, valide `BASE_URL`, `LWE_TOKEN`, `PHPSESSID` |
+| Configuration | `src/config/initialization.py` | Charge `.env`, valide `BASE_URL`, `USERNAME`, `PASSWORD`, login REST pour obtenir `PHPSESSID` |
 | Protocole MCP | `src/server_mcp/server.py` | Assemble le serveur et enregistre outils et ressources |
 | Outils (écriture) | `src/server_mcp/tools.py` | Opérations mutantes : CRUD ressources, chunks, snippets, templates, etc. |
 | Ressources (lecture) | `src/server_mcp/resources.py` | Opérations en lecture seule, réponses filtrées pour limiter le contexte envoyé à l'agent |
@@ -47,8 +47,9 @@ Les deux couches partagent le même `ClientRest` injecté à l'assemblage du ser
 - `uv`
 - Un fichier `.env` avec:
   - `BASE_URL`
-  - `LWE_TOKEN`
-  - `PHPSESSID`
+  - `USERNAME`
+  - `PASSWORD`
+  - `LWE_USERNAME` et `LWE_PASSWORD` (optionnels, authentification HTTP basic)
 
 ## Installation
 

+ 37 - 9
src/config/initialization.py

@@ -5,16 +5,15 @@ from __future__ import annotations
 import os
 from dataclasses import dataclass
 from functools import lru_cache
-
+from httpx import Client
 from dotenv import load_dotenv
-
+from urllib.parse import urlparse
 
 @dataclass(frozen=True)
 class Settings:
     """Configuration runtime chargee depuis les variables d'environnement."""
 
     base_url: str
-    lwe_token: str
     phpsessid: str
     timeout_seconds: float = 10.0
 
@@ -23,21 +22,35 @@ class InitializationError(RuntimeError):
     """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)
 def get_settings() -> Settings:
     """Charge le .env et valide la presence des secrets requis."""
     load_dotenv()
 
-    base_url = (os.getenv("BASE_URL") or "").strip().rstrip("/")
-    lwe_token = (os.getenv("LWE_TOKEN") or "").strip()
-    phpsessid = (os.getenv("PHPSESSID") or "").strip()
+    raw = (os.getenv("BASE_URL") or "").strip().rstrip("/")
+    lwe_username = (os.getenv("LWE_USERNAME") or "").strip()
+    lwe_password = (os.getenv("LWE_PASSWORD") or "").strip()
+    http_username = (os.getenv("HTTP_USERNAME") or "").strip()
+    http_password = (os.getenv("HTTP_PASSWORD") or "").strip()
+
+
+    scheme, base_url = _parse_base_url(raw)
 
     missing = [
         name
         for name, value in (
             ("BASE_URL", base_url),
-            ("LWE_TOKEN", lwe_token),
-            ("PHPSESSID", phpsessid),
+            ("LWE_USERNAME", lwe_username),
+            ("LWE_PASSWORD", lwe_password)
         )
         if not value
     ]
@@ -45,5 +58,20 @@ def get_settings() -> Settings:
         raise InitializationError(
             f"Variables d'environnement manquantes: {', '.join(missing)}"
         )
+    
+    if http_username and http_password:
+        base_url = f"{scheme}://{http_username}:{http_password}@{base_url}"
+    else:
+        base_url = f"{scheme}://{base_url}"
+
+    try:  
+        with Client() as client:
+            response = client.post(f"{base_url}/rest/user/login", json={"id": lwe_username, "password": lwe_password})
+            print(response.text)
+            phpsessid = response.cookies.get("PHPSESSID")
+            if phpsessid is None:
+                raise InitializationError("PHPSESSID non trouvé, veuillez vérifier les identifiants de connexion")
+    except Exception as e:
+        raise InitializationError(f"Erreur lors de la connexion: {e}")
 
-    return Settings(base_url=base_url, lwe_token=lwe_token, phpsessid=phpsessid)
+    return Settings(base_url=base_url, phpsessid=phpsessid)

+ 0 - 1
src/services/client_rest.py

@@ -23,7 +23,6 @@ class ClientRest:
     def __init__(self, settings: Settings | None = None) -> None:
         self.settings = settings or get_settings()
         self.headers = {
-            "Authorization": self.settings.lwe_token,
             "Cookie": f"PHPSESSID={self.settings.phpsessid}",
             "Accept": "application/json",
         }

+ 0 - 2
tests/test_client_rest.py

@@ -15,7 +15,6 @@ from src.services.client_rest import ClientRest, HTTPMethod
 def settings() -> Settings:
     return Settings(
         base_url="https://api.example.com",
-        lwe_token="lwe_tok_test",
         phpsessid="sess_test",
         timeout_seconds=5.0,
     )
@@ -63,7 +62,6 @@ class TestClientRestInit:
         self, client: ClientRest
     ) -> None:
         assert client.headers == {
-            "Authorization": "lwe_tok_test",
             "Cookie": "PHPSESSID=sess_test",
             "Accept": "application/json",
         }

+ 88 - 9
tests/test_initialization.py

@@ -2,11 +2,13 @@
 
 from __future__ import annotations
 
+from unittest.mock import MagicMock, patch
+
 import pytest
 
 from src.config.initialization import InitializationError, Settings, get_settings
 
-_ENV_KEYS = ("BASE_URL", "LWE_TOKEN", "PHPSESSID")
+_ENV_KEYS = ("BASE_URL", "HTTP_USERNAME", "HTTP_PASSWORD", "LWE_USERNAME", "LWE_PASSWORD")
 
 
 @pytest.fixture(autouse=True)
@@ -27,21 +29,58 @@ def isolated_env(monkeypatch: pytest.MonkeyPatch) -> None:
     )
 
 
+@pytest.fixture
+def mock_login_success() -> MagicMock:
+    mock_response = MagicMock()
+    mock_response.cookies.get.return_value = "sess_xyz789"
+    mock_client = MagicMock()
+    mock_client.post.return_value = mock_response
+    mock_client.__enter__.return_value = mock_client
+    mock_client.__exit__.return_value = False
+    return mock_client
+
+
 def test_get_settings_with_all_environment_variables(
     isolated_env: None,
     monkeypatch: pytest.MonkeyPatch,
+    mock_login_success: MagicMock,
 ) -> None:
     monkeypatch.setenv("BASE_URL", "https://api.example.com/")
-    monkeypatch.setenv("LWE_TOKEN", "lwe_tok_abc123")
-    monkeypatch.setenv("PHPSESSID", "sess_xyz789")
+    monkeypatch.setenv("LWE_USERNAME", "admin")
+    monkeypatch.setenv("LWE_PASSWORD", "secret")
 
-    settings = get_settings()
+    with patch("src.config.initialization.Client", return_value=mock_login_success):
+        settings = get_settings()
 
     assert settings == Settings(
         base_url="https://api.example.com",
-        lwe_token="lwe_tok_abc123",
         phpsessid="sess_xyz789",
     )
+    mock_login_success.post.assert_called_once_with(
+        "https://api.example.com/rest/user/login",
+        json={"id": "admin", "password": "secret"},
+    )
+
+
+def test_get_settings_injects_basic_auth_when_lwe_credentials_are_set(
+    isolated_env: None,
+    monkeypatch: pytest.MonkeyPatch,
+    mock_login_success: MagicMock,
+) -> None:
+    monkeypatch.setenv("BASE_URL", "api.example.com")
+    monkeypatch.setenv("LWE_USERNAME", "admin")
+    monkeypatch.setenv("LWE_PASSWORD", "secret")
+    monkeypatch.setenv("HTTP_USERNAME", "basic_user")
+    monkeypatch.setenv("HTTP_PASSWORD", "basic_pass")
+
+    with patch("src.config.initialization.Client", return_value=mock_login_success):
+        settings = get_settings()
+
+    assert settings.base_url == "https://basic_user:basic_pass@api.example.com"
+    mock_login_success.post.assert_called_once_with(
+        "https://basic_user:basic_pass@api.example.com/rest/user/login",
+        json={"id": "admin", "password": "secret"},
+    )
 
 
 def test_get_settings_raises_when_environment_variables_are_missing(
@@ -55,8 +94,8 @@ def test_get_settings_raises_when_environment_variables_are_missing(
 
     message = str(exc_info.value)
     assert "Variables d'environnement manquantes" in message
-    assert "LWE_TOKEN" in message
-    assert "PHPSESSID" in message
+    assert "LWE_USERNAME" in message
+    assert "LWE_PASSWORD" in message
 
 
 def test_get_settings_raises_when_env_file_is_missing(
@@ -68,5 +107,45 @@ def test_get_settings_raises_when_env_file_is_missing(
     message = str(exc_info.value)
     assert "Variables d'environnement manquantes" in message
     assert "BASE_URL" in message
-    assert "LWE_TOKEN" in message
-    assert "PHPSESSID" in message
+    assert "USERNAME" in message
+    assert "PASSWORD" in message
+
+
+def test_get_settings_raises_when_login_does_not_return_phpsessid(
+    isolated_env: None,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("BASE_URL", "https://api.example.com")
+    monkeypatch.setenv("LWE_USERNAME", "admin")
+    monkeypatch.setenv("LWE_PASSWORD", "secret")
+
+    mock_response = MagicMock()
+    mock_response.cookies.get.return_value = None
+    mock_client = MagicMock()
+    mock_client.post.return_value = mock_response
+    mock_client.__enter__.return_value = mock_client
+    mock_client.__exit__.return_value = False
+
+    with patch("src.config.initialization.Client", return_value=mock_client):
+        with pytest.raises(InitializationError) as exc_info:
+            get_settings()
+
+    assert "PHPSESSID non trouvé" in str(exc_info.value)
+
+
+def test_get_settings_raises_when_login_request_fails(
+    isolated_env: None,
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("BASE_URL", "https://api.example.com")
+    monkeypatch.setenv("LWE_USERNAME", "admin")
+    monkeypatch.setenv("LWE_PASSWORD", "secret")
+
+    with patch(
+        "src.config.initialization.Client",
+        side_effect=RuntimeError("network down"),
+    ):
+        with pytest.raises(InitializationError) as exc_info:
+            get_settings()
+
+    assert "Erreur lors de la connexion" in str(exc_info.value)