Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-05-22 21:33:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply code cleanup rules to projects

Browse Source 
Apply automated cleanup rules to add `@Override` and `@Deprecated`
annotations and to fix class references used with static methods.

Issue gh-8945
This commit is contained in:
Phillip Webb
2020-07-26 12:04:13 -07:00
committed by Rob Winch
parent 8866fa6fb0
commit 9e08b51ed3
558 changed files with 1418 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCrypt.java
+46 -24
View File
@@ -260,9 +260,10 @@ public class BCrypt {
* @return the decoded value of x
*/
private static byte char64(char x) {
if ((int) x < 0 || (int) x >= index_64.length)
if (x < 0 || x >= index_64.length) {
return -1;
return index_64[(int) x];
}
return index_64[x];
}
/**
@@ -279,27 +280,32 @@ public class BCrypt {
byte ret[];
byte c1, c2, c3, c4, o;
if (maxolen <= 0)
if (maxolen <= 0) {
throw new IllegalArgumentException("Invalid maxolen");
}
while (off < slen - 1 && olen < maxolen) {
c1 = char64(s.charAt(off++));
c2 = char64(s.charAt(off++));
if (c1 == -1 || c2 == -1)
if (c1 == -1 || c2 == -1) {
break;
}
o = (byte) (c1 << 2);
o |= (c2 & 0x30) >> 4;
rs.append((char) o);
if (++olen >= maxolen || off >= slen)
if (++olen >= maxolen || off >= slen) {
break;
}
c3 = char64(s.charAt(off++));
if (c3 == -1)
if (c3 == -1) {
break;
}
o = (byte) ((c2 & 0x0f) << 4);
o |= (c3 & 0x3c) >> 2;
rs.append((char) o);
if (++olen >= maxolen || off >= slen)
if (++olen >= maxolen || off >= slen) {
break;
}
c4 = char64(s.charAt(off++));
o = (byte) ((c3 & 0x03) << 6);
o |= c4;
@@ -308,8 +314,9 @@ public class BCrypt {
}
ret = new byte[olen];
for (off = 0; off < olen; off++)
for (off = 0; off < olen; off++) {
ret[off] = (byte) rs.charAt(off);
}
return ret;
}
@@ -357,9 +364,10 @@ public class BCrypt {
for (i = 0; i < 4; i++) {
words[0] = (words[0] << 8) | (data[off] & 0xff);
words[1] = (words[1] << 8) | (int) data[off]; // sign extension bug
if (i > 0)
words[1] = (words[1] << 8) | data[off]; // sign extension bug
if (i > 0) {
sign |= words[1] & 0x80;
}
off = (off + 1) % data.length;
}
@@ -410,11 +418,14 @@ public class BCrypt {
int lr[] = { 0, 0 };
int plen = this.P.length, slen = this.S.length;
for (i = 0; i < plen; i++)
if (!sign_ext_bug)
for (i = 0; i < plen; i++) {
if (!sign_ext_bug) {
this.P[i] = this.P[i] ^ streamtoword(key, koffp);
else
}
else {
this.P[i] = this.P[i] ^ streamtoword_bug(key, koffp);
}
}
for (i = 0; i < plen; i += 2) {
encipher(lr, 0);
@@ -520,11 +531,13 @@ public class BCrypt {
int clen = cdata.length;
byte ret[];
if (log_rounds < 4 || log_rounds > 31)
if (log_rounds < 4 || log_rounds > 31) {
throw new IllegalArgumentException("Bad number of rounds");
}
rounds = 1 << log_rounds;
if (salt.length != BCRYPT_SALT_LEN)
if (salt.length != BCRYPT_SALT_LEN) {
throw new IllegalArgumentException("Bad salt length");
}
init_key();
ekskey(salt, password, sign_ext_bug, safety);
@@ -534,8 +547,9 @@ public class BCrypt {
}
for (i = 0; i < 64; i++) {
for (j = 0; j < (clen >> 1); j++)
for (j = 0; j < (clen >> 1); j++) {
encipher(cdata, j << 1);
}
}
ret = new byte[clen * 4];
@@ -586,20 +600,24 @@ public class BCrypt {
throw new IllegalArgumentException("Invalid salt");
}
if (salt.charAt(0) != '$' || salt.charAt(1) != '2')
if (salt.charAt(0) != '$' || salt.charAt(1) != '2') {
throw new IllegalArgumentException("Invalid salt version");
if (salt.charAt(2) == '$')
}
if (salt.charAt(2) == '$') {
off = 3;
}
else {
minor = salt.charAt(2);
if ((minor != 'a' && minor != 'x' && minor != 'y' && minor != 'b') || salt.charAt(3) != '$')
if ((minor != 'a' && minor != 'x' && minor != 'y' && minor != 'b') || salt.charAt(3) != '$') {
throw new IllegalArgumentException("Invalid salt revision");
}
off = 4;
}
// Extract number of rounds
if (salt.charAt(off + 2) > '$')
if (salt.charAt(off + 2) > '$') {
throw new IllegalArgumentException("Missing salt rounds");
}
if (off == 4 && saltLength < 29) {
throw new IllegalArgumentException("Invalid salt");
@@ -609,18 +627,21 @@ public class BCrypt {
real_salt = salt.substring(off + 3, off + 25);
saltb = decode_base64(real_salt, BCRYPT_SALT_LEN);
if (minor >= 'a') // add null terminator
if (minor >= 'a') {
passwordb = Arrays.copyOf(passwordb, passwordb.length + 1);
}
B = new BCrypt();
hashed = B.crypt_raw(passwordb, saltb, rounds, minor == 'x', minor == 'a' ? 0x10000 : 0);
rs.append("$2");
if (minor >= 'a')
if (minor >= 'a') {
rs.append(minor);
}
rs.append("$");
if (rounds < 10)
if (rounds < 10) {
rs.append("0");
}
rs.append(rounds);
rs.append("$");
encode_base64(saltb, saltb.length, rs);
@@ -654,8 +675,9 @@ public class BCrypt {
rs.append("$2");
rs.append(prefix.charAt(2));
rs.append("$");
if (log_rounds < 10)
if (log_rounds < 10) {
rs.append("0");
}
rs.append(log_rounds);
rs.append("$");
encode_base64(rnd, rnd.length, rs);
crypto/src/main/java/org/springframework/security/crypto/bcrypt/BCryptPasswordEncoder.java
+2
View File
@@ -100,6 +100,7 @@ public class BCryptPasswordEncoder implements PasswordEncoder {
this.random = random;
}
@Override
public String encode(CharSequence rawPassword) {
if (rawPassword == null) {
throw new IllegalArgumentException("rawPassword cannot be null");
@@ -115,6 +116,7 @@ public class BCryptPasswordEncoder implements PasswordEncoder {
return BCrypt.hashpw(rawPassword.toString(), salt);
}
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
if (rawPassword == null) {
throw new IllegalArgumentException("rawPassword cannot be null");
crypto/src/main/java/org/springframework/security/crypto/encrypt/AesBytesEncryptor.java
+4
View File
@@ -118,6 +118,7 @@ public final class AesBytesEncryptor implements BytesEncryptor {
this.ivGenerator = ivGenerator != null ? ivGenerator : alg.defaultIvGenerator();
}
@Override
public byte[] encrypt(byte[] bytes) {
synchronized (this.encryptor) {
byte[] iv = this.ivGenerator.generateKey();
@@ -127,6 +128,7 @@ public final class AesBytesEncryptor implements BytesEncryptor {
}
}
@Override
public byte[] decrypt(byte[] encryptedBytes) {
synchronized (this.decryptor) {
byte[] iv = iv(encryptedBytes);
@@ -151,10 +153,12 @@ public final class AesBytesEncryptor implements BytesEncryptor {
private final byte[] VALUE = new byte[16];
@Override
public int getKeyLength() {
return this.VALUE.length;
}
@Override
public byte[] generateKey() {
return this.VALUE;
}
crypto/src/main/java/org/springframework/security/crypto/encrypt/Encryptors.java
+2
View File
@@ -119,10 +119,12 @@ public final class Encryptors {
private static final class NoOpTextEncryptor implements TextEncryptor {
@Override
public String encrypt(String text) {
return text;
}
@Override
public String decrypt(String encryptedText) {
return encryptedText;
}
crypto/src/main/java/org/springframework/security/crypto/encrypt/HexEncodingTextEncryptor.java
+2
View File
@@ -33,10 +33,12 @@ final class HexEncodingTextEncryptor implements TextEncryptor {
this.encryptor = encryptor;
}
@Override
public String encrypt(String text) {
return new String(Hex.encode(this.encryptor.encrypt(Utf8.encode(text))));
}
@Override
public String decrypt(String encryptedText) {
return Utf8.decode(this.encryptor.decrypt(Hex.decode(encryptedText)));
}
crypto/src/main/java/org/springframework/security/crypto/keygen/HexEncodingStringKeyGenerator.java
+1
View File
@@ -31,6 +31,7 @@ final class HexEncodingStringKeyGenerator implements StringKeyGenerator {
this.keyGenerator = keyGenerator;
}
@Override
public String generateKey() {
return new String(Hex.encode(this.keyGenerator.generateKey()));
}
crypto/src/main/java/org/springframework/security/crypto/keygen/SecureRandomBytesKeyGenerator.java
+2
View File
@@ -46,10 +46,12 @@ final class SecureRandomBytesKeyGenerator implements BytesKeyGenerator {
this.keyLength = keyLength;
}
@Override
public int getKeyLength() {
return this.keyLength;
}
@Override
public byte[] generateKey() {
byte[] bytes = new byte[this.keyLength];
this.random.nextBytes(bytes);
crypto/src/main/java/org/springframework/security/crypto/keygen/SharedKeyGenerator.java
+2
View File
@@ -30,10 +30,12 @@ final class SharedKeyGenerator implements BytesKeyGenerator {
this.sharedKey = sharedKey;
}
@Override
public int getKeyLength() {
return this.sharedKey.length;
}
@Override
public byte[] generateKey() {
return this.sharedKey;
}
crypto/src/main/java/org/springframework/security/crypto/password/LdapShaPasswordEncoder.java
+2
View File
@@ -91,6 +91,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
* @return the encoded password in the specified format
*
*/
@Override
public String encode(CharSequence rawPass) {
byte[] salt = this.saltGenerator.generateKey();
return encode(rawPass, salt);
@@ -143,6 +144,7 @@ public class LdapShaPasswordEncoder implements PasswordEncoder {
* @param encodedPassword the actual SSHA or SHA encoded password
* @return true if they match (independent of the case of the prefix).
*/
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
return matches(rawPassword == null ? null : rawPassword.toString(), encodedPassword);
}
crypto/src/main/java/org/springframework/security/crypto/password/Md4PasswordEncoder.java
+2
View File
@@ -98,6 +98,7 @@ public class Md4PasswordEncoder implements PasswordEncoder {
* @return Hex string of password digest (or base64 encoded string if
* encodeHashAsBase64 is enabled.
*/
@Override
public String encode(CharSequence rawPassword) {
String salt = PREFIX + this.saltGenerator.generateKey() + SUFFIX;
return digest(salt, rawPassword);
@@ -134,6 +135,7 @@ public class Md4PasswordEncoder implements PasswordEncoder {
* @param encodedPassword previously encoded password
* @return true or false
*/
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
String salt = extractSalt(encodedPassword);
String rawPasswordEncoded = digest(salt, rawPassword);
crypto/src/main/java/org/springframework/security/crypto/password/MessageDigestPasswordEncoder.java
+2
View File
@@ -114,6 +114,7 @@ public class MessageDigestPasswordEncoder implements PasswordEncoder {
* @return Hex string of password digest (or base64 encoded string if
* encodeHashAsBase64 is enabled.
*/
@Override
public String encode(CharSequence rawPassword) {
String salt = PREFIX + this.saltGenerator.generateKey() + SUFFIX;
return digest(salt, rawPassword);
@@ -143,6 +144,7 @@ public class MessageDigestPasswordEncoder implements PasswordEncoder {
* @param encodedPassword previously encoded password
* @return true or false
*/
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
String salt = extractSalt(encodedPassword);
String rawPasswordEncoded = digest(salt, rawPassword);
crypto/src/main/java/org/springframework/security/crypto/password/NoOpPasswordEncoder.java
+2
View File
@@ -32,10 +32,12 @@ package org.springframework.security.crypto.password;
@Deprecated
public final class NoOpPasswordEncoder implements PasswordEncoder {
@Override
public String encode(CharSequence rawPassword) {
return rawPassword.toString();
}
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
return rawPassword.toString().equals(encodedPassword);
}
crypto/src/main/java/org/springframework/security/crypto/password/StandardPasswordEncoder.java
+2
View File
@@ -73,10 +73,12 @@ public final class StandardPasswordEncoder implements PasswordEncoder {
this("SHA-256", secret);
}
@Override
public String encode(CharSequence rawPassword) {
return encode(rawPassword, this.saltGenerator.generateKey());
}
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
byte[] digested = decode(encodedPassword);
byte[] salt = subArray(digested, 0, this.saltGenerator.getKeyLength());
crypto/src/main/java/org/springframework/security/crypto/scrypt/SCryptPasswordEncoder.java
+2
View File
@@ -116,10 +116,12 @@ public class SCryptPasswordEncoder implements PasswordEncoder {
this.saltGenerator = KeyGenerators.secureRandom(saltLength);
}
@Override
public String encode(CharSequence rawPassword) {
return digest(rawPassword, this.saltGenerator.generateKey());
}
@Override
public boolean matches(CharSequence rawPassword, String encodedPassword) {
if (encodedPassword == null || encodedPassword.length() < this.keyLength) {
this.logger.warn("Empty encoded password");
crypto/src/test/java/org/springframework/security/crypto/encrypt/BouncyCastleAesBytesEncryptorEquivalencyTests.java
+2
View File
@@ -133,10 +133,12 @@ public class BouncyCastleAesBytesEncryptorEquivalencyTests {
this.keyLength = keyLength;
}
@Override
public int getKeyLength() {
return this.keyLength;
}
@Override
public byte[] generateKey() {
byte[] bytes = new byte[this.keyLength];
this.random.nextBytes(bytes);