nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00
Code Releases Activity

Don't crash if password BCrypt formatted

Browse source
This commit is contained in:
Felix Ableitner 2017-10-25 10:59:58 +09:00
parent 3409578995
commit 3a6a6030bf
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/nutomic/syncthingandroid/util/ConfigXml.java
View file

@ -142,9 +142,14 @@ public class ConfigXml {
gui.appendChild(password); gui.appendChild(password);
} }
String apikey = getApiKey(); String apikey = getApiKey();
boolean passwordOk;
String pw = password.getTextContent(); String pw = password.getTextContent();
passwordOk = !TextUtils.isEmpty(pw) && BCrypt.checkpw(apikey, pw); boolean passwordOk;
try {
passwordOk = !TextUtils.isEmpty(pw) && BCrypt.checkpw(apikey, pw);
} catch (IllegalArgumentException e) {
Log.w(TAG, "Malformed password", e);
passwordOk = false;
}
if (!passwordOk) { if (!passwordOk) {
Log.i(TAG, "Updating password"); Log.i(TAG, "Updating password");
password.setTextContent(BCrypt.hashpw(apikey, BCrypt.gensalt(4))); password.setTextContent(BCrypt.hashpw(apikey, BCrypt.gensalt(4)));