Skip to content

[9.0] Use DIRACX_CA_PATH to communicate to diracx and S3 #8364

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: integration
Choose a base branch
from
Open

[9.0] Use DIRACX_CA_PATH to communicate to diracx and S3 #8364

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63de52f
fix: use DIRACX_CA_PATH if set to communicate to diracx and minIO
atsareg Nov 3, 2025
beaf1fd
fix: use CAs from DIRACX_CA_PATH for downloads also
atsareg Nov 3, 2025
f690a74
fix: take the CA's file path from the DIRACX_CA_PATH environment
atsareg Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/DIRAC/FrameworkSystem/Utilities/diracx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@
DEFAULT_TOKEN_CACHE_SIZE = 1024

legacy_exchange_session = requests.Session()
diracxUrl = gConfig.getValue("/DiracX/URL")
Copy link
Contributor

@fstagni fstagni Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be a URL, or you break the pydantic check.

Probably:

Suggested change
diracxUrl = gConfig.getValue("/DiracX/URL")
diracxUrl = gConfig.getValue("/DiracX/URL", os.environ["DIRACX_URL"])

then inject one for the unit test.

legacy_exchange_session.verify = DiracxPreferences(url=diracxUrl).ca_path or True


def get_token(
Expand Down
6 changes: 4 additions & 2 deletions src/DIRAC/WorkloadManagementSystem/Service/SandboxStoreHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ def _getFromClient(self, fileId, token, fileSize, fileHelper=None, data=""):
gLogger.debug("Uploading sandbox for", res.pfn)
files = {"file": ("file", tar_fh)}

response = requests.post(res.url, data=res.fields, files=files, timeout=300)
verify = os.environ.get("DIRACX_CA_PATH", True)
response = requests.post(res.url, data=res.fields, files=files, timeout=300, verify=verify)

gLogger.debug("Sandbox uploaded", f"for {res.pfn} with status code {response.status_code}")
# TODO: Handle this error better
Expand Down Expand Up @@ -371,7 +372,8 @@ def _sendToClient(self, fileID, token, fileHelper=None, raw=False):
if filePath.startswith("/S3"):
with TheImpersonator(credDict, source="SandboxStore") as client:
res = client.jobs.get_sandbox_file(pfn=filePath)
r = requests.get(res.url)
verify = os.environ.get("DIRACX_CA_PATH", True)
r = requests.get(res.url, verify=verify)
r.raise_for_status()
sbData = r.content
if fileHelper:
Expand Down
Loading