Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][omemo_integration] new: Add OMEMOTrustManager
by Daniel Brötzmann (＠wurstsalat) 18 Oct '22

18 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: fa02f944 by wurstsalat at 2022-10-18T19:59:03+02:00 new: Add OMEMOTrustManager - - - - - 12 changed files: - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_details.py - gajim/gtk/message_actions_box.py - + gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -725,6 +725,39 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="encryption_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="encryption_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> + <property name="margin-top">36</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="name">encryption-omemo</property> + <property name="title" translatable="yes">Encryption (OMEMO)</property> + <property name="icon-name">channel-secure-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="groups_page_box"> <property name="visible">True</property> @@ -873,7 +906,7 @@ <property name="name">groups</property> <property name="title" translatable="yes">Groups</property> <property name="icon-name">view-pin-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -934,7 +967,7 @@ <property name="name">notes</property> <property name="title" translatable="yes">Notes</property> <property name="icon-name">x-office-address-book-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -1004,7 +1037,7 @@ <property name="name">devices</property> <property name="title" translatable="yes">Devices</property> <property name="icon-name">computer-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <style> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -129,6 +129,39 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="encryption_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="encryption_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> + <property name="margin-top">36</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="name">encryption-omemo</property> + <property name="title" translatable="yes">Encryption (OMEMO)</property> + <property name="icon-name">channel-secure-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="manage_box"> <property name="visible">True</property> @@ -151,7 +184,7 @@ <property name="name">manage</property> <property name="title" translatable="yes">Manage</property> <property name="icon-name">preferences-other-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -170,7 +203,7 @@ <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -189,7 +222,7 @@ <property name="name">outcasts</property> <property name="title" translatable="yes">Outcasts</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -205,7 +238,7 @@ <property name="name">config</property> <property name="title" translatable="yes">Configuration</property> <property name="icon-name">document-properties-symbolic</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <style> ===================================== gajim/data/gui/omemo_trust_manager.ui ===================================== @@ -0,0 +1,420 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkPopover" id="search_popover"> + <property name="can-focus">False</property> + <child> + <object class="GtkSearchEntry" id="search"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="caps-lock-warning">False</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <signal name="search-changed" handler="_on_search_changed" swapped="no"/> + </object> + </child> + </object> + <object class="GtkPopover" id="qr_code_popover"> + <property name="can-focus">False</property> + <property name="relative-to">qr_menu_button</property> + <property name="constrain-to">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">This Device</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="comparing_instructions"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">13</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="our_fingerprint_2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <style> + <class name="fingerprint"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkImage" id="qr_code_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="icon_size">6</property> + <style> + <class name="border"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="qr_dependency_missing"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">For verification via QR-Code you have to install <tt>python-qrcode</tt>.</property> + <property name="use-markup">True</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + </child> + </object> + <object class="GtkStack" id="stack"> + <property name="width-request">400</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">crossfade</property> + <property name="interpolate-size">True</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">This Device</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkListBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="selectable">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Fingerprint for this Device</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="our_fingerprint_1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <style> + <class name="fingerprint"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="qr_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Scan QR Code</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="direction">up</property> + <property name="popover">qr_code_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">qr-code-scan</property> + </object> + </child> + <style> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_trust_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Manage your Devices…</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_manage_trust_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-system-symbolic</property> + </object> + </child> + <style> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="settings-box"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="list_heading"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="list_heading_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkSwitch" id="show_inactive_switch"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="valign">center</property> + <signal name="notify::active" handler="_on_show_inactive" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Show Inactive Devices</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="search_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Search…</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="popover">search_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-find-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkListBox" id="list"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="clear_devices_button"> + <property name="label" translatable="yes">Clear Devices…</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_clear_devices_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <style> + <class name="omemo-trust-manager"/> + </style> + </object> + <packing> + <property name="name">manage-keys</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Account is not connected.</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">no-connection</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg ===================================== @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="296" + height="296" + viewBox="0 0 296 296" + version="1.1" + id="svg879" + sodipodi:docname="qr-code-scan.svg" + xml:space="preserve" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview + id="namedview881" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="1.1820013" + inkscape:cx="-30.033808" + inkscape:cy="205.58353" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg879" /><defs + id="defs5"><rect + id="p" + width="8" + height="8" /></defs><g + id="g3488" + transform="matrix(1.1697246,0,0,1.1697246,-27.551074,-25.261865)"><path + style="fill:#000000;stroke-width:0.476103" + d="M 251.48889,66.946387 V 46.712014 H 231.25452 211.02015 V 36.475802 26.23959 h 21.16314 c 22.41235,0 24.39388,0.156166 28.55025,2.250069 3.06508,1.544132 6.94528,5.251442 8.51507,8.135659 2.59204,4.762428 2.71271,6.062675 2.71271,29.230841 V 87.18076 h -10.23621 -10.23622 z" + id="path3464" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 28.196638,66.017616 c 0,-22.412343 0.156166,-24.393876 2.250069,-28.550247 1.544132,-3.065083 5.251442,-6.945286 8.135659,-8.515074 4.762428,-2.592038 6.062675,-2.712705 29.230841,-2.712705 H 89.137808 V 36.475802 46.712014 H 68.903435 48.669062 V 66.946387 87.18076 H 38.43285 28.196638 Z" + id="path3462" /><path + style="fill:#000000;stroke-width:0.476103" + d="M 170.5514,97.175398 V 66.701287 l 30.35156,0.12255 30.35156,0.12255 0.12255,30.351559 0.12255,30.351564 H 201.02551 170.5514 Z m 40.46875,0.241574 V 87.18076 h -10.23621 -10.23622 v 9.918809 c 0,5.455351 0.14283,10.061641 0.31741,10.236211 0.17457,0.17457 4.78086,0.3174 10.23621,0.3174 h 9.91881 z" + id="path3460" /><path + style="fill:#000000;stroke-width:0.476103" + d="M 140.08082,107.41513 V 87.18076 h 9.99816 9.99816 v 20.23437 20.23438 h -9.99816 -9.99816 z" + id="path3458" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.780885,97.297946 0.12255,-30.351559 30.351559,-0.12255 30.351556,-0.12255 V 97.175398 127.64951 H 99.132446 68.658335 Z m 40.719795,0 0.12849,-10.117186 H 99.38349 89.137808 v 10.245682 10.245678 l 10.117186,-0.12849 10.117186,-0.1285 z" + id="path3456" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.665384,148.12193 v -9.99816 h 10.236212 10.236212 v 9.99816 9.99816 H 78.901596 68.665384 Z" + id="path3454" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 139.97126,168.47533 -0.12849,-10.11719 -10.11719,-0.12849 -30.662081,-0.28013 v -9.98869 -9.98869 l 40.779271,0.15163 h 20.23437 v 20.23437 20.23437 h -9.98869 -9.98869 z" + id="path3452" + sodipodi:nodetypes="ccccccccccccc" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 211.02015,193.82781 v -15.2353 h -10.23621 -10.23622 v 15.2353 15.23529 h 10.23622 10.23621 z" + id="path3474" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 140.08082,209.0631 v -20.47242 h 15.23529 15.23529 v -4.99908 -4.99909 h 9.99816 9.99816 V 168.3563 158.12009 h -9.99816 -9.99816 v -9.99816 -9.99816 h 9.99816 9.99816 v 9.99816 9.99816 h 10.23622 10.23621 v -9.99816 -9.99816 h 10.23621 10.23621 v 9.99816 9.99816 h -10.23621 -10.23621 v 10.23621 10.23621 h 10.23621 10.23621 v 15.2353 15.23529 h -10.23621 -10.23621 v 10.24568 10.24568 l -10.11719,-0.12849 -10.11718,-0.1285 -0.1285,-10.11718 -0.1285,-10.11719 h -15.22582 -15.22582 v 10.23621 10.23621 h -9.99816 -9.99816 z" + id="path3450" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.982786,229.21812 c -0.174571,-0.17457 -0.317402,-13.88633 -0.317402,-30.47058 v -30.15319 h 30.470585 30.470581 v 30.47059 30.47058 H 99.453372 c -16.584254,0 -30.296015,-0.14283 -30.470586,-0.3174 z m 40.517894,-30.27221 -0.1285,-10.11718 -10.117186,-0.1285 -10.117186,-0.12849 v 10.24568 10.24568 h 10.245682 10.24568 z" + id="path3448" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 211.02015,259.76806 v -10.23621 h 20.23437 20.23437 V 229.29747 209.0631 h 10.23622 10.23621 v 21.3246 c 0,23.16817 -0.12067,24.46841 -2.71271,29.23084 -1.56979,2.88422 -5.44999,6.59153 -8.51507,8.13566 -4.15637,2.0939 -6.1379,2.25007 -28.55025,2.25007 h -21.16314 z" + id="path3446" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 43.551277,269.26862 c -1.374571,-0.37014 -3.39419,-1.12956 -4.488044,-1.6876 -2.760243,-1.40817 -6.658458,-5.21488 -8.15389,-7.96248 -2.592038,-4.76243 -2.712705,-6.06267 -2.712705,-29.23084 V 209.0631 H 38.43285 48.669062 v 20.23437 20.23438 h 20.234373 20.234373 v 10.23621 10.23621 l -21.543656,-0.0313 c -16.989841,-0.0247 -22.071931,-0.17358 -24.042875,-0.70431 z" + id="path3346" /></g></svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -8,6 +8,7 @@ .chatcontrol-actionbar-button { .message-action-box { margin: 8px 13px 8px 8px } +.border { border: 1px solid @borders; } .no-border { border: none; } .scrolled-no-border { border: none; } .no-scroll-indicator undershoot.top, undershoot.bottom { background-image: none; } @@ -577,7 +578,7 @@ list.settings > row:not(:last-child) { } list.settings row { min-height: 52px; } list.settings > row > box { - margin: 6px 18px; + margin: 10px 20px 10px 10px; } /* Settings Window */ @@ -625,7 +626,7 @@ #SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } /* Accounts Window */ .accounts-menu { border-right: 1px solid; border-color: @borders;} .accounts-settings-border {border: 1px solid; border-color: @borders;} -.accounts-settings stack > box { margin:30px; } +.accounts-settings stack > box.settings-page { margin:30px; } .accounts-label-row { padding-top: 10px; padding-bottom: 10px; @@ -766,6 +767,8 @@ .large-header { font-size: 1.75rem; font-weight: bold; } +.monospace { font-family: monospace; } + .insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ @@ -799,6 +802,28 @@ .selected-color { color: @theme_selected_bg_color; } .encrypted-color { color: rgb(75, 181, 67); } .unencrypted-color { color: @error_color; } +/* OMEMO */ +.fingerprint { + color: @insensitive_fg_color; + font-family: monospace; + font-size: 90%; +} +.omemo-inactive-color { color: @insensitive_fg_color; } + +.omemo-trust-manager list row { + border-bottom: 1px solid; + border-color: @unfocused_borders; + padding: 10px 20px 10px 10px; +} +.omemo-trust-manager list row:last-child { border-bottom: 0px} +.omemo-trust-manager list { + border: 1px solid; + border-color:@unfocused_borders; +} +.omemo-trust-manager list > row { outline: none; } + +.omemo-trust-popover row { padding: 10px 15px 10px 10px; } + /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } ===================================== gajim/gtk/accounts.py ===================================== @@ -40,6 +40,7 @@ from .const import Setting from .const import SettingKind from .const import SettingType +from .omemo_trust_manager import OMEMOTrustManager from .settings import SettingsDialog from .settings import SettingsBox from .settings import PopoverSetting @@ -166,9 +167,9 @@ def add_account(self, account: str, initial: bool = False) -> None: if not initial: self._accounts[account].show() - def select_account(self, account: str) -> None: + def select_account(self, account: str, page: Optional[str] = None) -> None: try: - self._accounts[account].select() + self._accounts[account].select(page) except KeyError: log.warning('select_account() failed, account %s not found', account) @@ -292,6 +293,12 @@ def _on_sub_menu_row_activated(self, listbox.account, f'{listbox.account}-{row.name}') + def set_page(self, account: str, page_name: str) -> None: + sub_menu = cast( + AccountSubMenu, self._stack.get_child_by_name(f'{account}-menu')) + sub_menu.select_row_by_name(page_name) + self.emit('menu-activated', account, f'{account}-{page_name}') + def update_account_label(self, account: str) -> None: self._accounts_listbox.invalidate_sort() sub_menu = cast( @@ -317,6 +324,7 @@ def __init__(self, account: str) -> None: self.add(BackMenuItem()) self.add(PageMenuItem('general', _('General'))) self.add(PageMenuItem('privacy', _('Privacy'))) + self.add(PageMenuItem('encryption-omemo', _('Encryption (OMEMO)'))) self.add(PageMenuItem('connection', _('Connection'))) self.add(PageMenuItem('advanced', _('Advanced'))) self.add(RemoveMenuItem()) @@ -325,6 +333,14 @@ def __init__(self, account: str) -> None: def account(self) -> str: return self._account + def select_row_by_name(self, row_name: str) -> None: + for row in self.get_children(): + if not isinstance(row, PageMenuItem): + continue + if row.name == row_name: + self.select_row(row) + return + def update(self) -> None: self.emit('update', self._account) @@ -411,6 +427,8 @@ def __init__(self, name: str, label: str) -> None: icon = 'preferences-system-symbolic' elif name == 'privacy': icon = 'preferences-system-privacy-symbolic' + elif name == 'encryption-omemo': + icon = 'channel-secure-symbolic' elif name == 'connection': icon = 'preferences-system-network-symbolic' elif name == 'advanced': @@ -436,15 +454,18 @@ def __init__(self, self._settings = settings self._settings.add_page(GeneralPage(account)) - self._settings.add_page(ConnectionPage(account)) self._settings.add_page(PrivacyPage(account)) + self._settings.add_page(EncryptionOMEMOPage(account)) + self._settings.add_page(ConnectionPage(account)) self._settings.add_page(AdvancedPage(account)) self._account_row = AccountRow(account) self._menu.add_account(self._account_row) - def select(self) -> None: + def select(self, page_name: Optional[str] = None) -> None: self._account_row.emit('activate') + if page_name is not None: + self._menu.set_page(self._account, page_name) def show(self) -> None: self._menu.show_all() @@ -616,6 +637,7 @@ def __init__(self, account: str, settings: list[Setting]) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) self.set_valign(Gtk.Align.START) self.set_vexpand(True) + self.get_style_context().add_class('settings-page') self.account = account self.listbox = SettingsBox(account) @@ -891,6 +913,40 @@ def _reset_send_read_marker(self, button: Gtk.Button) -> None: 'send_marker', None, context='private') +class EncryptionOMEMOPage(GenericSettingPage): + + name = 'encryption-omemo' + + def __init__(self, account: str) -> None: + settings = [ + Setting(SettingKind.SWITCH, + _('Blind Trust'), + SettingType.ACCOUNT_CONFIG, + 'omemo_blind_trust', + desc=_('Blindly trust new devices until you verify them')) + ] + GenericSettingPage.__init__(self, account, settings) + + heading = Gtk.Label(label=_('Trust Management')) + heading.get_style_context().add_class('bold') + heading.set_xalign(0) + self.add(heading) + + btbv_label = Gtk.Label() + btbv_label.set_xalign(0) + markup = '<a href="%s">%s</a>' % ( + 'https://dev.gajim.org/gajim/gajim-plugins/-/' + 'wikis/omemogajimplugin', + _('Read more about blind trust')) + btbv_label.set_markup(markup) + self.add(btbv_label) + + omemo_trust_manager = OMEMOTrustManager(account) + omemo_trust_manager.set_margin_top(18) + self.pack_end(omemo_trust_manager, True, True, 0) + self.reorder_child(omemo_trust_manager, 0) + + class ConnectionPage(GenericSettingPage): name = 'connection' ===================================== gajim/gtk/builder.pyi ===================================== @@ -283,6 +283,8 @@ class ContactInfoBuilder(Builder): to_subscription_button: Gtk.Button contact_settings_box: Gtk.Box remove_history_button: Gtk.Button + encryption_scrolled: Gtk.ScrolledWindow + encryption_box: Gtk.Box groups_page_box: Gtk.Box groups_treeview: Gtk.TreeView tree_selection: Gtk.TreeSelection @@ -412,6 +414,8 @@ class GroupchatDetailsBuilder(Builder): main_stack: Gtk.Stack info_box: Gtk.Box settings_box: Gtk.Box + encryption_scrolled: Gtk.ScrolledWindow + encryption_box: Gtk.Box manage_box: Gtk.Box affiliation_box: Gtk.Box outcasts_box: Gtk.Box @@ -589,6 +593,26 @@ class MessageActionsBoxBuilder(Builder): input_scrolled: Gtk.ScrolledWindow +class OmemoTrustManagerBuilder(Builder): + search_popover: Gtk.Popover + search: Gtk.SearchEntry + qr_code_popover: Gtk.Popover + comparing_instructions: Gtk.Label + our_fingerprint_2: Gtk.Label + qr_code_image: Gtk.Image + qr_dependency_missing: Gtk.Label + stack: Gtk.Stack + our_fingerprint_1: Gtk.Label + qr_menu_button: Gtk.MenuButton + manage_trust_button: Gtk.Button + list_heading: Gtk.Label + list_heading_box: Gtk.Box + show_inactive_switch: Gtk.Switch + search_button: Gtk.MenuButton + list: Gtk.ListBox + clear_devices_button: Gtk.Button + + class PasswordDialogBuilder(Builder): pass_box: Gtk.Box header: Gtk.Label @@ -649,6 +673,7 @@ class PreferencesBuilder(Builder): stack: Gtk.Stack window_behaviour: Gtk.Grid plugins: Gtk.Grid + general: Gtk.Grid chats: Gtk.Grid group_chats: Gtk.Grid file_preview: Gtk.Grid @@ -1016,6 +1041,8 @@ def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] = ...) -> MessageActionsBoxBuilder: ... @overload +def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... +@overload def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... @overload def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... ===================================== gajim/gtk/chat_stack.py ===================================== @@ -718,7 +718,7 @@ def _on_send_message(self) -> None: assert contact is not None encryption = contact.settings.get('encryption') - if encryption: + if encryption and encryption != 'OMEMO': if encryption not in app.plugin_manager.encryption_plugins: ErrorDialog(_('Encryption error'), _('Missing necessary encryption plugin')) ===================================== gajim/gtk/contact_info.py ===================================== @@ -49,6 +49,7 @@ from .contact_settings import ContactSettings from .dialogs import ConfirmationDialog from .dialogs import DialogButton +from .omemo_trust_manager import OMEMOTrustManager from .sidebar_switcher import SideBarSwitcher from .builder import get_builder from .util import connect_destroy @@ -109,6 +110,7 @@ def __init__(self, if isinstance(self.contact, BareContact): self._fill_settings_page(self.contact) + self._fill_encryption_page(self.contact) self._fill_device_info(self.contact) self._fill_groups_page(self.contact) self._fill_note_page(self.contact) @@ -120,7 +122,6 @@ def __init__(self, self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) - # pylint: disable=line-too-long connect_destroy(self._ui.tree_selection, 'changed', self._on_group_selection_changed) connect_destroy(self._ui.toggle_renderer, @@ -134,7 +135,6 @@ def __init__(self, ('unsubscribed-presence-received', ged.GUI1, self._on_unsubscribed_presence_received), ]) - # pylint: enable=line-too-long self.add(self._ui.main_grid) self.show_all() @@ -185,6 +185,11 @@ def _fill_information_page(self, contact: ContactT) -> None: self._switcher.set_row_visible('information', True) + def _fill_encryption_page(self, contact: ContactT) -> None: + self._ui.encryption_box.add( + OMEMOTrustManager(self.contact.account, self.contact)) + self._switcher.set_row_visible('encryption-omemo', True) + def _fill_note_page(self, contact: BareContact) -> None: if not contact.is_in_roster: return ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -34,6 +34,7 @@ from .groupchat_config import GroupchatConfig from .groupchat_manage import GroupchatManage from .groupchat_settings import GroupChatSettings +from .omemo_trust_manager import OMEMOTrustManager from .sidebar_switcher import SideBarSwitcher from .structs import RemoveHistoryActionParams @@ -71,6 +72,7 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() + self._add_groupchat_encryption() self._add_groupchat_manage() self._add_affiliations() self._add_outcasts() @@ -173,6 +175,10 @@ def _add_groupchat_settings(self) -> None: self._ui.settings_box.add(scrolled_window) + def _add_groupchat_encryption(self) -> None: + self._ui.encryption_box.add( + OMEMOTrustManager(self._contact.account, self._contact)) + def _add_affiliations(self) -> None: affiliations = GroupchatAffiliation(self._client, self._contact) self._ui.affiliation_box.add(affiliations) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -42,6 +42,7 @@ from gajim.common.client import Client from gajim.common.const import SimpleClientState from gajim.common.const import Direction +from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT @@ -59,7 +60,7 @@ from .menus import get_self_contact_menu from .menus import get_singlechat_menu from .message_input import MessageInputTextView - +from .util import open_window log = logging.getLogger('gajim.gui.messageactionsbox') @@ -297,7 +298,7 @@ def _change_encryption(self, if current_state == new_state: return - if new_state: + if new_state and new_state != 'OMEMO': plugin = app.plugin_manager.encryption_plugins.get(new_state) if plugin is None: # TODO: Add GUI error here @@ -353,6 +354,9 @@ def _update_encryption_details_button(self) -> None: app.window.get_control(), encryption_state) + if state == 'OMEMO': + encryption_state['authenticated'] = True + visible, enc_type, authenticated = encryption_state.values() assert isinstance(visible, bool) @@ -378,6 +382,24 @@ def _update_encryption_details_button(self) -> None: def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') + if encryption == 'OMEMO': + if contact.is_groupchat: + open_window('GroupchatDetails', + contact=contact, + page='encryption-omemo') + return + + if isinstance(contact, BareContact) and contact.is_self: + window = open_window('AccountsWindow') + window.select_account(contact.account, page='encryption-omemo') + return + + open_window('ContactInfo', + account=contact.account, + contact=contact, + page='encryption-omemo') + return + app.plugin_manager.extension_point( f'encryption_dialog{encryption}', app.window.get_control()) ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -0,0 +1,533 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# OMEMO Gajim Plugin is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# OMEMO Gajim Plugin is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import cast +from typing import Optional +from typing import Union + +import os +import time +import locale +import logging +import tempfile +from packaging.version import Version as V + +from pkg_resources import get_distribution + +from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore + +from nbxmpp.protocol import JID + +from gi.repository import Gtk +from gi.repository import GdkPixbuf + +from gajim.common import app +from gajim.common import ged +from gajim.common import types +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisconnected +from gajim.common.i18n import _ +from gajim.common.ged import EventHelper +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.omemobackend.util import Trust +from gajim.common.modules.omemobackend.util import IdentityKeyExtended +from gajim.common.modules.omemobackend.util import get_fingerprint + +from .builder import get_builder +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton +from .util import open_window + +log = logging.getLogger('gajim.gui.omemo_trust_dialog') + + +TRUST_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Not Decided'), + 'warning-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color') +} + + +class OMEMOTrustManager(Gtk.Box, EventHelper): + def __init__(self, + account: str, + contact: Optional[types.ChatContactT] = None + ) -> None: + + Gtk.Box.__init__(self) + EventHelper.__init__(self) + + self._account = account + self._contact = contact + + self._ui = get_builder('omemo_trust_manager.ui') + self.add(self._ui.stack) + + self._ui.list.set_filter_func(self._filter_func, None) + self._ui.list.set_sort_func(self._sort_func, None) + + self._ui.connect_signals(self) + + self.connect('destroy', self._on_destroy) + self.show_all() + + self.register_events([ + ('account-connected', ged.GUI2, self._on_account_state), + ('account-disconnected', ged.GUI2, self._on_account_state) + ]) + + if not app.account_is_connected(account): + self._ui.stack.set_visible_child_name('no-connection') + return + + self._update() + + def _update(self) -> None: + client = app.get_client(self._account) + if self._contact is None: + self._contact = client.get_module('Contacts').get_contact( + client.get_own_jid().bare) + + if isinstance(self._contact, BareContact) and self._contact.is_self: + header_text = _('Other devices connected with your account') + popover_qr_text = _('Compare this code with the one shown on your ' + 'contact’s screen to ensure the safety of ' + 'your end-to-end encrypted chat.') + else: + header_text = _('Devices connected with %s') % self._contact.name + popover_qr_text = _('Compare this code with the one shown on your ' + 'contact’s screen to ensure the safety of ' + 'your end-to-end encrypted chat ' + 'with %s.') % self._contact.name + + self._ui.list_heading.set_text(header_text) + self._ui.comparing_instructions.set_text(popover_qr_text) + + self._omemo = client.get_module('OMEMO') + + self._identity_key = cast( + IdentityKeyPair, self._omemo.backend.storage.getIdentityKeyPair()) + our_fpr_formatted = get_fingerprint(self._identity_key, formatted=True) + self._ui.our_fingerprint_1.set_text(our_fpr_formatted) + self._ui.our_fingerprint_2.set_text(our_fpr_formatted) + + self.update() + self._load_qrcode() + + def update(self) -> None: + assert self._contact is not None + self._ui.list.foreach(self._ui.list.remove) + + if isinstance(self._contact, BareContact) and self._contact.is_self: + self._ui.clear_devices_button.show() + self._ui.list_heading_box.set_halign(Gtk.Align.START) + else: + self._ui.manage_trust_button.show() + if self._contact.is_groupchat: + self._ui.search_button.show() + + self._load_fingerprints(self._contact) + + def _on_destroy(self, *args: Any) -> None: + app.check_finalize(self) + + def _on_account_state(self, + event: Union[AccountConnected, AccountDisconnected] + ) -> None: + + if isinstance(event, AccountConnected): + self._update() + self._ui.stack.set_visible_child_name('manage-keys') + else: + self._ui.stack.set_visible_child_name('no-connection') + + def _filter_func(self, row: KeyRow, _user_data: Any) -> bool: + search_text = self._ui.search.get_text() + if search_text and search_text.lower() not in str(row.jid): + return False + if self._ui.show_inactive_switch.get_active(): + return True + return row.active + + @staticmethod + def _sort_func(row1: KeyRow, row2: KeyRow, _user_data: Any) -> int: + result = locale.strcoll(str(row1.jid), str(row2.jid)) + if result != 0: + return result + + if row1.active != row2.active: + return -1 if row1.active else 1 + + if row1.trust != row2.trust: + return -1 if row1.trust > row2.trust else 1 + return 0 + + def _on_search_changed(self, _entry: Gtk.SearchEntry) -> None: + self._ui.list.invalidate_filter() + + def _load_fingerprints(self, contact: types.ChatContactT) -> None: + if contact.is_groupchat: + members = list(self._omemo.backend.get_muc_members( + str(contact.jid))) + sessions = self._omemo.backend.storage.getSessionsFromJids(members) + results = self._omemo.backend.storage.getMucFingerprints(members) + else: + sessions = self._omemo.backend.storage.getSessionsFromJid( + str(contact.jid)) + results = self._omemo.backend.storage.getFingerprints( + str(contact.jid)) + + rows: dict[IdentityKeyExtended, KeyRow] = {} + for result in results: + rows[result.public_key] = KeyRow(contact, + result.recipient_id, + result.public_key, + result.trust, + result.timestamp) + + for item in sessions: + if item.record.isFresh(): + return + identity_key = item.record.getSessionState().getRemoteIdentityKey() + identity_key = IdentityKeyExtended(identity_key.getPublicKey()) + try: + key_row = rows[identity_key] + except KeyError: + log.warning('Could not find session identitykey %s', + item.device_id) + self._omemo.backend.storage.deleteSession(item.recipient_id, + item.device_id) + continue + + key_row.active = item.active + key_row.device_id = item.device_id + + for row in rows.values(): + self._ui.list.add(row) + + @staticmethod + def _get_qrcode(jid: str, sid: int, identity_key: IdentityKeyPair) -> str: + fingerprint = get_fingerprint(identity_key) + path = os.path.join(tempfile.gettempdir(), + 'omemo_{}.png'.format(jid)) + + ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint) + log.debug('Verification String: %s', ver_string) + + import qrcode + qr = qrcode.QRCode(version=None, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=6, + border=4) + qr.add_data(ver_string) + qr.make(fit=True) + + fill_color = 'black' + back_color = 'white' + if V(get_distribution('qrcode').version) < V('6.0'): + # meaning of fill_color and back_color were switched + # before this commit in qrcode between versions 5.3 + # and 6.0: https://github.com/lincolnloop/python-qrcode/ + # commit/01f440d64b7d1f61bb75161ce118b86eca85b15c + back_color, fill_color = fill_color, back_color + + img = qr.make_image(fill_color=fill_color, back_color=back_color) + img.save(path) + return path + + def _load_qrcode(self) -> None: + try: + client = app.get_client(self._account) + path = self._get_qrcode(client.get_own_jid().bare, + self._omemo.backend.own_device, + self._identity_key) + except ImportError: + log.exception('Failed to generate QR code') + self._ui.qr_code_image.hide() + self._ui.qr_dependency_missing.show() + else: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) + self._ui.qr_code_image.set_from_pixbuf(pixbuf) + self._ui.qr_code_image.show() + self._ui.qr_dependency_missing.hide() + + def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: + self._ui.list.invalidate_filter() + + def _on_clear_devices_clicked(self, _button: Gtk.Button) -> None: + def _clear(): + self._omemo.clear_devicelist() + + window = self.get_window() + assert isinstance(window, Gtk.Window) + + ConfirmationDialog( + _('Clear Devices'), + _('Clear Devices Now?'), + _('This will clear the devices store for your account.'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Clear Devices'), + callback=_clear)], + transient_for=window).show() + + def _on_manage_trust_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None + window = open_window('AccountsWindow') + window.select_account(self._contact.account, 'encryption-omemo') + + +class KeyRow(Gtk.ListBoxRow): + def __init__(self, + contact: types.ChatContactT, + jid: JID, + identity_key: IdentityKeyExtended, + trust: Trust, + last_seen: Optional[float] + ) -> None: + + Gtk.ListBoxRow.__init__(self) + self.set_activatable(False) + + self._active = False + self._device_id: Optional[int] = None + self._identity_key = identity_key + self.trust = trust + self.jid = jid + + client = app.get_client(contact.account) + self._omemo = client.get_module('OMEMO') + + grid = Gtk.Grid() + grid.set_column_spacing(12) + + self._trust_button = TrustButton(self) + grid.attach(self._trust_button, 1, 1, 1, 3) + + self.fingerprint = Gtk.Label( + label=self._identity_key.get_fingerprint(formatted=True)) + self.fingerprint.get_style_context().add_class('omemo-mono') + self.fingerprint.get_style_context().add_class('omemo-inactive-color') + self.fingerprint.set_selectable(True) + self.fingerprint.set_halign(Gtk.Align.START) + self.fingerprint.set_valign(Gtk.Align.START) + self.fingerprint.set_hexpand(True) + grid.attach(self.fingerprint, 2, 1, 1, 1) + + if last_seen is not None: + last_seen_str = time.strftime('%d-%m-%Y %H:%M:%S', + time.localtime(last_seen)) + else: + last_seen_str = _('Never') + last_seen_label = Gtk.Label(label=_('Last seen: %s') % last_seen_str) + last_seen_label.set_halign(Gtk.Align.START) + last_seen_label.set_valign(Gtk.Align.START) + last_seen_label.set_hexpand(True) + last_seen_label.get_style_context().add_class('small-label') + last_seen_label.get_style_context().add_class('dim-label') + grid.attach(last_seen_label, 2, 3, 1, 1) + + self.add(grid) + self.show_all() + + def delete_fingerprint(self, *args: Any) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + window = cast(Gtk.Window, listbox.get_window()) + + def _remove(): + self._omemo.backend.remove_device(str(self.jid), self.device_id) + self._omemo.backend.storage.deleteSession( + str(self.jid), self.device_id) + self._omemo.backend.storage.deleteIdentity( + str(self.jid), self._identity_key) + + listbox.remove(self) + self.destroy() + + ConfirmationDialog( + _('Delete'), + _('Delete Fingerprint'), + _('Doing so will permanently delete this Fingerprint'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('Delete'), + callback=_remove)], + transient_for=window).show() + + def set_trust(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self.trust] + image = cast(Gtk.Image, self._trust_button.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().add_class(css_class) + image.set_tooltip_text(tooltip) + + self._omemo.backend.storage.setTrust( + str(self.jid), self._identity_key, self.trust) + + @property + def active(self) -> bool: + return self._active + + @active.setter + def active(self, active: bool) -> None: + context = self.fingerprint.get_style_context() + self._active = bool(active) + if self._active: + context.remove_class('omemo-inactive-color') + else: + context.add_class('omemo-inactive-color') + self._trust_button.update() + + @property + def device_id(self) -> Optional[int]: + return self._device_id + + @device_id.setter + def device_id(self, device_id: int) -> None: + self._device_id = device_id + + +class TrustButton(Gtk.MenuButton): + def __init__(self, row: KeyRow) -> None: + Gtk.MenuButton.__init__(self) + self._row = row + self._css_class = '' + self.set_popover(TrustPopver(row)) + self.set_valign(Gtk.Align.CENTER) + self.update() + + def update(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self._row.trust] + image = cast(Gtk.Image, self.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().remove_class(self._css_class) + + if not self._row.active: + css_class = 'omemo-inactive-color' + tooltip = '%s - %s' % (_('Inactive'), tooltip) + + image.get_style_context().add_class(css_class) + self._css_class = css_class + self.set_tooltip_text(tooltip) + + +class TrustPopver(Gtk.Popover): + def __init__(self, row: KeyRow) -> None: + Gtk.Popover.__init__(self) + self._row = row + self._listbox = Gtk.ListBox() + self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.update() + self.add(self._listbox) + self._listbox.show_all() + self._listbox.connect('row-activated', self._activated) + self.get_style_context().add_class('omemo-trust-popover') + + def _activated(self, _listbox: Gtk.ListBox, row: MenuOption) -> None: + self.popdown() + if row.type_ is None: + self._row.delete_fingerprint() + else: + self._row.trust = row.type_ + self._row.set_trust() + trust_button = cast(TrustButton, self.get_relative_to()) + trust_button.update() + self.update() + + def update(self) -> None: + self._listbox.foreach(self._listbox.remove) + if self._row.trust != Trust.VERIFIED: + self._listbox.add(VerifiedOption()) + if self._row.trust != Trust.BLIND: + self._listbox.add(BlindOption()) + if self._row.trust != Trust.UNTRUSTED: + self._listbox.add(NotTrustedOption()) + self._listbox.add(DeleteOption()) + + +class MenuOption(Gtk.ListBoxRow): + def __init__(self, + icon: str, + label_text: str, + color: str, + type_: Optional[Trust] = None + ) -> None: + + Gtk.ListBoxRow.__init__(self) + + self.type_ = type_ + self.icon = icon + self.label = label_text + self.color = color + + box = Gtk.Box() + box.set_spacing(6) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + label = Gtk.Label(label=label_text) + image.get_style_context().add_class(color) + + box.add(image) + box.add(label) + self.add(box) + self.show_all() + + +class BlindOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color', + Trust.BLIND) + + +class VerifiedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-high-symbolic', + _('Verified'), + 'encrypted-color', + Trust.VERIFIED) + + +class NotTrustedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'dialog-error-symbolic', + _('Untrusted'), + 'error-color', + Trust.UNTRUSTED) + + +class DeleteOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'user-trash-symbolic', + _('Delete'), + '') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa02f944431b2752798995f2f819c361… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa02f944431b2752798995f2f819c361… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] new: Add OMEMOTrustManager
by Daniel Brötzmann (＠wurstsalat) 18 Oct '22

