Skip to content

fix: follow the platform's renamed job folder and session cookie #73

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

Merged
cigamit merged 2 commits into from
Sep 15, 2026
Merged

fix: follow the platform's renamed job folder and session cookie #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e833af
fix: accept both names for a job's private data directory
blaipr Sep 14, 2026
7c633c5
fix: default the websocket session cookie to ascender_sessionid
blaipr Sep 14, 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
13 changes: 8 additions & 5 deletions ascenderkit/api/pages/unified_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,20 @@ def controller_dir(self):
"""
self.get()
job_args = self.job_args
# Server-side value, not a brand reference: this must stay in step with
# JOB_FOLDER_PREFIX in awx/main/constants.py over in ctrliq/ascender.
expected_prefix = f'/tmp/awx_{self.id}'
# Server-side values, not brand references: these must stay in step with
# JOB_FOLDER_PREFIX and FORMER_JOB_FOLDER_PREFIX in
# ascender/main/constants.py over in ctrliq/ascender. Both are accepted,
# because this client talks to whichever release the server is running
# and the folder name changed between two of them.
expected_prefixes = (f'/tmp/ascender_{self.id}', f'/tmp/awx_{self.id}')
for arg1, arg2 in zip(job_args[:-1], job_args[1:]):
if arg1 == '-v':
if ':' in arg2:
host_loc = arg2.split(':')[0]
if host_loc.startswith(expected_prefix):
if host_loc.startswith(expected_prefixes):
return host_loc
raise RuntimeError(
f'Could not find a controller private_data_dir for this job. Searched for volume mount to {expected_prefix} inside of args {job_args}'
f'Could not find a controller private_data_dir for this job. Searched for a volume mount to one of {expected_prefixes} inside of args {job_args}'
)


Expand Down
9 changes: 7 additions & 2 deletions ascenderkit/ws.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,13 @@ def __init__(
csrftoken=None,
add_received_time=False,
# Server-side value, not a brand reference: this must stay in step with
# SESSION_COOKIE_NAME in awx/settings/defaults.py over in ctrliq/ascender.
session_cookie_name='awx_sessionid',
# SESSION_COOKIE_NAME in ascender/settings/defaults.py over in
# ctrliq/ascender, which was awx_sessionid before the rename. Unlike the
# HTTP side this cookie is sent rather than read, so it has to be the one
# name the server expects: a caller holding a Connection should pass its
# session_cookie_name, which Connection discovers from the
# X-API-Session-Cookie-Name header at login and is right for any release.
session_cookie_name='ascender_sessionid',
verify=None,
):
# delay this import, because this is an optional dependency
Expand Down