Skip to content

Block webviews from allowing multiple parallel authorization_grant flows #4918

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 1 commit into from
Oct 2, 2024
Merged

Block webviews from allowing multiple parallel authorization_grant flows #4918

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
11 changes: 11 additions & 0 deletions ...re/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/LoginUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,35 @@ import software.amazon.awssdk.services.ssooidc.model.SsoOidcException
import software.amazon.awssdk.services.sts.StsClient
import software.aws.toolkits.core.credentials.validatedSsoIdentifierFromUrl
import software.aws.toolkits.core.region.AwsRegion
import software.aws.toolkits.core.utils.debug
import software.aws.toolkits.core.utils.getLogger
import software.aws.toolkits.core.utils.warn
import software.aws.toolkits.jetbrains.core.AwsClientManager
import software.aws.toolkits.jetbrains.core.credentials.profiles.SsoSessionConstants
import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
import software.aws.toolkits.jetbrains.core.credentials.sono.isSono
import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.InteractiveBearerTokenProvider
import software.aws.toolkits.jetbrains.core.credentials.sso.pkce.ToolkitOAuthService
import software.aws.toolkits.jetbrains.utils.runUnderProgressIfNeeded
import software.aws.toolkits.resources.AwsCoreBundle
import software.aws.toolkits.telemetry.CredentialSourceId
import java.io.IOException

private val LOG = getLogger<Login<*>>()

sealed class Login<T> {
abstract val id: CredentialSourceId
abstract val onError: (Exception) -> Unit
protected abstract fun doLogin(project: Project): T

fun login(project: Project): T {
LOG.debug { "Starting login with request: $this" }
try {
check(!ToolkitOAuthService.getInstance().hasPendingRequest()) {
LOG.warn { "$this attempt initiated with pending request: ${ToolkitOAuthService.getInstance().pendingRequest()}" }
AwsCoreBundle.message("toolkit.login.singleton")
}
return doLogin(project)
} catch (e: Exception) {
onError(e)
Expand Down
2 changes: 2 additions & 0 deletions ...nity/src/software/aws/toolkits/jetbrains/core/credentials/sso/pkce/ToolkitOAuthService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ const val PKCE_CLIENT_NAME = "AWS IDE Plugins for JetBrains"
class ToolkitOAuthService : OAuthServiceBase<AccessToken>() {
override val name: String = "aws/toolkit"

internal fun pendingRequest() = (currentRequest.get()?.request as? ToolkitOAuthRequest)?.registration

fun hasPendingRequest() = currentRequest.get() != null

fun authorize(registration: PKCEClientRegistration): CompletableFuture<AccessToken> {
Expand Down
1 change: 1 addition & 0 deletions plugins/core/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1954,6 +1954,7 @@ toolkit.login.dialog.sso.text_field.region=Region:
toolkit.login.dialog.sso.text_field.start_url=Start URL:
toolkit.login.dialog.sso.title=Connect using AWS IAM Identity Center
toolkit.login.dialog.title=AWS Toolkit: Add Connection
toolkit.login.singleton=Only one browser authorization flow may be active at once
toolkit.sso_expire.dialog.cancel_button=Cancel
toolkit.sso_expire.dialog.no_button=Don't show again
toolkit.sso_expire.dialog.title=Connection Expired
Expand Down