Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-06-23 21:31:08 +02:00
Code Issues Packages Projects Releases Activity

Add realm for api key

Browse Source
This commit is contained in:
René Pfeuffer
2020-09-30 14:01:19 +02:00
parent 91471c0ec0
commit 12ab218eba
3 changed files with 92 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
scm-webapp/src/main/java/sonia/scm/security/ApiKeyService.java
View File

@@ -37,7 +37,6 @@ import sonia.scm.store.ConfigurationEntryStoreFactory;
import javax.inject.Inject;
import java.security.SecureRandom;
import java.util.Collection;
import java.util.Optional;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.function.Supplier;
@@ -114,16 +113,16 @@ public class ApiKeyService {
}
}
Optional<String> check(String tokenAsString) {
CheckResult check(String tokenAsString) {
return check(tokenHandler.readToken(tokenAsString)
.orElseThrow(AuthorizationException::new));
}
private Optional<String> check(ApiKeyTokenHandler.Token token) {
private CheckResult check(ApiKeyTokenHandler.Token token) {
return check(token.getUser(), token.getApiKeyId(), token.getPassphrase());
}
Optional<String> check(String user, String id, String passphrase) {
CheckResult check(String user, String id, String passphrase) {
Lock lock = locks.get(user).readLock();
lock.lock();
try {
@@ -134,7 +133,9 @@ public class ApiKeyService {
.filter(key -> key.getId().equals(id))
.filter(key -> passwordService.passwordsMatch(passphrase, key.getPassphrase()))
.map(ApiKeyWithPassphrase::getRole)
.findAny();
.map(role -> new CheckResult(user, role))
.findAny()
.orElseThrow(AuthorizationException::new);
} finally {
lock.unlock();
}
@@ -177,4 +178,11 @@ public class ApiKeyService {
private final String token;
private final String id;
}
@Getter
@AllArgsConstructor
public static class CheckResult {
private final String user;
private final String role;
}
}