- tor-commits - lists.torproject.org

[tech-reports/master] Turn tor-nat-plan into a Tor Tech Report.
by karsten＠torproject.org 22 Aug '12

22 Aug '12

commit df7b3707a9a082377772e9bc580f0094d9bee742 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 22 08:01:07 2012 +0200 Turn tor-nat-plan into a Tor Tech Report. --- 2012/tor-nat-plan/.gitignore | 1 + 2012/tor-nat-plan/tor-nat-plan.bib | 56 +++++++++--------------------------- 2012/tor-nat-plan/tor-nat-plan.tex | 50 +++++++++++--------------------- 2012/tor-nat-plan/tortechrep.cls | 1 + 4 files changed, 33 insertions(+), 75 deletions(-) diff --git a/2012/tor-nat-plan/.gitignore b/2012/tor-nat-plan/.gitignore index 59cf12a..1053ba0 100644 --- a/2012/tor-nat-plan/.gitignore +++ b/2012/tor-nat-plan/.gitignore @@ -1,2 +1,3 @@ tor-nat-plan.pdf +tor-nat-plan-2012-08-22.pdf diff --git a/2012/tor-nat-plan/tor-nat-plan.bib b/2012/tor-nat-plan/tor-nat-plan.bib index e2a5dfd..35715bd 100644 --- a/2012/tor-nat-plan/tor-nat-plan.bib +++ b/2012/tor-nat-plan/tor-nat-plan.bib @@ -1,47 +1,19 @@ -@MISC{dummy, - author={nobody}, - title = {nothing}, - note = {\url{http://example.com}}, - year = {2011} +@inproceedings{dingledine2004tor, + title = {{Tor}: The Second-Generation Onion Router}, + author = {Roger Dingledine and Nick Mathewson and Paul Syverson}, + booktitle = {Proceedings of the 13th USENIX Security Symposium}, + year = {2004}, + month = {August}, + note = {\url{https://svn.torproject.org/svn/projects/design-paper/tor-design.pdf}}, } - -@techreport{dingledine2004tor, - title={Tor: The second-generation onion router}, - author={Dingledine, R. and Mathewson, N. and Syverson, P.}, - year={2004}, - institution={DTIC Document} -} @inproceedings{muller2010autonomous, - title={Autonomous nat traversal}, - author={Muller, A. and Evans, N. and Grothoff, C. and Kamkar, S.}, - booktitle={Peer-to-Peer Computing (P2P), 2010 IEEE Tenth International -Conference on}, - pages={1--4}, - year={2010}, - organization={IEEE} -} - -@misc{wiki:000, - author = "Wikipedia", - title = "STUN --- {W}ikipedia{,} The Free Encyclopedia", - year = "2012", - url = "\url{https://en.wikipedia.org/w/index.php?title=STUN&oldid=480053418}", - note = "[Online; accessed 20-March-2012]" + title = {Autonomous {NAT} Traversal}, + author = {Andreas M\"{u}ller and Nathan Evans and Christian Grothoff and Samy Kamkar}, + booktitle = {10th IEEE International Conference on Peer-to-Peer Computing (P2P)}, + year = {2010}, + month = {August}, + pages = {1--4}, + organization={IEEE}, } -@misc{wiki:001, - author = "Wikipedia", - title = "TURN --- {W}ikipedia{,} The Free Encyclopedia", - year = "2012", - url = "\url{https://en.wikipedia.org/w/index.php?title=Traversal_Using_Relays_around_NAT&oldid=480053422}", - note = "[Online; accessed 20-March-2012]" -} - -@misc{wiki:002, - author = "Wikipedia", - title = "ICE --- {W}ikipedia{,} The Free Encyclopedia", - year = "2012", - url = "\url{https://en.wikipedia.org/w/index.php?title=Interactive_Connectivity_Establishment&oldid=472491355}", - note = "[Online; accessed 20-March-2012]" -} diff --git a/2012/tor-nat-plan/tor-nat-plan.tex b/2012/tor-nat-plan/tor-nat-plan.tex index af19aff..0c0b44d 100644 --- a/2012/tor-nat-plan/tor-nat-plan.tex +++ b/2012/tor-nat-plan/tor-nat-plan.tex @@ -1,17 +1,5 @@ -\documentclass{article} -%\usepackage{palatcm} -\usepackage{censor} - -\usepackage{listings} -\lstset{language=python,breaklines=true} - -\usepackage{fancyhdr} -\usepackage{color} +\documentclass{tortechrep} \usepackage{graphicx} -\usepackage{fullpage} -\setlength{\headheight}{12pt} -\setlength{\headsep}{12pt} -\addtolength{\textheight}{-24pt} \usepackage{prettyref} \newrefformat{sec}{Section~\ref{#1}} @@ -42,26 +30,20 @@ \newcommand{\ia}{inter alia\xspace} \makeatother - -\newcommand{\thetitle}{Tor and NAT devices: increasing bridge \& relay reachability} -\title{\thetitle\\or,\\enabling the use of NAT--PMP and UPnP by default} +\title{Tor and NAT devices:\\increasing bridge \& relay reachability\\% +or,\\enabling the use of NAT--PMP and UPnP by default} %% Please add your name in here if you contribute -\author{Jacob Appelbaum - \\jacob(a)torproject.org - } -\pagestyle{fancy} -\fancyhf{} - -\fancyhead[C]{\thetitle} -\fancyfoot[C]{\thepage} +\author{Jacob Appelbaum} +\contact{jacob(a)torproject.org} +\reportid{2012-08-001} +\date{August 22, 2012} \begin{document} -\thispagestyle{plain} - \maketitle +\begin{abstract} Tor relays and Tor bridges require at least a single reachable TCP port. This document discusses the current methods for enabling and enhancing Tor bridge and Tor relay reachability when behind a consumer grade @@ -69,10 +51,7 @@ NAT device. Such reachability improvements are extremely important for embedded devices that provide Tor relaying or Tor bridging services. We propose the use of NAT--PMP and/or UPnP protocol(s) to ensure that inbound connectivity is possible. - -\pagebreak -\tableofcontents -\pagebreak +\end{abstract} %\section{License} %This work is released under the Creative Commons @@ -87,7 +66,7 @@ possible. \label{introduction} -Tor\cite{dingledine2004tor} is the second-generation onion router -- it is both +Tor~\cite{dingledine2004tor} is the second-generation onion router -- it is both client and server software in a single program. When {\em Tor} is configured to be a relay or bridge, it requires a public IPv4 address and at least a single TCP port for its Onion Router Port (ORPort). Tor does not directly need to be @@ -115,7 +94,13 @@ mention it when applicable. While other methods of NAT traversal are possible, we consider them to be out of scope at this time due to their reliance on third parties -(STUN~\cite{wiki:000}, TURN~\cite{wiki:001}, ICE~\cite{wiki:002}, etc) or +(STUN% +\footnote{\url{https://en.wikipedia.org/w/index.php?title=STUN\&oldid=480053418}}, +TURN% +\footnote{\url{https://en.wikipedia.org/w/index.php?title=Traversal\_Using\_Relays\_around\_NAT&oldid=480053422}}, +ICE% +\footnote{\url{https://en.wikipedia.org/w/index.php?title=Interactive\_Connectivity\_Establishment\&oldid=472491355}}, +etc) or because they require specialized client software (pwnat~\cite{muller2010autonomous}, etc) to access services offered behind a NAT device; this topic is discussed in section \ref{third}. The @@ -297,7 +282,6 @@ size or complexity. I would like to thank the University of Washington Security and Privacy Research Lab and other anonymous cypherpunks who contributed valuable feedback. -\bibliographystyle{acm} \bibliography{tor-nat-plan} \end{document} diff --git a/2012/tor-nat-plan/tortechrep.cls b/2012/tor-nat-plan/tortechrep.cls new file mode 120000 index 0000000..4c24db2 --- /dev/null +++ b/2012/tor-nat-plan/tortechrep.cls @@ -0,0 +1 @@ +../../tortechrep.cls \ No newline at end of file

1 0

[tech-reports/master] Add mostly unmodified tor-nat-plan sources.
by karsten＠torproject.org 22 Aug '12

22 Aug '12

commit 5477d662aedd8c0953f5d80f9ec326cebb6c8940 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 22 08:00:17 2012 +0200 Add mostly unmodified tor-nat-plan sources. The main modification is that the license section was removed to avoid committing and later removing the creative commons image. --- 2012/tor-nat-plan/.gitignore | 2 + 2012/tor-nat-plan/tor-nat-plan.bib | 47 ++++++ 2012/tor-nat-plan/tor-nat-plan.tex | 304 ++++++++++++++++++++++++++++++++++++ 3 files changed, 353 insertions(+), 0 deletions(-) diff --git a/2012/tor-nat-plan/.gitignore b/2012/tor-nat-plan/.gitignore new file mode 100644 index 0000000..59cf12a --- /dev/null +++ b/2012/tor-nat-plan/.gitignore @@ -0,0 +1,2 @@ +tor-nat-plan.pdf + diff --git a/2012/tor-nat-plan/tor-nat-plan.bib b/2012/tor-nat-plan/tor-nat-plan.bib new file mode 100644 index 0000000..e2a5dfd --- /dev/null +++ b/2012/tor-nat-plan/tor-nat-plan.bib @@ -0,0 +1,47 @@ +@MISC{dummy, + author={nobody}, + title = {nothing}, + note = {\url{http://example.com}}, + year = {2011} +} + + +@techreport{dingledine2004tor, + title={Tor: The second-generation onion router}, + author={Dingledine, R. and Mathewson, N. and Syverson, P.}, + year={2004}, + institution={DTIC Document} +} +@inproceedings{muller2010autonomous, + title={Autonomous nat traversal}, + author={Muller, A. and Evans, N. and Grothoff, C. and Kamkar, S.}, + booktitle={Peer-to-Peer Computing (P2P), 2010 IEEE Tenth International +Conference on}, + pages={1--4}, + year={2010}, + organization={IEEE} +} + +@misc{wiki:000, + author = "Wikipedia", + title = "STUN --- {W}ikipedia{,} The Free Encyclopedia", + year = "2012", + url = "\url{https://en.wikipedia.org/w/index.php?title=STUN&oldid=480053418}", + note = "[Online; accessed 20-March-2012]" +} + +@misc{wiki:001, + author = "Wikipedia", + title = "TURN --- {W}ikipedia{,} The Free Encyclopedia", + year = "2012", + url = "\url{https://en.wikipedia.org/w/index.php?title=Traversal_Using_Relays_around_NAT&oldid=480053422}", + note = "[Online; accessed 20-March-2012]" +} + +@misc{wiki:002, + author = "Wikipedia", + title = "ICE --- {W}ikipedia{,} The Free Encyclopedia", + year = "2012", + url = "\url{https://en.wikipedia.org/w/index.php?title=Interactive_Connectivity_Establishment&oldid=472491355}", + note = "[Online; accessed 20-March-2012]" +} diff --git a/2012/tor-nat-plan/tor-nat-plan.tex b/2012/tor-nat-plan/tor-nat-plan.tex new file mode 100644 index 0000000..af19aff --- /dev/null +++ b/2012/tor-nat-plan/tor-nat-plan.tex @@ -0,0 +1,304 @@ +\documentclass{article} +%\usepackage{palatcm} +\usepackage{censor} + +\usepackage{listings} +\lstset{language=python,breaklines=true} + +\usepackage{fancyhdr} +\usepackage{color} +\usepackage{graphicx} +\usepackage{fullpage} +\setlength{\headheight}{12pt} +\setlength{\headsep}{12pt} +\addtolength{\textheight}{-24pt} + +\usepackage{prettyref} +\newrefformat{sec}{Section~\ref{#1}} +\newrefformat{tab}{Table~\ref{#1}} +\newrefformat{fig}{Figure~\ref{#1}} +\newrefformat{cha}{Chapter~\ref{#1}} +\newrefformat{eqn}{Equation~\ref{#1}} +\newrefformat{apx}{Appendix~\ref{#1}} + +\usepackage{hyperref} +\hypersetup{colorlinks, citecolor=MyDarkRed, filecolor=MyDarkBlue, linkcolor=MyDarkRed, urlcolor=MyDarkBlue} + +\definecolor{MyDarkBlue}{rgb}{0, 0.0, 0.45} +\definecolor{MyDarkRed}{rgb}{0.45, 0.0, 0} +\definecolor{MyDarkGreen}{rgb}{0, 0.45, 0} +\definecolor{MyLightGray}{gray}{.90} +\definecolor{MyLightGreen}{rgb}{0.5, 0.99, 0.5} + +\usepackage{xspace} +\makeatletter +\newcommand{\ie}{i.e.\@\xspace} +\newcommand{\eg}{e.g.\@\xspace} +\newcommand{\cf}{cf.\@\xspace} +\newcommand{\vs}{vs.\@\xspace} +\newcommand{\wrt}{w.r.t.\@\xspace} +\newcommand{\etal}{\textit{et al.\@\xspace}} +\newcommand{\detal}{\textit{et al.}} +\newcommand{\ia}{inter alia\xspace} +\makeatother + + +\newcommand{\thetitle}{Tor and NAT devices: increasing bridge \& relay reachability} +\title{\thetitle\\or,\\enabling the use of NAT--PMP and UPnP by default} + +%% Please add your name in here if you contribute +\author{Jacob Appelbaum + \\jacob(a)torproject.org + } +\pagestyle{fancy} +\fancyhf{} + +\fancyhead[C]{\thetitle} +\fancyfoot[C]{\thepage} + +\begin{document} + +\thispagestyle{plain} + +\maketitle + +Tor relays and Tor bridges require at least a single reachable TCP port. This +document discusses the current methods for enabling and enhancing Tor +bridge and Tor relay reachability when behind a consumer grade +NAT device. Such reachability improvements are extremely important for embedded +devices that provide Tor relaying or Tor bridging services. We propose the use +of NAT--PMP and/or UPnP protocol(s) to ensure that inbound connectivity is +possible. + +\pagebreak +\tableofcontents +\pagebreak + +%\section{License} +%This work is released under the Creative Commons +%Attribution-NonCommercial-NoDerivs license. +% +%\begin{figure}[htb] +%\centering +%\includegraphics*[keepaspectratio=true]{by-nc-nd.eps} +%\end{figure} + +\section{Introduction} +\label{introduction} + + +Tor\cite{dingledine2004tor} is the second-generation onion router -- it is both +client and server software in a single program. When {\em Tor} is configured to +be a relay or bridge, it requires a public IPv4 address and at least a single +TCP port for its Onion Router Port (ORPort). Tor does not directly need to be +assigned this IP -- it is only required that inbound connectivity is possible on +the advertised TCP port on the respective IP. + +While other terms such as network address and port translation (NAPT), port +address translation (PAT) or IP masquerading are used, we have chosen to use +Network Address Translation (NAT) for brevity and simplicity. + +The ORPort handles connections from either Tor clients or other Tor relays. +When placed behind a NAT device, the {\em Tor} relay or bridge is generally +able to make outgoing connections without restriction. In general, incoming +connections are filtered and require that the NAT device forward traffic. In +general consumer grade NAT devices have a single IPv4 address bound to its +respective Wide Area Network (WAN) interface and that IP address is shared +between many systems on the NAT device's Local Area Network (LAN) interface. +Most consumer grade NAT devices allow for services to be reachable behind the +NAT device with manual configuration and many allow for automatic configuration +with one of two major protocols, UPnP and NAT--PMP. + +Tor only supports IPv6 for bridges at the moment and as NAT is not an issue +with IPv6, we consider IPv6 to be largely out of scope for this document but we +mention it when applicable. + +While other methods of NAT traversal are possible, we consider them +to be out of scope at this time due to their reliance on third parties +(STUN~\cite{wiki:000}, TURN~\cite{wiki:001}, ICE~\cite{wiki:002}, etc) or +because they require specialized client software +(pwnat~\cite{muller2010autonomous}, etc) to access services offered behind a +NAT device; this topic is discussed in section \ref{third}. The +former grouping of third--party--dependent solutions is almost certainly +never a viable NAT piercing technique for anonymity reasons. The latter +technique implemented by {\em pwnat} is much more attractive. It is generally +friendly to privacy and does not rely on NAT router configuration. + +This document explores methods of programmatically configuring NAT routers to +improve Tor relay and bridge reachability. Automatic configuration of NAT +routers is easy to use but slightly controversial. Many consumer grade NAT +devices do support some form of port forwarding or NAT traversal. They are +quite straightforward to configure in a programmatic manner. It is often the +case that these devices support UPnP and/or NAT--PMP by default which allows +for simple NAT traversal. Nearly all of these routers also support a web +interface for configuration of port forwarding; we do not consider methods of +automating configuration through the web interface. + +\section{Why we shouldn't rely on distant third parties} +\label{third} +Full reachability is a serious problem on the modern internet. Offering a +service requires bi--directional IPv4 connectivity. While it may seem +attractive to attempt to use protocols STUN, ICE, or other NAT punching +techniques that involve a third party, such techniques are generally bad for +anonymity. We assume that readers of this paper are familiar with the work by +Grothoff et al in Autonomous NAT Traversal~\cite{muller2010autonomous}, the +basic ideas of NAT--PMP and UPnP and we cover the important aspects as they +apply to Tor in section \ref{sec:protocols}. + +In the case of Tor relays, we expect that a third party relay, such as an ICE +or STUN service becomes a kind of centralized area of the network with high +value. When many relays route through a single third party, we may find that +the anonymity properties provided by all of those nodes is reducible to the +third party itself. The Tor network assumes that there is no global or network +wide observer of all Tor nodes but adding a NAT-piercing third party would +create one or a class of centralized systems to ease such monitoring. While +asymmetric connection properties may create a more subtle security analysis, we +think caution is prudent. + +In the case of Tor bridges, in addition to the challenges faced by relays, we +expect that any given third party used to broker bridge connections would +simply become blocked, perhaps even before the bridge itself is blocked. +Additionally, monitoring of the third party may reveal every bridge attempting +to connect to the third party -- this is certainly not a good property in terms +of censorship resistance. Even if this service is run by a trusted party, we +have no way to protect it from surveillance. + +\section{NAT traversal protocols} +\label{sec:protocols} + +There are two protocols commonly used by consumer grade routers for NAT +configuration. The most common protocol is the UPnP Forum managed standard, +UPnP, and the second, but still extremely common protocol, is the Apple +standard NAT--PMP. + +These two protocols along with experimental ideas such as +pwnat~\cite{muller2010autonomous} perform NAT traversal with nearby third +parties -- generally NAT devices. STUN, ICE and other third party NAT +traversal protocols use a well known third party on the wider internet, UPnP +and NAT--PMP attempt to create a state of bi-directional connectivity through +the nearest upstream NAT device. While this does not strictly remove the third +party from the NAT traversal problem, we ensure that the third party is already +in the network path. + +Only pwnat~\cite{muller2010autonomous} as described by Grothoff et al in +their seminal Autonomous NAT traversal stands alone in its ability to produce +results without a specialized protocol supported by a third party during NAT +traversal. It however requires that both the client and server run specific +software to complete connections. In the future it seems that a pwnat based +pluggable transport for Tor bridges would be suitable for certain reachability +cases. It is unlikely to work for the entire Tor network which requires that +all relays communicate directly with all other relays. + +\subsection{UPnP} +\label{sec:UPnP} + +Configuration of upstream NAT devices is possible with the UPnP protocol in two +different ways. The first method is available in the Vidalia Tor controller and +the second is with the {\em tor--fw--helper} utility. + +\subsection{NAT--PMP} +\label{renumber:natpmp} + +Configuration of upstream NAT devices with the NAT--PMP is not currently +supported by the Vidalia Tor controller. There is currently no known plan to +add NAT--PMP support to the Vidalia controller. It is possible to use the +{\em tor--fw--helper} utility with the NAT--PMP protocol. + +\section{Tor controllers and NAT devices} +\label{sec:tor-controllers} + +When {\em tor} is launched or controlled by a controller such as Vidalia and it +is running as a relay or bridge, the controller may attempt to configure any +upstream NAT devices to forward required TCP ports. Vidalia does this with UPnP +at the request of the user and not by default. + +When {\em tor} is launched without such a controller, the current stable {\em +tor} program itself has no knowledge about NAT piercing techniques. It requires +a pre--configured upstream NAT device or it must be running on a system with a +public IPv4 address. + +\section{Tor and NAT devices} +\label{sec:tor-nat} + +The 0.2.3.x branch of {\em tor} includes two new options, {\em PortForwarding} and +{\em PortForwardingHelper}, to assist in the configuration of upstream NAT +devices. The default {\em PortForwardingHelper} is {\em tor--fw--helper} and +{\em PortForwarding} is disabled by default. + +The {\em tor--fw--helper} utility supports both UPnP and NAT--PMP if compiled +with the requisite libraries. This utility is not currently built by default and +each protocol must be manually specified and enabled at build time. + +When {\em tor--fw--helper} is built with UPnP and NAT--PMP, and {\em +PortForwarding} is enabled with {\em tor} configured as a relay or bridge, {\em +tor} is generally able to pierce supported NAT devices without any additional +software. This is especially important when embedded devices with Tor are +considered as relay or bridge devices. + +\section{Security concerns} +\label{sec:security} + +We presume that if Tor enables UPnP and NAT--PMP by default it will increase Tor +router and Tor bridge availability without requiring manual reconfiguration of +NAT devices. It is generally important to note that NAT devices are largely +deployed to resolve IPv4 resource allocation issues. While NAT devices perform +similar functions to network firewalls they are not by design a security +boundary. If a network operator prefers to not use UPnP and NAT--PMP, it is +suggested that they disable support for the protocols on their respective NAT +devices. Furthermore, such a network operator must manually configure their +respective routers to ensure that the required ports are globally reachable. + +By Tor shipping with support for UPnP and NAT--PMP, we might encourage +users to enable this feature on their NAT devices and thus make them more +vulnerable to other applications also using the enabled UPnP or NAT--PMP +services offered by their NAT device. We believe that this is a reasonable +trade--off. Users have to positively affirm their desire to enable such +a feature on their routers and such consent is a reasonable standard for such a +trade--off. Users who are behind such a NAT device will have log messages +indicating that UPnP or NAT--PMP was the NAT traversal method used by the Tor +relay or Tor bridge. + +Perhaps the greatest security concern is that Tor would depend on libnatpmp and +libminiupnpc. This code could have vulnerabilities which may be exploitable and +{\em tor--fw--helper} would raise the overall attack surface of a given Tor +relay or Tor bridge. + +\section{Suggestions for improvement} +\label{sec:improvements} + +Future releases of {\em tor} should build {\em tor--fw--helper} by +default with full UPnP and NAT--PMP support enabled at compile time. Vidalia +should be extended to understand the {\em tor} {\em PortForwarding} and +{\em PortForwardingHelper} options rather than including UPnP or NAT--PMP +library code directly. When {\em tor} is configured to be a relay or a bridge, it +should ensure that {\em PortForwarding} is enabled without further user +intervention. The exception is that IPv6 enabled bridges will not and should +not ever need NAT traversal services; on such IPv6 enabled devices, we should +not automatically launch our {\em PortForwardingHelper} unless we also have a +corresponding IPv4 IP address that must be globally reachable. + +We suggest that libminiupnpc and libnatpmp must be audited for security related +concerns before any full scale {\em tor--fw--helper} deployment. Any changes +or security improvements should be sent to the upstream authors. + +\section{Conclusion} +\label{sec:conclusion} + +When {\em tor--fw--helper} is built and shipped in various binary releases and +when {\em tor} {\em PortForwarding} is enabled, Tor bridge and relay +reachability and availability will improve. Tor bridges and relays previously +hidden behind many NAT devices will become available. Furthermore, NAT +piercing on embedded devices will improve and graphical Tor controllers will +be able to easily support these new features without significant increases in +size or complexity. + +\section*{Acknowledgements} + +I would like to thank the University of Washington Security and Privacy +Research Lab and other anonymous cypherpunks who contributed valuable feedback. + +\bibliographystyle{acm} +\bibliography{tor-nat-plan} + +\end{document} +

1 0

[ooni-probe/master] Write some documentation for DOMClass
by art＠torproject.org 22 Aug '12

22 Aug '12

commit 78fe6dea0b46c4055fbc195cf9329001c062cb17 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Aug 21 01:51:58 2012 +0200 Write some documentation for DOMClass --- ooni/plugins/domclass.py | 97 ++++++++++++++++++++++++++++++++++----------- ooni/protocols/http.py | 5 ++ 2 files changed, 78 insertions(+), 24 deletions(-) diff --git a/ooni/plugins/domclass.py b/ooni/plugins/domclass.py index 31e2e41..cdcd508 100644 --- a/ooni/plugins/domclass.py +++ b/ooni/plugins/domclass.py @@ -1,8 +1,33 @@ -""" -This is a self genrated test created by scaffolding.py. -you will need to fill it up with all your necessities. -Safe hacking :). -""" +# +# +# domclass +# ******** +# +# :copyright: (c) 2012 by Arturo Filastò +# :license: see LICENSE for more details. +# +# how this works +# -------------- +# +# This classifier uses the DOM structure of a website to determine how similar +# the two sites are. +# The procedure we use is the following: +# * First we parse all the DOM tree of the web page and we build a list of +# TAG parent child relationships (ex. <html><a><b></b></a><c></c></html> => +# (html, a), (a, b), (html, c)). +# +# * We then use this information to build a matrix (M) where m[i][j] = P(of +# transitioning from tag[i] to tag[j]). If tag[i] does not exists P() = 0. +# Note: M is a square matrix that is number_of_tags wide. +# +# * We then calculate the eigenvectors (v_i) and eigenvalues (e) of M. +# +# * The corelation between page A and B is given via this formula: +# correlation = dot_product(e_A, e_B), where e_A and e_B are +# resepectively the eigenvalues for the probability matrix A and the +# probability matrix B. +# + from zope.interface import implements from twisted.python import usage from twisted.plugin import IPlugin @@ -18,6 +43,8 @@ class domclassArgs(usage.Options): ['asset', 'a', None, 'URL List'], ['resume', 'r', 0, 'Resume at this index']] +# All HTML4 tags +# XXX add link to W3C page where these came from alltags = ['A', 'ABBR', 'ACRONYM', 'ADDRESS', 'APPLET', 'AREA', 'B', 'BASE', 'BASEFONT', 'BD', 'BIG', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION', 'CENTER', 'CITE', 'CODE', 'COL', 'COLGROUP', 'DD', 'DEL', 'DFN', 'DIR', 'DIV', @@ -29,6 +56,7 @@ alltags = ['A', 'ABBR', 'ACRONYM', 'ADDRESS', 'APPLET', 'AREA', 'B', 'BASE', 'STRIKE', 'STRONG', 'STYLE', 'SUB', 'SUP', 'TABLE', 'TBODY', 'TD', 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'U', 'UL', 'VAR'] +# Reduced subset of only the most common tags commontags = ['A', 'B', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION', 'CENTER', 'CITE', 'CODE', 'COL', 'DD', 'DIV', 'DL', 'DT', 'EM', 'FIELDSET', 'FONT', 'FORM', 'FRAME', 'FRAMESET', 'H1', 'H2', @@ -39,12 +67,18 @@ commontags = ['A', 'B', 'BLOCKQUOTE', 'BODY', 'BR', 'BUTTON', 'CAPTION', 'STRIKE', 'STRONG', 'STYLE', 'SUB', 'SUP', 'TABLE', 'TBODY', 'TD', 'TEXTAREA', 'TFOOT', 'TH', 'THEAD', 'TITLE', 'TR', 'TT', 'U', 'UL'] +# The tags we are intested in using for our analysis thetags = ['A', 'DIV', 'FRAME', 'H1', 'H2', 'H3', 'H4', 'IFRAME ', 'INPUT', 'LABEL','LI', 'P', 'SCRIPT', 'SPAN', 'STYLE', 'TR'] -def compute_matrix(dataset): +def compute_probability_matrix(dataset): + """ + Compute the probability matrix based on the input dataset. + + :dataset: an array of pairs representing the parent child relationships. + """ import itertools import numpy ret = {} @@ -74,21 +108,38 @@ def compute_matrix(dataset): if possibilities != 0: matrix[x][i] = matrix[x][i]/possibilities - ret['matrix'] = matrix - ret['eigen'] = numpy.linalg.eigvals(matrix) - return ret + return matrix + +def compute_eigenvalues(matrix): + """ + Returns the eigenvalues of the supplied square matrix. + + :matrix: must be a square matrix and diagonalizable. + """ + return numpy.linalg.eigvals(matrix) def readDOM(content=None, filename=None): + """ + Parses the DOM of the HTML page and returns an array of parent, child + pairs. + + :content: the content of the HTML page to be read. + + :filename: the filename to be read from for getting the content of the + page. + """ from bs4 import BeautifulSoup + if filename: f = open(filename) content = ''.join(f.readlines()) + f.close() dom = BeautifulSoup(content) couples = [] for x in dom.findAll(): couples.append((str(x.parent.name), str(x.name))) - #f.close() + return couples class domclassTest(HTTPTest): @@ -100,17 +151,20 @@ class domclassTest(HTTPTest): options = domclassArgs blocking = False - tool = True + follow_redirects = True + #tool = True def runTool(self): import yaml, numpy site_a = readDOM(filename=self.local_options['file']) site_b = readDOM(filename=self.local_options['fileb']) - a = compute_matrix(site_a) + a['matrix'] = compute_probability_matrix(site_a) + a['eigen'] = compute_eigenvalue(a['matrix']) + self.result['eigenvalues'] = a['eigen'] - #self.result['matrix'] = str(a['matrix'] - #self.result['content'] = data[:200] - b = compute_matrix(site_b) + b['matrix'] = compute_probability_matrix(site_b) + b['eigen'] = compute_eigenvalue(b['matrix']) + #print "A: %s" % a #print "B: %s" % b correlation = numpy.vdot(a['eigen'],b['eigen']) @@ -122,24 +176,19 @@ class domclassTest(HTTPTest): import yaml, numpy site_a = readDOM(data) #site_b = readDOM(self.local_options['fileb']) - a = compute_matrix(site_a) + a['matrix'] = compute_probability_matrix(site_a) + a['eigen'] = compute_eigenvalue(a['matrix']) + if len(data) == 0: self.result['eigenvalues'] = None self.result['matrix'] = None else: self.result['eigenvalues'] = a['eigen'] - #self.result['matrix'] = str(a['matrix']) + #self.result['matrix'] = a['matrix'] #self.result['content'] = data[:200] #b = compute_matrix(site_b) print "A: %s" % a return a['eigen'] - #print "B: %s" % b - #correlation = numpy.vdot(a['eigen'],b['eigen']) - #correlation /= numpy.linalg.norm(a['eigen'])*numpy.linalg.norm(b['eigen']) - #correlation = (correlation + 1)/2 - #print "Corelation: %s" % correlation -# We need to instantiate it otherwise getPlugins does not detect it -# XXX Find a way to load plugins without instantiating them. domclass = domclassTest(None, None, None) diff --git a/ooni/protocols/http.py b/ooni/protocols/http.py index 5254a5c..2b38f28 100644 --- a/ooni/protocols/http.py +++ b/ooni/protocols/http.py @@ -40,12 +40,17 @@ class HTTPTest(OONITest): and once the request body has been received. """ randomize_ua = True + follow_redirects = False def initialize(self): from twisted.web.client import Agent import yaml self.agent = Agent(self.reactor) + if self.follow_redirects: + from twisted.web.client import RedirectAgent + self.agent = RedirectAgent(self.agent) + self.request = {} self.response = {}

1 0

[stem/master] Better validation of controller's from_port() function
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit a6c5a063d1f963a53e012b4c31478f90dea0d795 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 17 10:24:16 2012 -0700 Better validation of controller's from_port() function I scratched my head due to an awefully misleading stacktrace when I passed a port value into the method's argument slot. Validating the inputs to avoid having this cause confusion in the future. Before: Traceback (most recent call last): File "<stdin>", line 1, in <module> File "test/prompt.py", line 67, in controller controller = stem.control.Controller.from_port(CONTROL_PORT) File "stem/control.py", line 457, in from_port control_port = stem.socket.ControlPort(control_addr, control_port) File "stem/socket.py", line 287, in __init__ if connect: self.connect() File "stem/socket.py", line 171, in connect self._socket = self._make_socket() File "stem/socket.py", line 311, in _make_socket control_socket.connect((self._control_addr, str(self._control_port))) File "/usr/lib/python2.7/socket.py", line 224, in meth return getattr(self._sock,name)(*args) TypeError: coercing to Unicode: need string or buffer, int found After: Traceback (most recent call last): File "<stdin>", line 1, in <module> File "test/prompt.py", line 67, in controller controller = stem.control.Controller.from_port(CONTROL_PORT) File "stem/control.py", line 459, in from_port raise ValueError("Invalid ip address: %s" % control_addr) ValueError: Invalid ip address: 2779 --- stem/control.py | 6 ++++++ stem/util/connection.py | 2 ++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/stem/control.py b/stem/control.py index aca6f41..dd5f812 100644 --- a/stem/control.py +++ b/stem/control.py @@ -48,6 +48,7 @@ import threading import stem.response import stem.socket import stem.version +import stem.util.connection import stem.util.log as log # state changes a control socket can have @@ -454,6 +455,11 @@ class Controller(BaseController): :raises: :class:`stem.socket.SocketError` if we're unable to establish a connection """ + if not stem.util.connection.is_valid_ip_address(control_addr): + raise ValueError("Invalid IP address: %s" % control_addr) + elif not stem.util.connection.is_valid_port(control_port): + raise ValueError("Invalid port: %s" % control_port) + control_port = stem.socket.ControlPort(control_addr, control_port) return Controller(control_port) diff --git a/stem/util/connection.py b/stem/util/connection.py index eda3569..02201bb 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -39,6 +39,8 @@ def is_valid_ip_address(address): :returns: True if input is a valid IPv4 address, False otherwise """ + if not isinstance(address, str): return False + # checks if theres four period separated values if address.count(".") != 3: return False

1 0

[stem/master] Caching parsed controller version
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit 2a34547cc6dc157617c4a485d7e9e41816d46e66 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 6 08:45:07 2012 -0700 Caching parsed controller version Our controller version is something that we'll frequently look up. There's no reason to leave it uncached. --- stem/control.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 673261c..6fed090 100644 --- a/stem/control.py +++ b/stem/control.py @@ -627,7 +627,13 @@ class Controller(BaseController): * ValueError if unable to parse the version """ - return stem.version.Version(self.get_info("version")) + if not self.is_caching_enabled(): + return stem.version.Version(self.get_info("version")) + elif not "version" in self._request_cache: + version = stem.version.Version(self.get_info("version")) + self._request_cache["version"] = version + + return self._request_cache["version"] def authenticate(self, *args, **kwargs): """

1 0

[stem/master] Fixing circular import
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit fc736ff07c2ded068ee3e5b9ad1028923ee89c47 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Aug 17 10:07:55 2012 -0700 Fixing circular import Correcting a circular import between the connection and control modules... >>> import test.prompt Traceback (most recent call last): File "<stdin>", line 1, in <module> File "test/prompt.py", line 15, in <module> import stem.control File "stem/control.py", line 48, in <module> import stem.connection File "stem/connection.py", line 106, in <module> def connect_port(control_addr = "127.0.0.1", control_port = 9051, password = None, chroot_path = None, controller = stem.control.Controller): AttributeError: 'module' object has no attribute 'control' --- stem/control.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stem/control.py b/stem/control.py index 0d7bb04..aca6f41 100644 --- a/stem/control.py +++ b/stem/control.py @@ -45,7 +45,6 @@ import time import Queue import threading -import stem.connection import stem.response import stem.socket import stem.version @@ -646,6 +645,7 @@ class Controller(BaseController): :raises: see :func:`stem.connection.authenticate` """ + import stem.connection stem.connection.authenticate(self, *args, **kwargs) def protocolinfo(self): @@ -659,6 +659,7 @@ class Controller(BaseController): * :class:`stem.socket.SocketError` if problems arise in establishing or using the socket """ + import stem.connection return stem.connection.get_protocolinfo(self) def get_conf(self, param, default = UNDEFINED, multiple = False):

1 0

[stem/master] Pydoc mistake
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit 9fe8da962aadec5d56bfeb6d6635a01228514ca2 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 6 08:24:16 2012 -0700 Pydoc mistake Actually, I'm not sure what I was trying to say there. Issue spotted by Karsten. --- stem/descriptor/server_descriptor.py | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 759d6a5..6b0f2cf 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -70,8 +70,7 @@ SINGLE_FIELDS = ( def parse_file(descriptor_file, validate = True): """ - Iterates over the server descriptors in a file. This can only read relay or - descriptors. + Iterates over the server descriptors in a file. :param file descriptor_file: file with descriptor content :param bool validate: checks the validity of the descriptor's content if True, skips these checks otherwise

1 0

[stem/master] Caching and logging for GETCONF/SETCONF
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit c87b1005ad045b4554c3ed4c2ba6ce6e54aa81dc Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 6 10:04:40 2012 -0700 Caching and logging for GETCONF/SETCONF Caching and logging in a similar fashion to GETINFO. Remaining todo items... * This is broken if another controller tampers with our configuration values. We should listen for configuration change events to catch that. * Calling 'GETCONF blarg' causes an exception without a message. I should figure out why. --- stem/control.py | 90 ++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 70 insertions(+), 20 deletions(-) diff --git a/stem/control.py b/stem/control.py index 6fed090..0d7bb04 100644 --- a/stem/control.py +++ b/stem/control.py @@ -612,6 +612,8 @@ class Controller(BaseController): if is_geoip_request and self.is_caching_enabled() and self._geoip_failure_count != -1: self._geoip_failure_count += 1 + log.debug("GETINFO %s (failed: %s)" % (" ".join(params), exc)) + if default == UNDEFINED: raise exc else: return default @@ -694,7 +696,7 @@ class Controller(BaseController): entries = self.get_conf_map(param, default, multiple) return _case_insensitive_lookup(entries, param, default) - def get_conf_map(self, param, default = UNDEFINED, multiple = True): + def get_conf_map(self, params, default = UNDEFINED, multiple = True): """ Queries the control socket for the values of given configuration options and provides a mapping of the keys to the values. If provided a default @@ -720,7 +722,7 @@ class Controller(BaseController): provides so get_conf_map("HiddenServicePort") will give the same response as get_conf_map("HiddenServiceOptions"). - :param str,list param: configuration option(s) to be queried + :param str,list params: configuration option(s) to be queried :param object default: response if the query fails :param bool multiple: if True, the value(s) provided are lists of all returned values,otherwise this just provides the first value @@ -735,19 +737,44 @@ class Controller(BaseController): :class:`stem.socket.InvalidArguments` if the configuration option requested was invalid """ - if isinstance(param, str): - param = [param] + start_time = time.time() + reply = {} - try: - # remove strings which contain only whitespace - param = filter(lambda entry: entry.strip(), param) - if param == []: return {} + if isinstance(params, str): + params = [params] + + # remove strings which contain only whitespace + params = filter(lambda entry: entry.strip(), params) + if params == []: return {} + + # translate context sensitive options + lookup_params = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in params]) + + # check for cached results + for param in list(lookup_params): + cache_key = "getconf.%s" % param.lower() - # translate context sensitive options - lookup_param = set([MAPPED_CONFIG_KEYS.get(entry, entry) for entry in param]) + if cache_key in self._request_cache: + reply[param] = self._request_cache[cache_key] + lookup_params.remove(param) + + # if everything was cached then short circuit making the query + if not lookup_params: + log.debug("GETCONF %s (cache fetch)" % " ".join(reply.keys())) - response = self.msg("GETCONF %s" % ' '.join(lookup_param)) + if multiple: + return reply + else: + return dict([(entry[0], entry[1][0]) for entry in reply.items()]) + + try: + response = self.msg("GETCONF %s" % ' '.join(lookup_params)) stem.response.convert("GETCONF", response) + reply.update(response.entries) + + if self.is_caching_enabled(): + for key, value in response.entries.items(): + self._request_cache["getconf.%s" % key.lower()] = value # Maps the entries back to the parameters that the user requested so the # capitalization matches (ie, if they request "exitpolicy" then that @@ -759,19 +786,23 @@ class Controller(BaseController): # entries since the user didn't request those by their key, so we can't # be sure what they wanted. - for key in response.entries: + for key in reply: if not key.lower() in MAPPED_CONFIG_KEYS.values(): - user_expected_key = _case_insensitive_lookup(param, key, key) + user_expected_key = _case_insensitive_lookup(params, key, key) if key != user_expected_key: - response.entries[user_expected_key] = response.entries[key] - del response.entries[key] + reply[user_expected_key] = reply[key] + del reply[key] + + log.debug("GETCONF %s (runtime: %0.4f)" % (" ".join(lookup_params), time.time() - start_time)) if multiple: - return response.entries + return reply else: - return dict([(entry[0], entry[1][0]) for entry in response.entries.items()]) + return dict([(entry[0], entry[1][0]) for entry in reply.items()]) except stem.socket.ControllerError, exc: + log.debug("GETCONF %s (failed: %s)" % (" ".join(lookup_params), exc)) + if default != UNDEFINED: return default else: raise exc @@ -820,7 +851,7 @@ class Controller(BaseController): :: my_controller.set_options({ - "Nickname", "caerSidi", + "Nickname": "caerSidi", "ExitPolicy": ["accept *:80", "accept *:443", "reject *:*"], "ContactInfo": "caerSidi-exit(a)someplace.com", "Log": None, @@ -839,6 +870,8 @@ class Controller(BaseController): :class:`stem.socket.InvalidRequest` if the configuration setting is impossible or if there's a syntax error in the configuration values """ + start_time = time.time() + # constructs the SETCONF or RESETCONF query query_comp = ["RESETCONF" if reset else "SETCONF"] @@ -853,10 +886,27 @@ class Controller(BaseController): else: query_comp.append(param) - response = self.msg(" ".join(query_comp)) + query = " ".join(query_comp) + response = self.msg(query) stem.response.convert("SINGLELINE", response) - if not response.is_ok(): + if response.is_ok(): + log.debug("%s (runtime: %0.4f)" % (query, time.time() - start_time)) + + if self.is_caching_enabled(): + for param, value in params: + cache_key = "getconf.%s" % param.lower() + + if value is None: + if cache_key in self._request_cache: + del self._request_cache[cache_key] + elif isinstance(value, str): + self._request_cache[cache_key] = [value] + else: + self._request_cache[cache_key] = value + else: + log.debug("%s (failed, code: %s, message: %s)" % (query, response.code, response.message)) + if response.code == "552": if response.message.startswith("Unrecognized option: Unknown option '"): key = response.message[37:response.message.find("\'", 37)]

1 0

[stem/master] Adding an easy method for getting a controller instance
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit f999b627dc3ab00cdd7c245d4811ad7b0a2cc20c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 18 11:21:08 2012 -0700 Adding an easy method for getting a controller instance Adding a 'prompt' script that kicks off a python interpretor with a readily available stem.control.Controller instance. This starts a tor test instance if it isn't already running and offers to shut it down when done. The purpose of this script is to make it easy to get a controller instance we can exercise. The sh shebang makes this *nix specific, though I suppose windows users can still use it by running 'bash prompt'. Example usage: atagar@morrigan:~/Desktop/stem$ ./prompt Welcome to stem's testing prompt. You currently have a controller available via the 'control' variable. >>> control.get_info('version') '0.2.1.30' >>> quit() Would you like to stop the tor instance we made? (y/n, default: n): y --- prompt | 19 +++++++++++ test/__init__.py | 1 + test/prompt.py | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 109 insertions(+), 0 deletions(-) diff --git a/prompt b/prompt new file mode 100755 index 0000000..e833fd2 --- /dev/null +++ b/prompt @@ -0,0 +1,19 @@ +#!/bin/sh +# +# Provides a quick method of getting a controller that we can use to test stem +# with. This starts tor if it isn't already running and provides us with a +# controller instance. When done it gives us the option to stop the tor. +# +# atagar@morrigan:~/Desktop/stem$ ./prompt +# Welcome to stem's testing prompt. You currently have a controller available +# via the 'control' variable. +# +# >>> control.get_info("version") +# '0.2.1.30' +# >>> quit() +# +# Would you like to stop the tor instance we made? (y/n, default: n): y + +python -i -c "import test.prompt; test.prompt.print_usage(); control = test.prompt.controller()" +python -c "import test.prompt; test.prompt.stop(True)" + diff --git a/test/__init__.py b/test/__init__.py index c0297aa..78d6543 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -6,6 +6,7 @@ __all__ = [ "check_whitespace", "mocking", "output", + "prompt", "runner", ] diff --git a/test/prompt.py b/test/prompt.py new file mode 100644 index 0000000..eccdbec --- /dev/null +++ b/test/prompt.py @@ -0,0 +1,89 @@ +""" +Simple helper methods to make troubleshooting with the python interpretor +easier. + +:: + + >>> from test.prompt import * + >>> control = controller() + >>> control.get_info("version") + '0.2.1.30' + + >>> is_running() + True + + >>> stop() +""" + +import os +import signal + +import stem.control +import stem.process +import stem.util.system + +CONTROL_PORT = 2779 + +STOP_CONFIRMATION = "Would you like to stop the tor instance we made? (y/n, default: n): " + +def print_usage(): + """ + Provides a welcoming message. + """ + + print "Welcome to stem's testing prompt. You currently have a controller available" + print "via the 'control' variable." + print + +def start(): + """ + Starts up a tor instance that we can attach a contorller to. + """ + + tor_config = { + 'SocksPort': '0', + 'ControlPort': str(CONTROL_PORT), + 'ExitPolicy': 'reject *:*', + } + + stem.process.launch_tor_with_config(config = tor_config, completion_percent = 5) + +def stop(prompt = False): + """ + Stops the tor instance spawned by this module. + + :param bool prompt: asks user for confirmation that they would like to stop tor if True + """ + + tor_pid = stem.util.system.get_pid_by_port(CONTROL_PORT) + + if tor_pid: + if prompt: + print + response = raw_input(STOP_CONFIRMATION) + if not response.lower() in ("y", "yes"): return + + os.kill(tor_pid, signal.SIGTERM) + +def is_running(): + """ + Checks if we're likely running a tor instance spawned by this module. This is + simply a check if our custom control port is in use, so it can be confused by + other applications (not likely, but possable). + + :returns: True if the control port is used, False otherwise + """ + + return bool(stem.util.system.get_pid_by_port(CONTROL_PORT)) + +def controller(): + """ + Provides a Controller for our tor instance. This starts tor if it isn't + already running. + """ + + if not is_running(): start() + control = stem.control.Controller.from_port(control_port = CONTROL_PORT) + control.authenticate() + return control +

1 0

[stem/master] Fixing issues spotted by Ravi
by atagar＠torproject.org 22 Aug '12

22 Aug '12

commit 683eeb25e812346cfd01790fe7729b686b8a2c2c Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 21 18:10:30 2012 -0700 Fixing issues spotted by Ravi Typos and whitespace issues spotted by Ravi. --- test/prompt.py | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/prompt.py b/test/prompt.py index eccdbec..fad9d4e 100644 --- a/test/prompt.py +++ b/test/prompt.py @@ -8,10 +8,10 @@ easier. >>> control = controller() >>> control.get_info("version") '0.2.1.30' - + >>> is_running() True - + >>> stop() """ @@ -37,7 +37,7 @@ def print_usage(): def start(): """ - Starts up a tor instance that we can attach a contorller to. + Starts up a tor instance that we can attach a controller to. """ tor_config = { @@ -59,10 +59,9 @@ def stop(prompt = False): if tor_pid: if prompt: - print - response = raw_input(STOP_CONFIRMATION) + response = raw_input("\n" + STOP_CONFIRMATION) if not response.lower() in ("y", "yes"): return - + os.kill(tor_pid, signal.SIGTERM) def is_running():

1 0