Compare commits

...

3 Commits

Author SHA1 Message Date
Gravita c9a81da60c [FIX] Profile generation 2024-04-26 02:01:50 +07:00
Gravita 6c0ead015b [FIX] NPE in new profiles 2024-04-26 01:49:09 +07:00
XakepSDK b5457ee866
[FIX OpenID validate issuer and aud (#710)
Co-authored-by: d3coder <admin@xakeps.dk>
2024-04-25 22:05:53 +07:00
4 changed files with 12 additions and 2 deletions

View File

@ -36,7 +36,10 @@ public class OpenIDAuthenticator {
public OpenIDAuthenticator(OpenIDConfig openIDConfig) {
this.openIDConfig = openIDConfig;
var keyLocator = loadKeyLocator(openIDConfig);
this.jwtParser = Jwts.parser().keyLocator(keyLocator)
this.jwtParser = Jwts.parser()
.keyLocator(keyLocator)
.requireIssuer(openIDConfig.issuer())
.requireAudience(openIDConfig.clientId())
.build();
}

View File

@ -3,7 +3,8 @@ package pro.gravit.launchserver.auth.core.openid;
import java.net.URI;
public record OpenIDConfig(URI tokenUri, String authorizationEndpoint, String clientId, String clientSecret,
String redirectUri, URI jwksUri, String scopes, ClaimExtractorConfig extractorConfig) {
String redirectUri, URI jwksUri, String scopes, String issuer,
ClaimExtractorConfig extractorConfig) {
public record ClaimExtractorConfig(String usernameClaim, String uuidClaim) {}
}

View File

@ -51,6 +51,11 @@ public class ClientProfileBuilder {
this.properties = new HashMap<>();
this.servers = new ArrayList<>();
this.flags = new ArrayList<>();
this.settings = new ClientProfile.ProfileDefaultSettings();
this.recommendJavaVersion = 21;
this.minJavaVersion = 17;
this.maxJavaVersion = 999;
this.classLoaderConfig = ClientProfile.ClassLoaderConfig.LAUNCHER;
}
public ClientProfileBuilder(ClientProfile profile) {

View File

@ -18,4 +18,5 @@ public class ClientProfileVersions {
public static final ClientProfile.Version MINECRAFT_1_20 = ClientProfile.Version.of("1.20");
public static final ClientProfile.Version MINECRAFT_1_20_2 = ClientProfile.Version.of("1.20.2");
public static final ClientProfile.Version MINECRAFT_1_20_3 = ClientProfile.Version.of("1.20.3");
public static final ClientProfile.Version MINECRAFT_1_20_5 = ClientProfile.Version.of("1.20.5");
}