Skip to content
This repository was archived by the owner on Jan 21, 2022. It is now read-only.

NPE check for Password and Account Name field #384

Open
wants to merge 11 commits into
base: MAS-2.1.00
Choose a base branch
from
Open

NPE check for Password and Account Name field #384

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3539bf8
NPE check for Password and Account Name field
Jun 17, 2021
5e4d89e
Throwing NPE if Account Name and Password is null
Jun 17, 2021
cc6e418
Throw IllegalArgument Exception while Account is null
Jun 17, 2021
43d9ef5
Added Logs to capture the exception inside the catch block
Jun 27, 2021
fae84fe
Printing the account type
Jun 28, 2021
ff87134
Fixing the null check
graju256 Jun 28, 2021
e1dac15
Printing the account name if it is not matching inside the loop
Jun 28, 2021
1f70116
printing the identifier in the logs
Jun 29, 2021
37ea576
Added Synchronized block
Jul 13, 2021
13dd503
Made the changes regarding synchronized block
Jul 13, 2021
b006774
Updated the synchronized block to include the key changes
Jul 14, 2021
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
66 changes: 43 additions & 23 deletions mas-foundation/src/main/java/com/ca/mas/core/storage/sharedstorage/AccountManagerUtil.java
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Logger;

import static com.ca.mas.foundation.MAS.TAG;
import static com.ca.mas.foundation.MAS.getContext;
Expand All @@ -38,40 +39,59 @@ public class AccountManagerUtil implements StorageActions {
public AccountManagerUtil(Context context, String accountName, boolean sharedStorage){

// Gets the account type from the manifest
String accountType = getAccountType(context);
final String accountType = getAccountType(context);
final StringBuilder messageBuilder = new StringBuilder();

if (accountType == null || accountType.isEmpty()) {
throw new IllegalArgumentException(MASFoundationStrings.SHARED_STORAGE_NULL_ACCOUNT_TYPE);
}

if (accountName == null) {
throw new IllegalArgumentException(MASFoundationStrings.SHARED_STORAGE_NULL_ACCOUNT_NAME);
}

shared = sharedStorage;

try {
SharedStorageIdentifier identifier = new SharedStorageIdentifier();

mAccountManager = AccountManager.get(MAS.getContext());
//Attempt to retrieve the account
Account[] accounts = mAccountManager.getAccountsByType(accountType);
for (Account account : accounts) {
if (accountName.equals(account.name)) {
String password = mAccountManager.getPassword(account);
String savedPassword = identifier.toString();
if (password.equals(savedPassword)) {
mAccount = account;
}else {
// - case migration from old AccountManagerStoreDataSource
mAccount = null;
identifier = new SharedStorageIdentifier();
synchronized (mutex) {
SharedStorageIdentifier identifier = new SharedStorageIdentifier();

mAccountManager = AccountManager.get(MAS.getContext());

//Attempt to retrieve the account
Account[] accounts = mAccountManager.getAccountsByType(accountType);
messageBuilder.append(" existing accounts (" + accountType + ")=" + accounts.length);
for (Account account : accounts) {
messageBuilder.append(" trying account:" + account.name);

if (accountName.equals(account.name)) {
String password = mAccountManager.getPassword(account);
String savedPassword = identifier.toString();
if (password != null && password.equals(savedPassword)) {
mAccount = account;
}else {
// - case migration from old AccountManagerStoreDataSource
mAccount = null;
messageBuilder.append(" password is null or password not equals to saved password:");
identifier = new SharedStorageIdentifier();
}
}
}
}

//Create the account if it wasn't retrieved,
if (mAccount == null) {
mAccount = new Account(accountName, accountType);
mAccountManager.addAccountExplicitly(mAccount, identifier.toString(), null);
//Create the account if it wasn't retrieved,
if (mAccount == null) {
messageBuilder.append(" account identifier when mAccount is null:" +identifier);
messageBuilder.append(" attempt to create an account explicitly name=" + accountName + ", accountType=" + accountType);
mAccount = new Account(accountName, accountType);
boolean accountCreated = mAccountManager.addAccountExplicitly(mAccount, identifier.toString(), null);
messageBuilder.append("created account status=" + accountCreated);
}
}
Log.e(TAG, "Retrieved account details name="+mAccount.name+
" type=" +mAccount.type+" hashcode=" + mAccount.hashCode());
} catch (Exception e) {
throw new MASSharedStorageException(e.getMessage(), e);
Log.e(TAG, "Failed to retrieve account, " + e.getMessage() + " - " + messageBuilder.toString());
throw new MASSharedStorageException(e.getMessage() +" - " + messageBuilder.toString(), e);
}
}

Expand Down Expand Up @@ -223,4 +243,4 @@ private String proxyKey(String key){

return retVal;
}
}
}