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.

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

Update redirect URIs in authentication services #210

Merged
merged 1 commit into from
Sep 17, 2024
Merged

Update redirect URIs in authentication services #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion ...-services/src/main/java/edu/harvard/hms/dbmi/avillach/auth/service/impl/TokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ private TokenInspection validateToken(Map<String, Object> inputMap) throws Illeg
// The protocol between applications and PSAMA is application will
// attach everything that needs to be verified in request field of inputMap
// besides token. So here we should attach everything in request.
&& authorizationService.isAuthorized(application, inputMap.get("request"), user)) {
&& authorizationService.isAuthorized(application, inputMap.get("request"), user, isLongTermToken)) {
isAuthorizationPassed = true;
} else {
// if isLongTermTokenCompromised flag is true,
Expand Down
5 changes: 3 additions & 2 deletions ...a/edu/harvard/hms/dbmi/avillach/auth/service/impl/authorization/AuthorizationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,12 @@ public AuthorizationService(AccessRuleService accessRuleService,
*
* @param application
* @param requestBody
* @param isLongTermToken
* @return
* @see Privilege
* @see AccessRule
*/
public boolean isAuthorized(Application application, Object requestBody, User user) {
public boolean isAuthorized(Application application, Object requestBody, User user, boolean isLongTermToken) {
String applicationName = application.getName();
String resourceId = "null";
String targetService = "null";
Expand All @@ -103,7 +104,7 @@ public boolean isAuthorized(Application application, Object requestBody, User us
return false;
}

if (sessionService.isSessionExpired(user.getSubject())) {
if (!isLongTermToken && sessionService.isSessionExpired(user.getSubject())) {
logger.error("isAuthorized() Session expired {}", user.getSubject());
return false;
}
Expand Down
8 changes: 4 additions & 4 deletions ...c/test/java/edu/harvard/hms/dbmi/avillach/auth/service/impl/AuthorizationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void testIsAuthorized_AccessRulePassed() {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("test", "value");

boolean result = authorizationService.isAuthorized(application, requestBody, user);
boolean result = authorizationService.isAuthorized(application, requestBody, user, false);

assertTrue(result);
}
Expand All @@ -77,7 +77,7 @@ public void testIsAuthorized_AccessRuleFailed() {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("test", "differentValue");

boolean result = authorizationService.isAuthorized(application, requestBody, user);
boolean result = authorizationService.isAuthorized(application, requestBody, user, false);

assertFalse(result);
}
Expand Down Expand Up @@ -171,7 +171,7 @@ public void testIsAuthorized_NoRequestBody() {
configureUserSecurityContext(user);
application.setPrivileges(user.getPrivilegesByApplication(application));

boolean result = authorizationService.isAuthorized(application, null, user);
boolean result = authorizationService.isAuthorized(application, null, user, false);

assertTrue(result);
}
Expand All @@ -182,7 +182,7 @@ public void testIsAuthorized_NoPrivileges() {
User user = createTestUser();

user.getRoles().iterator().next().setPrivileges(Collections.emptySet());
boolean result = authorizationService.isAuthorized(application, new HashMap<>(), user);
boolean result = authorizationService.isAuthorized(application, new HashMap<>(), user, false);

assertFalse(result);
}
Expand Down
10 changes: 5 additions & 5 deletions ...u/harvard/hms/dbmi/avillach/auth/service/impl/authorization/AuthorizationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ public void testIsAuthorized_AccessRulePassed() {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("test", "value");

boolean result = authorizationService.isAuthorized(application, requestBody, user);
boolean result = authorizationService.isAuthorized(application, requestBody, user, false);

assertTrue(result);
}
Expand All @@ -359,7 +359,7 @@ public void testIsAuthorized_AccessRuleFailed() {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("test", "differentValue");

boolean result = authorizationService.isAuthorized(application, requestBody, user);
boolean result = authorizationService.isAuthorized(application, requestBody, user, false);

assertFalse(result);
}
Expand All @@ -374,7 +374,7 @@ public void testIsAuthorized_AccessRuleFailed_strict() {
Map<String, Object> requestBody = new HashMap<>();
requestBody.put("test", "differentValue");

boolean result = authorizationService.isAuthorized(application, requestBody, user);
boolean result = authorizationService.isAuthorized(application, requestBody, user, false);

assertFalse(result);
}
Expand Down Expand Up @@ -476,7 +476,7 @@ public void testIsAuthorized_NoRequestBody() {
configureUserSecurityContext(user);
application.setPrivileges(user.getPrivilegesByApplication(application));

boolean result = authorizationService.isAuthorized(application, null, user);
boolean result = authorizationService.isAuthorized(application, null, user, false);

assertTrue(result);
}
Expand All @@ -488,7 +488,7 @@ public void testIsAuthorized_NoPrivileges() {
user.setConnection(createFenceTestConnection());

user.getRoles().iterator().next().setPrivileges(Collections.emptySet());
boolean result = authorizationService.isAuthorized(application, new HashMap<>(), user);
boolean result = authorizationService.isAuthorized(application, new HashMap<>(), user, false);

assertFalse(result);
}
Expand Down