Skip to content
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

Add Null Check when Validating and Storing TOTP Secret Key #182

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Add Null Check when Validating and Storing TOTP Secret Key #182

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
34 changes: 28 additions & 6 deletions ...so2/carbon/identity/application/authenticator/totp/util/TOTPAuthenticatorCredentials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,24 @@

import org.apache.commons.codec.binary.Base32;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang.StringUtils;
import org.wso2.carbon.core.util.CryptoException;
import org.wso2.carbon.identity.application.authentication.framework.exception.AuthenticationFailedException;
import org.wso2.carbon.identity.application.authenticator.totp.TOTPAuthenticatorConstants;
import org.wso2.carbon.user.api.UserRealm;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.utils.multitenancy.MultitenantUtils;

import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.*;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.Random;
import java.util.logging.Logger;
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

/**
* TOTP Authenticator Implementation.
Expand Down Expand Up @@ -372,9 +377,26 @@ public boolean authorizeAndStoreSecret(int verificationCode, String username) {
}
Map<String, String> userClaimValues = userRealm.getUserStoreManager().
getUserClaimValues(tenantAwareUsername,
new String[]{TOTPAuthenticatorConstants.VERIFY_SECRET_KEY_CLAIM_URL}, null);
String secretKey = TOTPUtil.decrypt(userClaimValues.
get(TOTPAuthenticatorConstants.VERIFY_SECRET_KEY_CLAIM_URL));
new String[]{
TOTPAuthenticatorConstants.VERIFY_SECRET_KEY_CLAIM_URL,
TOTPAuthenticatorConstants.SECRET_KEY_CLAIM_URL
}, null);
String verifySecretKeyClaim = userClaimValues
.get(TOTPAuthenticatorConstants.VERIFY_SECRET_KEY_CLAIM_URL);
if (StringUtils.isBlank(verifySecretKeyClaim)) {
/*
If the secret key is already validated then "Verify Secret Key" claim can be empty.
In that case, "Secret Key" claim will be used for TOTP validation.
*/
dhaura marked this conversation as resolved.
Show resolved Hide resolved
String secretKeyClaim = userClaimValues
.get(TOTPAuthenticatorConstants.SECRET_KEY_CLAIM_URL);
if (StringUtils.isBlank(secretKeyClaim)) {
return false;
}
return authorize(TOTPUtil.decrypt(secretKeyClaim), verificationCode, new Date().getTime());
}

String secretKey = TOTPUtil.decrypt(verifySecretKeyClaim);
if (authorize(secretKey, verificationCode, new Date().getTime())) {
storeSecretKey(secretKey, tenantAwareUsername, tenantDomain, userRealm);
return true;
Expand Down
Loading