diracx 0.0.1a45__tar.gz → 0.0.1a46__tar.gz

{diracx-0.0.1a45 → diracx-0.0.1a46}/.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           run-install: false
           post-cleanup: false
@@ -32,7 +32,7 @@ jobs:
           pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           cache: false
           environments: shellcheck
@@ -63,7 +63,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           run-install: false
           post-cleanup: false
@@ -76,7 +76,7 @@ jobs:
           pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           cache: false
           environments: ${{ matrix.package }}
@@ -96,7 +96,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           run-install: false
           post-cleanup: false
@@ -109,7 +109,7 @@ jobs:
           pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           cache: false
           environments: ${{ matrix.extension == 'diracx' && 'default' || 'default-gubbins' }}
@@ -222,7 +222,7 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           run-install: false
           post-cleanup: false
@@ -232,7 +232,7 @@ jobs:
           pixi add --no-install --pypi --feature diracx-core pytest-github-actions-annotate-failures
           # Show any changes
           git diff
-      - uses: prefix-dev/setup-pixi@v0.8.8
+      - uses: prefix-dev/setup-pixi@v0.8.11
         with:
           cache: false
           locked: false

diracx-0.0.1a46/.github/workflows/update_security_txt_expiry.yml

@@ -0,0 +1,88 @@
+name: Update Security.txt Expiry
+
+on:
+  schedule:
+    # Runs once a year
+    - cron: '15 2 1 1 *' # January 1st at 02:15 UTC
+  workflow_dispatch: # Allows manual triggering for testing.
+
+jobs:
+  update-expiry:
+    runs-on: ubuntu-latest
+    # Grant GITHUB_TOKEN permissions to create a pull request.
+    permissions:
+      contents: write
+      pull-requests: write
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Update expiry date in well_known.py
+        id: update_script
+        run: |
+          import re
+          from datetime import datetime, timedelta, timezone
+          import os
+
+          file_path = "diracx-routers/src/diracx/routers/auth/well_known.py"
+          changes_made = False
+
+          with open(file_path, "r") as f:
+              content = f.read()
+
+          # Using a robust regex to find the line and capture the date
+          pattern = re.compile(r'''(^\s*Expires: )(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z)''', re.MULTILINE)
+          match = pattern.search(content)
+
+          if match:
+              old_date_str = match.group(2)
+              try:
+                  expiry_date = datetime.strptime(old_date_str, "%Y-%m-%dT%H:%M:%S.%fZ").replace(tzinfo=timezone.utc)
+                  now = datetime.now(timezone.utc)
+
+                  # Update if the expiry is less than 45 days away
+                  if (expiry_date - now) < timedelta(days=45):
+                      # Set the new expiry to be 1 year from today
+                      new_expiry_date = now + timedelta(days=365)
+                      new_date_str = new_expiry_date.strftime("%Y-%m-%dT%H:%M:%S.%f")[:-3] + "Z"
+
+                      new_content = pattern.sub(r'''\g<1>''' + new_date_str, content)
+
+                      with open(file_path, "w") as f:
+                          f.write(new_content)
+
+                      print(f"INFO: Updated expiry date to {new_date_str}")
+                      changes_made = True
+                  else:
+                      print(f"INFO: Expiry date {old_date_str} is not within the update window. No changes made.")
+              except (ValueError) as e:
+                  print(f"ERROR: Could not parse date string {old_date_str}. Error: {e}")
+
+          else:
+              print(f"ERROR: Could not find the 'Expires:' line in the specified format in {file_path}")
+
+          # Set output for subsequent steps
+          with open(os.environ['GITHUB_OUTPUT'], 'a') as hf:
+              print(f'changes_made={str(changes_made).lower()}', file=hf)
+        shell: python
+
+      - name: Create Pull Request
+        if: steps.update_script.outputs.changes_made == 'true'
+        uses: peter-evans/create-pull-request@v7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: "chore(security): Update security.txt expiry date"
+          title: "Automated Security.txt Expiry Update"
+          body: |
+            This is an automated PR to update the `Expires` field in the `security.txt` file.
+
+            The expiry date is automatically updated to one year from the current date to ensure it remains valid.
+          branch: "chore/update-security-txt-expiry"
+          base: "main"
+          delete-branch: true

