- tor-commits - lists.torproject.org

[obfsproxy/master] Add brief file-level documentation for all source files.
by nickm＠torproject.org 12 Dec '11

12 Dec '11

commit 6016f54a961d51fe8a2fc2bbee18d41d0127d092 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sun Dec 11 05:18:59 2011 +0100 Add brief file-level documentation for all source files. --- Doxyfile | 2 +- src/container.h | 5 +++++ src/crypt.c | 6 ++++++ src/crypt.h | 5 +++++ src/external.c | 6 ++++++ src/external.h | 5 +++++ src/ht.h | 5 +++++ src/main.c | 11 +++++++++++ src/main.h | 6 ++++++ src/managed.c | 6 ++++++ src/managed.h | 5 +++++ src/network.c | 8 ++++++++ src/network.h | 5 +++++ src/obfs_main.c | 6 ++++++ src/protocol.c | 9 +++++++++ src/protocol.h | 5 +++++ src/protocols/dummy.c | 7 +++++++ src/protocols/dummy.h | 6 ++++++ src/protocols/obfs2.c | 7 +++++++ src/protocols/obfs2.h | 5 +++++ src/sha256.c | 13 ++++++++++--- src/sha256.h | 8 +++++++- src/socks.c | 6 ++++++ src/socks.h | 5 +++++ src/test/tester.py.in | 14 ++++++++------ src/util.c | 6 ++++++ src/util.h | 5 +++++ 27 files changed, 166 insertions(+), 11 deletions(-) diff --git a/Doxyfile b/Doxyfile index ba1d24a..a479ab2 100644 --- a/Doxyfile +++ b/Doxyfile @@ -534,7 +534,7 @@ WARN_LOGFILE = # directories like "/usr/src/myproject". Separate the files or directories # with spaces. -INPUT = src/ +INPUT = src/ src/protocols/ # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is diff --git a/src/container.h b/src/container.h index 129e4f9..ff5b9e2 100644 --- a/src/container.h +++ b/src/container.h @@ -3,6 +3,11 @@ * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See LICENSE for licensing information */ +/** + * \file container.h + * \brief Headers for container.c. + **/ + #ifndef CONTAINER_H #define CONTAINER_H diff --git a/src/crypt.c b/src/crypt.c index 62d99fe..b8240be 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file crypt.c + * \headerfile crypt.h + * \brief Cryptographic functions. + **/ + #include "util.h" #define CRYPT_PRIVATE diff --git a/src/crypt.h b/src/crypt.h index 51bbc57..bf20803 100644 --- a/src/crypt.h +++ b/src/crypt.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file crypt.h + * \brief Headers for crypt.c. + **/ + #ifndef CRYPT_H #define CRYPT_H diff --git a/src/external.c b/src/external.c index e05deca..3a79909 100644 --- a/src/external.c +++ b/src/external.c @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file external.c + * \headerfile external.h + * \brief Implements the 'external proxy' mode of obfsproxy. + **/ + #include "util.h" #include "container.h" diff --git a/src/external.h b/src/external.h index 6bfcb46..d9d987c 100644 --- a/src/external.h +++ b/src/external.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file external.h + * \brief Headers for external.c. + **/ + #ifndef EXTERNAL_H #define EXTERNAL_H diff --git a/src/ht.h b/src/ht.h index 8c45db1..6733612 100644 --- a/src/ht.h +++ b/src/ht.h @@ -3,6 +3,11 @@ * Copyright (c) 2007-2011, The Tor Project, Inc. */ /* See license at end. */ +/** + * \file ht.h + * \brief Hash table functions. + **/ + /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */ #ifndef HT_H diff --git a/src/main.c b/src/main.c index c7515a2..e03daf0 100644 --- a/src/main.c +++ b/src/main.c @@ -2,6 +2,17 @@ See LICENSE for other credits and copying information */ +/** + * \file main.c + * \headerfile main.h + * \brief Entry point of obfsproxy. Does command-line parsing, and + * switches into 'external' or 'managed' proxy mode. + * + * (Practically, obfs_main.c is the actual entry point of obfsproxy, + * but all it does is call obfs_main().) + **/ + + #include "util.h" #include "container.h" diff --git a/src/main.h b/src/main.h index 538cfdd..65900b3 100644 --- a/src/main.h +++ b/src/main.h @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file main.h + * \brief Headers for main.c. + **/ + + #ifndef MAIN_H #define MAIN_H diff --git a/src/managed.c b/src/managed.c index 99f8290..71658dc 100644 --- a/src/managed.c +++ b/src/managed.c @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file managed.c + * \headerfile managed.h + * \brief Implements the 'managed proxy' mode of obfsproxy. + **/ + #include "util.h" #define MANAGED_PRIVATE diff --git a/src/managed.h b/src/managed.h index 2b14c2b..34382f5 100644 --- a/src/managed.h +++ b/src/managed.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file managed.h + * \brief Headers for managed.c. + **/ + #ifndef MANAGED_H #define MANAGED_H diff --git a/src/network.c b/src/network.c index a1fbe41..5c3cedf 100644 --- a/src/network.c +++ b/src/network.c @@ -2,6 +2,14 @@ See LICENSE for other credits and copying information */ +/** + * \file network.c + * \headerfile network.h + * \brief Networking side of obfspoxy. Creates listeners, accepts + * connections, reads/writes data, and calls transport callbacks when + * applicable. + **/ + #include "util.h" #define NETWORK_PRIVATE diff --git a/src/network.h b/src/network.h index 97e3d8c..825a91e 100644 --- a/src/network.h +++ b/src/network.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file network.h + * \brief Headers for network.c. + **/ + #ifndef NETWORK_H #define NETWORK_H diff --git a/src/obfs_main.c b/src/obfs_main.c index c891e05..f787d69 100644 --- a/src/obfs_main.c +++ b/src/obfs_main.c @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file obfs_main.c + * \brief Real entry point of obfsproxy. Immediately calls + * main.c:obfs_main(). + **/ + int obfs_main(int argc, char *argv[]); /** diff --git a/src/protocol.c b/src/protocol.c index 81fd454..4abff90 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -2,6 +2,15 @@ See LICENSE for other credits and copying information */ +/** + * \file protocol.c + * \headerfile protocol.h + * \brief Pluggable transports-related functions. Acts as a wrapper on + * top of transport callbacks and transport-specific option parsing. + * + * 'Protocol' is a synonym to 'pluggable transport' in obfsproxy code. + **/ + #include "util.h" #include "network.h" #include "protocol.h" diff --git a/src/protocol.h b/src/protocol.h index d360594..2dcc535 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file protocol.h + * \brief Headers for protocol.c. + **/ + #ifndef PROTOCOL_H #define PROTOCOL_H diff --git a/src/protocols/dummy.c b/src/protocols/dummy.c index 21fd3ca..f27f48b 100644 --- a/src/protocols/dummy.c +++ b/src/protocols/dummy.c @@ -2,6 +2,13 @@ See LICENSE for other credits and copying information */ +/** + * \file dummy.c + * \headerfile dummy.h + * \brief Implements the 'dummy' pluggable transport. A testing-only + * pluggable transport that leaves traffic intact + **/ + #include "util.h" #define PROTOCOL_DUMMY_PRIVATE diff --git a/src/protocols/dummy.h b/src/protocols/dummy.h index 3dc1995..150b3ff 100644 --- a/src/protocols/dummy.h +++ b/src/protocols/dummy.h @@ -1,6 +1,12 @@ /* Copyright 2011 Nick Mathewson, George Kadianakis See LICENSE for other credits and copying information */ + +/** + * \file dummy.h + * \brief Headers for dummy.c. + **/ + #ifndef PROTOCOL_DUMMY_H #define PROTOCOL_DUMMY_H diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index 6e241c3..de26858 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -2,6 +2,13 @@ See LICENSE for other credits and copying information */ +/** + * \file obfs2.c + * \headerfile obfs2.h + * \brief Implements the 'obfs2' pluggable transport. + **/ + + #include "util.h" #define PROTOCOL_OBFS2_PRIVATE diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index fb07407..6030c79 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file obfs2.h + * \brief Headers for obfs2.c. + **/ + #ifndef PROTOCOL_OBFS2_H #define PROTOCOL_OBFS2_H diff --git a/src/sha256.c b/src/sha256.c index 8d835d4..349cdeb 100644 --- a/src/sha256.c +++ b/src/sha256.c @@ -1,8 +1,15 @@ /* Copyright (c) 2009-2011, The Tor Project, Inc. */ /* See the LICENSE file for licensing information */ -/* This SHA256 implementation is adapted from the public domain one in - LibTomCrypt, version 1.6. Tor uses it on platforms where OpenSSL doesn't - have a SHA256. */ + +/** + * \file sha256.c + * \headerfile sha256.h + * \brief SHA256 implementation by Tom St Denis. + * + * This SHA256 implementation is adapted from the public domain one in + * LibTomCrypt, version 1.6. Tor uses it on platforms where OpenSSL + * doesn't have a SHA256. + **/ #include "util.h" diff --git a/src/sha256.h b/src/sha256.h index 6afdbfe..033f00d 100644 --- a/src/sha256.h +++ b/src/sha256.h @@ -1,4 +1,10 @@ -/* Header file for the fallback (libtomcrypt) implementation of SHA256. */ +/* See the LICENSE file for licensing information */ + +/** + * \file sha256.h + * \brief Headers for sha256.c. + **/ + #ifndef SHA256_H #define SHA256_H diff --git a/src/socks.c b/src/socks.c index 46bc5d5..51c6dff 100644 --- a/src/socks.c +++ b/src/socks.c @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file socks.c + * \headerfile socks.h + * \brief SOCKS{5,4,4a} server. + **/ + #include "util.h" #define SOCKS_PRIVATE diff --git a/src/socks.h b/src/socks.h index a06a11e..4e0bdfa 100644 --- a/src/socks.h +++ b/src/socks.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file socks.h + * \brief Headers for socks.c. + **/ + #ifndef SOCKS_H #define SOCKS_H diff --git a/src/test/tester.py.in b/src/test/tester.py.in index 4b93784..ea46d1f 100644 --- a/src/test/tester.py.in +++ b/src/test/tester.py.in @@ -1,11 +1,13 @@ #! @PYTHON@ -# Integration tests for obfsproxy. -# -# The obfsproxy binary is assumed to exist in the current working -# directory, and you need to have Python 2.6 or better (but not 3). -# You need to be able to make connections to arbitrary high-numbered -# TCP ports on the loopback interface. +"""@package tester.py.in +Integration tests for obfsproxy. + +The obfsproxy binary is assumed to exist in the current working +directory, and you need to have Python 2.6 or better (but not 3). +You need to be able to make connections to arbitrary high-numbered +TCP ports on the loopback interface. +""" import difflib import errno diff --git a/src/util.c b/src/util.c index f56ba58..db0dc77 100644 --- a/src/util.c +++ b/src/util.c @@ -2,6 +2,12 @@ See LICENSE for other credits and copying information */ +/** + * \file util.c + * \headerfile util.h + * \brief Utility functions. + **/ + #include "util.h" #include <errno.h> diff --git a/src/util.h b/src/util.h index 2b37c48..8a7585b 100644 --- a/src/util.h +++ b/src/util.h @@ -2,6 +2,11 @@ See LICENSE for other credits and copying information */ +/** + * \file util.h + * \brief Headers for util.c. + **/ + #ifndef UTIL_H #define UTIL_H

