November 2011 - tor-commits - lists.torproject.org

r25195: {website} updated the manual, translations are outdated now (website/trunk/docs/en)
by Runa Sandvik 05 Nov '11

05 Nov '11

Author: runa Date: 2011-11-05 17:15:00 +0000 (Sat, 05 Nov 2011) New Revision: 25195 Modified: website/trunk/docs/en/short-user-manual.wml Log: updated the manual, translations are outdated now Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-11-04 02:31:24 UTC (rev 25194) +++ website/trunk/docs/en/short-user-manual.wml 2011-11-05 17:15:00 UTC (rev 25195) @@ -22,9 +22,6 @@ <p>The user manual is available in the following languages:</p> <ul> <li><a href="https://torproject.org/dist/manual/short-user-manual_en.xhtml">English</a></li> - <li><a href="https://torproject.org/dist/manual/short-user-manual_hu.xhtml">Hungarian</a></li> - <li><a href="https://torproject.org/dist/manual/short-user-manual_nl.xhtml">Dutch</a></li> - <li><a href="https://torproject.org/dist/manual/short-user-manual_fa.xhtml">Farsi</a></li> </ul> </div>

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 05 Nov '11

05 Nov '11

commit 3ef82516bfd3121b5db5c4e46dd3fc34f64d0f61 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 5 01:36:13 2011 +0000 Update translations for vidalia_help --- it/services.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/it/services.po b/it/services.po index 1e16a35..62b91b3 100644 --- a/it/services.po +++ b/it/services.po @@ -1,12 +1,13 @@ # # Translators: +# <lukefiltroman(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-05 01:22+0000\n" +"Last-Translator: FiltroMan <lukefiltroman(a)gmail.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -17,7 +18,7 @@ msgstr "" #. type: Content of: <html><body><h1> #: en/services.html:16 msgid "Hidden Services" -msgstr "" +msgstr "Servizi nascosti" #. type: Content of: <html><body> #: en/services.html:19 @@ -32,7 +33,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/services.html:26 msgid "What is a hidden service?" -msgstr "" +msgstr "Cos'è un servizio nascosto?" #. type: Content of: <html><body><p> #: en/services.html:28

1 0

[pytorctl/master] Don't round the circ fail rate.
by mikeperry＠torproject.org 04 Nov '11

04 Nov '11

commit 391b4399adda91e8b68ffd6e1fa294efe846debd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Nov 4 15:41:54 2011 -0700 Don't round the circ fail rate. --- SQLSupport.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 40cbdf7..e50dd71 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -674,7 +674,7 @@ class RouterStats(Entity): f.write("node_id=$"+s.router.idhex+" nick="+s.router.nickname) f.write(" strm_bw="+str(cvt(s.sbw,0))) f.write(" filt_bw="+str(cvt(s.filt_sbw,0))) - f.write(" circ_fail_rate="+str(cvt(s.circ_to_rate,0))) + f.write(" circ_fail_rate="+str(s.circ_to_rate)) f.write(" desc_bw="+str(int(cvt(s.avg_desc_bw,0)))) f.write(" ns_bw="+str(int(cvt(s.avg_bw,0)))+"\n")

1 0

[flashproxy/master] Fix a usage example.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit ec2f93037dbd2fd6a006c183d9801cabda0c8c71 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 4 00:54:41 2011 -0700 Fix a usage example. --- experiments/switching/remote-tor-constant.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c1cce88..c1f1a82 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -1,6 +1,6 @@ #!/bin/bash -# Usage: ./remote-tor-constant.sh +# Usage: ./remote-tor-constant.sh [OUTPUT_FILENAME] # # Tests a Tor download over an uninterrupted flash proxy. If OUTPUT_FILENAME is # supplied, appends the time measurement to that file.

1 0

