Merge 'upstream/master'

1 files changed, 0 insertions, 159 deletions

diff --git a/plugins/openpgp/src/stream_module.vala b/plugins/openpgp/src/stream_module.vala
deleted file mode 100644
index 9985df26..00000000
--- a/plugins/openpgp/src/stream_module.vala
+++ /dev/null
@@ -1,159 +0,0 @@
-using GPG;
-
-using Xmpp;
-
-namespace Dino.Plugins.OpenPgp {
-    private const string NS_URI = "jabber:x";
-    private const string NS_URI_ENCRYPTED = NS_URI + ":encrypted";
-    private const string NS_URI_SIGNED = NS_URI +  ":signed";
-
-    public class Module : XmppStreamModule {
-        public static Xmpp.ModuleIdentity<Module> IDENTITY = new Xmpp.ModuleIdentity<Module>(NS_URI, "0027_current_pgp_usage");
-
-        public signal void received_jid_presence_signature(XmppStream stream, Jid jid, string sig, string signed_data);
-
-        private string? signed_status = null;
-        private Key? own_key = null;
-        private ReceivedPipelineDecryptListener received_pipeline_decrypt_listener = new ReceivedPipelineDecryptListener();
-
-        public Module(string? own_key_id = null, ref string? signed_data, ref string? sig) {
-            set_private_key_id(own_key_id, ref signed_data, ref sig);
-        }
-
-        public void set_private_key_id(string? own_key_id, ref string? signed_data, ref string? sig) {
-            if (own_key_id != null && sig == null) {
-                try {
-                    own_key = GPGHelper.get_private_key(own_key_id);
-                    if (own_key == null) warning("Can't get PGP private key");
-                } catch (Error e) { }
-                if (own_key != null) {
-                    if (signed_data == null) signed_data = "";
-                    sig = gpg_sign(signed_data, own_key);
-                }
-            }
-            signed_status = own_key_id != null ? sig : null;
-        }
-
-        public bool encrypt(MessageStanza message, GPG.Key[] keys) {
-            string? enc_body = gpg_encrypt(message.body, keys);
-            if (enc_body != null) {
-                message.stanza.put_node(new StanzaNode.build("x", NS_URI_ENCRYPTED).add_self_xmlns().put_node(new StanzaNode.text(enc_body)));
-                message.body = "[This message is OpenPGP encrypted (see XEP-0027)]";
-                Xep.ExplicitEncryption.add_encryption_tag_to_message(message, NS_URI_ENCRYPTED);
-                return true;
-            }
-            return false;
-        }
-
-        public override void attach(XmppStream stream) {
-            stream.get_module(Presence.Module.IDENTITY).received_presence.connect(on_received_presence);
-            stream.get_module(Presence.Module.IDENTITY).pre_send_presence_stanza.connect(on_pre_send_presence_stanza);
-            stream.get_module(MessageModule.IDENTITY).received_pipeline.connect(received_pipeline_decrypt_listener);
-        }
-
-        public override void detach(XmppStream stream) {
-            stream.get_module(Presence.Module.IDENTITY).received_presence.disconnect(on_received_presence);
-            stream.get_module(Presence.Module.IDENTITY).pre_send_presence_stanza.disconnect(on_pre_send_presence_stanza);
-            stream.get_module(MessageModule.IDENTITY).received_pipeline.disconnect(received_pipeline_decrypt_listener);
-        }
-
-        public override string get_ns() { return NS_URI; }
-        public override string get_id() { return IDENTITY.id; }
-
-        private void on_received_presence(XmppStream stream, Presence.Stanza presence) {
-            StanzaNode x_node = presence.stanza.get_subnode("x", NS_URI_SIGNED);
-            if (x_node == null) return;
-            string? sig = x_node.get_string_content();
-            if (sig == null) return;
-            string signed_data = presence.status == null ? "" : presence.status;
-            received_jid_presence_signature(stream, presence.from, sig, signed_data);
-        }
-
-        private void on_pre_send_presence_stanza(XmppStream stream, Presence.Stanza presence) {
-            if (presence.type_ == Presence.Stanza.TYPE_AVAILABLE && signed_status != null) {
-                presence.stanza.put_node(new StanzaNode.build("x", NS_URI_SIGNED).add_self_xmlns().put_node(new StanzaNode.text(signed_status)));
-            }
-        }
-
-        private static string? gpg_encrypt(string plain, GPG.Key[] keys) {
-            string encr;
-            try {
-                encr = GPGHelper.encrypt_armor(plain, keys, GPG.EncryptFlags.ALWAYS_TRUST);
-            } catch (Error e) {
-                return null;
-            }
-            int encryption_start = encr.index_of("\n\n") + 2;
-            return encr.substring(encryption_start, encr.length - "\n-----END PGP MESSAGE-----".length - encryption_start);
-        }
-
-        private static string? gpg_sign(string str, Key key) {
-            string signed;
-            try {
-                signed = GPGHelper.sign(str, GPG.SigMode.CLEAR, key);
-            } catch (Error e) {
-                return null;
-            }
-            int signature_start = signed.index_of("-----BEGIN PGP SIGNATURE-----");
-            signature_start = signed.index_of("\n\n", signature_start) + 2;
-            return signed.substring(signature_start, signed.length - "\n-----END PGP SIGNATURE-----".length - signature_start);
-        }
-    }
-
-    public class MessageFlag : Xmpp.MessageFlag {
-        public const string id = "pgp";
-
-        public bool decrypted = false;
-
-        public static MessageFlag? get_flag(MessageStanza message) {
-            return (MessageFlag) message.get_flag(NS_URI, id);
-        }
-
-        public override string get_ns() { return NS_URI; }
-        public override string get_id() { return id; }
-    }
-
-public class ReceivedPipelineDecryptListener : StanzaListener<MessageStanza> {
-
-    private string[] after_actions_const = {"MODIFY_BODY"};
-
-    public override string action_group { get { return "ENCRYPT_BODY"; } }
-    public override string[] after_actions { get { return after_actions_const; } }
-
-    public override async bool run(XmppStream stream, MessageStanza message) {
-        string? encrypted = get_cyphertext(message);
-        if (encrypted != null) {
-            MessageFlag flag = new MessageFlag();
-            message.add_flag(flag);
-            string? decrypted = yield gpg_decrypt(encrypted);
-            if (decrypted != null) {
-                flag.decrypted = true;
-                message.body = decrypted;
-            }
-        }
-        return false;
-    }
-
-    private static async string? gpg_decrypt(string enc) {
-        SourceFunc callback = gpg_decrypt.callback;
-        string? res = null;
-        new Thread<void*> (null, () => {
-            string armor = "-----BEGIN PGP MESSAGE-----\n\n" + enc + "\n-----END PGP MESSAGE-----";
-            try {
-                res = GPGHelper.decrypt(armor);
-            } catch (Error e) {
-                res = null;
-            }
-            Idle.add((owned) callback);
-            return null;
-        });
-        yield;
-        return res;
-    }
-
-    private string? get_cyphertext(MessageStanza message) {
-        StanzaNode? x_node = message.stanza.get_subnode("x", NS_URI_ENCRYPTED);
-        return x_node == null ? null : x_node.get_string_content();
-    }
-}
-
-}