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

Rename OIDC expiration-grace property to lifespan-grace #8658

Merged
merged 1 commit into from
Apr 21, 2020
Merged

Rename OIDC expiration-grace property to lifespan-grace #8658

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
17 changes: 10 additions & 7 deletions extensions/oidc/runtime/src/main/java/io/quarkus/oidc/OidcTenantConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,11 +589,14 @@ public static Token fromAudience(String... audience) {
public Optional<List<String>> audience = Optional.empty();

/**
* Expiration grace period in seconds. A token expiration time will be reduced by
* the value of this property before being compared to the current time.
* Life span grace period in seconds.
* When checking token expiry, current time is allowed to be later than token expiration time by at most the configured
* number of seconds.
* When checking token issuance, current time is allowed to be sooner than token issue time by at most the configured
* number of seconds.
*/
@ConfigItem
public Optional<Integer> expirationGrace = Optional.empty();
public Optional<Integer> lifespanGrace = Optional.empty();

/**
* Name of the claim which contains a principal name. By default, the 'upn', 'preferred_username' and `sub` claims are
Expand Down Expand Up @@ -629,12 +632,12 @@ public void setAudience(List<String> audience) {
this.audience = Optional.of(audience);
}

public Optional<Integer> getExpirationGrace() {
return expirationGrace;
public Optional<Integer> getLifespanGrace() {
return lifespanGrace;
}

public void setExpirationGrace(int expirationGrace) {
this.expirationGrace = Optional.of(expirationGrace);
public void setLifespanGrace(int lifespanGrace) {
this.lifespanGrace = Optional.of(lifespanGrace);
}

public Optional<String> getPrincipalClaim() {
Expand Down
4 changes: 2 additions & 2 deletions ...sions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/CodeAuthenticationMechanism.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,8 +303,8 @@ private void processSuccessfulAuthentication(RoutingContext context, TenantConfi
.append(COOKIE_DELIM)
.append(result.opaqueRefreshToken()).toString());
long maxAge = result.idToken().getLong("exp") - result.idToken().getLong("iat");
if (configContext.oidcConfig.token.expirationGrace.isPresent()) {
maxAge += configContext.oidcConfig.token.expirationGrace.get();
if (configContext.oidcConfig.token.lifespanGrace.isPresent()) {
maxAge += configContext.oidcConfig.token.lifespanGrace.get();
}
LOG.debugf("Session cookie 'max-age' parameter is set to %d", maxAge);
cookie.setMaxAge(maxAge);
Expand Down
4 changes: 2 additions & 2 deletions extensions/oidc/runtime/src/main/java/io/quarkus/oidc/runtime/OidcRecorder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ private TenantConfigContext createTenantContext(Vertx vertx, OidcTenantConfig oi
options.setValidateIssuer(false);
}

if (oidcConfig.getToken().getExpirationGrace().isPresent()) {
if (oidcConfig.getToken().getLifespanGrace().isPresent()) {
JWTOptions jwtOptions = new JWTOptions();
jwtOptions.setLeeway(oidcConfig.getToken().getExpirationGrace().get());
jwtOptions.setLeeway(oidcConfig.getToken().getLifespanGrace().get());
options.setJWTOptions(jwtOptions);
}

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/oidc-code-flow/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ quarkus.oidc.tenant-logout.authentication.cookie-path=/tenant-logout
quarkus.oidc.tenant-logout.logout.path=/tenant-logout/logout
quarkus.oidc.tenant-logout.logout.post-logout-path=/tenant-logout/post-logout
quarkus.oidc.tenant-logout.token.refresh-expired=true
quarkus.oidc.tenant-logout.token.expiration-grace=120
quarkus.oidc.tenant-logout.token.lifespan-grace=120

quarkus.http.auth.permission.roles1.paths=/index.html
quarkus.http.auth.permission.roles1.policy=authenticated
Expand Down