- tor-commits - lists.torproject.org

[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

[stem/master] Config argument for the test runner
by atagar＠torproject.org 04 Nov '11

04 Nov '11

commit 263dfd53cec592c10d9dbe40211ea56915ac7552 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Oct 30 00:51:47 2011 -0700 Config argument for the test runner Integration tests can have custom behavior via a testrc, which is simple for now, and will grow as tests become more complex. Previously I was loading a static settings.cfg but that was stupid. The user's config file should neither be hardcoded nor under version control. This change also includes the config loading in the status output to stdout. --- run_tests.py | 31 ++++++++++-------------- stem/util/conf.py | 4 +- test/runner.py | 68 ++++++++++++++++++++++++++++++++++++++++++---------- test/settings.cfg | 17 ------------- testrc.sample | 17 +++++++++++++ 5 files changed, 87 insertions(+), 50 deletions(-) diff --git a/run_tests.py b/run_tests.py index ccdee42..2f2d6ae 100755 --- a/run_tests.py +++ b/run_tests.py @@ -15,10 +15,10 @@ import test.unit.version import test.integ.message import test.integ.system -from stem.util import conf, enum, term +from stem.util import enum, term -OPT = "uit:h" -OPT_EXPANDED = ["unit", "integ", "targets=", "help"] +OPT = "uic:t:h" +OPT_EXPANDED = ["unit", "integ", "config=", "targets=", "help"] DIVIDER = "=" * 70 # (name, class) tuples for all of our unit and integration tests @@ -46,11 +46,12 @@ TARGET_ATTR = { HELP_MSG = """Usage runTests.py [OPTION] Runs tests for the stem library. - -u, --unit runs unit tests - -i, --integ runs integration tests - -t, --target comma separated list of tor configurations to use for the - integration tests (all are used by default) - -h, --help presents this help + -u, --unit runs unit tests + -i, --integ runs integration tests + -c, --config PATH path to a custom test configuration + -t, --target TARGET comma separated list of tor configurations to use for + the integration tests (all are used by default) + -h, --help presents this help Integration targets: %s @@ -60,6 +61,7 @@ if __name__ == '__main__': start_time = time.time() run_unit_tests = False run_integ_tests = False + config_path = None integ_targets = TARGETS.values() # parses user input, noting any issues @@ -72,6 +74,7 @@ if __name__ == '__main__': for opt, arg in opts: if opt in ("-u", "--unit"): run_unit_tests = True elif opt in ("-i", "--integ"): run_integ_tests = True + elif opt in ("-c", "--config"): config_path = arg elif opt in ("-t", "--targets"): integ_targets = arg.split(",") @@ -99,15 +102,6 @@ if __name__ == '__main__': print HELP_MSG % "\n ".join(target_lines) sys.exit() - test_config = conf.get_config("test") - - try: - config_path = os.path.dirname(__file__) + "/test/settings.cfg" - test_config.load(config_path) - except IOError, exc: - print term.format("Unable to load testing configuration: %s" % exc, term.Color.RED, term.Attr.BOLD) - sys.exit(1) - if not run_unit_tests and not run_integ_tests: print "Nothing to run (for usage provide --help)\n" sys.exit() @@ -129,7 +123,8 @@ if __name__ == '__main__': integ_runner = test.runner.get_runner() try: - integ_runner.start(user_config = test_config) + # TODO: note unused config options afterward + integ_runner.start(config_path = config_path) print term.format("Running tests...", term.Color.BLUE, term.Attr.BOLD) print diff --git a/stem/util/conf.py b/stem/util/conf.py index c7575ad..40cc956 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -359,7 +359,7 @@ class Config(): if type(val) == type(conf_mappings[entry]): conf_mappings[entry] = val - def get_keys(self): + def keys(self): """ Provides all keys in the currently loaded configuration. @@ -369,7 +369,7 @@ class Config(): return self._contents.keys() - def get_unused_keys(self): + def unused_keys(self): """ Provides the configuration keys that have never been provided to a caller via the get, get_value, or update methods. diff --git a/test/runner.py b/test/runner.py index 5565e3e..6e2f998 100644 --- a/test/runner.py +++ b/test/runner.py @@ -25,7 +25,7 @@ import threading import stem.process -from stem.util import term +from stem.util import conf, term DEFAULT_CONFIG = { "test.integ.test_directory": "./test/data", @@ -42,6 +42,10 @@ SocksPort 0 ControlPort 1111 """ +# We make some paths relative to stem's base directory (the one above us) +# rather than the process' cwd. This doesn't end with a slash. +STEM_BASE = "/".join(__file__.split("/")[:-2]) + # singleton Runner instance INTEG_RUNNER = None @@ -68,15 +72,15 @@ class Runner: self._torrc_contents = "" self._tor_process = None - def start(self, quiet = False, user_config = None): + def start(self, quiet = False, config_path = None): """ Makes temporary testing resources and starts tor, blocking until it completes. Arguments: - quiet (bool) - if False then this prints status information as we start - up to stdout - user_config (stem.util.conf.Config) - custom test configuration + quiet (bool) - if False then this prints status information as we + start up to stdout + config_path (str) - path to a custom test configuration Raises: OSError if unable to run test preparations or start tor @@ -88,8 +92,10 @@ class Runner: # it so we can start a fresh instance if self._tor_process: self.stop(quiet) - # apply any custom configuration attributes - if user_config: user_config.update(self._config) + _print_status("Setting up a test instance...\n", STATUS_ATTR, quiet) + + # load and apply any custom configurations + self._load_config(config_path, quiet) # if 'test_directory' is unset then we make a new data directory in /tmp # and clean it up when we're done @@ -97,10 +103,9 @@ class Runner: config_test_dir = self._config["test.integ.test_directory"] if config_test_dir: - # makes paths relative of stem's base directory (the one above us) + # makes paths relative of stem's base directory if config_test_dir.startswith("./"): - stem_base = "/".join(__file__.split("/")[:-2]) - config_test_dir = stem_base + config_test_dir[1:] + config_test_dir = STEM_BASE + config_test_dir[1:] self._test_dir = os.path.expanduser(config_test_dir) else: @@ -259,6 +264,45 @@ class Runner: finally: self._runner_lock.release() + def _load_config(self, config_path, quiet): + """ + Loads the given configuration file, printing the contents if successful and + the exception if not. + + Arguments: + config_path (str) - path to custom testing configuration options, skipped + if None + quiet (bool) - prints status information to stdout if False + """ + + if not config_path: + _print_status(" loading test configuration... skipped\n", STATUS_ATTR, quiet) + else: + # loads custom testing configuration + test_config = conf.get_config("test") + config_path = os.path.abspath(config_path) + + try: + _print_status(" loading test configuration (%s)... " % config_path, STATUS_ATTR, quiet) + + test_config.load(config_path) + test_config.update(self._config) + + _print_status("done\n", STATUS_ATTR, quiet) + + for config_key in test_config.keys(): + key_entry = " %s => " % config_key + + # if there's multiple values then list them on separate lines + value_div = ",\n" + (" " * len(key_entry)) + value_entry = value_div.join(test_config.get_value(config_key, multiple = True)) + + _print_status(key_entry + value_entry + "\n", SUBSTATUS_ATTR, quiet) + + _print_status("\n", (), quiet) + except IOError, exc: + _print_status("failed (%s)\n" % exc, ERROR_ATTR, quiet) + def _run_setup(self, quiet): """ Makes a temporary runtime resources of our integration test instance. @@ -270,8 +314,6 @@ class Runner: OSError if unsuccessful """ - _print_status("Setting up a test instance...\n", STATUS_ATTR, quiet) - # makes a temporary data directory if needed try: _print_status(" making test directory (%s)... " % self._test_dir, STATUS_ATTR, quiet) @@ -302,7 +344,7 @@ class Runner: _print_status("\n", (), quiet) except Exception, exc: _print_status("failed (%s)\n\n" % exc, ERROR_ATTR, quiet) - raise exc + raise OSError(exc) def _start_tor(self, quiet): """ diff --git a/test/settings.cfg b/test/settings.cfg deleted file mode 100644 index cff8d13..0000000 --- a/test/settings.cfg +++ /dev/null @@ -1,17 +0,0 @@ -# Integration Test Settings -# -# test.integ.test_directory -# Path used for our data directory and any temporary test resources. Relative -# paths are expanded in reference to the location of 'run_tests.py'. -# -# If set then the directory's contents are reused for future tests (so we -# have a faster startup and lower load on authorities). If set to an empty -# value then this makes a fresh data directory for each test run. -# -# test.integ.run.online -# Runs tests with network activity. If set then we'll wait for tor to fully -# bootstrap when starting, which won't happen without a network connection. - -test.integ.test_directory ./test/data -test.integ.run.online false - diff --git a/testrc.sample b/testrc.sample new file mode 100644 index 0000000..cff8d13 --- /dev/null +++ b/testrc.sample @@ -0,0 +1,17 @@ +# Integration Test Settings +# +# test.integ.test_directory +# Path used for our data directory and any temporary test resources. Relative +# paths are expanded in reference to the location of 'run_tests.py'. +# +# If set then the directory's contents are reused for future tests (so we +# have a faster startup and lower load on authorities). If set to an empty +# value then this makes a fresh data directory for each test run. +# +# test.integ.run.online +# Runs tests with network activity. If set then we'll wait for tor to fully +# bootstrap when starting, which won't happen without a network connection. + +test.integ.test_directory ./test/data +test.integ.run.online false +

1 0

[stem/master] Replacing get_entry with ControlLine class
by atagar＠torproject.org 04 Nov '11

04 Nov '11

commit 12064b7b9fc4799b50ff83cffbab55829c0e1046 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Nov 4 10:16:28 2011 -0700 Replacing get_entry with ControlLine class Making a string subclass to help with the parsing of controller output. Most entries are space separated lists of elements, which this class has functions to easily parse. For controller messages that don't follow this pattern we can still treat it as a normal string. Next is to add header documentation and tests. --- stem/types.py | 303 ++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 224 insertions(+), 79 deletions(-) diff --git a/stem/types.py b/stem/types.py index c149b3b..2e1ac91 100644 --- a/stem/types.py +++ b/stem/types.py @@ -19,9 +19,12 @@ Version - Tor versioning information. import re import socket +import threading from stem.util import log +KEY_ARG = re.compile("^(\S+)=") + # 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"} @@ -186,8 +189,8 @@ class ControlMessage: def __iter__(self): """ - Provides the content of the message (stripped of status codes and dividers) - for each component of the message. Ie... + Provides ControlLine instances for the content of the message. This is + stripped of status codes and dividers, for instance... 250+info/names= desc/id/* -- Router descriptors by ID. @@ -203,7 +206,225 @@ class ControlMessage: """ for _, _, content in self._parsed_content: - yield content + yield ControlLine(content) + +class ControlLine(str): + """ + String subclass that represents a line of controller output. This behaves as + a normal string with additional methods for parsing and popping entries from + a space delimited series of elements like a stack. + + None of these additional methods effect ourselves as a string (which is still + immutable). All methods are thread safe. + """ + + def __new__(self, value): + return str.__new__(self, value) + + def __init__(self, value): + self._remainder = value + self._remainder_lock = threading.RLock() + + def remainder(self): + """ + Provides our unparsed content. This is an empty string after we've popped + all entries. + + Returns: + str of the unparsed content + """ + + return self._remainder + + def is_empty(self): + """ + Checks if we have further content to pop or not. + + Returns: + True if we have additional content, False otherwise + """ + + return self._remainder == "" + + def is_next_quoted(self, escaped = False): + """ + Checks if our next entry is a quoted value or not. + + Arguments: + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + True if the next entry can be parsed as a quoted value, False otherwise + """ + + start_quote, end_quote = _get_quote_indeces(self._remainder, escaped) + return start_quote == 0 and end_quote != -1 + + def is_next_mapping(self, quoted = False, escaped = False): + """ + Checks if our next entry is a KEY=VALUE mapping or not. + + Arguments: + quoted (bool) - checks that the mapping is to a quoted value + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + True if the next entry can be parsed as a key=value mapping, False + otherwise + """ + + remainder = self._remainder # temp copy to avoid locking + key_match = KEY_ARG.match(remainder) + + if key_match and quoted: + # checks that we have a quoted value and that it comes after the 'key=' + start_quote, end_quote = _get_quote_indeces(remainder, escaped) + return start_quote == key_match.end() and end_quote != -1 + elif key_match: + return True # we just needed to check for the key + else: + return False # doesn't start with a key + + def pop(self, quoted = False, escaped = False): + """ + Parses the next space separated entry, removing it and the space from our + remaining content. Examples... + + >>> line = ControlLine('"We're all mad here." says the grinning cat.') + >>> print line.pop(True) + "We're all mad here." + >>> print line.pop() + "says" + >>> print line.remainder() + "the grinning cat." + + >>> line = ControlLine('"this has a \\\" and \\\\ in it" foo=bar more_data') + >>> print line.pop(True, True) + "this has a \" and \\ in it" + + Arguments: + quoted (bool) - parses the next entry as a quoted value, removing the + quotes + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + str of the next space separated entry + + Raises: + ValueError if quoted is True without the value being quoted + IndexError if we don't have any remaining content left to parse + """ + + try: + self._remainder_lock.acquire() + next_entry, remainder = _parse_entry(self._remainder, quoted, escaped) + self._remainder = remainder + return next_entry + finally: + self._remainder_lock.release() + + def pop_mapping(self, quoted = False, escaped = False): + """ + Parses the next space separated entry as a KEY=VALUE mapping, removing it + and the space from our remaining content. + + Arguments: + quoted (bool) - parses the value as being quoted, removing the quotes + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + tuple of the form (key, value) + + Raises: + ValueError if this isn't a KEY=VALUE mapping or if quoted is True without + the value being quoted + """ + + try: + self._remainder_lock.acquire() + key_match = KEY_ARG.match(self._remainder) + + if not key_match: + raise ValueError("the next entry isn't a KEY=VALUE mapping: " + self._remainder) + + # parse off the key + key = key_match.groups()[0] + remainder = self._remainder[key_match.end():] + + next_entry, remainder = _parse_entry(remainder, quoted, escaped) + self._remainder = remainder + return (key, next_entry) + finally: + self._remainder_lock.release() + +def _parse_entry(line, quoted, escaped): + """ + Parses the next entry from the given space separated content. + + Arguments: + line (str) - content to be parsed + 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 (entry, remainder) + + Raises: + ValueError if quoted is True without the next value being quoted + IndexError if there's nothing to parse from the line + """ + + if line == "": + raise IndexError("no remaining content to parse") + + next_entry, remainder = "", line + + if quoted: + # validate and parse the quoted value + start_quote, end_quote = _get_quote_indeces(remainder, escaped) + + if start_quote != 0 or end_quote == -1: + raise ValueError("the next entry isn't a quoted value: " + line) + + next_entry, 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: next_entry, remainder = remainder.split(" ", 1) + else: next_entry, remainder = remainder, "" + + if escaped: + for esc_sequence, replacement in CONTROL_ESCAPES.items(): + next_entry = next_entry.replace(esc_sequence, replacement) + + return (next_entry, remainder.lstrip()) + +def _get_quote_indeces(line, escaped): + """ + Provides the indices of the next two quotes in the given content. + + Arguments: + line (str) - content to be parsed + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + tuple of two ints, indices being -1 if a quote doesn't exist + """ + + indices, quote_index = [], -1 + + for _ in range(2): + quote_index = line.find("\"", quote_index + 1) + + # if we have escapes then we need to skip any r'\"' entries + if escaped: + # skip check if index is -1 (no match) or 0 (first character) + while quote_index >= 1 and line[quote_index - 1] == "\\": + quote_index = line.find("\"", quote_index + 1) + + indices.append(quote_index) + + return tuple(indices) class Version: """ @@ -286,79 +507,3 @@ 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 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.lstrip()) -

1 0

[tor-cloud/master] Fixed spelling, thanks Karsten
by runa＠torproject.org 04 Nov '11

04 Nov '11

commit 915b5629479e49dd1a5f7587ded4b63c7160325d Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 4 16:46:24 2011 +0000 Fixed spelling, thanks Karsten --- html/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/html/index.html b/html/index.html index b03c3a3..e9a04ad 100644 --- a/html/index.html +++ b/html/index.html @@ -62,7 +62,7 @@ platform, which powers Amazon.com and other major websites such as Netflix. Users are able to launch their own virtual machines and computing resources with flexible and - cost-efective terms. The Tor network can always benefit from + 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> <hgroup>

1 0

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

04 Nov '11

commit 81f840513b7f714e2655412183f3d8d2f19db7d7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Nov 4 13:05:18 2011 +0000 Update translations for vidalia_help --- nl/services.po | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/nl/services.po b/nl/services.po index 576224c..9b002a2 100644 --- a/nl/services.po +++ b/nl/services.po @@ -1,13 +1,14 @@ # # Translators: +# <aerkenbrand(a)gmail.com>, 2011. # runasand <runa.sandvik(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-04 12:54+0000\n" +"Last-Translator: DamnYankee <aerkenbrand(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -43,6 +44,10 @@ msgid "" "provide a hidden service is built on top of the same circuits that Tor uses " "for anonymous browsing and roughly has similar anonymity properties." msgstr "" +"Verborgen diensten maken het mogelijk om op TCP gebaseerde diensten, zoals " +"HTTP diensten, aan te bieden aan anderen zonder je IP adres openbaar te " +"maken. Het protocol voor verborgen diensten werkt bovenop de circuits die " +"Tor gebruikt voor anoniem browsen, en heeft ongeveer dezelfde eigenschappen." #. type: Content of: <html><body><p> #: en/services.html:35 @@ -60,12 +65,14 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/services.html:41 msgid "How do I provide a hidden service?" -msgstr "" +msgstr "Hoe bied ik een verborgen dienst aan?" #. type: Content of: <html><body><p> #: en/services.html:43 msgid "Providing a hidden service consists of at least two steps:" msgstr "" +"Het verstrekken van een verborgen dienst bestaat uit ten minste twee " +"stappen:" #. type: Content of: <html><body><p><ol><li> #: en/services.html:45 @@ -73,6 +80,8 @@ msgid "" "Install a web server locally (or a server for whatever service you want to " "provide, e.g. IRC) to listen for local requests." msgstr "" +"Installeer een lokale web server (of een server voor een andere dienst die u" +" aan wil bieden, zoals IRC) om te luisteren voor de lokale verzoeken." #. type: Content of: <html><body><p><ol><li> #: en/services.html:47 @@ -80,6 +89,8 @@ msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." msgstr "" +"Configureer uw verborgen service zo dat Tor verzoeken van Tor gebruikers " +"doorstuurt naar uw lokale server." #. type: Content of: <html><body><p> #: en/services.html:50 @@ -96,7 +107,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/services.html:56 msgid "What data do I need to provide?" -msgstr "" +msgstr "Welke gegevens moet ik verstrekken?" #. type: Content of: <html><body><p> #: en/services.html:58 @@ -164,6 +175,11 @@ msgid "" " currently unused service for later use. All non-enabled services are stored" " in the Vidalia-specific configuration file vidalia.conf." msgstr "" +"Ingeschakeld: Als dit selectievakje niet is geselecteerd, zal Vidalia deze " +"verborgen dienst niet configureren. Dit kan nuttig zijn voor het bewaren van" +" de configuratie van een dienst die momenteel niet in gebruik is. De " +"configuratie van alle niet geselecteerde diensten wordt opgeslagen in het " +"configuratie bestand van Vidalia: vidalia.conf." #. type: Content of: <html><body> #: en/services.html:103 @@ -173,7 +189,7 @@ msgstr "" #. type: Content of: <html><body><h3> #: en/services.html:104 msgid "What are the five buttons used for?" -msgstr "" +msgstr "Waar worden de vijf knoppen voor gebruikt?" #. type: Content of: <html><body><p><ul><li> #: en/services.html:107 @@ -193,6 +209,8 @@ msgid "" "Copy to clipboard: Copies the onion address to the clipboard, so that you " "can tell it to whoever shall be able to use your service." msgstr "" +"Kopieer naar klembord: kopieert het onion adres naar het klembord, zodat u " +"het kan delen met de gebruikers van uw diensten." #. type: Content of: <html><body><p><ul><li> #: en/services.html:114 @@ -208,6 +226,7 @@ msgstr "<a name=\"advanced\"/>" #: en/services.html:120 msgid "How can I configure advanced hidden service settings?" msgstr "" +"Hoe kan ik de geavanceerde functies van verborgen diensten configureren?" #. type: Content of: <html><body><p> #: en/services.html:122

1 0

[tor-cloud/master] Change the paths from github to gitweb.tpo
by runa＠torproject.org 04 Nov '11

04 Nov '11

commit 27bc5be0000602e061aeed6a43bea97a265e35af Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 4 06:20:02 2011 +0000 Change the paths from github to gitweb.tpo --- build.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index fc8bd2e..ba89ddc 100755 --- a/build.sh +++ b/build.sh @@ -87,10 +87,10 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ub #ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ~/keys/tor-cloud.pem ubuntu@${host} -q -t "gpg --verify /mnt/SHA256SUMS.gpg /mnt/SHA256SUMS &> /mnt/verify.txt && cat /mnt/verify.txt | grep Good | awk {'print $2'})" # this is our startup file that loads tor-prep.sh on first boot -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://raw.github.com/inf0/Tor-Cloud/master/rc.local -O /mnt/src/etc/rc.local" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local" # this script is responsible for installation and configuration of the Tor application -ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://raw.github.com/inf0/Tor-Cloud/master/ec2-prep.sh -O /mnt/src/etc/ec2-prep.sh" +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/ec2-prep.sh -O /mnt/src/etc/ec2-prep.sh" # fix permissions ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo chmod +x /mnt/src/etc/ec2-prep.sh && sudo chmod +x /mnt/src/etc/ec2-prep.sh"

1 0

[tor-cloud/master] Update copyright info
by runa＠torproject.org 04 Nov '11

04 Nov '11

commit d935b5920684600d775f41962ffeb58d94e60a2f Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 4 06:23:07 2011 +0000 Update copyright info --- build.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index ba89ddc..1dd5c6c 100755 --- a/build.sh +++ b/build.sh @@ -1,5 +1,6 @@ # Copyright (c) 2011 Expression Technologies <info(a)expressiontech.org> # Copyright (c) 2011 SiNA <sina(a)expressiontech.org> +# Copyright (c) 2011 The Tor Project, Inc # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -15,8 +16,10 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 # USA - -# Tor CLoud Servers - http://expressiontech.org/torcloud +# +# Tor Cloud is developed and maintained by partnership between +# ExpressionTech and The Tor Project. +# # Bundle and publish instance of canonical AMI Ubuntu 10.04 LTS (Lucid Lynx), # modified to run as a Tor bridge relay, private relay or middle realy on Amazon EC2 @@ -124,10 +127,7 @@ NOW=$(date +"%m-%d-%Y") RANDOM=$(echo `</dev/urandom tr -dc A-Za-z0-9 | head -c8`) # Finally register and publish the image -ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}] by: expressiontech.org/torcloud" - -# Finally register and publish the image -#echo "ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name \"Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}\" --description \"Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}] by: expressiontech.org/torcloud\"" +ec2-register --region ${region} --snapshot ${snap} --architecture=i386 --kernel=${aki} --name "Tor-Cloud-EC2-${rel}-${region}-${NOW}-${RANDOM}" --description "Tor Cloud Server - [bridge] - Ubuntu 10.04.3 LTS [Lucid Lynx] - [${region}]" # cleanup ec2-detach-volume --region ${region} ${vol}

1 0

[tor-cloud/master] Make sure we can launch private bridges and relays as well. Solves #4350.
by runa＠torproject.org 04 Nov '11

04 Nov '11

commit 9b7bb37177398cae933d76568f480affd5964e3b Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 4 07:39:26 2011 +0000 Make sure we can launch private bridges and relays as well. Solves #4350. --- build.sh | 3 +++ rc.local | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build.sh b/build.sh index 1dd5c6c..249fba3 100755 --- a/build.sh +++ b/build.sh @@ -92,6 +92,9 @@ ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ub # this is our startup file that loads tor-prep.sh on first boot ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/rc.local -O /mnt/src/etc/rc.local" +# Update the rc.local file with the type of relay we want to create (bridge, private-bridge or relay) +ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo sed -i s/type/$1/ /mnt/src/etc/rc.local" + # this script is responsible for installation and configuration of the Tor application ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i ${sshkey} ubuntu@${host} -q -v -t "sudo wget https://gitweb.torproject.org/tor-cloud.git/blob_plain/HEAD:/ec2-prep.sh -O /mnt/src/etc/ec2-prep.sh" diff --git a/rc.local b/rc.local index 79586b3..a2af486 100644 --- a/rc.local +++ b/rc.local @@ -1,4 +1,4 @@ #!/bin/sh -e sudo aptitude -y safe-upgrade -sudo /etc/ec2-prep.sh bridge +sudo /etc/ec2-prep.sh type exit 0

1 0