18 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 17611a75 by wurstsalat at 2022-10-18T19:52:34+02:00 new: Add OMEMOTrustManager - - - - - 12 changed files: - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_details.py - gajim/gtk/message_actions_box.py - + gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -725,6 +725,39 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="encryption_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="encryption_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> + <property name="margin-top">36</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="name">encryption-omemo</property> + <property name="title" translatable="yes">Encryption (OMEMO)</property> + <property name="icon-name">channel-secure-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="groups_page_box"> <property name="visible">True</property> @@ -873,7 +906,7 @@ <property name="name">groups</property> <property name="title" translatable="yes">Groups</property> <property name="icon-name">view-pin-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -934,7 +967,7 @@ <property name="name">notes</property> <property name="title" translatable="yes">Notes</property> <property name="icon-name">x-office-address-book-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -1004,7 +1037,7 @@ <property name="name">devices</property> <property name="title" translatable="yes">Devices</property> <property name="icon-name">computer-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <style> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -129,6 +129,39 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="encryption_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="encryption_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> + <property name="margin-top">36</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="name">encryption-omemo</property> + <property name="title" translatable="yes">Encryption (OMEMO)</property> + <property name="icon-name">channel-secure-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="manage_box"> <property name="visible">True</property> @@ -151,7 +184,7 @@ <property name="name">manage</property> <property name="title" translatable="yes">Manage</property> <property name="icon-name">preferences-other-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -170,7 +203,7 @@ <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -189,7 +222,7 @@ <property name="name">outcasts</property> <property name="title" translatable="yes">Outcasts</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -205,7 +238,7 @@ <property name="name">config</property> <property name="title" translatable="yes">Configuration</property> <property name="icon-name">document-properties-symbolic</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <style> ===================================== gajim/data/gui/omemo_trust_manager.ui ===================================== @@ -0,0 +1,416 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkPopover" id="search_popover"> + <property name="can-focus">False</property> + <child> + <object class="GtkSearchEntry" id="search"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="caps-lock-warning">False</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <signal name="search-changed" handler="_on_search_changed" swapped="no"/> + </object> + </child> + </object> + <object class="GtkPopover" id="qr_code_popover"> + <property name="can-focus">False</property> + <property name="relative-to">qr_menu_button</property> + <property name="constrain-to">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">This Device</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="comparing_instructions"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">13</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="our_fingerprint_2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <style> + <class name="fingerprint"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkImage" id="qr_code_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="qr_dependency_missing"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">For verification via QR-Code you have to install <tt>python-qrcode</tt>.</property> + <property name="use-markup">True</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + </child> + </object> + <object class="GtkStack" id="stack"> + <property name="width-request">400</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">crossfade</property> + <property name="interpolate-size">True</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">This Device</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkListBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="selectable">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Fingerprint for this Device</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="our_fingerprint_1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <style> + <class name="fingerprint"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="qr_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Scan QR Code</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="direction">up</property> + <property name="popover">qr_code_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">qr-code-scan</property> + </object> + </child> + <style> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_trust_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Manage your Devices…</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_manage_trust_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">preferences-system-symbolic</property> + </object> + </child> + <style> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="settings-box"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="list_heading"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="list_heading_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkSwitch" id="show_inactive_switch"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="valign">center</property> + <signal name="notify::active" handler="_on_show_inactive" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Show Inactive Devices</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="search_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Search…</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="popover">search_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-find-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkListBox" id="list"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="clear_devices_button"> + <property name="label" translatable="yes">Clear Devices…</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_clear_devices_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <style> + <class name="omemo-trust-manager"/> + </style> + </object> + <packing> + <property name="name">manage-keys</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Account is not connected.</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">no-connection</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg ===================================== @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="296" + height="296" + viewBox="0 0 296 296" + version="1.1" + id="svg879" + sodipodi:docname="qr-code-scan.svg" + xml:space="preserve" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview + id="namedview881" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="1.1820013" + inkscape:cx="-30.033808" + inkscape:cy="205.58353" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg879" /><defs + id="defs5"><rect + id="p" + width="8" + height="8" /></defs><g + id="g3488" + transform="matrix(1.1697246,0,0,1.1697246,-27.551074,-25.261865)"><path + style="fill:#000000;stroke-width:0.476103" + d="M 251.48889,66.946387 V 46.712014 H 231.25452 211.02015 V 36.475802 26.23959 h 21.16314 c 22.41235,0 24.39388,0.156166 28.55025,2.250069 3.06508,1.544132 6.94528,5.251442 8.51507,8.135659 2.59204,4.762428 2.71271,6.062675 2.71271,29.230841 V 87.18076 h -10.23621 -10.23622 z" + id="path3464" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 28.196638,66.017616 c 0,-22.412343 0.156166,-24.393876 2.250069,-28.550247 1.544132,-3.065083 5.251442,-6.945286 8.135659,-8.515074 4.762428,-2.592038 6.062675,-2.712705 29.230841,-2.712705 H 89.137808 V 36.475802 46.712014 H 68.903435 48.669062 V 66.946387 87.18076 H 38.43285 28.196638 Z" + id="path3462" /><path + style="fill:#000000;stroke-width:0.476103" + d="M 170.5514,97.175398 V 66.701287 l 30.35156,0.12255 30.35156,0.12255 0.12255,30.351559 0.12255,30.351564 H 201.02551 170.5514 Z m 40.46875,0.241574 V 87.18076 h -10.23621 -10.23622 v 9.918809 c 0,5.455351 0.14283,10.061641 0.31741,10.236211 0.17457,0.17457 4.78086,0.3174 10.23621,0.3174 h 9.91881 z" + id="path3460" /><path + style="fill:#000000;stroke-width:0.476103" + d="M 140.08082,107.41513 V 87.18076 h 9.99816 9.99816 v 20.23437 20.23438 h -9.99816 -9.99816 z" + id="path3458" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.780885,97.297946 0.12255,-30.351559 30.351559,-0.12255 30.351556,-0.12255 V 97.175398 127.64951 H 99.132446 68.658335 Z m 40.719795,0 0.12849,-10.117186 H 99.38349 89.137808 v 10.245682 10.245678 l 10.117186,-0.12849 10.117186,-0.1285 z" + id="path3456" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.665384,148.12193 v -9.99816 h 10.236212 10.236212 v 9.99816 9.99816 H 78.901596 68.665384 Z" + id="path3454" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 139.97126,168.47533 -0.12849,-10.11719 -10.11719,-0.12849 -30.662081,-0.28013 v -9.98869 -9.98869 l 40.779271,0.15163 h 20.23437 v 20.23437 20.23437 h -9.98869 -9.98869 z" + id="path3452" + sodipodi:nodetypes="ccccccccccccc" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 211.02015,193.82781 v -15.2353 h -10.23621 -10.23622 v 15.2353 15.23529 h 10.23622 10.23621 z" + id="path3474" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 140.08082,209.0631 v -20.47242 h 15.23529 15.23529 v -4.99908 -4.99909 h 9.99816 9.99816 V 168.3563 158.12009 h -9.99816 -9.99816 v -9.99816 -9.99816 h 9.99816 9.99816 v 9.99816 9.99816 h 10.23622 10.23621 v -9.99816 -9.99816 h 10.23621 10.23621 v 9.99816 9.99816 h -10.23621 -10.23621 v 10.23621 10.23621 h 10.23621 10.23621 v 15.2353 15.23529 h -10.23621 -10.23621 v 10.24568 10.24568 l -10.11719,-0.12849 -10.11718,-0.1285 -0.1285,-10.11718 -0.1285,-10.11719 h -15.22582 -15.22582 v 10.23621 10.23621 h -9.99816 -9.99816 z" + id="path3450" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.982786,229.21812 c -0.174571,-0.17457 -0.317402,-13.88633 -0.317402,-30.47058 v -30.15319 h 30.470585 30.470581 v 30.47059 30.47058 H 99.453372 c -16.584254,0 -30.296015,-0.14283 -30.470586,-0.3174 z m 40.517894,-30.27221 -0.1285,-10.11718 -10.117186,-0.1285 -10.117186,-0.12849 v 10.24568 10.24568 h 10.245682 10.24568 z" + id="path3448" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 211.02015,259.76806 v -10.23621 h 20.23437 20.23437 V 229.29747 209.0631 h 10.23622 10.23621 v 21.3246 c 0,23.16817 -0.12067,24.46841 -2.71271,29.23084 -1.56979,2.88422 -5.44999,6.59153 -8.51507,8.13566 -4.15637,2.0939 -6.1379,2.25007 -28.55025,2.25007 h -21.16314 z" + id="path3446" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 43.551277,269.26862 c -1.374571,-0.37014 -3.39419,-1.12956 -4.488044,-1.6876 -2.760243,-1.40817 -6.658458,-5.21488 -8.15389,-7.96248 -2.592038,-4.76243 -2.712705,-6.06267 -2.712705,-29.23084 V 209.0631 H 38.43285 48.669062 v 20.23437 20.23438 h 20.234373 20.234373 v 10.23621 10.23621 l -21.543656,-0.0313 c -16.989841,-0.0247 -22.071931,-0.17358 -24.042875,-0.70431 z" + id="path3346" /></g></svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -577,7 +577,7 @@ list.settings > row:not(:last-child) { } list.settings row { min-height: 52px; } list.settings > row > box { - margin: 6px 18px; + margin: 10px 20px 10px 10px; } /* Settings Window */ @@ -625,7 +625,7 @@ #SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } /* Accounts Window */ .accounts-menu { border-right: 1px solid; border-color: @borders;} .accounts-settings-border {border: 1px solid; border-color: @borders;} -.accounts-settings stack > box { margin:30px; } +.accounts-settings stack > box.settings-page { margin:30px; } .accounts-label-row { padding-top: 10px; padding-bottom: 10px; @@ -766,6 +766,8 @@ .large-header { font-size: 1.75rem; font-weight: bold; } +.monospace { font-family: monospace; } + .insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ @@ -799,6 +801,28 @@ .selected-color { color: @theme_selected_bg_color; } .encrypted-color { color: rgb(75, 181, 67); } .unencrypted-color { color: @error_color; } +/* OMEMO */ +.fingerprint { + color: @insensitive_fg_color; + font-family: monospace; + font-size: 90%; +} +.omemo-inactive-color { color: @insensitive_fg_color; } + +.omemo-trust-manager list row { + border-bottom: 1px solid; + border-color: @unfocused_borders; + padding: 10px 20px 10px 10px; +} +.omemo-trust-manager list row:last-child { border-bottom: 0px} +.omemo-trust-manager list { + border: 1px solid; + border-color:@unfocused_borders; +} +.omemo-trust-manager list > row { outline: none; } + +.omemo-trust-popover row { padding: 10px 15px 10px 10px; } + /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } ===================================== gajim/gtk/accounts.py ===================================== @@ -40,6 +40,7 @@ from .const import Setting from .const import SettingKind from .const import SettingType +from .omemo_trust_manager import OMEMOTrustManager from .settings import SettingsDialog from .settings import SettingsBox from .settings import PopoverSetting @@ -166,9 +167,9 @@ def add_account(self, account: str, initial: bool = False) -> None: if not initial: self._accounts[account].show() - def select_account(self, account: str) -> None: + def select_account(self, account: str, page: Optional[str] = None) -> None: try: - self._accounts[account].select() + self._accounts[account].select(page) except KeyError: log.warning('select_account() failed, account %s not found', account) @@ -292,6 +293,12 @@ def _on_sub_menu_row_activated(self, listbox.account, f'{listbox.account}-{row.name}') + def set_page(self, account: str, page_name: str) -> None: + sub_menu = cast( + AccountSubMenu, self._stack.get_child_by_name(f'{account}-menu')) + sub_menu.select_row_by_name(page_name) + self.emit('menu-activated', account, f'{account}-{page_name}') + def update_account_label(self, account: str) -> None: self._accounts_listbox.invalidate_sort() sub_menu = cast( @@ -317,6 +324,7 @@ def __init__(self, account: str) -> None: self.add(BackMenuItem()) self.add(PageMenuItem('general', _('General'))) self.add(PageMenuItem('privacy', _('Privacy'))) + self.add(PageMenuItem('encryption-omemo', _('Encryption (OMEMO)'))) self.add(PageMenuItem('connection', _('Connection'))) self.add(PageMenuItem('advanced', _('Advanced'))) self.add(RemoveMenuItem()) @@ -325,6 +333,14 @@ def __init__(self, account: str) -> None: def account(self) -> str: return self._account + def select_row_by_name(self, row_name: str) -> None: + for row in self.get_children(): + if not isinstance(row, PageMenuItem): + continue + if row.name == row_name: + self.select_row(row) + return + def update(self) -> None: self.emit('update', self._account) @@ -411,6 +427,8 @@ def __init__(self, name: str, label: str) -> None: icon = 'preferences-system-symbolic' elif name == 'privacy': icon = 'preferences-system-privacy-symbolic' + elif name == 'encryption-omemo': + icon = 'channel-secure-symbolic' elif name == 'connection': icon = 'preferences-system-network-symbolic' elif name == 'advanced': @@ -436,15 +454,18 @@ def __init__(self, self._settings = settings self._settings.add_page(GeneralPage(account)) - self._settings.add_page(ConnectionPage(account)) self._settings.add_page(PrivacyPage(account)) + self._settings.add_page(EncryptionOMEMOPage(account)) + self._settings.add_page(ConnectionPage(account)) self._settings.add_page(AdvancedPage(account)) self._account_row = AccountRow(account) self._menu.add_account(self._account_row) - def select(self) -> None: + def select(self, page_name: Optional[str] = None) -> None: self._account_row.emit('activate') + if page_name is not None: + self._menu.set_page(self._account, page_name) def show(self) -> None: self._menu.show_all() @@ -616,6 +637,7 @@ def __init__(self, account: str, settings: list[Setting]) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) self.set_valign(Gtk.Align.START) self.set_vexpand(True) + self.get_style_context().add_class('settings-page') self.account = account self.listbox = SettingsBox(account) @@ -891,6 +913,40 @@ def _reset_send_read_marker(self, button: Gtk.Button) -> None: 'send_marker', None, context='private') +class EncryptionOMEMOPage(GenericSettingPage): + + name = 'encryption-omemo' + + def __init__(self, account: str) -> None: + settings = [ + Setting(SettingKind.SWITCH, + _('Blind Trust'), + SettingType.ACCOUNT_CONFIG, + 'omemo_blind_trust', + desc=_('Blindly trust new devices until you verify them')) + ] + GenericSettingPage.__init__(self, account, settings) + + heading = Gtk.Label(label=_('Trust Management')) + heading.get_style_context().add_class('bold') + heading.set_xalign(0) + self.add(heading) + + btbv_label = Gtk.Label() + btbv_label.set_xalign(0) + markup = '<a href="%s">%s</a>' % ( + 'https://dev.gajim.org/gajim/gajim-plugins/-/' + 'wikis/omemogajimplugin', + _('Read more about blind trust')) + btbv_label.set_markup(markup) + self.add(btbv_label) + + omemo_trust_manager = OMEMOTrustManager(account) + omemo_trust_manager.set_margin_top(18) + self.pack_end(omemo_trust_manager, True, True, 0) + self.reorder_child(omemo_trust_manager, 0) + + class ConnectionPage(GenericSettingPage): name = 'connection' ===================================== gajim/gtk/builder.pyi ===================================== @@ -283,6 +283,8 @@ class ContactInfoBuilder(Builder): to_subscription_button: Gtk.Button contact_settings_box: Gtk.Box remove_history_button: Gtk.Button + encryption_scrolled: Gtk.ScrolledWindow + encryption_box: Gtk.Box groups_page_box: Gtk.Box groups_treeview: Gtk.TreeView tree_selection: Gtk.TreeSelection @@ -412,6 +414,8 @@ class GroupchatDetailsBuilder(Builder): main_stack: Gtk.Stack info_box: Gtk.Box settings_box: Gtk.Box + encryption_scrolled: Gtk.ScrolledWindow + encryption_box: Gtk.Box manage_box: Gtk.Box affiliation_box: Gtk.Box outcasts_box: Gtk.Box @@ -589,6 +593,26 @@ class MessageActionsBoxBuilder(Builder): input_scrolled: Gtk.ScrolledWindow +class OmemoTrustManagerBuilder(Builder): + search_popover: Gtk.Popover + search: Gtk.SearchEntry + qr_code_popover: Gtk.Popover + comparing_instructions: Gtk.Label + our_fingerprint_2: Gtk.Label + qr_code_image: Gtk.Image + qr_dependency_missing: Gtk.Label + stack: Gtk.Stack + our_fingerprint_1: Gtk.Label + qr_menu_button: Gtk.MenuButton + manage_trust_button: Gtk.Button + list_heading: Gtk.Label + list_heading_box: Gtk.Box + show_inactive_switch: Gtk.Switch + search_button: Gtk.MenuButton + list: Gtk.ListBox + clear_devices_button: Gtk.Button + + class PasswordDialogBuilder(Builder): pass_box: Gtk.Box header: Gtk.Label @@ -649,6 +673,7 @@ class PreferencesBuilder(Builder): stack: Gtk.Stack window_behaviour: Gtk.Grid plugins: Gtk.Grid + general: Gtk.Grid chats: Gtk.Grid group_chats: Gtk.Grid file_preview: Gtk.Grid @@ -1016,6 +1041,8 @@ def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] = ...) -> MessageActionsBoxBuilder: ... @overload +def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... +@overload def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... @overload def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... ===================================== gajim/gtk/chat_stack.py ===================================== @@ -718,7 +718,7 @@ def _on_send_message(self) -> None: assert contact is not None encryption = contact.settings.get('encryption') - if encryption: + if encryption and encryption != 'OMEMO': if encryption not in app.plugin_manager.encryption_plugins: ErrorDialog(_('Encryption error'), _('Missing necessary encryption plugin')) ===================================== gajim/gtk/contact_info.py ===================================== @@ -49,6 +49,7 @@ from .contact_settings import ContactSettings from .dialogs import ConfirmationDialog from .dialogs import DialogButton +from .omemo_trust_manager import OMEMOTrustManager from .sidebar_switcher import SideBarSwitcher from .builder import get_builder from .util import connect_destroy @@ -109,6 +110,7 @@ def __init__(self, if isinstance(self.contact, BareContact): self._fill_settings_page(self.contact) + self._fill_encryption_page(self.contact) self._fill_device_info(self.contact) self._fill_groups_page(self.contact) self._fill_note_page(self.contact) @@ -120,7 +122,6 @@ def __init__(self, self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) - # pylint: disable=line-too-long connect_destroy(self._ui.tree_selection, 'changed', self._on_group_selection_changed) connect_destroy(self._ui.toggle_renderer, @@ -134,7 +135,6 @@ def __init__(self, ('unsubscribed-presence-received', ged.GUI1, self._on_unsubscribed_presence_received), ]) - # pylint: enable=line-too-long self.add(self._ui.main_grid) self.show_all() @@ -185,6 +185,11 @@ def _fill_information_page(self, contact: ContactT) -> None: self._switcher.set_row_visible('information', True) + def _fill_encryption_page(self, contact: ContactT) -> None: + self._ui.encryption_box.add( + OMEMOTrustManager(self.contact.account, self.contact)) + self._switcher.set_row_visible('encryption-omemo', True) + def _fill_note_page(self, contact: BareContact) -> None: if not contact.is_in_roster: return ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -34,6 +34,7 @@ from .groupchat_config import GroupchatConfig from .groupchat_manage import GroupchatManage from .groupchat_settings import GroupChatSettings +from .omemo_trust_manager import OMEMOTrustManager from .sidebar_switcher import SideBarSwitcher from .structs import RemoveHistoryActionParams @@ -71,6 +72,7 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() + self._add_groupchat_encryption() self._add_groupchat_manage() self._add_affiliations() self._add_outcasts() @@ -173,6 +175,10 @@ def _add_groupchat_settings(self) -> None: self._ui.settings_box.add(scrolled_window) + def _add_groupchat_encryption(self) -> None: + self._ui.encryption_box.add( + OMEMOTrustManager(self._contact.account, self._contact)) + def _add_affiliations(self) -> None: affiliations = GroupchatAffiliation(self._client, self._contact) self._ui.affiliation_box.add(affiliations) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -42,6 +42,7 @@ from gajim.common.client import Client from gajim.common.const import SimpleClientState from gajim.common.const import Direction +from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT @@ -59,7 +60,7 @@ from .menus import get_self_contact_menu from .menus import get_singlechat_menu from .message_input import MessageInputTextView - +from .util import open_window log = logging.getLogger('gajim.gui.messageactionsbox') @@ -297,7 +298,7 @@ def _change_encryption(self, if current_state == new_state: return - if new_state: + if new_state and new_state != 'OMEMO': plugin = app.plugin_manager.encryption_plugins.get(new_state) if plugin is None: # TODO: Add GUI error here @@ -353,6 +354,9 @@ def _update_encryption_details_button(self) -> None: app.window.get_control(), encryption_state) + if state == 'OMEMO': + encryption_state['authenticated'] = True + visible, enc_type, authenticated = encryption_state.values() assert isinstance(visible, bool) @@ -378,6 +382,24 @@ def _update_encryption_details_button(self) -> None: def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') + if encryption == 'OMEMO': + if contact.is_groupchat: + open_window('GroupchatDetails', + contact=contact, + page='encryption-omemo') + return + + if isinstance(contact, BareContact) and contact.is_self: + window = open_window('AccountsWindow') + window.select_account(contact.account, page='encryption-omemo') + return + + open_window('ContactInfo', + account=contact.account, + contact=contact, + page='encryption-omemo') + return + app.plugin_manager.extension_point( f'encryption_dialog{encryption}', app.window.get_control()) ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -0,0 +1,533 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# OMEMO Gajim Plugin is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# OMEMO Gajim Plugin is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import cast +from typing import Optional +from typing import Union + +import os +import time +import locale +import logging +import tempfile +from packaging.version import Version as V + +from pkg_resources import get_distribution + +from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore + +from nbxmpp.protocol import JID + +from gi.repository import Gtk +from gi.repository import GdkPixbuf + +from gajim.common import app +from gajim.common import ged +from gajim.common import types +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisconnected +from gajim.common.i18n import _ +from gajim.common.ged import EventHelper +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.omemobackend.util import Trust +from gajim.common.modules.omemobackend.util import IdentityKeyExtended +from gajim.common.modules.omemobackend.util import get_fingerprint + +from .builder import get_builder +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton +from .util import open_window + +log = logging.getLogger('gajim.gui.omemo_trust_dialog') + + +TRUST_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Not Decided'), + 'warning-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color') +} + + +class OMEMOTrustManager(Gtk.Box, EventHelper): + def __init__(self, + account: str, + contact: Optional[types.ChatContactT] = None + ) -> None: + + Gtk.Box.__init__(self) + EventHelper.__init__(self) + + self._account = account + self._contact = contact + + self._ui = get_builder('omemo_trust_manager.ui') + self.add(self._ui.stack) + + self._ui.list.set_filter_func(self._filter_func, None) + self._ui.list.set_sort_func(self._sort_func, None) + + self._ui.connect_signals(self) + + self.connect('destroy', self._on_destroy) + self.show_all() + + self.register_events([ + ('account-connected', ged.GUI2, self._on_account_state), + ('account-disconnected', ged.GUI2, self._on_account_state) + ]) + + if not app.account_is_connected(account): + self._ui.stack.set_visible_child_name('no-connection') + return + + self._update() + + def _update(self) -> None: + client = app.get_client(self._account) + if self._contact is None: + self._contact = client.get_module('Contacts').get_contact( + client.get_own_jid().bare) + + if isinstance(self._contact, BareContact) and self._contact.is_self: + header_text = _('Other devices connected with your account') + popover_qr_text = _('Compare this code with the one shown on your ' + 'contact’s screen to ensure the safety of ' + 'your end-to-end encrypted chat.') + else: + header_text = _('Devices connected with %s') % self._contact.name + popover_qr_text = _('Compare this code with the one shown on your ' + 'contact’s screen to ensure the safety of ' + 'your end-to-end encrypted chat ' + 'with %s.') % self._contact.name + + self._ui.list_heading.set_text(header_text) + self._ui.comparing_instructions.set_text(popover_qr_text) + + self._omemo = client.get_module('OMEMO') + + self._identity_key = cast( + IdentityKeyPair, self._omemo.backend.storage.getIdentityKeyPair()) + our_fpr_formatted = get_fingerprint(self._identity_key, formatted=True) + self._ui.our_fingerprint_1.set_text(our_fpr_formatted) + self._ui.our_fingerprint_2.set_text(our_fpr_formatted) + + self.update() + self._load_qrcode() + + def update(self) -> None: + assert self._contact is not None + self._ui.list.foreach(self._ui.list.remove) + + if isinstance(self._contact, BareContact) and self._contact.is_self: + self._ui.clear_devices_button.show() + self._ui.list_heading_box.set_halign(Gtk.Align.START) + else: + self._ui.manage_trust_button.show() + if self._contact.is_groupchat: + self._ui.search_button.show() + + self._load_fingerprints(self._contact) + + def _on_destroy(self, *args: Any) -> None: + app.check_finalize(self) + + def _on_account_state(self, + event: Union[AccountConnected, AccountDisconnected] + ) -> None: + + if isinstance(event, AccountConnected): + self._update() + self._ui.stack.set_visible_child_name('manage-keys') + else: + self._ui.stack.set_visible_child_name('no-connection') + + def _filter_func(self, row: KeyRow, _user_data: Any) -> bool: + search_text = self._ui.search.get_text() + if search_text and search_text.lower() not in str(row.jid): + return False + if self._ui.show_inactive_switch.get_active(): + return True + return row.active + + @staticmethod + def _sort_func(row1: KeyRow, row2: KeyRow, _user_data: Any) -> int: + result = locale.strcoll(str(row1.jid), str(row2.jid)) + if result != 0: + return result + + if row1.active != row2.active: + return -1 if row1.active else 1 + + if row1.trust != row2.trust: + return -1 if row1.trust > row2.trust else 1 + return 0 + + def _on_search_changed(self, _entry: Gtk.SearchEntry) -> None: + self._ui.list.invalidate_filter() + + def _load_fingerprints(self, contact: types.ChatContactT) -> None: + if contact.is_groupchat: + members = list(self._omemo.backend.get_muc_members( + str(contact.jid))) + sessions = self._omemo.backend.storage.getSessionsFromJids(members) + results = self._omemo.backend.storage.getMucFingerprints(members) + else: + sessions = self._omemo.backend.storage.getSessionsFromJid( + str(contact.jid)) + results = self._omemo.backend.storage.getFingerprints( + str(contact.jid)) + + rows: dict[IdentityKeyExtended, KeyRow] = {} + for result in results: + rows[result.public_key] = KeyRow(contact, + result.recipient_id, + result.public_key, + result.trust, + result.timestamp) + + for item in sessions: + if item.record.isFresh(): + return + identity_key = item.record.getSessionState().getRemoteIdentityKey() + identity_key = IdentityKeyExtended(identity_key.getPublicKey()) + try: + key_row = rows[identity_key] + except KeyError: + log.warning('Could not find session identitykey %s', + item.device_id) + self._omemo.backend.storage.deleteSession(item.recipient_id, + item.device_id) + continue + + key_row.active = item.active + key_row.device_id = item.device_id + + for row in rows.values(): + self._ui.list.add(row) + + @staticmethod + def _get_qrcode(jid: str, sid: int, identity_key: IdentityKeyPair) -> str: + fingerprint = get_fingerprint(identity_key) + path = os.path.join(tempfile.gettempdir(), + 'omemo_{}.png'.format(jid)) + + ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint) + log.debug('Verification String: %s', ver_string) + + import qrcode + qr = qrcode.QRCode(version=None, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=6, + border=4) + qr.add_data(ver_string) + qr.make(fit=True) + + fill_color = 'black' + back_color = 'white' + if V(get_distribution('qrcode').version) < V('6.0'): + # meaning of fill_color and back_color were switched + # before this commit in qrcode between versions 5.3 + # and 6.0: https://github.com/lincolnloop/python-qrcode/ + # commit/01f440d64b7d1f61bb75161ce118b86eca85b15c + back_color, fill_color = fill_color, back_color + + img = qr.make_image(fill_color=fill_color, back_color=back_color) + img.save(path) + return path + + def _load_qrcode(self) -> None: + try: + client = app.get_client(self._account) + path = self._get_qrcode(client.get_own_jid().bare, + self._omemo.backend.own_device, + self._identity_key) + except ImportError: + log.exception('Failed to generate QR code') + self._ui.qr_code_image.hide() + self._ui.qr_dependency_missing.show() + else: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) + self._ui.qr_code_image.set_from_pixbuf(pixbuf) + self._ui.qr_code_image.show() + self._ui.qr_dependency_missing.hide() + + def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: + self._ui.list.invalidate_filter() + + def _on_clear_devices_clicked(self, _button: Gtk.Button) -> None: + def _clear(): + self._omemo.clear_devicelist() + + window = self.get_window() + assert isinstance(window, Gtk.Window) + + ConfirmationDialog( + _('Clear Devices'), + _('Clear Devices Now?'), + _('This will clear the devices store for your account.'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Clear Devices'), + callback=_clear)], + transient_for=window).show() + + def _on_manage_trust_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None + window = open_window('AccountsWindow') + window.select_account(self._contact.account, 'encryption-omemo') + + +class KeyRow(Gtk.ListBoxRow): + def __init__(self, + contact: types.ChatContactT, + jid: JID, + identity_key: IdentityKeyExtended, + trust: Trust, + last_seen: Optional[float] + ) -> None: + + Gtk.ListBoxRow.__init__(self) + self.set_activatable(False) + + self._active = False + self._device_id: Optional[int] = None + self._identity_key = identity_key + self.trust = trust + self.jid = jid + + client = app.get_client(contact.account) + self._omemo = client.get_module('OMEMO') + + grid = Gtk.Grid() + grid.set_column_spacing(12) + + self._trust_button = TrustButton(self) + grid.attach(self._trust_button, 1, 1, 1, 3) + + self.fingerprint = Gtk.Label( + label=self._identity_key.get_fingerprint(formatted=True)) + self.fingerprint.get_style_context().add_class('omemo-mono') + self.fingerprint.get_style_context().add_class('omemo-inactive-color') + self.fingerprint.set_selectable(True) + self.fingerprint.set_halign(Gtk.Align.START) + self.fingerprint.set_valign(Gtk.Align.START) + self.fingerprint.set_hexpand(True) + grid.attach(self.fingerprint, 2, 1, 1, 1) + + if last_seen is not None: + last_seen_str = time.strftime('%d-%m-%Y %H:%M:%S', + time.localtime(last_seen)) + else: + last_seen_str = _('Never') + last_seen_label = Gtk.Label(label=_('Last seen: %s') % last_seen_str) + last_seen_label.set_halign(Gtk.Align.START) + last_seen_label.set_valign(Gtk.Align.START) + last_seen_label.set_hexpand(True) + last_seen_label.get_style_context().add_class('small-label') + last_seen_label.get_style_context().add_class('dim-label') + grid.attach(last_seen_label, 2, 3, 1, 1) + + self.add(grid) + self.show_all() + + def delete_fingerprint(self, *args: Any) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + window = cast(Gtk.Window, listbox.get_window()) + + def _remove(): + self._omemo.backend.remove_device(str(self.jid), self.device_id) + self._omemo.backend.storage.deleteSession( + str(self.jid), self.device_id) + self._omemo.backend.storage.deleteIdentity( + str(self.jid), self._identity_key) + + listbox.remove(self) + self.destroy() + + ConfirmationDialog( + _('Delete'), + _('Delete Fingerprint'), + _('Doing so will permanently delete this Fingerprint'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('Delete'), + callback=_remove)], + transient_for=window).show() + + def set_trust(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self.trust] + image = cast(Gtk.Image, self._trust_button.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().add_class(css_class) + image.set_tooltip_text(tooltip) + + self._omemo.backend.storage.setTrust( + str(self.jid), self._identity_key, self.trust) + + @property + def active(self) -> bool: + return self._active + + @active.setter + def active(self, active: bool) -> None: + context = self.fingerprint.get_style_context() + self._active = bool(active) + if self._active: + context.remove_class('omemo-inactive-color') + else: + context.add_class('omemo-inactive-color') + self._trust_button.update() + + @property + def device_id(self) -> Optional[int]: + return self._device_id + + @device_id.setter + def device_id(self, device_id: int) -> None: + self._device_id = device_id + + +class TrustButton(Gtk.MenuButton): + def __init__(self, row: KeyRow) -> None: + Gtk.MenuButton.__init__(self) + self._row = row + self._css_class = '' + self.set_popover(TrustPopver(row)) + self.set_valign(Gtk.Align.CENTER) + self.update() + + def update(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self._row.trust] + image = cast(Gtk.Image, self.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().remove_class(self._css_class) + + if not self._row.active: + css_class = 'omemo-inactive-color' + tooltip = '%s - %s' % (_('Inactive'), tooltip) + + image.get_style_context().add_class(css_class) + self._css_class = css_class + self.set_tooltip_text(tooltip) + + +class TrustPopver(Gtk.Popover): + def __init__(self, row: KeyRow) -> None: + Gtk.Popover.__init__(self) + self._row = row + self._listbox = Gtk.ListBox() + self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.update() + self.add(self._listbox) + self._listbox.show_all() + self._listbox.connect('row-activated', self._activated) + self.get_style_context().add_class('omemo-trust-popover') + + def _activated(self, _listbox: Gtk.ListBox, row: MenuOption) -> None: + self.popdown() + if row.type_ is None: + self._row.delete_fingerprint() + else: + self._row.trust = row.type_ + self._row.set_trust() + trust_button = cast(TrustButton, self.get_relative_to()) + trust_button.update() + self.update() + + def update(self) -> None: + self._listbox.foreach(self._listbox.remove) + if self._row.trust != Trust.VERIFIED: + self._listbox.add(VerifiedOption()) + if self._row.trust != Trust.BLIND: + self._listbox.add(BlindOption()) + if self._row.trust != Trust.UNTRUSTED: + self._listbox.add(NotTrustedOption()) + self._listbox.add(DeleteOption()) + + +class MenuOption(Gtk.ListBoxRow): + def __init__(self, + icon: str, + label_text: str, + color: str, + type_: Optional[Trust] = None + ) -> None: + + Gtk.ListBoxRow.__init__(self) + + self.type_ = type_ + self.icon = icon + self.label = label_text + self.color = color + + box = Gtk.Box() + box.set_spacing(6) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + label = Gtk.Label(label=label_text) + image.get_style_context().add_class(color) + + box.add(image) + box.add(label) + self.add(box) + self.show_all() + + +class BlindOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color', + Trust.BLIND) + + +class VerifiedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-high-symbolic', + _('Verified'), + 'encrypted-color', + Trust.VERIFIED) + + +class NotTrustedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'dialog-error-symbolic', + _('Untrusted'), + 'error-color', + Trust.UNTRUSTED) + + +class DeleteOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'user-trash-symbolic', + _('Delete'), + '') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17611a75aa328dc7b2a6a6ec38a0a0bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17611a75aa328dc7b2a6a6ec38a0a0bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] new: Add OMEMOTrustManager
by Daniel Brötzmann (＠wurstsalat) 17 Oct '22

17 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: f4c51a34 by wurstsalat at 2022-10-18T00:45:00+02:00 new: Add OMEMOTrustManager - - - - - 12 changed files: - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_details.py - gajim/gtk/message_actions_box.py - + gajim/gtk/omemo_trust_manager.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -725,6 +725,39 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="encryption_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="encryption_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> + <property name="margin-top">36</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="name">encryption-omemo</property> + <property name="title" translatable="yes">Encryption (OMEMO)</property> + <property name="icon-name">channel-secure-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="groups_page_box"> <property name="visible">True</property> @@ -873,7 +906,7 @@ <property name="name">groups</property> <property name="title" translatable="yes">Groups</property> <property name="icon-name">view-pin-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -934,7 +967,7 @@ <property name="name">notes</property> <property name="title" translatable="yes">Notes</property> <property name="icon-name">x-office-address-book-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -1004,7 +1037,7 @@ <property name="name">devices</property> <property name="title" translatable="yes">Devices</property> <property name="icon-name">computer-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <style> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/>  @@ -129,6 +129,39 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkScrolledWindow" id="encryption_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox" id="encryption_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-start">36</property> + <property name="margin-end">36</property> + <property name="margin-top">36</property> + <property name="margin-bottom">36</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="name">encryption-omemo</property> + <property name="title" translatable="yes">Encryption (OMEMO)</property> + <property name="icon-name">channel-secure-symbolic</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="manage_box"> <property name="visible">True</property> @@ -151,7 +184,7 @@ <property name="name">manage</property> <property name="title" translatable="yes">Manage</property> <property name="icon-name">preferences-other-symbolic</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child> @@ -170,7 +203,7 @@ <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -189,7 +222,7 @@ <property name="name">outcasts</property> <property name="title" translatable="yes">Outcasts</property> <property name="icon-name">system-users-symbolic</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <child> @@ -205,7 +238,7 @@ <property name="name">config</property> <property name="title" translatable="yes">Configuration</property> <property name="icon-name">document-properties-symbolic</property> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> <style> ===================================== gajim/data/gui/omemo_trust_manager.ui ===================================== @@ -0,0 +1,416 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkPopover" id="search_popover"> + <property name="can-focus">False</property> + <child> + <object class="GtkSearchEntry" id="search"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="caps-lock-warning">False</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <signal name="search-changed" handler="_on_search_changed" swapped="no"/> + </object> + </child> + </object> + <object class="GtkPopover" id="qr_code_popover"> + <property name="can-focus">False</property> + <property name="relative-to">qr_menu_button</property> + <property name="constrain-to">none</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">This Device</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="comparing_instructions"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">13</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="our_fingerprint_2"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <style> + <class name="fingerprint"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkImage" id="qr_code_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="qr_dependency_missing"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">For verification via QR-Code you have to install <tt>python-qrcode</tt>.</property> + <property name="use-markup">True</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + </child> + </object> + <object class="GtkStack" id="stack"> + <property name="width-request">400</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">crossfade</property> + <property name="interpolate-size">True</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">This Device</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkListBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="selectable">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Fingerprint for this Device</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="our_fingerprint_1"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selectable">True</property> + <property name="xalign">0</property> + <style> + <class name="fingerprint"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="qr_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Scan QR Code</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="direction">up</property> + <property name="popover">qr_code_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">qr-code-scan</property> + </object> + </child> + <style> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="manage_trust_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Manage your Devices…</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_manage_trust_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">channel-secure-symbolic</property> + </object> + </child> + <style> + <class name="image-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="settings-box"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="list_heading"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <property name="xalign">0</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkBox" id="list_heading_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkSwitch" id="show_inactive_switch"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="valign">center</property> + <signal name="notify::active" handler="_on_show_inactive" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Show Inactive Devices</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="search_button"> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Search…</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="popover">search_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-find-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkListBox" id="list"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="clear_devices_button"> + <property name="label" translatable="yes">Clear Devices…</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_clear_devices_clicked" swapped="no"/> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <style> + <class name="omemo-trust-manager"/> + </style> + </object> + <packing> + <property name="name">manage-keys</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Account is not connected.</property> + <property name="wrap">True</property> + <property name="max-width-chars">42</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="name">no-connection</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg ===================================== @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + width="296" + height="296" + viewBox="0 0 296 296" + version="1.1" + id="svg879" + sodipodi:docname="qr-code-scan.svg" + xml:space="preserve" + inkscape:version="1.2.1 (9c6d41e410, 2022-07-14, custom)" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview + id="namedview881" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:showpageshadow="2" + inkscape:pageopacity="0.0" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1" + showgrid="false" + inkscape:zoom="1.1820013" + inkscape:cx="-30.033808" + inkscape:cy="205.58353" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg879" /><defs + id="defs5"><rect + id="p" + width="8" + height="8" /></defs><g + id="g3488" + transform="matrix(1.1697246,0,0,1.1697246,-27.551074,-25.261865)"><path + style="fill:#000000;stroke-width:0.476103" + d="M 251.48889,66.946387 V 46.712014 H 231.25452 211.02015 V 36.475802 26.23959 h 21.16314 c 22.41235,0 24.39388,0.156166 28.55025,2.250069 3.06508,1.544132 6.94528,5.251442 8.51507,8.135659 2.59204,4.762428 2.71271,6.062675 2.71271,29.230841 V 87.18076 h -10.23621 -10.23622 z" + id="path3464" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 28.196638,66.017616 c 0,-22.412343 0.156166,-24.393876 2.250069,-28.550247 1.544132,-3.065083 5.251442,-6.945286 8.135659,-8.515074 4.762428,-2.592038 6.062675,-2.712705 29.230841,-2.712705 H 89.137808 V 36.475802 46.712014 H 68.903435 48.669062 V 66.946387 87.18076 H 38.43285 28.196638 Z" + id="path3462" /><path + style="fill:#000000;stroke-width:0.476103" + d="M 170.5514,97.175398 V 66.701287 l 30.35156,0.12255 30.35156,0.12255 0.12255,30.351559 0.12255,30.351564 H 201.02551 170.5514 Z m 40.46875,0.241574 V 87.18076 h -10.23621 -10.23622 v 9.918809 c 0,5.455351 0.14283,10.061641 0.31741,10.236211 0.17457,0.17457 4.78086,0.3174 10.23621,0.3174 h 9.91881 z" + id="path3460" /><path + style="fill:#000000;stroke-width:0.476103" + d="M 140.08082,107.41513 V 87.18076 h 9.99816 9.99816 v 20.23437 20.23438 h -9.99816 -9.99816 z" + id="path3458" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.780885,97.297946 0.12255,-30.351559 30.351559,-0.12255 30.351556,-0.12255 V 97.175398 127.64951 H 99.132446 68.658335 Z m 40.719795,0 0.12849,-10.117186 H 99.38349 89.137808 v 10.245682 10.245678 l 10.117186,-0.12849 10.117186,-0.1285 z" + id="path3456" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.665384,148.12193 v -9.99816 h 10.236212 10.236212 v 9.99816 9.99816 H 78.901596 68.665384 Z" + id="path3454" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 139.97126,168.47533 -0.12849,-10.11719 -10.11719,-0.12849 -30.662081,-0.28013 v -9.98869 -9.98869 l 40.779271,0.15163 h 20.23437 v 20.23437 20.23437 h -9.98869 -9.98869 z" + id="path3452" + sodipodi:nodetypes="ccccccccccccc" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 211.02015,193.82781 v -15.2353 h -10.23621 -10.23622 v 15.2353 15.23529 h 10.23622 10.23621 z" + id="path3474" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 140.08082,209.0631 v -20.47242 h 15.23529 15.23529 v -4.99908 -4.99909 h 9.99816 9.99816 V 168.3563 158.12009 h -9.99816 -9.99816 v -9.99816 -9.99816 h 9.99816 9.99816 v 9.99816 9.99816 h 10.23622 10.23621 v -9.99816 -9.99816 h 10.23621 10.23621 v 9.99816 9.99816 h -10.23621 -10.23621 v 10.23621 10.23621 h 10.23621 10.23621 v 15.2353 15.23529 h -10.23621 -10.23621 v 10.24568 10.24568 l -10.11719,-0.12849 -10.11718,-0.1285 -0.1285,-10.11718 -0.1285,-10.11719 h -15.22582 -15.22582 v 10.23621 10.23621 h -9.99816 -9.99816 z" + id="path3450" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 68.982786,229.21812 c -0.174571,-0.17457 -0.317402,-13.88633 -0.317402,-30.47058 v -30.15319 h 30.470585 30.470581 v 30.47059 30.47058 H 99.453372 c -16.584254,0 -30.296015,-0.14283 -30.470586,-0.3174 z m 40.517894,-30.27221 -0.1285,-10.11718 -10.117186,-0.1285 -10.117186,-0.12849 v 10.24568 10.24568 h 10.245682 10.24568 z" + id="path3448" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 211.02015,259.76806 v -10.23621 h 20.23437 20.23437 V 229.29747 209.0631 h 10.23622 10.23621 v 21.3246 c 0,23.16817 -0.12067,24.46841 -2.71271,29.23084 -1.56979,2.88422 -5.44999,6.59153 -8.51507,8.13566 -4.15637,2.0939 -6.1379,2.25007 -28.55025,2.25007 h -21.16314 z" + id="path3446" /><path + style="fill:#000000;stroke-width:0.476103" + d="m 43.551277,269.26862 c -1.374571,-0.37014 -3.39419,-1.12956 -4.488044,-1.6876 -2.760243,-1.40817 -6.658458,-5.21488 -8.15389,-7.96248 -2.592038,-4.76243 -2.712705,-6.06267 -2.712705,-29.23084 V 209.0631 H 38.43285 48.669062 v 20.23437 20.23438 h 20.234373 20.234373 v 10.23621 10.23621 l -21.543656,-0.0313 c -16.989841,-0.0247 -22.071931,-0.17358 -24.042875,-0.70431 z" + id="path3346" /></g></svg> ===================================== gajim/data/style/gajim.css ===================================== @@ -577,7 +577,7 @@ list.settings > row:not(:last-child) { } list.settings row { min-height: 52px; } list.settings > row > box { - margin: 6px 18px; + margin: 10px 20px 10px 10px; } /* Settings Window */ @@ -625,7 +625,7 @@ #SendFileDialog grid list > row { padding: 10px 20px 10px 10px; } /* Accounts Window */ .accounts-menu { border-right: 1px solid; border-color: @borders;} .accounts-settings-border {border: 1px solid; border-color: @borders;} -.accounts-settings stack > box { margin:30px; } +.accounts-settings stack > box.settings-page { margin:30px; } .accounts-label-row { padding-top: 10px; padding-bottom: 10px; @@ -766,6 +766,8 @@ .large-header { font-size: 1.75rem; font-weight: bold; } +.monospace { font-family: monospace; } + .insensitive-fg-color {color: @insensitive_fg_color;} /* Padding/Margins */ @@ -799,6 +801,28 @@ .selected-color { color: @theme_selected_bg_color; } .encrypted-color { color: rgb(75, 181, 67); } .unencrypted-color { color: @error_color; } +/* OMEMO */ +.fingerprint { + color: @insensitive_fg_color; + font-family: monospace; + font-size: 90%; +} +.omemo-inactive-color { color: @insensitive_fg_color; } + +.omemo-trust-manager list row { + border-bottom: 1px solid; + border-color: @unfocused_borders; + padding: 10px 20px 10px 10px; +} +.omemo-trust-manager list row:last-child { border-bottom: 0px} +.omemo-trust-manager list { + border: 1px solid; + border-color:@unfocused_borders; +} +.omemo-trust-manager list > row { outline: none; } + +.omemo-trust-popover row { padding: 10px 15px 10px 10px; } + /*Receipts*/ .receipt-received-color { color: rgb(75, 181, 67); } ===================================== gajim/gtk/accounts.py ===================================== @@ -40,6 +40,7 @@ from .const import Setting from .const import SettingKind from .const import SettingType +from .omemo_trust_manager import OMEMOTrustManager from .settings import SettingsDialog from .settings import SettingsBox from .settings import PopoverSetting @@ -317,6 +318,7 @@ def __init__(self, account: str) -> None: self.add(BackMenuItem()) self.add(PageMenuItem('general', _('General'))) self.add(PageMenuItem('privacy', _('Privacy'))) + self.add(PageMenuItem('encryption', _('Encryption (OMEMO)'))) self.add(PageMenuItem('connection', _('Connection'))) self.add(PageMenuItem('advanced', _('Advanced'))) self.add(RemoveMenuItem()) @@ -411,6 +413,8 @@ def __init__(self, name: str, label: str) -> None: icon = 'preferences-system-symbolic' elif name == 'privacy': icon = 'preferences-system-privacy-symbolic' + elif name == 'encryption': + icon = 'channel-secure-symbolic' elif name == 'connection': icon = 'preferences-system-network-symbolic' elif name == 'advanced': @@ -436,8 +440,9 @@ def __init__(self, self._settings = settings self._settings.add_page(GeneralPage(account)) - self._settings.add_page(ConnectionPage(account)) self._settings.add_page(PrivacyPage(account)) + self._settings.add_page(EncryptionPage(account)) + self._settings.add_page(ConnectionPage(account)) self._settings.add_page(AdvancedPage(account)) self._account_row = AccountRow(account) @@ -616,6 +621,7 @@ def __init__(self, account: str, settings: list[Setting]) -> None: Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL, spacing=12) self.set_valign(Gtk.Align.START) self.set_vexpand(True) + self.get_style_context().add_class('settings-page') self.account = account self.listbox = SettingsBox(account) @@ -891,6 +897,40 @@ def _reset_send_read_marker(self, button: Gtk.Button) -> None: 'send_marker', None, context='private') +class EncryptionPage(GenericSettingPage): + + name = 'encryption' + + def __init__(self, account: str) -> None: + settings = [ + Setting(SettingKind.SWITCH, + _('Blind Trust'), + SettingType.ACCOUNT_CONFIG, + 'omemo_blind_trust', + desc=_('Blindly trust new devices until you verify them')) + ] + GenericSettingPage.__init__(self, account, settings) + + heading = Gtk.Label(label=_('Trust Management')) + heading.get_style_context().add_class('bold') + heading.set_xalign(0) + self.add(heading) + + btbv_label = Gtk.Label() + btbv_label.set_xalign(0) + markup = '<a href="%s">%s</a>' % ( + 'https://dev.gajim.org/gajim/gajim-plugins/-/' + 'wikis/omemogajimplugin', + _('Read more about blind trust')) + btbv_label.set_markup(markup) + self.add(btbv_label) + + omemo_trust_manager = OMEMOTrustManager(account) + omemo_trust_manager.set_margin_top(18) + self.pack_end(omemo_trust_manager, True, True, 0) + self.reorder_child(omemo_trust_manager, 0) + + class ConnectionPage(GenericSettingPage): name = 'connection' ===================================== gajim/gtk/builder.pyi ===================================== @@ -283,6 +283,8 @@ class ContactInfoBuilder(Builder): to_subscription_button: Gtk.Button contact_settings_box: Gtk.Box remove_history_button: Gtk.Button + encryption_scrolled: Gtk.ScrolledWindow + encryption_box: Gtk.Box groups_page_box: Gtk.Box groups_treeview: Gtk.TreeView tree_selection: Gtk.TreeSelection @@ -412,6 +414,8 @@ class GroupchatDetailsBuilder(Builder): main_stack: Gtk.Stack info_box: Gtk.Box settings_box: Gtk.Box + encryption_scrolled: Gtk.ScrolledWindow + encryption_box: Gtk.Box manage_box: Gtk.Box affiliation_box: Gtk.Box outcasts_box: Gtk.Box @@ -589,6 +593,26 @@ class MessageActionsBoxBuilder(Builder): input_scrolled: Gtk.ScrolledWindow +class OmemoTrustManagerBuilder(Builder): + search_popover: Gtk.Popover + search: Gtk.SearchEntry + qr_code_popover: Gtk.Popover + comparing_instructions: Gtk.Label + our_fingerprint_2: Gtk.Label + qr_code_image: Gtk.Image + qr_dependency_missing: Gtk.Label + stack: Gtk.Stack + our_fingerprint_1: Gtk.Label + qr_menu_button: Gtk.MenuButton + manage_trust_button: Gtk.Button + list_heading: Gtk.Label + list_heading_box: Gtk.Box + show_inactive_switch: Gtk.Switch + search_button: Gtk.MenuButton + list: Gtk.ListBox + clear_devices_button: Gtk.Button + + class PasswordDialogBuilder(Builder): pass_box: Gtk.Box header: Gtk.Label @@ -649,6 +673,7 @@ class PreferencesBuilder(Builder): stack: Gtk.Stack window_behaviour: Gtk.Grid plugins: Gtk.Grid + general: Gtk.Grid chats: Gtk.Grid group_chats: Gtk.Grid file_preview: Gtk.Grid @@ -1016,6 +1041,8 @@ def get_builder(file_name: Literal['manage_sounds.ui'], widgets: list[str] = ... @overload def get_builder(file_name: Literal['message_actions_box.ui'], widgets: list[str] = ...) -> MessageActionsBoxBuilder: ... @overload +def get_builder(file_name: Literal['omemo_trust_manager.ui'], widgets: list[str] = ...) -> OmemoTrustManagerBuilder: ... +@overload def get_builder(file_name: Literal['password_dialog.ui'], widgets: list[str] = ...) -> PasswordDialogBuilder: ... @overload def get_builder(file_name: Literal['pep_config.ui'], widgets: list[str] = ...) -> PepConfigBuilder: ... ===================================== gajim/gtk/chat_stack.py ===================================== @@ -718,7 +718,7 @@ def _on_send_message(self) -> None: assert contact is not None encryption = contact.settings.get('encryption') - if encryption: + if encryption and encryption != 'OMEMO': if encryption not in app.plugin_manager.encryption_plugins: ErrorDialog(_('Encryption error'), _('Missing necessary encryption plugin')) ===================================== gajim/gtk/contact_info.py ===================================== @@ -49,6 +49,7 @@ from .contact_settings import ContactSettings from .dialogs import ConfirmationDialog from .dialogs import DialogButton +from .omemo_trust_manager import OMEMOTrustManager from .sidebar_switcher import SideBarSwitcher from .builder import get_builder from .util import connect_destroy @@ -109,6 +110,7 @@ def __init__(self, if isinstance(self.contact, BareContact): self._fill_settings_page(self.contact) + self._fill_encryption_page(self.contact) self._fill_device_info(self.contact) self._fill_groups_page(self.contact) self._fill_note_page(self.contact) @@ -120,7 +122,6 @@ def __init__(self, self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) - # pylint: disable=line-too-long connect_destroy(self._ui.tree_selection, 'changed', self._on_group_selection_changed) connect_destroy(self._ui.toggle_renderer, @@ -134,7 +135,6 @@ def __init__(self, ('unsubscribed-presence-received', ged.GUI1, self._on_unsubscribed_presence_received), ]) - # pylint: enable=line-too-long self.add(self._ui.main_grid) self.show_all() @@ -185,6 +185,11 @@ def _fill_information_page(self, contact: ContactT) -> None: self._switcher.set_row_visible('information', True) + def _fill_encryption_page(self, contact: ContactT) -> None: + self._ui.encryption_box.add( + OMEMOTrustManager(self.contact.account, self.contact)) + self._switcher.set_row_visible('encryption-omemo', True) + def _fill_note_page(self, contact: BareContact) -> None: if not contact.is_in_roster: return ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -34,6 +34,7 @@ from .groupchat_config import GroupchatConfig from .groupchat_manage import GroupchatManage from .groupchat_settings import GroupChatSettings +from .omemo_trust_manager import OMEMOTrustManager from .sidebar_switcher import SideBarSwitcher from .structs import RemoveHistoryActionParams @@ -71,6 +72,7 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() + self._add_groupchat_encryption() self._add_groupchat_manage() self._add_affiliations() self._add_outcasts() @@ -173,6 +175,10 @@ def _add_groupchat_settings(self) -> None: self._ui.settings_box.add(scrolled_window) + def _add_groupchat_encryption(self) -> None: + self._ui.encryption_box.add( + OMEMOTrustManager(self._contact.account, self._contact)) + def _add_affiliations(self) -> None: affiliations = GroupchatAffiliation(self._client, self._contact) self._ui.affiliation_box.add(affiliations) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -42,6 +42,7 @@ from gajim.common.client import Client from gajim.common.const import SimpleClientState from gajim.common.const import Direction +from gajim.common.modules.contacts import BareContact from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.types import ChatContactT @@ -59,7 +60,7 @@ from .menus import get_self_contact_menu from .menus import get_singlechat_menu from .message_input import MessageInputTextView - +from .util import open_window log = logging.getLogger('gajim.gui.messageactionsbox') @@ -297,7 +298,7 @@ def _change_encryption(self, if current_state == new_state: return - if new_state: + if new_state and new_state != 'OMEMO': plugin = app.plugin_manager.encryption_plugins.get(new_state) if plugin is None: # TODO: Add GUI error here @@ -353,6 +354,9 @@ def _update_encryption_details_button(self) -> None: app.window.get_control(), encryption_state) + if state == 'OMEMO': + encryption_state['authenticated'] = True + visible, enc_type, authenticated = encryption_state.values() assert isinstance(visible, bool) @@ -378,6 +382,24 @@ def _update_encryption_details_button(self) -> None: def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: contact = self.get_current_contact() encryption = contact.settings.get('encryption') + if encryption == 'OMEMO': + if contact.is_groupchat: + open_window('GroupchatDetails', + contact=contact, + page='encryption-omemo') + return + + if isinstance(contact, BareContact) and contact.is_self: + window = open_window('AccountsWindow') + window.select_account(contact.account) + return + + open_window('ContactInfo', + account=contact.account, + contact=contact, + page='encryption-omemo') + return + app.plugin_manager.extension_point( f'encryption_dialog{encryption}', app.window.get_control()) ===================================== gajim/gtk/omemo_trust_manager.py ===================================== @@ -0,0 +1,533 @@ +# Copyright (C) 2019 Philipp Hörist <philipp AT hoerist.com> +# +# This file is part of Gajim. +# +# OMEMO Gajim Plugin is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# OMEMO Gajim Plugin is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with OMEMO Gajim Plugin. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import Any +from typing import cast +from typing import Optional +from typing import Union + +import os +import time +import locale +import logging +import tempfile +from packaging.version import Version as V + +from pkg_resources import get_distribution + +from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore + +from nbxmpp.protocol import JID + +from gi.repository import Gtk +from gi.repository import GdkPixbuf + +from gajim.common import app +from gajim.common import ged +from gajim.common import types +from gajim.common.events import AccountConnected +from gajim.common.events import AccountDisconnected +from gajim.common.i18n import _ +from gajim.common.ged import EventHelper +from gajim.common.modules.contacts import BareContact +from gajim.common.modules.omemobackend.util import Trust +from gajim.common.modules.omemobackend.util import IdentityKeyExtended +from gajim.common.modules.omemobackend.util import get_fingerprint + +from .builder import get_builder +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton +from .util import open_window + +log = logging.getLogger('gajim.gui.omemo_trust_dialog') + + +TRUST_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Not Decided'), + 'warning-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color') +} + + +class OMEMOTrustManager(Gtk.Box, EventHelper): + def __init__(self, + account: str, + contact: Optional[types.ChatContactT] = None + ) -> None: + + Gtk.Box.__init__(self) + EventHelper.__init__(self) + + self._account = account + self._contact = contact + + self._ui = get_builder('omemo_trust_manager.ui') + self.add(self._ui.stack) + + self._ui.list.set_filter_func(self._filter_func, None) + self._ui.list.set_sort_func(self._sort_func, None) + + self._ui.connect_signals(self) + + self.connect('destroy', self._on_destroy) + self.show_all() + + self.register_events([ + ('account-connected', ged.GUI2, self._on_account_state), + ('account-disconnected', ged.GUI2, self._on_account_state) + ]) + + if not app.account_is_connected(account): + self._ui.stack.set_visible_child_name('no-connection') + return + + self._update() + + def _update(self) -> None: + client = app.get_client(self._account) + if self._contact is None: + self._contact = client.get_module('Contacts').get_contact( + client.get_own_jid().bare) + + if isinstance(self._contact, BareContact) and self._contact.is_self: + header_text = _('Other devices connected with your account') + popover_qr_text = _('Compare this code with the one shown on your ' + 'contact’s screen to ensure the safety of ' + 'your end-to-end encrypted chat.') + else: + header_text = _('Devices connected with %s') % self._contact.name + popover_qr_text = _('Compare this code with the one shown on your ' + 'contact’s screen to ensure the safety of ' + 'your end-to-end encrypted chat ' + 'with %s.') % self._contact.name + + self._ui.list_heading.set_text(header_text) + self._ui.comparing_instructions.set_text(popover_qr_text) + + self._omemo = client.get_module('OMEMO') + + self._identity_key = cast( + IdentityKeyPair, self._omemo.backend.storage.getIdentityKeyPair()) + our_fpr_formatted = get_fingerprint(self._identity_key, formatted=True) + self._ui.our_fingerprint_1.set_text(our_fpr_formatted) + self._ui.our_fingerprint_2.set_text(our_fpr_formatted) + + self.update() + self._load_qrcode() + + def update(self) -> None: + assert self._contact is not None + self._ui.list.foreach(self._ui.list.remove) + + if isinstance(self._contact, BareContact) and self._contact.is_self: + self._ui.clear_devices_button.show() + self._ui.list_heading_box.set_halign(Gtk.Align.START) + else: + self._ui.manage_trust_button.show() + if self._contact.is_groupchat: + self._ui.search_button.show() + + self._load_fingerprints(self._contact) + + def _on_destroy(self, *args: Any) -> None: + app.check_finalize(self) + + def _on_account_state(self, + event: Union[AccountConnected, AccountDisconnected] + ) -> None: + + if isinstance(event, AccountConnected): + self._update() + self._ui.stack.set_visible_child_name('manage-keys') + else: + self._ui.stack.set_visible_child_name('no-connection') + + def _filter_func(self, row: KeyRow, _user_data: Any) -> bool: + search_text = self._ui.search.get_text() + if search_text and search_text.lower() not in str(row.jid): + return False + if self._ui.show_inactive_switch.get_active(): + return True + return row.active + + @staticmethod + def _sort_func(row1: KeyRow, row2: KeyRow, _user_data: Any) -> int: + result = locale.strcoll(str(row1.jid), str(row2.jid)) + if result != 0: + return result + + if row1.active != row2.active: + return -1 if row1.active else 1 + + if row1.trust != row2.trust: + return -1 if row1.trust > row2.trust else 1 + return 0 + + def _on_search_changed(self, _entry: Gtk.SearchEntry) -> None: + self._ui.list.invalidate_filter() + + def _load_fingerprints(self, contact: types.ChatContactT) -> None: + if contact.is_groupchat: + members = list(self._omemo.backend.get_muc_members( + str(contact.jid))) + sessions = self._omemo.backend.storage.getSessionsFromJids(members) + results = self._omemo.backend.storage.getMucFingerprints(members) + else: + sessions = self._omemo.backend.storage.getSessionsFromJid( + str(contact.jid)) + results = self._omemo.backend.storage.getFingerprints( + str(contact.jid)) + + rows: dict[IdentityKeyExtended, KeyRow] = {} + for result in results: + rows[result.public_key] = KeyRow(contact, + result.recipient_id, + result.public_key, + result.trust, + result.timestamp) + + for item in sessions: + if item.record.isFresh(): + return + identity_key = item.record.getSessionState().getRemoteIdentityKey() + identity_key = IdentityKeyExtended(identity_key.getPublicKey()) + try: + key_row = rows[identity_key] + except KeyError: + log.warning('Could not find session identitykey %s', + item.device_id) + self._omemo.backend.storage.deleteSession(item.recipient_id, + item.device_id) + continue + + key_row.active = item.active + key_row.device_id = item.device_id + + for row in rows.values(): + self._ui.list.add(row) + + @staticmethod + def _get_qrcode(jid: str, sid: int, identity_key: IdentityKeyPair) -> str: + fingerprint = get_fingerprint(identity_key) + path = os.path.join(tempfile.gettempdir(), + 'omemo_{}.png'.format(jid)) + + ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint) + log.debug('Verification String: %s', ver_string) + + import qrcode + qr = qrcode.QRCode(version=None, + error_correction=qrcode.constants.ERROR_CORRECT_L, + box_size=6, + border=4) + qr.add_data(ver_string) + qr.make(fit=True) + + fill_color = 'black' + back_color = 'white' + if V(get_distribution('qrcode').version) < V('6.0'): + # meaning of fill_color and back_color were switched + # before this commit in qrcode between versions 5.3 + # and 6.0: https://github.com/lincolnloop/python-qrcode/ + # commit/01f440d64b7d1f61bb75161ce118b86eca85b15c + back_color, fill_color = fill_color, back_color + + img = qr.make_image(fill_color=fill_color, back_color=back_color) + img.save(path) + return path + + def _load_qrcode(self) -> None: + try: + client = app.get_client(self._account) + path = self._get_qrcode(client.get_own_jid().bare, + self._omemo.backend.own_device, + self._identity_key) + except ImportError: + log.exception('Failed to generate QR code') + self._ui.qr_code_image.hide() + self._ui.qr_dependency_missing.show() + else: + pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) + self._ui.qr_code_image.set_from_pixbuf(pixbuf) + self._ui.qr_code_image.show() + self._ui.qr_dependency_missing.hide() + + def _on_show_inactive(self, switch: Gtk.Switch, _param: Any) -> None: + self._ui.list.invalidate_filter() + + def _on_clear_devices_clicked(self, _button: Gtk.Button) -> None: + def _clear(): + self._omemo.clear_devicelist() + + window = self.get_window() + assert isinstance(window, Gtk.Window) + + ConfirmationDialog( + _('Clear Devices'), + _('Clear Devices Now?'), + _('This will clear the devices store for your account.'), + [DialogButton.make('Cancel'), + DialogButton.make('Accept', + text=_('_Clear Devices'), + callback=_clear)], + transient_for=window).show() + + def _on_manage_trust_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None + window = open_window('AccountsWindow') + window.select_account(self._contact.account) + + +class KeyRow(Gtk.ListBoxRow): + def __init__(self, + contact: types.ChatContactT, + jid: JID, + identity_key: IdentityKeyExtended, + trust: Trust, + last_seen: Optional[float] + ) -> None: + + Gtk.ListBoxRow.__init__(self) + self.set_activatable(False) + + self._active = False + self._device_id: Optional[int] = None + self._identity_key = identity_key + self.trust = trust + self.jid = jid + + client = app.get_client(contact.account) + self._omemo = client.get_module('OMEMO') + + grid = Gtk.Grid() + grid.set_column_spacing(12) + + self._trust_button = TrustButton(self) + grid.attach(self._trust_button, 1, 1, 1, 3) + + self.fingerprint = Gtk.Label( + label=self._identity_key.get_fingerprint(formatted=True)) + self.fingerprint.get_style_context().add_class('omemo-mono') + self.fingerprint.get_style_context().add_class('omemo-inactive-color') + self.fingerprint.set_selectable(True) + self.fingerprint.set_halign(Gtk.Align.START) + self.fingerprint.set_valign(Gtk.Align.START) + self.fingerprint.set_hexpand(True) + grid.attach(self.fingerprint, 2, 1, 1, 1) + + if last_seen is not None: + last_seen_str = time.strftime('%d-%m-%Y %H:%M:%S', + time.localtime(last_seen)) + else: + last_seen_str = _('Never') + last_seen_label = Gtk.Label(label=_('Last seen: %s') % last_seen_str) + last_seen_label.set_halign(Gtk.Align.START) + last_seen_label.set_valign(Gtk.Align.START) + last_seen_label.set_hexpand(True) + last_seen_label.get_style_context().add_class('small-label') + last_seen_label.get_style_context().add_class('dim-label') + grid.attach(last_seen_label, 2, 3, 1, 1) + + self.add(grid) + self.show_all() + + def delete_fingerprint(self, *args: Any) -> None: + listbox = cast(Gtk.ListBox, self.get_parent()) + window = cast(Gtk.Window, listbox.get_window()) + + def _remove(): + self._omemo.backend.remove_device(str(self.jid), self.device_id) + self._omemo.backend.storage.deleteSession( + str(self.jid), self.device_id) + self._omemo.backend.storage.deleteIdentity( + str(self.jid), self._identity_key) + + listbox.remove(self) + self.destroy() + + ConfirmationDialog( + _('Delete'), + _('Delete Fingerprint'), + _('Doing so will permanently delete this Fingerprint'), + [DialogButton.make('Cancel'), + DialogButton.make('Remove', + text=_('Delete'), + callback=_remove)], + transient_for=window).show() + + def set_trust(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self.trust] + image = cast(Gtk.Image, self._trust_button.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().add_class(css_class) + image.set_tooltip_text(tooltip) + + self._omemo.backend.storage.setTrust( + str(self.jid), self._identity_key, self.trust) + + @property + def active(self) -> bool: + return self._active + + @active.setter + def active(self, active: bool) -> None: + context = self.fingerprint.get_style_context() + self._active = bool(active) + if self._active: + context.remove_class('omemo-inactive-color') + else: + context.add_class('omemo-inactive-color') + self._trust_button.update() + + @property + def device_id(self) -> Optional[int]: + return self._device_id + + @device_id.setter + def device_id(self, device_id: int) -> None: + self._device_id = device_id + + +class TrustButton(Gtk.MenuButton): + def __init__(self, row: KeyRow) -> None: + Gtk.MenuButton.__init__(self) + self._row = row + self._css_class = '' + self.set_popover(TrustPopver(row)) + self.set_valign(Gtk.Align.CENTER) + self.update() + + def update(self) -> None: + icon_name, tooltip, css_class = TRUST_DATA[self._row.trust] + image = cast(Gtk.Image, self.get_child()) + image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + image.get_style_context().remove_class(self._css_class) + + if not self._row.active: + css_class = 'omemo-inactive-color' + tooltip = '%s - %s' % (_('Inactive'), tooltip) + + image.get_style_context().add_class(css_class) + self._css_class = css_class + self.set_tooltip_text(tooltip) + + +class TrustPopver(Gtk.Popover): + def __init__(self, row: KeyRow) -> None: + Gtk.Popover.__init__(self) + self._row = row + self._listbox = Gtk.ListBox() + self._listbox.set_selection_mode(Gtk.SelectionMode.NONE) + self.update() + self.add(self._listbox) + self._listbox.show_all() + self._listbox.connect('row-activated', self._activated) + self.get_style_context().add_class('omemo-trust-popover') + + def _activated(self, _listbox: Gtk.ListBox, row: MenuOption) -> None: + self.popdown() + if row.type_ is None: + self._row.delete_fingerprint() + else: + self._row.trust = row.type_ + self._row.set_trust() + trust_button = cast(TrustButton, self.get_relative_to()) + trust_button.update() + self.update() + + def update(self) -> None: + self._listbox.foreach(self._listbox.remove) + if self._row.trust != Trust.VERIFIED: + self._listbox.add(VerifiedOption()) + if self._row.trust != Trust.BLIND: + self._listbox.add(BlindOption()) + if self._row.trust != Trust.UNTRUSTED: + self._listbox.add(NotTrustedOption()) + self._listbox.add(DeleteOption()) + + +class MenuOption(Gtk.ListBoxRow): + def __init__(self, + icon: str, + label_text: str, + color: str, + type_: Optional[Trust] = None + ) -> None: + + Gtk.ListBoxRow.__init__(self) + + self.type_ = type_ + self.icon = icon + self.label = label_text + self.color = color + + box = Gtk.Box() + box.set_spacing(6) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + label = Gtk.Label(label=label_text) + image.get_style_context().add_class(color) + + box.add(image) + box.add(label) + self.add(box) + self.show_all() + + +class BlindOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-medium-symbolic', + _('Blind Trust'), + 'encrypted-color', + Trust.BLIND) + + +class VerifiedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'security-high-symbolic', + _('Verified'), + 'encrypted-color', + Trust.VERIFIED) + + +class NotTrustedOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'dialog-error-symbolic', + _('Untrusted'), + 'error-color', + Trust.UNTRUSTED) + + +class DeleteOption(MenuOption): + def __init__(self) -> None: + MenuOption.__init__(self, + 'user-trash-symbolic', + _('Delete'), + '') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4c51a3435979ba740a58767be11fcc8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f4c51a3435979ba740a58767be11fcc8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 14 commits: new: Archive: Add new columns
by Daniel Brötzmann (＠wurstsalat) 17 Oct '22

