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

Jump to bottom

Disable id_token time validation #1451

Merged
merged 1 commit into from
Jun 1, 2022
Merged

Disable id_token time validation #1451

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
2 changes: 1 addition & 1 deletion projects/angular-auth-oidc-client/src/lib/auth-state/auth-state.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ describe('Auth State Service', () => {

authStateService.hasIdTokenExpiredAndRenewCheckIsEnabled(config);

expect(spy).toHaveBeenCalledOnceWith('idToken', config, 30);
expect(spy).toHaveBeenCalledOnceWith('idToken', config, 30, undefined);
});

it('fires event if idToken is expired', () => {
Expand Down
4 changes: 2 additions & 2 deletions projects/angular-auth-oidc-client/src/lib/auth-state/auth-state.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,14 +118,14 @@ export class AuthStateService {
}

hasIdTokenExpiredAndRenewCheckIsEnabled(configuration: OpenIdConfiguration): boolean {
const { renewTimeBeforeTokenExpiresInSeconds, enableIdTokenExpiredValidationInRenew } = configuration;
const { renewTimeBeforeTokenExpiresInSeconds, enableIdTokenExpiredValidationInRenew, disableIdTokenValidation } = configuration;

if (!enableIdTokenExpiredValidationInRenew) {
return false;
}
const tokenToCheck = this.storagePersistenceService.getIdToken(configuration);

const idTokenExpired = this.tokenValidationService.hasIdTokenExpired(tokenToCheck, configuration, renewTimeBeforeTokenExpiresInSeconds);
const idTokenExpired = this.tokenValidationService.hasIdTokenExpired(tokenToCheck, configuration, renewTimeBeforeTokenExpiresInSeconds, disableIdTokenValidation);

if (idTokenExpired) {
this.publicEventsService.fireEvent<boolean>(EventTypes.IdTokenExpired, idTokenExpired);
Expand Down
2 changes: 2 additions & 0 deletions projects/angular-auth-oidc-client/src/lib/config/openid-configuration.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,4 +175,6 @@ export interface OpenIdConfiguration {
* The refresh token rotation is optional (rfc6749) but is more safe and hence encouraged.
*/
allowUnsafeReuseRefreshToken?: boolean;
/** Disable validation for id_token expiry time */
disableIdTokenValidation?: boolean
}
4 changes: 2 additions & 2 deletions projects/angular-auth-oidc-client/src/lib/validation/state-validation.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export class StateValidationService {
}

if (callbackContext.authResult.id_token) {
const { clientId, issValidationOff, maxIdTokenIatOffsetAllowedInSeconds, disableIatOffsetValidation, ignoreNonceAfterRefresh } =
const { clientId, issValidationOff, maxIdTokenIatOffsetAllowedInSeconds, disableIatOffsetValidation, ignoreNonceAfterRefresh, disableIdTokenValidation } =
configuration;

toReturn.idToken = callbackContext.authResult.id_token;
Expand Down Expand Up @@ -164,7 +164,7 @@ export class StateValidationService {
return of(toReturn);
}

if (!this.tokenValidationService.validateIdTokenExpNotExpired(toReturn.decodedIdToken, configuration)) {
if (!this.tokenValidationService.validateIdTokenExpNotExpired(toReturn.decodedIdToken, configuration, maxIdTokenIatOffsetAllowedInSeconds, disableIdTokenValidation)) {
this.loggerService.logWarning(configuration, 'authCallback id token expired');
toReturn.state = ValidationResult.TokenExpired;
this.handleUnsuccessfulValidation(configuration);
Expand Down
8 changes: 5 additions & 3 deletions projects/angular-auth-oidc-client/src/lib/validation/token-validation.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,17 @@ export class TokenValidationService {

// id_token C7: The current time MUST be before the time represented by the exp Claim
// (possibly allowing for some small leeway to account for clock skew).
hasIdTokenExpired(token: string, configuration: OpenIdConfiguration, offsetSeconds?: number): boolean {
hasIdTokenExpired(token: string, configuration: OpenIdConfiguration, offsetSeconds?: number, disableIdTokenValidation?: boolean): boolean {
const decoded = this.tokenHelperService.getPayloadFromToken(token, false, configuration);

return !this.validateIdTokenExpNotExpired(decoded, configuration, offsetSeconds);
return !this.validateIdTokenExpNotExpired(decoded, configuration, offsetSeconds, disableIdTokenValidation);
}

// id_token C7: The current time MUST be before the time represented by the exp Claim
// (possibly allowing for some small leeway to account for clock skew).
validateIdTokenExpNotExpired(decodedIdToken: string, configuration: OpenIdConfiguration, offsetSeconds?: number): boolean {
validateIdTokenExpNotExpired(decodedIdToken: string, configuration: OpenIdConfiguration, offsetSeconds?: number, disableIdTokenValidation?: boolean): boolean {
if (disableIdTokenValidation) return true;

const tokenExpirationDate = this.tokenHelperService.getTokenExpirationDate(decodedIdToken);
offsetSeconds = offsetSeconds || 0;

Expand Down