[flashproxy/master] Add remote-tor-direct.sh.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 64918e685118a140dc1f5cd177a888ea1a0e7f39 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 4 14:01:43 2011 -0700 Add remote-tor-direct.sh. This tests the speed of a Tor download without any flash proxy. --- experiments/switching/remote-tor-direct.sh | 37 ++++++++++++++++++++++++++++ experiments/switching/switching-all.sh | 3 ++ experiments/switching/torrc.bridge | 5 ++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --git a/experiments/switching/remote-tor-direct.sh b/experiments/switching/remote-tor-direct.sh new file mode 100755 index 0000000..1b6bdaa --- /dev/null +++ b/experiments/switching/remote-tor-direct.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +# Usage: ./remote-tor-direct.sh [OUTPUT_FILENAME] +# +# Tests a Tor download without using a flash proxy. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. + +. ../common.sh + +DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" + +# Declare an array. +declare -a PIDS_TO_KILL +stop() { + if [ -n "${PIDS_TO_KILL[*]}" ]; then + echo "Kill pids ${PIDS_TO_KILL[@]}." + kill "${PIDS_TO_KILL[@]}" + fi + echo "Delete data file." + rm -f "$DATA_FILE_NAME" + exit +} +trap stop EXIT + +echo "Start Tor." +"$TOR" -f torrc.bridge & +PIDS_TO_KILL+=($!) + +# Let Tor bootstrap. +visible_sleep 15 + +if [ -n "$OUTPUT_FILENAME" ]; then + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" +else + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" +fi diff --git a/experiments/switching/switching-all.sh b/experiments/switching/switching-all.sh index b3051cc..f306152 100755 --- a/experiments/switching/switching-all.sh +++ b/experiments/switching/switching-all.sh @@ -28,6 +28,9 @@ repeat $NUM_ITERATIONS ./local-http-constant.sh "local-http-constant-$DATE.log" > "local-http-alternating-$DATE.log" repeat $NUM_ITERATIONS ./local-http-alternating.sh "local-http-alternating-$DATE.log" +> "remote-tor-direct-$DATE.log" +repeat $NUM_ITERATIONS ./remote-tor-direct.sh "remote-tor-direct-$DATE.log" + > "remote-tor-constant-$DATE.log" repeat $NUM_ITERATIONS ./remote-tor-constant.sh "remote-tor-constant-$DATE.log" diff --git a/experiments/switching/torrc.bridge b/experiments/switching/torrc.bridge new file mode 100644 index 0000000..d70c8b1 --- /dev/null +++ b/experiments/switching/torrc.bridge @@ -0,0 +1,5 @@ +# This configuration file causes a direct Tor connection to use the same bridge +# used by a flash proxy. + +UseBridges 1 +Bridge tor1.bamsoftware.com:9001

1 0

