You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/02/16 10:44:35 UTC
syncope git commit: [SYNCOPE-767] Applying suggested improvement
Repository: syncope
Updated Branches:
refs/heads/master 26cba3b9c -> 0d9358373
[SYNCOPE-767] Applying suggested improvement
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0d935837
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0d935837
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0d935837
Branch: refs/heads/master
Commit: 0d9358373bf741130b06f739109d8dfd4d74031b
Parents: 26cba3b
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Feb 16 10:44:24 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Feb 16 10:44:24 2016 +0100
----------------------------------------------------------------------
.../syncope/core/persistence/jpa/dao/DefaultAccountRule.java | 3 ++-
.../syncope/core/persistence/jpa/dao/DefaultPasswordRule.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d935837/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultAccountRule.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultAccountRule.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultAccountRule.java
index d4eaf63..f2156fc 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultAccountRule.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultAccountRule.java
@@ -20,6 +20,7 @@ package org.apache.syncope.core.persistence.jpa.dao;
import java.util.List;
import java.util.regex.Pattern;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.policy.AccountRuleConf;
import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;
import org.apache.syncope.core.misc.policy.AccountPolicyException;
@@ -72,7 +73,7 @@ public class DefaultAccountRule implements AccountRule {
// check words not permitted
for (String word : this.conf.getWordsNotPermitted()) {
- if (user.getUsername().contains(word)) {
+ if (StringUtils.containsIgnoreCase(user.getUsername(), word)) {
throw new AccountPolicyException("Used word(s) not permitted");
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/0d935837/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPasswordRule.java
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPasswordRule.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPasswordRule.java
index d3ab592..1ce560a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPasswordRule.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/DefaultPasswordRule.java
@@ -19,6 +19,7 @@
package org.apache.syncope.core.persistence.jpa.dao;
import java.util.List;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.policy.DefaultPasswordRuleConf;
import org.apache.syncope.common.lib.policy.PasswordRuleConf;
import org.apache.syncope.core.misc.policy.PasswordPolicyException;
@@ -69,7 +70,7 @@ public class DefaultPasswordRule implements PasswordRule {
// check words not permitted
for (String word : this.conf.getWordsNotPermitted()) {
- if (clearPassword.contains(word)) {
+ if (StringUtils.containsIgnoreCase(clearPassword, word)) {
throw new PasswordPolicyException("Used word(s) not permitted");
}
}