Homeoffice/Essensbestellungsverwaltung
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into Richards_Branch

Browse Source
This commit is contained in:
Malte Schulze Hobeling 2023-01-23 08:59:38 +01:00
commit 27710e92af
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/bib/essensbestellungsverwaltung/AccountMgr.java
View File

@ -106,9 +106,15 @@ public class AccountMgr {
String[] pwH = {"email"}; String[] pwH = {"email"};
String[] pwD = {email}; String[] pwD = {email};
List<String> foundEmail = Database.select("user",pwH,pwD); List<String> foundEmail = Database.select("user",pwH,pwD);
String[] userParts = foundEmail.get(0).split(":"); String salt;
String[] pwParts = userParts[4].split("\\."); if(foundEmail.size() == 1){
String salt = pwParts[1]; String[] userParts = foundEmail.get(0).split(":");
String[] pwParts = userParts[4].split("\\.");
salt = pwParts[1];
}else{
//no unique user found; still calculating a hash for security reasons
salt = getSalt();
}
String[] userH = {"email","password"}; String[] userH = {"email","password"};
String[] userD = {email,hashAndSalt(pw,salt)}; String[] userD = {email,hashAndSalt(pw,salt)};
return Database.getSingleId("user",userH,userD); return Database.getSingleId("user",userH,userD);