tor-commits May 2015

tor-commits@lists.torproject.org

22 participants
990 discussions

[torsocks/master] Fix: socks5 resolve wasn't sending data correctly
by dgoulet＠torproject.org 27 May '15

27 May '15

commit 72039624bb190dfec3e758b7389410a987adc8a3 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed May 27 13:20:03 2015 -0400 Fix: socks5 resolve wasn't sending data correctly The resolve function was sending uninitialized data to tor and sometimes too much data than needed. Furthermore, a valid SOCKS5 request for that needs a port so add one in both resolve and resolve_ptr. Reported-by: Yawning Angel <yawning(a)schwanenlied.me> Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/common/socks5.c | 43 +++++++++++++++++++++++++++++++------------ src/common/socks5.h | 2 ++ 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/src/common/socks5.c b/src/common/socks5.c index 3c9544a..3f284ca 100644 --- a/src/common/socks5.c +++ b/src/common/socks5.c @@ -564,20 +564,19 @@ ATTR_HIDDEN int socks5_send_resolve_request(const char *hostname, struct connection *conn) { int ret, ret_send; - /* - * Can't go bigger than that. 4 bytes for the header, 1 for the name len - * and 255 for the name. - */ - unsigned char buffer[260]; size_t name_len, msg_len, data_len; struct socks5_request msg; struct socks5_request_resolve req; + /* Can't go bigger than that. 4 bytes for the header, 1 for the name len, + * 255 for the name and 2 bytes for the port. */ + unsigned char buffer[sizeof(msg) + sizeof(req)]; assert(hostname); assert(conn); assert(conn->fd >= 0); memset(buffer, 0, sizeof(buffer)); + memset(&req, 0, sizeof(req)); msg_len = sizeof(msg); msg.ver = SOCKS5_VERSION; @@ -596,11 +595,21 @@ int socks5_send_resolve_request(const char *hostname, struct connection *conn) /* Setup resolve request. */ req.len = name_len; memcpy(req.name, hostname, name_len); + /* Dummy port, tor doesn't need it. */ + req.port = htons(42); /* Copy final buffer. */ memcpy(buffer, &msg, msg_len); - memcpy(buffer + msg_len, &req, sizeof(req)); - data_len = msg_len + sizeof(req); + data_len = msg_len; + /* Add the length of hostname. */ + memcpy(buffer + data_len, &req.len, sizeof(req.len)); + data_len += sizeof(req.len); + /* Add hostname without NULL terminated byte. */ + memcpy(buffer + data_len, req.name, req.len); + data_len += req.len; + /* Add the dummy port at the end. */ + memcpy(buffer + data_len, &req.port, sizeof(req.port)); + data_len += sizeof(req.port); ret_send = send_data(conn->fd, &buffer, data_len); if (ret_send < 0) { @@ -703,10 +712,11 @@ ATTR_HIDDEN int socks5_send_resolve_ptr_request(struct connection *conn, const void *ip, int af) { int ret, ret_send; - unsigned char buffer[20]; /* Can't go higher than that (with IPv6). */ size_t msg_len, data_len; struct socks5_request msg; struct socks5_request_resolve_ptr req; + /* Can't go higher than that (with IPv6). */ + unsigned char buffer[sizeof(msg) + sizeof(req)]; assert(conn); assert(conn->fd >= 0); @@ -724,11 +734,17 @@ int socks5_send_resolve_ptr_request(struct connection *conn, const void *ip, int switch (af) { case AF_INET: msg.atyp = SOCKS5_ATYP_IPV4; - memcpy(req.addr.ipv4, ip, 4); + memcpy(req.addr.ipv4, ip, sizeof(req.addr.ipv4)); + /* Copy right away the IP since we know the family type. */ + memcpy(buffer + msg_len, &req.addr, sizeof(req.addr.ipv4)); + data_len = msg_len + sizeof(req.addr.ipv4); break; case AF_INET6: msg.atyp = SOCKS5_ATYP_IPV6; - memcpy(req.addr.ipv6, ip, 16); + memcpy(req.addr.ipv6, ip, sizeof(req.addr.ipv6)); + /* Copy right away the IP since we know the family type. */ + memcpy(buffer + msg_len, &req.addr, sizeof(req.addr.ipv6)); + data_len = msg_len + sizeof(req.addr.ipv6); break; default: ERR("Unknown address domain of %d", ip); @@ -736,10 +752,13 @@ int socks5_send_resolve_ptr_request(struct connection *conn, const void *ip, int goto error; } + /* Dummy port, tor doesn't need it. */ + req.port = htons(42); + /* Copy final buffer. */ memcpy(buffer, &msg, msg_len); - memcpy(buffer + msg_len, &req, sizeof(req)); - data_len = msg_len + sizeof(req); + memcpy(buffer + data_len, &req.port, sizeof(req.port)); + data_len += sizeof(req.port); ret_send = send_data(conn->fd, &buffer, data_len); if (ret_send < 0) { diff --git a/src/common/socks5.h b/src/common/socks5.h index 35c7d2b..41da679 100644 --- a/src/common/socks5.h +++ b/src/common/socks5.h @@ -108,6 +108,7 @@ struct socks5_request_domain { struct socks5_request_resolve { uint8_t len; unsigned char name[UINT8_MAX]; + uint16_t port; }; /* Use for the Tor resolve ptr command. */ @@ -116,6 +117,7 @@ struct socks5_request_resolve_ptr { uint8_t ipv4[4]; uint8_t ipv6[16]; } addr; + uint16_t port; }; /* Non variable part of a reply. */

1 0

[stem/master] Drop download link from tutorials
by atagar＠torproject.org 27 May '15

27 May '15

commit 054119489d9e94889be07bc41711477854825886 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 27 09:55:49 2015 -0700 Drop download link from tutorials Well, damn. Turns out Sphinx 1.3 isn't yet available in Debian backports... https://trac.torproject.org/projects/tor/ticket/16214 Until it is we can't use the :caption: attribute. Dropping it for now so we can once again build our site. --- docs/change_log.rst | 1 - docs/conf.py | 2 +- docs/faq.rst | 2 +- docs/tutorials/east_of_the_sun.rst | 1 - docs/tutorials/examples/compare_flags.rst | 1 - docs/tutorials/examples/exit_used.rst | 1 - docs/tutorials/examples/list_circuits.rst | 1 - docs/tutorials/examples/outdated_relays.rst | 1 - docs/tutorials/examples/persisting_a_consensus.rst | 2 -- docs/tutorials/examples/votes_by_bandwidth_authorities.rst | 1 - docs/tutorials/mirror_mirror_on_the_wall.rst | 8 -------- docs/tutorials/over_the_river.rst | 4 ---- docs/tutorials/the_little_relay_that_could.rst | 1 - docs/tutorials/to_russia_with_love.rst | 4 ---- docs/tutorials/tortoise_and_the_hare.rst | 1 - 15 files changed, 2 insertions(+), 29 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 1d801f9..643f5bd 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -52,7 +52,6 @@ The following are only available within Stem's `git repository * **Website** * Example for `custom path selection for circuits <tutorials/to_russia_with_love.html#custom-path-selection>`_ (:trac:`8728`) - * Download link for tutorial examples (:trac:`10411`) .. _version_1.4: diff --git a/docs/conf.py b/docs/conf.py index b28a67b..6535135 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -22,7 +22,7 @@ sys.path.append(os.path.abspath('.')) # -- General configuration ----------------------------------------------------- # If your documentation needs a minimal Sphinx version, state it here. -needs_sphinx = '1.3' # required for the caption option +needs_sphinx = '1.1' # required for the sphinx-apidoc command # Add any Sphinx extension module names here, as strings. They can be extensions # coming with Sphinx (named 'sphinx.ext.*') or your custom ones. diff --git a/docs/faq.rst b/docs/faq.rst index 4d5a9a5..2a4ec83 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -545,7 +545,7 @@ example... How do I build the site? ------------------------ -If you have `Sphinx <http://sphinx-doc.org/>`_ version 1.3 or later installed +If you have `Sphinx <http://sphinx-doc.org/>`_ version 1.1 or later installed then building our site is as easy as... :: diff --git a/docs/tutorials/east_of_the_sun.rst b/docs/tutorials/east_of_the_sun.rst index f577df9..d74c347 100644 --- a/docs/tutorials/east_of_the_sun.rst +++ b/docs/tutorials/east_of_the_sun.rst @@ -34,7 +34,6 @@ With that out of the way, how do you look up this information? Below is a simple script that dumps Tor's present connections. .. literalinclude:: /_static/example/utilities.py - :caption: `[Download] <../_static/example/utilities.py>`__ :language: python :: diff --git a/docs/tutorials/examples/compare_flags.rst b/docs/tutorials/examples/compare_flags.rst index 3ea6143..c661493 100644 --- a/docs/tutorials/examples/compare_flags.rst +++ b/docs/tutorials/examples/compare_flags.rst @@ -8,7 +8,6 @@ Compares the votes of two directory authorities, in this case moria1 and maatuska, with a special interest in the 'Running' flag. .. literalinclude:: /_static/example/compare_flags.py - :caption: `[Download] <../../_static/example/compare_flags.py>`__ :language: python :: diff --git a/docs/tutorials/examples/exit_used.rst b/docs/tutorials/examples/exit_used.rst index 095cd3c..24a3d7d 100644 --- a/docs/tutorials/examples/exit_used.rst +++ b/docs/tutorials/examples/exit_used.rst @@ -12,7 +12,6 @@ Here's a simple script that prints information about the exits used to service the requests going through Tor... .. literalinclude:: /_static/example/exit_used.py - :caption: `[Download] <../../_static/example/exit_used.py>`__ :language: python Now if you make a request over Tor... diff --git a/docs/tutorials/examples/list_circuits.rst b/docs/tutorials/examples/list_circuits.rst index 298089b..d856e31 100644 --- a/docs/tutorials/examples/list_circuits.rst +++ b/docs/tutorials/examples/list_circuits.rst @@ -8,7 +8,6 @@ Tor creates new circuits and tears down old ones on your behalf, so how can you get information about circuits Tor currently has available? .. literalinclude:: /_static/example/list_circuits.py - :caption: `[Download] <../../_static/example/list_circuits.py>`__ :language: python :: diff --git a/docs/tutorials/examples/outdated_relays.rst b/docs/tutorials/examples/outdated_relays.rst index e7d4cb2..72b14b2 100644 --- a/docs/tutorials/examples/outdated_relays.rst +++ b/docs/tutorials/examples/outdated_relays.rst @@ -9,7 +9,6 @@ support for old ones. Below is the script we used on :trac:`9476` to reach out to relay operators that needed to upgrade. .. literalinclude:: /_static/example/outdated_relays.py - :caption: `[Download] <../../_static/example/outdated_relays.py>`__ :language: python :: diff --git a/docs/tutorials/examples/persisting_a_consensus.rst b/docs/tutorials/examples/persisting_a_consensus.rst index 6e51fe7..facd181 100644 --- a/docs/tutorials/examples/persisting_a_consensus.rst +++ b/docs/tutorials/examples/persisting_a_consensus.rst @@ -31,7 +31,6 @@ So how do we get it? Just tell Stem that's what you want. The consensus. For example, to write the consensus simply do the following... .. literalinclude:: /_static/example/persisting_a_consensus.py - :caption: `[Download] <../../_static/example/persisting_a_consensus.py>`__ :language: python Our *consensus* here is the current @@ -52,5 +51,4 @@ Our *consensus* here is the current You can then read it back with :func:`~stem.descriptor.__init__.parse_file`... .. literalinclude:: /_static/example/persisting_a_consensus_with_parse_file.py - :caption: `[Download] <../../_static/example/persisting_a_consensus_with_parse_file.py>`__ :language: python diff --git a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst index df78ca2..cea52e2 100644 --- a/docs/tutorials/examples/votes_by_bandwidth_authorities.rst +++ b/docs/tutorials/examples/votes_by_bandwidth_authorities.rst @@ -17,7 +17,6 @@ Bandwidth authorities include their measurements in their votes. The following gets their current votes then prints how many relays it had a measurement for. .. literalinclude:: /_static/example/votes_by_bandwidth_authorities.py - :caption: `[Download] <../../_static/example/votes_by_bandwidth_authorities.py>`__ :language: python :: diff --git a/docs/tutorials/mirror_mirror_on_the_wall.rst b/docs/tutorials/mirror_mirror_on_the_wall.rst index ff4c86c..2677aeb 100644 --- a/docs/tutorials/mirror_mirror_on_the_wall.rst +++ b/docs/tutorials/mirror_mirror_on_the_wall.rst @@ -77,7 +77,6 @@ irresponsible script can make Tor worse for everyone. Listing the current relays in the Tor network is as easy as... .. literalinclude:: /_static/example/current_descriptors.py - :caption: `[Download] <../_static/example/current_descriptors.py>`__ :language: python .. _where-can-i-get-past-descriptors: @@ -90,7 +89,6 @@ Descriptor archives are available from `CollecTor the `DescriptorReader <../api/descriptor/reader.html>`_... .. literalinclude:: /_static/example/past_descriptors.py - :caption: `[Download] <../_static/example/past_descriptors.py>`__ :language: python .. _can-i-get-descriptors-from-the-tor-process: @@ -140,13 +138,11 @@ Now that Tor is happy chugging along, up-to-date descriptors are available through Tor's control socket... .. literalinclude:: /_static/example/descriptor_from_tor_control_socket.py - :caption: `[Download] <../_static/example/descriptor_from_tor_control_socket.py>`__ :language: python ... or by reading directly from Tor's data directory... .. literalinclude:: /_static/example/descriptor_from_tor_data_directory.py - :caption: `[Download] <../_static/example/descriptor_from_tor_data_directory.py>`__ :language: python .. _validating-the-descriptors-content: @@ -175,7 +171,6 @@ Validating is as simple as including **validate = True** in any method that provides descriptors... .. literalinclude:: /_static/example/validate_descriptor_content.py - :caption: `[Download] <../_static/example/validate_descriptor_content.py>`__ :language: python .. _saving-and-loading-descriptors: @@ -188,7 +183,6 @@ Tor descriptors are just plaintext documents. As such, if you'd rather not use descriptor by simply writing it to disk, then reading it back later. .. literalinclude:: /_static/example/saving_and_loading_descriptors.py - :caption: `[Download] <../_static/example/saving_and_loading_descriptors.py>`__ :language: python Our *server_descriptors* here is a list of @@ -211,7 +205,6 @@ We can then read it back with :func:`~stem.descriptor.__init__.parse_file` by telling it the type of descriptors we're reading... .. literalinclude:: /_static/example/read_with_parse_file.py - :caption: `[Download] <../_static/example/read_with_parse_file.py>`__ :language: python For an example of doing this with a consensus document `see here @@ -234,7 +227,6 @@ could use any of the methods above, but for this example we'll use `stem.descriptor.remote <../api/descriptor/remote.html>`_... .. literalinclude:: /_static/example/tor_descriptors.py - :caption: `[Download] <../_static/example/tor_descriptors.py>`__ :language: python :: diff --git a/docs/tutorials/over_the_river.rst b/docs/tutorials/over_the_river.rst index 79e42d0..67ff2e1 100644 --- a/docs/tutorials/over_the_river.rst +++ b/docs/tutorials/over_the_river.rst @@ -52,7 +52,6 @@ But with that out of the way lets take a look at a simple `Flask <https://jordan-wright.github.io/blog/2014/10/06/creating-tor-hidden-service…>`_... .. literalinclude:: /_static/example/running_hidden_service.py - :caption: `[Download] <../_static/example/running_hidden_service.py>`__ :language: python Now if we run this... @@ -106,7 +105,6 @@ Stem provides three methods to work with ephemeral hidden services... For example, with a ephemeral service our earlier example becomes as simple as... .. literalinclude:: /_static/example/ephemeral_hidden_services.py - :caption: `[Download] <../_static/example/ephemeral_hidden_services.py>`__ :language: python .. _hidden-service-descriptors: @@ -120,7 +118,6 @@ connections. Hidden service descriptors are available from the tor process via its :func:`~stem.control.Controller.get_hidden_service_descriptor` method... .. literalinclude:: /_static/example/get_hidden_service_descriptor.py - :caption: `[Download] <../_static/example/get_hidden_service_descriptor.py>`__ :language: python :: @@ -151,7 +148,6 @@ descriptor's method. .. literalinclude:: /_static/example/introduction_points.py - :caption: `[Download] <../_static/example/introduction_points.py>`__ :language: python :: diff --git a/docs/tutorials/the_little_relay_that_could.rst b/docs/tutorials/the_little_relay_that_could.rst index 1c9067c..57782d2 100644 --- a/docs/tutorials/the_little_relay_that_could.rst +++ b/docs/tutorials/the_little_relay_that_could.rst @@ -48,7 +48,6 @@ unfamiliar with the '**with**' keyword then see `here <../faq.html#what-is-that-with-keyword-i-keep-seeing-in-the-tutorials>`_... .. literalinclude:: /_static/example/hello_world.py - :caption: `[Download] <../_static/example/hello_world.py>`_ :language: python :: diff --git a/docs/tutorials/to_russia_with_love.rst b/docs/tutorials/to_russia_with_love.rst index fc1b4d2..fed3902 100644 --- a/docs/tutorials/to_russia_with_love.rst +++ b/docs/tutorials/to_russia_with_love.rst @@ -52,7 +52,6 @@ improve this example then please `let me know <https://www.atagar.com/contact/>`_! .. literalinclude:: /_static/example/client_usage_using_pycurl.py - :caption: `[Download] <../_static/example/client_usage_using_pycurl.py>`__ :language: python .. image:: /_static/locale_selection_output.png @@ -69,7 +68,6 @@ control port. To use this approach simply replace the query() function above with... .. literalinclude:: /_static/example/client_usage_using_socksipy.py - :caption: `[Download] <../_static/example/client_usage_using_socksipy.py>`__ :language: python .. _reading-twitter: @@ -84,7 +82,6 @@ authentication `see their instructions <https://dev.twitter.com/oauth/overview/application-owner-access-tokens>`_... .. literalinclude:: /_static/example/reading_twitter.py - :caption: `[Download] <../_static/example/reading_twitter.py>`__ :language: python .. image:: /_static/twitter_output.png @@ -115,7 +112,6 @@ reachability and speed. **Naturally doing this causes quite a bit of load so please be careful not to leave this running!** .. literalinclude:: /_static/example/custom_path_selection.py - :caption: `[Download] <../_static/example/custom_path_selection.py>`__ :language: python :: diff --git a/docs/tutorials/tortoise_and_the_hare.rst b/docs/tutorials/tortoise_and_the_hare.rst index 413e149..2b067f9 100644 --- a/docs/tutorials/tortoise_and_the_hare.rst +++ b/docs/tutorials/tortoise_and_the_hare.rst @@ -29,7 +29,6 @@ are events that Tor emits each second saying the number of bytes downloaded and uploaded. .. literalinclude:: /_static/example/event_listening.py - :caption: `[Download] <../_static/example/event_listening.py>`__ :emphasize-lines: 53-55,62-67 :language: python

1 0

[obfs4/master] Fix doc comment for log.Debugf.
by yawning＠torproject.org 27 May '15

27 May '15

commit cf4dd074fa78f72affa8c701bbb049f9ef547f77 Author: David Fifield <david(a)bamsoftware.com> Date: Mon May 25 22:53:05 2015 -0700 Fix doc comment for log.Debugf. --- common/log/log.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/log/log.go b/common/log/log.go index f29b33b..1c30b48 100644 --- a/common/log/log.go +++ b/common/log/log.go @@ -140,7 +140,7 @@ func Infof(format string, a ...interface{}) { } } -// Debugf logs the given format string/arguments at the INFO log level. +// Debugf logs the given format string/arguments at the DEBUG log level. func Debugf(format string, a ...interface{}) { if enableLogging && logLevel >= LevelDebug { msg := fmt.Sprintf(format, a...)

1 0

[tor-browser/tor-browser-31.7.0esr-5.0-1] Bug 16026: Fix crash in GStreamer
by gk＠torproject.org 27 May '15

27 May '15

commit bc455d559db70c2106124492d9aa1e516b63ed52 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 22 07:38:56 2015 +0000 Bug 16026: Fix crash in GStreamer This is a backport of the patch attached to Mozilla's bug 1145230 (https://bugzilla.mozilla.org/show_bug.cgi?id=1145230). --- content/media/gstreamer/GStreamerReader.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp index e17f767..b9ba73b 100644 --- a/content/media/gstreamer/GStreamerReader.cpp +++ b/content/media/gstreamer/GStreamerReader.cpp @@ -220,12 +220,15 @@ void GStreamerReader::ElementAddedCb(GstBin *aPlayBin, GstElement *aElement, gpointer aUserData) { - const gchar *name = - gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(gst_element_get_factory(aElement))); - - if (!strcmp(name, "uridecodebin")) { - g_signal_connect(G_OBJECT(aElement), "autoplug-sort", - G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + GstElementFactory *factory = gst_element_get_factory(aElement); + if (factory) { + const gchar *name = + gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory)); + + if (!strcmp(name, "uridecodebin")) { + g_signal_connect(G_OBJECT(aElement), "autoplug-sort", + G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + } } }

1 0

[tor-browser/tor-browser-31.7.0esr-4.5-1] Bug 16026: Fix crash in GStreamer
by gk＠torproject.org 27 May '15

27 May '15

commit 9b5866c548c768b2a604d43896ce74e2a40848d0 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 22 07:38:56 2015 +0000 Bug 16026: Fix crash in GStreamer This is a backport of the patch attached to Mozilla's bug 1145230 (https://bugzilla.mozilla.org/show_bug.cgi?id=1145230). --- content/media/gstreamer/GStreamerReader.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/content/media/gstreamer/GStreamerReader.cpp b/content/media/gstreamer/GStreamerReader.cpp index e17f767..b9ba73b 100644 --- a/content/media/gstreamer/GStreamerReader.cpp +++ b/content/media/gstreamer/GStreamerReader.cpp @@ -220,12 +220,15 @@ void GStreamerReader::ElementAddedCb(GstBin *aPlayBin, GstElement *aElement, gpointer aUserData) { - const gchar *name = - gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(gst_element_get_factory(aElement))); - - if (!strcmp(name, "uridecodebin")) { - g_signal_connect(G_OBJECT(aElement), "autoplug-sort", - G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + GstElementFactory *factory = gst_element_get_factory(aElement); + if (factory) { + const gchar *name = + gst_plugin_feature_get_name(GST_PLUGIN_FEATURE(factory)); + + if (!strcmp(name, "uridecodebin")) { + g_signal_connect(G_OBJECT(aElement), "autoplug-sort", + G_CALLBACK(GStreamerReader::ElementFilterCb), aUserData); + } } }

1 0

[tor-ramdisk/master] config/kernel: turn off IPV6
by blueness＠torproject.org 27 May '15

27 May '15

commit 63015c0247f5a1c86e6d486e10d920683b144829 Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Tue May 26 21:34:29 2015 -0400 config/kernel: turn off IPV6 --- configs/kernel-4.0.4.x86.config | 21 +-------------------- configs/kernel-4.0.4.x86_64.config | 21 +-------------------- 2 files changed, 2 insertions(+), 40 deletions(-) diff --git a/configs/kernel-4.0.4.x86.config b/configs/kernel-4.0.4.x86.config index b7c4861..6388741 100644 --- a/configs/kernel-4.0.4.x86.config +++ b/configs/kernel-4.0.4.x86.config @@ -516,24 +516,7 @@ CONFIG_INET_LRO=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_GRE is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set CONFIG_NET_PTP_CLASSIFY=y # CONFIG_NETWORK_PHY_TIMESTAMPING is not set @@ -554,7 +537,6 @@ CONFIG_HAVE_NET_DSA=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set -# CONFIG_6LOWPAN is not set # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -712,7 +694,6 @@ CONFIG_NET_CORE=y # CONFIG_EQUALIZER is not set # CONFIG_NET_TEAM is not set # CONFIG_MACVLAN is not set -# CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set diff --git a/configs/kernel-4.0.4.x86_64.config b/configs/kernel-4.0.4.x86_64.config index c17430a..8ca465f 100644 --- a/configs/kernel-4.0.4.x86_64.config +++ b/configs/kernel-4.0.4.x86_64.config @@ -498,24 +498,7 @@ CONFIG_INET_LRO=y CONFIG_TCP_CONG_CUBIC=y CONFIG_DEFAULT_TCP_CONG="cubic" # CONFIG_TCP_MD5SIG is not set -CONFIG_IPV6=y -# CONFIG_IPV6_ROUTER_PREF is not set -# CONFIG_IPV6_OPTIMISTIC_DAD is not set -# CONFIG_INET6_AH is not set -# CONFIG_INET6_ESP is not set -# CONFIG_INET6_IPCOMP is not set -# CONFIG_IPV6_MIP6 is not set -# CONFIG_INET6_XFRM_TUNNEL is not set -# CONFIG_INET6_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET6_XFRM_MODE_TUNNEL is not set -# CONFIG_INET6_XFRM_MODE_BEET is not set -# CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION is not set -# CONFIG_IPV6_SIT is not set -# CONFIG_IPV6_TUNNEL is not set -# CONFIG_IPV6_GRE is not set -# CONFIG_IPV6_MULTIPLE_TABLES is not set -# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6 is not set # CONFIG_NETWORK_SECMARK is not set CONFIG_NET_PTP_CLASSIFY=y # CONFIG_NETWORK_PHY_TIMESTAMPING is not set @@ -536,7 +519,6 @@ CONFIG_HAVE_NET_DSA=y # CONFIG_X25 is not set # CONFIG_LAPB is not set # CONFIG_PHONET is not set -# CONFIG_6LOWPAN is not set # CONFIG_IEEE802154 is not set # CONFIG_NET_SCHED is not set # CONFIG_DCB is not set @@ -696,7 +678,6 @@ CONFIG_NET_CORE=y # CONFIG_EQUALIZER is not set # CONFIG_NET_TEAM is not set # CONFIG_MACVLAN is not set -# CONFIG_IPVLAN is not set # CONFIG_VXLAN is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set

1 0

[tor-ramdisk/master] build.sh: fix ntpd build.
by blueness＠torproject.org 27 May '15

27 May '15

commit 103289287b936e3358f4ea5fa0fdb767da4d415e Author: Anthony G. Basile <blueness(a)gentoo.org> Date: Tue May 26 21:33:21 2015 -0400 build.sh: fix ntpd build. --- build.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index c262763..25cf2c7 100755 --- a/build.sh +++ b/build.sh @@ -116,13 +116,13 @@ build_tor() build_ntpd() { cd $WORKING - [[ -f $NTPD/ntpd ]] && return 0 + [[ -f $NTPD/src/ntpd ]] && return 0 tar zxvf $WORKING/../sources/$NTPD.tar.gz cd $NTPD sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h ./configure --with-privsep-user=ntp --prefix= make - strip ntpd + strip src/ntpd } ################################################################################ @@ -179,7 +179,7 @@ populate_bin() cd $WORKING/initramfs/bin cp $WORKING/$BUSYBOX/busybox . cp $WORKING/$TOR/src/or/tor . - cp $WORKING/$NTPD/ntpd . + cp $WORKING/$NTPD/src/ntpd . cp $WORKING/$OPENSSH/ssh . cp $WORKING/$OPENSSH/scp . cp $WORKING/$HAVEGED/src/.libs/haveged .

1 0

[tor/master] FIx a couple of mistypes.
by nickm＠torproject.org 26 May '15

26 May '15

commit 0989ba33834c17b2eac3bb87596fca115965ce3c Author: rl1987 <rl1987(a)sdf.lonestar.org> Date: Tue May 26 21:52:26 2015 +0300 FIx a couple of mistypes. --- doc/WritingTests.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/WritingTests.txt b/doc/WritingTests.txt index ab6d084..b0f8722 100644 --- a/doc/WritingTests.txt +++ b/doc/WritingTests.txt @@ -96,7 +96,7 @@ Here's an example of a test function for a simple function in util.c: tor_free(contents); } -This should look pretty familier to you if you've read the tinytest +This should look pretty familiar to you if you've read the tinytest manual. One thing to note here is that we use the testing-specific function "get_fname" to generate a file with respect to a temporary directory that the tests use. You don't need to delete the file; @@ -119,7 +119,7 @@ it outside its usual module. To support this, Tor's build system compiles a testing version of teach module, with extra identifiers exposed. If you want to declare a function as static but available for testing, use the -macro "STATIC" instead of "static." Then, make sure there's a +macro "STATIC" instead of "static". Then, make sure there's a macro-protected declaration of the function in the module's header. For example, crypto_curve25519.h contains:

1 0

[stem/master] Read python scripts from docs/_static/example directory for tutorial tests
by atagar＠torproject.org 26 May '15

26 May '15

commit b94f9aa28fa453ad2be69fcfc9d9882e8849aa2c Author: Sambuddha Basu <sambuddhabasu1(a)gmail.com> Date: Tue May 26 04:45:31 2015 +0400 Read python scripts from docs/_static/example directory for tutorial tests Outdated Relays and Compare Flags now reads from reads python script from docs/_static/example/ All the tutorial_examples read python script from docs/_static/example/ test/unit/tutorial.py now read python scripts from docs/_static/example --- test/unit/tutorial.py | 46 ++----------- test/unit/tutorial_examples.py | 143 ++-------------------------------------- 2 files changed, 10 insertions(+), 179 deletions(-) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 4ae82c7..39e4f03 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -40,24 +40,13 @@ class TestTutorial(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_the_little_relay_that_could(self, from_port_mock, stdout_mock): - def tutorial_example(): - from stem.control import Controller - - with Controller.from_port(control_port = 9051) as controller: - controller.authenticate() # provide the password here if you set one - - bytes_read = controller.get_info('traffic/read') - bytes_written = controller.get_info('traffic/written') - - print('My Tor relay has read %s bytes and written %s.' % (bytes_read, bytes_written)) - controller = from_port_mock().__enter__() controller.get_info.side_effect = lambda arg: { 'traffic/read': '33406', 'traffic/written': '29649', }[arg] - tutorial_example() + execfile('docs/_static/example/hello_world.py') self.assertEqual('My Tor relay has read 33406 bytes and written 29649.\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -129,38 +118,18 @@ class TestTutorial(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.remote.DescriptorDownloader') def test_mirror_mirror_on_the_wall_1(self, downloader_mock, stdout_mock): - def tutorial_example(): - from stem.descriptor.remote import DescriptorDownloader - - downloader = DescriptorDownloader() - - try: - for desc in downloader.get_consensus().run(): - print('found relay %s (%s)' % (desc.nickname, desc.fingerprint)) - except Exception as exc: - print('Unable to retrieve the consensus: %s' % exc) - downloader_mock().get_consensus().run.return_value = [mocking.get_router_status_entry_v2()] - tutorial_example() + execfile('docs/_static/example/current_descriptors.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_mirror_mirror_on_the_wall_2(self, from_port_mock, stdout_mock): - def tutorial_example(): - from stem.control import Controller - - with Controller.from_port(control_port = 9051) as controller: - controller.authenticate() - - for desc in controller.get_network_statuses(): - print('found relay %s (%s)' % (desc.nickname, desc.fingerprint)) - controller = from_port_mock().__enter__() controller.get_network_statuses.return_value = [mocking.get_router_status_entry_v2()] - tutorial_example() + execfile('docs/_static/example/descriptor_from_tor_control_socket.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -186,17 +155,10 @@ class TestTutorial(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.reader.DescriptorReader', spec = DescriptorReader) def test_mirror_mirror_on_the_wall_4(self, reader_mock, stdout_mock): - def tutorial_example(): - from stem.descriptor.reader import DescriptorReader - - with DescriptorReader(['/home/atagar/server-descriptors-2013-03.tar']) as reader: - for desc in reader: - print('found relay %s (%s)' % (desc.nickname, desc.fingerprint)) - reader = reader_mock().__enter__() reader.__iter__.return_value = iter([mocking.get_relay_server_descriptor()]) - tutorial_example() + execfile('docs/_static/example/past_descriptors.py') self.assertEqual('found relay caerSidi (None)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index 3b470f5..ae73239 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -6,12 +6,6 @@ import itertools import unittest try: - # added in python 2.7 - from collections import OrderedDict -except ImportError: - from stem.util.ordereddict import OrderedDict - -try: from StringIO import StringIO except ImportError: from io import StringIO @@ -148,28 +142,6 @@ class TestTutorialExamples(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_list_circuits(self, from_port_mock, stdout_mock): - def tutorial_example(): - from stem import CircStatus - from stem.control import Controller - - with Controller.from_port(port = 9051) as controller: - controller.authenticate() - - for circ in sorted(controller.get_circuits()): - if circ.status != CircStatus.BUILT: - continue - - print('\nCircuit %s (%s)' % (circ.id, circ.purpose)) - - for i, entry in enumerate(circ.path): - div = '+' if (i == len(circ.path) - 1) else '|' - fingerprint, nickname = entry - - desc = controller.get_network_status(fingerprint, None) - address = desc.address if desc else 'unknown' - - print(' %s- %s (%s, %s)' % (div, fingerprint, nickname, address)) - path_1 = ('B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C', 'ByTORAndTheSnowDog') path_2 = ('0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338', 'afo02') path_3 = ('DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC', 'edwardsnowden3') @@ -195,7 +167,7 @@ class TestTutorialExamples(unittest.TestCase): path_7[0]: _get_router_status('176.67.169.171') }[fingerprint] - tutorial_example() + execfile('docs/_static/example/list_circuits.py') self.assert_equal_unordered(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -252,25 +224,6 @@ class TestTutorialExamples(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.descriptor.remote.DescriptorDownloader') def test_outdated_relays(self, downloader_mock, stdout_mock): - def tutorial_example(): - from stem.descriptor.remote import DescriptorDownloader - from stem.version import Version - - downloader = DescriptorDownloader() - count, with_contact = 0, 0 - - print('Checking for outdated relays...\n') - - for desc in downloader.get_server_descriptors(): - if desc.tor_version < Version('0.2.3.0'): - count += 1 - - if desc.contact: - print(' %-15s %s' % (desc.tor_version, desc.contact.decode('utf-8', 'replace'))) - with_contact += 1 - - print('\n%i outdated relays found, %i had contact information' % (count, with_contact)) - downloader_mock().get_server_descriptors.return_value = [ get_relay_server_descriptor({'platform': 'node-Tor 0.2.3.0 on Linux x86_64'}), get_relay_server_descriptor({'platform': 'node-Tor 0.1.0 on Linux x86_64'}), @@ -278,7 +231,7 @@ class TestTutorialExamples(unittest.TestCase): get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), ] - tutorial_example() + execfile('docs/_static/example/outdated_relays.py') self.assert_equal_unordered(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) @@ -286,49 +239,6 @@ class TestTutorialExamples(unittest.TestCase): @patch('stem.descriptor.remote.Query') @patch('stem.descriptor.remote.get_authorities') def test_compare_flags(self, get_authorities_mock, query_mock, stdout_mock): - def tutorial_example(): - from stem.descriptor import DocumentHandler, remote - - # Query all authority votes asynchronously. - - downloader = remote.DescriptorDownloader(document_handler = DocumentHandler.DOCUMENT) - queries = OrderedDict() - - for name, authority in remote.get_authorities().items(): - if authority.v3ident is None: - continue # authority doens't vote if it lacks a v3ident - - queries[name] = downloader.get_vote(authority) - - # Wait for the votes to finish being downloaded, this produces a dictionary of - # authority nicknames to their vote. - - votes = dict((name, query.run()[0]) for (name, query) in queries.items()) - - # Get a superset of all the fingerprints in all the votes. - - all_fingerprints = set() - - for vote in votes.values(): - all_fingerprints.update(vote.routers.keys()) - - # Finally, compare moria1's votes to maatuska. - - for fingerprint in all_fingerprints: - moria1_vote = votes['moria1'].routers.get(fingerprint) - maatuska_vote = votes['maatuska'].routers.get(fingerprint) - - if not moria1_vote and not maatuska_vote: - print("both moria1 and maatuska haven't voted about %s" % fingerprint) - elif not moria1_vote: - print("moria1 hasn't voted about %s" % fingerprint) - elif not maatuska_vote: - print("maatuska hasn't voted about %s" % fingerprint) - elif 'Running' in moria1_vote.flags and 'Running' not in maatuska_vote.flags: - print("moria1 has the Running flag but maatuska doesn't: %s" % fingerprint) - elif 'Running' in maatuska_vote.flags and 'Running' not in moria1_vote.flags: - print("maatuska has the Running flag but moria1 doesn't: %s" % fingerprint) - get_authorities_mock().items.return_value = [('moria1', DIRECTORY_AUTHORITIES['moria1']), ('maatuska', DIRECTORY_AUTHORITIES['maatuska'])] fingerprint = [ @@ -362,7 +272,7 @@ class TestTutorialExamples(unittest.TestCase): [get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9]))], ] - tutorial_example() + execfile('docs/_static/example/compare_flags.py') self.assert_equal_unordered(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) @@ -370,37 +280,6 @@ class TestTutorialExamples(unittest.TestCase): @patch('stem.descriptor.remote.get_authorities') @patch('stem.descriptor.remote.DescriptorDownloader.query') def test_votes_by_bandwidth_authorities(self, query_mock, get_authorities_mock, stdout_mock): - def tutorial_example(): - from stem.descriptor import remote - - # request votes from all the bandwidth authorities - - queries = {} - downloader = remote.DescriptorDownloader() - - for authority in remote.get_authorities().values(): - if authority.is_bandwidth_authority: - queries[authority.nickname] = downloader.query( - '/tor/status-vote/current/authority', - endpoints = [(authority.address, authority.dir_port)], - ) - - for authority_name, query in queries.items(): - try: - print("Getting %s's vote from %s:" % (authority_name, query.download_url)) - - measured, unmeasured = 0, 0 - - for desc in query.run(): - if desc.measured: - measured += 1 - else: - unmeasured += 1 - - print(' %i measured entries and %i unmeasured' % (measured, unmeasured)) - except Exception as exc: - print(' failed to get the vote (%s)' % exc) - directory_values = [ DIRECTORY_AUTHORITIES['gabelmoo'], DIRECTORY_AUTHORITIES['tor26'], @@ -432,7 +311,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock.side_effect = [query1, query2, query3, query4] - tutorial_example() + execfile('docs/_static/example/votes_by_bandwidth_authorities.py') self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -440,16 +319,6 @@ class TestTutorialExamples(unittest.TestCase): @patch('%s.open' % __name__, create = True) @patch('stem.descriptor.remote.Query') def test_persisting_a_consensus(self, query_mock, open_mock, parse_file_mock, stdout_mock): - def tutorial_example_1(): - from stem.descriptor import DocumentHandler - from stem.descriptor.remote import DescriptorDownloader - - downloader = DescriptorDownloader() - consensus = downloader.get_consensus(document_handler = DocumentHandler.DOCUMENT).run()[0] - - with open('/tmp/descriptor_dump', 'w') as descriptor_file: - descriptor_file.write(str(consensus)) - def tutorial_example_2(): from stem.descriptor import DocumentHandler, parse_file @@ -466,7 +335,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock().run.return_value = [network_status] parse_file_mock.return_value = itertools.cycle([network_status]) - tutorial_example_1() - tutorial_example_2() + execfile('docs/_static/example/persisting_a_consensus.py') + execfile('docs/_static/example/persisting_a_consensus_with_parse_file.py') self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue())

1 0

[stem/master] Make revised tutorial tests run under python3
by atagar＠torproject.org 26 May '15

26 May '15

commit c79dc3d401de243bc7ae0e3146c8a6290a7f554a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue May 26 09:39:05 2015 -0700 Make revised tutorial tests run under python3 Python3 drops execfile(), so adding a helper function that does the same... https://stackoverflow.com/questions/436198/what-is-an-alternative-to-execfi… --- test/unit/tutorial.py | 14 ++++++++++---- test/unit/tutorial_examples.py | 20 ++++++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 39e4f03..95634dc 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -36,6 +36,12 @@ MIRROR_MIRROR_OUTPUT = """\ """ +def exec_file(path): + with open(path) as f: + code = compile(f.read(), path, 'exec') + exec(code) + + class TestTutorial(unittest.TestCase): @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) @@ -46,7 +52,7 @@ class TestTutorial(unittest.TestCase): 'traffic/written': '29649', }[arg] - execfile('docs/_static/example/hello_world.py') + exec_file('docs/_static/example/hello_world.py') self.assertEqual('My Tor relay has read 33406 bytes and written 29649.\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -120,7 +126,7 @@ class TestTutorial(unittest.TestCase): def test_mirror_mirror_on_the_wall_1(self, downloader_mock, stdout_mock): downloader_mock().get_consensus().run.return_value = [mocking.get_router_status_entry_v2()] - execfile('docs/_static/example/current_descriptors.py') + exec_file('docs/_static/example/current_descriptors.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -129,7 +135,7 @@ class TestTutorial(unittest.TestCase): controller = from_port_mock().__enter__() controller.get_network_statuses.return_value = [mocking.get_router_status_entry_v2()] - execfile('docs/_static/example/descriptor_from_tor_control_socket.py') + exec_file('docs/_static/example/descriptor_from_tor_control_socket.py') self.assertEqual('found relay caerSidi (A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -158,7 +164,7 @@ class TestTutorial(unittest.TestCase): reader = reader_mock().__enter__() reader.__iter__.return_value = iter([mocking.get_relay_server_descriptor()]) - execfile('docs/_static/example/past_descriptors.py') + exec_file('docs/_static/example/past_descriptors.py') self.assertEqual('found relay caerSidi (None)\n', stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) diff --git a/test/unit/tutorial_examples.py b/test/unit/tutorial_examples.py index ae73239..246b483 100644 --- a/test/unit/tutorial_examples.py +++ b/test/unit/tutorial_examples.py @@ -32,6 +32,8 @@ try: except ImportError: from mock import Mock, patch +OPEN_FUNCTION = open # make a reference so mocking open() won't mess with us + CIRC_CONTENT = '650 CIRC %d %s \ %s \ PURPOSE=%s' @@ -99,6 +101,12 @@ A7569A83B5706AB1B1A9CB52EFF7D2D32E4553EB: caerSidi """ +def exec_file(path): + with OPEN_FUNCTION(path, 'rb') as f: + code = compile(f.read(), path, 'exec') + exec(code) + + def _get_event(content): controller_event = mocking.get_message(content) stem.response.convert('EVENT', controller_event) @@ -167,7 +175,7 @@ class TestTutorialExamples(unittest.TestCase): path_7[0]: _get_router_status('176.67.169.171') }[fingerprint] - execfile('docs/_static/example/list_circuits.py') + exec_file('docs/_static/example/list_circuits.py') self.assert_equal_unordered(LIST_CIRCUITS_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -231,7 +239,7 @@ class TestTutorialExamples(unittest.TestCase): get_relay_server_descriptor({'opt': 'contact Sambuddha Basu', 'platform': 'node-Tor 0.1.0 on Linux x86_64'}), ] - execfile('docs/_static/example/outdated_relays.py') + exec_file('docs/_static/example/outdated_relays.py') self.assert_equal_unordered(OUTDATED_RELAYS_OUTPUT, stdout_mock.getvalue()) @@ -272,7 +280,7 @@ class TestTutorialExamples(unittest.TestCase): [get_network_status_document_v3(routers = (entry[5], entry[6], entry[7], entry[8], entry[9]))], ] - execfile('docs/_static/example/compare_flags.py') + exec_file('docs/_static/example/compare_flags.py') self.assert_equal_unordered(COMPARE_FLAGS_OUTPUT, stdout_mock.getvalue()) @@ -311,7 +319,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock.side_effect = [query1, query2, query3, query4] - execfile('docs/_static/example/votes_by_bandwidth_authorities.py') + exec_file('docs/_static/example/votes_by_bandwidth_authorities.py') self.assert_equal_unordered(VOTES_BY_BANDWIDTH_AUTHORITIES_OUTPUT, stdout_mock.getvalue()) @patch('sys.stdout', new_callable = StringIO) @@ -335,7 +343,7 @@ class TestTutorialExamples(unittest.TestCase): query_mock().run.return_value = [network_status] parse_file_mock.return_value = itertools.cycle([network_status]) - execfile('docs/_static/example/persisting_a_consensus.py') - execfile('docs/_static/example/persisting_a_consensus_with_parse_file.py') + exec_file('docs/_static/example/persisting_a_consensus.py') + exec_file('docs/_static/example/persisting_a_consensus_with_parse_file.py') self.assertEqual(PERSISTING_A_CONSENSUS_OUTPUT, stdout_mock.getvalue())

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
99
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2015