{diracx-0.0.1a45 → diracx-0.0.1a46}/.github/workflows/vulnerabilities.yml

@@ -22,7 +22,7 @@ jobs:
           tags: true
 
       - name: Run Trivy (client:dev)
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         with:
           image-ref: "ghcr.io/diracgrid/diracx/client:dev"
           format: "sarif"
@@ -35,7 +35,7 @@ jobs:
           category: "client-dev"
 
       - name: Run Trivy (services:dev)
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         with:
           image-ref: "ghcr.io/diracgrid/diracx/services:dev"
           format: "sarif"
@@ -61,7 +61,7 @@ jobs:
 
       - name: Run Trivy (client:release)
         if: ${{ steps.get-latest-tag.outputs.latest_tag != '' }}
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         with:
           image-ref: "ghcr.io/diracgrid/diracx/client:${{ steps.get-latest-tag.outputs.latest_tag }}"
           format: "sarif"
@@ -77,7 +77,7 @@ jobs:
 
       - name: Run Trivy (services:release)
         if: ${{ steps.get-latest-tag.outputs.latest_tag != '' }}
-        uses: aquasecurity/trivy-action@0.30.0
+        uses: aquasecurity/trivy-action@0.32.0
         with:
           image-ref: "ghcr.io/diracgrid/diracx/services:${{ steps.get-latest-tag.outputs.latest_tag }}"
           format: "sarif"

{diracx-0.0.1a45 → diracx-0.0.1a46}/.pre-commit-config.yaml

@@ -1,9 +1,22 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
+default_install_hook_types:
+  - pre-commit
+  - commit-msg
+
 default_language_version:
   python: python3
 
+default_stages: [pre-commit]
+
 repos:
+  - repo: https://github.com/compilerla/conventional-pre-commit
+    rev: v4.2.0
+    hooks:
+      - id: conventional-pre-commit
+        stages: [commit-msg]
+        args: ["--verbose"]
+
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
@@ -14,18 +27,14 @@ repos:
       - id: check-added-large-files
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: 'v0.11.9'
+    rev: 'v0.12.3'
     hooks:
       - id: ruff
         args: ["--fix", "--show-fixes"]
-
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 25.1.0
-    hooks:
-      - id: black
+      - id: ruff-format
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.15.0
+    rev: v1.16.1
     hooks:
       - id: mypy
         additional_dependencies:
@@ -51,7 +60,4 @@ repos:
     rev: v2.4.1
     hooks:
     - id: codespell
-      args:
-        - "--skip=diracx-client/src/diracx/client/_generated/*, diracx-[a-z]*/tests/*, diracx-testing/*, build/*, extensions/gubbins/gubbins-client/src/gubbins/client/_generated/*, extensions/gubbins/gubbins-*/tests/*"
-        - "--ignore-words-list=CheckIn"
-        - "-w"
+      args: ["-w"]