[metrics-tasks/master] No need to edit the R file anymore (#2394).
by karsten＠torproject.org 04 Nov '11

04 Nov '11

commit 9dbecb3523efdd184f0687f144ee26a54deca154 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 4 21:52:35 2011 +0100 No need to edit the R file anymore (#2394). --- task-2394/README | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/task-2394/README b/task-2394/README index 714853e..774dff2 100644 --- a/task-2394/README +++ b/task-2394/README @@ -31,7 +31,3 @@ Visualize self-reported vs. measured bandwidth of relays $ R --slave -f bandwidth-comparison.R - (Edit bandwidth-comparison.R to color urras or one of the other - directories specially by putting in the lines containing "purple" and - re-run the last command above.) -

1 0

[metrics-tasks/master] Add colours and a legend to bwauth graphs (#2394).
by karsten＠torproject.org 04 Nov '11

04 Nov '11

commit 67d7d6441c62d188e646e220980545914e2cf54e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 4 21:47:51 2011 +0100 Add colours and a legend to bwauth graphs (#2394). --- task-2394/bandwidth-comparison.R | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R index 356464b..a4b0329 100644 --- a/task-2394/bandwidth-comparison.R +++ b/task-2394/bandwidth-comparison.R @@ -45,14 +45,14 @@ cdf_relays_category_votes <- function(data, category) { y = (1:length(consensus)) / length(consensus), source = "consensus", category = category), - data.frame(x = ides, - y = (1:length(ides)) / length(ides), - source = "ides", - category = category), data.frame(x = urras, y = (1:length(urras)) / length(urras), source = "urras", category = category), + data.frame(x = ides, + y = (1:length(ides)) / length(ides), + source = "ides", + category = category), data.frame(x = moria1, y = (1:length(moria1)) / length(moria1), source = "moria1", @@ -78,13 +78,12 @@ scale_x_log10("\nRatio of measured by self-reported bandwidth", labels = c("0.1", "1", "10")) + scale_y_continuous("Fraction of relays\n", limits = c(0, 1), formatter = "percent") + -scale_colour_manual("", - breaks = c("consensus", "urras", "ides", "moria1", "gabelmoo"), - values = c("black", rep(alpha("black", 0.25), 4))) + -# values = c("black", alpha("purple", 0.5), rep(alpha("black", 0.25), 3))) + +scale_colour_manual("", c("consensus" = "black", + "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", - "consensus and votes\n"), legend.position = "none") + "consensus and votes\n"), legend.position = "right") ggsave(filename = "bandwidth-comparison-relays-votes.png", width = 8, height = 5, dpi = 150) @@ -111,12 +110,12 @@ cdf_measured_category_votes <- function(data, category) { ratio = d$consensusbandwidth * 1000 / d$descriptorbandwidth, measured = d$consensusbandwidth), "consensus", category), wecdf(data.frame( - ratio = d$idesbandwidth * 1000 / d$descriptorbandwidth, - measured = d$idesbandwidth), "ides", category), - wecdf(data.frame( ratio = d$urrasbandwidth * 1000 / d$descriptorbandwidth, measured = d$urrasbandwidth), "urras", category), wecdf(data.frame( + ratio = d$idesbandwidth * 1000 / d$descriptorbandwidth, + measured = d$idesbandwidth), "ides", category), + wecdf(data.frame( ratio = d$moria1bandwidth * 1000 / d$descriptorbandwidth, measured = d$moria1bandwidth), "moria1", category), wecdf(data.frame( @@ -139,13 +138,12 @@ scale_x_log10("\nRatio of measured by self-reported bandwidth", labels = c("0.1", "1", "10")) + scale_y_continuous("Fraction of measured bandwidth\n", limits = c(0, 1), formatter = "percent") + -scale_colour_manual("", - breaks = c("consensus", "urras", "ides", "moria1", "gabelmoo"), - values = c("black", rep(alpha("black", 0.25), 4))) + -# values = c("black", alpha("purple", 0.5), rep(alpha("black", 0.25), 3))) + +scale_colour_manual("", c("consensus" = "black", + "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", - "consensus and votes\n"), legend.position = "none") + "consensus and votes\n"), legend.position = "right") ggsave(filename = "bandwidth-comparison-measured-votes.png", width = 8, height = 5, dpi = 150) write.csv(measured_category_votes, "measured_category_votes-temp.csv",

1 0

[tor-cloud/master] Updated with FAQ and more info (do /not/ push this live just yet)
by runa＠torproject.org 04 Nov '11

04 Nov '11

commit 902da50891a1f9fd3b145df5fe0e83631b55ddae Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 4 20:36:16 2011 +0000 Updated with FAQ and more info (do /not/ push this live just yet) --- html/index.html | 150 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 131 insertions(+), 19 deletions(-) diff --git a/html/index.html b/html/index.html index e9a04ad..f445c15 100644 --- a/html/index.html +++ b/html/index.html @@ -37,8 +37,8 @@ <ul class="tabs nav"> <li><a id="t1" href="#what_is_it">What Is It?</a></li> <li><a id="t2" href="#get_started">Get Started!</a></li> - <li><a id="t3" href="#support">Support</a></li> - + <li><a id="t3" href="#faq">FAQ</a></li> + <li><a id="t4" href="#support">Support</a></li> </ul> </nav> <h1 id="logo"><a href="/">Tor Cloud</a></h1> @@ -52,11 +52,11 @@ <div class="deco first"></div> <h2>Tor Cloud on Amazon EC2</h2> </hgroup> - <p>The Tor Cloud is a user friendly way of deploying relays - to help users in countries securely access the Internet, - free of censorship. By donating your bandwidth to the Tor + <p>The Tor Cloud is a user friendly way of deploying bridges and + relays to help users in countries securely access the Internet, + free of censorship. By donating your bandwidth to the Tor Network, you improve the safety and speed at which users - can access the Internet. <a href="http://www.torproject.org" + can access the Internet. <a href="https://www.torproject.org" target="_blank">Learn more about Tor »</a></p> <p>This project runs on the Amazon EC2 cloud computing platform, which powers Amazon.com and other major websites @@ -65,6 +65,12 @@ cost-effective terms. The Tor network can always benefit from more volunteer bandwidth. <a href="http://aws.amazon.com/ec2/" target="_blank">Learn more about Amazon EC2 »</a></p> + <p>Setting up a Tor bridge or relay in the Amazon cloud is simple and + will only take you a couple of minutes. The images have all been + configured with automatic package updates and port forwarding, so you + do not have to worry about Tor not working or lacking security updates. + <a href="https://cloud.torproject.org/#get_started" target="_blank">Get + started with Tor Cloud »</a></p> <hgroup> <div class="deco"></div> <h2>AWS Free Usage Tier</h2> @@ -84,31 +90,58 @@ <div class="main" role="main"> <hgroup> <div class="deco first"></div> - <h2>How to Get Started</h2> + <h2>Sign up for an AWS account</h2> </hgroup> - <p>1. Sign-up for an AWS account and - subscribe to EC2 service: <a class="signup" + <p>Before you can set up a bridge or a relay in the Amazon cloud,<br> + you need to sign up for an <i>Amazon Web Services (AWS)</i> account. + <a class="signup" href="https://aws-portal.amazon.com/gp/aws/developer/registration" - target="_blank" border="0"> Sign Up Now!</a><br><em>(Amazon - will send you an email once your account is - activated.)</em></p> - <p>2. Click and start your Tor Cloud bridge on one of the - many locations available:</p> + target="_blank" border="0"> Sign Up Now!</a> + <br><br><br>Amazon will send + you an email once your account has been activated.</p> + <hgroup> + <div class="deco"></div> + <h2>Select type of relay and its location</h2> + </hgroup> + <p>The images below have been configured as private bridges, public + bridges, and non-exit relays. The cost of running a bridge or a relay in the + Amazon Cloud depends on a number of factors, including the region you decide to + put it in. See <a href="http://aws.amazon.com/ec2/pricing/">Amazon EC2 + Pricing</a> for more information.</p> + + <p><b>Bridge:</b></p> <ul class="region-nav"> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af…" target="_blank">us-east-1<br>Virginia</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-4bf9…" target="_blank">us-west-1<br>N. California</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1<br>Tokyo</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-9c99…" target="_blank">eu-west-1<br>Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1<br>Singapore</a></li> - </ul> + </ul> + + <p><b>Private bridge:</b></p> + <ul class="region-nav"> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af…" target="_blank">us-east-1<br>Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-4bf9…" target="_blank">us-west-1<br>N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1<br>Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-9c99…" target="_blank">eu-west-1<br>Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1<br>Singapore</a></li> + </ul> + + <p><b>Non-exit relay:</b></p> + <ul class="region-nav"> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-11af…" target="_blank">us-east-1<br>Virginia</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-4bf9…" target="_blank">us-west-1<br>N. California</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1<br>Tokyo</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-9c99…" target="_blank">eu-west-1<br>Ireland</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-southeast-1#launchAmi=ami…" target="_blank">ap-southeast-1<br>Singapore</a></li> + </ul> + <hgroup> <div class="deco"></div> <h2>Step by Step Process</h2> </hgroup> - <p>Once you select a location from the selecton above, - you will be redirected to Amazon's management console.</p> - <p>Below you can see all the steps you have to take after - clicking on your desired location:</p> + <p>Once you have selected a relay and its location, you will be redirected to Amazon's management console. + Simply follow the steps as illustrated below, and your relay will up and running in just a couple of minutes:</p> <div class='slider-wrapper theme-orman'> <div id='slider' class='nivoSlider'> <img src="img/tor-1.png" alt="" title="Click @@ -135,6 +168,85 @@ </div> </div> + +<div class="main" role="main"> + <hgroup> + <div class="deco first"></div> + <h2>Frequently Asked Questions (FAQ)</h2> + </hgroup> + + <p> + <a href="#WhatIsTheDifference">1. What is the difference between a bridge and a relay?</a><br> + <a href="#HowMuchDoesItCost">2. How much does it cost?</a><br> + <a href="#ICantConnect">3. I can't connect as user <i>root</i>, what's wrong?</a><br> + <a href="#CanISetUpAnExit">4. Can I set up an exit relay?</a><br> + <a href="#WhatIsInTheConfig">5. What's in the Tor configuration file?</a><br> + <a href="#AutomaticUpdates">6. Will the images automatically download and install package updates?</a><br> + <a href="#NewImages">7. Will you let me know when you publish new images?</a><br> + <a href="#ReportBugs">8. Where do I report a bug I am encountering?</a><br> + <a href="#IRC">9. Is there an IRC channel about Tor Cloud?</a><br> + <a href="#AnotherQuestion">10. I have a question that is not answered here, what do I do?</a> + </p> + + <p><b><a class="anchor" href="#WhatIsTheDifference">1. What is the difference between a bridge and a relay?</a></b><br> + A bridge is a hidden relay used only to forward traffic on to the rest + of the Tor network. A bridge will usually see less traffic than a relay, and + thus consume less bandwidth. This is something to consider if you're worried + about the cost. + <br><br> + When you set up a bridge, we will automatically distribute the bridge + address (that is, the IP address and the port Tor is listening on) for + you via email and on <a + href="https://bridges.torproject.org">bridges.torproject.org</a>. If you only + want a specific group of people (such as close friends and family) to use the + bridge, set up a private bridge instead. + <br><br> + A non-exit relay is a public server used only to forward traffic on to + the rest of the Tor network. No traffic will ever exit from your relay. + A relay will usually see more traffic than a bridge, so please keep + this in mind if you're worried about the cost. + </p> + + <p><b><a class="anchor" href="#HowMuchDoesItCost">2. How much does it cost?</a></b><br> + There is no fee charged by the Tor Project for you to run a Tor Cloud + image. Amazon does, however, charge instances according to their <a + href="http://aws.amazon.com/ec2/pricing/">pricing</a>. + We have <a + href="https://trac.torproject.org/projects/tor/ticket/3574#comment:4">estimated</a> + that running a bridge will cost around $30 a month. A private bridge + ay be cheaper, a non-exit relay will probably cost a bit + more.<br><br>If you decide to run a private bridge or a non-exit relay, please + let us know how much you end up paying each month so that we can update this + FAQ.</p> + + <p><b><a class="anchor" href="#ICantConnect">3. I can't connect as user <i>root</i>, what's wrong?</a></b><br> + When you right-click and choose <i>connect</i>, AWS will suggest that + you use <i>root</i> as the username. This is wrong. You need to use + <i>ubuntu</i> as the username if you wish to connect to your server via + SSH.</p> + + <p><b><a class="anchor" href="#CanISetUpAnExit">4. Can I set up an exit relay?</a></b><br> + Answer here.</p> + + <p><b><a class="anchor" href="#WhatIsInTheConfig">5. What's in the Tor configuration file?</a></b><br> + Answer here.</p> + + <p><b><a class="anchor" href="#AutomaticUpdates">6. Will the images automatically download and install package updates?</a></b><br> + Yes, the images have all been configured with the <a href="https://help.ubuntu.com/community/AutomaticSecurityUpdates"><i>unattended-upgrades</i></a> package. This means that your system will automatically download and install updates.</p> + + <p><b><a class="anchor" href="#NewImages">7. Will you let me know when you publish new images?</a></b><br> + New cloud images will be announced on <a href="https://twitter.com/torproject">Twitter</a>, <a href="https://identi.ca/torproject">identi.ca</a>, <a href="https://blog.torproject.org">our blog</a> and on the <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-talk">tor-talk</a> mailing list.</p> + + <p><b><a class="anchor" href="#ReportBugs">8. Where do I report a bug I am encountering?</a></b><br> + If you think the bug you have found is specific to the Tor Cloud images we provide, please <a href="https://trac.torproject.org">file a bug</a> or send an email to <i>community-support AT lists.torproject.org</i>.</p> + + <p><b><a class="anchor" href="#IRC">9. Is there an IRC channel about Tor Cloud?</a></b><br> + Yes, simply join #tor on irc.oftc.net and ask your question. It may take a while before we get back to you, so please be patient.</p> + + <p><b><a class="anchor" href="#AnotherQuestion">10. I have a question that is not answered here, what do I do?</a></b><br> + Please send an email to <i>community-support AT lists.torproject.org</i> and we'll make sure it gets added to the list.</p> +</div> +  <div class="main" role="main"> <hgroup>

1 0

[stem/master] Utility function for parsing control messages
by atagar＠torproject.org 04 Nov '11

04 Nov '11

commit a090373e5384026295b31daee8ef622a589a913d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 1 18:49:55 2011 -0700 Utility function for parsing control messages Trying out a utility function to pop the first item off a control response, with the caller providing attributes it should have. --- stem/types.py | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/stem/types.py b/stem/types.py index b289921..e6188ae 100644 --- a/stem/types.py +++ b/stem/types.py @@ -22,6 +22,10 @@ import socket from stem.util import log +# Escape sequences from the 'esc_for_log' function of tor's 'common/util.c'. +CONTROL_ESCAPES = {r"\\": "\\", r"\"": "\"", r"\'": "'", + r"\r": "\r", r"\n": "\n", r"\t": "\t"} + class ProtocolError(Exception): "Malformed content from the control socket." pass @@ -282,3 +286,79 @@ class Version: # TODO: version requirements will probably be moved to another module later REQ_GETINFO_CONFIG_TEXT = Version("0.2.2.7-alpha") +# TODO: trying this out temporarily to see if it's generally helpful or another +# parser function would be a better fit +def get_entry(line, mapping = False, quoted = False, escaped = False): + """ + Parses a space separated series of entries, providing back a tuple with the + first entry in the string and the remainder (dropping the space between). + + This is meant to be a helper function for stem to parse tor's control + protocol lines rather than being used directly by this library's users. + + Example: + get_entry('hello there random person') => + (None, "hello", "there random person") + get_entry('version="0.1.2.3"', True, True) => + ("version", "0.1.2.3", "") + get_entry('"this has a \" and \\ in it" foo=bar more_data', False, True, True) => + (None, 'this has a " and \ in it', "foo=bar more_data") + + Arguments: + line (str) - string with a space separated series of entries + mapping (bool) - parses the next entry as a KEY=VALUE entry, if False then + the 'key' attribute of the returned tuple is None + quoted (bool) - parses the next entry as a quoted value, removing the + quotes + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + tuple of the form (key, value, remainder) + + Raises: + ValueError if 'mapping' is True without a '=' or 'quoted' is True without + the value being quoted + """ + + # Start by splitting apart the 'key=everything else' portion. The key + # shouldn't have any spaces in it. + + if mapping: + key_match = re.match("^(\S+)=", line) + + if key_match: + key = key_match.groups()[0] + remainder = line[key_match.end():] + else: + raise ValueError("mapping doesn't contain a '=': " + line) + else: key, remainder = None, line + + if quoted: + # Check that we have a starting quote. + if not remainder.startswith("\""): + raise ValueError("quoted value doesn't have a leading quote: " + line) + + # Finds the ending quote. If we have escapes then we need to skip any '\"' + # entries. + end_quote = remainder.find("\"", 1) + + if is_escaped: + while end_quote != -1 and remainder[end_quote - 1] == "/": + end_quote = remainder.find("\"", end_quote + 1) + + # Check that we have an ending quote. + if end_quote == -1: + raise ValueError("quoted value doesn't have an ending quote: " + line) + + value, remainder = remainder[1:end_quote], remainder[end_quote + 1:] + else: + # Non-quoted value. Just need to check if there's more data afterward. + if " " in remainder: value, remainder = remainder.split(" ", 1) + else: value, remainder = remainder, "" + + if escaped: + for esc_sequence, replacement in CONTROL_ESCAPES.items(): + value = value.replace(esc_sequence, replacement) + + return (key, value, remainder) +

1 0

[stem/master] Unit tests for types.get_entry examples
by atagar＠torproject.org 04 Nov '11

04 Nov '11

commit 45d3c819b21dd29aec70178f66777a365200a617 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 07:07:11 2011 -0700 Unit tests for types.get_entry examples Unit tests for the examples in the pydocs of the function and fixes for the issues they uncovered. --- run_tests.py | 2 ++ stem/types.py | 6 +++--- test/unit/types.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index 2f2d6ae..15a6c92 100755 --- a/run_tests.py +++ b/run_tests.py @@ -12,6 +12,7 @@ import unittest import test.runner import test.unit.message import test.unit.version +import test.unit.types import test.integ.message import test.integ.system @@ -24,6 +25,7 @@ DIVIDER = "=" * 70 # (name, class) tuples for all of our unit and integration tests UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctions), ("stem.types.Version", test.unit.version.TestVerionFunctions), + ("stem.types.get_entry", test.unit.types.TestGetEntry), ) INTEG_TESTS = (("stem.types.ControlMessage", test.integ.message.TestMessageFunctions), diff --git a/stem/types.py b/stem/types.py index e6188ae..c149b3b 100644 --- a/stem/types.py +++ b/stem/types.py @@ -342,8 +342,8 @@ def get_entry(line, mapping = False, quoted = False, escaped = False): # entries. end_quote = remainder.find("\"", 1) - if is_escaped: - while end_quote != -1 and remainder[end_quote - 1] == "/": + if escaped: + while end_quote != -1 and remainder[end_quote - 1] == "\\": end_quote = remainder.find("\"", end_quote + 1) # Check that we have an ending quote. @@ -360,5 +360,5 @@ def get_entry(line, mapping = False, quoted = False, escaped = False): for esc_sequence, replacement in CONTROL_ESCAPES.items(): value = value.replace(esc_sequence, replacement) - return (key, value, remainder) + return (key, value, remainder.lstrip()) diff --git a/test/unit/types.py b/test/unit/types.py new file mode 100644 index 0000000..9c06ab2 --- /dev/null +++ b/test/unit/types.py @@ -0,0 +1,29 @@ +""" +Unit tests for the types.get_entry function. +""" + +import unittest +import stem.types + +class TestGetEntry(unittest.TestCase): + """ + Tests the types.get_entry function. + """ + + def test_examples(self): + """ + Checks that the examples from the pydoc are correct. + """ + + example_input = 'hello there random person' + example_result = (None, "hello", "there random person") + self.assertEquals(stem.types.get_entry(example_input), example_result) + + example_input = 'version="0.1.2.3"' + example_result = ("version", "0.1.2.3", "") + self.assertEquals(stem.types.get_entry(example_input, True, True), example_result) + + example_input = r'"this has a \" and \\ in it" foo=bar more_data' + example_result = (None, r'this has a " and \ in it', "foo=bar more_data") + self.assertEquals(stem.types.get_entry(example_input, False, True, True), example_result) +

1 0