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

Store registration recovery passwords by both E164 and PNI

This commit is contained in:
Jon Chambers 2024-11-22 15:43:00 -05:00 committed by Jon Chambers
parent 0cb6f662c6
commit 3c8b2a82a3
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
service/src/main/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryPasswords.java
View File

@ -89,9 +89,8 @@ public class RegistrationRecoveryPasswords extends AbstractDynamoDbStore {
return asyncClient.transactWriteItems(TransactWriteItemsRequest.builder() return asyncClient.transactWriteItems(TransactWriteItemsRequest.builder()
.transactItems( .transactItems(
buildPutRecoveryPasswordWriteItem(number, expirationSeconds, data.salt(), data.hash()) buildPutRecoveryPasswordWriteItem(number, expirationSeconds, data.salt(), data.hash()),
// buildPutRecoveryPasswordWriteItem(phoneNumberIdentifier.toString(), expirationSeconds, data.salt(), data.hash()) buildPutRecoveryPasswordWriteItem(phoneNumberIdentifier.toString(), expirationSeconds, data.salt(), data.hash()))
)
.build()) .build())
.thenRun(Util.NOOP); .thenRun(Util.NOOP);
} }

12
service/src/test/java/org/whispersystems/textsecuregcm/storage/RegistrationRecoveryTest.java
View File

@ -82,12 +82,12 @@ public class RegistrationRecoveryTest {
assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByNumber.get().hash()); assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByNumber.get().hash());
} }
/* { {
final Optional<SaltedTokenHash> saltedTokenHashByPni = registrationRecoveryPasswords.lookup(PNI).get(); final Optional<SaltedTokenHash> saltedTokenHashByPni = registrationRecoveryPasswords.lookup(PNI).get();
assertTrue(saltedTokenHashByPni.isPresent()); assertTrue(saltedTokenHashByPni.isPresent());
assertEquals(ORIGINAL_HASH.salt(), saltedTokenHashByPni.get().salt()); assertEquals(ORIGINAL_HASH.salt(), saltedTokenHashByPni.get().salt());
assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByPni.get().hash()); assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByPni.get().hash());
} */ }
} }
@Test @Test
@ -107,12 +107,12 @@ public class RegistrationRecoveryTest {
assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByNumber.get().hash()); assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByNumber.get().hash());
} }
/* { {
final Optional<SaltedTokenHash> saltedTokenHashByPni = registrationRecoveryPasswords.lookup(PNI).get(); final Optional<SaltedTokenHash> saltedTokenHashByPni = registrationRecoveryPasswords.lookup(PNI).get();
assertTrue(saltedTokenHashByPni.isPresent()); assertTrue(saltedTokenHashByPni.isPresent());
assertEquals(ORIGINAL_HASH.salt(), saltedTokenHashByPni.get().salt()); assertEquals(ORIGINAL_HASH.salt(), saltedTokenHashByPni.get().salt());
assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByPni.get().hash()); assertEquals(ORIGINAL_HASH.hash(), saltedTokenHashByPni.get().hash());
} */ }
} }
@Test @Test
@ -127,12 +127,12 @@ public class RegistrationRecoveryTest {
assertEquals(ANOTHER_HASH.hash(), saltedTokenHashByNumber.get().hash()); assertEquals(ANOTHER_HASH.hash(), saltedTokenHashByNumber.get().hash());
} }
/* { {
final Optional<SaltedTokenHash> saltedTokenHashByPni = registrationRecoveryPasswords.lookup(PNI).get(); final Optional<SaltedTokenHash> saltedTokenHashByPni = registrationRecoveryPasswords.lookup(PNI).get();
assertTrue(saltedTokenHashByPni.isPresent()); assertTrue(saltedTokenHashByPni.isPresent());
assertEquals(ANOTHER_HASH.salt(), saltedTokenHashByPni.get().salt()); assertEquals(ANOTHER_HASH.salt(), saltedTokenHashByPni.get().salt());
assertEquals(ANOTHER_HASH.hash(), saltedTokenHashByPni.get().hash()); assertEquals(ANOTHER_HASH.hash(), saltedTokenHashByPni.get().hash());
} */ }
} }
@Test @Test