- tor-commits - lists.torproject.org

[tor/master] Revert "Fix issues pointed out by nickm."
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 45c46129ed7a53844d6bed5ecda9d15dc8a676aa Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 6 19:49:20 2011 -0500 Revert "Fix issues pointed out by nickm." This reverts commit e097bffaed72af6b19f7293722021196bb94de1e. --- src/common/tortls.c | 26 ++++++++++---------------- 1 files changed, 10 insertions(+), 16 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 62d34f7..65c26cc 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1323,21 +1323,17 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address) return 1; } -/** We got an SSL ClientHello message. This might mean that the - * client wants to initiate a renegotiation and appropriate actions - * must be taken. */ +/** We sent the ServerHello part of an SSL handshake. This might mean + * that we completed a renegotiation and appropriate actions must be + * taken. */ static void -tor_tls_got_client_hello(tor_tls_t *tls) +tor_tls_got_server_hello(tor_tls_t *tls) { if (tls->server_handshake_count < 3) ++tls->server_handshake_count; if (tls->server_handshake_count == 2) { - if (!tls->negotiated_callback) { - log_warn(LD_BUG, "Got a renegotiation request but we don't" - " have a renegotiation callback set!"); - } - + tor_assert(tls->negotiated_callback); tls->got_renegotiate = 1; } @@ -1380,8 +1376,8 @@ tor_tls_state_changed_callback(const SSL *ssl, int type, int val) if (type == SSL_CB_ACCEPT_LOOP && ssl->state == SSL3_ST_SW_SRVR_HELLO_A) { - /* Call tor_tls_got_client_hello() for every SSL ClientHello we - receive. */ + /* Call tor_tls_got_server_hello() for every SSL ServerHello we + send. */ tor_tls_t *tls = tor_tls_get_by_ssl(ssl); if (!tls) { @@ -1389,7 +1385,7 @@ tor_tls_state_changed_callback(const SSL *ssl, int type, int val) return; } - tor_tls_got_client_hello(tls); + tor_tls_got_server_hello(tls); } #endif @@ -1660,10 +1656,8 @@ tor_tls_read(tor_tls_t *tls, char *cp, size_t len) #ifdef V2_HANDSHAKE_SERVER if (tls->got_renegotiate) { - if (tls->server_handshake_count != 2) { - log_warn(LD_BUG, "We did not notice renegotiation in a timely fashion (%u)!", - tls->server_handshake_count); - } + tor_assert(tls->server_handshake_count == 2); + /* XXX tor_assert(err == TOR_TLS_WANTREAD); */ /* Renegotiation happened! */ log_info(LD_NET, "Got a TLS renegotiation from %s", ADDR(tls));

1 0

[tor/master] Revert "Get rid of tor_tls_block_renegotiation()."
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 021ff31ba6c303ebf13e12e691ea74ca4b39a693 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 6 19:49:21 2011 -0500 Revert "Get rid of tor_tls_block_renegotiation()." This reverts commit 340809dd224b244675496e301d3ba154a6fe68d0. --- src/common/tortls.c | 10 ++++++++++ src/common/tortls.h | 1 + src/or/connection_or.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index ddb5ea1..9caf930 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1572,6 +1572,16 @@ tor_tls_unblock_renegotiation(tor_tls_t *tls) } } +/** If this version of openssl supports it, turn off renegotiation on + * tls. (Our protocol never requires this for security, but it's nice + * to use belt-and-suspenders here.) + */ +void +tor_tls_block_renegotiation(tor_tls_t *tls) +{ + tls->ssl->s3->flags &= ~SSL3_FLAGS_ALLOW_UNSAFE_LEGACY_RENEGOTIATION; +} + void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls) { diff --git a/src/common/tortls.h b/src/common/tortls.h index e558df7..673f18d 100644 --- a/src/common/tortls.h +++ b/src/common/tortls.h @@ -77,6 +77,7 @@ int tor_tls_handshake(tor_tls_t *tls); int tor_tls_finish_handshake(tor_tls_t *tls); int tor_tls_renegotiate(tor_tls_t *tls); void tor_tls_unblock_renegotiation(tor_tls_t *tls); +void tor_tls_block_renegotiation(tor_tls_t *tls); void tor_tls_assert_renegotiation_unblocked(tor_tls_t *tls); int tor_tls_shutdown(tor_tls_t *tls); int tor_tls_get_pending_bytes(tor_tls_t *tls); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 992db9a..cbe678d 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1149,6 +1149,10 @@ connection_or_tls_renegotiated_cb(tor_tls_t *tls, void *_conn) or_connection_t *conn = _conn; (void)tls; + /* Don't invoke this again. */ + tor_tls_set_renegotiate_callback(tls, NULL, NULL); + tor_tls_block_renegotiation(tls); + if (connection_tls_finish_handshake(conn) < 0) { /* XXXX_TLS double-check that it's ok to do this from inside read. */ /* XXXX_TLS double-check that this verifies certificates. */ @@ -1537,6 +1541,7 @@ connection_tls_finish_handshake(or_connection_t *conn) connection_or_init_conn_from_address(conn, &conn->_base.addr, conn->_base.port, digest_rcvd, 0); } + tor_tls_block_renegotiation(conn->tls); return connection_or_set_state_open(conn); } else { conn->_base.state = OR_CONN_STATE_OR_HANDSHAKING_V2;

1 0

[tor/master] Revert "Detect and deny excess renegotiations attempts."
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit e09dd43ab38e2f1a23010463b1188a1d3631e960 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 6 19:49:21 2011 -0500 Revert "Detect and deny excess renegotiations attempts." This reverts commit ecd239e3b577705e0669d47293a2e755cf93cec0. --- src/common/tortls.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index 9caf930..c0ff4e1 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -146,7 +146,7 @@ struct tor_tls_t { /** True iff we should call negotiated_callback when we're done reading. */ unsigned int got_renegotiate:1; /** Incremented every time we start the server side of a handshake. */ - unsigned int server_handshake_count:2; + uint8_t server_handshake_count; size_t wantwrite_n; /**< 0 normally, >0 if we returned wantwrite last * time. */ /** Last values retrieved from BIO_number_read()/write(); see @@ -1318,13 +1318,11 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address) static void tor_tls_got_server_hello(tor_tls_t *tls) { - if (tls->server_handshake_count < 3) - ++tls->server_handshake_count; - - if (tls->server_handshake_count == 2) { - tor_assert(tls->negotiated_callback); + /* Check whether we're watching for renegotiates. If so, this is one! */ + if (tls->negotiated_callback) tls->got_renegotiate = 1; - } + if (tls->server_handshake_count < 127) /*avoid any overflow possibility*/ + ++tls->server_handshake_count; /* Now check the cipher list. */ if (tor_tls_client_is_using_v2_ciphers(tls->ssl, ADDR(tls))) { @@ -1659,14 +1657,6 @@ tor_tls_read(tor_tls_t *tls, char *cp, size_t len) tls->got_renegotiate = 0; return r; - } else if (tls->server_handshake_count > 2) { - /* If we get more than 2 handshakes, it means that our peer is - trying to re-renegotiate. Return an error. */ - tor_assert(tls->server_handshake_count == 3); - - log_info(LD_NET, "Detected excess renegotiation from %s!", ADDR(tls)); - - return TOR_TLS_ERROR_MISC; } #endif

1 0

[tor/master] Revert "Detect renegotiation when it actually happens."
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 9727d21f68d0ef91f9c9002bebde425477bc4c6f Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 6 19:49:21 2011 -0500 Revert "Detect renegotiation when it actually happens." This reverts commit 4fd79f9def28996552b5739792f428c2514de1f6. --- src/common/tortls.c | 29 ++++++++++------------------- 1 files changed, 10 insertions(+), 19 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index c0ff4e1..e26fd1f 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1638,28 +1638,19 @@ tor_tls_read(tor_tls_t *tls, char *cp, size_t len) tor_assert(tls->state == TOR_TLS_ST_OPEN); tor_assert(len<INT_MAX); r = SSL_read(tls->ssl, cp, (int)len); - if (r > 0) /* return the number of characters read */ - return r; - - /* If we got here, SSL_read() did not go as expected. */ - - err = tor_tls_get_error(tls, r, CATCH_ZERO, "reading", LOG_DEBUG, LD_NET); - + if (r > 0) { #ifdef V2_HANDSHAKE_SERVER - if (tls->got_renegotiate) { - tor_assert(tls->server_handshake_count == 2); - /* XXX tor_assert(err == TOR_TLS_WANTREAD); */ - - /* Renegotiation happened! */ - log_info(LD_NET, "Got a TLS renegotiation from %s", ADDR(tls)); - if (tls->negotiated_callback) - tls->negotiated_callback(tls, tls->callback_arg); - tls->got_renegotiate = 0; - + if (tls->got_renegotiate) { + /* Renegotiation happened! */ + log_info(LD_NET, "Got a TLS renegotiation from %s", ADDR(tls)); + if (tls->negotiated_callback) + tls->negotiated_callback(tls, tls->callback_arg); + tls->got_renegotiate = 0; + } +#endif return r; } -#endif - + err = tor_tls_get_error(tls, r, CATCH_ZERO, "reading", LOG_DEBUG, LD_NET); if (err == _TOR_TLS_ZERORETURN || err == TOR_TLS_CLOSE) { log_debug(LD_NET,"read returned r=%d; TLS is closed",r); tls->state = TOR_TLS_ST_CLOSED;

1 0

[tor/master] Merge remote-tracking branch 'public/revert_4312'
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 8bb853b2a23e56505d598ee9c38ce56b4afe248c Merge: 299034e 0ebcf34 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 21:12:20 2011 -0500 Merge remote-tracking branch 'public/revert_4312' src/common/compat_libevent.c | 59 +------------- src/common/compat_libevent.h | 6 +- src/common/tortls.c | 177 +++++++++++++++++++----------------------- src/common/tortls.h | 5 +- src/common/util.c | 4 +- src/or/connection_or.c | 51 +++--------- src/or/or.h | 2 - 7 files changed, 102 insertions(+), 202 deletions(-)

1 0

[tor/master] Revert "Refactor the SSL_set_info_callback() callbacks."
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 0ebcf345ce6087deeb9f1a1a54b9e6d003822fc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Dec 6 19:49:21 2011 -0500 Revert "Refactor the SSL_set_info_callback() callbacks." This reverts commit 69a821ea1c9357acdd5aa1c9e23fd030b01cb5a9. --- src/common/tortls.c | 97 ++++++++++++++++++++++++++++----------------------- 1 files changed, 53 insertions(+), 44 deletions(-) diff --git a/src/common/tortls.c b/src/common/tortls.c index e26fd1f..e4992ef 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -1312,29 +1312,55 @@ tor_tls_client_is_using_v2_ciphers(const SSL *ssl, const char *address) return 1; } -/** We sent the ServerHello part of an SSL handshake. This might mean - * that we completed a renegotiation and appropriate actions must be - * taken. */ static void -tor_tls_got_server_hello(tor_tls_t *tls) +tor_tls_debug_state_callback(const SSL *ssl, int type, int val) { - /* Check whether we're watching for renegotiates. If so, this is one! */ - if (tls->negotiated_callback) - tls->got_renegotiate = 1; - if (tls->server_handshake_count < 127) /*avoid any overflow possibility*/ - ++tls->server_handshake_count; + log_debug(LD_HANDSHAKE, "SSL %p is now in state %s [type=%d,val=%d].", + ssl, ssl_state_to_string(ssl->state), type, val); +} + +/** Invoked when we're accepting a connection on ssl, and the connection + * changes state. We use this: + * <ul><li>To alter the state of the handshake partway through, so we + * do not send or request extra certificates in v2 handshakes.</li> + * <li>To detect renegotiation</li></ul> + */ +static void +tor_tls_server_info_callback(const SSL *ssl, int type, int val) +{ + tor_tls_t *tls; + (void) val; + + tor_tls_debug_state_callback(ssl, type, val); + + if (type != SSL_CB_ACCEPT_LOOP) + return; + if (ssl->state != SSL3_ST_SW_SRVR_HELLO_A) + return; + + tls = tor_tls_get_by_ssl(ssl); + if (tls) { + /* Check whether we're watching for renegotiates. If so, this is one! */ + if (tls->negotiated_callback) + tls->got_renegotiate = 1; + if (tls->server_handshake_count < 127) /*avoid any overflow possibility*/ + ++tls->server_handshake_count; + } else { + log_warn(LD_BUG, "Couldn't look up the tls for an SSL*. How odd!"); + return; + } /* Now check the cipher list. */ - if (tor_tls_client_is_using_v2_ciphers(tls->ssl, ADDR(tls))) { + if (tor_tls_client_is_using_v2_ciphers(ssl, ADDR(tls))) { /*XXXX_TLS keep this from happening more than once! */ /* Yes, we're casting away the const from ssl. This is very naughty of us. * Let's hope openssl doesn't notice! */ /* Set SSL_MODE_NO_AUTO_CHAIN to keep from sending back any extra certs. */ - SSL_set_mode((SSL*) tls->ssl, SSL_MODE_NO_AUTO_CHAIN); + SSL_set_mode((SSL*) ssl, SSL_MODE_NO_AUTO_CHAIN); /* Don't send a hello request. */ - SSL_set_verify((SSL*) tls->ssl, SSL_VERIFY_NONE, NULL); + SSL_set_verify((SSL*) ssl, SSL_VERIFY_NONE, NULL); if (tls) { tls->wasV2Handshake = 1; @@ -1349,35 +1375,6 @@ tor_tls_got_server_hello(tor_tls_t *tls) } #endif -/** This is a callback function for SSL_set_info_callback() and it - * will be called in every SSL state change. - * It logs the SSL state change, and executes any actions that must be - * taken. */ -static void -tor_tls_state_changed_callback(const SSL *ssl, int type, int val) -{ - log_debug(LD_HANDSHAKE, "SSL %p is now in state %s [type=%d,val=%d].", - ssl, ssl_state_to_string(ssl->state), type, val); - -#ifdef V2_HANDSHAKE_SERVER - if (type == SSL_CB_ACCEPT_LOOP && - ssl->state == SSL3_ST_SW_SRVR_HELLO_A) { - - /* Call tor_tls_got_server_hello() for every SSL ServerHello we - send. */ - - tor_tls_t *tls = tor_tls_get_by_ssl(ssl); - if (!tls) { - log_warn(LD_BUG, "Couldn't look up the tls for an SSL*. How odd!"); - return; - } - - tor_tls_got_server_hello(tls); - } -#endif - -} - /** Replace *ciphers with a new list of SSL ciphersuites: specifically, * a list designed to mimic a common web browser. Some of the ciphers in the * list won't actually be implemented by OpenSSL: that's okay so long as the @@ -1519,8 +1516,14 @@ tor_tls_new(int sock, int isServer) log_warn(LD_NET, "Newly created BIO has read count %lu, write count %lu", result->last_read_count, result->last_write_count); } - - SSL_set_info_callback(result->ssl, tor_tls_state_changed_callback); +#ifdef V2_HANDSHAKE_SERVER + if (isServer) { + SSL_set_info_callback(result->ssl, tor_tls_server_info_callback); + } else +#endif + { + SSL_set_info_callback(result->ssl, tor_tls_debug_state_callback); + } /* Not expected to get called. */ tls_log_errors(NULL, LOG_WARN, LD_NET, "creating tor_tls_t object"); @@ -1550,7 +1553,13 @@ tor_tls_set_renegotiate_callback(tor_tls_t *tls, tls->negotiated_callback = cb; tls->callback_arg = arg; tls->got_renegotiate = 0; - SSL_set_info_callback(tls->ssl, tor_tls_state_changed_callback); +#ifdef V2_HANDSHAKE_SERVER + if (cb) { + SSL_set_info_callback(tls->ssl, tor_tls_server_info_callback); + } else { + SSL_set_info_callback(tls->ssl, tor_tls_debug_state_callback); + } +#endif } /** If this version of openssl requires it, turn on renegotiation on

1 0

[tor/master] Remove 4312 from the changelog.
by nickm＠torproject.org 08 Dec '11

08 Dec '11

commit 00fae9a500475d7ebf1dd0f56c7fc78e2567c818 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Dec 7 21:10:32 2011 -0500 Remove 4312 from the changelog. --- ChangeLog | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a7d50a..ba0ae18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.3.9-alpha - 2011-1?-?? +Changes in version 0.2.3.9-alpha - 2011-12-?? o Major features: - When using OpenSSL 1.0.0 or later, use OpenSSL's counter mode implementation. It makes AES_CTR about 7% faster than our old one @@ -9,15 +9,8 @@ Changes in version 0.2.3.9-alpha - 2011-1?-?? censorship by allowing bridges to use protocol obfuscation plugins. It implements the 'managed proxy' part of proposal 180. Implements ticket 3472. - - Block excess renegotiations even if they are RFC5746 compliant. - This security fix mitigates potential SSL Denial of Service attacks - that use SSL renegotiation as a way of forcing the server to perform - unneeded computationally expensive SSL handshakes. Implements - ticket 4312. o Major bugfixes: - - Teach Tor how to notice excess renegotiation attempts before it - receives the first data SSL record. Fixes part of ticket 4312. - Only use the EVP interface when AES acceleration is enabled, to avoid a 5-7% performance regression. Resolves issue 4525; bugfix on 0.2.3.8-alpha.

1 0

[tor/master] clarify a debug line
by arma＠torproject.org 07 Dec '11

07 Dec '11

commit 299034edf5e05c81d535fc7d0b2120b6a2810477 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Dec 7 18:12:11 2011 -0500 clarify a debug line --- src/or/circuitbuild.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 7934a2e..a9e5d22 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2524,7 +2524,8 @@ onionskin_answer(or_circuit_t *circ, uint8_t cell_type, const char *payload, append_cell_to_circuit_queue(TO_CIRCUIT(circ), circ->p_conn, &cell, CELL_DIRECTION_IN, 0); - log_debug(LD_CIRC,"Finished sending 'created' cell."); + log_debug(LD_CIRC,"Finished sending '%s' cell.", + circ->is_first_hop ? "created_fast" : "created"); if (!is_local_addr(&circ->p_conn->_base.addr) && !connection_or_nonopen_was_started_here(circ->p_conn)) {

1 0

[torbutton/master] Bug 4517: Disable external drag and drop.
by mikeperry＠torproject.org 07 Dec '11

07 Dec '11

commit adc40a1d2c0d8be8b4e082fecc22722372b7a0cb Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Tue Dec 6 14:29:49 2011 -0800 Bug 4517: Disable external drag and drop. We basically remove all the url-containing drag and drop mime-types from the drag action. This seems to still allow you to drag stuff within TBB (because it uses its own internal secret types), but prevents dragging to outside apps. --- src/chrome.manifest | 1 + src/components/external-app-blocker.js | 103 +++++++++++++++++++++++++++++++- src/install.rdf | 2 +- 3 files changed, 102 insertions(+), 4 deletions(-) diff --git a/src/chrome.manifest b/src/chrome.manifest index cda8bb9..2172815 100644 --- a/src/chrome.manifest +++ b/src/chrome.manifest @@ -132,6 +132,7 @@ component {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} components/external-app-blocker contract @mozilla.org/mime;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} contract @mozilla.org/uriloader/external-protocol-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} contract @mozilla.org/uriloader/external-helper-app-service;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} +contract @mozilla.org/widget/dragservice;1 {3da0269f-fc29-4e9e-a678-c3b1cafcf13f} component {aef08952-b003-4697-b935-a392367e214f} components/tbSessionStore.js contract @torproject.org/torbutton-ss-blocker;1 {aef08952-b003-4697-b935-a392367e214f} diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index a83f50c..7b68a21 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -11,16 +11,21 @@ const kMODULE_CONTRACTID_APP = "@mozilla.org/uriloader/external-helper-app-servi const kMODULE_CONTRACTID_PROTO = "@mozilla.org/uriloader/external-protocol-service;1"; const kMODULE_CONTRACTID_MIME = "@mozilla.org/mime;1"; +const kMODULE_CONTRACTID_DRAG = "@mozilla.org/widget/dragservice;1"; + + const kMODULE_CID = Components.ID("3da0269f-fc29-4e9e-a678-c3b1cafcf13f"); /* Mozilla defined interfaces for FF3.0 */ const kREAL_EXTERNAL_CID = "{A7F800E0-4306-11d4-98D0-001083010E9B}"; - const kExternalInterfaces = ["nsIObserver", "nsIMIMEService", "nsIExternalHelperAppService", "nsISupportsWeakReference", // XXX: Uh-oh... "nsIExternalProtocolService", "nsPIExternalAppLauncher"]; + +const kREAL_DRAG_CID = "{8b5314bb-db01-11d2-96ce-0060b0fb9956}"; +const kDragInterfaces = ["nsIDragService"]; const Cr = Components.results; const Cc = Components.classes; @@ -38,6 +43,7 @@ function ExternalWrapper() { this.logger.log(3, "Component Load 0: New ExternalWrapper."); this._real_external = Components.classesByID[kREAL_EXTERNAL_CID]; + this._real_drag = Components.classesByID[kREAL_DRAG_CID]; this._interfaces = kExternalInterfaces; this._prefs = Components.classes["@mozilla.org/preferences-service;1"] @@ -52,6 +58,15 @@ function ExternalWrapper() { }; this.copyMethods(this._external()); + + this._drag = function() { + var drag = this._real_drag.getService(); + for (var i = 0; i < kDragInterfaces.length; i++) { + drag.QueryInterface(Components.interfaces[kDragInterfaces]); + } + return drag; + }; + this.copyMethods(this._drag()); } ExternalWrapper.prototype = @@ -62,8 +77,13 @@ ExternalWrapper.prototype = return this; } - var external = this._external().QueryInterface(iid); - this.copyMethods(external); + try { + var external = this._external().QueryInterface(iid); + this.copyMethods(external); + } catch(e) { + var drag = this._drag().QueryInterface(iid); + this.copyMethods(drag); + } return this; }, @@ -83,6 +103,10 @@ ExternalWrapper.prototype = interfaceList.push(Components.interfaces[this._interfaces[i]]); } + for (var i = 0; i < kDragInterfaces.length; i++) { + interfaceList.push(Components.interfaces[kDragInterfaces[i]]); + } + count.value = interfaceList.length; return interfaceList; }, @@ -199,6 +223,71 @@ ExternalWrapper.prototype = return this._external().doContent(aMimeContentType, aRequest, aWindowContext, aForceSave); }, + // from nsIDragService + invokeDragSessionWithImage: function(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer) { + aActionType = 0; + + for(var i = 0; i < aTransferableArray.Count(); i++) { + this.logger.log(3, "Inspecting drag+drop transfer: "+i); + var tr = aTransferableArray.GetElementAt(i); + tr.QueryInterface(Ci.nsITransferable); + + var flavors = tr.flavorsTransferableCanExport() + .QueryInterface(Ci.nsISupportsArray); + + for (var f=0; f < flavors.Count(); f++) { + var flavor =flavors.GetElementAt(f); + flavor.QueryInterface(Ci.nsISupportsCString); + + this.logger.log(3, "Got drag+drop flavor: "+flavor); + if (flavor == "text/x-moz-url" || + flavor == "text/x-moz-url-data" || + flavor == "text/uri-list" || + flavor == "application/x-moz-file-promise-url") { + this.logger.log(3, "Removing "+flavor); + try { tr.removeDataFlavor(flavor); } catch(e) {} + continue; + } + + /* + var data = {}, len = {}; + try { + tr.getTransferData(flavor, data, len); + this.logger.log(3, "Got data: "+data.value.QueryInterface(Ci.nsISupportsString).data); + } catch(e) { + } + */ + } + } + + return this._drag().invokeDragSessionWithImage(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer); + }, + /* + fireDragEventAtSource: function( aMsg ) { + this.logger.log(4, "FIRE AT THE SOURCE!!!"); + return this._drag().fireDragEventAtSource(aMsg); + }, + + invokeDragSession: function(aDOMNode, aTransferables, aRegion, aActionType ) { + this.logger.log(4, "InvokeDragSession!"); + return this._drag().invokeDragSession(aDOMNode, aTransferables, aRegion, aActionType ); + }, + invokeDragSessionWithSelection: function(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer) { + this.logger.log(4, "InvokeDragSessionWithSelection!!"); + return this._drag().invokeDragSessionWithSelection(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer); + }, + + endDragSession: function(aDoneDrag) { + this.logger.log(4, "EndDrag"); + return this._drag().endDragSession(aDoneDrag); + }, + + startDragSesssion: function() { + this.logger.log(4, "StartDrag"); + return this._drag().startDragSession(); + } + */ + }; var ExternalWrapperSingleton = null; @@ -250,6 +339,14 @@ function (compMgr, fileSpec, location, type) { fileSpec, location, type); + + compMgr.registerFactoryLocation(kMODULE_CID, + kMODULE_NAME, + kMODULE_CONTRACTID_DRAG, + fileSpec, + location, + type); + }; ExternalWrapperModule.getClassObject = function (compMgr, cid, iid) diff --git a/src/install.rdf b/src/install.rdf index 3a95f96..34e433c 100644 --- a/src/install.rdf +++ b/src/install.rdf @@ -6,7 +6,7 @@ <em:name>Torbutton</em:name> <em:creator>Mike Perry & Kory Kirk</em:creator> <em:id>{e0204bd5-9d31-402b-a99d-a6aa8ffebdca}</em:id> - <em:version>1.4.4.1</em:version> + <em:version>1.4.5pre</em:version> <em:homepageURL>https://www.torproject.org/torbutton/</em:homepageURL> <em:optionsURL>chrome://torbutton/content/preferences.xul</em:optionsURL> <em:iconURL>chrome://torbutton/skin/tor.png</em:iconURL>

1 0

[torbutton/master] Remove some commented logging statements.
by mikeperry＠torproject.org 07 Dec '11

07 Dec '11

commit 6d929eaab9347152e440908441ed06628de13f85 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Wed Dec 7 14:31:04 2011 -0800 Remove some commented logging statements. Want to keep them in the git history, though. --- src/components/external-app-blocker.js | 35 -------------------------------- 1 files changed, 0 insertions(+), 35 deletions(-) diff --git a/src/components/external-app-blocker.js b/src/components/external-app-blocker.js index 7b68a21..ff81cad 100644 --- a/src/components/external-app-blocker.js +++ b/src/components/external-app-blocker.js @@ -246,47 +246,12 @@ ExternalWrapper.prototype = flavor == "application/x-moz-file-promise-url") { this.logger.log(3, "Removing "+flavor); try { tr.removeDataFlavor(flavor); } catch(e) {} - continue; } - - /* - var data = {}, len = {}; - try { - tr.getTransferData(flavor, data, len); - this.logger.log(3, "Got data: "+data.value.QueryInterface(Ci.nsISupportsString).data); - } catch(e) { - } - */ } } return this._drag().invokeDragSessionWithImage(aDOMNode, aTransferableArray, aRegion, aActionType, aImage, aImageX, aImageY, aDragEvent, aDataTransfer); }, - /* - fireDragEventAtSource: function( aMsg ) { - this.logger.log(4, "FIRE AT THE SOURCE!!!"); - return this._drag().fireDragEventAtSource(aMsg); - }, - - invokeDragSession: function(aDOMNode, aTransferables, aRegion, aActionType ) { - this.logger.log(4, "InvokeDragSession!"); - return this._drag().invokeDragSession(aDOMNode, aTransferables, aRegion, aActionType ); - }, - invokeDragSessionWithSelection: function(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer) { - this.logger.log(4, "InvokeDragSessionWithSelection!!"); - return this._drag().invokeDragSessionWithSelection(aSelection, aTransferableArray, aActionType, aDragEvent, aDataTransfer); - }, - - endDragSession: function(aDoneDrag) { - this.logger.log(4, "EndDrag"); - return this._drag().endDragSession(aDoneDrag); - }, - - startDragSesssion: function() { - this.logger.log(4, "StartDrag"); - return this._drag().startDragSession(); - } - */ };

1 0