TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for possible NPE.

Browse source
This commit is contained in:
FireMasterK 2021-10-03 09:55:13 +01:00
parent 08aeefa099
commit d03c677a7f
No known key found for this signature in database
GPG key ID: 49451E4482CC5BCD
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/me/kavin/piped/utils/ResponseHelper.java
View file

@ -578,15 +578,14 @@ public class ResponseHelper {
User dbuser = s.createQuery(cr).uniqueResult(); User dbuser = s.createQuery(cr).uniqueResult();
String hash = dbuser.getPassword();
if (dbuser != null) { if (dbuser != null) {
if (hash.startsWith("$argon2") && argon2PasswordEncoder.matches(pass, hash)) { String hash = dbuser.getPassword();
if (hash.startsWith("$argon2")) {
if (argon2PasswordEncoder.matches(pass, hash)) {
s.close(); s.close();
return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId())); return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId()));
} }
} else if (bcryptPasswordEncoder.matches(pass, hash)) {
if (bcryptPasswordEncoder.matches(pass, hash)) {
s.close(); s.close();
return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId())); return Constants.mapper.writeValueAsBytes(new LoginResponse(dbuser.getSessionId()));
} }