-
Notifications
You must be signed in to change notification settings - Fork 9
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 #1711 from wultra/develop
Merge develop to master
- Loading branch information
Showing
45 changed files
with
416 additions
and
94 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
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,5 @@ | ||
| # Migration from 1.8.0 to 1.9.0 | ||
|
|
||
| This guide contains instructions for migration from PowerAuth WebFlow version `1.8.x` to version `1.9.0`. | ||
|
|
||
| There are no database changes needed for this version. |
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
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 |
|---|---|---|
|
|
@@ -17,11 +17,14 @@ | |
| */ | ||
| package io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration; | ||
|
|
||
| import lombok.Getter; | ||
|
|
||
| /** | ||
| * Enumeration representing hashing algorithms. | ||
| * | ||
| * @author Roman Strobl, [email protected] | ||
| */ | ||
| @Getter | ||
| public enum HashAlgorithm { | ||
|
|
||
| /** | ||
|
|
@@ -37,35 +40,30 @@ public enum HashAlgorithm { | |
| /** | ||
| * Algorithm argon2id. | ||
| */ | ||
| ARGON_2ID("argon2id", 2); | ||
| ARGON_2ID("argon2id", 2), | ||
|
|
||
| BCRYPT("bcrypt"); | ||
|
|
||
| private final String name; | ||
| private final int id; | ||
| private final Integer id; | ||
|
|
||
| /** | ||
| * Hash algorithm constructor. | ||
| * @param name Algorithm name for Modular Crypt Format. | ||
| * @param id Algorithm ID in Bouncy Castle library. | ||
| * @param name Algorithm name. | ||
| */ | ||
| HashAlgorithm(String name, int id) { | ||
| HashAlgorithm(String name) { | ||
| this.name = name; | ||
| this.id = id; | ||
| this.id = null; | ||
| } | ||
|
|
||
| /** | ||
| * Get algorithm name for Modular Crypt Format. | ||
| * @return Algorithm name. | ||
| */ | ||
| public String getName() { | ||
| return name; | ||
| } | ||
|
|
||
| /** | ||
| * Get algorithm ID in Bouncy Castle library. | ||
| * @return Algorithm ID. | ||
| * Hash algorithm constructor for Argon family of algorithms. | ||
| * @param name Algorithm name for Modular Crypt Format. | ||
| * @param id Algorithm ID in Bouncy Castle library (Argon algorithms only). | ||
| */ | ||
| public int getId() { | ||
| return id; | ||
| HashAlgorithm(String name, int id) { | ||
| this.name = name; | ||
| this.id = id; | ||
| } | ||
|
|
||
| } | ||
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
97 changes: 97 additions & 0 deletions
97
...a/io/getlime/security/powerauth/app/nextstep/service/CredentialProtectionServiceTest.java
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,97 @@ | ||
| /* | ||
| * PowerAuth Web Flow and related software components | ||
| * Copyright (C) 2024 Wultra s.r.o. | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as published | ||
| * by the Free Software Foundation, either version 3 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package io.getlime.security.powerauth.app.nextstep.service; | ||
|
|
||
| import com.fasterxml.jackson.databind.ObjectMapper; | ||
| import io.getlime.security.powerauth.app.nextstep.NextStepTest; | ||
| import io.getlime.security.powerauth.app.nextstep.repository.model.entity.CredentialDefinitionEntity; | ||
| import io.getlime.security.powerauth.app.nextstep.repository.model.entity.CredentialEntity; | ||
| import io.getlime.security.powerauth.app.nextstep.repository.model.entity.HashConfigEntity; | ||
| import io.getlime.security.powerauth.app.nextstep.repository.model.entity.UserIdentityEntity; | ||
| import io.getlime.security.powerauth.lib.nextstep.model.entity.CredentialValue; | ||
| import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.EncryptionAlgorithm; | ||
| import io.getlime.security.powerauth.lib.nextstep.model.entity.enumeration.HashAlgorithm; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.*; | ||
|
|
||
| /** | ||
| * Tests for password hashing. | ||
| * | ||
| * @author Roman Strobl, [email protected] | ||
| */ | ||
| class CredentialProtectionServiceTest extends NextStepTest { | ||
|
|
||
| @Autowired | ||
| private CredentialProtectionService credentialProtectionService; | ||
|
|
||
| @Test | ||
| void testBcrypt() throws Exception { | ||
| final CredentialEntity credentialEntity = new CredentialEntity(); | ||
| final UserIdentityEntity user = new UserIdentityEntity(); | ||
| final HashConfigEntity hashConfig = new HashConfigEntity(); | ||
| final CredentialDefinitionEntity credentialDefinition = new CredentialDefinitionEntity(); | ||
| credentialDefinition.setEncryptionAlgorithm(EncryptionAlgorithm.NO_ENCRYPTION); | ||
| credentialDefinition.setHashingConfig(hashConfig); | ||
| hashConfig.setAlgorithm(HashAlgorithm.BCRYPT); | ||
| hashConfig.setParameters("{}"); | ||
| user.setUserId("test"); | ||
| credentialEntity.setUser(user); | ||
| credentialEntity.setCredentialDefinition(credentialDefinition); | ||
| credentialEntity.setHashingConfig(hashConfig); | ||
| final CredentialValue hashed = credentialProtectionService.protectCredential("test", credentialEntity); | ||
| credentialEntity.setValue(hashed.getValue()); | ||
| assertEquals(EncryptionAlgorithm.NO_ENCRYPTION, hashed.getEncryptionAlgorithm()); | ||
| assertNotEquals("test", hashed.getValue()); | ||
| assertTrue(hashed.getValue().startsWith("$2a$10$")); | ||
| assertTrue(credentialProtectionService.verifyCredential("test", credentialEntity)); | ||
| } | ||
|
|
||
| @Test | ||
| void testArgon2() throws Exception { | ||
| final CredentialEntity credentialEntity = new CredentialEntity(); | ||
| final UserIdentityEntity user = new UserIdentityEntity(); | ||
| final HashConfigEntity hashConfig = new HashConfigEntity(); | ||
| final CredentialDefinitionEntity credentialDefinition = new CredentialDefinitionEntity(); | ||
| credentialDefinition.setEncryptionAlgorithm(EncryptionAlgorithm.NO_ENCRYPTION); | ||
| credentialDefinition.setHashingConfig(hashConfig); | ||
| hashConfig.setAlgorithm(HashAlgorithm.ARGON_2I); | ||
| final Map<String, String> params = Map.of( | ||
| "version", "19", | ||
| "iterations", "4", | ||
| "memory", "16", | ||
| "parallelism", "2", | ||
| "outputLength", "32" | ||
| ); | ||
| hashConfig.setParameters(new ObjectMapper().writeValueAsString(params)); | ||
| user.setUserId("test"); | ||
| credentialEntity.setUser(user); | ||
| credentialEntity.setCredentialDefinition(credentialDefinition); | ||
| credentialEntity.setHashingConfig(hashConfig); | ||
| final CredentialValue hashed = credentialProtectionService.protectCredential("test", credentialEntity); | ||
| credentialEntity.setValue(hashed.getValue()); | ||
| assertEquals(EncryptionAlgorithm.NO_ENCRYPTION, hashed.getEncryptionAlgorithm()); | ||
| assertNotEquals("test", hashed.getValue()); | ||
| assertTrue(hashed.getValue().startsWith("$argon2i$v=19$m=65536,t=4,p=2$")); | ||
| assertTrue(credentialProtectionService.verifyCredential("test", credentialEntity)); | ||
| } | ||
|
|
||
| } |
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
Oops, something went wrong.