Warn about undecrypted and untrusted messages
This commit is contained in:
parent
a6a92487d6
commit
c029da49bc
|
@ -53,6 +53,7 @@ SOURCES
|
||||||
|
|
||||||
src/ui/account_settings_entry.vala
|
src/ui/account_settings_entry.vala
|
||||||
src/ui/account_settings_widget.vala
|
src/ui/account_settings_widget.vala
|
||||||
|
src/ui/bad_messages_populator.vala
|
||||||
src/ui/contact_details_provider.vala
|
src/ui/contact_details_provider.vala
|
||||||
src/ui/contact_details_dialog.vala
|
src/ui/contact_details_dialog.vala
|
||||||
src/ui/device_notification_populator.vala
|
src/ui/device_notification_populator.vala
|
||||||
|
|
|
@ -6,7 +6,7 @@ using Dino.Entities;
|
||||||
namespace Dino.Plugins.Omemo {
|
namespace Dino.Plugins.Omemo {
|
||||||
|
|
||||||
public class Database : Qlite.Database {
|
public class Database : Qlite.Database {
|
||||||
private const int VERSION = 4;
|
private const int VERSION = 5;
|
||||||
|
|
||||||
public class IdentityMetaTable : Table {
|
public class IdentityMetaTable : Table {
|
||||||
//Default to provide backwards compatability
|
//Default to provide backwards compatability
|
||||||
|
@ -18,10 +18,12 @@ public class Database : Qlite.Database {
|
||||||
public Column<int> trust_level = new Column.Integer("trust_level") { default = TrustLevel.UNKNOWN.to_string(), min_version = 2 };
|
public Column<int> trust_level = new Column.Integer("trust_level") { default = TrustLevel.UNKNOWN.to_string(), min_version = 2 };
|
||||||
public Column<bool> now_active = new Column.BoolInt("now_active") { default = "1" };
|
public Column<bool> now_active = new Column.BoolInt("now_active") { default = "1" };
|
||||||
public Column<long> last_active = new Column.Long("last_active");
|
public Column<long> last_active = new Column.Long("last_active");
|
||||||
|
public Column<long> last_message_untrusted = new Column.Long("last_message_untrusted") { min_version = 5 };
|
||||||
|
public Column<long> last_message_undecryptable = new Column.Long("last_message_undecryptable") { min_version = 5 };
|
||||||
|
|
||||||
internal IdentityMetaTable(Database db) {
|
internal IdentityMetaTable(Database db) {
|
||||||
base(db, "identity_meta");
|
base(db, "identity_meta");
|
||||||
init({identity_id, address_name, device_id, identity_key_public_base64, trusted_identity, trust_level, now_active, last_active});
|
init({identity_id, address_name, device_id, identity_key_public_base64, trusted_identity, trust_level, now_active, last_active, last_message_untrusted, last_message_undecryptable});
|
||||||
index("identity_meta_idx", {identity_id, address_name, device_id}, true);
|
index("identity_meta_idx", {identity_id, address_name, device_id}, true);
|
||||||
index("identity_meta_list_idx", {identity_id, address_name});
|
index("identity_meta_list_idx", {identity_id, address_name});
|
||||||
}
|
}
|
||||||
|
@ -78,6 +80,30 @@ public class Database : Qlite.Database {
|
||||||
.value(this.trust_level, trust).perform();
|
.value(this.trust_level, trust).perform();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void update_last_message_untrusted(int identity_id, int device_id, DateTime? time) {
|
||||||
|
var stmt = update()
|
||||||
|
.with(this.identity_id, "=", identity_id)
|
||||||
|
.with(this.device_id, "=", device_id);
|
||||||
|
if (time != null) {
|
||||||
|
stmt.set(last_message_untrusted, (long)time.to_unix());
|
||||||
|
} else {
|
||||||
|
stmt.set_null(last_message_untrusted);
|
||||||
|
}
|
||||||
|
stmt.perform();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void update_last_message_undecryptable(int identity_id, int device_id, DateTime? time) {
|
||||||
|
var stmt = update()
|
||||||
|
.with(this.identity_id, "=", identity_id)
|
||||||
|
.with(this.device_id, "=", device_id);
|
||||||
|
if (time != null) {
|
||||||
|
stmt.set(last_message_undecryptable, (long)time.to_unix());
|
||||||
|
} else {
|
||||||
|
stmt.set_null(last_message_undecryptable);
|
||||||
|
}
|
||||||
|
stmt.perform();
|
||||||
|
}
|
||||||
|
|
||||||
public QueryBuilder get_trusted_devices(int identity_id, string address_name) {
|
public QueryBuilder get_trusted_devices(int identity_id, string address_name) {
|
||||||
return this.with_address(identity_id, address_name)
|
return this.with_address(identity_id, address_name)
|
||||||
.with(this.trust_level, "!=", TrustLevel.UNTRUSTED)
|
.with(this.trust_level, "!=", TrustLevel.UNTRUSTED)
|
||||||
|
|
|
@ -8,6 +8,8 @@ namespace Dino.Plugins.Omemo {
|
||||||
|
|
||||||
public class TrustManager {
|
public class TrustManager {
|
||||||
|
|
||||||
|
public signal void bad_message_state_updated(Account account, Jid jid, int device_id);
|
||||||
|
|
||||||
private StreamInteractor stream_interactor;
|
private StreamInteractor stream_interactor;
|
||||||
private Database db;
|
private Database db;
|
||||||
private DecryptMessageListener decrypt_message_listener;
|
private DecryptMessageListener decrypt_message_listener;
|
||||||
|
@ -19,8 +21,8 @@ public class TrustManager {
|
||||||
this.stream_interactor = stream_interactor;
|
this.stream_interactor = stream_interactor;
|
||||||
this.db = db;
|
this.db = db;
|
||||||
|
|
||||||
decrypt_message_listener = new DecryptMessageListener(stream_interactor, db, message_device_id_map);
|
decrypt_message_listener = new DecryptMessageListener(stream_interactor, this, db, message_device_id_map);
|
||||||
tag_message_listener = new TagMessageListener(stream_interactor, db, message_device_id_map);
|
tag_message_listener = new TagMessageListener(stream_interactor, this, db, message_device_id_map);
|
||||||
stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(decrypt_message_listener);
|
stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(decrypt_message_listener);
|
||||||
stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(tag_message_listener);
|
stream_interactor.get_module(MessageProcessor.IDENTITY).received_pipeline.connect(tag_message_listener);
|
||||||
}
|
}
|
||||||
|
@ -60,6 +62,11 @@ public class TrustManager {
|
||||||
.where(selection, selection_args)
|
.where(selection, selection_args)
|
||||||
.perform();
|
.perform();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (trust_level == TrustLevel.TRUSTED) {
|
||||||
|
db.identity_meta.update_last_message_untrusted(identity_id, device_id, null);
|
||||||
|
bad_message_state_updated(account, jid, device_id);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private StanzaNode create_encrypted_key_node(uint8[] key, Address address, Store store) throws GLib.Error {
|
private StanzaNode create_encrypted_key_node(uint8[] key, Address address, Store store) throws GLib.Error {
|
||||||
|
@ -204,11 +211,13 @@ public class TrustManager {
|
||||||
public override string[] after_actions { get { return after_actions_const; } }
|
public override string[] after_actions { get { return after_actions_const; } }
|
||||||
|
|
||||||
private StreamInteractor stream_interactor;
|
private StreamInteractor stream_interactor;
|
||||||
|
private TrustManager trust_manager;
|
||||||
private Database db;
|
private Database db;
|
||||||
private HashMap<Message, int> message_device_id_map;
|
private HashMap<Message, int> message_device_id_map;
|
||||||
|
|
||||||
public TagMessageListener(StreamInteractor stream_interactor, Database db, HashMap<Message, int> message_device_id_map) {
|
public TagMessageListener(StreamInteractor stream_interactor, TrustManager trust_manager, Database db, HashMap<Message, int> message_device_id_map) {
|
||||||
this.stream_interactor = stream_interactor;
|
this.stream_interactor = stream_interactor;
|
||||||
|
this.trust_manager = trust_manager;
|
||||||
this.db = db;
|
this.db = db;
|
||||||
this.message_device_id_map = message_device_id_map;
|
this.message_device_id_map = message_device_id_map;
|
||||||
}
|
}
|
||||||
|
@ -234,6 +243,8 @@ public class TrustManager {
|
||||||
TrustLevel trust_level = (TrustLevel) db.identity_meta.get_device(identity_id, jid.bare_jid.to_string(), device_id)[db.identity_meta.trust_level];
|
TrustLevel trust_level = (TrustLevel) db.identity_meta.get_device(identity_id, jid.bare_jid.to_string(), device_id)[db.identity_meta.trust_level];
|
||||||
if (trust_level == TrustLevel.UNTRUSTED || trust_level == TrustLevel.UNKNOWN) {
|
if (trust_level == TrustLevel.UNTRUSTED || trust_level == TrustLevel.UNKNOWN) {
|
||||||
stream_interactor.get_module(ContentItemStore.IDENTITY).set_item_hide(content_item, true);
|
stream_interactor.get_module(ContentItemStore.IDENTITY).set_item_hide(content_item, true);
|
||||||
|
db.identity_meta.update_last_message_untrusted(identity_id, device_id, message.time);
|
||||||
|
trust_manager.bad_message_state_updated(conversation.account, jid, device_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
db.content_item_meta.insert()
|
db.content_item_meta.insert()
|
||||||
|
@ -254,11 +265,13 @@ public class TrustManager {
|
||||||
public override string[] after_actions { get { return after_actions_const; } }
|
public override string[] after_actions { get { return after_actions_const; } }
|
||||||
|
|
||||||
private StreamInteractor stream_interactor;
|
private StreamInteractor stream_interactor;
|
||||||
|
private TrustManager trust_manager;
|
||||||
private Database db;
|
private Database db;
|
||||||
private HashMap<Message, int> message_device_id_map;
|
private HashMap<Message, int> message_device_id_map;
|
||||||
|
|
||||||
public DecryptMessageListener(StreamInteractor stream_interactor, Database db, HashMap<Message, int> message_device_id_map) {
|
public DecryptMessageListener(StreamInteractor stream_interactor, TrustManager trust_manager, Database db, HashMap<Message, int> message_device_id_map) {
|
||||||
this.stream_interactor = stream_interactor;
|
this.stream_interactor = stream_interactor;
|
||||||
|
this.trust_manager = trust_manager;
|
||||||
this.db = db;
|
this.db = db;
|
||||||
this.message_device_id_map = message_device_id_map;
|
this.message_device_id_map = message_device_id_map;
|
||||||
}
|
}
|
||||||
|
@ -270,9 +283,6 @@ public class TrustManager {
|
||||||
StanzaNode? _encrypted = stanza.stanza.get_subnode("encrypted", NS_URI);
|
StanzaNode? _encrypted = stanza.stanza.get_subnode("encrypted", NS_URI);
|
||||||
if (_encrypted == null || MessageFlag.get_flag(stanza) != null || stanza.from == null) return false;
|
if (_encrypted == null || MessageFlag.get_flag(stanza) != null || stanza.from == null) return false;
|
||||||
StanzaNode encrypted = (!)_encrypted;
|
StanzaNode encrypted = (!)_encrypted;
|
||||||
if (message.body == null && Xep.ExplicitEncryption.get_encryption_tag(stanza) == NS_URI) {
|
|
||||||
message.body = "[This message is OMEMO encrypted]"; // TODO temporary
|
|
||||||
};
|
|
||||||
if (!Plugin.ensure_context()) return false;
|
if (!Plugin.ensure_context()) return false;
|
||||||
int identity_id = db.identity.get_id(conversation.account.id);
|
int identity_id = db.identity.get_id(conversation.account.id);
|
||||||
MessageFlag flag = new MessageFlag();
|
MessageFlag flag = new MessageFlag();
|
||||||
|
@ -282,10 +292,16 @@ public class TrustManager {
|
||||||
StanzaNode header = (!)_header;
|
StanzaNode header = (!)_header;
|
||||||
int sid = header.get_attribute_int("sid");
|
int sid = header.get_attribute_int("sid");
|
||||||
if (sid <= 0) return false;
|
if (sid <= 0) return false;
|
||||||
|
|
||||||
|
var our_nodes = new ArrayList<StanzaNode>();
|
||||||
foreach (StanzaNode key_node in header.get_subnodes("key")) {
|
foreach (StanzaNode key_node in header.get_subnodes("key")) {
|
||||||
debug("Is ours? %d =? %u", key_node.get_attribute_int("rid"), store.local_registration_id);
|
debug("Is ours? %d =? %u", key_node.get_attribute_int("rid"), store.local_registration_id);
|
||||||
if (key_node.get_attribute_int("rid") == store.local_registration_id) {
|
if (key_node.get_attribute_int("rid") == store.local_registration_id) {
|
||||||
|
our_nodes.add(key_node);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (StanzaNode key_node in our_nodes) {
|
||||||
string? payload = encrypted.get_deep_string_content("payload");
|
string? payload = encrypted.get_deep_string_content("payload");
|
||||||
string? iv_node = header.get_deep_string_content("iv");
|
string? iv_node = header.get_deep_string_content("iv");
|
||||||
string? key_node_content = key_node.get_string_content();
|
string? key_node_content = key_node.get_string_content();
|
||||||
|
@ -393,7 +409,12 @@ public class TrustManager {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (our_nodes.size == 0) {
|
||||||
|
db.identity_meta.update_last_message_undecryptable(identity_id, sid, message.time);
|
||||||
|
trust_manager.bad_message_state_updated(conversation.account, message.from, sid);
|
||||||
}
|
}
|
||||||
|
|
||||||
debug("Received OMEMO encryped message that could not be decrypted.");
|
debug("Received OMEMO encryped message that could not be decrypted.");
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -47,6 +47,7 @@ public class Plugin : RootInterface, Object {
|
||||||
this.app.plugin_registry.register_account_settings_entry(settings_entry);
|
this.app.plugin_registry.register_account_settings_entry(settings_entry);
|
||||||
this.app.plugin_registry.register_contact_details_entry(contact_details_provider);
|
this.app.plugin_registry.register_contact_details_entry(contact_details_provider);
|
||||||
this.app.plugin_registry.register_notification_populator(device_notification_populator);
|
this.app.plugin_registry.register_notification_populator(device_notification_populator);
|
||||||
|
this.app.plugin_registry.register_conversation_addition_populator(new BadMessagesPopulator(this.app.stream_interactor, this));
|
||||||
this.app.stream_interactor.module_manager.initialize_account_modules.connect((account, list) => {
|
this.app.stream_interactor.module_manager.initialize_account_modules.connect((account, list) => {
|
||||||
list.add(new StreamModule());
|
list.add(new StreamModule());
|
||||||
list.add(new JetOmemo.Module(this));
|
list.add(new JetOmemo.Module(this));
|
||||||
|
|
136
plugins/omemo/src/ui/bad_messages_populator.vala
Normal file
136
plugins/omemo/src/ui/bad_messages_populator.vala
Normal file
|
@ -0,0 +1,136 @@
|
||||||
|
using Gee;
|
||||||
|
using Gtk;
|
||||||
|
using Qlite;
|
||||||
|
|
||||||
|
using Dino.Entities;
|
||||||
|
using Xmpp;
|
||||||
|
|
||||||
|
namespace Dino.Plugins.Omemo {
|
||||||
|
|
||||||
|
public enum BadnessType {
|
||||||
|
UNTRUSTED,
|
||||||
|
UNDECRYPTABLE
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BadMessagesPopulator : Plugins.ConversationItemPopulator, Plugins.ConversationAdditionPopulator, Object {
|
||||||
|
|
||||||
|
public string id { get { return "bad_omemo_messages"; } }
|
||||||
|
|
||||||
|
private StreamInteractor stream_interactor;
|
||||||
|
private Plugin plugin;
|
||||||
|
private Database db;
|
||||||
|
|
||||||
|
private Conversation? current_conversation;
|
||||||
|
private Plugins.ConversationItemCollection? item_collection;
|
||||||
|
|
||||||
|
private Gee.List<BadMessageItem> bad_items = new ArrayList<BadMessageItem>();
|
||||||
|
|
||||||
|
public BadMessagesPopulator(StreamInteractor stream_interactor, Plugin plugin) {
|
||||||
|
this.stream_interactor = stream_interactor;
|
||||||
|
this.plugin = plugin;
|
||||||
|
this.db = plugin.db;
|
||||||
|
|
||||||
|
plugin.trust_manager.bad_message_state_updated.connect((account, jid, device_id) => {
|
||||||
|
clear_state();
|
||||||
|
init_state();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private void init_state() {
|
||||||
|
var qry = db.identity_meta.select()
|
||||||
|
.join_with(db.identity, db.identity.id, db.identity_meta.identity_id)
|
||||||
|
.with(db.identity.account_id, "=", current_conversation.account.id)
|
||||||
|
.with(db.identity_meta.address_name, "=", current_conversation.counterpart.to_string())
|
||||||
|
.where("last_message_untrusted is not NULL OR last_message_undecryptable is not NULL");
|
||||||
|
|
||||||
|
foreach (Row row in qry) {
|
||||||
|
Jid jid = new Jid(row[db.identity_meta.address_name]);
|
||||||
|
if (!db.identity_meta.last_message_untrusted.is_null(row)) {
|
||||||
|
DateTime time = new DateTime.from_unix_utc(row[db.identity_meta.last_message_untrusted]);
|
||||||
|
var item = new BadMessageItem(plugin, current_conversation.account, jid, time, BadnessType.UNTRUSTED);
|
||||||
|
bad_items.add(item);
|
||||||
|
item_collection.insert_item(item);
|
||||||
|
}
|
||||||
|
if (!db.identity_meta.last_message_undecryptable.is_null(row)) {
|
||||||
|
DateTime time = new DateTime.from_unix_utc(row[db.identity_meta.last_message_undecryptable]);
|
||||||
|
var item = new BadMessageItem(plugin, current_conversation.account, jid, time, BadnessType.UNDECRYPTABLE);
|
||||||
|
bad_items.add(item);
|
||||||
|
item_collection.insert_item(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void clear_state() {
|
||||||
|
foreach (BadMessageItem bad_item in bad_items) {
|
||||||
|
item_collection.remove_item(bad_item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void init(Conversation conversation, Plugins.ConversationItemCollection item_collection, Plugins.WidgetType type) {
|
||||||
|
current_conversation = conversation;
|
||||||
|
this.item_collection = item_collection;
|
||||||
|
|
||||||
|
init_state();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void close(Conversation conversation) { }
|
||||||
|
|
||||||
|
public void populate_timespan(Conversation conversation, DateTime after, DateTime before) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BadMessageItem : Plugins.MetaConversationItem {
|
||||||
|
public override bool can_merge { get; set; default=false; }
|
||||||
|
public override bool requires_avatar { get; set; default=false; }
|
||||||
|
public override bool requires_header { get; set; default=false; }
|
||||||
|
|
||||||
|
private Plugin plugin;
|
||||||
|
private Account account;
|
||||||
|
private DateTime date;
|
||||||
|
private Jid problem_jid;
|
||||||
|
private BadnessType badness_type;
|
||||||
|
|
||||||
|
public BadMessageItem(Plugin plugin, Account account, Jid jid, DateTime date, BadnessType badness_type) {
|
||||||
|
this.plugin = plugin;
|
||||||
|
this.account = account;
|
||||||
|
this.problem_jid = jid;
|
||||||
|
this.date = date;
|
||||||
|
this.sort_time = date;
|
||||||
|
this.badness_type = badness_type;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override Object? get_widget(Plugins.WidgetType widget_type) {
|
||||||
|
return new BadMessagesWidget(plugin, account, problem_jid, badness_type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public class BadMessagesWidget : Box {
|
||||||
|
public BadMessagesWidget(Plugin plugin, Account account, Jid jid, BadnessType badness_type) {
|
||||||
|
Object(orientation:Orientation.HORIZONTAL, spacing:5);
|
||||||
|
|
||||||
|
this.halign = Align.CENTER;
|
||||||
|
this.visible = true;
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
if (badness_type == BadnessType.UNTRUSTED) {
|
||||||
|
sb.append("Your contact has been using an untrusted device. You won't see messages from devices that you do not trust.");
|
||||||
|
sb.append(" <a href=\"\">%s</a>".printf(_("Manage devices")));
|
||||||
|
} else {
|
||||||
|
sb.append("Your contact does not trust this device. That means, you might be missing messages.");
|
||||||
|
}
|
||||||
|
Label label = new Label(sb.str) { margin_start=70, margin_end=70, justify=Justification.CENTER, use_markup=true, selectable=true, wrap=true, wrap_mode=Pango.WrapMode.WORD_CHAR, hexpand=true, visible=true };
|
||||||
|
label.get_style_context().add_class("dim-label");
|
||||||
|
this.add(label);
|
||||||
|
|
||||||
|
label.activate_link.connect(() => {
|
||||||
|
if (badness_type == BadnessType.UNTRUSTED) {
|
||||||
|
ContactDetailsDialog dialog = new ContactDetailsDialog(plugin, account, jid);
|
||||||
|
dialog.set_transient_for((Window) get_toplevel());
|
||||||
|
dialog.present();
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in a new issue