-
Notifications
You must be signed in to change notification settings - Fork 27
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #128 from Password4j/126
#126: back to UTF-8 encoding for byte[]
- Loading branch information
Showing
6 changed files
with
158 additions
and
108 deletions.
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,150 @@ | ||
| package com.password4j; | ||
|
|
||
| import com.password4j.types.Argon2; | ||
| import org.junit.Assert; | ||
| import org.junit.Test; | ||
|
|
||
| import java.security.Provider; | ||
| import java.security.Security; | ||
| import java.util.Set; | ||
|
|
||
| import static org.junit.Assert.assertEquals; | ||
| import static org.junit.Assert.assertTrue; | ||
|
|
||
| public class IssuesTest | ||
| { | ||
|
|
||
| /** | ||
| * @see <a href="https://github.com/Password4j/password4j/issues/92">issue #92</a> | ||
| */ | ||
| @Test | ||
| public void issue92() | ||
| { | ||
| String hash = "$argon2id$v=19$m=16384,t=2,p=1$nlm7oNI5zquzSYkyby6oVw$JOkJAYrDB0i2gmiJrXC6o2r+u1rszCm/RO9gIQtnxlY"; | ||
| String plain = "Test123!"; | ||
| Argon2Function function = Argon2Function.getInstanceFromHash(hash); | ||
|
|
||
| boolean verified = Password.check(plain, hash).with(function); | ||
| Hash newHash = Password.hash(plain).addSalt("Y9ΫI2o.W").with(function); | ||
| boolean verified2 = Password.check(plain, newHash); | ||
|
|
||
| assertTrue(verified); | ||
| assertTrue(verified2); | ||
| assertEquals("$argon2id$v=19$m=16384,t=2,p=1$WTnOq0kyby5X$SewIdM+Ywctw0lfNQ0xKYoUIlyRs3qF+gVmEVtpdmyg", newHash.getResult()); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @see <a href="https://github.com/Password4j/password4j/issues/99">issue #99</a> | ||
| */ | ||
| @Test | ||
| public void issue99() | ||
| { | ||
| int memory = 65536; | ||
| int iterations = 2; | ||
| int parallelism = 3; | ||
| int outputLength = 32; | ||
| int version = 0x13; | ||
| byte[] salt = | ||
| { | ||
| (byte) 0x6b, (byte) 0x25, (byte) 0xc9, (byte) 0xd7, (byte) 0x0e, (byte) 0x5c, (byte) 0x19, (byte) 0xac, | ||
| (byte) 0x51, (byte) 0x74, (byte) 0xd7, (byte) 0x74, (byte) 0x53, (byte) 0xad, (byte) 0x23, (byte) 0x70, | ||
| (byte) 0x15, (byte) 0x27, (byte) 0x56, (byte) 0x2e, (byte) 0x02, (byte) 0xb8, (byte) 0xec, (byte) 0x5c, | ||
| (byte) 0xac, (byte) 0x89, (byte) 0x2d, (byte) 0xc3, (byte) 0xe4, (byte) 0xb5, (byte) 0x1c, (byte) 0x12 | ||
| }; | ||
| byte[] password="Test".getBytes(); | ||
| Argon2 type = Argon2.ID; | ||
| Argon2Function instance=Argon2Function.getInstance(memory, iterations, parallelism, outputLength, type, version); | ||
|
|
||
| Hash hash = instance.hash(password, salt); | ||
|
|
||
|
|
||
| String expResult = "cbcfdee482c233e525ca405c7014e89cd33142758a2f1d23c420690f950c988c"; | ||
| assertEquals(expResult, printBytesToString(hash.getBytes())); | ||
| } | ||
|
|
||
| /** | ||
| * @see <a href="https://github.com/Password4j/password4j/issues/93">issue #93</a> | ||
| */ | ||
| @Test | ||
| public void issue93() | ||
| { | ||
| String hash = "$argon2id$v=19$m=16384,t=2,p=1$nlm7oNI5zquzSYkyby6oVw$JOkJAYrDB0i2gmiJrXC6o2r+u1rszCm/RO9gIQtnxlY"; | ||
| Argon2Function function = Argon2Function.getInstanceFromHash(hash); | ||
|
|
||
| boolean test1 = Password.check("Test123!", hash).with(function); | ||
| assertTrue(test1); | ||
|
|
||
| boolean test2 = function.check("Test123!", hash); | ||
| assertTrue(test2); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @see <a href="https://github.com/Password4j/password4j/issues/120">issue #120</a> | ||
| */ | ||
| @Test(expected = Test.None.class) | ||
| public void issue120() | ||
| { | ||
| // GIVEN | ||
| String name = "issue120FakeProvider"; | ||
| Provider emptyProvider = new Provider(name, 1, "info") | ||
| { | ||
| @Override | ||
| public synchronized Set<Service> getServices() | ||
| { | ||
| return null; | ||
| } | ||
| }; | ||
| Security.addProvider(emptyProvider); | ||
|
|
||
| // WHEN | ||
| Password.hash("hash"); | ||
|
|
||
| // THEN | ||
| Security.removeProvider(name); | ||
| } | ||
|
|
||
|
|
||
| /** | ||
| * @see <a href="https://github.com/Password4j/password4j/issues/126">issue #126</a> | ||
| */ | ||
| @Test | ||
| public void issue126() | ||
| { | ||
| byte[] hashBytes = Password.hash("’(っ＾▿＾)۶\uD83C\uDF78\uD83C\uDF1F\uD83C\uDF7A٩(˘◡˘ ) ❌❌ ❌❌❌") | ||
| .addSalt("\uD83E\uDDC2") | ||
| .withScrypt() | ||
| .getBytes(); | ||
|
|
||
| Assert.assertEquals("827b022b411e712e5ae4855d8c71cb047d882b2457120d1019974d17dcf6f1bf59644d9a93e470ab14ee5f7a88ae9b0140d2db121de58f6d830fc9c16c82f212", printBytesToString(hashBytes)); | ||
|
|
||
|
|
||
| hashBytes = Password.hash("ŸŁĀPRČ") | ||
| .addSalt("ŸŁĀPRČAA") | ||
| .withArgon2() | ||
| .getBytes(); | ||
|
|
||
| Assert.assertEquals("59dedcf45d7a8604926ca66f6abe3990ce8b6ba108f535836fa18e95b7d94e9f56301e422c1d487dd06dc26061261402a5f7fe912bd545b6aeec866fec74df81", printBytesToString(hashBytes)); | ||
|
|
||
| } | ||
|
|
||
| private static String printBytesToString(byte[] bytes) | ||
| { | ||
| StringBuilder byteString= new StringBuilder(); | ||
| if (bytes!=null) | ||
| { | ||
| for (byte aByte : bytes) | ||
| { | ||
| byteString.append(String.format("%02x", aByte)); | ||
| } | ||
| } | ||
| else | ||
| { | ||
| byteString = new StringBuilder("-"); | ||
| } | ||
| return byteString.toString(); | ||
| } | ||
|
|
||
|
|
||
| } |
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 |
|---|---|---|
|
|
@@ -271,4 +271,6 @@ public void testOWASP() | |
| PropertyReader.properties = oldProps; | ||
| } | ||
|
|
||
|
|
||
|
|
||
| } | ||