webmaster/signal-cli
1
0
Fork 0
mirror of https://github.com/AsamK/signal-cli synced 2025-08-29 10:30:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cache sender certificates in memory

Browse source
This commit is contained in:
AsamK 2021-11-10 15:36:29 +01:00
parent c30eba92cc
commit 793df99bef
1 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

30
lib/src/main/java/org/asamk/signal/manager/helper/UnidentifiedAccessHelper.java
View file

@ -5,6 +5,7 @@ import org.asamk.signal.manager.api.PhoneNumberSharingMode;
import org.asamk.signal.manager.storage.SignalAccount; import org.asamk.signal.manager.storage.SignalAccount;
import org.asamk.signal.manager.storage.recipients.RecipientId; import org.asamk.signal.manager.storage.recipients.RecipientId;
import org.signal.libsignal.metadata.certificate.InvalidCertificateException; import org.signal.libsignal.metadata.certificate.InvalidCertificateException;
import org.signal.libsignal.metadata.certificate.SenderCertificate;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.libsignal.util.guava.Optional; import org.whispersystems.libsignal.util.guava.Optional;
@ -13,6 +14,7 @@ import org.whispersystems.signalservice.api.crypto.UnidentifiedAccessPair;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static org.whispersystems.signalservice.internal.util.Util.getSecretBytes; import static org.whispersystems.signalservice.internal.util.Util.getSecretBytes;
@ -20,12 +22,16 @@ import static org.whispersystems.signalservice.internal.util.Util.getSecretBytes
public class UnidentifiedAccessHelper { public class UnidentifiedAccessHelper {
private final static Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class); private final static Logger logger = LoggerFactory.getLogger(UnidentifiedAccessHelper.class);
private final static long CERTIFICATE_EXPIRATION_BUFFER = TimeUnit.DAYS.toMillis(1);
private final SignalAccount account; private final SignalAccount account;
private final SignalDependencies dependencies; private final SignalDependencies dependencies;
private final SelfProfileKeyProvider selfProfileKeyProvider; private final SelfProfileKeyProvider selfProfileKeyProvider;
private final ProfileProvider profileProvider; private final ProfileProvider profileProvider;
private SenderCertificate privacySenderCertificate;
private SenderCertificate senderCertificate;
public UnidentifiedAccessHelper( public UnidentifiedAccessHelper(
final SignalAccount account, final SignalAccount account,
final SignalDependencies dependencies, final SignalDependencies dependencies,
@ -53,20 +59,32 @@ public class UnidentifiedAccessHelper {
} }
private byte[] getSenderCertificateForPhoneNumberPrivacy() { private byte[] getSenderCertificateForPhoneNumberPrivacy() {
// TODO cache for a day if (privacySenderCertificate != null && System.currentTimeMillis() < (
privacySenderCertificate.getExpiration() - CERTIFICATE_EXPIRATION_BUFFER
)) {
return privacySenderCertificate.getSerialized();
}
try { try {
return dependencies.getAccountManager().getSenderCertificateForPhoneNumberPrivacy(); final var certificate = dependencies.getAccountManager().getSenderCertificateForPhoneNumberPrivacy();
} catch (IOException e) { privacySenderCertificate = new SenderCertificate(certificate);
return certificate;
} catch (IOException | InvalidCertificateException e) {
logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage()); logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
return null; return null;
} }
} }
private byte[] getSenderCertificate() { private byte[] getSenderCertificate() {
// TODO cache for a day if (senderCertificate != null && System.currentTimeMillis() < (
senderCertificate.getExpiration() - CERTIFICATE_EXPIRATION_BUFFER
)) {
return senderCertificate.getSerialized();
}
try { try {
return dependencies.getAccountManager().getSenderCertificate(); final var certificate = dependencies.getAccountManager().getSenderCertificate();
} catch (IOException e) { this.senderCertificate = new SenderCertificate(certificate);
return certificate;
} catch (IOException | InvalidCertificateException e) {
logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage()); logger.warn("Failed to get sender certificate, ignoring: {}", e.getMessage());
return null; return null;
} }