Changes in otr.c [858ea01:faa75c0e]

File:

• otr.c (modified) (10 diffs)

otr.c

@@ -2 +2 @@
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2008 Wilmer van der Gaast and others                *
+  * Copyright 2002-2010 Wilmer van der Gaast and others                *
   \********************************************************************/
 
@@ -8 +8 @@
   OTR support (cf. http://www.cypherpunks.ca/otr/)
   
-  2008, Sven Moritz Hallberg <pesco@khjk.org>
-  (c) and funded by stonedcoder.org
+  (c) 2008-2010 Sven Moritz Hallberg <pesco@khjk.org>
+  (c) 2008 funded by stonedcoder.org
     
   files used to store OTR data:
@@ -87 +87 @@
 void cmd_otr_disconnect(irc_t *irc, char **args);
 void cmd_otr_smp(irc_t *irc, char **args);
+void cmd_otr_smpq(irc_t *irc, char **args);
 void cmd_otr_trust(irc_t *irc, char **args);
 void cmd_otr_info(irc_t *irc, char **args);
@@ -96 +97 @@
         { "disconnect",  1, &cmd_otr_disconnect, 0 },
         { "smp",         2, &cmd_otr_smp,        0 },
+        { "smpq",        3, &cmd_otr_smpq,       0 },
         { "trust",       6, &cmd_otr_trust,      0 },
         { "info",        0, &cmd_otr_info,       0 },
@@ -154 +156 @@
 /* handle SMP TLVs from a received message */
 void otr_handle_smp(struct im_connection *ic, const char *handle, OtrlTLV *tlvs);
+
+/* combined handler for the 'otr smp' and 'otr smpq' commands */
+void otr_smp_or_smpq(irc_t *irc, const char *nick, const char *question,
+                const char *secret);
 
 /* update op/voice flag of given user according to encryption state and settings
@@ -732 +738 @@
 void cmd_otr_smp(irc_t *irc, char **args)
 {
-        irc_user_t *u;
-        ConnContext *ctx;
-        
-        u = irc_user_by_name(irc, args[1]);
-        if(!u || !u->bu || !u->bu->ic) {
-                irc_usermsg(irc, "%s: unknown user", args[1]);
-                return;
-        }
-        if(!(u->bu->flags & BEE_USER_ONLINE)) {
-                irc_usermsg(irc, "%s is offline", args[1]);
-                return;
-        }
-        
-        ctx = otrl_context_find(irc->otr->us, u->bu->handle,
-                u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 1, NULL, NULL, NULL);
-        if(!ctx) {
-                /* huh? out of memory or what? */
-                return;
-        }
-
-        if(ctx->smstate->nextExpected != OTRL_SMP_EXPECT1) {
-                log_message(LOGLVL_INFO,
-                        "SMP already in phase %d, sending abort before reinitiating",
-                        ctx->smstate->nextExpected+1);
-                otrl_message_abort_smp(irc->otr->us, &otr_ops, u->bu->ic, ctx);
-                otrl_sm_state_free(ctx->smstate);
-        }
-        
-        /* warning: the following assumes that smstates are cleared whenever an SMP
-           is completed or aborted! */ 
-        if(ctx->smstate->secret == NULL) {
-                irc_usermsg(irc, "smp: initiating with %s...", u->nick);
-                otrl_message_initiate_smp(irc->otr->us, &otr_ops,
-                        u->bu->ic, ctx, (unsigned char *)args[2], strlen(args[2]));
-                /* smp is now in EXPECT2 */
-        } else {
-                /* if we're still in EXPECT1 but smstate is initialized, we must have
-                   received the SMP1, so let's issue a response */
-                irc_usermsg(irc, "smp: responding to %s...", u->nick);
-                otrl_message_respond_smp(irc->otr->us, &otr_ops,
-                        u->bu->ic, ctx, (unsigned char *)args[2], strlen(args[2]));
-                /* smp is now in EXPECT3 */
-        }
+        otr_smp_or_smpq(irc, args[1], NULL, args[2]);   /* no question */
+}
+
+void cmd_otr_smpq(irc_t *irc, char **args)
+{
+        otr_smp_or_smpq(irc, args[1], args[2], args[3]);
 }
 
@@ -1098 +1067 @@
         if(!context) {
                 /* huh? out of memory or what? */
+                irc_usermsg(irc, "smp: failed to get otr context for %s", u->nick);
+                otrl_message_abort_smp(us, ops, u->bu->ic, context);
+                otrl_sm_state_free(context->smstate);
                 return;
         }
         nextMsg = context->smstate->nextExpected;
 
+        if (context->smstate->sm_prog_state == OTRL_SMP_PROG_CHEATED) {
+                irc_usermsg(irc, "smp %s: opponent violated protocol, aborting",
+                        u->nick);
+                otrl_message_abort_smp(us, ops, u->bu->ic, context);
+                otrl_sm_state_free(context->smstate);
+                return;
+        }
+
+        tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP1Q);
+        if (tlv) {
+                if (nextMsg != OTRL_SMP_EXPECT1) {
+                        irc_usermsg(irc, "smp %s: spurious SMP1Q received, aborting", u->nick);
+                        otrl_message_abort_smp(us, ops, u->bu->ic, context);
+                        otrl_sm_state_free(context->smstate);
+                } else {
+                        char *question = g_strndup((char *)tlv->data, tlv->len);
+                        irc_usermsg(irc, "smp: initiated by %s with question: \x02\"%s\"\x02", u->nick,
+                                question);
+                        irc_usermsg(irc, "smp: respond with \x02otr smp %s <answer>\x02",
+                                u->nick);
+                        g_free(question);
+                        /* smp stays in EXPECT1 until user responds */
+                }
+        }
         tlv = otrl_tlv_find(tlvs, OTRL_TLV_SMP1);
         if (tlv) {
@@ -1134 +1130 @@
                 } else {
                         /* SMP3 received, otrl_message_receiving will have sent SMP4 and set fp trust */
-                        const char *trust = context->active_fingerprint->trust;
-                        if(!trust || trust[0]=='\0') {
-                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                        /* as noted above, fp trust SHOULD have been set by libotr.
+                         * however at least version 3.2.0 seems to forget it when
+                         * responding to an smp session that was initiated with SMP1Q
+                         * (question and answer); other cases appear to work fine.
+                         * as a workaround, we explicitly set it below.
+                         */ 
+                        if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
+                                otrl_context_set_trust(context->active_fingerprint, "smp");
+                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                         u->nick);
                         } else {
-                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                otrl_context_set_trust(context->active_fingerprint, "");
+                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                         u->nick);
                         }
@@ -1154 +1157 @@
                 } else {
                         /* SMP4 received, otrl_message_receiving will have set fp trust */
-                        const char *trust = context->active_fingerprint->trust;
-                        if(!trust || trust[0]=='\0') {
-                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
+                        if(context->smstate->sm_prog_state == OTRL_SMP_PROG_SUCCEEDED) {
+                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
                                         u->nick);
                         } else {
-                                irc_usermsg(irc, "smp %s: secrets proved equal, fingerprint trusted",
+                                irc_usermsg(irc, "smp %s: secrets did not match, fingerprint not trusted",
                                         u->nick);
                         }
@@ -1171 +1173 @@
                 otrl_sm_state_free(context->smstate);
                 /* smp is in back in EXPECT1 */
+        }
+}
+
+/* combined handler for the 'otr smp' and 'otr smpq' commands */
+void otr_smp_or_smpq(irc_t *irc, const char *nick, const char *question,
+                const char *secret)
+{
+        irc_user_t *u;
+        ConnContext *ctx;
+
+        u = irc_user_by_name(irc, nick);
+        if(!u || !u->bu || !u->bu->ic) {
+                irc_usermsg(irc, "%s: unknown user", nick);
+                return;
+        }
+        if(!(u->bu->flags & BEE_USER_ONLINE)) {
+                irc_usermsg(irc, "%s is offline", nick);
+                return;
+        }
+        
+        ctx = otrl_context_find(irc->otr->us, u->bu->handle,
+                u->bu->ic->acc->user, u->bu->ic->acc->prpl->name, 0, NULL, NULL, NULL);
+        if(!ctx || ctx->msgstate != OTRL_MSGSTATE_ENCRYPTED) {
+                irc_usermsg(irc, "smp: otr inactive with %s, try \x02otr connect"
+                                " %s\x02", nick, nick);
+                return;
+        }
+
+        if(ctx->smstate->nextExpected != OTRL_SMP_EXPECT1) {
+                log_message(LOGLVL_INFO,
+                        "SMP already in phase %d, sending abort before reinitiating",
+                        ctx->smstate->nextExpected+1);
+                otrl_message_abort_smp(irc->otr->us, &otr_ops, u->bu->ic, ctx);
+                otrl_sm_state_free(ctx->smstate);
+        }
+
+        if(question) {
+                /* this was 'otr smpq', just initiate */
+                irc_usermsg(irc, "smp: initiating with %s...", u->nick);
+                otrl_message_initiate_smp_q(irc->otr->us, &otr_ops, u->bu->ic, ctx,
+                        question, (unsigned char *)secret, strlen(secret));
+                /* smp is now in EXPECT2 */
+        } else {
+                /* this was 'otr smp', initiate or reply */
+                /* warning: the following assumes that smstates are cleared whenever an SMP
+                   is completed or aborted! */ 
+                if(ctx->smstate->secret == NULL) {
+                        irc_usermsg(irc, "smp: initiating with %s...", u->nick);
+                        otrl_message_initiate_smp(irc->otr->us, &otr_ops,
+                                u->bu->ic, ctx, (unsigned char *)secret, strlen(secret));
+                        /* smp is now in EXPECT2 */
+                } else {
+                        /* if we're still in EXPECT1 but smstate is initialized, we must have
+                           received the SMP1, so let's issue a response */
+                        irc_usermsg(irc, "smp: responding to %s...", u->nick);
+                        otrl_message_respond_smp(irc->otr->us, &otr_ops,
+                                u->bu->ic, ctx, (unsigned char *)secret, strlen(secret));
+                        /* smp is now in EXPECT3 */
+                }
         }
 }