1 0

[obfsproxy/master] Add detailed file-level documentation.
by nickm＠torproject.org 12 Dec '11

12 Dec '11

commit fec1360c7a20e7d06b7c12946e7ffd10286a67db Author: George Kadianakis <desnacked(a)gmail.com> Date: Mon Dec 12 11:36:17 2011 +0100 Add detailed file-level documentation. --- Doxyfile | 2 +- src/crypt.c | 2 + src/main.c | 5 +-- src/managed.c | 8 ++++++ src/network.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ src/obfs_main.c | 3 ++ src/protocol.c | 10 ++++++-- src/protocols/dummy.h | 3 ++ src/protocols/obfs2.c | 19 +++++++++++++++- src/protocols/obfs2.h | 17 ++++++++++++++ src/sha256.c | 6 ++-- src/socks.c | 58 +++++++++++++++++++++++++++++++----------------- src/util.c | 6 +++++ 13 files changed, 162 insertions(+), 32 deletions(-) diff --git a/Doxyfile b/Doxyfile index a479ab2..b2e21c1 100644 --- a/Doxyfile +++ b/Doxyfile @@ -1118,7 +1118,7 @@ PERLMOD_MAKEVAR_PREFIX = # evaluate all C-preprocessor directives found in the sources and include # files. -ENABLE_PREPROCESSING = YES +ENABLE_PREPROCESSING = NO # If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro # names in the source code. If set to NO (the default) only conditional diff --git a/src/crypt.c b/src/crypt.c index b8240be..e70ec29 100644 --- a/src/crypt.c +++ b/src/crypt.c @@ -6,6 +6,8 @@ * \file crypt.c * \headerfile crypt.h * \brief Cryptographic functions. + * + * \details Most functions here are wrappers of OpenSSL functions. **/ #include "util.h" diff --git a/src/main.c b/src/main.c index e03daf0..76158e0 100644 --- a/src/main.c +++ b/src/main.c @@ -8,11 +8,10 @@ * \brief Entry point of obfsproxy. Does command-line parsing, and * switches into 'external' or 'managed' proxy mode. * - * (Practically, obfs_main.c is the actual entry point of obfsproxy, - * but all it does is call obfs_main().) + * \details Practically, obfs_main.c is the actual entry point of + * obfsproxy, but all it really does is call obfs_main(). **/ - #include "util.h" #include "container.h" diff --git a/src/managed.c b/src/managed.c index 71658dc..d70c1cf 100644 --- a/src/managed.c +++ b/src/managed.c @@ -6,6 +6,14 @@ * \file managed.c * \headerfile managed.h * \brief Implements the 'managed proxy' mode of obfsproxy. + * + * \details This is an implementation of managed proxies according to + * the 180-pluggable-transport.txt specification. The entry point is + * launch_managed_proxy() where a managed_proxy_t instance is created + * to represent our managed proxy. We read and validate the + * environment variables that tor should have prepared for us, launch + * the appropriate listeners, and finally kickstart libevent to start + * accepting connections. **/ #include "util.h" diff --git a/src/network.c b/src/network.c index 5c3cedf..3ede3ab 100644 --- a/src/network.c +++ b/src/network.c @@ -8,6 +8,61 @@ * \brief Networking side of obfspoxy. Creates listeners, accepts * connections, reads/writes data, and calls transport callbacks when * applicable. + * + * \details Terminology: + * + * A connection is a bidirectional communications channel, + * usually backed by a network socket, and represented in this layer + * by a conn_t, wrapping a libevent bufferevent. + * + * A circuit is a pair of connections, referred to as the + * upstream and downstream connections. A circuit + * is represented by a circuit_t. The upstream connection of a + * circuit communicates in cleartext with the higher-level program + * that wishes to make use of our obfuscation service. The + * downstream connection commmunicates in an obfuscated fashion with + * the remote peer that the higher-level client wishes to contact. + * + * A listener is a listening socket bound to a particular + * obfuscation protocol, represented in this layer by a listener_t + * and its config_t. Connecting to a listener creates one + * connection of a circuit, and causes this program to initiate the + * other connection (possibly after receiving in-band instructions + * about where to connect to). A listener is said to be a + * client listener if connecting to it creates the + * upstream connection, and a server listener if + * connecting to it creates the downstream connection. + * + * There are two kinds of client listeners: a simple client + * listener always connects to the same remote peer every time it + * needs to initiate a downstream connection; a socks + * client listener can be told to connect to an arbitrary remote + * peer using the SOCKS protocol (version 4 or 5). + * + * The diagram below might help demonstrate the relationship between + * connections and circuits: + * + *\verbatim + downstream + + 'circuit_t C' 'conn_t CD' 'conn_t SD' 'circuit_t S' + +-----------+ +-----------+ + upstream ----|obfsproxy c|-------------|obfsproxy s|---- upstream + | +-----------+ +-----------+ | + 'conn_t CU'| |'conn_t SU' + +------------+ +--------------+ + | Tor Client | | Tor Bridge | + +------------+ +--------------+ + + \endverbatim + * + * In the above diagram, obfsproxy c is the client-side + * obfsproxy, and obfsproxy s is the server-side + * obfsproxy. conn_t CU is the Client's Upstream connection, + * the communication channel between tor and obfsproxy. conn_t + * CD is the Client's Downstream connection, the communication + * channel between obfsproxy and the remote peer. These two + * connections form circuit_t C. **/ #include "util.h" diff --git a/src/obfs_main.c b/src/obfs_main.c index f787d69..08399eb 100644 --- a/src/obfs_main.c +++ b/src/obfs_main.c @@ -6,6 +6,9 @@ * \file obfs_main.c * \brief Real entry point of obfsproxy. Immediately calls * main.c:obfs_main(). + * + * \details This all happens so that our unittests binary can link + * against main.c. **/ int obfs_main(int argc, char *argv[]); diff --git a/src/protocol.c b/src/protocol.c index 4abff90..4b97d4e 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -5,10 +5,14 @@ /** * \file protocol.c * \headerfile protocol.h - * \brief Pluggable transports-related functions. Acts as a wrapper on - * top of transport callbacks and transport-specific option parsing. + * \brief Pluggable transports-related functions. * - * 'Protocol' is a synonym to 'pluggable transport' in obfsproxy code. + * \details Acts as an intermediary between generic obfsproxy code, + * and pluggable transports code. Provides wrappers for + * transport-specific configuration, and callbacks. + * + * Note that in obfsproxy code, 'protocol' is a synonym to 'pluggable + * transport'. **/ #include "util.h" diff --git a/src/protocols/dummy.h b/src/protocols/dummy.h index 150b3ff..b5cb3a6 100644 --- a/src/protocols/dummy.h +++ b/src/protocols/dummy.h @@ -28,6 +28,7 @@ extern const protocol_vtable dummy_vtable; also because, if you're using dummy as a template, you probably will want to extend the generic structures. */ +/** \private \extends config_t */ typedef struct dummy_config_t { config_t super; struct evutil_addrinfo *listen_addr; @@ -35,10 +36,12 @@ typedef struct dummy_config_t { enum listen_mode mode; } dummy_config_t; +/** \private \extends conn_t */ typedef struct dummy_conn_t { conn_t super; } dummy_conn_t; +/** \private \extends circuit_t */ typedef struct dummy_circuit_t { circuit_t super; } dummy_circuit_t; diff --git a/src/protocols/obfs2.c b/src/protocols/obfs2.c index de26858..213e36f 100644 --- a/src/protocols/obfs2.c +++ b/src/protocols/obfs2.c @@ -6,9 +6,26 @@ * \file obfs2.c * \headerfile obfs2.h * \brief Implements the 'obfs2' pluggable transport. + * + * \details We track the state of the obfs2 protocol in the + * state member of obfs2_state_t. + * + * The first step of the obfs2 protocol, is to send the handshake + * message (obfs2_handshake()) and move to the initial state which is + * ST_WAIT_FOR_KEY. + * + * During ST_WAIT_FOR_KEY, we are waiting for the key of our + * peer. obfs2_recv() is responsible for picking up the key from our + * peer's handshake message, deriving additional keys out of it + * (init_crypto()), and progressing to the ST_WAIT_FOR_PADDING state. + * + * During ST_WAIT_FOR_PADDING, we are waiting for the amount + * of padding that our peer promised in his handshake message. When we + * receive the padding, we move to the final state ST_OPEN + * and start exchanging data messages with our peer using the derived + * keys. **/ - #include "util.h" #define PROTOCOL_OBFS2_PRIVATE diff --git a/src/protocols/obfs2.h b/src/protocols/obfs2.h index 6030c79..74b65a1 100644 --- a/src/protocols/obfs2.h +++ b/src/protocols/obfs2.h @@ -74,20 +74,37 @@ typedef struct obfs2_state_t { int padding_left_to_read; } obfs2_state_t; +/** config_t for obfs2. + * \private \extends config_t + */ typedef struct obfs2_config_t { + /** Base config_t. */ config_t super; + /** Address to listen on. */ struct evutil_addrinfo *listen_addr; + /** Address to connect to. */ struct evutil_addrinfo *target_addr; + /** Listener mode. */ enum listen_mode mode; + /** obfs2 shared secret. */ uchar shared_secret[SHARED_SECRET_LENGTH]; } obfs2_config_t; +/** conn_t for obfs2. + * \private \extends conn_t + */ typedef struct obfs2_conn_t { + /** Base conn_t. */ conn_t super; } obfs2_conn_t; +/** circuit_t for obfs2. + * \private \extends circuit_t + */ typedef struct obfs2_circuit_t { + /** Base circuit_t. */ circuit_t super; + /** State of obfs2 for this circuit. */ obfs2_state_t *state; } obfs2_circuit_t; diff --git a/src/sha256.c b/src/sha256.c index 349cdeb..f6bbd7a 100644 --- a/src/sha256.c +++ b/src/sha256.c @@ -6,9 +6,9 @@ * \headerfile sha256.h * \brief SHA256 implementation by Tom St Denis. * - * This SHA256 implementation is adapted from the public domain one in - * LibTomCrypt, version 1.6. Tor uses it on platforms where OpenSSL - * doesn't have a SHA256. + * \details This SHA256 implementation is adapted from the public + * domain one in LibTomCrypt, version 1.6. Tor uses it on platforms + * where OpenSSL doesn't have a SHA256. **/ #include "util.h" diff --git a/src/socks.c b/src/socks.c index 51c6dff..98cb678 100644 --- a/src/socks.c +++ b/src/socks.c @@ -6,6 +6,43 @@ * \file socks.c * \headerfile socks.h * \brief SOCKS{5,4,4a} server. + * + * \details + * Every circuit_t has a socks_state_t attached + * to it, representing the state of the SOCKS protocol on that + * circuit. + * + * If we are a client using SOCKS, and we haven't completed the SOCKS + * handshake, socks_read_cb() passes all incoming data to + * handle_socks(). On a valid 'Client request' packet, we parse the + * requested address into struct parsereq of + * socks_state_t, and toggle SOCKS' state to ST_HAVE_ADDR. When + * socks_read_cb() notices that we are in ST_HAVE_ADDR, it connects to + * the requested address to set up the proxying tunnel. Upon a + * successful connection, pending_socks_cb() sends back a 'Server + * reply' and sets up the proxying tunnel. + * + * SOCKS5 protocol handshake: + * + * Client ------------------------> Server\n + * Method Negotiation Packet (socks5_handle_negotiation()) + * + * Client <------------------------ Server\n + * Method Negotiation Reply (socks5_do_negotiation()) + * + * Client ------------------------> Server\n + * Client request (socks5_handle_request()) + * + * Client <------------------------ Server\n + * Server reply (socks5_send_reply()) + * + * SOCKS{4,4a} protocol handshake: + * + * Client ------------------------> Server\n + * Client Request (socks4_read_request()) + * + * Client <------------------------ Server\n + * Server reply (socks4_send_reply()) **/ #include "util.h" @@ -17,27 +54,6 @@ #include <event2/buffer.h> -/** - General SOCKS5 idea: - - Client ------------------------> Server - Method Negotiation Packet - - Client <------------------------ Server - Method Negotiation Reply - - Client ------------------------> Server - Client request - - Client <------------------------ Server - Server reply - - "Method Negotiation Packet" is handled by: socks5_handle_negotiation() - "Method Negotiation Reply" is done by: socks5_do_negotiation() - "Client request" is handled by: socks5_handle_request() - "Server reply" is done by: socks5_send_reply() -*/ - typedef unsigned char uchar; diff --git a/src/util.c b/src/util.c index db0dc77..c63a651 100644 --- a/src/util.c +++ b/src/util.c @@ -6,6 +6,12 @@ * \file util.c * \headerfile util.h * \brief Utility functions. + * + * \details Contains: + * - wrappers of malloc() et al. + * - network functions + * - string functions + * - functions used by obfsproxy's logging subsystem **/ #include "util.h"

