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

updated dependencies on srsoftware.de packages

Browse Source 
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
Stephan Richter
2025-02-27 23:14:44 +01:00
parent 7be5960e4b
commit a47eb00a8b
12 changed files with 53 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
de.srsoftware.oidc.datastore.encrypted/build.gradle.kts
View File

@@ -3,7 +3,8 @@ description = "SRSoftware OIDC: encrypted 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.1.0")
implementation("de.srsoftware:tools.result:1.0.0")
implementation("de.srsoftware:tools.util:1.3.1")
implementation(project(":de.srsoftware.oidc.api"))
testImplementation(project(":de.srsoftware.oidc.api","testBundle"))

16
de.srsoftware.oidc.datastore.encrypted/src/main/java/de/srsoftware/oidc/datastore/encrypted/EncryptedUserService.java
View File

@@ -2,16 +2,18 @@
package de.srsoftware.oidc.datastore.encrypted;
import static de.srsoftware.oidc.api.Constants.*;
import static de.srsoftware.tools.result.Error.error;
import static java.lang.System.Logger.Level.WARNING;
import static java.util.Optional.empty;
import de.srsoftware.oidc.api.UserService;
import de.srsoftware.oidc.api.data.AccessToken;
import de.srsoftware.oidc.api.data.User;
import de.srsoftware.tools.Error;
import de.srsoftware.tools.PasswordHasher;
import de.srsoftware.tools.Payload;
import de.srsoftware.tools.Result;
import de.srsoftware.tools.result.*;
import de.srsoftware.tools.result.Error;
import de.srsoftware.tools.result.Payload;
import de.srsoftware.tools.result.Result;
import java.util.*;
public class EncryptedUserService extends EncryptedConfig implements UserService {
@@ -98,12 +100,13 @@ public class EncryptedUserService extends EncryptedConfig implements UserService
@Override
public Result<User> login(String username, String password) {
if (username == null || username.isBlank()) return Error.of(ERROR_NO_USERNAME);
if (username == null || username.isBlank()) return error(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 new Error<User>(ERROR_LOCKED).addData(ATTEMPTS, lock.attempts(), RELEASE, lock.releaseTime());
Error<User> err = error(ERROR_LOCKED);
return err.addData(ATTEMPTS, lock.attempts(), RELEASE, lock.releaseTime());
}
for (var encryptedUser : backend.list()) {
var decryptedUser = decrypt(encryptedUser);
@@ -116,7 +119,8 @@ public class EncryptedUserService extends EncryptedConfig implements UserService
var lock = lock(username);
LOG.log(WARNING, "Login failed for {0} → locking account until {1}", username, lock.releaseTime());
return new Error<User>(ERROR_LOGIN_FAILED).addData(RELEASE, lock.releaseTime());
Error<User> err = error(ERROR_LOGIN_FAILED);
return err.addData(RELEASE, lock.releaseTime());
}
@Override

13
de.srsoftware.oidc.datastore.encrypted/src/test/java/de/srsoftware/oidc/datastore/encrypted/EncryptedUserServiceTest.java
View File

@@ -3,15 +3,16 @@ package de.srsoftware.oidc.datastore.encrypted; /* © SRSoftware 2024 */
import static de.srsoftware.oidc.api.Constants.*;
import static de.srsoftware.tools.Optionals.nullable;
import static de.srsoftware.tools.Strings.uuid;
import static de.srsoftware.tools.result.Error.error;
import static java.lang.System.Logger.Level.WARNING;
import de.srsoftware.oidc.api.*;
import de.srsoftware.oidc.api.data.AccessToken;
import de.srsoftware.oidc.api.data.User;
import de.srsoftware.tools.Error;
import de.srsoftware.tools.PasswordHasher;
import de.srsoftware.tools.Payload;
import de.srsoftware.tools.Result;
import de.srsoftware.tools.result.Error;
import de.srsoftware.tools.result.Payload;
import de.srsoftware.tools.result.Result;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
@@ -76,7 +77,8 @@ public class EncryptedUserServiceTest extends UserServiceTest {
if (optLock.isPresent()) {
var lock = optLock.get();
LOG.log(WARNING, "{} is locked after {} failed logins. Lock will be released at {}", username, lock.attempts(), lock.releaseTime());
return new Error<User>(ERROR_LOCKED).addData(ATTEMPTS, lock.attempts(), RELEASE, lock.releaseTime());
Error<User> err = error(ERROR_LOCKED);
return err.addData(ATTEMPTS, lock.attempts(), RELEASE, lock.releaseTime());
}
for (var entry : users.entrySet()) {
@@ -88,7 +90,8 @@ public class EncryptedUserServiceTest extends UserServiceTest {
}
var lock = lock(username);
LOG.log(WARNING, "Login failed for {0} → locking account until {1}", username, lock.releaseTime());
return new Error<User>(ERROR_LOGIN_FAILED).addData(RELEASE, lock.releaseTime());
Error<User> err = error(ERROR_LOGIN_FAILED);
return err.addData(RELEASE, lock.releaseTime());
}
@Override