You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bm...@apache.org on 2021/05/19 19:41:22 UTC
[shiro] branch main updated (0208130 -> 2e9cddc)
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git.
from 0208130 Merge pull request #268 from seaswalker/avoid_conflict_with_spring
add c6e6ca7 [SHIRO-290] Implement BCrypt and Argon2
add d84faf8 [SHIRO-290] doc fix, remove backwards compatibility for SimpleHash.
add 29dcaad [SHIRO-290] add review suggestions:
add eb8662d [SHIRO-290] remove obsolete legacy-tests.
new 2e9cddc Merge pull request #280 from apache/SHIRO-290
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES | 20 +-
core/pom.xml | 10 +
.../shiro/authc/SimpleAuthenticationInfo.java | 26 +-
.../authc/credential/DefaultPasswordService.java | 58 ++--
.../authc/credential/HashedCredentialsMatcher.java | 32 +-
.../authc/credential/Md2CredentialsMatcher.java | 47 ---
.../authc/credential/Md5CredentialsMatcher.java | 46 ---
.../shiro/authc/credential/PasswordMatcher.java | 18 +-
.../authc/credential/Sha1CredentialsMatcher.java | 46 ---
.../shiro/realm/text/TextConfigurationRealm.java | 1 +
.../credential/DefaultPasswordServiceTest.groovy | 110 ++----
.../authc/credential/PasswordMatcherTest.groovy | 49 ++-
.../credential/HashedCredentialsMatcherTest.java | 24 +-
.../credential/Md2CredentialsMatcherTest.java | 39 ---
.../credential/Md5CredentialsMatcherTest.java | 37 --
.../credential/Sha1CredentialsMatcherTest.java | 37 --
crypto/cipher/pom.xml | 1 -
crypto/hash/pom.xml | 5 +
.../shiro/crypto/hash/AbstractCryptHash.java | 253 ++++++++++++++
.../org/apache/shiro/crypto/hash/AbstractHash.java | 74 +---
.../shiro/crypto/hash/ConfigurableHashService.java | 34 +-
.../shiro/crypto/hash/DefaultHashService.java | 281 ++--------------
.../java/org/apache/shiro/crypto/hash/Hash.java | 12 +-
.../org/apache/shiro/crypto/hash/HashProvider.java | 62 ++++
.../org/apache/shiro/crypto/hash/HashRequest.java | 75 +++--
.../java/org/apache/shiro/crypto/hash/HashSpi.java | 87 +++++
.../java/org/apache/shiro/crypto/hash/Md2Hash.java | 65 ----
.../java/org/apache/shiro/crypto/hash/Md5Hash.java | 66 ----
.../org/apache/shiro/crypto/hash/Sha1Hash.java | 67 ----
.../org/apache/shiro/crypto/hash/SimpleHash.java | 85 ++++-
.../shiro/crypto/hash/SimpleHashProvider.java | 219 ++++++++++++
.../shiro/crypto/hash/SimpleHashRequest.java | 51 +--
.../shiro/crypto/hash/format/Base64Format.java | 14 +-
.../hash/format/DefaultHashFormatFactory.java | 5 +-
.../shiro/crypto/hash/format/HashFormat.java | 5 +-
.../apache/shiro/crypto/hash/format/HexFormat.java | 12 +-
.../crypto/hash/format/ProvidedHashFormat.java | 13 +-
.../crypto/hash/format/Shiro1CryptFormat.java | 18 +-
.../crypto/hash/format/Shiro2CryptFormat.java | 137 ++++++++
crypto/hash/src/main/resources/META-INF/NOTICE | 2 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 1 +
.../crypto/hash/DefaultHashServiceTest.groovy | 82 +----
.../crypto/hash/HashRequestBuilderTest.groovy | 31 +-
.../crypto/hash/format/Base64FormatTest.groovy | 10 +-
.../format/DefaultHashFormatFactoryTest.groovy | 7 +-
.../shiro/crypto/hash/format/HexFormatTest.groovy | 12 +-
.../hash/format/ProvidedHashFormatTest.groovy | 3 +-
.../hash/format/Shiro1CryptFormatTest.groovy | 7 +-
crypto/pom.xml | 1 +
.../support/hashes/argon2}/pom.xml | 56 ++--
.../crypto/support/hashes/argon2/Argon2Hash.java | 371 +++++++++++++++++++++
.../support/hashes/argon2/Argon2HashProvider.java | 207 ++++++++++++
.../argon2}/src/main/resources/META-INF/NOTICE | 9 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 7 +-
.../support/hashes/argon2/Argon2HashTest.groovy | 92 +++++
.../support/hashes/bcrypt}/pom.xml | 56 ++--
.../crypto/support/hashes/bcrypt/BCryptHash.java | 200 +++++++++++
.../support/hashes/bcrypt/BCryptProvider.java | 144 ++++++++
.../support/hashes/bcrypt/OpenBSDBase64.java | 179 ++++++++++
.../bcrypt}/src/main/resources/META-INF/NOTICE | 9 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 7 +-
.../support/hashes/bcrypt/BCryptHashTest.groovy | 98 ++++++
{config => crypto/support}/pom.xml | 17 +-
.../org/apache/shiro/lang/codec/CodecSupport.java | 40 ++-
.../apache/shiro/lang/util/SimpleByteSource.java | 13 +-
.../org/apache/shiro/lang/util/StringUtils.java | 12 +
pom.xml | 17 +
tools/hasher/pom.xml | 17 +-
.../java/org/apache/shiro/tools/hasher/Hasher.java | 70 ++--
.../hasher/src/main/resources/logback.xml | 19 +-
.../org/apache/shiro/tools/hasher/HasherTest.java | 101 ++++++
.../hasher/src/test/resources/logback-test.xml | 16 +-
72 files changed, 2840 insertions(+), 1314 deletions(-)
delete mode 100644 core/src/main/java/org/apache/shiro/authc/credential/Md2CredentialsMatcher.java
delete mode 100644 core/src/main/java/org/apache/shiro/authc/credential/Md5CredentialsMatcher.java
delete mode 100644 core/src/main/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcher.java
delete mode 100644 core/src/test/java/org/apache/shiro/authc/credential/Md2CredentialsMatcherTest.java
delete mode 100644 core/src/test/java/org/apache/shiro/authc/credential/Md5CredentialsMatcherTest.java
delete mode 100644 core/src/test/java/org/apache/shiro/authc/credential/Sha1CredentialsMatcherTest.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/AbstractCryptHash.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/HashProvider.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/HashSpi.java
delete mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Md2Hash.java
delete mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Md5Hash.java
delete mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/Sha1Hash.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/SimpleHashProvider.java
create mode 100644 crypto/hash/src/main/java/org/apache/shiro/crypto/hash/format/Shiro2CryptFormat.java
copy samples/spring/src/main/resources/application.properties => crypto/hash/src/main/resources/META-INF/services/org.apache.shiro.crypto.hash.HashSpi (94%)
copy {support/quartz => crypto/support/hashes/argon2}/pom.xml (56%)
create mode 100644 crypto/support/hashes/argon2/src/main/java/org/apache/shiro/crypto/support/hashes/argon2/Argon2Hash.java
create mode 100644 crypto/support/hashes/argon2/src/main/java/org/apache/shiro/crypto/support/hashes/argon2/Argon2HashProvider.java
copy {config/ogdl => crypto/support/hashes/argon2}/src/main/resources/META-INF/NOTICE (78%)
copy core/src/test/resources/org/apache/shiro/realm/text/IniRealmTest.simple.ini => crypto/support/hashes/argon2/src/main/resources/META-INF/services/org.apache.shiro.crypto.hash.HashSpi (92%)
create mode 100644 crypto/support/hashes/argon2/src/test/groovy/org/apache/shiro/crypto/support/hashes/argon2/Argon2HashTest.groovy
copy {support/quartz => crypto/support/hashes/bcrypt}/pom.xml (56%)
create mode 100644 crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHash.java
create mode 100644 crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptProvider.java
create mode 100644 crypto/support/hashes/bcrypt/src/main/java/org/apache/shiro/crypto/support/hashes/bcrypt/OpenBSDBase64.java
copy {config/ogdl => crypto/support/hashes/bcrypt}/src/main/resources/META-INF/NOTICE (78%)
copy core/src/test/resources/org/apache/shiro/realm/text/IniRealmTest.simple.ini => crypto/support/hashes/bcrypt/src/main/resources/META-INF/services/org.apache.shiro.crypto.hash.HashSpi (92%)
create mode 100644 crypto/support/hashes/bcrypt/src/test/groovy/org/apache/shiro/crypto/support/hashes/bcrypt/BCryptHashTest.groovy
copy {config => crypto/support}/pom.xml (69%)
copy support/aspectj/src/test/resources/META-INF/aop.xml => tools/hasher/src/main/resources/logback.xml (74%)
create mode 100644 tools/hasher/src/test/java/org/apache/shiro/tools/hasher/HasherTest.java
copy samples/spring-hibernate/src/main/webapp/index.jsp => tools/hasher/src/test/resources/logback-test.xml (80%)
[shiro] 01/01: Merge pull request #280 from apache/SHIRO-290
Posted by bm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
bmarwell pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 2e9cddc806bdb0617071cea1c88fa92d02e3c9b5
Merge: 0208130 eb8662d
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Wed May 19 21:41:07 2021 +0200
Merge pull request #280 from apache/SHIRO-290
[SHIRO-290] Implement BCrypt and Argon2
RELEASE-NOTES | 20 +-
core/pom.xml | 10 +
.../shiro/authc/SimpleAuthenticationInfo.java | 26 +-
.../authc/credential/DefaultPasswordService.java | 58 ++--
.../authc/credential/HashedCredentialsMatcher.java | 32 +-
.../authc/credential/Md2CredentialsMatcher.java | 47 ---
.../authc/credential/Md5CredentialsMatcher.java | 46 ---
.../shiro/authc/credential/PasswordMatcher.java | 18 +-
.../authc/credential/Sha1CredentialsMatcher.java | 46 ---
.../shiro/realm/text/TextConfigurationRealm.java | 1 +
.../credential/DefaultPasswordServiceTest.groovy | 110 ++----
.../authc/credential/PasswordMatcherTest.groovy | 49 ++-
.../credential/HashedCredentialsMatcherTest.java | 24 +-
.../credential/Md2CredentialsMatcherTest.java | 39 ---
.../credential/Md5CredentialsMatcherTest.java | 37 --
.../credential/Sha1CredentialsMatcherTest.java | 37 --
crypto/cipher/pom.xml | 1 -
crypto/hash/pom.xml | 5 +
.../shiro/crypto/hash/AbstractCryptHash.java | 253 ++++++++++++++
.../org/apache/shiro/crypto/hash/AbstractHash.java | 74 +---
.../shiro/crypto/hash/ConfigurableHashService.java | 34 +-
.../shiro/crypto/hash/DefaultHashService.java | 281 ++--------------
.../java/org/apache/shiro/crypto/hash/Hash.java | 12 +-
.../org/apache/shiro/crypto/hash/HashProvider.java | 62 ++++
.../org/apache/shiro/crypto/hash/HashRequest.java | 75 +++--
.../java/org/apache/shiro/crypto/hash/HashSpi.java | 87 +++++
.../java/org/apache/shiro/crypto/hash/Md2Hash.java | 65 ----
.../java/org/apache/shiro/crypto/hash/Md5Hash.java | 66 ----
.../org/apache/shiro/crypto/hash/Sha1Hash.java | 67 ----
.../org/apache/shiro/crypto/hash/SimpleHash.java | 85 ++++-
.../shiro/crypto/hash/SimpleHashProvider.java | 219 ++++++++++++
.../shiro/crypto/hash/SimpleHashRequest.java | 51 +--
.../shiro/crypto/hash/format/Base64Format.java | 14 +-
.../hash/format/DefaultHashFormatFactory.java | 5 +-
.../shiro/crypto/hash/format/HashFormat.java | 5 +-
.../apache/shiro/crypto/hash/format/HexFormat.java | 12 +-
.../crypto/hash/format/ProvidedHashFormat.java | 13 +-
.../crypto/hash/format/Shiro1CryptFormat.java | 18 +-
.../crypto/hash/format/Shiro2CryptFormat.java | 137 ++++++++
crypto/hash/src/main/resources/META-INF/NOTICE | 2 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 20 ++
.../crypto/hash/DefaultHashServiceTest.groovy | 82 +----
.../crypto/hash/HashRequestBuilderTest.groovy | 31 +-
.../crypto/hash/format/Base64FormatTest.groovy | 10 +-
.../format/DefaultHashFormatFactoryTest.groovy | 7 +-
.../shiro/crypto/hash/format/HexFormatTest.groovy | 12 +-
.../hash/format/ProvidedHashFormatTest.groovy | 3 +-
.../hash/format/Shiro1CryptFormatTest.groovy | 7 +-
crypto/pom.xml | 1 +
crypto/{cipher => support/hashes/argon2}/pom.xml | 64 ++--
.../crypto/support/hashes/argon2/Argon2Hash.java | 371 +++++++++++++++++++++
.../support/hashes/argon2/Argon2HashProvider.java | 207 ++++++++++++
.../argon2}/src/main/resources/META-INF/NOTICE | 9 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 20 ++
.../support/hashes/argon2/Argon2HashTest.groovy | 92 +++++
crypto/{cipher => support/hashes/bcrypt}/pom.xml | 64 ++--
.../crypto/support/hashes/bcrypt/BCryptHash.java | 200 +++++++++++
.../support/hashes/bcrypt/BCryptProvider.java | 144 ++++++++
.../support/hashes/bcrypt/OpenBSDBase64.java | 179 ++++++++++
.../bcrypt}/src/main/resources/META-INF/NOTICE | 9 +-
.../services/org.apache.shiro.crypto.hash.HashSpi | 20 ++
.../support/hashes/bcrypt/BCryptHashTest.groovy | 98 ++++++
crypto/{ => support}/pom.xml | 18 +-
.../org/apache/shiro/lang/codec/CodecSupport.java | 40 ++-
.../apache/shiro/lang/util/SimpleByteSource.java | 13 +-
.../org/apache/shiro/lang/util/StringUtils.java | 12 +
pom.xml | 17 +
tools/hasher/pom.xml | 17 +-
.../java/org/apache/shiro/tools/hasher/Hasher.java | 70 ++--
.../hasher/src/main/resources/logback.xml | 31 +-
.../org/apache/shiro/tools/hasher/HasherTest.java | 101 ++++++
.../hasher/src/test/resources/logback-test.xml | 28 +-
72 files changed, 2906 insertions(+), 1334 deletions(-)