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

refactor: enforce single OAuth2 account binding per platform #59

Merged
merged 2 commits into from
Aug 2, 2024
Merged

refactor: enforce single OAuth2 account binding per platform #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf7d928
refactor: enforce single OAuth2 account binding per platform
guqing Aug 2, 2024
d0baab4
Merge remote-tracking branch 'origin/main' into refactor/29
guqing Aug 2, 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
3 changes: 2 additions & 1 deletion src/main/java/run/halo/oauth/Oauth2Authenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package run.halo.oauth;

import static org.apache.commons.lang3.StringUtils.defaultIfBlank;
import static org.apache.commons.lang3.StringUtils.defaultString;
import static run.halo.oauth.SocialServerOauth2AuthorizationRequestResolver.SOCIAL_CONNECTION;

Expand Down Expand Up @@ -170,7 +171,7 @@ private ServerAuthenticationSuccessHandler registrationPageHandler(String regist
Assert.notNull(oauth2User, "oauth2User cannot be null");

String loginName = oauth2User.getName();
String name = defaultString(oauth2User.getAttribute("name"), loginName);
String name = defaultIfBlank(oauth2User.getAttribute("name"), loginName);
MultiValueMap<String, String> queryParams = new LinkedMultiValueMap<>();
queryParams.add("login", loginName);
queryParams.add("name", name);
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/run/halo/oauth/OauthClientRegistrationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@ public Mono<ClientRegistration> findByRegistrationId(String registrationId) {
Mono.error(new ProviderNotFoundException(
"Unsupported OAuth2 provider: " + registrationId)))
.flatMap(provider -> fetchEnabledProviders()
.map(enabledNames -> {
if (enabledNames.contains(registrationId)) {
return provider;
.doOnNext(enabledNames -> {
if (!enabledNames.contains(registrationId)) {
throw new OAuth2AuthenticationException(
"Authentication provider is not enabled: " + registrationId);
}
throw new OAuth2AuthenticationException(
"Authentication provider is not enabled: " + registrationId);
})
.thenReturn(provider)
)
.flatMap(this::getClientRegistrationMono);
}
Expand Down
31 changes: 23 additions & 8 deletions src/main/java/run/halo/oauth/UserConnectionServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.security.oauth2.core.user.OAuth2User;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert;
import org.springframework.web.server.ServerWebInputException;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import run.halo.app.core.extension.UserConnection;
Expand Down Expand Up @@ -39,14 +40,22 @@ public Mono<UserConnection> createConnection(String username,

UserConnection connection = convert(username, authentication);
String providerUserId = authentication.getPrincipal().getName();
return fetchUserConnection(connection.getSpec().getRegistrationId(), providerUserId)
.flatMap(persisted -> {
connection.getMetadata().setName(persisted.getMetadata().getName());
connection.getMetadata()
.setVersion(persisted.getMetadata().getVersion());
return client.update(connection);
})
.switchIfEmpty(Mono.defer(() -> client.create(connection)));
return findByRegistrationId(connection.getSpec().getRegistrationId())
.hasElement()
.flatMap(exists -> {
if (exists) {
return Mono.error(new ServerWebInputException(
"已经绑定过 " + connection.getSpec().getRegistrationId() + " 账号，请先解绑"));
}
return fetchUserConnection(connection.getSpec().getRegistrationId(), providerUserId)
.flatMap(persisted -> {
connection.getMetadata().setName(persisted.getMetadata().getName());
connection.getMetadata()
.setVersion(persisted.getMetadata().getVersion());
return client.update(connection);
})
.switchIfEmpty(Mono.defer(() -> client.create(connection)));
});
}

@Override
Expand Down Expand Up @@ -81,6 +90,12 @@ Flux<UserConnection> listByRegistrationIdAndUsername(String registrationId, Stri
&& persisted.getSpec().getUsername().equals(username), null);
}

private Mono<UserConnection> findByRegistrationId(String registrationId) {
return client.list(UserConnection.class,
persisted -> persisted.getSpec().getRegistrationId().equals(registrationId), null)
.next();
}

private Mono<UserConnection> fetchUserConnection(String registrationId, String providerUserId) {
return client.list(UserConnection.class, persisted -> persisted.getSpec()
.getProviderUserId().equals(providerUserId)
Expand Down