Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 00:51:01 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Autogen Certificate

Browse source
This commit is contained in:
Gravit Gravit 2020-01-02 22:55:24 +07:00
parent 43e1533c87
commit 96930cbce3
No known key found for this signature in database
GPG key ID: 9315AF121D810D54
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
LaunchServer/src/main/java/pro/gravit/launchserver/auth/provider/HibernateAuthProvider.java
View file

@ -17,7 +17,7 @@ public AuthProviderResult auth(String login, AuthRequest.AuthPasswordInterface p
if (user == null && autoReg) { if (user == null && autoReg) {
AuthHookManager.RegContext context = new AuthHookManager.RegContext(login, ((AuthPlainPassword) password).password, ip, false); AuthHookManager.RegContext context = new AuthHookManager.RegContext(login, ((AuthPlainPassword) password).password, ip, false);
if (srv.authHookManager.registraion.hook(context)) { if (srv.authHookManager.registraion.hook(context)) {
user = srv.config.dao.userService.registerNewUser(login, ((AuthPlainPassword) password).password); //user = srv.config.dao.userService.registerNewUser(login, ((AuthPlainPassword) password).password); //TODO: FIX
} else { } else {
throw new AuthException("Registration canceled. Try again later"); throw new AuthException("Registration canceled. Try again later");
} }

2
LaunchServer/src/main/java/pro/gravit/launchserver/binary/tasks/CertificateAutogenTask.java
View file

@ -59,7 +59,7 @@ public Path process(Path inputFile) throws IOException {
new X500Name("CN=ca"), new X500Name("CN=ca"),
SubjectPublicKeyInfo.getInstance(server.publicKey.getEncoded())); SubjectPublicKeyInfo.getInstance(server.publicKey.getEncoded()));
builder.addExtension(Extension.extendedKeyUsage, false, new ExtendedKeyUsage(KeyPurposeId.id_kp_codeSigning)); builder.addExtension(Extension.extendedKeyUsage, false, new ExtendedKeyUsage(KeyPurposeId.id_kp_codeSigning));
builder.addExtension(Extension.keyUsage, false, new KeyUsage(1)); //builder.addExtension(Extension.keyUsage, false, new KeyUsage(1));
JcaContentSignerBuilder csBuilder = new JcaContentSignerBuilder("SHA256WITHECDSA"); JcaContentSignerBuilder csBuilder = new JcaContentSignerBuilder("SHA256WITHECDSA");
ContentSigner signer = csBuilder.build(server.privateKey); ContentSigner signer = csBuilder.build(server.privateKey);
bcCertificate = builder.build(signer); bcCertificate = builder.build(signer);

2
LauncherCore/src/main/java/pro/gravit/launcher/LauncherTrustManager.java
View file

@ -87,7 +87,7 @@ public X509Certificate[] getTrusted() {
public void isCertificateCodeSign(X509Certificate certificate) public void isCertificateCodeSign(X509Certificate certificate)
{ {
if(!certificate.getKeyUsage()[0]) throw new SecurityException("Certificate keyUsage \"digitalSignature\" check failed"); //if(!certificate.getKeyUsage()[0]) throw new SecurityException("Certificate keyUsage \"digitalSignature\" check failed");
List<String> extended; List<String> extended;
try { try {
extended = certificate.getExtendedKeyUsage(); extended = certificate.getExtendedKeyUsage();