BaseBand/BaseBandRewrite
3
0
Fork 0
Code Issues 4 Pull requests Projects 3 Releases Packages Wiki Activity Actions

fix dictionary, improve auth
All checks were successful
/ Build BaseBand DSM & Broadway (push) Successful in 2m39s
Details

Browse source
This commit is contained in:
Daniella / Tove 2024-06-29 10:58:10 +02:00
parent 819120100f
commit 739f0a9cc7
2 changed files with 374 additions and 374 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

728
Client/proguard/dictionary.txt
View file

File diff suppressed because it is too large Load diff

20
Server/src/main/java/de/com/baseband/server/UserHandler.java
View file

@ -35,17 +35,17 @@ public class UserHandler {
return new DoubleTypedObject<>(Response.SERVER_ERROR.ordinal(), localTCN); return new DoubleTypedObject<>(Response.SERVER_ERROR.ordinal(), localTCN);
} }
if (isReset) {
localTCN.set("hardware-id-reset", false);
localTCN.set("hardware-id", remoteHardwareID);
return new DoubleTypedObject<>(Response.RESET.ordinal(), localTCN);
}
if(!localHardwareID.equals(remoteTCN.getString("hardware-id"))) {
return new DoubleTypedObject<>(Response.HWID_INVALID.ordinal(), localTCN);
}
if(BCrypt.verifyer().verify(remotePassword.toCharArray(), localPassword.toCharArray()).verified) { if(BCrypt.verifyer().verify(remotePassword.toCharArray(), localPassword.toCharArray()).verified) {
if (isReset) {
localTCN.set("hardware-id-reset", false);
localTCN.set("hardware-id", remoteHardwareID);
return new DoubleTypedObject<>(Response.RESET.ordinal(), localTCN);
}
if(!localHardwareID.equals(remoteTCN.getString("hardware-id"))) {
return new DoubleTypedObject<>(Response.HWID_INVALID.ordinal(), localTCN);
}
String remoteCommit = remoteTCN.getString("commit"); String remoteCommit = remoteTCN.getString("commit");
if("[dev]".equals(remoteCommit) || Main.loaderHash.equals(remoteCommit)) { if("[dev]".equals(remoteCommit) || Main.loaderHash.equals(remoteCommit)) {
return new DoubleTypedObject<>(Response.OK.ordinal(), localTCN); return new DoubleTypedObject<>(Response.OK.ordinal(), localTCN);