1 0

[doctor/master] Remove an unnecessary word in a status message.
by karsten＠torproject.org 12 Dec '11

12 Dec '11

commit ccca2e76026b095a072b2f6975d40590f737f1bf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 12 15:38:45 2011 +0100 Remove an unnecessary word in a status message. --- src/org/torproject/doctor/StatusFileReport.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index a43a27e..884dc18 100755 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -147,7 +147,7 @@ public class StatusFileReport implements Report { case ConsensusMissingSignatures: warningStrings.put("The consensuses downloaded from the " + "following authorities are missing signatures from " - + "other, previously voting authorities: " + details, + + "previously voting authorities: " + details, 150L * 60L * 1000L); break; }

1 0

[metrics-lib/master] Don't forget to set the request timeout value.
by karsten＠torproject.org 12 Dec '11

12 Dec '11

commit b656101ecc0a772e0ca74b63a9f477b668182eb5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 12 14:42:46 2011 +0100 Don't forget to set the request timeout value. --- .../impl/RelayDescriptorDownloaderImpl.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java index 6c56164..a1e1473 100755 --- a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java @@ -260,12 +260,12 @@ public class RelayDescriptorDownloaderImpl this.globalTimerThread.start(); for (DirectoryDownloader directoryMirror : this.directoryMirrors.values()) { - directoryMirror.downloadCoordinator = this; + directoryMirror.setRequestTimeout(this.requestTimeoutMillis); new Thread(directoryMirror).start(); } for (DirectoryDownloader directoryAuthority : this.directoryAuthorities.values()) { - directoryAuthority.downloadCoordinator = this; + directoryAuthority.setRequestTimeout(this.requestTimeoutMillis); new Thread(directoryAuthority).start(); } }

