Skip to content

CORE-444 deny account link #1617

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
merged 3 commits into from
Apr 4, 2025
Merged

CORE-444 deny account link #1617

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b6b76b
deny account link
dvoet Apr 4, 2025
614793d
format
dvoet Apr 4, 2025
e16d201
invalid test
dvoet Apr 4, 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
10 changes: 10 additions & 0 deletions src/main/scala/org/broadinstitute/dsde/firecloud/service/NihService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,16 @@ class NihService(val samDao: SamDAO,

def updateNihLinkAndSyncSelf(userInfo: UserInfo, jwtWrapper: JWTWrapper): Future[PerRequestMessage] = {
val res = for {
_ <-
if (allowedNihMembers(Set(WorkbenchEmail(userInfo.userEmail))).isEmpty) {
Future.failed(
new FireCloudExceptionWithErrorReport(
ErrorReport(StatusCodes.Forbidden, "User is not allowed to link NIH account")
)
)
} else {
Future.successful(())
}
shibbolethPublicKey <- shibbolethDao.getPublicKey()
decodedToken <- Future
.fromTry(Jwt.decodeRawAll(jwtWrapper.jwt, shibbolethPublicKey, Seq(JwtAlgorithm.RS256)))
Expand Down
11 changes: 11 additions & 0 deletions src/test/scala/org/broadinstitute/dsde/firecloud/service/NihServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package org.broadinstitute.dsde.firecloud.service

import akka.http.scaladsl.model.StatusCodes
import akka.http.scaladsl.model.headers.OAuth2BearerToken
import org.broadinstitute.dsde.firecloud.FireCloudExceptionWithErrorReport
import org.broadinstitute.dsde.firecloud.dataaccess._
import org.broadinstitute.dsde.firecloud.mock.MockGoogleServicesDAO
import org.broadinstitute.dsde.firecloud.model.{JWTWrapper, UserInfo}
Expand Down Expand Up @@ -112,4 +114,13 @@ class NihServiceSpec extends AnyFlatSpec with Matchers {
fail(s"Expired token should fail at the decode stage. Response was: $x")
}
}

it should "403 linking denied email" in {
val nihServiceMock = new NihService(samDao, thurloeDao, googleDao, mock[ShibbolethDAO], ecmDao)
val userToken: UserInfo = UserInfo("someone@gmail.com", OAuth2BearerToken("dummyToken"), -1, thurloeDao.TCGA_AND_TARGET_LINKED)
val error = intercept[FireCloudExceptionWithErrorReport] {
Await.result(nihServiceMock.updateNihLinkAndSyncSelf(userToken, JWTWrapper("dummyToken")), 3.seconds)
}
error.errorReport.statusCode shouldBe Some(StatusCodes.Forbidden)
}
}
Loading