hueso/gajim-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[omemo] Refactor Plugin

Browse Source
This commit is contained in:
Philipp Hörist
2019-02-17 16:58:34 +01:00
parent 87ece2397e
commit 6fd32591fc
8 changed files with 579 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files

139
omemo/gtk/config.py
View File

@@ -16,11 +16,8 @@
# 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/>.
import binascii
import logging
import os
import textwrap
from enum import IntEnum, unique
from gi.repository import GdkPixbuf
@@ -29,6 +26,8 @@ from gajim.common import configpaths
from gajim.plugins.gui import GajimPluginConfigDialog
from gajim.plugins.helpers import get_builder
from omemo.backend.util import get_fingerprint
log = logging.getLogger('gajim.plugin_system.omemo')
PILLOW = False
@@ -40,13 +39,6 @@ except ImportError as error:
log.error('python-qrcode or dependencies of it are not available')
@unique
class State(IntEnum):
UNTRUSTED = 0
TRUSTED = 1
UNDECIDED = 2
class OMEMOConfigDialog(GajimPluginConfigDialog):
def init(self):
# pylint: disable=attribute-defined-outside-init
@@ -62,19 +54,8 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
self.plugin.config['DISABLED_ACCOUNTS'] = []
self.disabled_accounts = self.plugin.config['DISABLED_ACCOUNTS']
log.debug('Disabled Accounts:')
log.debug(self.disabled_accounts)
self.device_model = self._ui.get_object('deviceid_store')
self.disabled_acc_store = self._ui.get_object('disabled_account_store')
self.account_store = self._ui.get_object('account_store')
self.active_acc_view = self._ui.get_object('active_accounts_view')
self.disabled_acc_view = self._ui.get_object('disabled_accounts_view')
box = self.get_content_area()
box.pack_start(self._ui.get_object('notebook1'), True, True, 0)
box.pack_start(self._ui.notebook1, True, True, 0)
self._ui.connect_signals(self)
@@ -91,7 +72,7 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
self.update_disabled_account_view()
def is_in_accountstore(self, account):
for row in self.account_store:
for row in self._ui.account_store:
if row[0] == account:
return True
return False
@@ -103,32 +84,34 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
if account == 'Local':
continue
if not self.is_in_accountstore(account):
self.account_store.append(row=(account,))
self._ui.account_store.append(row=(account,))
def update_account_combobox(self):
if self.plugin_active is False:
return
if len(self.account_store) > 0:
self._ui.get_object('account_combobox').set_active(0)
if self._ui.account_store:
self._ui.account_combobox.set_active(0)
else:
self.account_combobox_changed_cb(
self._ui.get_object('account_combobox'))
self.account_combobox_changed_cb(self._ui.account_combobox)
def account_combobox_changed_cb(self, box, *args):
self.update_context_list()
def get_qrcode(self, jid, sid, fingerprint):
@staticmethod
def _get_qrcode(jid, sid, identity_key):
fingerprint = get_fingerprint(identity_key)
file_name = 'omemo_{}.png'.format(jid)
path = os.path.join(
configpaths.get('MY_DATA'), file_name)
ver_string = 'xmpp:{}?omemo-sid-{}={}'.format(jid, sid, fingerprint)
log.debug('Verification String: ' + ver_string)
log.debug('Verification String: %s', ver_string)
if os.path.exists(path):
return path
qr = qrcode.QRCode(version=None, error_correction=2, box_size=4, border=1)
qr = qrcode.QRCode(version=None, error_correction=2,
box_size=4, border=1)
qr.add_data(ver_string)
qr.make(fit=True)
img = qr.make_image()
@@ -136,99 +119,89 @@ class OMEMOConfigDialog(GajimPluginConfigDialog):
return path
def update_disabled_account_view(self):
self.disabled_acc_store.clear()
self._ui.disabled_account_store.clear()
for account in self.disabled_accounts:
self.disabled_acc_store.append(row=(account,))
self._ui.disabled_account_store.append(row=(account,))
def activate_accounts_btn_clicked(self, button, *args):
mod, paths = self.disabled_acc_view.get_selection().get_selected_rows()
def activate_accounts_btn_clicked(self, _button, *args):
selection = self._ui.disabled_accounts_view.get_selection()
mod, paths = selection.get_selected_rows()
for path in paths:
it = mod.get_iter(path)
account = mod.get(it, 0)
if account[0] in self.disabled_accounts and \
not self.is_in_accountstore(account[0]):
self.account_store.append(row=(account[0],))
self._ui.account_store.append(row=(account[0],))
self.disabled_accounts.remove(account[0])
self.update_disabled_account_view()
self.plugin.config['DISABLED_ACCOUNTS'] = self.disabled_accounts
self.update_account_combobox()
def disable_accounts_btn_clicked(self, button, *args):
mod, paths = self.active_acc_view.get_selection().get_selected_rows()
def disable_accounts_btn_clicked(self, _button, *args):
selection = self._ui.active_accounts_view.get_selection()
mod, paths = selection.get_selected_rows()
for path in paths:
it = mod.get_iter(path)
account = mod.get(it, 0)
if account[0] not in self.disabled_accounts and \
self.is_in_accountstore(account[0]):
self.disabled_accounts.append(account[0])
self.account_store.remove(it)
self._ui.account_store.remove(it)
self.update_disabled_account_view()
self.plugin.config['DISABLED_ACCOUNTS'] = self.disabled_accounts
self.update_account_combobox()
def cleardevice_button_clicked_cb(self, button, *args):
active = self._ui.get_object('account_combobox').get_active()
account = self.account_store[active][0]
app.connections[account].get_module('OMEMO').set_devicelist(new=True)
active = self._ui.account_combobox.get_active()
account = self._ui.account_store[active][0]
app.connections[account].get_module('OMEMO').clear_devicelist()
self.update_context_list()
def refresh_button_clicked_cb(self, button, *args):
self.update_context_list()
def update_context_list(self):
self.device_model.clear()
self.qrcode = self._ui.get_object('qrcode')
self.qrinfo = self._ui.get_object('qrinfo')
if len(self.account_store) == 0:
self._ui.get_object('ID').set_markup('')
self._ui.get_object('fingerprint_label').set_markup('')
self._ui.get_object('refresh').set_sensitive(False)
self._ui.get_object('cleardevice_button').set_sensitive(False)
self._ui.get_object('qrcode').clear()
self._ui.deviceid_store.clear()
if not self._ui.account_store:
self._ui.ID.set_markup('')
self._ui.fingerprint_label.set_markup('')
self._ui.refresh.set_sensitive(False)
self._ui.cleardevice_button.set_sensitive(False)
self._ui.qrcode.clear()
return
active = self._ui.get_object('account_combobox').get_active()
account = self.account_store[active][0]
active = self._ui.account_combobox.get_active()
account = self._ui.account_store[active][0]
# Set buttons active
self._ui.get_object('refresh').set_sensitive(True)
self._ui.refresh.set_sensitive(True)
if account == 'Local':
self._ui.get_object('cleardevice_button').set_sensitive(False)
self._ui.cleardevice_button.set_sensitive(False)
else:
self._ui.get_object('cleardevice_button').set_sensitive(True)
self._ui.cleardevice_button.set_sensitive(True)
# Set FPR Label and DeviceID
state = self.plugin.get_omemo(account)
deviceid = state.own_device_id
self._ui.get_object('ID').set_markup('<tt>%s</tt>' % deviceid)
omemo = self.plugin.get_omemo(account)
self._ui.ID.set_markup('<tt>%s</tt>' % omemo.backend.own_device)
ownfpr = binascii.hexlify(state.store.getIdentityKeyPair()
.getPublicKey().serialize()).decode('utf-8')
human_ownfpr = self.human_hash(ownfpr[2:])
self._ui.get_object('fingerprint_label').set_markup('<tt>%s</tt>'
% human_ownfpr)
identity_key = omemo.backend.storage.getIdentityKeyPair()
fpr = get_fingerprint(identity_key, formatted=True)
self._ui.fingerprint_label.set_markup('<tt>%s</tt>' % fpr)
own_jid = app.get_jid_from_account(account)
# Set Device ID List
for item in state.own_devices:
self.device_model.append([item])
for item in omemo.backend.get_devices(own_jid, without_self=True):
self._ui.deviceid_store.append([item])
# Set QR Verification Code
if PILLOW:
path = self.get_qrcode(
app.get_jid_from_account(account), deviceid, ownfpr[2:])
path = self._get_qrcode(own_jid,
omemo.backend.own_device,
identity_key)
pixbuf = GdkPixbuf.Pixbuf.new_from_file(path)
self.qrcode.set_from_pixbuf(pixbuf)
self.qrcode.show()
self.qrinfo.hide()
self._ui.qrcode.set_from_pixbuf(pixbuf)
self._ui.qrcode.show()
self._ui.qrinfo.hide()
else:
self.qrcode.hide()
self.qrinfo.show()
def human_hash(self, fpr):
fpr = fpr.upper()
fplen = len(fpr)
wordsize = fplen // 8
buf = ''
for w in range(0, fplen, wordsize):
buf += '{0} '.format(fpr[w:w + wordsize])
buf = textwrap.fill(buf, width=36)
return buf.rstrip()
self._ui.qrcode.hide()
self._ui.qrinfo.show()