1 0

[doctor/master] Use the new metrics-lib for downloading consensuses and votes.
by karsten＠torproject.org 12 Dec '11

12 Dec '11

commit 0c96c1a6410dd93545692de70f66be2357f0dcbd Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 12 11:29:03 2011 +0100 Use the new metrics-lib for downloading consensuses and votes. Don't use the lib for parsing consensuses and votes. That part is not implemented yet. --- build.xml | 1 + src/org/torproject/doctor/Downloader.java | 261 ++++++----------------------- 2 files changed, 52 insertions(+), 210 deletions(-) diff --git a/build.xml b/build.xml index 2db0db4..feedb12 100755 --- a/build.xml +++ b/build.xml @@ -5,6 +5,7 @@ <path id="classpath"> <pathelement path="${classes}"/> <pathelement location="${libs}/commons-codec-1.4.jar"/> + <pathelement location="${libs}/descriptor.jar"/> </path> <target name="init"> <mkdir dir="${classes}"/> diff --git a/src/org/torproject/doctor/Downloader.java b/src/org/torproject/doctor/Downloader.java index a2e6db5..a82ac8d 100755 --- a/src/org/torproject/doctor/Downloader.java +++ b/src/org/torproject/doctor/Downloader.java @@ -7,241 +7,82 @@ import java.net.*; import java.text.*; import java.util.*; import java.util.zip.*; +import org.torproject.descriptor.*; /* Download the latest network status consensus and corresponding * votes. */ public class Downloader { - /* List of directory authorities to download consensuses and votes - * from. */ - private SortedMap<String, String> authorities = - new TreeMap<String, String>(); - public Downloader() { - this.authorities.put("gabelmoo", "212.112.245.170"); - this.authorities.put("tor26", "86.59.21.38"); - this.authorities.put("ides", "216.224.124.114:9030"); - this.authorities.put("maatuska", "213.115.239.118:443"); - this.authorities.put("dannenberg", "193.23.244.244"); - this.authorities.put("urras", "208.83.223.34:443"); - this.authorities.put("moria1", "128.31.0.34:9131"); - this.authorities.put("dizum", "194.109.206.212"); - } - /* Download a new consensus and corresponding votes. */ public void downloadFromAuthorities() { - this.downloadConsensus(); - if (!this.downloadedConsensuses.isEmpty()) { - this.parseConsensusToFindReferencedVotes(); - this.downloadReferencedVotes(); - } - } - /* Download the most recent consensus from all authorities. */ - private List<Download> downloadedConsensuses = - new ArrayList<Download>(); - private void downloadConsensus() { - Map<String, String> urls = new HashMap<String, String>(); - for (Map.Entry<String, String> e : this.authorities.entrySet()) { - String nickname = e.getKey(); - String address = e.getValue(); - String resource = "/tor/status-vote/current/consensus.z"; - String fullUrl = "http://" + address + resource; - urls.put(fullUrl, nickname); - } - this.downloadedConsensuses = this.downloadFromAuthority(urls); - if (this.downloadedConsensuses.isEmpty()) { - System.err.println("Could not download consensus from any of the " - + "directory authorities. Ignoring."); - } - } + RelayDescriptorDownloader downloader = + DescriptorSourceFactory.createRelayDescriptorDownloader(); - /* Downloads a consensus or vote in a separate thread that can be - * interrupted after a timeout. */ - private static class DownloadRunnable implements Runnable { - Thread mainThread; - String nickname; - String url; - String response; - boolean finished = false; - long requestStart = 0L, requestEnd = 0L; - public DownloadRunnable(String nickname, String url) { - this.mainThread = Thread.currentThread(); - this.nickname = nickname; - this.url = url; - } - public void run() { - this.requestStart = System.currentTimeMillis(); - try { - URL u = new URL(this.url); - HttpURLConnection huc = (HttpURLConnection) u.openConnection(); - huc.setRequestMethod("GET"); - huc.connect(); - int responseCode = huc.getResponseCode(); - if (responseCode == 200) { - BufferedInputStream in = new BufferedInputStream( - new InflaterInputStream(huc.getInputStream())); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - int len; - byte[] data = new byte[1024]; - while (!this.finished && - (len = in.read(data, 0, 1024)) >= 0) { - baos.write(data, 0, len); - } - if (this.finished) { - return; - } - in.close(); - byte[] allData = baos.toByteArray(); - this.response = new String(allData); - this.finished = true; - this.mainThread.interrupt(); - } - } catch (IOException e) { - /* Can't do much except leaving this.response at null. */ - } - this.finished = true; - this.requestEnd = System.currentTimeMillis(); - } - public Download getDownload() { - Download result = null; - if (this.response != null) { - result = new Download(this.nickname, this.url, this.response, - this.requestStart, this.requestEnd - this.requestStart); - } - return result; - } - } + downloader.addDirectoryAuthority("gabelmoo", "212.112.245.170", 80); + downloader.addDirectoryAuthority("tor26", "86.59.21.38", 80); + downloader.addDirectoryAuthority("ides", "216.224.124.114", 9030); + downloader.addDirectoryAuthority("maatuska", "213.115.239.118", 443); + downloader.addDirectoryAuthority("dannenberg", "193.23.244.244", 80); + downloader.addDirectoryAuthority("urras", "208.83.223.34", 443); + downloader.addDirectoryAuthority("moria1", "128.31.0.34", 9131); + downloader.addDirectoryAuthority("dizum", "194.109.206.212", 80); - /* Download one or more consensuses or votes from one or more directory - * authorities using a timeout of 60 seconds. */ - private List<Download> downloadFromAuthority(Map<String, String> urls) { - Set<DownloadRunnable> downloadRunnables = - new HashSet<DownloadRunnable>(); - for (Map.Entry<String, String> e : urls.entrySet()) { - String url = e.getKey(); - String nickname = e.getValue(); - DownloadRunnable downloadRunnable = new DownloadRunnable(nickname, - url); - downloadRunnables.add(downloadRunnable); - new Thread(downloadRunnable).start(); - } - long started = System.currentTimeMillis(), sleep; - while ((sleep = started + 60L * 1000L - System.currentTimeMillis()) - > 0L) { - try { - Thread.sleep(sleep); - } catch (InterruptedException e) { - /* Do nothing. */ - } - boolean unfinished = false; - for (DownloadRunnable downloadRunnable : downloadRunnables) { - if (!downloadRunnable.finished) { - unfinished = true; - break; - } - } - if (!unfinished) { - break; - } - } - List<Download> responses = new ArrayList<Download>(); - for (DownloadRunnable downloadRunnable : downloadRunnables) { - Download download = downloadRunnable.getDownload(); - if (download != null) { - responses.add(download); - } - downloadRunnable.finished = true; - } - return responses; - } + downloader.setIncludeCurrentConsensusFromAllDirectoryAuthorities(); + downloader.setIncludeCurrentReferencedVotes(); - /* Date-time formats to parse and format timestamps. */ - private static SimpleDateFormat dateTimeFormat; - static { - dateTimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - } + downloader.setRequestTimeout(60L * 1000L); - /* Parse the downloaded consensus to find fingerprints of directory - * authorities publishing the corresponding votes. */ - private SortedSet<String> fingerprints = new TreeSet<String>(); - private void parseConsensusToFindReferencedVotes() { - for (Download download : this.downloadedConsensuses) { - String downloadedConsensus = download.getResponseString(); - try { - BufferedReader br = new BufferedReader(new StringReader( - downloadedConsensus)); - String line; - while ((line = br.readLine()) != null) { - if (line.startsWith("valid-after ")) { - try { - long validAfterMillis = dateTimeFormat.parse(line.substring( - "valid-after ".length())).getTime(); - if (validAfterMillis + 60L * 60L * 1000L < - System.currentTimeMillis()) { - /* Consensus is more than 1 hour old. We won't be able to - * download the corresponding votes anymore. */ - break; - } - } catch (ParseException e) { - System.err.println("Could not parse valid-after timestamp " - + "in line '" + line + "' of a downloaded consensus. " - + "Not downloading votes."); - break; - } - } else if (line.startsWith("dir-source ")) { - String[] parts = line.split(" "); - if (parts.length < 3) { - System.err.println("Bad dir-source line '" + line - + "' in downloaded consensus. Skipping."); - continue; - } - String nickname = parts[1]; - if (nickname.endsWith("-legacy")) { - continue; - } - String fingerprint = parts[2]; - this.fingerprints.add(fingerprint); - } + Iterator<DescriptorRequest> descriptorRequests = + downloader.downloadDescriptors(); + while (descriptorRequests.hasNext()) { + DescriptorRequest request = descriptorRequests.next(); + String authority = request.getDirectoryNickname(); + String requestUrl = request.getRequestUrl(); + long requestStart = request.getRequestStart(); + long fetchTime = request.getRequestEnd() + - request.getRequestStart(); + if (request.globalTimeoutHasExpired()) { + System.err.println("Global timeout has expired. Exiting."); + System.exit(1); + } else if (!request.requestTimeoutHasExpired()) { + if (request.getDescriptors().isEmpty()) { + /* No response. We'll realize later on if we're missing a + * consensus or vote. */ + continue; + } else if (request.getDescriptors().size() > 1) { + System.out.println("Response contains more than 1 " + + "descriptor. Considering only the first."); } - br.close(); - } catch (IOException e) { - System.err.println("Could not parse consensus to find referenced " - + "votes in it. Skipping."); - } - } - } - - /* Download the votes published by directory authorities listed in the - * consensus. */ - private List<Download> downloadedVotes = new ArrayList<Download>(); - private void downloadReferencedVotes() { - for (String fingerprint : this.fingerprints) { - String downloadedVote = null; - List<String> authorities = new ArrayList<String>( - this.authorities.values()); - Collections.shuffle(authorities); - for (String authority : authorities) { - if (downloadedVote != null) { - break; + Descriptor downloadedDescriptor = request.getDescriptors().get(0); + String response = new String(request.getDescriptors().get(0). + getRawDescriptorBytes()); + Download download = new Download(authority, requestUrl, response, + requestStart, fetchTime); + if (downloadedDescriptor instanceof + RelayNetworkStatusConsensus) { + this.downloadedConsensuses.add(download); + } else if (downloadedDescriptor instanceof + RelayNetworkStatusVote) { + this.downloadedVotes.add(download); + } else { + System.err.println("Did not expect a descriptor of type " + + downloadedDescriptor.getClass() + ". Ignoring."); } - String resource = "/tor/status-vote/current/" + fingerprint - + ".z"; - String fullUrl = "http://" + authority + resource; - Map<String, String> urls = new HashMap<String, String>(); - urls.put(fullUrl, authority); - this.downloadedVotes.addAll(this.downloadFromAuthority(urls)); } } } /* Return the previously downloaded (unparsed) consensus string by * authority nickname. */ + private List<Download> downloadedConsensuses = + new ArrayList<Download>(); public List<Download> getConsensuses() { return this.downloadedConsensuses; } /* Return the previously downloaded (unparsed) vote strings. */ + private List<Download> downloadedVotes = new ArrayList<Download>(); public List<Download> getVotes() { return this.downloadedVotes; }

1 0

[torflow/master] And it's INT32_MAX, not UINT32_MAX..
by mikeperry＠torproject.org 11 Dec '11

11 Dec '11

commit dcddc95dc3480016957e1f831f44d3a70aa95f7b Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Dec 11 12:01:04 2011 -0800 And it's INT32_MAX, not UINT32_MAX.. Too bad python doesn't seem to have constants for either? --- NetworkScanners/BwAuthority/aggregate.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index b655db7..15d8d82 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -735,9 +735,9 @@ def main(argv): # Go through the list and cap them to NODE_CAP for n in nodes.itervalues(): - if n.new_bw >= 0xffffffff: + if n.new_bw >= 0x7fffffff: plog("WARN", "Bandwidth of node "+n.nick+"="+n.idhex+" exceeded maxint32: "+str(n.new_bw)) - n.new_bw = 0xffffffff + n.new_bw = 0x7fffffff if cs_junk.T_i > 0 and cs_junk.T_i_decay > 0 \ and math.fabs(n.pid_error_sum) > \ math.fabs(2*cs_junk.T_i*n.pid_error/cs_junk.T_i_decay):

1 0

[torflow/master] Fix an overflow check
by mikeperry＠torproject.org 11 Dec '11

11 Dec '11

commit 02e0a0af07679fa52a3d496e6afda219eea2cbd7 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Sun Dec 11 11:45:26 2011 -0800 Fix an overflow check Tor internally multiplies our values by 1000, and silently eats the overflow. Why do we bother dividing them by 1000 in the first place? It just causes confusion and bugs.. The git blame log and comments mumble something about consensus diffs, but I think we gave up on those... --- NetworkScanners/BwAuthority/aggregate.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index ba6af20..b655db7 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -735,9 +735,9 @@ def main(argv): # Go through the list and cap them to NODE_CAP for n in nodes.itervalues(): - if n.new_bw >= 0xffffffff*1000: + if n.new_bw >= 0xffffffff: plog("WARN", "Bandwidth of node "+n.nick+"="+n.idhex+" exceeded maxint32: "+str(n.new_bw)) - n.new_bw = 0xffffffff*1000 + n.new_bw = 0xffffffff if cs_junk.T_i > 0 and cs_junk.T_i_decay > 0 \ and math.fabs(n.pid_error_sum) > \ math.fabs(2*cs_junk.T_i*n.pid_error/cs_junk.T_i_decay):

1 0

[tor/master] Fix compilation of natpmp-helper on non-windows
by nickm＠torproject.org 10 Dec '11

10 Dec '11

commit e4cebb76c5577b1a39b752cc694147e929662c4a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Dec 10 03:25:40 2011 +0100 Fix compilation of natpmp-helper on non-windows Fixes a small oversight in 5dbfb1b3e0efc95be34ba7d69852511c9bac1f4b. --- changes/bug4691 | 4 ++++ src/tools/tor-fw-helper/tor-fw-helper-natpmp.c | 3 +++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/changes/bug4691 b/changes/bug4691 new file mode 100644 index 0000000..124b8f8 --- /dev/null +++ b/changes/bug4691 @@ -0,0 +1,4 @@ + o Major bugfixes: + - Fix compilation of the libnatpmp helper on non-Windows. Bugfix on + 0.2.3.9-alpha; fixes bug 4691. Reported by Anthony G. Basile. + diff --git a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c index aaa685e..2380b14 100644 --- a/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c +++ b/src/tools/tor-fw-helper/tor-fw-helper-natpmp.c @@ -16,6 +16,9 @@ #include <stdio.h> #include <string.h> #include <errno.h> +#ifndef MS_WINDOWS +#include <arpa/inet.h> +#endif // debugging stuff #include <assert.h>

1 0

[torflow/master] Be merciful in Guard intermediate voting mode.
by mikeperry＠torproject.org 10 Dec '11

10 Dec '11

commit 846880384a6153caa8e8f6ffaa996b24c7611082 Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Dec 9 17:08:59 2011 -0800 Be merciful in Guard intermediate voting mode. Also don't use Wgd in mercy mode or in section2 mode. --- NetworkScanners/BwAuthority/aggregate.py | 18 ++++++++++++++---- 1 files changed, 14 insertions(+), 4 deletions(-) diff --git a/NetworkScanners/BwAuthority/aggregate.py b/NetworkScanners/BwAuthority/aggregate.py index 93cad8a..ba6af20 100755 --- a/NetworkScanners/BwAuthority/aggregate.py +++ b/NetworkScanners/BwAuthority/aggregate.py @@ -656,7 +656,11 @@ def main(argv): 0.0, False) else: # Use previous vote's feedback bw - n.use_bw = prev_votes.vote_map[n.idhex].pid_bw + # FIXME: compare to ns_bw or prev_vote bw? + if cs_junk.use_mercy and n.desc_bw > n.ns_bw and n.pid_error < 0: + n.use_bw = n.desc_bw + else: + n.use_bw = prev_votes.vote_map[n.idhex].pid_bw n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], cs_junk.K_p, 0.0, @@ -677,10 +681,16 @@ def main(argv): if n.idhex in prev_consensus and \ ("Guard" in prev_consensus[n.idhex].flags \ and "Exit" in prev_consensus[n.idhex].flags): + # For section2-equivalent mode and/or use_mercy, we should + # not use Wgd + if n.use_bw == n.desc_bw: + weight = 1.0 + else: + weight = (1.0-cs_junk.bw_weights["Wgd"]) n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex], - cs_junk.K_p*(1.0-cs_junk.bw_weights["Wgd"]), - cs_junk.K_i*(1.0-cs_junk.bw_weights["Wgd"]), - cs_junk.K_d*(1.0-cs_junk.bw_weights["Wgd"]), + cs_junk.K_p*weight, + cs_junk.K_i*weight, + cs_junk.K_d*weight, cs_junk.K_i_decay) else: n.new_bw = n.get_pid_bw(prev_votes.vote_map[n.idhex],

1 0

[stem/master] Issuing IOError for cookie read failures
by atagar＠torproject.org 09 Dec '11

09 Dec '11

commit 3b89feb04f2d9389e387f7d2e1af5f69158d52e9 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 2 07:47:49 2011 -0800 Issuing IOError for cookie read failures Replacing OSError for read failures with IOError (more appropriate for this). --- stem/connection.py | 27 ++++++++++++--------------- test/integ/connection/authentication.py | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/stem/connection.py b/stem/connection.py index 0b654d8..9906b26 100644 --- a/stem/connection.py +++ b/stem/connection.py @@ -112,13 +112,13 @@ def authenticate_cookie(control_socket, cookie_path): Raises: ValueError if the authentication credentials aren't accepted - OSError if the cookie file doesn't exist or we're unable to read it + IOError if the cookie file doesn't exist or we're unable to read it stem.socket.ProtocolError the content from the socket is malformed stem.socket.SocketError if problems arise in using the socket """ if not os.path.exists(cookie_path): - raise OSError(AUTH_COOKIE_MISSING % cookie_path) + raise IOError(AUTH_COOKIE_MISSING % cookie_path) # Abort if the file isn't 32 bytes long. This is to avoid exposing arbitrary # file content to the port. @@ -134,19 +134,16 @@ def authenticate_cookie(control_socket, cookie_path): if auth_cookie_size != 32: raise ValueError(AUTH_COOKIE_WRONG_SIZE % (cookie_path, auth_cookie_size)) - try: - auth_cookie_file = open(cookie_path, "r") - auth_cookie_contents = auth_cookie_file.read() - auth_cookie_file.close() - - control_socket.send("AUTHENTICATE %s" % binascii.b2a_hex(auth_cookie_contents)) - auth_response = control_socket.recv() - - # if we got anything but an OK response then error - if str(auth_response) != "OK": - raise ValueError(str(auth_response)) - except IOError, exc: - raise OSError(exc) + auth_cookie_file = open(cookie_path, "r") + auth_cookie_contents = auth_cookie_file.read() + auth_cookie_file.close() + + control_socket.send("AUTHENTICATE %s" % binascii.b2a_hex(auth_cookie_contents)) + auth_response = control_socket.recv() + + # if we got anything but an OK response then error + if str(auth_response) != "OK": + raise ValueError(str(auth_response)) def get_protocolinfo_by_port(control_addr = "127.0.0.1", control_port = 9051, get_socket = False): """ diff --git a/test/integ/connection/authentication.py b/test/integ/connection/authentication.py index 7883c8a..9df2db3 100644 --- a/test/integ/connection/authentication.py +++ b/test/integ/connection/authentication.py @@ -73,7 +73,7 @@ class TestAuthenticate(unittest.TestCase): """ test_path = "/if/this/exists/then/they're/asking/for/a/failure" - expected_exc = OSError(stem.connection.AUTH_COOKIE_MISSING % test_path) + expected_exc = IOError(stem.connection.AUTH_COOKIE_MISSING % test_path) self._check_auth(stem.connection.AuthMethod.COOKIE, test_path, False, expected_exc) def test_authenticate_cookie_wrong_size(self):

1 0