Skip to content
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.

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

Support for OIDC API Auth and OIDC integration tests #16977

Merged
merged 26 commits into from
Jan 2, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6182222
Add test harness for oidc login against keycloak
nuwang Oct 8, 2023
d1aa6d1
Add oidc logout tests and fix bug in server side logout
nuwang Oct 8, 2023
9d3d45a
Accept access token for api auth
nuwang Oct 15, 2023
32dc586
Make bearer token optional and test for API calls by users who have n…
nuwang Oct 16, 2023
9367a69
Only run the cleanup if job state is available
nuwang Oct 16, 2023
257ebbc
Refactor method name
nuwang Oct 19, 2023
e4fd79b
Move method to correct class after rebase
nuwang Nov 2, 2023
a7a0492
Add test for token expiry
nuwang Nov 2, 2023
54d0bd2
Add audience configs with additional clients
nuwang Nov 3, 2023
9992c38
Make sure that audiences are respected
nuwang Nov 3, 2023
41e70f2
Add test for unauthorized client
nuwang Nov 3, 2023
4e2f56a
Add default scope
nuwang Nov 3, 2023
c78788e
Add test for unauthorized audience
nuwang Nov 3, 2023
9cc1a6a
Reformat code
nuwang Nov 3, 2023
cc2d8c1
Reduce access token lifespan
nuwang Nov 3, 2023
92851c0
Refactor method names and lint fixes
nuwang Nov 4, 2023
7f05d3f
Fix issues flagged by mypy
nuwang Nov 4, 2023
e1323b7
Start the keycloak container
nuwang Nov 4, 2023
65ee1e6
Change keycloak docker hostname
nuwang Nov 5, 2023
3d1244d
Make keycloak port configurable
nuwang Nov 6, 2023
517f0e7
Verify client scopes before accepting token
nuwang Nov 6, 2023
ca8cb47
Add integration tests for oidc account linkup
nuwang Nov 6, 2023
5d316fb
Improved error messages and exception handling
nuwang Nov 7, 2023
56edd29
Merge branch 'dev' into oidc_api_auth
nuwang Dec 19, 2023
fed04ed
More descriptive help text for oidc_scope_prefix
nuwang Dec 20, 2023
a21c9b2
Also update oidc_scope_prefix description in config_schema.yml
nuwang Dec 20, 2023
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
Prev Previous commit
Next Next commit
Only run the cleanup if job state is available
nuwang committed Nov 6, 2023
commit 9367a6947e7b604555ac69b7b1cfa2e168485f49
6 changes: 4 additions & 2 deletions lib/galaxy_test/base/api.py
Original file line number Diff line number Diff line change
@@ -98,8 +98,10 @@ class UsesApiTestCaseMixin:
def tearDown(self):
if os.environ.get("GALAXY_TEST_EXTERNAL") is None:
# Only kill running jobs after test for managed test instances
for job in self.galaxy_interactor.get("jobs?state=running").json():
self._delete(f"jobs/{job['id']}")
response = self.galaxy_interactor.get("jobs?state=running")
if response.ok:
for job in response.json():
self._delete(f"jobs/{job['id']}")

def _api_url(self, path, params=None, use_key=None, use_admin_key=None):
if not params: