aboutsummaryrefslogtreecommitdiff
path: root/main/src
diff options
context:
space:
mode:
Diffstat (limited to 'main/src')
-rw-r--r--main/src/plugins/omemo/logic/pre_key_store.vala38
-rw-r--r--main/src/plugins/omemo/logic/session_store.vala61
-rw-r--r--main/src/plugins/omemo/logic/signed_pre_key_store.vala38
-rw-r--r--main/src/plugins/omemo/protocol/bundle.vala4
-rw-r--r--main/src/plugins/omemo/protocol/stream_module.vala13
5 files changed, 93 insertions, 61 deletions
diff --git a/main/src/plugins/omemo/logic/pre_key_store.vala b/main/src/plugins/omemo/logic/pre_key_store.vala
index 968ec119..97e27858 100644
--- a/main/src/plugins/omemo/logic/pre_key_store.vala
+++ b/main/src/plugins/omemo/logic/pre_key_store.vala
@@ -4,41 +4,43 @@ using Omemo;
namespace Dino.Plugins.Omemo {
-private class BackedPreKeyStore : SimplePreKeyStore {
+private class BackedPreKeyStore : PreKeyStore {
private Database db;
private int identity_id;
public BackedPreKeyStore(Database db, int identity_id) {
this.db = db;
this.identity_id = identity_id;
- init();
}
- private void init() {
- try {
- foreach (Row row in db.pre_key.select().with(db.pre_key.identity_id, "=", identity_id)) {
- store_pre_key(row[db.pre_key.pre_key_id], Base64.decode(row[db.pre_key.record_base64]));
- }
- } catch (Error e) {
- warning("Error while initializing pre key store: %s", e.message);
- }
-
- pre_key_stored.connect(on_pre_key_stored);
- pre_key_deleted.connect(on_pre_key_deleted);
+ public override uint8[]? load_pre_key(uint32 pre_key_id) throws Crypto.Error {
+ RowOption row = db.pre_key.select({db.pre_key.record_base64})
+ .with(db.pre_key.identity_id, "=", identity_id)
+ .with(db.pre_key.pre_key_id, "=", (int) pre_key_id)
+ .single().row();
+ if (!row.is_present()) return null;
+ return Base64.decode(row[db.pre_key.record_base64]);
}
- public void on_pre_key_stored(PreKeyStore.Key key) {
+ public override void store_pre_key(uint32 pre_key_id, uint8[] record) throws Crypto.Error {
db.pre_key.upsert()
.value(db.pre_key.identity_id, identity_id, true)
- .value(db.pre_key.pre_key_id, (int) key.key_id, true)
- .value(db.pre_key.record_base64, Base64.encode(key.record))
+ .value(db.pre_key.pre_key_id, (int) pre_key_id, true)
+ .value(db.pre_key.record_base64, Base64.encode(record))
.perform();
}
- public void on_pre_key_deleted(PreKeyStore.Key key) {
+ public override bool contains_pre_key(uint32 pre_key_id) throws Crypto.Error {
+ return db.pre_key.select({db.pre_key.pre_key_id})
+ .with(db.pre_key.identity_id, "=", identity_id)
+ .with(db.pre_key.pre_key_id, "=", (int) pre_key_id)
+ .count() > 0;
+ }
+
+ public override void delete_pre_key(uint32 pre_key_id) throws Crypto.Error {
db.pre_key.delete()
.with(db.pre_key.identity_id, "=", identity_id)
- .with(db.pre_key.pre_key_id, "=", (int) key.key_id)
+ .with(db.pre_key.pre_key_id, "=", (int) pre_key_id)
.perform();
}
}
diff --git a/main/src/plugins/omemo/logic/session_store.vala b/main/src/plugins/omemo/logic/session_store.vala
index 4232e6be..883e1caa 100644
--- a/main/src/plugins/omemo/logic/session_store.vala
+++ b/main/src/plugins/omemo/logic/session_store.vala
@@ -4,45 +4,64 @@ using Omemo;
namespace Dino.Plugins.Omemo {
-private class BackedSessionStore : SimpleSessionStore {
+private class BackedSessionStore : SessionStore {
private Database db;
private int identity_id;
public BackedSessionStore(Database db, int identity_id) {
this.db = db;
this.identity_id = identity_id;
- init();
}
- private void init() {
- try {
- foreach (Row row in db.session.select().with(db.session.identity_id, "=", identity_id)) {
- Address addr = new Address(row[db.session.address_name], row[db.session.device_id]);
- store_session(addr, Base64.decode(row[db.session.record_base64]));
- addr.device_id = 0;
- }
- } catch (Error e) {
- print("Error while initializing session store: %s", e.message);
- }
+ public override uint8[]? load_session(Address address) throws Crypto.Error {
+ RowOption row = db.session.select({db.session.record_base64})
+ .with(db.session.identity_id, "=", identity_id)
+ .with(db.session.address_name, "=", address.name)
+ .with(db.session.device_id, "=", address.device_id)
+ .single().row();
+ if (!row.is_present()) return null;
+ return Base64.decode(row[db.session.record_base64]);
+ }
- session_stored.connect(on_session_stored);
- session_removed.connect(on_session_deleted);
+ public override IntList get_sub_device_sessions(string name) throws Crypto.Error {
+ IntList res = new IntList();
+ foreach (Row row in db.session.select({db.session.device_id})
+ .with(db.session.identity_id, "=", identity_id)
+ .with(db.session.address_name, "=", name)) {
+ res.add(row[db.session.device_id]);
+ }
+ return res;
}
- public void on_session_stored(SessionStore.Session session) {
+ public override void store_session(Address address, uint8[] record) throws Crypto.Error {
db.session.upsert()
.value(db.session.identity_id, identity_id, true)
- .value(db.session.address_name, session.name, true)
- .value(db.session.device_id, session.device_id, true)
- .value(db.session.record_base64, Base64.encode(session.record))
+ .value(db.session.address_name, address.name, true)
+ .value(db.session.device_id, address.device_id, true)
+ .value(db.session.record_base64, Base64.encode(record))
+ .perform();
+ }
+
+ public override bool contains_session(Address address) throws Crypto.Error {
+ return db.session.select({db.session.device_id})
+ .with(db.session.identity_id, "=", identity_id)
+ .with(db.session.address_name, "=", address.name)
+ .with(db.session.device_id, "=", address.device_id)
+ .count() > 0;
+ }
+
+ public override void delete_session(Address address) throws Crypto.Error {
+ db.session.delete()
+ .with(db.session.identity_id, "=", identity_id)
+ .with(db.session.address_name, "=", address.name)
+ .with(db.session.device_id, "=", address.device_id)
.perform();
}
- public void on_session_deleted(SessionStore.Session session) {
+ public override void delete_all_sessions(string name) throws Crypto.Error {
db.session.delete()
.with(db.session.identity_id, "=", identity_id)
- .with(db.session.address_name, "=", session.name)
- .with(db.session.device_id, "=", session.device_id)
+ .with(db.session.address_name, "=", name)
.perform();
}
}
diff --git a/main/src/plugins/omemo/logic/signed_pre_key_store.vala b/main/src/plugins/omemo/logic/signed_pre_key_store.vala
index 373a0060..f4d57550 100644
--- a/main/src/plugins/omemo/logic/signed_pre_key_store.vala
+++ b/main/src/plugins/omemo/logic/signed_pre_key_store.vala
@@ -4,41 +4,43 @@ using Omemo;
namespace Dino.Plugins.Omemo {
-private class BackedSignedPreKeyStore : SimpleSignedPreKeyStore {
+private class BackedSignedPreKeyStore : SignedPreKeyStore {
private Database db;
private int identity_id;
public BackedSignedPreKeyStore(Database db, int identity_id) {
this.db = db;
this.identity_id = identity_id;
- init();
}
- private void init() {
- try {
- foreach (Row row in db.signed_pre_key.select().with(db.signed_pre_key.identity_id, "=", identity_id)) {
- store_signed_pre_key(row[db.signed_pre_key.signed_pre_key_id], Base64.decode(row[db.signed_pre_key.record_base64]));
- }
- } catch (Error e) {
- print("Error while initializing signed pre key store: %s", e.message);
- }
-
- signed_pre_key_stored.connect(on_signed_pre_key_stored);
- signed_pre_key_deleted.connect(on_signed_pre_key_deleted);
+ public override uint8[]? load_signed_pre_key(uint32 pre_key_id) throws Crypto.Error {
+ RowOption row = db.signed_pre_key.select({db.signed_pre_key.record_base64})
+ .with(db.signed_pre_key.identity_id, "=", identity_id)
+ .with(db.signed_pre_key.signed_pre_key_id, "=", (int) pre_key_id)
+ .single().row();
+ if (!row.is_present()) return null;
+ return Base64.decode(row[db.signed_pre_key.record_base64]);
}
- public void on_signed_pre_key_stored(SignedPreKeyStore.Key key) {
+ public override void store_signed_pre_key(uint32 pre_key_id, uint8[] record) throws Crypto.Error {
db.signed_pre_key.upsert()
.value(db.signed_pre_key.identity_id, identity_id, true)
- .value(db.signed_pre_key.signed_pre_key_id, (int) key.key_id, true)
- .value(db.signed_pre_key.record_base64, Base64.encode(key.record))
+ .value(db.signed_pre_key.signed_pre_key_id, (int) pre_key_id, true)
+ .value(db.signed_pre_key.record_base64, Base64.encode(record))
.perform();
}
- public void on_signed_pre_key_deleted(SignedPreKeyStore.Key key) {
+ public override bool contains_signed_pre_key(uint32 pre_key_id) throws Crypto.Error {
+ return db.signed_pre_key.select({db.signed_pre_key.signed_pre_key_id})
+ .with(db.signed_pre_key.identity_id, "=", identity_id)
+ .with(db.signed_pre_key.signed_pre_key_id, "=", (int) pre_key_id)
+ .count() > 0;
+ }
+
+ public override void delete_signed_pre_key(uint32 pre_key_id) throws Crypto.Error {
db.signed_pre_key.delete()
.with(db.signed_pre_key.identity_id, "=", identity_id)
- .with(db.signed_pre_key.signed_pre_key_id, "=", (int) key.key_id)
+ .with(db.signed_pre_key.signed_pre_key_id, "=", (int) pre_key_id)
.perform();
}
}
diff --git a/main/src/plugins/omemo/protocol/bundle.vala b/main/src/plugins/omemo/protocol/bundle.vala
index b7e2b9cf..abd5269f 100644
--- a/main/src/plugins/omemo/protocol/bundle.vala
+++ b/main/src/plugins/omemo/protocol/bundle.vala
@@ -58,6 +58,10 @@ public class Bundle {
return list;
}}
+ public bool is_valid { get {
+ return signed_pre_key_id != -1 && signed_pre_key != null && signed_pre_key_signature != null && identity_key != null;
+ }}
+
public class PreKey {
private StanzaNode node;
diff --git a/main/src/plugins/omemo/protocol/stream_module.vala b/main/src/plugins/omemo/protocol/stream_module.vala
index 695c3508..3958bc23 100644
--- a/main/src/plugins/omemo/protocol/stream_module.vala
+++ b/main/src/plugins/omemo/protocol/stream_module.vala
@@ -153,15 +153,20 @@ public class StreamModule : XmppStreamModule {
if (node == null) {
// Device not registered, shouldn't exist
if (ignore_if_non_present) {
- debug("Ignoring device %s/%d: No bundle", jid.bare_jid.to_string(), device_id);
+ warning("Ignoring device %s/%d: No bundle", jid.bare_jid.to_string(), device_id);
stream.get_module(IDENTITY).ignore_device(jid, device_id);
}
bundle_fetch_failed(jid, device_id);
} else {
Bundle bundle = new Bundle(node);
- stream.get_module(IDENTITY).unignore_device(jid, device_id);
- debug("Received bundle for %s/%d: %s", jid.bare_jid.to_string(), device_id, Base64.encode(bundle.identity_key.serialize()));
- bundle_fetched(jid, device_id, bundle);
+ if (bundle.is_valid) {
+ stream.get_module(IDENTITY).unignore_device(jid, device_id);
+ debug("Received bundle for %s/%d: %s", jid.bare_jid.to_string(), device_id, Base64.encode(bundle.identity_key.serialize()));
+ bundle_fetched(jid, device_id, bundle);
+ } else {
+ warning("Ignoring device %s/%d: Invalid bundle", jid.bare_jid.to_string(), device_id);
+ bundle_fetch_failed(jid, device_id);
+ }
}
stream.get_module(IDENTITY).active_bundle_requests.remove(jid.bare_jid.to_string() + @":$device_id");
}
generated by cgit v1.3 (git 2.53.0) at 2026-11-04 08:42:30 +0000