Tkabber plugins

Check-in [af69e92400]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Do not send the message if the OTR code returns an error (this prevents leaking unencrypted material due to bugs in the OTR plugin).
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: af69e9240076e112075a97d4d78702fb2da41379
User & Date: sgolovan 2016-07-10 18:50:41
Context
2016-10-11
04:16
Do not include own JID into the OTR request message. check-in: b965b70d39 user: sgolovan tags: trunk
2016-07-10
18:50
Do not send the message if the OTR code returns an error (this prevents leaking unencrypted material due to bugs in the OTR plugin). check-in: af69e92400 user: sgolovan tags: trunk
2016-02-04
15:12
Fixed rendering OTR icons in chat windows. check-in: 85a632cce0 user: sgolovan tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to ChangeLog.







1
2
3
4
5
6
7






2016-02-04  Sergei Golovan  <sgolovan@nes.ru>

	* otr/otr.tcl: Fixed rendering OTR icons in chat windows.

2016-02-01  Sergei Golovan  <sgolovan@nes.ru>

	* ctcomp/msgs/ru.msg: Fixed typo.
>
>
>
>
>
>







1
2
3
4
5
6
7
8
9
10
11
12
13
2016-07-10  Sergei Golovan  <sgolovan@nes.ru>

	* otr/otr.tcl: Do not send the message if the OTR code returns an
	  error (this prevents leaking unencrypted material due to bugs in the
	  OTR plugin).

2016-02-04  Sergei Golovan  <sgolovan@nes.ru>

	* otr/otr.tcl: Fixed rendering OTR icons in chat windows.

2016-02-01  Sergei Golovan  <sgolovan@nes.ru>

	* ctcomp/msgs/ru.msg: Fixed typo.

Changes to otr/otr.tcl.

1238
1239
1240
1241
1242
1243
1244



1245
1246
1247
1248
1249
1250
1251
    if {![info exists body]} return

    upvar 2 $vxlib xlib
    upvar 2 $vto to

    if {![once_only $xlib $to]} return




    # Only the message body is encrypted if appropriate
    set result [::otr::outgoingMessage $ctx($xlib,$to) $body]

    debugmsg otr "OUTGOING MESSAGE: $xlib; $to; $result;"

    array set res $result








>
>
>







1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
    if {![info exists body]} return

    upvar 2 $vxlib xlib
    upvar 2 $vto to

    if {![once_only $xlib $to]} return

    # Disable sending the message in case of error in the OTR code
    hook::unset_flag rewrite_outgoing_message_hook send

    # Only the message body is encrypted if appropriate
    set result [::otr::outgoingMessage $ctx($xlib,$to) $body]

    debugmsg otr "OUTGOING MESSAGE: $xlib; $to; $result;"

    array set res $result

1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279


1280
1281
1282
1283
1284
1285
1286

        store $xlib $to $isid $nid $istype $ntype $issubject $nsubject \
              1 $ctx(original_message_body,$xlib,$to) \
              $iserr $nerr $isthread $nthread $isx $nx
    }

    if {[info exists res(message)]} {
        set body $res(message)
    } else {
        # Disable sending
        hook::unset_flag rewrite_outgoing_message_hook send



        # Don't show this message in the chat log window
        # This flag makes sense only for chat messages, but causes no harm for
        # normal ones
        hook::unset_flag chat_send_message_hook draw
    }
    return
}







<
<
|
|

>
>







1271
1272
1273
1274
1275
1276
1277


1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289

        store $xlib $to $isid $nid $istype $ntype $issubject $nsubject \
              1 $ctx(original_message_body,$xlib,$to) \
              $iserr $nerr $isthread $nthread $isx $nx
    }

    if {[info exists res(message)]} {


        # Enable sending the message back
        hook::set_flag rewrite_outgoing_message_hook send

        set body $res(message)
    } else {
        # Don't show this message in the chat log window
        # This flag makes sense only for chat messages, but causes no harm for
        # normal ones
        hook::unset_flag chat_send_message_hook draw
    }
    return
}