Skip to content

fix(security): generate OTP with SecureRandom, uniform draw, zero-padded (A2) #136

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
pallakartheekreddy wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

fix(security): generate OTP with SecureRandom, uniform draw, zero-padded (A2) #136

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
19 changes: 12 additions & 7 deletions .../src/main/java/org/sunbird/keycloak/resetcredential/sms/KeycloakSmsAuthenticatorUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import org.sunbird.utils.JsonUtil;

import java.io.File;
import java.security.SecureRandom;
import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.stream.Collectors;

/**
Expand All @@ -21,6 +21,8 @@ public class KeycloakSmsAuthenticatorUtil {

private static Logger logger = Logger.getLogger(KeycloakSmsAuthenticatorUtil.class);

private static final SecureRandom SECURE_RANDOM = new SecureRandom();

public static String getAttributeValue(UserModel user, String attributeName) {
String result = null;
List<String> values = user.getAttributeStream(attributeName).collect(Collectors.toList());
Expand Down Expand Up @@ -119,14 +121,17 @@ private static Boolean send(String mobileNumber, String code) {
}

static String getSmsCode(long nrOfDigits) {
if (nrOfDigits < 1) {
throw new RuntimeException("Number of digits must be bigger than 0");
if (nrOfDigits < 1 || nrOfDigits > 9) {
// 10^9 fits in an int; higher widths would need a long/BigInteger draw.
throw new IllegalArgumentException("Number of digits must be between 1 and 9");
}

double maxValue = Math.pow(10.0, nrOfDigits); // 10 ^ nrOfDigits;
Random r = new Random();
long code = (long) (r.nextFloat() * maxValue);
return Long.toString(code);
// SecureRandom + uniform integer draw (not java.util.Random / nextFloat, which is a
// predictable LCG that under-samples the code space). Zero-pad so leading zeros are
// preserved and every OTP is exactly nrOfDigits long.
int bound = (int) Math.pow(10, nrOfDigits);
int code = SECURE_RANDOM.nextInt(bound);
return String.format("%0" + nrOfDigits + "d", code);
}

public static boolean validateTelephoneNumber(String telephoneNumber) {
Expand Down