Added: Random Passwords #48
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| package com.kinancity.core.generator.password; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.concurrent.ThreadLocalRandom; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import com.kinancity.core.KinanCityCli; | ||
| import com.kinancity.core.generator.PasswordGenerator; | ||
|
|
||
| /** | ||
| * Random Password generator | ||
| * @author 0815Flo0815 | ||
| * | ||
| */ | ||
| public class RandomPasswordGenerator implements PasswordGenerator { | ||
|
|
||
| private static final char[][] CHAR_POOL = { | ||
| {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'}, | ||
| {'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z'}, | ||
| {'1','2','3','4','5','6','7','8','9','0'}, | ||
| {'#','?','!','@','$','%','%','^','&','>','<','+','`','*','(',')','-',']'} | ||
| }; | ||
| private static final int MIN_LENGTH = 8; | ||
| private static final int MAX_LENGTH = 50; | ||
|
|
||
| private static Logger LOGGER = LoggerFactory.getLogger(KinanCityCli.class); | ||
|
There was a problem hiding this comment. On other classes I currently use instance loggers : |
||
|
|
||
| private int length; | ||
|
|
||
| public RandomPasswordGenerator(Integer length) { | ||
|
There was a problem hiding this comment. There is no need to take an Integer as paramter, primitive int would be better to avoid null checks |
||
| super(); | ||
| if (length == null) { | ||
| LOGGER.warn("Password length must be a number! Using a random length!"); | ||
| this.length = -1; | ||
| } | ||
| else if (length < 0) { | ||
|
There was a problem hiding this comment. style : |
||
| this.length = -1; | ||
| } | ||
| else if (length < MIN_LENGTH) { | ||
| LOGGER.warn("The minimum password length is " + MIN_LENGTH + "! Using " + MIN_LENGTH + "!"); | ||
| this.length = MIN_LENGTH; | ||
| } | ||
| else if (length > MAX_LENGTH) { | ||
| LOGGER.warn("The maximum password length is " + MAX_LENGTH + "! Using " + MAX_LENGTH + "!"); | ||
| this.length = MAX_LENGTH; | ||
| } | ||
| else { | ||
| this.length = length; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public String generatePassword() { | ||
| int length; | ||
| if (this.length == -1) { | ||
| length = ThreadLocalRandom.current().nextInt(MIN_LENGTH, MAX_LENGTH + 1); | ||
| } | ||
| else { | ||
| length = this.length; | ||
| } | ||
|
|
||
| ArrayList<Character> passwordPool = new ArrayList<Character>(); | ||
| for (int i = 0; i < length; i++) { | ||
| char[] currentPool = CHAR_POOL[i % CHAR_POOL.length]; | ||
| int randomIndexPool = ThreadLocalRandom.current().nextInt(currentPool.length); | ||
| int randomIndexPosition = ThreadLocalRandom.current().nextInt(passwordPool.size() + 1); | ||
| passwordPool.add(randomIndexPosition, currentPool[randomIndexPool]); | ||
| } | ||
| Collections.shuffle(passwordPool); | ||
| return String.valueOf(passwordPool.stream().map(e->e.toString()).collect(Collectors.joining())); | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,8 @@ | |
|
|
||
| import com.kinancity.api.model.AccountData; | ||
| import com.kinancity.core.generator.account.SequenceAccountGenerator; | ||
| import com.kinancity.core.generator.password.RandomPasswordGenerator; | ||
| import com.kinancity.core.generator.password.SinglePasswordGenerator; | ||
|
|
||
| public class SequenceAccountGeneratorTest { | ||
|
|
||
|
|
@@ -16,21 +18,37 @@ public void sequenceTest() { | |
| generator.setBaseEmail("[email protected]"); | ||
| generator.setUsernamePattern("pref*****suf"); | ||
| generator.setStartFrom(1234); | ||
| generator.setNbAccounts(4); | ||
|
|
||
| AccountData data; | ||
|
|
||
| generator.setPasswordGenerator(new SinglePasswordGenerator("Test")); | ||
|
|
||
| data = generator.next(); | ||
| assertThat(data).isNotNull(); | ||
| assertThat(data.getUsername()).isEqualTo("pref01234suf"); | ||
| assertThat(data.getPassword()).isEqualTo("Test"); | ||
|
|
||
| generator.setPasswordGenerator(new RandomPasswordGenerator(-1)); | ||
|
|
||
| data = generator.next(); | ||
| assertThat(data).isNotNull(); | ||
| assertThat(data.getUsername()).isEqualTo("pref01235suf"); | ||
| assertThat(data.getPassword().length()).isBetween(8, 50); | ||
|
There was a problem hiding this comment. Using the same regexp or calling directly isAccountValid would be better. |
||
|
|
||
| generator.setPasswordGenerator(new RandomPasswordGenerator(5)); | ||
|
|
||
| data = generator.next(); | ||
| assertThat(data).isNotNull(); | ||
| assertThat(data.getUsername()).isEqualTo("pref01236suf"); | ||
| assertThat(data.getPassword().length()).isEqualTo(8); | ||
|
|
||
| generator.setPasswordGenerator(new RandomPasswordGenerator(100)); | ||
|
|
||
| data = generator.next(); | ||
| assertThat(data).isNotNull(); | ||
| assertThat(data.getUsername()).isEqualTo("pref01237suf"); | ||
| assertThat(data.getPassword().length()).isEqualTo(50); | ||
|
|
||
| data = generator.next(); | ||
| assertThat(data).isNull(); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Options key should not overlap each other one should not start like the other.
"p" is contained in "pl"