17 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: 7aa38beb by Philipp Hörist at 2022-10-17T23:11:41+02:00 new: Archive: Add new columns - - - - - a4cff0e8 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Remove unused code We only use MAM for history - - - - - 6f5a03d5 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Remove unused code - - - - - 8c4ee941 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Simplify instances dict init - - - - - bf75eda4 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: AccountWizard: Save account color early - - - - - 2276c302 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Settings: Align default settings with account creation - - - - - 27a41e04 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Move account interface methods into Application - - - - - 7c5ad2dc by wurstsalat at 2022-10-17T23:35:16+02:00 fix: PreviewAudio: Increase update rate for seek bar Fixes #11215 - - - - - 4d544f07 by lovetox at 2022-10-17T23:49:25+02:00 Omemo Start - - - - - 3afb2632 by wurstsalat at 2022-10-17T23:49:25+02:00 cq: OMEMO: Add type annotations - - - - - 4f031f76 by wurstsalat at 2022-10-17T23:49:25+02:00 cq: Add type stubs for python-qrcode - - - - - dc01ab63 by wurstsalat at 2022-10-17T23:49:25+02:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - f15868e9 by wurstsalat at 2022-10-17T23:49:25+02:00 new: Add OMEMO_TEMP_DL to caps - - - - - a19cbc44 by wurstsalat at 2022-10-18T00:42:30+02:00 new: Add OMEMOTrustManager - - - - - 29 changed files: - gajim/common/application.py - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/message.py - + gajim/common/modules/omemo.py - + gajim/common/modules/omemobackend/__init__.py - + gajim/common/modules/omemobackend/aes.py - + gajim/common/modules/omemobackend/devices.py - + gajim/common/modules/omemobackend/liteaxolotlstore.py - + gajim/common/modules/omemobackend/state.py - + gajim/common/modules/omemobackend/util.py - gajim/common/modules/util.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg - gajim/data/style/gajim.css - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/application.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_details.py - gajim/gtk/message_actions_box.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/69de6a0185c3868d8e0a7b28c4d706e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/69de6a0185c3868d8e0a7b28c4d706e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: PreviewAudio: Increase update rate for seek bar
by Daniel Brötzmann (＠wurstsalat) 17 Oct '22

17 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7c5ad2dc by wurstsalat at 2022-10-17T23:35:16+02:00 fix: PreviewAudio: Increase update rate for seek bar Fixes #11215 - - - - - 1 changed file: - gajim/gtk/preview_audio.py Changes: ===================================== gajim/gtk/preview_audio.py ===================================== @@ -116,7 +116,7 @@ def _on_bus_message(self, _bus: Gst.Bus, message: Gst.Message) -> None: is_paused = self._get_paused() if (duration > 0 and not is_paused and not self._has_timeout): - GLib.timeout_add(500, self._update_seek_bar) + GLib.timeout_add(50, self._update_seek_bar) self._has_timeout = True def _on_seek(self, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7c5ad2dca54d0fec747c575426f3a1b0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7c5ad2dca54d0fec747c575426f3a1b0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 7 commits: new: Archive: Add new columns
by Philipp Hörist (＠lovetox) 17 Oct '22

17 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7aa38beb by Philipp Hörist at 2022-10-17T23:11:41+02:00 new: Archive: Add new columns - - - - - a4cff0e8 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Remove unused code We only use MAM for history - - - - - 6f5a03d5 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Remove unused code - - - - - 8c4ee941 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Simplify instances dict init - - - - - bf75eda4 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: AccountWizard: Save account color early - - - - - 2276c302 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Settings: Align default settings with account creation - - - - - 27a41e04 by Philipp Hörist at 2022-10-17T23:11:41+02:00 refactor: Move account interface methods into Application - - - - - 11 changed files: - gajim/common/application.py - gajim/common/events.py - gajim/common/modules/message.py - gajim/common/setting_values.py - gajim/common/storage/archive.py - gajim/common/structs.py - gajim/gtk/account_wizard.py - gajim/gtk/accounts.py - gajim/gtk/application.py - gajim/gtk/remove_account.py - gajim/gui_interface.py Changes: ===================================== gajim/common/application.py ===================================== @@ -31,6 +31,8 @@ from gi.repository import Gio from gi.repository import GLib from gi.repository import Soup +from nbxmpp.const import ConnectionType +from nbxmpp.const import ConnectionProtocol from gajim.common import app from gajim.common import ged @@ -40,10 +42,13 @@ from gajim.common.commands import ChatCommands from gajim.common.dbus import logind from gajim.common.events import AccountDisconnected +from gajim.common.events import AccountDisabled +from gajim.common.events import AccountEnabled from gajim.common.events import AllowGajimUpdateCheck from gajim.common.events import GajimUpdateAvailable from gajim.common.client import Client from gajim.common.helpers import make_http_request +from gajim.common.helpers import get_random_string from gajim.common.storage.events import EventStorage from gajim.common.task_manager import TaskManager from gajim.common.settings import Settings @@ -270,3 +275,88 @@ def _on_update_response(self, return self._log.info('Gajim is up to date') + + def create_account(self, + account: str, + username: str, + domain: str, + password: str, + proxy_name: str, + custom_host: tuple[str, + ConnectionProtocol, + ConnectionType], + anonymous: bool = False + ) -> None: + + account_label = f'{username}@{domain}' + if anonymous: + username = 'anon' + account_label = f'anon@{domain}' + + config: dict[str, Union[str, int, bool]] = { + 'name': username, + 'resource': f'gajim.{get_random_string(8)}', + 'account_label': account_label, + 'hostname': domain, + 'anonymous_auth': anonymous, + } + + if proxy_name is not None: + config['proxy'] = proxy_name + + use_custom_host = custom_host is not None + config['use_custom_host'] = use_custom_host + if custom_host: + host, _protocol, type_ = custom_host + host, port = host.rsplit(':', maxsplit=1) + config['custom_port'] = int(port) + config['custom_host'] = host + config['custom_type'] = type_.value + + app.settings.add_account(account) + for opt, value in config.items(): + app.settings.set_account_setting(account, opt, value) # pyright: ignore # noqa + + # Password module depends on existing config + passwords.save_password(account, password) + + def enable_account(self, account: str) -> None: + app.connections[account] = Client(account) + + app.plugin_manager.register_modules_for_account( + app.connections[account]) + + app.automatic_rooms[account] = {} + app.to_be_removed[account] = [] + app.nicks[account] = app.settings.get_account_setting(account, 'name') + app.settings.set_account_setting(account, 'active', True) + + app.ged.raise_event(AccountEnabled(account=account)) + + app.get_client(account).change_status('online', '') + + def disable_account(self, account: str) -> None: + app.settings.set_account_setting(account, 'roster_version', '') + app.settings.set_account_setting(account, 'active', False) + + # Code in account-disabled handlers may use app.get_client() + app.ged.raise_event(AccountDisabled(account=account)) + + app.get_client(account).cleanup() + del app.connections[account] + if account in app.interface.instances: + del app.interface.instances[account] + del app.nicks[account] + del app.automatic_rooms[account] + del app.to_be_removed[account] + + def remove_account(self, account: str) -> None: + if app.settings.get_account_setting(account, 'active'): + self.disable_account(account) + + app.storage.cache.remove_roster(account) + # Delete password must be before del_per() because it calls set_per() + # which would recreate the account with defaults values if not found + passwords.delete_password(account) + app.settings.remove_account(account) + app.app.remove_account_actions(account) ===================================== gajim/common/events.py ===================================== @@ -393,7 +393,6 @@ class MessageReceived(ApplicationEvent): stanza_id: str fjid: str resource: str - session: Any delayed: Optional[float] msg_log_id: int displaymarking: Optional[Displaymarking] ===================================== gajim/common/modules/message.py ===================================== @@ -126,18 +126,6 @@ def _message_received(self, stanza_id, message_id = self._get_unique_id(properties) - if properties.type.is_groupchat and properties.has_server_delay: - # Only for XEP-0045 MUC History - # Don’t check for message text because the message could be - # encrypted. - if app.storage.archive.deduplicate_muc_message( - self._account, - properties.jid.bare, - properties.jid.resource, - properties.timestamp, - properties.id): - raise nbxmpp.NodeProcessed - if (properties.is_self_message or properties.is_muc_pm): archive_jid = self._con.get_own_jid().bare if app.storage.archive.find_stanza_id( @@ -150,8 +138,6 @@ def _message_received(self, msgtxt = properties.body - session = None - additional_data = AdditionalDataDict() if properties.has_user_delay: @@ -182,7 +168,6 @@ def _message_received(self, 'stanza_id': stanza_id, 'unique_id': stanza_id or message_id, 'msgtxt': msgtxt, - 'session': session, 'delayed': properties.user_timestamp is not None, 'msg_log_id': None, 'displaymarking': displaymarking, ===================================== gajim/common/setting_values.py ===================================== @@ -407,13 +407,13 @@ class _ACCOUNT_DEFAULT: 'account': { 'account_color': 'rgb(85, 85, 85)', 'account_label': '', - 'active': True, + 'active': False, 'adjust_priority_with_status': False, 'anonymous_auth': False, 'answer_receipts': True, 'attached_gpg_keys': '', 'autoauth': False, - 'autoconnect': False, + 'autoconnect': True, 'autopriority_away': 40, 'autopriority_chat': 50, 'autopriority_dnd': 20, @@ -455,14 +455,14 @@ class _ACCOUNT_DEFAULT: 'resource': 'gajim.$rand', 'restore_last_status': False, 'roster_version': '', - 'savepass': False, + 'savepass': True, 'send_chatstate_default': 'composing_only', 'send_idle_time': True, 'send_marker_default': True, 'send_os_info': True, 'send_time_info': True, 'subscription_request_msg': '', - 'sync_with_global_status': False, + 'sync_with_global_status': True, 'test_ft_proxies_on_startup': False, 'use_custom_host': False, 'use_ft_proxies': False, ===================================== gajim/common/storage/archive.py ===================================== @@ -50,7 +50,7 @@ from gajim.common.storage.base import SqliteStorage from gajim.common.storage.base import timeit -CURRENT_USER_VERSION = 6 +CURRENT_USER_VERSION = 7 ARCHIVE_SQL_STATEMENT = ''' CREATE TABLE jids( @@ -63,6 +63,8 @@ account_id INTEGER, jid_id INTEGER, contact_name TEXT, + occupant_id TEXT, + real_jid TEXT, time INTEGER, kind INTEGER, show INTEGER, @@ -258,6 +260,14 @@ def _migrate(self) -> None: ] self._execute_multiple(statements) + if user_version < 7: + statements = [ + 'ALTER TABLE logs ADD COLUMN "real_jid" TEXT', + 'ALTER TABLE logs ADD COLUMN "occupant_id" TEXT', + 'PRAGMA user_version=7' + ] + self._execute_multiple(statements) + @staticmethod def _like(search_str: str) -> str: return f'%{search_str}%' @@ -865,59 +875,6 @@ def get_recent_muc_nicks(self, contact: GroupchatContact) -> list[str]: return nicknames - @timeit - def deduplicate_muc_message(self, - account: str, - jid: str, - resource: str, - timestamp: float, - message_id: str - ) -> bool: - ''' - Check if a message is already in the `logs` table - - :param account: The account - - :param jid: The muc jid as string - - :param resource: The resource - - :param timestamp: The timestamp in UTC epoch - - :param message_id: The message-id - ''' - - # Add 60 seconds around the timestamp - start_time = timestamp - 60 - end_time = timestamp + 60 - - account_id = self.get_account_id(account) - log.debug('Search for MUC duplicate') - log.debug('start: %s, end: %s, jid: %s, resource: %s, message-id: %s', - start_time, end_time, jid, resource, message_id) - - sql = ''' - SELECT * FROM logs - NATURAL JOIN jids WHERE - jid = ? AND - contact_name = ? AND - message_id = ? AND - account_id = ? AND - time BETWEEN ? AND ? - ''' - - result = self._con.execute(sql, (jid, - resource, - message_id, - account_id, - start_time, - end_time)).fetchone() - - if result is not None: - log.debug('Found duplicate') - return True - return False - @timeit def find_stanza_id(self, account: str, ===================================== gajim/common/structs.py ===================================== @@ -158,7 +158,6 @@ def __init__(self, self.timestamp = None self.message_id = None self.stanza = None - self.session = None self.delayed = None # TODO never set self.is_loggable = True ===================================== gajim/gtk/account_wizard.py ===================================== @@ -215,7 +215,7 @@ def _on_assistant_button_clicked(self, elif button_name == 'connect': if page == 'success': - app.interface.enable_account(self.get_page('success').account) + app.app.enable_account(self.get_page('success').account) self.destroy() elif button_name == 'back': @@ -371,12 +371,12 @@ def _on_login_successful(self, client: Client, _signal_name: str) -> None: if client.proxy is not None: proxy_name = self.get_page('advanced').get_proxy() - app.interface.create_account(account, - client.username, - client.domain, - client.password, - proxy_name, - client.custom_host) + app.app.create_account(account, + client.username, + client.domain, + client.password, + proxy_name, + client.custom_host) self.get_page('success').set_account(account) self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) @@ -393,13 +393,13 @@ def _on_anonymous_supported(self, if client.proxy is not None: proxy_name = self.get_page('advanced').get_proxy() - app.interface.create_account(account, - None, - client.domain, - client.password, - proxy_name, - client.custom_host, - anonymous=True) + app.app.create_account(account, + None, + client.domain, + client.password, + proxy_name, + client.custom_host, + anonymous=True) self.get_page('success').set_account(account) self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) @@ -549,12 +549,12 @@ def _on_register_result(self, task: Task) -> None: if self._client.proxy is not None: proxy_name = self.get_page('advanced').get_proxy() - app.interface.create_account(account, - username, - self._client.domain, - password, - proxy_name, - self._client.custom_host) + app.app.create_account(account, + username, + self._client.domain, + password, + proxy_name, + self._client.custom_host) self.get_page('success').set_account(account) self.show_page('success', Gtk.StackTransitionType.SLIDE_LEFT) @@ -1080,6 +1080,7 @@ def set_account(self, account: str) -> None: self._ui.account_color_button.set_rgba(rgba) self._color = rgba.to_string() self._set_badge_color(self._color) + self._save_config() @property def account(self) -> Optional[str]: ===================================== gajim/gtk/accounts.py ===================================== @@ -569,9 +569,9 @@ def _disable() -> None: return Gdk.EVENT_STOP if state: - app.interface.enable_account(account) + app.app.enable_account(account) else: - app.interface.disable_account(account) + app.app.disable_account(account) return Gdk.EVENT_PROPAGATE @@ -582,7 +582,7 @@ def _on_state_changed(self, ) -> None: if client_state.is_disconnected: - app.interface.disable_account(client.account) + app.app.disable_account(client.account) class AddNewAccountPage(Gtk.Box): ===================================== gajim/gtk/application.py ===================================== @@ -47,6 +47,8 @@ from nbxmpp.namespaces import Namespace from nbxmpp import JID from nbxmpp.protocol import InvalidJid +from nbxmpp.const import ConnectionType +from nbxmpp.const import ConnectionProtocol from gi.repository import Gio from gi.repository import GLib from gi.repository import Gtk @@ -70,6 +72,7 @@ from gajim.gui import menus from gajim.gui import structs from gajim.gui.about import AboutDialog +from gajim.gui.accounts import AccountsWindow from gajim.gui.avatar import AvatarStorage from gajim.gui.builder import get_builder from gajim.gui.const import ACCOUNT_ACTIONS @@ -83,6 +86,7 @@ from gajim.gui.discovery import ServiceDiscoveryWindow from gajim.gui.start_chat import StartChatDialog from gajim.gui.util import get_app_window +from gajim.gui.util import get_app_windows from gajim.gui.util import load_user_iconsets from gajim.gui.util import open_window @@ -521,6 +525,66 @@ def _on_feature_discovered(self, event: events.FeatureDiscovered) -> None: action = '%s-block-contact' % event.account self.set_action_state(action, True) + def create_account(self, + account: str, + username: str, + domain: str, + password: str, + proxy_name: str, + custom_host: tuple[str, + ConnectionProtocol, + ConnectionType], + anonymous: bool = False + ) -> None: + + CoreApplication.create_account(self, + account, + username, + domain, + password, + proxy_name, + custom_host, + anonymous) + + app.css_config.refresh() + + # Action must be added before account window is updated + self.add_account_actions(account) + + window = cast(AccountsWindow, get_app_window('AccountsWindow')) + if window is not None: + window.add_account(account) + + def enable_account(self, account: str) -> None: + CoreApplication.enable_account(self, account) + menus.build_accounts_menu() + self.update_app_actions_state() + window = cast(AccountsWindow, get_app_window('AccountsWindow')) + if window is not None: + window.enable_account(account, True) + + def disable_account(self, account: str) -> None: + for win in get_app_windows(account): + # Close all account specific windows, except the RemoveAccount + # dialog. It shows if the removal was successful. + if type(win).__name__ == 'RemoveAccount': + continue + win.destroy() + + CoreApplication.disable_account(self, account) + + menus.build_accounts_menu() + self.update_app_actions_state() + + def remove_account(self, account: str) -> None: + CoreApplication.remove_account(self, account) + + self.remove_account_actions(account) + + window = cast(AccountsWindow, get_app_window('AccountsWindow')) + if window is not None: + window.remove_account(account) + # Action Callbacks @staticmethod @@ -580,6 +644,9 @@ def _on_services_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: account = param.get_string() server_jid = app.settings.get_account_setting(account, 'hostname') + if account not in app.interface.instances: + app.interface.instances[account] = {'disco': {}} + disco = app.interface.instances[account]['disco'] if server_jid in disco: disco[server_jid].window.present() ===================================== gajim/gtk/remove_account.py ===================================== @@ -89,7 +89,7 @@ def _on_account_disconnected(self, _event: AccountDisconnected) -> None: if self._account_removed: self.show_page('success') - app.interface.remove_account(self.account) + app.app.remove_account(self.account) def _set_remove_from_server_checkbox(self) -> None: enabled = self._client is not None and self._client.state.is_available @@ -126,7 +126,7 @@ def _on_remove(self, *args: Any) -> None: return if self._client is None or self._client.state.is_disconnected: - app.interface.remove_account(self.account) + app.app.remove_account(self.account) self.show_page('success') return ===================================== gajim/gui_interface.py ===================================== @@ -57,10 +57,7 @@ from gajim.common import proxy65_manager from gajim.common import socks5 from gajim.common import helpers -from gajim.common import passwords -from gajim.common.events import AccountEnabled -from gajim.common.events import AccountDisabled from gajim.common.events import FileCompleted from gajim.common.events import FileHashError from gajim.common.events import FileProgress @@ -69,7 +66,6 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.structs import OutgoingMessage from gajim.common.i18n import _ -from gajim.common.client import Client from gajim.common.const import FTState from gajim.common.file_props import FileProp from gajim.common.types import ChatContactT @@ -80,10 +76,6 @@ from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.file_transfer_send import SendFileDialog from gajim.gui.filetransfer import FileTransfersWindow -from gajim.gui.menus import build_accounts_menu -from gajim.gui.util import get_app_window -from gajim.gui.util import get_app_windows -from gajim.gui.util import get_color_for_account from gajim.gui.control import ChatControl from gajim.plugins.repository import PluginRepository @@ -115,10 +107,6 @@ def __init__(self): self.instances: dict[str, Any] = {} for acc in app.settings.get_active_accounts(): - self.instances[acc] = { - 'infos': {}, - 'disco': {} - } app.automatic_rooms[acc] = {} app.to_be_removed[acc] = [] app.nicks[acc] = app.settings.get_account_setting(acc, 'name') @@ -128,7 +116,6 @@ def _create_core_handlers_list(self) -> None: self.handlers = { 'signed-in': [self.handle_event_signed_in], 'message-sent': [self.handle_event_msgsent], - 'message-not-sent': [self.handle_event_msgnotsent], } # pylint: enable=line-too-long @@ -179,24 +166,6 @@ def handle_event_msgsent(event): return helpers.play_sound('message_sent', event.account) - @staticmethod - def handle_event_msgnotsent(event): - # ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session)) - msg = _('error while sending %(message)s ( %(error)s )') % { - 'message': event.message, - 'error': event.error} - if not event.session: - # No session. This can happen when sending a message from - # gajim-remote - log.warning(msg) - return - event.session.roster_message( - event.jid, - msg, - event.time_, - event.conn.name, - msg_type='error') - # Jingle File Transfer @staticmethod def handle_event_file_error(title: str, message: str) -> None: @@ -469,125 +438,6 @@ def start_chat_from_jid(account: str, app.app.activate_action( 'start-chat', GLib.Variant('as', [str(jid), message or ''])) - @staticmethod - def create_account(account: str, - username: str, - domain: str, - password: str, - proxy_name: str, - custom_host: str, - anonymous: bool = False - ) -> None: - - account_label = f'{username}@{domain}' - if anonymous: - username = 'anon' - account_label = f'anon@{domain}' - - config = {} - config['active'] = False - config['name'] = username - config['resource'] = f'gajim.{helpers.get_random_string(8)}' - config['account_label'] = account_label - config['account_color'] = get_color_for_account(f'{username}@{domain}') - config['hostname'] = domain - config['savepass'] = True - config['anonymous_auth'] = anonymous - config['autoconnect'] = True - config['sync_with_global_status'] = True - - if proxy_name is not None: - config['proxy'] = proxy_name - - use_custom_host = custom_host is not None - config['use_custom_host'] = use_custom_host - if custom_host: - host, _protocol, type_ = custom_host - host, port = host.rsplit(':', maxsplit=1) - config['custom_port'] = int(port) - config['custom_host'] = host - config['custom_type'] = type_.value - - app.settings.add_account(account) - for opt, value in config.items(): - app.settings.set_account_setting(account, opt, value) - - # Password module depends on existing config - passwords.save_password(account, password) - - app.css_config.refresh() - - # Action must be added before account window is updated - app.app.add_account_actions(account) - - window = get_app_window('AccountsWindow') - if window is not None: - window.add_account(account) - - def enable_account(self, account: str) -> None: - app.connections[account] = Client(account) - - app.plugin_manager.register_modules_for_account( - app.connections[account]) - - # update variables - self.instances[account] = { - 'infos': {}, - 'disco': {} - } - - app.automatic_rooms[account] = {} - app.to_be_removed[account] = [] - app.nicks[account] = app.settings.get_account_setting(account, 'name') - app.settings.set_account_setting(account, 'active', True) - build_accounts_menu() - app.app.update_app_actions_state() - - app.ged.raise_event(AccountEnabled(account=account)) - - app.get_client(account).change_status('online', '') - window = get_app_window('AccountsWindow') - if window is not None: - GLib.idle_add(window.enable_account, account, True) - - def disable_account(self, account: str) -> None: - for win in get_app_windows(account): - # Close all account specific windows, except the RemoveAccount - # dialog. It shows if the removal was successful. - if type(win).__name__ == 'RemoveAccount': - continue - win.destroy() - - app.settings.set_account_setting(account, 'roster_version', '') - app.settings.set_account_setting(account, 'active', False) - build_accounts_menu() - app.app.update_app_actions_state() - - # Code in account-disabled handlers may use app.get_client() - app.ged.raise_event(AccountDisabled(account=account)) - - app.get_client(account).cleanup() - del app.connections[account] - del self.instances[account] - del app.nicks[account] - del app.automatic_rooms[account] - del app.to_be_removed[account] - - def remove_account(self, account: str) -> None: - if app.settings.get_account_setting(account, 'active'): - self.disable_account(account) - - app.storage.cache.remove_roster(account) - # Delete password must be before del_per() because it calls set_per() - # which would recreate the account with defaults values if not found - passwords.delete_password(account) - app.settings.remove_account(account) - app.app.remove_account_actions(account) - - window = get_app_window('AccountsWindow') - if window is not None: - window.remove_account(account) - def autoconnect(self) -> None: ''' Auto connect at startup View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/99f66cdb0a7d9ef9a70c4b743aa1f0e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/99f66cdb0a7d9ef9a70c4b743aa1f0e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 13 commits: fix: Roster: Always show workspace when starting chat
by Daniel Brötzmann (＠wurstsalat) 16 Oct '22

16 Oct '22

Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim Commits: c579e2ef by wurstsalat at 2022-10-13T21:27:04+02:00 fix: Roster: Always show workspace when starting chat - - - - - c9a229c3 by wurstsalat at 2022-10-13T21:37:35+02:00 fix: ChatList: Don’t increase in width while drag and drop - - - - - 29c24bdb by Philipp Hörist at 2022-10-15T18:27:49+02:00 new: Settings: Add get_workspace_count() - - - - - edac92a6 by Philipp Hörist at 2022-10-16T13:01:58+02:00 feat: Accounts: Add setting for default workspace Fixes #11208 - - - - - 379fc572 by Philipp Hörist at 2022-10-16T19:55:22+02:00 fix: Client: Load trusted certificates on connect() This eliminates some race conditions where _create_client() is called before the cert is stored. Fixes #11220 - - - - - ff5523dd by Philipp Hörist at 2022-10-16T20:39:03+02:00 fix: AccountPage: Disable Excute Command button by default Fixes #11216 - - - - - 99f66cdb by wurstsalat at 2022-10-17T00:17:31+02:00 cq: Preferences: Fix type annotations - - - - - d8fe9cee by lovetox at 2022-10-17T00:17:53+02:00 Omemo Start - - - - - 13ea22e7 by wurstsalat at 2022-10-17T00:23:43+02:00 cq: OMEMO: Add type annotations - - - - - 5da08947 by wurstsalat at 2022-10-17T00:23:43+02:00 cq: Add type stubs for python-qrcode - - - - - e419527f by wurstsalat at 2022-10-17T00:23:43+02:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - 70e388ef by wurstsalat at 2022-10-17T00:23:43+02:00 new: Add OMEMO_TEMP_DL to caps - - - - - 69de6a01 by wurstsalat at 2022-10-17T00:23:43+02:00 new: Add OMEMOTrustManager - - - - - 29 changed files: - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - + gajim/common/modules/omemo.py - + gajim/common/modules/omemobackend/__init__.py - + gajim/common/modules/omemobackend/aes.py - + gajim/common/modules/omemobackend/devices.py - + gajim/common/modules/omemobackend/liteaxolotlstore.py - + gajim/common/modules/omemobackend/state.py - + gajim/common/modules/omemobackend/util.py - gajim/common/modules/util.py - gajim/common/setting_values.py - gajim/common/settings.py - gajim/data/gui/account_page.ui - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_list_stack.py - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_details.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8fc78e261a86b561e1166096dfdf6c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8fc78e261a86b561e1166096dfdf6c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: Preferences: Fix type annotations
by Daniel Brötzmann (＠wurstsalat) 16 Oct '22

16 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 99f66cdb by wurstsalat at 2022-10-17T00:17:31+02:00 cq: Preferences: Fix type annotations - - - - - 1 changed file: - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/preferences.py ===================================== @@ -35,7 +35,7 @@ from gajim.common.multimedia_helpers import VideoInputManager from gajim.common.events import StyleChanged from gajim.common.events import ThemeUpdate -from gajim.common.setting_values import AllSettings +from gajim.common.setting_values import BoolSettings from .const import Setting from .const import SettingKind @@ -912,7 +912,7 @@ def _create_av_combo_items(items_dict: dict[str, str]) -> dict[str, str]: class Miscellaneous(PreferenceBox): def __init__(self, pref_window: Preferences) -> None: - self._hints_list: list[AllSettings] = [ + self._hints_list: list[BoolSettings] = [ 'show_help_start_chat', ] @@ -946,7 +946,7 @@ def __init__(self, pref_window: Preferences) -> None: reset_button = pref_window.get_ui().reset_button reset_button.connect('clicked', self._on_reset_hints) - reset_button.set_sensitive(self._check_hints_reset) + reset_button.set_sensitive(self._check_hints_reset()) purge_history_button = pref_window.get_ui().purge_history_button purge_history_button.connect('clicked', self._on_purge_history_clicked) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99f66cdb0a7d9ef9a70c4b743aa1f0ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/99f66cdb0a7d9ef9a70c4b743aa1f0ea… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] feat: Add support for XEP-0421
by Philipp Hörist (＠lovetox) 16 Oct '22

16 Oct '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 91fb4a7f by Philipp Hörist at 2022-10-16T23:09:14+02:00 feat: Add support for XEP-0421 - - - - - 4 changed files: - nbxmpp/modules/muc/muc.py - nbxmpp/namespaces.py - nbxmpp/structs.py - python-nbxmpp.doap Changes: ===================================== nbxmpp/modules/muc/muc.py ===================================== @@ -116,6 +116,12 @@ class MUC(BaseModule): properties.muc_jid = properties.jid.new_as_bare() properties.muc_nickname = properties.jid.resource + occupant_id = stanza.getTagAttr('occupant-id', + 'id', + namespace=Namespace.OCCUPANT_ID) + + properties.occupant_id = occupant_id + def _process_muc_user_presence(self, _client, stanza, properties): muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) if muc_user is None: @@ -123,6 +129,13 @@ class MUC(BaseModule): properties.from_muc = True properties.muc_jid = properties.jid.new_as_bare() + + occupant_id = stanza.getTagAttr('occupant-id', + 'id', + namespace=Namespace.OCCUPANT_ID) + + properties.occupant_id = occupant_id + destroy = muc_user.getTag('destroy') if destroy is not None: alternate = destroy.getAttr('jid') @@ -192,6 +205,12 @@ class MUC(BaseModule): properties.muc_jid = properties.jid.new_as_bare() properties.muc_nickname = properties.jid.resource + occupant_id = stanza.getTagAttr('occupant-id', + 'id', + namespace=Namespace.OCCUPANT_ID) + + properties.occupant_id = occupant_id + muc_user = stanza.getTag('x', namespace=Namespace.MUC_USER) if muc_user is not None: try: @@ -220,6 +239,12 @@ class MUC(BaseModule): if muc_user is None: return + occupant_id = stanza.getTagAttr('occupant-id', + 'id', + namespace=Namespace.OCCUPANT_ID) + + properties.occupant_id = occupant_id + # MUC Private message if (properties.type.is_chat or properties.type.is_error and ===================================== nbxmpp/namespaces.py ===================================== @@ -114,6 +114,7 @@ class _Namespaces: MUC_REQUEST: str = 'http://jabber.org/protocol/muc#request' MUC_INFO: str = 'http://jabber.org/protocol/muc#roominfo' NICK: str = 'http://jabber.org/protocol/nick' + OCCUPANT_ID: str = 'urn:xmpp:occupant-id:0' OMEMO_TEMP: str = 'eu.siacs.conversations.axolotl' OMEMO_TEMP_BUNDLE: str = 'eu.siacs.conversations.axolotl.bundles' OMEMO_TEMP_DL: str = 'eu.siacs.conversations.axolotl.devicelist' ===================================== nbxmpp/structs.py ===================================== @@ -963,6 +963,7 @@ class MessageProperties: http_auth: Optional[HTTPAuthData] = None nickname: Optional[str] = None from_muc: bool = False + occupant_id: Optional[str] = None muc_jid: Optional[JID] = None muc_nickname: Optional[str] = None muc_status_codes: Optional[Set[StatusCode]] = None @@ -1183,6 +1184,7 @@ class PresenceProperties: self_presence: bool = False self_bare: bool = False from_muc: bool = False + occupant_id: Optional[str] = None status: str = '' timestamp: float = field(default_factory=time.time) user_timestamp: Optional[float] = None ===================================== python-nbxmpp.doap ===================================== @@ -401,6 +401,13 @@ <xmpp:version>0.3.0</xmpp:version> </xmpp:SupportedXep> </implements> + <implements> + <xmpp:SupportedXep> + <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0421.html"/> + <xmpp:status>complete</xmpp:status> + <xmpp:version>0.1.0</xmpp:version> + </xmpp:SupportedXep> + </implements> <implements> <xmpp:SupportedXep> <xmpp:xep rdf:resource="https://xmpp.org/extensions/xep-0425.html"/> View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/91fb4a7f15c3992b25a91672… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/91fb4a7f15c3992b25a91672… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AccountPage: Disable Excute Command button by default
by Philipp Hörist (＠lovetox) 16 Oct '22

16 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff5523dd by Philipp Hörist at 2022-10-16T20:39:03+02:00 fix: AccountPage: Disable Excute Command button by default Fixes #11216 - - - - - 1 changed file: - gajim/data/gui/account_page.ui Changes: ===================================== gajim/data/gui/account_page.ui ===================================== @@ -231,6 +231,7 @@ <child> <object class="GtkButton" id="adhoc_commands_button"> <property name="visible">True</property> + <property name="sensitive">False</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="tooltip-text" translatable="yes">Execute Command…</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff5523dd3758bd83cc748f449222b814… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ff5523dd3758bd83cc748f449222b814… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits