libervia-web: src/browser/sat_browser/plugin_sec

comparison src/browser/sat_browser/plugin_sec_otr.py @ 530:1735aaeac652

plugin OTR: forces FINISHED state if we are in ENCRYPTED state on contact disconnection

author	souliane <souliane@mailoo.org>
date	Fri, 05 Sep 2014 11:53:55 +0200
parents	9bfd71e2b35c
children	793f12d1f970

comparison

equal deleted inserted replaced

-:9bfd71e2b35c
+:1735aaeac652
 AUTH_INFO_TXT = D_("Authenticating a correspondent helps ensure that the person you are talking to is who he or she claims to be.{eol}{eol}").format(eol=DIALOG_EOL)
 AUTH_FINGERPRINT_TXT = D_("<i>To verify the fingerprint, contact your correspondent via some other authenticated channel (i.e. not in this chat), such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other.</i>{eol}{eol}").format(eol=DIALOG_EOL)
 AUTH_QUEST_DEF = D_("<i>To authenticate using a question, pick a question whose answer is known only to you and your correspondent. Enter this question and this answer, then wait for your correspondent to enter the answer too. If the answers don't match, then you may be talking to an imposter.</i>{eol}{eol}").format(eol=DIALOG_EOL)
 AUTH_QUEST_ASK = D_("<i>Your correspondent is attempting to determine if he or she is really talking to you, or if it's someone pretending to be you. Your correspondent has asked a question, indicated below. To authenticate to your correspondent, enter the answer and click OK.</i>{eol}{eol}").format(eol=DIALOG_EOL)
 AUTH_SECRET_TXT = D_("{eol}{eol}Enter secret answer here: (case sensitive){eol}").format(eol=DIALOG_EOL)
-FEEDBACK_NOT_PRIVATE = D_("You haven't started any private conversation with %s yet.")
+FEEDBACK_NOT_PRIVATE = D_("Your conversation with %s is not encrypted.")
 DROP_TXT = D_("You private key is used to encrypt messages for your correspondent, nobody except you must know it, if you are in doubt, you should drop it!{eol}{eol}Are you sure you want to drop your private key?").format(eol=DIALOG_EOL)
 DEFAULT_POLICY_FLAGS = {
 'ALLOW_V2': True,
 def disconnect(self):
 """Disconnect the session."""
 if self.state != otr.context.STATE_PLAINTEXT:
 super(Context, self).disconnect()
+def finish(self):
+"""Finish the session - avoid to send any message but the user still has to end the session himself."""
+if self.state == otr.context.STATE_ENCRYPTED:
+super(Context, self).finish()
 class Account(otr.context.Account):
 def __init__(self, host):
 log.debug(u"new account: %s" % host.whoami.full())
 #context = self.contexts.setdefault(other_jid, Context(self.host, self.account, other_jid))
 if other_jid not in self.contexts:
 self.contexts[other_jid] = Context(self.host, self.account, other_jid)
 return self.contexts[other_jid]
-def getContextForUser(self, other, create=True):
+def getContextForUser(self, other_jid, start=True):
-log.debug(u"getContextForUser [%s]" % other)
+"""Get the context for the given JID
-if not other.resource:
+@param other_jid (JID): your correspondent
+@param start (bool): start non-existing context if True
+@return: Context
+"""
+log.debug(u"getContextForUser [%s]" % other_jid)
+if not other_jid.resource:
 log.error("getContextForUser called with a bare jid")
 if start:
 return self.startContext(other_jid)
 else:
 return self.contexts.get(other_jid, None)
 self.fixResource(to_jid, cb)
 else:
 cb(to_jid)
 return False  # interrupt the main process
+def presenceReceivedTrigger(self, entity, show, priority, statuses):
+if show == "unavailable":
+self.endSession(entity, finish=True)
+return True
+def endSession(self, other_jid, profile, finish=False):
+"""Finish or disconnect an OTR session
+@param other_jid (JID): str
+@param finish: if True, finish the session but do not disconnect it
+@return: True if the session has been finished or disconnected, False if there was nothing to do
+"""
+def cb(other_jid):
+def not_available():
+if not finish:
+self.host.newMessageCb(other_jid, FEEDBACK_NOT_PRIVATE % other_jid.full(), "headline", self.host.whoami, {})
+priv_key = self.context_manager.account.privkey
+if priv_key is None:
+not_available()
+return
+otrctx = self.context_manager.getContextForUser(other_jid, start=False)
+if otrctx is None:
+not_available()
+return
+if finish:
+otrctx.finish()
+else:
+otrctx.disconnect()
+self.fixResource(other_jid, cb)
 # Menu callbacks
 def _startRefresh(self, menu_data):
 """Start or refresh an OTR session
 def _endSession(self, menu_data):
 """End an OTR session
 @param menu_data: %(menu_data)s
 """
-def cb(other_jid):
-def not_available():
-self.host.newMessageCb(other_jid, FEEDBACK_NOT_PRIVATE % other_jid.full(), "headline", self.host.whoami, {})
-priv_key = self.context_manager.account.privkey
-if priv_key is None:
-not_available()
-return
-otrctx = self.context_manager.getContextForUser(other_jid, create=False)
-if otrctx is None:
-not_available()
-return
-otrctx.disconnect()
 try:
 other_jid = menu_data['jid']
-self.fixResource(other_jid, cb)
 except KeyError:
 log.error(_("jid key is not present !"))
 return None
+self.endSession(other_jid)
 def _authenticate(self, menu_data, profile):
 """Authenticate other user and see our own fingerprint
 @param menu_data: %(menu_data)s
 to_jid = menu_data['jid']
 self.fixResource(to_jid, cb)
 except KeyError:
 log.error(_("jid key is not present !"))
 return None

Mercurial > libervia-web

comparison src/browser/sat_browser/plugin_sec_otr.py @ 530:1735aaeac652