Skip to content

自动屏蔽 placeholder OAuth provider #480

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
yaffir wants to merge 1 commit into
base: main
Choose a base branch
from
Open

自动屏蔽 placeholder OAuth provider #480

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
15 changes: 15 additions & 0 deletions server/skillhub-app/src/main/java/com/iflytek/skillhub/service/AuthMethodCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public AuthMethodCatalog(OAuth2ClientProperties oAuth2ClientProperties,
public List<AuthProviderResponse> listOAuthProviders(String returnTo) {
String sanitizedReturnTo = OAuthLoginRedirectSupport.sanitizeReturnTo(returnTo);
return new ArrayList<>(oAuth2ClientProperties.getRegistration().entrySet().stream()
.filter(entry -> isValidOAuthProvider(entry.getValue()))
.sorted(Comparator.comparing(entry -> entry.getKey()))
.map(entry -> new AuthProviderResponse(
entry.getKey(),
Expand All @@ -54,6 +55,19 @@ public List<AuthProviderResponse> listOAuthProviders(String returnTo) {
.toList());
}

/**
* Check if an OAuth provider has valid configuration (non-empty client-id that is not a placeholder).
*/
private boolean isValidOAuthProvider(OAuth2ClientProperties.Registration registration) {
String clientId = registration.getClientId();
if (clientId == null || clientId.isBlank()) {
return false;
}
// Filter out placeholder values used in dev/test configs
String lowerClientId = clientId.toLowerCase();
return !lowerClientId.contains("placeholder") && !lowerClientId.contains("local-placeholder");
}

public List<AuthMethodResponse> listMethods(String returnTo) {
String sanitizedReturnTo = OAuthLoginRedirectSupport.sanitizeReturnTo(returnTo);
List<AuthMethodResponse> methods = new ArrayList<>();
Expand All @@ -67,6 +81,7 @@ public List<AuthMethodResponse> listMethods(String returnTo) {
));

oAuth2ClientProperties.getRegistration().entrySet().stream()
.filter(entry -> isValidOAuthProvider(entry.getValue()))
.sorted(Comparator.comparing(entry -> entry.getKey()))
.forEach(entry -> methods.add(new AuthMethodResponse(
"oauth-" + entry.getKey(),
Expand Down
Loading