svn commit: r1596538 - in /syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core: connid/PasswordGenerator.java util/SecureRandomUtil.java
Author: coheigea
Date: Wed May 21 11:14:12 2014
New Revision: 1596538
URL: http://svn.apache.org/r1596538
Log:
Better password generation
Conflicts:
core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
Modified:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java
Modified:
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java?rev=1596538&r1=1596537&r2=1596538&view=diff
==
---
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
(original)
+++
syncope/branches/1_1_X/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
Wed May 21 11:14:12 2014
@@ -20,7 +20,7 @@ package org.apache.syncope.core.connid;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang.RandomStringUtils;
+
import org.apache.commons.lang.StringUtils;
import org.apache.syncope.common.types.PasswordPolicySpec;
import org.apache.syncope.core.persistence.beans.ExternalResource;
@@ -30,6 +30,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.PolicyDAO;
import org.apache.syncope.core.policy.PolicyPattern;
import org.apache.syncope.core.util.InvalidPasswordPolicySpecException;
+import org.apache.syncope.core.util.SecureRandomUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -41,7 +42,7 @@ import org.springframework.stereotype.Co
@Component
public class PasswordGenerator {
-private static final String[] SPECIAL_CHARS = {"", "!", "£", "%", "&",
"(", ")", "?", "#", "_", "$"};
+private static final char[] SPECIAL_CHARS = {'!', '£', '%', '&', '(',
')', '?', '#', '$'};
@Autowired
private PolicyDAO policyDAO;
@@ -216,7 +217,7 @@ public class PasswordGenerator {
//filled empty chars
for (int firstEmptyChar = firstEmptyChar(generatedPassword);
firstEmptyChar < generatedPassword.length - 1;
firstEmptyChar++) {
-generatedPassword[firstEmptyChar] =
RandomStringUtils.randomAlphabetic(1);
+generatedPassword[firstEmptyChar] =
SecureRandomUtil.generateRandomLetter();
}
checkPrefixAndSuffix(generatedPassword, policySpec);
@@ -224,48 +225,43 @@ public class PasswordGenerator {
return StringUtils.join(generatedPassword);
}
-private int randomNumber(final int range) {
-int randomNumber = (int) (Math.random() * (range - 1));
-return randomNumber == 0 ? 1 : randomNumber;
-}
-
private void checkStartChar(final String[] generatedPassword, final
PasswordPolicySpec policySpec) {
if (policySpec.isMustStartWithAlpha()) {
-generatedPassword[0] = RandomStringUtils.randomAlphabetic(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomLetter();
}
if (policySpec.isMustStartWithNonAlpha() ||
policySpec.isMustStartWithDigit()) {
-generatedPassword[0] = RandomStringUtils.randomNumeric(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomNumber();
}
if (policySpec.isMustntStartWithAlpha()) {
-generatedPassword[0] = RandomStringUtils.randomNumeric(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomNumber();
}
if (policySpec.isMustntStartWithDigit()) {
-generatedPassword[0] = RandomStringUtils.randomAlphabetic(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomLetter();
}
if (policySpec.isMustntStartWithNonAlpha()) {
-generatedPassword[0] = RandomStringUtils.randomAlphabetic(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomLetter();
}
}
private void checkEndChar(final String[] generatedPassword, final
PasswordPolicySpec policySpec) {
if (policySpec.isMustEndWithAlpha()) {
-generatedPassword[policySpec.getMinLength() - 1] =
RandomStringUtils.randomAlphabetic(1);
+generatedPassword[policySpec.getMinLength() - 1] =
SecureRandomUtil.generateRandomLetter();
}
if (policySpec.isMustEndWithNonAlpha() ||
policySpec.isMustEndWithDigit()) {
-generatedPassword[policySpec.getMinLength() - 1] =
RandomStringUtils.randomNumeric(1);
+generatedPassword[policySpec.getMinLength() - 1] =
SecureRandomUtil.generateRandomNumber();
}
if (policySpec.isMustntEndWithAlpha()) {
-generatedPassword[policySpec.getMinLength() - 1] =
RandomStringUtils.r
svn commit: r1596537 - in /syncope/trunk/core/src/main/java/org/apache/syncope/core: connid/PasswordGenerator.java util/SecureRandomUtil.java
Author: coheigea
Date: Wed May 21 11:06:09 2014
New Revision: 1596537
URL: http://svn.apache.org/r1596537
Log:
Better password generation
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
syncope/trunk/core/src/main/java/org/apache/syncope/core/util/SecureRandomUtil.java
Modified:
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java?rev=1596537&r1=1596536&r2=1596537&view=diff
==
---
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
(original)
+++
syncope/trunk/core/src/main/java/org/apache/syncope/core/connid/PasswordGenerator.java
Wed May 21 11:06:09 2014
@@ -20,7 +20,7 @@ package org.apache.syncope.core.connid;
import java.util.ArrayList;
import java.util.List;
-import org.apache.commons.lang3.RandomStringUtils;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.types.PasswordPolicySpec;
import org.apache.syncope.core.persistence.beans.ExternalResource;
@@ -30,6 +30,7 @@ import org.apache.syncope.core.persisten
import org.apache.syncope.core.persistence.dao.PolicyDAO;
import org.apache.syncope.core.policy.PolicyPattern;
import org.apache.syncope.core.util.InvalidPasswordPolicySpecException;
+import org.apache.syncope.core.util.SecureRandomUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -41,7 +42,7 @@ import org.springframework.stereotype.Co
@Component
public class PasswordGenerator {
-private static final String[] SPECIAL_CHARS = {"", "!", "£", "%", "&",
"(", ")", "?", "#", "_", "$"};
+private static final char[] SPECIAL_CHARS = {'!', '£', '%', '&', '(',
')', '?', '#', '$'};
@Autowired
private PolicyDAO policyDAO;
@@ -216,7 +217,7 @@ public class PasswordGenerator {
//filled empty chars
for (int firstEmptyChar = firstEmptyChar(generatedPassword);
firstEmptyChar < generatedPassword.length - 1;
firstEmptyChar++) {
-generatedPassword[firstEmptyChar] =
RandomStringUtils.randomAlphabetic(1);
+generatedPassword[firstEmptyChar] =
SecureRandomUtil.generateRandomLetter();
}
checkPrefixAndSuffix(generatedPassword, policySpec);
@@ -224,48 +225,43 @@ public class PasswordGenerator {
return StringUtils.join(generatedPassword);
}
-private int randomNumber(final int range) {
-int randomNumber = (int) (Math.random() * (range - 1));
-return randomNumber == 0 ? 1 : randomNumber;
-}
-
private void checkStartChar(final String[] generatedPassword, final
PasswordPolicySpec policySpec) {
if (policySpec.isMustStartWithAlpha()) {
-generatedPassword[0] = RandomStringUtils.randomAlphabetic(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomLetter();
}
if (policySpec.isMustStartWithNonAlpha() ||
policySpec.isMustStartWithDigit()) {
-generatedPassword[0] = RandomStringUtils.randomNumeric(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomNumber();
}
if (policySpec.isMustntStartWithAlpha()) {
-generatedPassword[0] = RandomStringUtils.randomNumeric(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomNumber();
}
if (policySpec.isMustntStartWithDigit()) {
-generatedPassword[0] = RandomStringUtils.randomAlphabetic(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomLetter();
}
if (policySpec.isMustntStartWithNonAlpha()) {
-generatedPassword[0] = RandomStringUtils.randomAlphabetic(1);
+generatedPassword[0] = SecureRandomUtil.generateRandomLetter();
}
}
private void checkEndChar(final String[] generatedPassword, final
PasswordPolicySpec policySpec) {
if (policySpec.isMustEndWithAlpha()) {
-generatedPassword[policySpec.getMinLength() - 1] =
RandomStringUtils.randomAlphabetic(1);
+generatedPassword[policySpec.getMinLength() - 1] =
SecureRandomUtil.generateRandomLetter();
}
if (policySpec.isMustEndWithNonAlpha() ||
policySpec.isMustEndWithDigit()) {
-generatedPassword[policySpec.getMinLength() - 1] =
RandomStringUtils.randomNumeric(1);
+generatedPassword[policySpec.getMinLength() - 1] =
SecureRandomUtil.generateRandomNumber();
}
if (policySpec.isMustntEndWithAlpha()) {
-generatedPassword[policySpec.getMinLength() - 1] =
RandomStringUtils.randomNumeric(1);
+generatedPassword[policySpec.getMinLength() - 1] =
SecureRandomUtil.generateRandomNumber();
}
if