{diracx-0.0.1a45 → diracx-0.0.1a46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diracx
-Version: 0.0.1a45
+Version: 0.0.1a46
 Summary: Client installation for users of DiracX installations
 License: GPL-3.0-only
 License-File: LICENSE
@@ -20,8 +20,7 @@ Description-Content-Type: text/markdown
 
 ![DiracX tests](https://github.com/DIRACGrid/diracx/actions/workflows/main.yml/badge.svg?branch=main)
 ![Legacy tests](https://github.com/DIRACGrid/diracx/actions/workflows/integration.yml/badge.svg?branch=main)
-![Diracx deployment](https://github.com/DIRACGrid/diracx/actions/workflows/deployment.yml/badge.svg?branch=main)
-![Diracx: extensions](https://github.com/DIRACGrid/diracx/actions/workflows/extensions.yml/badge.svg?branch=main)
+![DiracX deployment](https://github.com/DIRACGrid/diracx/actions/workflows/deployment.yml/badge.svg?branch=main)
 
 # DiracX
 

{diracx-0.0.1a45 → diracx-0.0.1a46}/README.md

@@ -1,7 +1,6 @@
 ![DiracX tests](https://github.com/DIRACGrid/diracx/actions/workflows/main.yml/badge.svg?branch=main)
 ![Legacy tests](https://github.com/DIRACGrid/diracx/actions/workflows/integration.yml/badge.svg?branch=main)
-![Diracx deployment](https://github.com/DIRACGrid/diracx/actions/workflows/deployment.yml/badge.svg?branch=main)
-![Diracx: extensions](https://github.com/DIRACGrid/diracx/actions/workflows/extensions.yml/badge.svg?branch=main)
+![DiracX deployment](https://github.com/DIRACGrid/diracx/actions/workflows/deployment.yml/badge.svg?branch=main)
 
 # DiracX
 

{diracx-0.0.1a45 → diracx-0.0.1a46}/diracx-cli/pyproject.toml

@@ -20,7 +20,7 @@ dependencies = [
     "gitpython",
     "pydantic>=2.10",
     "rich",
-    "typer>=0.12.4",
+    "typer>=0.15.4",
     "pyyaml",
 ]
 dynamic = ["version"]

{diracx-0.0.1a45 → diracx-0.0.1a46}/diracx-cli/src/diracx/cli/auth.py

@@ -12,7 +12,9 @@ from typing import Annotated, Optional
 import typer
 
 from diracx.client.aio import AsyncDiracClient
-from diracx.client.models import DeviceFlowErrorResponse
+
+# See https://github.com/DIRACGrid/diracx/issues/578
+from diracx.client.models import DeviceFlowErrorResponse  # type: ignore [attr-defined]
 from diracx.core.preferences import get_diracx_preferences
 from diracx.core.utils import read_credentials, write_credentials
 
@@ -88,7 +90,9 @@ async def login(
         )
         while expires > datetime.now(tz=timezone.utc):
             print(".", end="", flush=True)
-            response = await api.auth.get_oidc_token(device_code=data.device_code, client_id=api.client_id)  # type: ignore
+            response = await api.auth.get_oidc_token(
+                device_code=data.device_code, client_id=api.client_id
+            )  # type: ignore
             if isinstance(response, DeviceFlowErrorResponse):
                 if response.error == "authorization_pending":
                     # TODO: Setting more than 5 seconds results in an error

{diracx-0.0.1a45 → diracx-0.0.1a46}/diracx-cli/src/diracx/cli/internal/legacy.py

@@ -95,6 +95,7 @@ def _apply_fixes(raw):
     raw["DIRAC"].pop("Extensions", None)
     raw["DIRAC"].pop("Framework", None)
     raw["DIRAC"].pop("Security", None)
+    raw["DIRAC"].pop("PreferredURLPatterns", None)
 
     # This is VOMS specific and no longer required
     raw["DIRAC"].pop("ConnConf", None)
@@ -265,7 +266,6 @@ def generate_helm_values(
     from diracx.core.extensions import select_from_extension
 
     for entry_point in select_from_extension(group="diracx.db.sql"):
-
         db_name = entry_point.name
         db_config = all_db_configs.get(db_name, {})
 
@@ -284,9 +284,9 @@ def generate_helm_values(
         if "Password" in db_config:
             sql_dbs["dbs"][db_name]["password"] = db_config.get("Password")
         if "Host" in db_config or "Port" in db_config:
-            sql_dbs["dbs"][db_name][
-                "host"
-            ] = f"{db_config.get('Host', default_db_host)}:{db_config.get('Port', default_db_port)}"
+            sql_dbs["dbs"][db_name]["host"] = (
+                f"{db_config.get('Host', default_db_host)}:{db_config.get('Port', default_db_port)}"
+            )
         if not sql_dbs["dbs"][db_name]:
             sql_dbs["dbs"][db_name] = None
 

{diracx-0.0.1a45 → diracx-0.0.1a46}/diracx-cli/tests/legacy/cs_sync/integration_test.cfg

@@ -1,6 +1,7 @@
 DIRAC
 {
   VirtualOrganization = vo
+  PreferredURLPatterns = .*\.main\.invalid/.*
   Configuration
   {
     Name = Production

{diracx-0.0.1a45 → diracx-0.0.1a46}/diracx-client/src/diracx/client/_generated/_client.py

@@ -15,12 +15,7 @@ from azure.core.rest import HttpRequest, HttpResponse
 from . import models as _models
 from ._configuration import DiracConfiguration
 from ._utils.serialization import Deserializer, Serializer
-from .operations import (
-    AuthOperations,
-    ConfigOperations,
-    JobsOperations,
-    WellKnownOperations,
-)
+from .operations import AuthOperations, ConfigOperations, JobsOperations, WellKnownOperations
 
 
 class Dirac:  # pylint: disable=client-accepts-api-version-keyword
@@ -57,39 +52,21 @@ class Dirac:  # pylint: disable=client-accepts-api-version-keyword
                 self._config.custom_hook_policy,
                 self._config.logging_policy,
                 policies.DistributedTracingPolicy(**kwargs),
-                (
-                    policies.SensitiveHeaderCleanupPolicy(**kwargs)
-                    if self._config.redirect_policy
-                    else None
-                ),
+                policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None,
                 self._config.http_logging_policy,
             ]
-        self._client: PipelineClient = PipelineClient(
-            base_url=endpoint, policies=_policies, **kwargs
-        )
+        self._client: PipelineClient = PipelineClient(base_url=endpoint, policies=_policies, **kwargs)
 
-        client_models = {
-            k: v for k, v in _models.__dict__.items() if isinstance(v, type)
-        }
+        client_models = {k: v for k, v in _models.__dict__.items() if isinstance(v, type)}
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
         self._serialize.client_side_validation = False
-        self.well_known = WellKnownOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.auth = AuthOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.config = ConfigOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-        self.jobs = JobsOperations(
-            self._client, self._config, self._serialize, self._deserialize
-        )
-
-    def send_request(
-        self, request: HttpRequest, *, stream: bool = False, **kwargs: Any
-    ) -> HttpResponse:
+        self.well_known = WellKnownOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.auth = AuthOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.config = ConfigOperations(self._client, self._config, self._serialize, self._deserialize)
+        self.jobs = JobsOperations(self._client, self._config, self._serialize, self._deserialize)
+
+    def send_request(self, request: HttpRequest, *, stream: bool = False, **kwargs: Any) -> HttpResponse:
         """Runs the network request through the client's chained policies.
 
         >>> from azure.core.rest import HttpRequest

{diracx-0.0.1a45 → diracx-0.0.1a46}/diracx-client/src/diracx/client/_generated/_configuration.py

@@ -25,24 +25,12 @@ class DiracConfiguration:  # pylint: disable=too-many-instance-attributes
         self._configure(**kwargs)
 
     def _configure(self, **kwargs: Any) -> None:
-        self.user_agent_policy = kwargs.get(
-            "user_agent_policy"
-        ) or policies.UserAgentPolicy(**kwargs)
-        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(
-            **kwargs
-        )
+        self.user_agent_policy = kwargs.get("user_agent_policy") or policies.UserAgentPolicy(**kwargs)
+        self.headers_policy = kwargs.get("headers_policy") or policies.HeadersPolicy(**kwargs)
         self.proxy_policy = kwargs.get("proxy_policy") or policies.ProxyPolicy(**kwargs)
-        self.logging_policy = kwargs.get(
-            "logging_policy"
-        ) or policies.NetworkTraceLoggingPolicy(**kwargs)
-        self.http_logging_policy = kwargs.get(
-            "http_logging_policy"
-        ) or policies.HttpLoggingPolicy(**kwargs)
-        self.custom_hook_policy = kwargs.get(
-            "custom_hook_policy"
-        ) or policies.CustomHookPolicy(**kwargs)
-        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(
-            **kwargs
-        )
+        self.logging_policy = kwargs.get("logging_policy") or policies.NetworkTraceLoggingPolicy(**kwargs)
+        self.http_logging_policy = kwargs.get("http_logging_policy") or policies.HttpLoggingPolicy(**kwargs)
+        self.custom_hook_policy = kwargs.get("custom_hook_policy") or policies.CustomHookPolicy(**kwargs)
+        self.redirect_policy = kwargs.get("redirect_policy") or policies.RedirectPolicy(**kwargs)
         self.retry_policy = kwargs.get("retry_policy") or policies.RetryPolicy(**kwargs)
         self.authentication_policy = kwargs.get("authentication_policy")