fix: Getting tokens from DiracX

chaen · Sep 28, 2023 · 8690e7c · 8690e7c
1 parent 503fefc
commit 8690e7c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py b/src/DIRAC/FrameworkSystem/Service/ProxyManagerHandler.py
@@ -426,13 +426,13 @@ def export_exchangeProxyForToken(self):
  vo = Registry.getVOForGroup(credDict["group"])
  dirac_properties = list(set(credDict.get("groupProperties", [])) | set(credDict.get("properties", [])))
  group = credDict["group"]
- scopes = [f"vo:{vo}", f"group:{group}", [f"property:{prop}" for prop in dirac_properties]]
+ scopes = [f"vo:{vo}", f"group:{group}"] + [f"property:{prop}" for prop in dirac_properties]
 
  r = requests.get(
  f"{diracxUrl}/auth/legacy-exchange",
  params={
  "preferred_username": credDict["username"],
- "scopes": " ".join(scopes),
+ "scope": " ".join(scopes),
  },
  headers={"Authorization": f"Bearer {apiKey}"},
  )

diff --git a/tests/CI/docker-compose.yml b/tests/CI/docker-compose.yml
@@ -65,7 +65,6 @@ services:
  pull_policy: always
 
  diracx-wait-for-db:
-
  image: ${MYSQL_VER}
  container_name: diracx-wait-for-db
  depends_on:
@@ -140,24 +139,38 @@ services:
  - diracx-cs-store:/cs_store/
  - diracx-key-store:/signing-key/
  entrypoint: |
- /dockerMicroMambaEntrypoint.sh dirac internal generate-cs /cs_store/initialRepo --vo=diracAdmin --user-group=admin --idp-url=http://dsdsd.csds/a/b
+ /dockerMicroMambaEntrypoint.sh bash -xc 'dirac internal generate-cs /cs_store/initialRepo --vo=vo --user-group=dirac_user --idp-url=http://dsdsd.csds/a/b && dirac internal add-user /cs_store/initialRepo --vo vo --user-group dirac_user --sub vo:35632895-df94-45de-acaa-43185c822a16 --dn "/C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser" --preferred-username ciuser && dirac internal add-user /cs_store/initialRepo --vo vo --user-group dirac_user --sub vo:e3784483-c854-4258-9bd4-200959db1208 --dn "/C=ch/O=DIRAC/OU=DIRAC CI/CN=ciuser" --preferred-username adminusername'
+ pull_policy: always
+
+ diracx-init-db:
+ image: ghcr.io/diracgrid/diracx/server
+ container_name: diracx-init-db
+ depends_on:
+ diracx-wait-for-db:
+ condition: service_completed_successfully
+ environment:
+ - DIRACX_DB_URL_AUTHDB=mysql+aiomysql://Dirac:Dirac@mysql/AuthDB
+ entrypoint: |
+ /dockerMicroMambaEntrypoint.sh python -m diracx.db init-sql
  pull_policy: always
 
  diracx:
  image: ghcr.io/diracgrid/diracx/server
  container_name: diracx
  environment:
  - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo
- - "DIRACX_DB_URL_AUTHDB=sqlite+aiosqlite:///:memory:"
+ - DIRACX_DB_URL_AUTHDB=mysql+aiomysql://Dirac:Dirac@mysql/AuthDB
  - DIRACX_DB_URL_JOBDB=mysql+aiomysql://Dirac:Dirac@mysql/JobDB
+ - DIRACX_DB_URL_JOBLOGGINGDB=mysql+aiomysql://Dirac:Dirac@mysql/JobLoggingDB
+ - DIRACX_DB_URL_SANDBOXMETADATADB=mysql+aiomysql://Dirac:Dirac@mysql/SandboxMetadataDB
  - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key
  - DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS=["http://diracx:8000/docs/oauth2-redirect"]
  # Obtained with echo 'InsecureChangeMe' | base64 -d | openssl sha512
  - DIRACX_LEGACY_EXCHANGE_HASHED_API_KEY=07cddf6948d316ac9d186544dc3120c4c6697d8f994619665985c0a5bf76265a
  ports:
  - 8000:8000
  depends_on:
- diracx-wait-for-db:
+ diracx-init-db:
  condition: service_completed_successfully
  volumes:
  - diracx-cs-store:/cs_store/

diff --git a/tests/Jenkins/dirac_ci.sh b/tests/Jenkins/dirac_ci.sh
@@ -135,7 +135,7 @@ installSite() {
 
  echo "==> Done installing, now configuring"
  source "${SERVERINSTALLDIR}/bashrc"
- if ! dirac-configure --cfg "${SERVERINSTALLDIR}/install.cfg" --LegacyExchangeApiKey='InsecureChangeMe' "${DEBUG}"; then
+ if ! dirac-configure --cfg "${SERVERINSTALLDIR}/install.cfg" --LegacyExchangeApiKey='diracx:legacy:InsecureChangeMe' "${DEBUG}"; then
  echo "ERROR: dirac-configure failed" >&2
  exit 1
  fi