Skip to content

Feat/pedago configurable oauth2 expiration #668

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
vmourot wants to merge 2 commits into
base: develop-pedago
Choose a base branch
from
Open

Feat/pedago configurable oauth2 expiration #668

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
cdc72e9
chore: prepare next development iteration
jenkinsEdificePublic Feb 26, 2025
32df7cd
feat: configure oAuth2 token expiration in conf
vmourot Apr 15, 2025
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 admin/src/main/ts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "admin-app",
"version": "6.4-SNAPSHOT",
"version": "6.4-%branch%.%generateVersion%",
"scripts": {
"ng": "ng",
"start": "ng serve --host 0.0.0.0",
Expand Down
2 changes: 1 addition & 1 deletion auth/src/main/java/org/entcore/auth/Auth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void start(final Promise<Void> startPromise) throws Exception {
openIdConnectService, checkFederatedLogin, config.getInteger("maxRetry", 5), config.getLong("banDelay", 900000L),
config.getString("password-event-min-date"), config.getInteger("password-event-sync-default-value", 0),
config.getJsonArray("oauth2-pw-client-enable-saml2"), eventStore,
config.getBoolean("otp-disabled", false));
config.getBoolean("otp-disabled", false), config.getInteger("oauth2-token-expiration-time-seconds", 3600));

