Skip to content

allow pin to be cleared. refs #283 #286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikecarroll merged 1 commit into from
Oct 23, 2016
Merged

allow pin to be cleared. refs #283 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions backbone/src/main/java/org/researchstack/backbone/StorageAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,14 @@ public void changePinCode(Context context, String oldPin, String newPin)
injectEncrypter();
}

/**
* Removes the pin code if one exists.
* @param context android context
*/
public void removePinCode(Context context) {
encryptionProvider.removePinCode(context);
}

private void injectEncrypter()
{
fileAccess.setEncrypter(encryptionProvider.getEncrypter());
Expand Down
7 changes: 7 additions & 0 deletions backbone/src/main/java/org/researchstack/backbone/storage/file/EncryptionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ public interface EncryptionProvider
*/
void createPinCode(Context context, String pin);

/**
* Removes the pin code if one exists.
*
* @param context android context
*/
void removePinCode(Context context);

/**
* Changes the pin code if the old pin provided matches
*
Expand Down
6 changes: 6 additions & 0 deletions backbone/src/main/java/org/researchstack/backbone/storage/file/UnencryptedProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ public void changePinCode(Context context, String oldPin, String newPin)
throw new RuntimeException(PIN_CODE_ERROR_MSG);
}

@Override
public void removePinCode(Context context)
{
throw new RuntimeException(PIN_CODE_ERROR_MSG);
}

@Override
public boolean needsAuth(Context context, PinCodeConfig codeConfig)
{
Expand Down
17 changes: 17 additions & 0 deletions backbone/src/main/java/org/researchstack/backbone/storage/file/aes/PinProtectedProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ public void changePinCode(Context context, String oldPin, String newPin)
}
}

public void removePinCode(Context context) {
removePassphrase(context);
}

private void initWithMasterKey(AesCbcWithIntegrity.SecretKeys masterKey)
{
encrypter = createEncrypter(masterKey);
Expand Down Expand Up @@ -136,13 +140,26 @@ public boolean passphraseExists(Context context)
return masterKeyFile.exists();
}

public void removePassphrase(Context context) {
if (passphraseExists(context)) {
removeMasterKeyFile(context);
}
}

@NonNull
private File createMasterKeyFile(Context context)
{
File secure = createSecureDirectory(context);
return new File(secure, "__encrypted");
}

private void removeMasterKeyFile(Context context) {
File masterKeyFile = createMasterKeyFile(context);
if (masterKeyFile.exists()) {
masterKeyFile.delete();
}
}

@NonNull
private File createSaltFile(Context context)
{
Expand Down