Thanks to visit codestin.com
Credit goes to github.com

Skip to content

SEAB-7134: Fix auth-related 500 #6106

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
svonworl merged 2 commits into from
May 1, 2025
Merged

SEAB-7134: Fix auth-related 500 #6106

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
912096c
fix problem
svonworl May 1, 2025
95c41a3
add a couple more tests
svonworl May 1, 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
3 changes: 3 additions & 0 deletions ...-webservice/src/main/java/io/dockstore/webservice/permissions/sam/SamPermissionsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,9 @@ private void addPolicy(ResourcesApi resourcesApi, String resourceId, String poli

@Override
public boolean canDoAction(User user, Workflow workflow, Role.Action action) {
if (user == null) {
return false;
}
if (hasGoogleToken(user)) {
try {
final ResourcesApi resourcesApi = getResourcesApi(user);
Expand Down
4 changes: 4 additions & 0 deletions ...service/src/test/java/io/dockstore/webservice/permissions/sam/SamPermissionsImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,10 @@ void testCanRead() throws ApiException {
Workflow fooWorkflow = Mockito.mock(Workflow.class);
when(fooWorkflow.getWorkflowPath()).thenReturn(FOO_WORKFLOW_NAME, GOO_WORKFLOW_NAME);
assertTrue(samPermissionsImpl.canDoAction(janeDoeUserMock, fooWorkflow, Action.READ));
assertFalse(samPermissionsImpl.canDoAction(null, fooWorkflow, Action.READ));
Workflow gooWorkflow = Mockito.mock(Workflow.class);
assertFalse(samPermissionsImpl.canDoAction(janeDoeUserMock, gooWorkflow, Action.READ));
assertFalse(samPermissionsImpl.canDoAction(null, gooWorkflow, Action.READ));
}

@Test
Expand All @@ -252,9 +254,11 @@ void testCanWrite() throws ApiException {

when(workflowInstance.getWorkflowPath()).thenReturn(FOO_WORKFLOW_NAME);
assertTrue(samPermissionsImpl.canDoAction(janeDoeUserMock, workflowInstance, Action.WRITE));
assertFalse(samPermissionsImpl.canDoAction(null, workflowInstance, Action.WRITE));
Workflow gooWorkflow = Mockito.mock(Workflow.class);
when(gooWorkflow.getWorkflowPath()).thenReturn(GOO_WORKFLOW_NAME);
assertFalse(samPermissionsImpl.canDoAction(janeDoeUserMock, gooWorkflow, Action.WRITE));
assertFalse(samPermissionsImpl.canDoAction(null, gooWorkflow, Action.WRITE));
}

@Test
Expand Down
Loading