- tor-commits - lists.torproject.org

[metrics-lib/master] Fix an awful copy-and-paste error.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit f331902c57843e15250a6c698c5d80c7dffd6bf5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 18:36:08 2012 +0100 Fix an awful copy-and-paste error. --- .../torproject/descriptor/impl/DescriptorImpl.java | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DescriptorImpl.java b/src/org/torproject/descriptor/impl/DescriptorImpl.java index 2d20fa7..7be2fbb 100644 --- a/src/org/torproject/descriptor/impl/DescriptorImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorImpl.java @@ -32,7 +32,7 @@ public abstract class DescriptorImpl implements Descriptor { if (firstLines.contains("\nvote-status consensus\n")) { parsedDescriptors.addAll(RelayNetworkStatusConsensusImpl. parseConsensuses(rawDescriptorBytes)); - } else if (firstLines.contains("\nvote-status consensus\n")) { + } else if (firstLines.contains("\nvote-status vote\n")) { parsedDescriptors.addAll(RelayNetworkStatusVoteImpl. parseVotes(rawDescriptorBytes)); } else {

1 0

[metrics-lib/master] Fix the logic what descriptors are left to download.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit c0656d16ac5eabf4a75a9b9e51929b6e7b8d7d01 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 19:38:10 2012 +0100 Fix the logic what descriptors are left to download. --- .../descriptor/impl/DownloadCoordinatorImpl.java | 34 ++++++++++++++------ 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index 273655e..e91fd8b 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -229,16 +229,30 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { if (response.getRequestEnd() != 0L) { this.descriptorQueue.add(response); } - if ((!this.missingConsensus || - (this.downloadConsensusFromAllAuthorities && - this.requestedConsensuses.containsAll( - this.directoryAuthorities.keySet()) && - this.requestingConsensuses.isEmpty())) && - this.missingVotes.isEmpty() && - this.requestingVotes.isEmpty()) { - /* TODO This logic may be somewhat broken. We don't wait for all - * consensus requests to complete or fail, which results in adding - * (failed) requests to the queue when we think we're done. */ + boolean doneDownloading = true; + if ((this.missingConsensus || + this.downloadConsensusFromAllAuthorities) && + (!this.requestedConsensuses.containsAll( + this.directoryAuthorities.keySet()) || + !this.requestingConsensuses.isEmpty())) { + doneDownloading = false; + } + if (!this.missingVotes.isEmpty()) { + if (!this.requestingVotes.isEmpty() || + !this.requestedVotes.keySet().containsAll( + this.directoryAuthorities.keySet())) { + doneDownloading = false; + } else { + for (String missingVote : this.missingVotes) { + for (Set<String> reqVotes : this.requestedVotes.values()) { + if (!reqVotes.contains(missingVote)) { + doneDownloading = false; + } + } + } + } + } + if (doneDownloading) { this.hasFinishedDownloading = true; this.globalTimerThread.interrupt(); this.descriptorQueue.setOutOfDescriptors();

1 0

[metrics-lib/master] Use timeouts in URLConnection instead of own timeout thread.
by karsten＠torproject.org 23 Jan '12

23 Jan '12

commit 8c14bac87e3623bf7d8c1e04f9edc84c5a2a64c0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Jan 23 19:40:26 2012 +0100 Use timeouts in URLConnection instead of own timeout thread. --- .../torproject/descriptor/DescriptorRequest.java | 10 +++- .../descriptor/RelayDescriptorDownloader.java | 12 ++++- .../descriptor/example/ConsensusHealthChecker.java | 10 +++-- .../example/MetricsRelayDescriptorAggregator.java | 9 ++-- .../descriptor/impl/DescriptorRequestImpl.java | 11 ++++- .../descriptor/impl/DirectoryDownloader.java | 44 ++++--------------- .../descriptor/impl/DownloadCoordinatorImpl.java | 15 ++++-- .../impl/RelayDescriptorDownloaderImpl.java | 30 ++++++++++---- 8 files changed, 77 insertions(+), 64 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorRequest.java b/src/org/torproject/descriptor/DescriptorRequest.java index f68332f..422d133 100644 --- a/src/org/torproject/descriptor/DescriptorRequest.java +++ b/src/org/torproject/descriptor/DescriptorRequest.java @@ -29,12 +29,16 @@ public interface DescriptorRequest { /* Return the time in millis when this request ended. */ public long getRequestEnd(); - /* Return whether this request ended, because the request timeout + /* Return whether this request ended, because the connect timeout has * expired. */ - public boolean requestTimeoutHasExpired(); + public boolean connectTimeoutHasExpired(); + + /* Return whether this request ended, because the read timeout has + * expired. */ + public boolean readTimeoutHasExpired(); /* Return whether this request ended, because the global timeout for all - * requests expired. */ + * requests has expired. */ public boolean globalTimeoutHasExpired(); /* Return the descriptors contained in the reply. */ diff --git a/src/org/torproject/descriptor/RelayDescriptorDownloader.java b/src/org/torproject/descriptor/RelayDescriptorDownloader.java index 28d6ea1..754c644 100644 --- a/src/org/torproject/descriptor/RelayDescriptorDownloader.java +++ b/src/org/torproject/descriptor/RelayDescriptorDownloader.java @@ -74,11 +74,17 @@ public interface RelayDescriptorDownloader { * descriptors. */ public void setExcludeExtraInfoDescriptors(Set<String> identifiers); - /* Define a request timeout for a single request. If a timeout expires, + /* Define a connect timeout for a single request. If a timeout expires, * no further requests will be sent to the directory authority or - * mirror. Setting this value to 0 disables the request timeout. + * mirror. Setting this value to 0 disables the connect timeout. * Default value is 1 minute (60 * 1000). */ - public void setRequestTimeout(long requestTimeoutMillis); + public void setConnectTimeout(long connectTimeoutMillis); + + /* Define a read timeout for a single request. If a timeout expires, + * no further requests will be sent to the directory authority or + * mirror. Setting this value to 0 disables the read timeout. + * Default value is 1 minute (60 * 1000). */ + public void setReadTimeout(long readTimeoutMillis); /* Define a global timeout for all requests. Once this timeout expires, * all running requests are aborted and no further requests are made. diff --git a/src/org/torproject/descriptor/example/ConsensusHealthChecker.java b/src/org/torproject/descriptor/example/ConsensusHealthChecker.java index 178f164..b8cc12b 100644 --- a/src/org/torproject/descriptor/example/ConsensusHealthChecker.java +++ b/src/org/torproject/descriptor/example/ConsensusHealthChecker.java @@ -38,9 +38,10 @@ public class ConsensusHealthChecker { downloader.setIncludeCurrentConsensusFromAllDirectoryAuthorities(); downloader.setIncludeCurrentReferencedVotes(); - /* Set a request timeout of 1 minute and a global timeout of 10 - * minutes to avoid being blocked forever by a slow download. */ - downloader.setRequestTimeout(60L * 1000L); + /* Set connect and read timeouts of 1 minute each and a global timeout + * of 10 minutes to avoid being blocked forever by a slow download. */ + downloader.setConnectTimeout(60L * 1000L); + downloader.setReadTimeout(60L * 1000L); downloader.setGlobalTimeout(10L * 60L * 1000L); /* Run the previously configured downloads and iterate over the @@ -60,7 +61,8 @@ public class ConsensusHealthChecker { + "more consensuses and/or votes and cannot make a good " + "statement about the consensus health. Exiting."); return; - } else if (request.requestTimeoutHasExpired()) { + } else if (request.connectTimeoutHasExpired() || + request.readTimeoutHasExpired()) { System.out.println("The request to directory authority " + request.getDirectoryNickname() + " to download the " + "descriptor(s) at " + request.getRequestUrl() + " has " diff --git a/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java b/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java index 0d9da8d..bfaaa22 100644 --- a/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java +++ b/src/org/torproject/descriptor/example/MetricsRelayDescriptorAggregator.java @@ -99,10 +99,11 @@ public class MetricsRelayDescriptorAggregator { downloader.setExcludeExtraInfoDescriptors( knownExtraInfoDescriptorIdentifiers.keySet()); - /* Set a request timeout of 2 minutes and a global timeout of 1 hour - * to avoid being blocked forever by a slow download, but also to - * avoid giving up too quickly. */ - downloader.setRequestTimeout(2L * 60L * 1000L); + /* Set connect and read timeouts of 2 minutes each and a global + * timeout of 1 hour to avoid being blocked forever by a slow + * download, but also to avoid giving up too quickly. */ + downloader.setConnectTimeout(2L * 60L * 1000L); + downloader.setReadTimeout(2L * 60L * 1000L); downloader.setGlobalTimeout(60L * 60L * 1000L); /* Download descriptors and process them. */ diff --git a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java index 6c44a79..e5c2ff5 100644 --- a/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorRequestImpl.java @@ -70,9 +70,14 @@ public class DescriptorRequestImpl implements DescriptorRequest { return this.requestEnd; } - private boolean requestTimeoutHasExpired; - public boolean requestTimeoutHasExpired() { - return this.requestTimeoutHasExpired; + private boolean connectTimeoutHasExpired; + public boolean connectTimeoutHasExpired() { + return this.connectTimeoutHasExpired; + } + + private boolean readTimeoutHasExpired; + public boolean readTimeoutHasExpired() { + return this.readTimeoutHasExpired; } private boolean globalTimeoutHasExpired; diff --git a/src/org/torproject/descriptor/impl/DirectoryDownloader.java b/src/org/torproject/descriptor/impl/DirectoryDownloader.java index 7b4311c..7e9d19c 100644 --- a/src/org/torproject/descriptor/impl/DirectoryDownloader.java +++ b/src/org/torproject/descriptor/impl/DirectoryDownloader.java @@ -27,9 +27,14 @@ public class DirectoryDownloader implements Runnable { this.downloadCoordinator = downloadCoordinator; } - private long requestTimeout; - protected void setRequestTimeout(long requestTimeout) { - this.requestTimeout = requestTimeout; + private long connectTimeout; + protected void setConnectTimeout(long connectTimeout) { + this.connectTimeout = connectTimeout; + } + + private long readTimeout; + protected void setReadTimeout(long readTimeout) { + this.readTimeout = readTimeout; } public void run() { @@ -41,13 +46,12 @@ public class DirectoryDownloader implements Runnable { String url = "http://" + this.ipPort + request.getRequestedResource(); request.setRequestStart(System.currentTimeMillis()); - Thread timeoutThread = new Thread(new RequestTimeout( - this.requestTimeout)); - timeoutThread.start(); try { URL u = new URL(url); HttpURLConnection huc = (HttpURLConnection) u.openConnection(); + huc.setConnectTimeout((int) this.connectTimeout); + huc.setReadTimeout((int) this.readTimeout); huc.setRequestMethod("GET"); huc.connect(); int responseCode = huc.getResponseCode(); @@ -74,39 +78,11 @@ public class DirectoryDownloader implements Runnable { * problems, e.g., refused connections. */ keepRunning = false; } - /* TODO How do we find out if we were interrupted, and by who? - * Set the request or global timeout flag in the response. */ - timeoutThread.interrupt(); this.downloadCoordinator.deliverResponse(request); } else { keepRunning = false; } } while (keepRunning); } - - /* Interrupt a download request if it takes longer than a given time. */ - /* TODO Also look at URLConnection.setConnectTimeout() and - * URLConnection.setReadTimeout() instead of implementing this - * ourselves. */ - private static class RequestTimeout implements Runnable { - private long timeoutMillis; - private Thread downloaderThread; - private RequestTimeout(long timeoutMillis) { - this.downloaderThread = Thread.currentThread(); - this.timeoutMillis = timeoutMillis; - } - public void run() { - long started = System.currentTimeMillis(), sleep; - while ((sleep = started + this.timeoutMillis - - System.currentTimeMillis()) > 0L) { - try { - Thread.sleep(sleep); - } catch (InterruptedException e) { - return; - } - } - this.downloaderThread.interrupt(); - } - } } diff --git a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java index e91fd8b..03e7997 100644 --- a/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java +++ b/src/org/torproject/descriptor/impl/DownloadCoordinatorImpl.java @@ -27,7 +27,8 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { private SortedMap<String, DirectoryDownloader> directoryMirrors; private boolean downloadConsensusFromAllAuthorities; private boolean includeCurrentReferencedVotes; - private long requestTimeoutMillis; + private long connectTimeoutMillis; + private long readTimeoutMillis; private long globalTimeoutMillis; protected DownloadCoordinatorImpl( @@ -36,7 +37,8 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { boolean downloadConsensus, boolean downloadConsensusFromAllAuthorities, Set<String> downloadVotes, boolean includeCurrentReferencedVotes, - long requestTimeoutMillis, long globalTimeoutMillis) { + long connectTimeoutMillis, long readTimeoutMillis, + long globalTimeoutMillis) { this.directoryAuthorities = directoryAuthorities; this.directoryMirrors = directoryMirrors; this.missingConsensus = downloadConsensus; @@ -44,7 +46,8 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { downloadConsensusFromAllAuthorities; this.missingVotes = downloadVotes; this.includeCurrentReferencedVotes = includeCurrentReferencedVotes; - this.requestTimeoutMillis = requestTimeoutMillis; + this.connectTimeoutMillis = connectTimeoutMillis; + this.readTimeoutMillis = readTimeoutMillis; this.globalTimeoutMillis = globalTimeoutMillis; if (this.directoryMirrors.isEmpty() && this.directoryAuthorities.isEmpty()) { @@ -59,13 +62,15 @@ public class DownloadCoordinatorImpl implements DownloadCoordinator { for (DirectoryDownloader directoryMirror : this.directoryMirrors.values()) { directoryMirror.setDownloadCoordinator(this); - directoryMirror.setRequestTimeout(this.requestTimeoutMillis); + directoryMirror.setConnectTimeout(this.connectTimeoutMillis); + directoryMirror.setReadTimeout(this.readTimeoutMillis); new Thread(directoryMirror).start(); } for (DirectoryDownloader directoryAuthority : this.directoryAuthorities.values()) { directoryAuthority.setDownloadCoordinator(this); - directoryAuthority.setRequestTimeout(this.requestTimeoutMillis); + directoryAuthority.setConnectTimeout(this.connectTimeoutMillis); + directoryAuthority.setReadTimeout(this.readTimeoutMillis); new Thread(directoryAuthority).start(); } } diff --git a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java index 7cdcc0c..0888d64 100644 --- a/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java +++ b/src/org/torproject/descriptor/impl/RelayDescriptorDownloaderImpl.java @@ -193,18 +193,32 @@ public class RelayDescriptorDownloaderImpl + "descriptors is not implemented yet."); } - private long requestTimeoutMillis = 60L * 1000L; - public void setRequestTimeout(long requestTimeoutMillis) { + private long readTimeoutMillis = 60L * 1000L; + public void setReadTimeout(long readTimeoutMillis) { if (this.hasStartedDownloading) { throw new IllegalStateException("Reconfiguration is not permitted " + "after starting to download."); } - if (requestTimeoutMillis < 0L) { - throw new IllegalArgumentException("Request timeout value " - + String.valueOf(requestTimeoutMillis) + " may not be " + if (readTimeoutMillis < 0L) { + throw new IllegalArgumentException("Read timeout value " + + String.valueOf(readTimeoutMillis) + " may not be " + "negative."); } - this.requestTimeoutMillis = requestTimeoutMillis; + this.readTimeoutMillis = readTimeoutMillis; + } + + private long connectTimeoutMillis = 60L * 1000L; + public void setConnectTimeout(long connectTimeoutMillis) { + if (this.hasStartedDownloading) { + throw new IllegalStateException("Reconfiguration is not permitted " + + "after starting to download."); + } + if (connectTimeoutMillis < 0L) { + throw new IllegalArgumentException("Connect timeout value " + + String.valueOf(connectTimeoutMillis) + " may not be " + + "negative."); + } + this.connectTimeoutMillis = connectTimeoutMillis; } private long globalTimeoutMillis = 60L * 60L * 1000L; @@ -231,8 +245,8 @@ public class RelayDescriptorDownloaderImpl new DownloadCoordinatorImpl(this.directoryAuthorities, this.directoryMirrors, this.downloadConsensus, this.downloadConsensusFromAllAuthorities, this.downloadVotes, - this.includeCurrentReferencedVotes, this.requestTimeoutMillis, - this.globalTimeoutMillis); + this.includeCurrentReferencedVotes, this.connectTimeoutMillis, + this.readTimeoutMillis, this.globalTimeoutMillis); Iterator<DescriptorRequest> descriptorQueue = downloadCoordinator. getDescriptorQueue(); return descriptorQueue;

1 0

[stem/master] Unit testing for stem.util.conf
by atagar＠torproject.org 23 Jan '12

23 Jan '12

commit 59764266b9dbce91accd6a55a371f24516b257a7 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Jan 23 09:25:46 2012 -0800 Unit testing for stem.util.conf I needed unit tests for the new listener functions so wrote long overdue tests for everything within the utilitity too. Caught a couple bugs in the process. --- run_tests.py | 2 + stem/util/conf.py | 12 ++- test/unit/util/__init__.py | 2 +- test/unit/util/conf.py | 232 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 245 insertions(+), 3 deletions(-) diff --git a/run_tests.py b/run_tests.py index c7dd91e..acb229b 100755 --- a/run_tests.py +++ b/run_tests.py @@ -17,6 +17,7 @@ import test.unit.connection.authentication import test.unit.connection.protocolinfo import test.unit.socket.control_line import test.unit.socket.control_message +import test.unit.util.conf import test.unit.util.enum import test.unit.util.system import test.unit.version @@ -71,6 +72,7 @@ DEFAULT_RUN_TARGET = TARGETS.RUN_OPEN UNIT_TESTS = ( test.unit.util.enum.TestEnum, + test.unit.util.conf.TestConf, test.unit.util.system.TestSystem, test.unit.version.TestVersion, test.unit.socket.control_message.TestControlMessage, diff --git a/stem/util/conf.py b/stem/util/conf.py index 68a332a..8a1fcfc 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -19,6 +19,7 @@ Config - Custom configuration. |- clear - empties our loaded configuration contents |- update - replaces mappings in a dictionary with the config's values |- add_listener - notifies the given listener when an update occures + |- clear_listeners - removes any attached listeners |- sync - keeps a dictionary synchronized with our config |- keys - provides keys in the loaded configuration |- set - sets the given key/value pair @@ -272,10 +273,17 @@ class Config(): if backfill: for key in self.keys(): - listener(key) + listener(self, key) self._contents_lock.release() + def clear_listeners(self): + """ + Removes any attached listeners. + """ + + self._listeners = [] + def sync(self, config_dict, interceptor = None): """ Synchronizes a dictionary with our current configuration (like the 'update' @@ -314,7 +322,7 @@ class Config(): set of configuration keys we've loaded but have never been requested """ - return set(self.get_keys()).difference(self._requested_keys) + return set(self.keys()).difference(self._requested_keys) def set(self, key, value, overwrite = True): """ diff --git a/test/unit/util/__init__.py b/test/unit/util/__init__.py index 57015c1..7c8d12b 100644 --- a/test/unit/util/__init__.py +++ b/test/unit/util/__init__.py @@ -2,5 +2,5 @@ Unit tests for stem.util.* contents. """ -__all__ = ["enum", "system"] +__all__ = ["conf", "enum", "system"] diff --git a/test/unit/util/conf.py b/test/unit/util/conf.py new file mode 100644 index 0000000..3e59a7c --- /dev/null +++ b/test/unit/util/conf.py @@ -0,0 +1,232 @@ +""" +Unit tests for the stem.util.conf class and functions. +""" + +import unittest +import stem.util.conf + +class TestConf(unittest.TestCase): + """ + Tests the stem.util.conf contents. + """ + + def tearDown(self): + # clears the config contents + test_config = stem.util.conf.get_config("unit_testing") + test_config.clear() + test_config.clear_listeners() + + def test_clear(self): + """ + Tests the clear method. + """ + + test_config = stem.util.conf.get_config("unit_testing") + self.assertEquals([], test_config.keys()) + + # tests clearing when we're already empty + test_config.clear() + self.assertEquals([], test_config.keys()) + + # tests clearing when we have contents + test_config.set("hello", "world") + self.assertEquals(["hello"], test_config.keys()) + + test_config.clear() + self.assertEquals([], test_config.keys()) + + def test_update(self): + """ + Tests the update method. + """ + + my_config = { + "bool_value": False, + "int_value": 5, + "str_value": "hello", + "list_value": [], + "map_value": {}, + } + + test_config = stem.util.conf.get_config("unit_testing") + test_config.set("bool_value", "true") + test_config.set("int_value", "11") + test_config.set("str_value", "world") + test_config.set("list_value", "a", False) + test_config.set("list_value", "b", False) + test_config.set("list_value", "c", False) + test_config.set("map_value", "foo => bar") + + test_config.update(my_config) + self.assertEquals(True, my_config["bool_value"]) + self.assertEquals(11, my_config["int_value"]) + self.assertEquals("world", my_config["str_value"]) + self.assertEquals(["a", "b", "c"], my_config["list_value"]) + self.assertEquals({"foo": "bar"}, my_config["map_value"]) + + def test_update_type_mismatch(self): + """ + Tests the update method when the config file has missing entries or the + wrong types. + """ + + my_config = { + "bool_value": False, + "int_value": 5, + "str_value": "hello", + "list_value": [], + "map_value": {}, + } + + test_config = stem.util.conf.get_config("unit_testing") + test_config.set("bool_value", "hello world") + test_config.set("int_value", "11a") + test_config.set("map_value", "foo bar") + + test_config.update(my_config) + self.assertEquals(False, my_config["bool_value"]) + self.assertEquals(5, my_config["int_value"]) + self.assertEquals("hello", my_config["str_value"]) + self.assertEquals([], my_config["list_value"]) + self.assertEquals({}, my_config["map_value"]) + + def test_listeners(self): + """ + Tests the add_listener and clear_listeners methods. + """ + + listener_received_keys = [] + + def test_listener(config, key): + self.assertEquals(config, stem.util.conf.get_config("unit_testing")) + listener_received_keys.append(key) + + test_config = stem.util.conf.get_config("unit_testing") + test_config.add_listener(test_listener) + + self.assertEquals([], listener_received_keys) + test_config.set("hello", "world") + self.assertEquals(["hello"], listener_received_keys) + + test_config.clear_listeners() + + test_config.set("foo", "bar") + self.assertEquals(["hello"], listener_received_keys) + + def test_sync(self): + """ + Tests the sync method. + """ + + my_config = { + "bool_value": False, + "int_value": 5, + "str_value": "hello", + "list_value": [], + } + + test_config = stem.util.conf.get_config("unit_testing") + + # checks that sync causes existing contents to be applied + test_config.set("bool_value", "true") + test_config.sync(my_config) + self.assertEquals(True, my_config["bool_value"]) + + # check a basic update + test_config.set("str_value", "me") + self.assertEquals("me", my_config["str_value"]) + + # update with a type mismatch, should keep the old value + test_config.set("int_value", "7a") + self.assertEquals(5, my_config["int_value"]) + + # changes for a collection + test_config.set("list_value", "a", False) + self.assertEquals(["a"], my_config["list_value"]) + + test_config.set("list_value", "b", False) + self.assertEquals(["a", "b"], my_config["list_value"]) + + test_config.set("list_value", "c", False) + self.assertEquals(["a", "b", "c"], my_config["list_value"]) + + def test_unused_keys(self): + """ + Tests the unused_keys method. + """ + + test_config = stem.util.conf.get_config("unit_testing") + test_config.set("hello", "world") + test_config.set("foo", "bar") + test_config.set("pw", "12345") + + test_config.get("hello") + test_config.get_value("foo") + + self.assertEquals(set(["pw"]), test_config.unused_keys()) + + test_config.get("pw") + self.assertEquals(set(), test_config.unused_keys()) + + def test_get(self): + """ + Tests the get and get_value methods. + """ + + test_config = stem.util.conf.get_config("unit_testing") + test_config.set("bool_value", "true") + test_config.set("int_value", "11") + test_config.set("float_value", "11.1") + test_config.set("str_value", "world") + test_config.set("list_value", "a", False) + test_config.set("list_value", "b", False) + test_config.set("list_value", "c", False) + test_config.set("map_value", "foo => bar") + + # check that we get the default for type mismatch or missing values + + self.assertEquals(5, test_config.get("foo", 5)) + self.assertEquals(5, test_config.get("bool_value", 5)) + + # checks that we get a string when no default is supplied + + self.assertEquals("11", test_config.get("int_value")) + + # exercise type casting for each of the supported types + + self.assertEquals(True, test_config.get("bool_value", False)) + self.assertEquals(11, test_config.get("int_value", 0)) + self.assertEquals(11.1, test_config.get("float_value", 0.0)) + self.assertEquals("world", test_config.get("str_value", "")) + self.assertEquals(["a", "b", "c"], test_config.get("list_value", [])) + self.assertEquals(("a", "b", "c"), test_config.get("list_value", ())) + self.assertEquals({"foo": "bar"}, test_config.get("map_value", {})) + + # the get_value is similar, though only provides back a string or list + + self.assertEquals("c", test_config.get_value("list_value")) + self.assertEquals(["a", "b", "c"], test_config.get_value("list_value", multiple = True)) + + self.assertEquals(None, test_config.get_value("foo")) + self.assertEquals("hello", test_config.get_value("foo", "hello")) + + def test_csv(self): + """ + Tests the get_str_csv and get_int_csv methods. + """ + + test_config = stem.util.conf.get_config("unit_testing") + test_config.set("str_csv_value", "hello, world") + test_config.set("int_csv_value", "1, 2, 3") + test_config.set("not_a_csv_value", "blarg I say!") + + self.assertEquals(["hello", "world"], test_config.get_str_csv("str_csv_value")) + self.assertEquals(["1", "2", "3"], test_config.get_str_csv("int_csv_value")) + self.assertEquals(["blarg I say!"], test_config.get_str_csv("not_a_csv_value")) + self.assertEquals(None, test_config.get_str_csv("not_a_csv_value", count = 5)) + + self.assertEquals(None, test_config.get_int_csv("str_csv_value")) + self.assertEquals([1, 2, 3], test_config.get_int_csv("int_csv_value")) + self.assertEquals(None, test_config.get_int_csv("int_csv_value", min_value = 4)) + self.assertEquals(None, test_config.get_int_csv("not_a_csv_value")) +

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit a5ecfd445ecc89dcd9dac5c8753558528b7e4531 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:47:12 2012 -0300 Add a changes file --- changes/bug4048 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4048 b/changes/bug4048 new file mode 100644 index 0000000..d138eb2 --- /dev/null +++ b/changes/bug4048 @@ -0,0 +1,2 @@ + o Attempt to remove port.conf file before using it to avoid a race + condition between tor and Vidalia. Fixes bug 4048. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4048_unlinkportconf' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 44260099f728d9c5503955d1de8244accc97e9b7 Merge: f3d84d5 a5ecfd4 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:47:50 2012 -0300 Merge branch 'bug4048_unlinkportconf' into alpha changes/bug4048 | 2 ++ src/vidalia/MainWindow.cpp | 6 +++++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 6d73fdedc9091ffafbd9b1c96b8736f5edbcd364 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:49:20 2012 -0300 Add a changes file --- changes/bug4598 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4598 b/changes/bug4598 new file mode 100644 index 0000000..89daf1d --- /dev/null +++ b/changes/bug4598 @@ -0,0 +1,2 @@ + o Explicitly disable SocksPort auto by setting it to its default + (9050). Fixes bug 4598. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4598_disableauto' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 5883f5d2e894af1b5dbfdbb3830c51645599850a Merge: 4426009 6d73fde Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 11:50:11 2012 -0300 Merge branch 'bug4598_disableauto' into alpha changes/bug4598 | 2 ++ src/vidalia/config/AdvancedPage.ui | 2 +- src/vidalia/config/TorSettings.cpp | 6 ++++++ 3 files changed, 9 insertions(+), 1 deletions(-)

1 0

[vidalia/alpha] Add a changes file
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit 97685a654d7fae7b848d022e445c223773f12e22 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 12:31:54 2012 -0300 Add a changes file --- changes/bug4031 | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/changes/bug4031 b/changes/bug4031 new file mode 100644 index 0000000..8c57fd2 --- /dev/null +++ b/changes/bug4031 @@ -0,0 +1,2 @@ + o Remember the previously used random socks/control ports so Firefox + keeps working after restarting tor. Fixes bug 4031. \ No newline at end of file

1 0

[vidalia/alpha] Merge branch 'bug4031_rememberports' into alpha
by chiiph＠torproject.org 23 Jan '12

23 Jan '12

commit ed2887ee31d01abe91289206251b05ac1df00772 Merge: 5883f5d 97685a6 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Mon Jan 23 12:33:38 2012 -0300 Merge branch 'bug4031_rememberports' into alpha Conflicts: src/vidalia/MainWindow.cpp changes/bug4031 | 2 + src/vidalia/MainWindow.cpp | 52 +++++++++++++++++++++++++++++++++++++++++-- src/vidalia/MainWindow.h | 4 +++ 3 files changed, 55 insertions(+), 3 deletions(-) diff --cc src/vidalia/MainWindow.cpp index 03f62a4,28786fc..89387c0 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@@ -617,13 -594,21 +619,25 @@@ MainWindow::start( if(settings.getControlMethod() == ControlMethod::Port) { if(settings.autoControlPort()) { + QString portconf = QString("%1/port.conf").arg(expDataDirectory); + if(!QFile::remove(portconf)) + vWarn(QString("Unable to remove %s, may be it didn't existed.").arg(portconf)); + - args << "ControlPort" << "auto"; - args << "SocksPort" << "auto"; - args << "ControlPortWriteToFile" << portconf; + QString control_str = "auto"; + QString socks_str = "auto"; + + if(!_previousControlPort.isEmpty()) { + control_str = _previousControlPort; + _startedWithPrevious = true; + } + if(!_previousSocksPort.isEmpty()) { + socks_str = _previousSocksPort; + _startedWithPrevious = true; + } + + args << "ControlPort" << control_str; + args << "SocksPort" << socks_str; + args << "ControlPortWriteToFile" << QString("%1/port.conf").arg(expDataDirectory); } else { /* Add the intended control port value */ quint16 controlPort = settings.getControlPort(); @@@ -869,11 -856,29 +892,34 @@@ voi MainWindow::connected() { authenticate(); + if(!_torControl->isVidaliaRunningTor()) { + QString err; + if(!_torControl->takeOwnership(&err)) + vWarn(err); + } + + TorSettings settings; + if(settings.autoControlPort()) { + // We want to remember the ports if it's on auto + QString control_str = "", socks_str = ""; + if(_torControl->getInfo("net/listeners/control", control_str)) { + QStringList control_parts = control_str.split(":"); + if(control_parts.size() > 1) + control_str = control_parts[1]; + } + if(_torControl->getInfo("net/listeners/socks", socks_str)) { + QStringList socks_parts = socks_str.split(":"); + if(socks_parts.size() > 1) + socks_str = socks_parts[1]; + } + + _previousControlPort = control_str; + _previousSocksPort = socks_str; + } else { + // Otherwise we want to clear the remembered ports + _previousControlPort = ""; + _previousSocksPort = ""; + } } /** Called when the connection to the control socket fails. The reason will be

1 0