marvin.weiler/signal-cli-with-http-logging
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue with broken sessions

Browse Source 
Fixes #530
This commit is contained in:
AsamK 2021-02-23 21:50:31 +01:00
parent 221d937eec
commit 8249f852f9
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/src/main/java/org/asamk/signal/manager/storage/protocol/JsonSessionStore.java
View File

@ -12,6 +12,7 @@ import org.asamk.signal.manager.util.Utils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.whispersystems.libsignal.SignalProtocolAddress; import org.whispersystems.libsignal.SignalProtocolAddress;
import org.whispersystems.libsignal.protocol.CiphertextMessage;
import org.whispersystems.libsignal.state.SessionRecord; import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.signalservice.api.SignalServiceSessionStore; import org.whispersystems.signalservice.api.SignalServiceSessionStore;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
@ -55,9 +56,7 @@ class JsonSessionStore implements SignalServiceSessionStore {
return new SessionRecord(info.sessionRecord); return new SessionRecord(info.sessionRecord);
} catch (IOException e) { } catch (IOException e) {
logger.warn("Failed to load session, resetting session: {}", e.getMessage()); logger.warn("Failed to load session, resetting session: {}", e.getMessage());
final var sessionRecord = new SessionRecord(); return new SessionRecord();
info.sessionRecord = sessionRecord.serialize();
return sessionRecord;
} }
} }
} }
@ -104,7 +103,16 @@ class JsonSessionStore implements SignalServiceSessionStore {
var serviceAddress = resolveSignalServiceAddress(address.getName()); var serviceAddress = resolveSignalServiceAddress(address.getName());
for (var info : sessions) { for (var info : sessions) {
if (info.address.matches(serviceAddress) && info.deviceId == address.getDeviceId()) { if (info.address.matches(serviceAddress) && info.deviceId == address.getDeviceId()) {
return true; final SessionRecord sessionRecord;
try {
sessionRecord = new SessionRecord(info.sessionRecord);
} catch (IOException e) {
logger.warn("Failed to check session: {}", e.getMessage());
return false;
}
return sessionRecord.hasSenderChain()
&& sessionRecord.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
} }
} }
return false; return false;