StephanRichter/LightOidc
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

adapted code to changes of underlying libraries

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2024-12-17 12:17:27 +01:00
parent 94aeaa8650
commit f593e7b2c9
15 changed files with 52 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
de.srsoftware.oidc.datastore.file/build.gradle.kts
View File

@@ -3,7 +3,7 @@ description = "SRSoftware OIDC: file datastore module"
dependencies{
implementation("com.sun.mail:jakarta.mail:2.0.1")
implementation("de.srsoftware:tools.optionals:1.0.0")
implementation("de.srsoftware:tools.util:1.0.2")
implementation("de.srsoftware:tools.util:1.0.3")
implementation("org.json:json:20240303")
implementation(project(":de.srsoftware.oidc.api"))

14
de.srsoftware.oidc.datastore.file/src/main/java/de/srsoftware/oidc/datastore/file/FileStore.java
View File

@@ -10,9 +10,9 @@ import static java.util.Optional.empty;
import de.srsoftware.oidc.api.*;
import de.srsoftware.oidc.api.data.*;
import de.srsoftware.tools.Content;
import de.srsoftware.tools.Error;
import de.srsoftware.tools.PasswordHasher;
import de.srsoftware.tools.Payload;
import de.srsoftware.tools.Result;
import jakarta.mail.Authenticator;
import jakarta.mail.PasswordAuthentication;
@@ -181,13 +181,13 @@ public class FileStore implements AuthorizationService, ClientService, SessionSe
@Override
public Result<User> login(String username, String password) {
if (!json.has(USERS)) return Error.message(ERROR_LOGIN_FAILED);
if (username == null || username.isBlank()) return Error.message(ERROR_NO_USERNAME);
if (!json.has(USERS)) return Error.of(ERROR_LOGIN_FAILED);
if (username == null || username.isBlank()) return Error.of(ERROR_NO_USERNAME);
var optLock = getLock(username);
if (optLock.isPresent()) {
var lock = optLock.get();
LOG.log(WARNING, "{0} is locked after {1} failed logins. Lock will be released at {2}", username, lock.attempts(), lock.releaseTime());
return Error.message(ERROR_LOCKED, ATTEMPTS, lock.attempts(), RELEASE, lock.releaseTime());
return new Error<User>(ERROR_LOCKED).addData(ATTEMPTS, lock.attempts(), RELEASE, lock.releaseTime());
}
try {
var users = json.getJSONObject(USERS);
@@ -198,14 +198,14 @@ public class FileStore implements AuthorizationService, ClientService, SessionSe
var loadedUser = User.of(userData, userId).filter(u -> passwordMatches(password, u));
if (loadedUser.isPresent()) {
unlock(username);
return Payload.of(loadedUser.get());
return Content.of(loadedUser.get());
}
}
var lock = lock(username);
LOG.log(WARNING, "Login failed for {0} → locking account until {1}", username, lock.releaseTime());
return Error.message(ERROR_LOGIN_FAILED, RELEASE, lock.releaseTime());
return new Error<User>(ERROR_LOGIN_FAILED).addData(RELEASE, lock.releaseTime());
} catch (Exception e) {
return Error.message(ERROR_LOGIN_FAILED);
return Error.of(ERROR_LOGIN_FAILED);
}
}