July 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Restructure directories to reflect architecture spec.
by art＠torproject.org 24 Jul '12

24 Jul '12

commit 178ab96765ddec35d0dc42e764d2bd45dd361d23 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jul 24 15:16:04 2012 +0200 Restructure directories to reflect architecture spec. --- oonib/README.md | 7 ++++ oonib/backends/daphn3.py | 37 -------------------- oonib/backends/dns.py | 16 --------- oonib/backends/http.py | 74 ----------------------------------------- oonib/backends/ssl.py | 7 ---- oonib/common.py | 6 --- oonib/lib/__init__.py | 6 +++ oonib/lib/ssl.py | 7 ++++ oonib/oonibackend.py | 10 +++--- oonib/testhelpers/daphn3.py | 37 ++++++++++++++++++++ oonib/testhelpers/dns.py | 16 +++++++++ oonib/testhelpers/http.py | 74 +++++++++++++++++++++++++++++++++++++++++ 12 files changed, 152 insertions(+), 145 deletions(-) diff --git a/oonib/README.md b/oonib/README.md index 6823d06..2d6caba 100644 --- a/oonib/README.md +++ b/oonib/README.md @@ -1,3 +1,10 @@ +# Dependencies + +The extra dependencies necessary to run OONIB are: + +* cyclone: https://github.com/fiorix/cyclone +* + # Generate self signed certs for OONIB openssl genrsa -des3 -out private.key 4096 diff --git a/oonib/backends/__init__.py b/oonib/backends/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/oonib/backends/daphn3.py b/oonib/backends/daphn3.py deleted file mode 100644 index 59bdeea..0000000 --- a/oonib/backends/daphn3.py +++ /dev/null @@ -1,37 +0,0 @@ -from twisted.internet import protocol -from twisted.internet.error import ConnectionDone - -from oonib.common import config - -from ooni.plugoo import reports -from ooni.protocols.daphn3 import Mutator, Daphn3Protocol -from ooni.protocols.daphn3 import read_pcap - -class Daphn3Server(protocol.ServerFactory): - """ - This is the main class that deals with the daphn3 server side component. - We keep track of global state of every client here. - Every client is identified by their IP address and the state of mutation is - stored by using their IP address as a key. This may lead to some bugs if - two different clients are sharing the same IP, but hopefully the - probability of such thing is not that likely. - """ - protocol = Daphn3Protocol - mutations = {} - def buildProtocol(self, addr): - p = self.protocol() - p.factory = self - p.factory.steps = read_pcap(config.daphn3.pcap_file) - - if addr.host not in self.mutations: - self.mutations[addr.host] = Mutator(p.steps) - else: - print "Moving on to next mutation" - if not self.mutations[addr.host].next_mutation(): - self.mutations.pop(addr.host) - try: - p.mutator = self.mutations[addr.host] - except: - pass - return p - diff --git a/oonib/backends/dns.py b/oonib/backends/dns.py deleted file mode 100644 index 689d1a4..0000000 --- a/oonib/backends/dns.py +++ /dev/null @@ -1,16 +0,0 @@ -from twisted.internet.protocol import Factory, Protocol -from twisted.internet import reactor -from twisted.names import dns -from twisted.names import client, server - -class ProxyDNSServer(server.DNSServerFactory): - def __init__(self, authorities = None, - caches = None, clients = None, - verbose = 0): - resolver = client.Resolver(servers=[('8.8.8.8', 53)]) - server.DNSServerFactory.__init__(self, authorities = authorities, - caches = caches, clients = [resolver], - verbose = verbose) - def handleQuery(self, message, protocol, address): - print message, protocol, address - server.DNSServerFactory.handleQuery(self, message, protocol, address) diff --git a/oonib/backends/http.py b/oonib/backends/http.py deleted file mode 100644 index 79a487b..0000000 --- a/oonib/backends/http.py +++ /dev/null @@ -1,74 +0,0 @@ -import json -import random -import string - -from twisted.application import internet, service -from twisted.internet import protocol, reactor, defer -from twisted.protocols import basic -from twisted.web import resource, server, static -from twisted.web.microdom import escape - -server.version = "Apache" - -class HTTPRandomPage(resource.Resource): - """ - This generates a random page of arbitrary length and containing the string - selected by the user. - The format is the following: - /random/<length>/<keyword> - """ - isLeaf = True - def _gen_random_string(self, length): - return ''.join(random.choice(string.letters) for x in range(length)) - - def genRandomPage(self, length=100, keyword=None): - data = self._gen_random_string(length/2) - if keyword: - data += keyword - data += self._gen_random_string(length - length/2) - data += '\n' - return data - - def render(self, request): - length = 100 - keyword = None - path_parts = request.path.split('/') - if len(path_parts) > 2: - length = int(path_parts[2]) - if length > 100000: - length = 100000 - - if len(path_parts) > 3: - keyword = escape(path_parts[3]) - - return self.genRandomPage(length, keyword) - -class HTTPReturnHeaders(resource.Resource): - """ - This returns the headers being sent by the client in JSON format. - """ - isLeaf = True - def render(self, request): - req_headers = request.getAllHeaders() - return json.dumps(req_headers) - -class HTTPSendHeaders(resource.Resource): - """ - This sends to the client the headers that they send inside of the POST - request encoded in json. - """ - isLeaf = True - def render_POST(self, request): - headers = json.loads(request.content.read()) - for header, value in headers.items(): - request.setHeader(str(header), str(value)) - return '' - -class HTTPBackend(resource.Resource): - def __init__(self): - resource.Resource.__init__(self) - self.putChild('random', HTTPRandomPage()) - self.putChild('returnheaders', HTTPReturnHeaders()) - self.putChild('sendheaders', HTTPSendHeaders()) - - diff --git a/oonib/backends/ssl.py b/oonib/backends/ssl.py deleted file mode 100644 index 5f19686..0000000 --- a/oonib/backends/ssl.py +++ /dev/null @@ -1,7 +0,0 @@ -from twisted.internet import ssl - -class SSLContext(ssl.DefaultOpenSSLContextFactory): - def __init__(self, config): - ssl.DefaultOpenSSLContextFactory.__init__(self, config.main.ssl_private_key, - config.main.ssl_certificate) - diff --git a/oonib/common.py b/oonib/common.py deleted file mode 100644 index 2f1b6f9..0000000 --- a/oonib/common.py +++ /dev/null @@ -1,6 +0,0 @@ -from ooni.utils import Storage -from ooni.utils.config import Config - -config = Storage() -config.main = Config('main', 'oonibackend.conf') -config.daphn3 = Config('daphn3', 'oonibackend.conf') diff --git a/oonib/lib/__init__.py b/oonib/lib/__init__.py new file mode 100644 index 0000000..2f1b6f9 --- /dev/null +++ b/oonib/lib/__init__.py @@ -0,0 +1,6 @@ +from ooni.utils import Storage +from ooni.utils.config import Config + +config = Storage() +config.main = Config('main', 'oonibackend.conf') +config.daphn3 = Config('daphn3', 'oonibackend.conf') diff --git a/oonib/lib/ssl.py b/oonib/lib/ssl.py new file mode 100644 index 0000000..5f19686 --- /dev/null +++ b/oonib/lib/ssl.py @@ -0,0 +1,7 @@ +from twisted.internet import ssl + +class SSLContext(ssl.DefaultOpenSSLContextFactory): + def __init__(self, config): + ssl.DefaultOpenSSLContextFactory.__init__(self, config.main.ssl_private_key, + config.main.ssl_certificate) + diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index c5a866b..d6ba3f0 100755 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -16,11 +16,11 @@ from twisted.web import resource, server, static from twisted.web.microdom import escape from twisted.names import dns -from oonib.common import config -from oonib.backends.http import HTTPBackend -from oonib.backends.ssl import SSLContext -from oonib.backends.dns import ProxyDNSServer -from oonib.backends.daphn3 import Daphn3Server +from oonib.lib import config +from oonib.testhelpers.http import HTTPBackend +from oonib.lib.ssl import SSLContext +from oonib.testhelpers.dns import ProxyDNSServer +from oonib.testhelpers.daphn3 import Daphn3Server # This tells twisted to set the server.version = config.main.server_version diff --git a/oonib/testhelpers/__init__.py b/oonib/testhelpers/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/oonib/testhelpers/daphn3.py b/oonib/testhelpers/daphn3.py new file mode 100644 index 0000000..59bdeea --- /dev/null +++ b/oonib/testhelpers/daphn3.py @@ -0,0 +1,37 @@ +from twisted.internet import protocol +from twisted.internet.error import ConnectionDone + +from oonib.common import config + +from ooni.plugoo import reports +from ooni.protocols.daphn3 import Mutator, Daphn3Protocol +from ooni.protocols.daphn3 import read_pcap + +class Daphn3Server(protocol.ServerFactory): + """ + This is the main class that deals with the daphn3 server side component. + We keep track of global state of every client here. + Every client is identified by their IP address and the state of mutation is + stored by using their IP address as a key. This may lead to some bugs if + two different clients are sharing the same IP, but hopefully the + probability of such thing is not that likely. + """ + protocol = Daphn3Protocol + mutations = {} + def buildProtocol(self, addr): + p = self.protocol() + p.factory = self + p.factory.steps = read_pcap(config.daphn3.pcap_file) + + if addr.host not in self.mutations: + self.mutations[addr.host] = Mutator(p.steps) + else: + print "Moving on to next mutation" + if not self.mutations[addr.host].next_mutation(): + self.mutations.pop(addr.host) + try: + p.mutator = self.mutations[addr.host] + except: + pass + return p + diff --git a/oonib/testhelpers/dns.py b/oonib/testhelpers/dns.py new file mode 100644 index 0000000..689d1a4 --- /dev/null +++ b/oonib/testhelpers/dns.py @@ -0,0 +1,16 @@ +from twisted.internet.protocol import Factory, Protocol +from twisted.internet import reactor +from twisted.names import dns +from twisted.names import client, server + +class ProxyDNSServer(server.DNSServerFactory): + def __init__(self, authorities = None, + caches = None, clients = None, + verbose = 0): + resolver = client.Resolver(servers=[('8.8.8.8', 53)]) + server.DNSServerFactory.__init__(self, authorities = authorities, + caches = caches, clients = [resolver], + verbose = verbose) + def handleQuery(self, message, protocol, address): + print message, protocol, address + server.DNSServerFactory.handleQuery(self, message, protocol, address) diff --git a/oonib/testhelpers/http.py b/oonib/testhelpers/http.py new file mode 100644 index 0000000..79a487b --- /dev/null +++ b/oonib/testhelpers/http.py @@ -0,0 +1,74 @@ +import json +import random +import string + +from twisted.application import internet, service +from twisted.internet import protocol, reactor, defer +from twisted.protocols import basic +from twisted.web import resource, server, static +from twisted.web.microdom import escape + +server.version = "Apache" + +class HTTPRandomPage(resource.Resource): + """ + This generates a random page of arbitrary length and containing the string + selected by the user. + The format is the following: + /random/<length>/<keyword> + """ + isLeaf = True + def _gen_random_string(self, length): + return ''.join(random.choice(string.letters) for x in range(length)) + + def genRandomPage(self, length=100, keyword=None): + data = self._gen_random_string(length/2) + if keyword: + data += keyword + data += self._gen_random_string(length - length/2) + data += '\n' + return data + + def render(self, request): + length = 100 + keyword = None + path_parts = request.path.split('/') + if len(path_parts) > 2: + length = int(path_parts[2]) + if length > 100000: + length = 100000 + + if len(path_parts) > 3: + keyword = escape(path_parts[3]) + + return self.genRandomPage(length, keyword) + +class HTTPReturnHeaders(resource.Resource): + """ + This returns the headers being sent by the client in JSON format. + """ + isLeaf = True + def render(self, request): + req_headers = request.getAllHeaders() + return json.dumps(req_headers) + +class HTTPSendHeaders(resource.Resource): + """ + This sends to the client the headers that they send inside of the POST + request encoded in json. + """ + isLeaf = True + def render_POST(self, request): + headers = json.loads(request.content.read()) + for header, value in headers.items(): + request.setHeader(str(header), str(value)) + return '' + +class HTTPBackend(resource.Resource): + def __init__(self): + resource.Resource.__init__(self) + self.putChild('random', HTTPRandomPage()) + self.putChild('returnheaders', HTTPReturnHeaders()) + self.putChild('sendheaders', HTTPSendHeaders()) + +

1 0

[ooni-probe/master] Improve OONI(B) design and fix Daphn3
by art＠torproject.org 24 Jul '12

24 Jul '12

commit 64ed356e8cde9d6f866205f978cf7c895ed28885 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jul 24 21:23:52 2012 +0200 Improve OONI(B) design and fix Daphn3 * Create a new kind of test functionality called tool * Add support for terminating a test via .end() * Fix some crazy off by one bugs in Daphn3 * Fix unit tests by starting reactor in the right place * Make Daphn3 into an OONI tool that generates a YAML file --- ooni/ooniprobe.py | 13 +++++-- ooni/plugins/daphn3.py | 66 +++++++++++++++++++++++++++++++---- ooni/plugoo/tests.py | 7 ++++ ooni/plugoo/work.py | 21 +++++++++--- ooni/protocols/daphn3.py | 76 +++++++++++++++++++++++++--------------- oonib/README.md | 2 +- oonib/lib/ssl.py | 3 +- oonib/oonibackend.conf.sample | 1 + oonib/testhelpers/daphn3.py | 17 +++++++-- 9 files changed, 155 insertions(+), 51 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index d6de6a6..b75deca 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -79,13 +79,21 @@ def runTest(test, options, global_options, reactor=reactor): if 'resume' in options: resume = options['resume'] - wgen = work.WorkGenerator(test_class(options, global_options, report, - reactor=reactor), + test = test_class(options, global_options, report, reactor=reactor) + if test.tool: + test.runTool() + return + + if test.end: + return + + wgen = work.WorkGenerator(test, dict(options), start=resume) for x in wgen: worker.push(x) + reactor.run() class Options(usage.Options): tests = plugoo.keys() @@ -132,5 +140,4 @@ if __name__ == "__main__": sys.exit(1) runTest(config.subCommand, config.subOptions, config) - reactor.run() diff --git a/ooni/plugins/daphn3.py b/ooni/plugins/daphn3.py index 82a3331..6c1186e 100644 --- a/ooni/plugins/daphn3.py +++ b/ooni/plugins/daphn3.py @@ -8,6 +8,7 @@ from twisted.python import usage from twisted.plugin import IPlugin from twisted.internet import protocol, endpoints +from ooni.plugoo import reports from ooni.plugoo.tests import ITest, OONITest from ooni.plugoo.assets import Asset from ooni.protocols import daphn3 @@ -15,40 +16,53 @@ from ooni.utils import log class Daphn3ClientProtocol(daphn3.Daphn3Protocol): def connectionMade(self): + print "I have made a connection!" self.next_state() def connectionLost(self, reason): - print "LOST!" + pass class Daphn3ClientFactory(protocol.ClientFactory): protocol = Daphn3ClientProtocol mutator = None steps = None + test = None + report = reports.Report('daphn3', 'daphn3.yamlooni') def buildProtocol(self, addr): p = self.protocol() + p.report = self.report p.factory = self if self.steps: p.steps = self.steps if not self.mutator: self.mutator = daphn3.Mutator(p.steps) - p.mutator = self.mutator else: print "Moving on to next mutation" - self.mutator.next_mutation() + self.mutator.next() + p.mutator = self.mutator return p def clientConnectionFailed(self, reason): print "We failed connecting the the OONIB" print "Cannot perform test. Perhaps it got blocked?" print "Please report this to tor-assistants(a)torproject.org" + self.test.end(d) def clientConnectionLost(self, reason): print "Connection Lost." class daphn3Args(usage.Options): - optParameters = [['pcap', 'f', None, 'PCAP file to take as input'], + optParameters = [['pcap', 'f', None, + 'PCAP to read for generating the YAML output'], + + ['output', 'o', 'daphn3.yaml', + 'What file should be written'], + + ['yaml', 'y', None, + 'The input file to the test'], + ['host', 'h', None, 'Target Hostname'], ['port', 'p', None, 'Target port number'], ['resume', 'r', 0, 'Resume at this index']] @@ -65,30 +79,66 @@ class daphn3Test(OONITest): local_options = None steps = None + def initialize(self): if not self.local_options: + self.end() return #pass self.factory = Daphn3ClientFactory() - self.steps = daphn3.read_pcap(self.local_options['pcap']) + self.factory.test = self + + if self.local_options['pcap']: + self.tool = True + + elif self.local_options['yaml']: + self.steps = daphn3.read_yaml(self.local_options['yaml']) + + else: + log.msg("Not enough inputs specified to the test") + self.end() + + def runTool(self): + import yaml + pcap = daphn3.read_pcap(self.local_options['pcap']) + f = open(self.local_options['output'], 'w') + f.write(yaml.dump(pcap)) + f.close() def control(self, exp_res, args): - mutation = self.factory.mutator.get_mutation(0) + try: + mutation = self.factory.mutator.get(0) + except: + mutation = None return {'mutation_number': args['mutation'], 'value': mutation} + def _failure(self, *argc, **kw): + print "We failed connecting the the OONIB" + print "Cannot perform test. Perhaps it got blocked?" + print "Please report this to tor-assistants(a)torproject.org" + print "Traceback: %s %s" % (argc, kw) + self.end() + def experiment(self, args): log.msg("Doing mutation %s" % args['mutation']) self.factory.steps = self.steps host = self.local_options['host'] port = int(self.local_options['port']) log.msg("Connecting to %s:%s" % (host, port)) + + if self.ended: + return + endpoint = endpoints.TCP4ClientEndpoint(self.reactor, host, port) - return endpoint.connect(self.factory) + d = endpoint.connect(self.factory) + d.addErrback(self._failure) + return d #return endpoint.connect(Daphn3ClientFactory) def load_assets(self): if not self.steps: - print "No asset!" + print "Error: No assets!" + self.end() return {} mutations = 0 for x in self.steps: diff --git a/ooni/plugoo/tests.py b/ooni/plugoo/tests.py index 9b6ea26..482b8bc 100644 --- a/ooni/plugoo/tests.py +++ b/ooni/plugoo/tests.py @@ -25,6 +25,7 @@ class OONITest(object): # By default we set this to False, meaning that we don't block blocking = False reactor = None + tool = False def __init__(self, local_options, global_options, report, ooninet=None, reactor=None): @@ -58,6 +59,12 @@ class OONITest(object): return "<OONITest %s %s %s>" % (self.options, self.global_options, self.assets) + def end(self): + """ + State that the current test should finish. + """ + self.ended = True + def finished(self, control): """ The Test has finished running, we must now calculate the test runtime diff --git a/ooni/plugoo/work.py b/ooni/plugoo/work.py index 6106456..db88fbf 100644 --- a/ooni/plugoo/work.py +++ b/ooni/plugoo/work.py @@ -43,12 +43,22 @@ class Worker(object): @param r: the return value of a previous test. """ - self._running -= 1 + if self._running > 0: + self._running -= 1 + if self._running < self.maxconcurrent and self._queued: workunit, d = self._queued.pop(0) asset, test, idx = workunit - self._running += 1 - actuald = test.startTest(asset).addBoth(self._run) + while test.ended and workunit: + try: + workunit, d = self._queued.pop(0) + asset, test, idx = workunit + except: + workunit = None + + if not test.ended: + self._running += 1 + actuald = test.startTest(asset).addBoth(self._run) if isinstance(r, failure.Failure): # XXX probably we should be doing something to retry test running @@ -71,8 +81,9 @@ class Worker(object): """ if self._running < self.maxconcurrent: asset, test, idx = workunit - self._running += 1 - return test.startTest(asset).addBoth(self._run) + if not test.ended: + self._running += 1 + return test.startTest(asset).addBoth(self._run) d = defer.Deferred() self._queued.append((workunit, d)) diff --git a/ooni/protocols/daphn3.py b/ooni/protocols/daphn3.py index 093929b..d7471ab 100644 --- a/ooni/protocols/daphn3.py +++ b/ooni/protocols/daphn3.py @@ -1,13 +1,14 @@ +import sys +import yaml + from twisted.internet import protocol, defer from twisted.internet.error import ConnectionDone +from scapy.all import * + from ooni.utils import log from ooni.plugoo import reports -import sys -from scapy.all import * -import yaml - def read_pcap(filename): """ @param filename: Filesystem path to the pcap. @@ -65,6 +66,12 @@ def read_pcap(filename): return messages +def read_yaml(filename): + f = open(filename) + obj = yaml.load(f) + f.close() + return obj + class Mutator: idx = 0 step = 0 @@ -74,10 +81,10 @@ class Mutator: def __init__(self, steps): """ - @param steps: array of dicts containing as keys data and wait. Data is - the content of the ith packet to be sent and wait is how - much we should wait before mutating the packet of the - next step. + @param steps: array of dicts for the steps that must be gone over by + the mutator. Looks like this: + [{"sender": "client", "data": "\xde\xad\xbe\xef"}, + {"sender": "server", "data": "\xde\xad\xbe\xef"}] """ self.steps = steps @@ -105,7 +112,7 @@ class Mutator: current_state = {'idx': self.idx, 'step': self.step} return current_state - def next_mutation(self): + def next(self): """ Increases by one the mutation state. @@ -121,9 +128,9 @@ class Mutator: returns True if another mutation is available. returns False if all the possible mutations have been done. """ - if (self.step + 1) > len(self.steps): + if (self.step) == len(self.steps): # Hack to stop once we have gone through all the steps - print "[Mutator.next_mutation()] I believe I have gone over all steps" + print "[Mutator.next()] I believe I have gone over all steps" print " Stopping!" self.waiting = True return False @@ -132,35 +139,40 @@ class Mutator: current_idx = self.idx current_step = self.step current_data = self.steps[current_step]['data'] - try: - data_to_receive = len(self.steps[current_step +1 ]['data']) - print "[Mutator.next_mutation()] Managed to receive some data." - except: - print "[Mutator.next_mutation()] No more data to receive." + + if 0: + print "current_step: %s" % current_step + print "current_idx: %s" % current_idx + print "current_data: %s" % current_data + print "steps: %s" % len(self.steps) + print "waiting_step: %s" % self.waiting_step + + data_to_receive = len(self.steps[current_step]['data']) if self.waiting and self.waiting_step == data_to_receive: - print "[Mutator.next_mutation()] I am no longer waiting" + print "[Mutator.next()] I am no longer waiting" log.debug("I am no longer waiting.") self.waiting = False self.waiting_step = 0 self.idx = 0 elif self.waiting: - print "[Mutator.next_mutation()] Waiting some more." + print "[Mutator.next()] Waiting some more." log.debug("Waiting some more.") self.waiting_step += 1 elif current_idx >= len(current_data): - print "[Mutator.next_mutation()] Entering waiting mode." + print "[Mutator.next()] Entering waiting mode." log.debug("Entering waiting mode.") self.step += 1 self.idx = 0 self.waiting = True + log.debug("current index %s" % current_idx) log.debug("current data %s" % len(current_data)) return True - def get_mutation(self, step): + def get(self, step): """ Returns the current packet to be sent to the wire. If no mutation is necessary it will return the plain data. @@ -172,11 +184,11 @@ class Mutator: returns the mutated packet for the specified step. """ if step != self.step or self.waiting: - log.debug("[Mutator.get_mutation()] I am not going to do anything :)") + log.debug("[Mutator.get()] I am not going to do anything :)") return self.steps[step]['data'] data = self.steps[step]['data'] - print "Mutating %s with idx %s" % (data, self.idx) + #print "Mutating %s with idx %s" % (data, self.idx) return self._mutate(data, self.idx) class Daphn3Protocol(protocol.Protocol): @@ -205,11 +217,13 @@ class Daphn3Protocol(protocol.Protocol): print "[Daphn3Protocol.next_state] No mutator. There is no point to stay on this earth." self.transport.loseConnection() return + if self.role is self.steps[self.state]['sender']: print "[Daphn3Protocol.next_state] I am a sender" - data = self.mutator.get_mutation(self.state) + data = self.mutator.get(self.state) self.transport.write(data) self.to_receive_data = 0 + else: print "[Daphn3Protocol.next_state] I am a receiver" self.to_receive_data = len(self.steps[self.state]['data']) @@ -228,11 +242,8 @@ class Daphn3Protocol(protocol.Protocol): print "I don't have a mutator. My life means nothing." self.transport.loseConnection() return - if len(self.steps) <= self.state: - print "I have reached the end of the state machine" - print "Censorship fingerprint bruteforced!" - report = {'mutator_state': self.mutator.state()} - self.report(report) + + if len(self.steps) == self.state: self.transport.loseConnection() return @@ -256,7 +267,7 @@ class Daphn3Protocol(protocol.Protocol): print "The connection was closed because of %s" % report['reason'] print "State %s, Mutator %s" % (report['proto_state'], report['mutator_state']) - self.mutator.next_mutation() + self.mutator.next() @@ -275,6 +286,13 @@ class Daphn3Protocol(protocol.Protocol): report['trigger'] = 'did not finish state walk' self.censorship_detected(report) + else: + print "I have reached the end of the state machine" + print "Censorship fingerprint bruteforced!" + report = {'mutator_state': self.mutator.state()} + self.report(report) + return + if reason.check(ConnectionDone): print "Connection closed cleanly" else: diff --git a/oonib/README.md b/oonib/README.md index 2d6caba..8136b06 100644 --- a/oonib/README.md +++ b/oonib/README.md @@ -2,8 +2,8 @@ The extra dependencies necessary to run OONIB are: +* twisted-names * cyclone: https://github.com/fiorix/cyclone -* # Generate self signed certs for OONIB diff --git a/oonib/lib/ssl.py b/oonib/lib/ssl.py index 5f19686..094bdc9 100644 --- a/oonib/lib/ssl.py +++ b/oonib/lib/ssl.py @@ -1,7 +1,8 @@ from twisted.internet import ssl +from oonib.lib import config class SSLContext(ssl.DefaultOpenSSLContextFactory): - def __init__(self, config): + def __init__(self, *args, **kw): ssl.DefaultOpenSSLContextFactory.__init__(self, config.main.ssl_private_key, config.main.ssl_certificate) diff --git a/oonib/oonibackend.conf.sample b/oonib/oonibackend.conf.sample index a5cbbd3..021e0e2 100644 --- a/oonib/oonibackend.conf.sample +++ b/oonib/oonibackend.conf.sample @@ -8,3 +8,4 @@ ssl_private_key = /path/to/private.key ssl_certificate = /path/to/certificate.crt [daphn3] pcap_file = /path/to/server.pcap +yaml_file = /path/to/server.yaml diff --git a/oonib/testhelpers/daphn3.py b/oonib/testhelpers/daphn3.py index 59bdeea..2dd2801 100644 --- a/oonib/testhelpers/daphn3.py +++ b/oonib/testhelpers/daphn3.py @@ -1,11 +1,11 @@ from twisted.internet import protocol from twisted.internet.error import ConnectionDone -from oonib.common import config +from oonib.lib import config from ooni.plugoo import reports from ooni.protocols.daphn3 import Mutator, Daphn3Protocol -from ooni.protocols.daphn3 import read_pcap +from ooni.protocols.daphn3 import read_pcap, read_yaml class Daphn3Server(protocol.ServerFactory): """ @@ -21,13 +21,22 @@ class Daphn3Server(protocol.ServerFactory): def buildProtocol(self, addr): p = self.protocol() p.factory = self - p.factory.steps = read_pcap(config.daphn3.pcap_file) + + if config.daphn3.yaml_file: + steps = read_yaml(config.daphn3.yaml_file) + elif config.daphn3.pcap_file: + steps = read_pcap(config.daphn3.pcap_file) + else: + print "Error! No PCAP, nor YAML file provided." + steps = None + + p.factory.steps = steps if addr.host not in self.mutations: self.mutations[addr.host] = Mutator(p.steps) else: print "Moving on to next mutation" - if not self.mutations[addr.host].next_mutation(): + if not self.mutations[addr.host].next(): self.mutations.pop(addr.host) try: p.mutator = self.mutations[addr.host]

1 0

[onionoo/master] Simplify URL check a bit.
by karsten＠torproject.org 24 Jul '12

24 Jul '12

commit e034adf8d7b1a8b50b81ca4e58e63a751080a6a9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jul 24 16:14:16 2012 +0200 Simplify URL check a bit. --- etc/web.xml.template | 6 +++--- src/org/torproject/onionoo/ResourceServlet.java | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/etc/web.xml.template b/etc/web.xml.template index 4cba2b5..b2c3178 100644 --- a/etc/web.xml.template +++ b/etc/web.xml.template @@ -18,15 +18,15 @@ </servlet> <servlet-mapping> <servlet-name>Resource</servlet-name> - <url-pattern>/summary/*</url-pattern> + <url-pattern>/summary</url-pattern> </servlet-mapping> <servlet-mapping> <servlet-name>Resource</servlet-name> - <url-pattern>/details/*</url-pattern> + <url-pattern>/details</url-pattern> </servlet-mapping> <servlet-mapping> <servlet-name>Resource</servlet-name> - <url-pattern>/bandwidth/*</url-pattern> + <url-pattern>/bandwidth</url-pattern> </servlet-mapping> </web-app> diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index 43c2110..7fddbea 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -160,14 +160,11 @@ public class ResourceServlet extends HttpServlet { uri = uri.substring("/onionoo".length()); } String resourceType = null; - if (uri.startsWith("/summary") && - !uri.startsWith("/summary/")) { + if (uri.startsWith("/summary")) { resourceType = "summary"; - } else if (uri.startsWith("/details") && - !uri.startsWith("/details/")) { + } else if (uri.startsWith("/details")) { resourceType = "details"; - } else if (uri.startsWith("/bandwidth") && - !uri.startsWith("/bandwidth/")) { + } else if (uri.startsWith("/bandwidth")) { resourceType = "bandwidth"; } else { response.sendError(HttpServletResponse.SC_BAD_REQUEST);

1 0

[stem/master] Descriptor pydoc mistake
by atagar＠torproject.org 24 Jul '12

24 Jul '12

commit 051ed27b99a5b8796777b86360a41bec52527b12 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Jul 24 08:42:56 2012 -0700 Descriptor pydoc mistake The parse_file() helper no longer runs over bridge descriptors, just relays. The reason for this is that only relay descriptors exist in the cached-descriptors file so there's little need for this to include hacks to differentiate between the two. --- stem/descriptor/server_descriptor.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index f54d5b1..759d6a5 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -70,8 +70,8 @@ SINGLE_FIELDS = ( def parse_file(descriptor_file, validate = True): """ - Iterates over the server descriptors in a file. This can read either relay or - bridge server descriptors. + Iterates over the server descriptors in a file. This can only read relay or + descriptors. :param file descriptor_file: file with descriptor content :param bool validate: checks the validity of the descriptor's content if True, skips these checks otherwise

1 0

[tor/master] Fix small memleak introduced in recent patch; fixe 6455.
by nickm＠torproject.org 24 Jul '12

24 Jul '12

commit 08e65ce04fbc68389095c627ae752a9784f5739a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 24 10:20:00 2012 -0400 Fix small memleak introduced in recent patch; fixe 6455. --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 0271cfd..281c458 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4025,7 +4025,7 @@ options_validate(or_options_t *old_options, or_options_t *options, log_notice(LD_GENERAL, "Tor is not configured as a relay but you specified" " a ServerTransportPlugin line (%s). The ServerTransportPlugin " "line will be ignored.", - esc_for_log(options->ServerTransportPlugin->value)); + escaped(options->ServerTransportPlugin->value)); } if (options->ConstrainedSockets) {

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Jul '12

24 Jul '12

commit 3fd2c4c5d6fb5053f105e03eb32803d711c6c868 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 24 14:15:11 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index f7fa015..77335a9 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-07-24 12:34+0000\n" +"PO-Revision-Date: 2012-07-24 13:57+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3269,15 +3269,15 @@ msgstr "Panoya Kopyala" msgctxt "StatusEventWidget" msgid "The Tor Software is Running" -msgstr "" +msgstr "Tor Programı Çalışıyor" msgctxt "StatusEventWidget" msgid "You are currently running version \"%1\" of the Tor software." -msgstr "" +msgstr "Şu anda Tor programının \"%1\" versiyonu çalışıyor." msgctxt "StatusEventWidget" msgid "The Tor Software is not Running" -msgstr "" +msgstr "Tor Programı Çalışmıyor" msgctxt "StatusEventWidget" msgid ""

1 0

[metrics-lib/master] Make parse history in descriptor reader more accessible.
by karsten＠torproject.org 24 Jul '12

24 Jul '12

commit 20f9d5574f1a25fe586eff18b7142894d65fb4ec Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jul 21 12:11:47 2012 +0200 Make parse history in descriptor reader more accessible. So far, the only way to prevent files from being parsed repeatedly in distinct runs was to specify a history file that only metrics-lib was supposed to read and write. However, some applications may want to specify the list of files to exclude themselves, or they may want to learn which files have been excluded and which have been parsed. These applications shouldn't be forced to mess with the history file. Add three methods to the descriptor reader for these applications. They should also play nicely together with the history file approach. AFAIK, stem has methods with the same purpose but a slightly different semantic. --- .../torproject/descriptor/DescriptorReader.java | 19 +++++ .../descriptor/impl/DescriptorReaderImpl.java | 73 +++++++++++++++---- 2 files changed, 76 insertions(+), 16 deletions(-) diff --git a/src/org/torproject/descriptor/DescriptorReader.java b/src/org/torproject/descriptor/DescriptorReader.java index 167f8b6..2783bd4 100644 --- a/src/org/torproject/descriptor/DescriptorReader.java +++ b/src/org/torproject/descriptor/DescriptorReader.java @@ -4,6 +4,7 @@ package org.torproject.descriptor; import java.io.File; import java.util.Iterator; +import java.util.SortedMap; /* Read descriptors from one or more local directories. */ public interface DescriptorReader { @@ -23,6 +24,24 @@ public interface DescriptorReader { * last modified timestamp and the absolute path of a file. */ public void setExcludeFiles(File historyFile); + /* Exclude files if they haven't changed since the corresponding last + * modified timestamps. Can be used instead of (or in addition to) a + * history file. */ + public void setExcludedFiles(SortedMap<String, Long> excludedFiles); + + /* Return files and lost modified timestamps of files that exist in the + * input directory or directories, but that have been excluded from + * parsing, because they haven't changed since they were last read. + * Can be used instead of (or in addition to) a history file when + * combined with the set of parsed files. */ + public SortedMap<String, Long> getExcludedFiles(); + + /* Return files and last modified timestamps of files that exist in the + * input directory or directories and that have been parsed. Can be + * used instead of (or in addition to) a history file when combined with + * the set of excluded files. */ + public SortedMap<String, Long> getParsedFiles(); + /* Fail descriptor parsing when encountering an unrecognized line. This * is not set by default, because the Tor specifications allow for new * lines to be added that shall be ignored by older Tor versions. But diff --git a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java index ddb6ea6..e3fb908 100644 --- a/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java +++ b/src/org/torproject/descriptor/impl/DescriptorReaderImpl.java @@ -59,6 +59,31 @@ public class DescriptorReaderImpl implements DescriptorReader { this.historyFile = historyFile; } + private SortedMap<String, Long> excludedFiles; + public void setExcludedFiles(SortedMap<String, Long> excludedFiles) { + if (this.hasStartedReading) { + throw new IllegalStateException("Reconfiguration is not permitted " + + "after starting to read."); + } + this.excludedFiles = excludedFiles; + } + + public SortedMap<String, Long> getExcludedFiles() { + if (this.reader == null || !this.reader.hasFinishedReading) { + throw new IllegalStateException("Operation is not permitted before " + + "finishing to read."); + } + return new TreeMap<String, Long>(this.reader.excludedFilesAfter); + } + + public SortedMap<String, Long> getParsedFiles() { + if (this.reader == null || !this.reader.hasFinishedReading) { + throw new IllegalStateException("Operation is not permitted before " + + "finishing to read."); + } + return new TreeMap<String, Long>(this.reader.parsedFilesAfter); + } + private boolean failUnrecognizedDescriptorLines = false; public void setFailUnrecognizedDescriptorLines() { if (this.hasStartedReading) { @@ -68,6 +93,7 @@ public class DescriptorReaderImpl implements DescriptorReader { this.failUnrecognizedDescriptorLines = true; } + private DescriptorReaderRunnable reader; public Iterator<DescriptorFile> readDescriptors() { if (this.hasStartedReading) { throw new IllegalStateException("Initiating reading is only " @@ -76,10 +102,10 @@ public class DescriptorReaderImpl implements DescriptorReader { this.hasStartedReading = true; BlockingIteratorImpl<DescriptorFile> descriptorQueue = new BlockingIteratorImpl<DescriptorFile>(); - DescriptorReaderRunnable reader = new DescriptorReaderRunnable( - this.directories, this.tarballs, descriptorQueue, - this.historyFile, this.failUnrecognizedDescriptorLines); - new Thread(reader).start(); + this.reader = new DescriptorReaderRunnable(this.directories, + this.tarballs, descriptorQueue, this.historyFile, + this.excludedFiles, this.failUnrecognizedDescriptorLines); + new Thread(this.reader).start(); return descriptorQueue; } @@ -88,15 +114,24 @@ public class DescriptorReaderImpl implements DescriptorReader { private List<File> tarballs; private BlockingIteratorImpl<DescriptorFile> descriptorQueue; private File historyFile; + private SortedMap<String, Long> + excludedFilesBefore = new TreeMap<String, Long>(), + excludedFilesAfter = new TreeMap<String, Long>(), + parsedFilesAfter = new TreeMap<String, Long>(); private DescriptorParser descriptorParser; + private boolean hasFinishedReading = false; private DescriptorReaderRunnable(List<File> directories, List<File> tarballs, BlockingIteratorImpl<DescriptorFile> descriptorQueue, - File historyFile, boolean failUnrecognizedDescriptorLines) { + File historyFile, SortedMap<String, Long> excludedFiles, + boolean failUnrecognizedDescriptorLines) { this.directories = directories; this.tarballs = tarballs; this.descriptorQueue = descriptorQueue; this.historyFile = historyFile; + if (excludedFiles != null) { + this.excludedFilesBefore = excludedFiles; + } this.descriptorParser = new DescriptorParserImpl(); this.descriptorParser.setFailUnrecognizedDescriptorLines( failUnrecognizedDescriptorLines); @@ -105,12 +140,10 @@ public class DescriptorReaderImpl implements DescriptorReader { this.readOldHistory(); this.readDescriptors(); this.readTarballs(); + this.hasFinishedReading = true; this.descriptorQueue.setOutOfDescriptors(); this.writeNewHistory(); } - private SortedMap<String, Long> - oldHistory = new TreeMap<String, Long>(), - newHistory = new TreeMap<String, Long>(); private void readOldHistory() { if (this.historyFile == null) { return; @@ -127,7 +160,7 @@ public class DescriptorReaderImpl implements DescriptorReader { long lastModifiedMillis = Long.parseLong(line.substring(0, line.indexOf(" "))); String absolutePath = line.substring(line.indexOf(" ") + 1); - this.oldHistory.put(absolutePath, lastModifiedMillis); + this.excludedFilesBefore.put(absolutePath, lastModifiedMillis); } br.close(); } catch (IOException e) { @@ -146,7 +179,10 @@ public class DescriptorReaderImpl implements DescriptorReader { } BufferedWriter bw = new BufferedWriter(new FileWriter( this.historyFile)); - for (Map.Entry<String, Long> e : this.newHistory.entrySet()) { + SortedMap<String, Long> newHistory = new TreeMap<String, Long>(); + newHistory.putAll(this.excludedFilesAfter); + newHistory.putAll(this.parsedFilesAfter); + for (Map.Entry<String, Long> e : newHistory.entrySet()) { String absolutePath = e.getKey(); long lastModifiedMillis = e.getValue(); bw.write(String.valueOf(lastModifiedMillis) + " " + absolutePath @@ -172,11 +208,14 @@ public class DescriptorReaderImpl implements DescriptorReader { } else { String absolutePath = file.getAbsolutePath(); long lastModifiedMillis = file.lastModified(); - this.newHistory.put(absolutePath, lastModifiedMillis); - if (this.oldHistory.containsKey(absolutePath) && - this.oldHistory.get(absolutePath) == lastModifiedMillis) { + if (this.excludedFilesBefore.containsKey(absolutePath) && + this.excludedFilesBefore.get(absolutePath) == + lastModifiedMillis) { + this.excludedFilesAfter.put(absolutePath, + lastModifiedMillis); continue; } + this.parsedFilesAfter.put(absolutePath, lastModifiedMillis); DescriptorFileImpl descriptorFile = new DescriptorFileImpl(); try { descriptorFile.setDirectory(directory); @@ -206,11 +245,13 @@ public class DescriptorReaderImpl implements DescriptorReader { } String absolutePath = tarball.getAbsolutePath(); long lastModifiedMillis = tarball.lastModified(); - this.newHistory.put(absolutePath, lastModifiedMillis); - if (this.oldHistory.containsKey(absolutePath) && - this.oldHistory.get(absolutePath) == lastModifiedMillis) { + if (this.excludedFilesBefore.containsKey(absolutePath) && + this.excludedFilesBefore.get(absolutePath) == + lastModifiedMillis) { + this.excludedFilesAfter.put(absolutePath, lastModifiedMillis); continue; } + this.parsedFilesAfter.put(absolutePath, lastModifiedMillis); try { FileInputStream in = new FileInputStream(tarball); if (in.available() > 0) {

1 0

[ooni-probe/master] Implement SSL support for OONIB
by art＠torproject.org 24 Jul '12

24 Jul '12

commit 59daf0150e2661be93ddde2bee57feb3ca7ac5b6 Author: Arturo Filastò <arturo(a)filasto.net> Date: Tue Jul 24 15:10:37 2012 +0200 Implement SSL support for OONIB --- .gitignore | 1 + oonib/README.md | 10 ++++++++++ oonib/backends/ssl.py | 7 +++++++ oonib/oonibackend.conf | 8 -------- oonib/oonibackend.conf.sample | 10 ++++++++++ oonib/oonibackend.py | 11 ++++++++++- 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 553482d..7f270bb 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ proxy-lists/italy-dns-ips.txt proxy-lists/italy-http-ips.txt private/* /ooni/plugins/dropin.cache +oonib/oonibackend.conf diff --git a/oonib/README.md b/oonib/README.md new file mode 100644 index 0000000..6823d06 --- /dev/null +++ b/oonib/README.md @@ -0,0 +1,10 @@ +# Generate self signed certs for OONIB + + openssl genrsa -des3 -out private.key 4096 + openssl req -new -key private.key -out server.csr + cp private.key private.key.org + # Remove passphrase from key + openssl rsa -in private.key.org -out private.key + openssl x509 -req -days 365 -in server.csr -signkey private.key -out certificate.crt + rm private.key.org + diff --git a/oonib/backends/ssl.py b/oonib/backends/ssl.py new file mode 100644 index 0000000..5f19686 --- /dev/null +++ b/oonib/backends/ssl.py @@ -0,0 +1,7 @@ +from twisted.internet import ssl + +class SSLContext(ssl.DefaultOpenSSLContextFactory): + def __init__(self, config): + ssl.DefaultOpenSSLContextFactory.__init__(self, config.main.ssl_private_key, + config.main.ssl_certificate) + diff --git a/oonib/oonibackend.conf b/oonib/oonibackend.conf deleted file mode 100644 index 5265045..0000000 --- a/oonib/oonibackend.conf +++ /dev/null @@ -1,8 +0,0 @@ -[main] -http_port = 8080 -dns_udp_port = 5354 -dns_tcp_port = 8002 -daphn3_port = 9666 -server_version = Apache -[daphn3] -pcap_file = /Users/y/Documents/workspace/ooni-probe.new/oonib/server.pcap diff --git a/oonib/oonibackend.conf.sample b/oonib/oonibackend.conf.sample new file mode 100644 index 0000000..a5cbbd3 --- /dev/null +++ b/oonib/oonibackend.conf.sample @@ -0,0 +1,10 @@ +[main] +http_port = 8080 +dns_udp_port = 5354 +dns_tcp_port = 8002 +daphn3_port = 9666 +server_version = Apache +ssl_private_key = /path/to/private.key +ssl_certificate = /path/to/certificate.crt +[daphn3] +pcap_file = /path/to/server.pcap diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index fe1a760..c5a866b 100755 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -18,6 +18,7 @@ from twisted.names import dns from oonib.common import config from oonib.backends.http import HTTPBackend +from oonib.backends.ssl import SSLContext from oonib.backends.dns import ProxyDNSServer from oonib.backends.daphn3 import Daphn3Server @@ -26,7 +27,15 @@ server.version = config.main.server_version application = service.Application('oonibackend') serviceCollection = service.IServiceCollection(application) -internet.TCPServer(int(config.main.http_port), server.Site(HTTPBackend())).setServiceParent(serviceCollection) + +internet.TCPServer(int(config.main.http_port), + server.Site(HTTPBackend()) + ).setServiceParent(serviceCollection) + +internet.SSLServer(int(config.main.ssl_port), + server.Site(HTTPBackend()), + SSLContext(config), + ).setServiceParent(serviceCollection) # Start the DNS Server related services TCPDNSServer = ProxyDNSServer()

1 0

[translation/vidalia_alpha] Update translations for vidalia_alpha
by translation＠torproject.org 24 Jul '12

24 Jul '12

commit 29f2f052b2f663249274644fdb5fe46dde469151 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Jul 24 12:45:13 2012 +0000 Update translations for vidalia_alpha --- tr/vidalia_tr.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tr/vidalia_tr.po b/tr/vidalia_tr.po index 8733f63..f7fa015 100644 --- a/tr/vidalia_tr.po +++ b/tr/vidalia_tr.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:46+0000\n" -"PO-Revision-Date: 2012-07-20 12:44+0000\n" +"PO-Revision-Date: 2012-07-24 12:34+0000\n" "Last-Translator: erg26 <ergungorler(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -2667,11 +2667,11 @@ msgstr "SOCKS 4" msgctxt "NetworkPage" msgid "SOCKS 5" -msgstr "" +msgstr "SOCKS 5" msgctxt "NetworkPage" msgid "HTTP / HTTPS" -msgstr "" +msgstr "HTTP / HTTPS" msgctxt "NetworkPage" msgid "You must specify one or more bridges." @@ -3183,19 +3183,19 @@ msgstr "<a href=\"bridges.finding\">Nasıl bir köprü bulabilirim?</a>" msgctxt "ServerPage" msgid "<a href=\"#bridgeHelp\">What's this?</a>" -msgstr "" +msgstr "<a href=\"#bridgeHelp\">Bu nedir?</a>" msgctxt "ServerPage" msgid "Automatically distribute my bridge address" -msgstr "" +msgstr "Köprü adresimi otomatik olarak dağıt" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Tor ağında anahtarlama trafiği (çıkış anahtarlaması olmayan)" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Tor ağı için anahtarlama trafiği (çıkış anahtarlaması)" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3265,7 +3265,7 @@ msgstr "" msgctxt "StatusEventWidget" msgid "Copy to Clipboard" -msgstr "" +msgstr "Panoya Kopyala" msgctxt "StatusEventWidget" msgid "The Tor Software is Running"

1 0

[ooni-probe/master] Merge branch 'master' of git://github.com/hellais/ooni-probe
by art＠torproject.org 24 Jul '12

24 Jul '12

1 0