Skip to content

Remove Basic auth from EDC credentials header #236

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
sujen1412 wants to merge 3 commits into
base: main
Choose a base branch
from
+17 −8
Open

Remove Basic auth from EDC credentials header #236

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9db80ae
fix: use Bearer token only for EDC credentials auth header (fixes #148)
claude May 26, 2026
9928d67
Improve EDL response handling and error logging
bsatoriu May 27, 2026
cd8f655
Resolve SonarCloud warnings.
May 27, 2026
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
25 changes: 17 additions & 8 deletions api/endpoints/members.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from api.models.member_secret import MemberSecret as MemberSecret_db
from api.schemas.member_schema import MemberSchema
from api.schemas.member_session_schema import MemberSessionSchema
from api.utils.security_utils import validate_ssh_key_file, sanitize_filename, InvalidFileTypeError, FileSizeTooLargeError, EmptyFileError
from api.utils.security_utils import validate_ssh_key_file, sanitize_filename, InvalidFileTypeError, FileSizeTooLargeError, EmptyFileError, ExternalServiceError
from api.utils.email_util import send_user_status_update_active_user_email, \
send_user_status_update_suspended_user_email, send_user_status_change_email, \
send_welcome_to_maap_active_user_email, send_welcome_to_maap_suspended_user_email
Expand Down Expand Up @@ -816,17 +816,26 @@ def get_edc_credentials(endpoint_uri, user_id):

s.headers.update(
{
'Authorization': f'Bearer {urs_token},Basic {settings.MAAP_EDL_CREDS}',
'Authorization': f'Bearer {urs_token}',
'Connection': 'close'
}
)

endpoint = parse.unquote(endpoint_uri)
login_resp = s.get(endpoint, allow_redirects=False)
edl_response = s.get(endpoint, allow_redirects=False)

if login_resp.status_code == status.HTTP_307_TEMPORARY_REDIRECT:
edl_response = s.get(url=login_resp.headers['location'])
else:
edl_response = edl_federated_request(url=endpoint)
if not edl_response.ok:
log.error(f"EDL credentials request failed with status {edl_response.status_code} for endpoint {endpoint}: {edl_response.text}")
raise ExternalServiceError(f"EDL credentials request failed with status {edl_response.status_code}")

return edl_response.json()
if not edl_response.text:
log.error(f"EDL credentials request returned empty response for endpoint {endpoint}")
raise ExternalServiceError("EDL credentials request returned an empty response")

try:
return edl_response.json()
except requests.exceptions.JSONDecodeError:
log.error(f"EDL credentials response is not valid JSON for endpoint {endpoint}. "
f"Content-Type: {edl_response.headers.get('Content-Type')}. "
f"Response body: {edl_response.text[:500]}")
raise ExternalServiceError("EDL credentials response is not valid JSON")
Loading