AuthController authController = new AuthController();
authController.setEventStore(eventStore);
Expand Down
8 changes: 5 additions & 3 deletions auth/src/main/java/org/entcore/auth/oauth/OAuthDataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,13 @@ public class OAuthDataHandler extends DataHandler implements OpenIdDataHandler {
private final SamlHelper samlHelper;
private final JwtVerifier jwtVerifier;
private final boolean otpDisabled;
private final int tokenExpirationTimeSeconds;

public OAuthDataHandler(Request request, Neo4j neo, MongoDb mongo, RedisClient redisClient,
OpenIdConnectService openIdConnectService, boolean checkFederatedLogin,
int pwMaxRetry, long pwBanDelay, String passwordEventMinDate, int defaultSyncValue,
JsonArray clientPWSupportSaml2, EventStore eventStore, SamlHelper samlHelper, JwtVerifier jwtVerifier,
final boolean otpDisabled) {
final boolean otpDisabled, int tokenExpirationTimeSeconds) {
super(request);
this.neo = neo;
this.mongo = mongo;
Expand All @@ -110,6 +111,7 @@ public OAuthDataHandler(Request request, Neo4j neo, MongoDb mongo, RedisClient r
this.clientPWSupportSaml2 = clientPWSupportSaml2;
this.samlHelper = samlHelper;
this.jwtVerifier = jwtVerifier;
this.tokenExpirationTimeSeconds = tokenExpirationTimeSeconds;
}

@Override
Expand Down Expand Up @@ -482,7 +484,7 @@ public void handle(Message<JsonObject> event) {
.put("authId", authInfo.getId())
.put("token", UUID.randomUUID().toString())
.put("createdOn", MongoDb.now())
.put("expiresIn", 3600);
.put("expiresIn", tokenExpirationTimeSeconds);
if (openIdConnectService != null && authInfo.getScope() != null
&& authInfo.getScope().contains("openid")) {
// "2.0".equals(RequestUtils.getAcceptVersion(getRequest().getHeader("Accept"))))
Expand Down Expand Up @@ -522,7 +524,7 @@ public void handle(Message<JsonObject> res) {
t.setAuthId(authInfo.getId());
t.setToken(token.getString("token"));
t.setCreatedOn(MongoDb.parseIsoDate(token.getJsonObject("createdOn")));
t.setExpiresIn(3600);
t.setExpiresIn(tokenExpirationTimeSeconds);
if (token.containsKey("id_token")) {
t.setIdToken(token.getString("id_token"));
}
Expand Down
8 changes: 5 additions & 3 deletions auth/src/main/java/org/entcore/auth/oauth/OAuthDataHandlerFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,12 @@ public class OAuthDataHandlerFactory implements DataHandlerFactory {
private final boolean otpDisabled;
private SamlHelper samlHelper;
private JwtVerifier jwtVerifier;
private final int tokenExpirationTimeSeconds;

public OAuthDataHandlerFactory(
OpenIdConnectService openIdConnectService, boolean cfl, int pwMaxRetry, long pwBanDelay,
String passwordEventMinDate, int defaultSyncValue, JsonArray clientPWSupportSaml2, EventStore eventStore,
final boolean otpDisabled) {
final boolean otpDisabled, int tokenExpirationTimeSeconds) {
this.otpDisabled = otpDisabled;
this.neo = Neo4j.getInstance();
this.mongo = MongoDb.getInstance();
Expand All @@ -66,19 +67,20 @@ public OAuthDataHandlerFactory(
this.passwordEventMinDate = passwordEventMinDate;
this.defaultSyncValue = defaultSyncValue;
this.clientPWSupportSaml2 = clientPWSupportSaml2;
this.tokenExpirationTimeSeconds = tokenExpirationTimeSeconds;
}

@Override
public DataHandler create(Request request) {
return new OAuthDataHandler(request, neo, mongo, redisClient, openIdConnectService, checkFederatedLogin,
pwMaxRetry, pwBanDelay, passwordEventMinDate, defaultSyncValue, clientPWSupportSaml2, eventStore, samlHelper,
jwtVerifier, otpDisabled);
jwtVerifier, otpDisabled, tokenExpirationTimeSeconds);
}

public DataHandler create(JsonRequestAdapter request) {
return new OAuthDataHandler(request, neo, mongo, redisClient, openIdConnectService, checkFederatedLogin,
pwMaxRetry, pwBanDelay, passwordEventMinDate, defaultSyncValue, clientPWSupportSaml2, eventStore,
samlHelper, jwtVerifier, otpDisabled);
samlHelper, jwtVerifier, otpDisabled, tokenExpirationTimeSeconds);
}

public void setSamlHelper(SamlHelper samlHelper) {
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ent-core",
"version": "6.4-SNAPSHOTdev.1",
"version": "6.4-develop-pedago.0",
"description": "",
"main": "gulpfile.js",
"directories": {
Expand All @@ -27,7 +27,7 @@
"angular-sanitize": "1.8.3",
"axios": "0.15.3",
"core-js": "^2.4.1",
"entcore": "dev",
"entcore": "develop-pedago",
"entcore-generic-icons": "https://github.com/edificeio/generic-icons.git",
"entcore-toolkit": "^1.0.1",
"humane-js": "^3.2.2",
Expand Down Expand Up @@ -75,8 +75,8 @@
"karma-jasmine": "~1.1.0",
"karma-jasmine-html-reporter": "^0.2.2",
"merge2": "^1.0.3",
"ode-ngjs-front": "dev",
"ode-ts-client": "dev",
"ode-ngjs-front": "develop-pedago",
"ode-ts-client": "develop-pedago",
"sass-loader": "^13.0.2",
"source-map-loader": "^0.1.5",
"ts-loader": "^3.1.1",
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
</modules>

<properties>
<revision>6.4-SNAPSHOT</revision>
<revision>6.4-develop-pedago-SNAPSHOT</revision>
<junitVersion>4.13.2</junitVersion>
<testContainerVersion>1.19.3</testContainerVersion>
<modPostgresVersion>2.0-SNAPSHOT</modPostgresVersion>
<modMongoVersion>4.0-SNAPSHOT</modMongoVersion>
<modMongoVersion>4.0-develop-pedago-SNAPSHOT</modMongoVersion>
<webUtilsVersion>3.1-SNAPSHOT</webUtilsVersion>
<mongodbHelperVersion>3.0-SNAPSHOT</mongodbHelperVersion>
<mongodbHelperVersion>3.0-develop-pedago-SNAPSHOT</mongodbHelperVersion>
<jodaTimeVersion>2.9.4</jodaTimeVersion>
<scramVersion>2.1</scramVersion>
<micrometerPrometheusVersion>1.11.4</micrometerPrometheusVersion>
Expand Down