Skip to content

[TOAZ-363] Allow UAMI accounts to be added to service admin whitelist #1466

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

Open
bennettn4 wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

[TOAZ-363] Allow UAMI accounts to be added to service admin whitelist #1466

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3dc122
allow uami accounts to be serviceAccountAdmins
bennettn4 Jun 26, 2024
ea35970
boolean logic update and helper function
bennettn4 Jul 1, 2024
50a7842
Merge branch 'develop' into bennettn/sam-integration-thurloe-on-azure
bennettn4 Jul 1, 2024
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
14 changes: 11 additions & 3 deletions src/main/scala/org/broadinstitute/dsde/workbench/sam/api/StandardSamUserDirectives.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,14 @@ trait StandardSamUserDirectives extends SamUserDirectives with LazyLogging with
def asAdminServiceUser: Directive0 = requireOidcHeaders.flatMap { oidcHeaders =>
Directives
.mapInnerRoute { r =>
if (!adminConfig.serviceAccountAdmins.contains(oidcHeaders.email)) {
reject(AuthorizationFailedRejection)
} else {
if (
adminConfig.serviceAccountAdmins.contains(oidcHeaders.email) ||
isServiceAccountAdminUami(oidcHeaders)
) {
logger.info(s"Handling request for service admin account: ${oidcHeaders.email}")
r
} else {
reject(AuthorizationFailedRejection)
}
}
.tflatMap(_ => logAdminServiceAdminUserRequestResult(oidcHeaders))
Expand Down Expand Up @@ -110,6 +113,11 @@ trait StandardSamUserDirectives extends SamUserDirectives with LazyLogging with
)
}

private def isServiceAccountAdminUami(oidcHeaders: OIDCHeaders) = {
val maybeUamiEmail = oidcHeaders.externalId.map(b2cId => WorkbenchEmail(s"${b2cId.value}@uami.terra.bio")).toOption
oidcHeaders.email.value.isEmpty && maybeUamiEmail.isDefined && adminConfig.serviceAccountAdmins.contains(maybeUamiEmail.get)
}

private def logAdminServiceAdminUserRequestResult(oidcHeaders: OIDCHeaders): Directive0 = {
def logRequest(unusedLogger: LoggingAdapter)(req: HttpRequest)(res: RouteResult): Unit =
res match {
Expand Down