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

fix: Some OIDC authentication settings not being applied #9000

Merged
merged 3 commits into from
Jul 30, 2024
Merged

fix: Some OIDC authentication settings not being applied #9000

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33a586b
change to use newOidcIssuer
WNomunomu Jul 30, 2024
900be27
Changing the timing of displaying the log
WNomunomu Jul 30, 2024
e3163de
remove unnecessary line
WNomunomu Jul 30, 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
25 changes: 15 additions & 10 deletions apps/app/src/server/service/passport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,43 +571,48 @@ class PassportService implements S2sMessageHandlable {
// Prevent request timeout error on app init
const oidcIssuer = await this.getOIDCIssuerInstance(issuerHost);
if (oidcIssuer != null) {
const oidcIssuerMetadata = oidcIssuer.metadata;

logger.debug('Discovered issuer %s %O', oidcIssuer.issuer, oidcIssuer.metadata);

const authorizationEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:authorizationEndpoint');
if (authorizationEndpoint) {
oidcIssuer.metadata.authorization_endpoint = authorizationEndpoint;
oidcIssuerMetadata.authorization_endpoint = authorizationEndpoint;
}
const tokenEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:tokenEndpoint');
if (tokenEndpoint) {
oidcIssuer.metadata.token_endpoint = tokenEndpoint;
oidcIssuerMetadata.token_endpoint = tokenEndpoint;
}
const revocationEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:revocationEndpoint');
if (revocationEndpoint) {
oidcIssuer.metadata.revocation_endpoint = revocationEndpoint;
oidcIssuerMetadata.revocation_endpoint = revocationEndpoint;
}
const introspectionEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:introspectionEndpoint');
if (introspectionEndpoint) {
oidcIssuer.metadata.introspection_endpoint = introspectionEndpoint;
oidcIssuerMetadata.introspection_endpoint = introspectionEndpoint;
}
const userInfoEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:userInfoEndpoint');
if (userInfoEndpoint) {
oidcIssuer.metadata.userinfo_endpoint = userInfoEndpoint;
oidcIssuerMetadata.userinfo_endpoint = userInfoEndpoint;
}
const endSessionEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:endSessionEndpoint');
if (endSessionEndpoint) {
oidcIssuer.metadata.end_session_endpoint = endSessionEndpoint;
oidcIssuerMetadata.end_session_endpoint = endSessionEndpoint;
}
const registrationEndpoint = configManager.getConfig('crowi', 'security:passport-oidc:registrationEndpoint');
if (registrationEndpoint) {
oidcIssuer.metadata.registration_endpoint = registrationEndpoint;
oidcIssuerMetadata.registration_endpoint = registrationEndpoint;
}
const jwksUri = configManager.getConfig('crowi', 'security:passport-oidc:jwksUri');
if (jwksUri) {
oidcIssuer.metadata.jwks_uri = jwksUri;
oidcIssuerMetadata.jwks_uri = jwksUri;
}
logger.debug('Configured issuer %s %O', oidcIssuer.issuer, oidcIssuer.metadata);

const client = new oidcIssuer.Client({
const newOidcIssuer = new OIDCIssuer(oidcIssuerMetadata);

logger.debug('Configured issuer %s %O', newOidcIssuer.issuer, newOidcIssuer.metadata);

const client = new newOidcIssuer.Client({
client_id: clientId,
client_secret: clientSecret,
redirect_uris: [redirectUri],
Expand Down
Loading