Skip to content

Make group auth check case-insensitive #11610

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

Closed
akulyakhtin wants to merge 4 commits into from
Closed

Make group auth check case-insensitive #11610

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
87141d0
Case-insensitive disjoint
Jul 3, 2025
0c0296e
Merge branch 'master' into fix_11609_case_insensitive_disjoint
akulyakhtin Jul 24, 2025
384e839
Apply suggestion from @Copilot
alisman Mar 24, 2026
a8f4b3d
Apply suggestion from @Copilot
alisman Mar 24, 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
8 changes: 7 additions & 1 deletion src/main/java/org/cbioportal/application/security/CancerStudyPermissionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ private boolean hasAccessToCancerStudy(
Arrays.stream(cancerStudy.getGroups().split(";"))
.filter(g -> !g.isEmpty())
.collect(Collectors.toSet());
if (!Collections.disjoint(groups, grantedAuthorities)) {
if (!caseInsensitiveDisjoint(groups, grantedAuthorities)) {
if (log.isDebugEnabled()) {
log.debug("hasAccessToCancerStudy(), user has access by groups return true");
}
Expand All @@ -393,6 +393,12 @@ private boolean hasAccessToCancerStudy(
return toReturn;
}

private static boolean caseInsensitiveDisjoint(Collection<String> c1, Collection<String> c2) {
Comment thread
alisman marked this conversation as resolved.
Set<String> upperC1 = c1.stream().map(String::toUpperCase).collect(Collectors.toSet());
Set<String> upperC2 = c2.stream().map(String::toUpperCase).collect(Collectors.toSet());
Comment thread
alisman marked this conversation as resolved.
Outdated
Comment thread
alisman marked this conversation as resolved.
Outdated
return Collections.disjoint(upperC1, upperC2);
}

private boolean hasAccessToCancerStudy(
Authentication authentication, String cancerStudyId, Object permission) {
// everybody has access the 'all' cancer study
Expand Down
Loading