MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace extraneous SecureRandom with empty byte array

This commit is contained in:
Chris Eager 2024-03-12 12:04:43 -05:00 committed by Chris Eager
parent f9533e016f
commit fd9eb462cc
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
service/src/main/java/org/whispersystems/textsecuregcm/storage/AccountChangeValidator.java
View File

@ -6,13 +6,14 @@
package org.whispersystems.textsecuregcm.storage; package org.whispersystems.textsecuregcm.storage;
import java.security.MessageDigest; import java.security.MessageDigest;
import java.security.SecureRandom;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
class AccountChangeValidator { class AccountChangeValidator {
private static final byte[] NO_HASH = new byte[32];
private final boolean allowNumberChange; private final boolean allowNumberChange;
private final boolean allowUsernameHashChange; private final boolean allowUsernameHashChange;
@ -48,12 +49,8 @@ class AccountChangeValidator {
} }
if (!allowUsernameHashChange) { if (!allowUsernameHashChange) {
// We can potentially replace this with the actual hash of some invalid username (e.g. 1nickname.123) final byte[] updatedAccountUsernameHash = updatedAccount.getUsernameHash().orElse(NO_HASH);
final byte[] dummyHash = new byte[32]; final byte[] originalAccountUsernameHash = originalAccount.getUsernameHash().orElse(NO_HASH);
new SecureRandom().nextBytes(dummyHash);
final byte[] updatedAccountUsernameHash = updatedAccount.getUsernameHash().orElse(dummyHash);
final byte[] originalAccountUsernameHash = originalAccount.getUsernameHash().orElse(dummyHash);
boolean usernameUnchanged = MessageDigest.isEqual(updatedAccountUsernameHash, originalAccountUsernameHash); boolean usernameUnchanged = MessageDigest.isEqual(updatedAccountUsernameHash, originalAccountUsernameHash);