Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ protected DefaultPasswordRuleConf merge(final List<DefaultPasswordRuleConf> defa
result.setRepeatSame(ruleConf.getRepeatSame());
}

if (!result.isUsernameAllowed()) {
if (result.isUsernameAllowed()) {
result.setUsernameAllowed(ruleConf.isUsernameAllowed());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,11 @@
package org.apache.syncope.core.spring.security;

import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.common.lib.policy.DefaultPasswordRuleConf;
import org.apache.syncope.core.provisioning.api.serialization.POJOHelper;
Expand All @@ -32,6 +34,7 @@
import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
import tools.jackson.databind.json.JsonMapper;


@SpringJUnitConfig(classes = { SpringTestConfiguration.class })
public class PasswordGeneratorTest {

Expand Down Expand Up @@ -149,4 +152,66 @@ public void issueSYNCOPE678() {
password = passwordGenerator.generate(List.of(new TestPasswordPolicy(passwordRule)));
assertNotNull(password);
}


private static DefaultPasswordRuleConf configRule(final boolean usernameAllowed) {
DefaultPasswordRuleConf conf = new DefaultPasswordRuleConf();
conf.setUsernameAllowed(usernameAllowed);
return conf;
}

@Test
Comment thread
ilgrosso marked this conversation as resolved.
Resolved
public void allForbid() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(false));
rules.add(configRule(false));
assertFalse(passwordGenerator.merge(rules).isUsernameAllowed());
}

@Test
public void singleTrue() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(true));
assertTrue(passwordGenerator.merge(rules).isUsernameAllowed());
}

@Test
public void singleFalse() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(false));
assertFalse(passwordGenerator.merge(rules).isUsernameAllowed());
}

@Test
public void twoTrue() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(true));
rules.add(configRule(true));
assertTrue(passwordGenerator.merge(rules).isUsernameAllowed());
}

@Test
public void trueThenFalse() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(true));
rules.add(configRule(false));
assertFalse(passwordGenerator.merge(rules).isUsernameAllowed());
}

@Test
public void falseThenTrue() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(false));
rules.add(configRule(true));
assertFalse(passwordGenerator.merge(rules).isUsernameAllowed());
}

@Test
public void falseInTheMiddle() {
List<DefaultPasswordRuleConf> rules = new ArrayList<>();
rules.add(configRule(true));
rules.add(configRule(false));
rules.add(configRule(true));
assertFalse(passwordGenerator.merge(rules).isUsernameAllowed());
}
}