github-mirrors/oauth-playground-server
1
0
Fork 0
mirror of https://github.com/ysoftdevs/oauth-playground-server.git synced 2026-04-26 18:38:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

WIP webauthn - fix a security issue when anyone could register a new credential in existing user's name

Browse Source
This commit is contained in:
Dusan Jakub
2023-09-25 11:27:12 +02:00
parent 5a677721df
commit 5462333ed0
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ysoft/geecon/dto/User.java
View File

@@ -19,7 +19,7 @@ public record User(String login, String password, List<WebAuthnCredential> crede
List<WebAuthnCredential> newCredentials; List<WebAuthnCredential> newCredentials;
if (existing.isPresent()) { if (existing.isPresent()) {
// TODO need to decide if immutable or not // TODO need to decide if immutable or not
existing.get().counter++; existing.get().counter = webAuthnCredential.counter;
newCredentials = credentials; newCredentials = credentials;
} else { } else {
newCredentials = new ArrayList<>(credentials); newCredentials = new ArrayList<>(credentials);

24
src/main/java/com/ysoft/geecon/webauthn/MyWebAuthnSetup.java
View File

@@ -55,11 +55,23 @@ public class MyWebAuthnSetup implements WebAuthnUserProvider {
@Override @Override
public Uni<Void> updateOrStoreWebAuthnCredentials(Authenticator authenticator) { public Uni<Void> updateOrStoreWebAuthnCredentials(Authenticator authenticator) {
WebAuthnCredential credential1 = new WebAuthnCredential(authenticator); WebAuthnCredential credential1 = new WebAuthnCredential(authenticator);
usersRepo.getUser(authenticator.getUserName())
.ifPresentOrElse( var existingUser = usersRepo.getUser(authenticator.getUserName());
user -> usersRepo.register(user.withAddedCredential(credential1)), var existingCredential = existingUser.stream().flatMap(u -> u.credentials().stream())
() -> usersRepo.register(new User(authenticator.getUserName(), null, List.of(credential1))) .filter(c -> authenticator.getCredID().equals(c.credID)).findAny();
);
return Uni.createFrom().nullItem(); if (existingUser.isPresent() && existingCredential.isPresent()) {
// returning user and credential -> update counter
usersRepo.register(existingUser.get().withAddedCredential(existingCredential.get()));
return Uni.createFrom().nullItem();
} else if (existingUser.isEmpty()) {
// new user -> register
usersRepo.register(new User(authenticator.getUserName(), null, List.of(credential1)));
return Uni.createFrom().nullItem();
} else {
// returning (or duplicate) user with new credential -> reject,
// as we do not provide a means to register additional credentials yet
return Uni.createFrom().failure(new Throwable("Duplicate user"));
}
} }
} }