Skip to content

4.8.17 dev v2 #8

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

Open
sharathkashyap wants to merge 3 commits into
base: cbrelease-4.8.17
Choose a base branch
from
Open

4.8.17 dev v2 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcf568e
Added debug logs
karthik-tarento Sep 11, 2024
e44ca84
Added logs
karthik-tarento Sep 11, 2024
896ebec
Added more logs to validate password
karthik-tarento Sep 12, 2024
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
5 changes: 5 additions & 0 deletions keycloak/sms-provider/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,5 +121,10 @@
<!--<scope>test</scope> -->
</dependency>

<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-core</artifactId>
<version>5.5.0</version>
</dependency>
</dependencies>
</project>
45 changes: 45 additions & 0 deletions ...ak/sms-provider/src/main/java/org/sunbird/keycloak/login/PasswordAndOtpAuthenticator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
import org.keycloak.services.ServicesLogger;
import org.keycloak.services.managers.AuthenticationManager;
import org.keycloak.services.messages.Messages;
import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder;
import org.sunbird.keycloak.resetcredential.sms.KeycloakSmsAuthenticatorConstants;
import org.sunbird.keycloak.resetcredential.sms.KeycloakSmsAuthenticatorUtil;
import org.sunbird.keycloak.utils.Constants;
Expand All @@ -61,6 +62,8 @@ public class PasswordAndOtpAuthenticator extends AbstractUsernameFormAuthenticat

Logger logger = Logger.getLogger(PasswordAndOtpAuthenticator.class);
private static final SecureRandom random = new SecureRandom();
private Pbkdf2PasswordEncoder passwordEncoder = new Pbkdf2PasswordEncoder();


private enum CODE_STATUS {
VALID, INVALID, EXPIRED
Expand Down Expand Up @@ -670,6 +673,9 @@ public boolean validatePassword(AuthenticationFlowContext context, UserModel use
List<CredentialInput> credentials = new LinkedList<>();
credentials.add(UserCredentialModel.password(decryptedPassword));

boolean isValid = validateHashedPassword(context, user, decryptedPassword);
logger.info(String.format("PasswordAndOtpAuthenticator::validateHashedPassword returns : %s", isValid));

if (decryptedPassword != null && !decryptedPassword.isEmpty()
&& context.getSession().userCredentialManager().isValid(context.getRealm(), user, credentials)) {
return true;
Expand All @@ -695,4 +701,43 @@ private String decryptPassword(String encryptedPassword, String secretKey, Strin
throw new RuntimeException("Error while decrypting password", e);
}
}

private boolean validateHashedPassword(AuthenticationFlowContext context, UserModel user,
String clientHashedPassword) {
try {

// Fetch the stored password credential
List<CredentialModel> credentials = context.getSession().userCredentialManager()
.getStoredCredentialsByType(context.getRealm(), user, CredentialModel.PASSWORD);

if (!credentials.isEmpty()) {
CredentialModel storedCredential = credentials.get(0);
logger.info(String.format(
"PasswordAndOtpAuthenticator::validateHashedPassword storedPasswordHash from list : %s",
storedCredential.getValue()));
} else {
logger.info(String.format("PasswordAndOtpAuthenticator::validateHashedPassword null value from type"));
}

// Fetch the stored password from Keycloak
CredentialModel storedCredential = context.getSession().userCredentialManager()
.getStoredCredentialById(context.getRealm(), user, CredentialModel.PASSWORD);

// The password stored in Keycloak is hashed with PBKDF2
if (storedCredential != null) {
String storedPasswordHash = storedCredential.getValue();
logger.info(String.format("PasswordAndOtpAuthenticator::validateHashedPassword storedPasswordHash : %s",
storedPasswordHash));
// Compare the PBKDF2-hashed password from client with Keycloak's stored PBKDF2
// hash
return passwordEncoder.matches(clientHashedPassword, storedPasswordHash);
} else {
logger.info(String.format("PasswordAndOtpAuthenticator::validateHashedPassword null value from id"));
}

} catch (Exception e) {
logger.error("Failed to validateHashedPassword. Exception: ", e);
}
return false;
}
}