Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-27 06:29:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid some 401 errors during story sends.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-05-11 16:54:57 -04:00
committed by GitHub
parent 3b5a3eccfe
commit 387f18be98
4 changed files with 47 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/java/org/thoughtcrime/securesms/crypto/UnidentifiedAccessUtil.java
View File

@@ -96,25 +96,29 @@ public class UnidentifiedAccessUtil {
Map<CertificateType, Integer> typeCounts = new HashMap<>();
for (Recipient recipient : recipients) {
byte[] theirUnidentifiedAccessKey = getTargetUnidentifiedAccessKey(recipient, isForStory);
CertificateType certificateType = getUnidentifiedAccessCertificateType(recipient);
byte[] ourUnidentifiedAccessCertificate = SignalStore.certificateValues().getUnidentifiedAccessCertificate(certificateType);
CertificateType certificateType = getUnidentifiedAccessCertificateType(recipient);
byte[] ourUnidentifiedAccessCertificate = SignalStore.certificateValues().getUnidentifiedAccessCertificate(certificateType);
int typeCount = Util.getOrDefault(typeCounts, certificateType, 0);
typeCount++;
typeCounts.put(certificateType, typeCount);
if (theirUnidentifiedAccessKey != null && ourUnidentifiedAccessCertificate != null) {
if (ourUnidentifiedAccessCertificate != null) {
try {
access.add(Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(theirUnidentifiedAccessKey,
ourUnidentifiedAccessCertificate),
new UnidentifiedAccess(ourUnidentifiedAccessKey,
ourUnidentifiedAccessCertificate))));
UnidentifiedAccess theirAccess = getTargetUnidentifiedAccess(recipient, ourUnidentifiedAccessCertificate, isForStory);
UnidentifiedAccess ourAccess = new UnidentifiedAccess(ourUnidentifiedAccessKey, ourUnidentifiedAccessCertificate, false);
if (theirAccess != null) {
access.add(Optional.of(new UnidentifiedAccessPair(theirAccess, ourAccess)));
} else {
access.add(Optional.empty());
}
} catch (InvalidCertificateException e) {
Log.w(TAG, e);
Log.w(TAG, "Invalid unidentified access certificate!", e);
access.add(Optional.empty());
}
} else {
Log.w(TAG, "Missing unidentified access certificate!");
access.add(Optional.empty());
}
}
@@ -140,9 +144,11 @@ public class UnidentifiedAccessUtil {
if (ourUnidentifiedAccessCertificate != null) {
return Optional.of(new UnidentifiedAccessPair(new UnidentifiedAccess(ourUnidentifiedAccessKey,
ourUnidentifiedAccessCertificate),
ourUnidentifiedAccessCertificate,
false),
new UnidentifiedAccess(ourUnidentifiedAccessKey,
ourUnidentifiedAccessCertificate)));
ourUnidentifiedAccessCertificate,
false)));
}
return Optional.empty();
@@ -168,7 +174,7 @@ public class UnidentifiedAccessUtil {
.getUnidentifiedAccessCertificate(getUnidentifiedAccessCertificateType(recipient));
}
private static @Nullable byte[] getTargetUnidentifiedAccessKey(@NonNull Recipient recipient, boolean isForStory) {
private static @Nullable UnidentifiedAccess getTargetUnidentifiedAccess(@NonNull Recipient recipient, @NonNull byte[] certificate, boolean isForStory) throws InvalidCertificateException {
ProfileKey theirProfileKey = ProfileKeyUtil.profileKeyOrNull(recipient.resolve().getProfileKey());
byte[] accessKey;
@@ -176,7 +182,11 @@ public class UnidentifiedAccessUtil {
switch (recipient.resolve().getUnidentifiedAccessMode()) {
case UNKNOWN:
if (theirProfileKey == null) {
accessKey = UNRESTRICTED_KEY;
if (isForStory) {
accessKey = null;
} else {
accessKey = UNRESTRICTED_KEY;
}
} else {
accessKey = UnidentifiedAccess.deriveAccessKeyFrom(theirProfileKey);
}
@@ -199,10 +209,12 @@ public class UnidentifiedAccessUtil {
}
if (accessKey == null && isForStory) {
accessKey = UNRESTRICTED_KEY;
return new UnidentifiedAccess(UNRESTRICTED_KEY, certificate, true);
} else if (accessKey != null) {
return new UnidentifiedAccess(accessKey, certificate, false);
} else {
return null;
}
return accessKey;
}
private enum CertificateValidatorHolder {