tor-commits July 2012

tor-commits@lists.torproject.org

14 participants
949 discussions

[translation/gettor] Update translations for gettor
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit 65dbfb0ebda910e53ba69b61ac32676e08f6a827 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:45:05 2012 +0000 Update translations for gettor --- ko/gettor.po | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ko/gettor.po b/ko/gettor.po index df5d164..3a79f0c 100644 --- a/ko/gettor.po +++ b/ko/gettor.po @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2012-07-10 02:19+0000\n" -"Last-Translator: pCsOrI <pcsori(a)gmail.com>\n" +"PO-Revision-Date: 2012-07-13 09:22+0000\n" +"Last-Translator: cwt96 <cwt967(a)naver.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -201,7 +201,7 @@ msgstr "지원\n=====" msgid "" "Here's your requested software as a zip file. Please unzip the\n" "package and verify the signature." -msgstr "" +msgstr "요청된 소프트웨어가 zip 파일로 있습니다. 압축을 풀어 주시고 서명을 확인해 주십시오." #: lib/gettor/i18n.py:136 msgid "" @@ -250,7 +250,7 @@ msgid "" "in the body of the email to the following email address:\n" "\n" " bridges(a)torproject.org" -msgstr "" +msgstr "\"get bridges\"라는 문구를 이메일 본문에 넣어 다음 주소에 보내면 귀하는 bridge를 얻을 수 있습니다.\n\n bridges(a)torproject.org" #: lib/gettor/i18n.py:167 msgid "" @@ -278,7 +278,7 @@ msgstr "패키지가 곧 도착할 것입니다. 모든 패키지를 압축을 msgid "" "It was successfully understood. Your request is currently being processed.\n" "Your package (%s) should arrive within the next ten minutes." -msgstr "" +msgstr "성공적으로 이해되었습니다. 귀하의 요청은 현재 진행중이며, 패키지(%s)는 다음 10분 내로 도착해야 합니다." #: lib/gettor/i18n.py:182 msgid ""

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 13 Jul '12

13 Jul '12

commit be85a4e965c95019de846eb763fe9fa72e77f52c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 13 09:15:31 2012 +0000 Update translations for https_everywhere --- ko/ssl-observatory.dtd | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ko/ssl-observatory.dtd b/ko/ssl-observatory.dtd index d6f8e4c..727e44d 100644 --- a/ko/ssl-observatory.dtd +++ b/ko/ssl-observatory.dtd @@ -44,7 +44,8 @@ to turn it on?">--> <!ENTITY ssl-observatory.prefs.done "완료"> <!ENTITY ssl-observatory.prefs.explanation -""> +"HTTPS Everywhere은 EFF의 SSL 관측소를 사용할 수 있습니다. 이것은 두 가지 일을 합니다: (1) +중간자 공격을 감지하고 웹의 보안을 향상시키는 것을 돕기 위해, HTTPS 인증서의 복사본을 SSL 관측소로 보냅니다. 그리고 (2) 우리가 귀하에게 보안적이지 않는 연결이나 브라우저에 대한 공격에 대해 경고하도록 합니다.">  ""> <!ENTITY ssl-observatory.prefs.priv_dns -""> +"non-public DNS 이름을 위한 인증서 확인과 제출"> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "">

1 0

[metrics-web/master] Update ExoneraTor text based on wseltzer's edits.
by karsten＠torproject.org 13 Jul '12

13 Jul '12

commit 6515e1631fad121d310f89905c4adae1f4e7adbf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 13 08:49:35 2012 +0200 Update ExoneraTor text based on wseltzer's edits. --- .../torproject/ernie/web/ExoneraTorServlet.java | 42 ++++++++++++++------ 1 files changed, 30 insertions(+), 12 deletions(-) diff --git a/src/org/torproject/ernie/web/ExoneraTorServlet.java b/src/org/torproject/ernie/web/ExoneraTorServlet.java index 4feaaba..d353c7b 100644 --- a/src/org/torproject/ernie/web/ExoneraTorServlet.java +++ b/src/org/torproject/ernie/web/ExoneraTorServlet.java @@ -101,24 +101,42 @@ public class ExoneraTorServlet extends HttpServlet { + " <div class=\"main-column\" style=\"margin:5; " + "Padding:0;\">\n" + " <h2>ExoneraTor</h2>\n" - + " <h3>or: a website that tells you whether some IP " + + " <h3>or: a website that tells you whether a given IP " + "address was a Tor relay</h3>\n" + + " <br>\n" + + " <p>Just because you see an Internet connection from a " + + "particular IP address does not mean you know <i>who</i> " + + "originated the traffic. Tor anonymizes Internet traffic by " + + "\"<a href=\"https://www.torproject.org/about/overview" + + "#thesolution\">onion routing</a>,\" sending packets " + + "through a series of encrypted hops before they reach their " + + "destination. Therefore, if you see traffic from a Tor node, " + + "you may be seeing traffic that originated from someone " + + "using Tor, rather than from the node operator itself. The " + + "Tor Project and Tor node operators have no records of the " + + "traffic that passes over the network, but we do maintain " + + "current and historical records of which IP addresses are " + + "part of the Tor network.</p>\n" + + " <br>\n" + " <p>ExoneraTor tells you whether there was a Tor relay " + "running on a given IP address at a given time. ExoneraTor " - + "can further find out whether this relay permitted exiting " - + "to a given server and/or TCP port. ExoneraTor learns about " - + "these facts from parsing the public relay lists and relay " + + "can further indicate whether this relay permitted exiting " + + "to a given server and/or TCP port. ExoneraTor learns these " + + "facts by parsing the public relay lists and relay " + "descriptors that are collected from the Tor directory " - + "authorities and the exit lists collected by TorDNSEL.</p>\n" + + "authorities and the exit lists collected by TorDNSEL. By " + + "inputting an IP address and time, you can determine whether " + + "that IP was then a part of the Tor network.</p>\n" + " <br>\n" + " <p><font color=\"red\"><b>Notice:</b> Note that the " - + "information you are providing below may be leaked to anyone " - + "who can read the network traffic between you and this web " - + "server or who has access to this web server. If you need to " - + "keep the IP addresses and incident times confidential, you " - + "should download the <a href=\"tools.html#exonerator\">Java " - + "or Python version of ExoneraTor</a> and run it on your " - + "local machine.</font></p>\n" + + "information you are providing below may be visible to " + + "anyone who can read the network traffic between you and " + + "this web server or who has access to this web server. For " + + "greater confidentiality of the IP addresses and incident " + + "times, you should download the " + + "<a href=\"tools.html#exonerator\">Java or Python version of " + + "ExoneraTor</a> and run it on your local " + + "machine.</font></p>\n" + " <br>\n"); }

1 0

[ooni-probe/master] Implement censorship detection for fingerprint
by art＠torproject.org 11 Jul '12

11 Jul '12

commit d249c7ff695b0efdb4dd23a0a4bc6756024f7f19 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Jul 11 12:37:23 2012 +0200 Implement censorship detection for fingerprint * Move part of b0wser to a ooni protocol --- ooni/protocols/b0wser.py | 104 ++++++++++++++++++++++++++++++++++++++++ oonib/b0wser.py | 118 ++++++++++++---------------------------------- 2 files changed, 134 insertions(+), 88 deletions(-) diff --git a/ooni/protocols/b0wser.py b/ooni/protocols/b0wser.py new file mode 100644 index 0000000..ae6b002 --- /dev/null +++ b/ooni/protocols/b0wser.py @@ -0,0 +1,104 @@ +from ooni.utils import log + +class Mutator: + idx = 0 + step = 0 + + waiting = False + waiting_step = 0 + + 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. + """ + self.steps = steps + + def _mutate(self, data, idx): + """ + Mutate the idx bytes by increasing it's value by one + + @param data: the data to be mutated. + + @param idx: what byte should be mutated. + """ + print "idx: %s, data: %s" % (idx, data) + ret = data[:idx] + ret += chr(ord(data[idx]) + 1) + ret += data[idx+1:] + return ret + + def state(self): + """ + Return the current mutation state. As in what bytes are being mutated. + + Returns a dict containg the packet index and the step number. + """ + return {'idx': self.idx, 'step': self.step} + + def next_mutation(self): + """ + Increases by one the mutation state. + + ex. (* is the mutation state, i.e. the byte to be mutated) + before [___*] [____] + step1 step2 + after [____] [*___] + + Should be called every time you need to proceed onto the next mutation. + It changes the internal state of the mutator to that of the next + mutatation. + + returns True if another mutation is available. + returns False if all the possible mutations have been done. + """ + if self.step > len(self.steps): + self.waiting = True + return False + + self.idx += 1 + current_idx = self.idx + current_step = self.step + current_data = self.steps[current_step]['data'] + data_to_receive = self.steps[current_step]['wait'] + + if self.waiting and self.waiting_step == data_to_receive: + log.debug("I am no longer waiting.") + self.waiting = False + self.waiting_step = 0 + self.idx = 0 + + elif self.waiting: + log.debug("Waiting some more.") + self.waiting_step += 1 + + elif current_idx >= len(current_data): + 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): + """ + Returns the current packet to be sent to the wire. + If no mutation is necessary it will return the plain data. + Should be called when you are interested in obtaining the data to be + sent for the selected state. + + @param step: the current step you want the mutation for + + returns the mutated packet for the specified step. + """ + if step != self.step or self.waiting: + log.debug("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) + return self._mutate(data, self.idx) + diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 186c9a4..6da1997 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -1,100 +1,19 @@ from twisted.internet import protocol +from twisted.internet.error import ConnectionDone -class Mutator: - idx = 0 - step = 0 - - waiting = False - waiting_step = 0 - - def __init__(self, steps): - self.steps = steps - - def _mutate(self, data, idx): - """ - Mutate the idx bytes by increasing it's value by one - - @param data: the data to be mutated. - - @param idx: what byte should be mutated. - """ - print "idx: %s, data: %s" % (idx, data) - ret = data[:idx] - ret += chr(ord(data[idx]) + 1) - ret += data[idx+1:] - return ret - - def next_mutation(self): - """ - Increases by one the mutation state. - - ex. (* is the mutation state, i.e. the byte to be mutated) - before [___*] [____] - step1 step2 - after [____] [*___] - - Should be called every time you need to proceed onto the next mutation. - It changes the internal state of the mutator to that of the next - mutatation. - - returns True if another mutation is available. - returns False if all the possible mutations have been done. - """ - if self.step > len(self.steps): - self.waiting = True - return False - - self.idx += 1 - current_idx = self.idx - current_step = self.step - current_data = self.steps[current_step]['data'] - data_to_receive = self.steps[current_step]['wait'] - - if self.waiting and self.waiting_step == data_to_receive: - print "I am no longer waiting..." - self.waiting = False - self.waiting_step = 0 - self.idx = 0 - - elif self.waiting: - print "Waiting some more..." - self.waiting_step += 1 - - elif current_idx >= len(current_data): - print "Entering waiting mode..." - self.step += 1 - self.idx = 0 - self.waiting = True - print "current index %s current data %s" % (current_idx, len(current_data)) - return True - - def get_mutation(self, state): - """ - Returns the current packet to be sent to the wire. - If no mutation is necessary it will return the plain data. - Should be called when you are interested in obtaining the data to be - sent for the selected state. - - @param step: the current step you want the mutation for - - returns the mutated packet for the specified step. - """ - if step != self.step or self.waiting: - print "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) - return self._mutate(data, self.idx) +from ooni.plugoo import reports +from ooni.protocols.b0wser import Mutator class B0wserProtocol(protocol.Protocol): steps = [{'data': "STEP1", 'wait': 4}, {'data': "STEP2", 'wait': 4}, {'data': "STEP3", 'wait': 4}] - mutator = None + state = 0 + total_states = len(steps) - 1 received_data = 0 + report = reports.Report('b0wser', 'b0wser.yamlooni') def next_state(self): data = self.mutator.get_mutation(self.state) @@ -111,6 +30,28 @@ class B0wserProtocol(protocol.Protocol): print "Moving to next state %s" % self.state self.next_state() + def censorship_detected(self, report): + print "The connection was closed because of %s" % report['reason'] + print "I may have matched the censorship fingerprint" + print "State %s, Mutator %s" % (report['proto_state'], + report['mutator_state']) + self.report(report) + + + def connectionLost(self, reason): + report = {'reason': reason, 'proto_state': self.state, + 'mutator_state': self.mutator.state(), 'trigger': None} + + if self.state < self.total_states: + report['trigger'] = 'did not finish state walk' + self.censorship_detected(report) + + if reason.check(ConnectionDone): + print "Connection closed cleanly" + else: + report['trigger'] = 'unclean connection closure' + self.censorship_detected(report) + class B0wserServer(protocol.ServerFactory): protocol = B0wserProtocol mutations = {} @@ -122,7 +63,8 @@ class B0wserServer(protocol.ServerFactory): self.mutations[addr.host] = Mutator(p.steps) else: print "Moving on to next mutation" - self.mutations[addr.host].next_mutation() + if not self.mutations[addr.host].next_mutation(): + self.mutations.pop(addr.host) p.mutator = self.mutations[addr.host] return p

1 0

[ooni-probe/master] Implement a working b0wser serveside component
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 32a0027388f4ce5a9404ab02e3e9a21ed9314465 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Jul 10 20:37:38 2012 +0200 Implement a working b0wser serveside component --- oonib/b0wser.py | 113 ++++++++++++++++++++++++++++++------------------------- 1 files changed, 62 insertions(+), 51 deletions(-) diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 072b4b9..186c9a4 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -3,13 +3,27 @@ from twisted.internet import protocol class Mutator: idx = 0 step = 0 - state = 0 + waiting = False waiting_step = 0 def __init__(self, steps): self.steps = steps + def _mutate(self, data, idx): + """ + Mutate the idx bytes by increasing it's value by one + + @param data: the data to be mutated. + + @param idx: what byte should be mutated. + """ + print "idx: %s, data: %s" % (idx, data) + ret = data[:idx] + ret += chr(ord(data[idx]) + 1) + ret += data[idx+1:] + return ret + def next_mutation(self): """ Increases by one the mutation state. @@ -18,81 +32,74 @@ class Mutator: before [___*] [____] step1 step2 after [____] [*___] + + Should be called every time you need to proceed onto the next mutation. + It changes the internal state of the mutator to that of the next + mutatation. + + returns True if another mutation is available. + returns False if all the possible mutations have been done. """ - current_idx = self.idx + 1 + if self.step > len(self.steps): + self.waiting = True + return False + + self.idx += 1 + current_idx = self.idx current_step = self.step - current_data = self.steps[c_step]['data'] - data_to_receive = self.steps[c_step]]['recv'] + current_data = self.steps[current_step]['data'] + data_to_receive = self.steps[current_step]['wait'] if self.waiting and self.waiting_step == data_to_receive: + print "I am no longer waiting..." self.waiting = False self.waiting_step = 0 + self.idx = 0 elif self.waiting: + print "Waiting some more..." self.waiting_step += 1 - elif current_idx > len(current_data): + elif current_idx >= len(current_data): + print "Entering waiting mode..." self.step += 1 self.idx = 0 self.waiting = True + print "current index %s current data %s" % (current_idx, len(current_data)) + return True - @classmethod - def mutate(data, idx): - """ - Mutate the idx bytes by increasing it's value by one - - @param data: the data to be mutated. - - @param idx: what byte should be mutated. + def get_mutation(self, state): """ - ret = data[:idx-1] - ret += chr(ord(data[idx]) + 1) - ret += data[idx:] - return ret - - def get_mutation(self): - """ - returns the current packet to be sent to the wire. + Returns the current packet to be sent to the wire. If no mutation is necessary it will return the plain data. - """ - self.next_mutation() - if self.state != self.step or self.waiting: - return self.steps[self.state] + Should be called when you are interested in obtaining the data to be + sent for the selected state. - data = self.steps[self.state] - return self.mutate(data, self.idx) + @param step: the current step you want the mutation for - def get_data(self, i): + returns the mutated packet for the specified step. """ - XXX remove this shit. - """ - j = 0 - pkt_size = len(self.steps[j]['data']) - while i > pkt_size: - j += 1 - pkt_size += len(self.steps[j]) - # I am not in a state to send mutations - if j != self.state: - return self.steps[j]['data'] - - rel_idx = i % (pkt_size - len(self.steps[j-1])) - data = self.steps[j] - data[rel_idx] = chr(ord(data[rel_idx]) + 1) - return data + if step != self.step or self.waiting: + print "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) + return self._mutate(data, self.idx) class B0wserProtocol(protocol.Protocol): - steps = [{'data': "STEP1", 'recv': 20}, - {'data': "STEP2", 'recv': 20}, - {'data': "STEP3", 'recv': 20}] + steps = [{'data': "STEP1", 'wait': 4}, + {'data': "STEP2", 'wait': 4}, + {'data': "STEP3", 'wait': 4}] mutator = None state = 0 received_data = 0 def next_state(self): - data = self.mutator.get_mutation() + data = self.mutator.get_mutation(self.state) self.transport.write(data) - self.mutator.state += 1 + self.state += 1 self.received_data = 0 def dataReceived(self, data): @@ -100,8 +107,8 @@ class B0wserProtocol(protocol.Protocol): self.transport.loseConnection() return self.received_data += len(data) - if self.received_data >= self.steps[self.state]['recv']: - print self.received_data + if self.received_data >= self.steps[self.state]['wait']: + print "Moving to next state %s" % self.state self.next_state() class B0wserServer(protocol.ServerFactory): @@ -112,6 +119,10 @@ class B0wserServer(protocol.ServerFactory): p.factory = self if addr.host not in self.mutations: - self.mutations[addr.host] = Mutation(p.steps) + self.mutations[addr.host] = Mutator(p.steps) + else: + print "Moving on to next mutation" + self.mutations[addr.host].next_mutation() p.mutator = self.mutations[addr.host] return p +

1 0

[ooni-probe/master] Add some documentation to b0wser protocol and server
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 4391e65f226f9b45ceaa08465f466903de14f8e0 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Jul 11 12:54:09 2012 +0200 Add some documentation to b0wser protocol and server --- oonib/b0wser.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 39 insertions(+), 0 deletions(-) diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 6da1997..4b01cc7 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -5,6 +5,12 @@ from ooni.plugoo import reports from ooni.protocols.b0wser import Mutator class B0wserProtocol(protocol.Protocol): + """ + This implements the B0wser protocol for the server side. + It gets instanced once for every client that connects to the oonib. + For every instance of protocol there is only 1 mutation. + Once the last step is reached the connection is closed on the serverside. + """ steps = [{'data': "STEP1", 'wait': 4}, {'data': "STEP2", 'wait': 4}, {'data': "STEP3", 'wait': 4}] @@ -16,12 +22,22 @@ class B0wserProtocol(protocol.Protocol): report = reports.Report('b0wser', 'b0wser.yamlooni') def next_state(self): + """ + This is called once I have completed one step of the protocol and need + to proceed to the next step. + """ data = self.mutator.get_mutation(self.state) self.transport.write(data) self.state += 1 self.received_data = 0 def dataReceived(self, data): + """ + This is called every time some data is received. I transition to the + next step once the amount of data that I expect to receive is received. + + @param data: the data that has been sent by the client. + """ if len(self.steps) <= self.state: self.transport.loseConnection() return @@ -31,6 +47,17 @@ class B0wserProtocol(protocol.Protocol): self.next_state() def censorship_detected(self, report): + """ + I have detected the possible presence of censorship we need to write a + report on it. + + @param report: a dict containing the report to be written. Must contain + the keys 'reason', 'proto_state' and 'mutator_state'. + The reason is the reason for which the connection was + closed. The proto_state is the current state of the + protocol instance and mutator_state is what was being + mutated. + """ print "The connection was closed because of %s" % report['reason'] print "I may have matched the censorship fingerprint" print "State %s, Mutator %s" % (report['proto_state'], @@ -39,6 +66,10 @@ class B0wserProtocol(protocol.Protocol): def connectionLost(self, reason): + """ + The connection was closed. This may be because of a legittimate reason + or it may be because of a censorship event. + """ report = {'reason': reason, 'proto_state': self.state, 'mutator_state': self.mutator.state(), 'trigger': None} @@ -53,6 +84,14 @@ class B0wserProtocol(protocol.Protocol): self.censorship_detected(report) class B0wserServer(protocol.ServerFactory): + """ + This is the main class that deals with the b0wser 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 = B0wserProtocol mutations = {} def buildProtocol(self, addr):

1 0

[ooni-probe/master] Half working mutator thing
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 614e7b51762fb99018ab0022b275969c00684b31 Author: Arturo Filastò <hellais(a)torproject.org> Date: Tue Jul 10 19:37:04 2012 +0200 Half working mutator thing --- oonib/b0wser.py | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++ oonib/oonibackend.py | 4 ++ 2 files changed, 121 insertions(+), 0 deletions(-) diff --git a/oonib/b0wser.py b/oonib/b0wser.py new file mode 100644 index 0000000..072b4b9 --- /dev/null +++ b/oonib/b0wser.py @@ -0,0 +1,117 @@ +from twisted.internet import protocol + +class Mutator: + idx = 0 + step = 0 + state = 0 + waiting = False + waiting_step = 0 + + def __init__(self, steps): + self.steps = steps + + def next_mutation(self): + """ + Increases by one the mutation state. + + ex. (* is the mutation state, i.e. the byte to be mutated) + before [___*] [____] + step1 step2 + after [____] [*___] + """ + current_idx = self.idx + 1 + current_step = self.step + current_data = self.steps[c_step]['data'] + data_to_receive = self.steps[c_step]]['recv'] + + if self.waiting and self.waiting_step == data_to_receive: + self.waiting = False + self.waiting_step = 0 + + elif self.waiting: + self.waiting_step += 1 + + elif current_idx > len(current_data): + self.step += 1 + self.idx = 0 + self.waiting = True + + @classmethod + def mutate(data, idx): + """ + Mutate the idx bytes by increasing it's value by one + + @param data: the data to be mutated. + + @param idx: what byte should be mutated. + """ + ret = data[:idx-1] + ret += chr(ord(data[idx]) + 1) + ret += data[idx:] + return ret + + def get_mutation(self): + """ + returns the current packet to be sent to the wire. + If no mutation is necessary it will return the plain data. + """ + self.next_mutation() + if self.state != self.step or self.waiting: + return self.steps[self.state] + + data = self.steps[self.state] + return self.mutate(data, self.idx) + + def get_data(self, i): + """ + XXX remove this shit. + """ + j = 0 + pkt_size = len(self.steps[j]['data']) + while i > pkt_size: + j += 1 + pkt_size += len(self.steps[j]) + # I am not in a state to send mutations + if j != self.state: + return self.steps[j]['data'] + + rel_idx = i % (pkt_size - len(self.steps[j-1])) + data = self.steps[j] + data[rel_idx] = chr(ord(data[rel_idx]) + 1) + return data + +class B0wserProtocol(protocol.Protocol): + steps = [{'data': "STEP1", 'recv': 20}, + {'data': "STEP2", 'recv': 20}, + {'data': "STEP3", 'recv': 20}] + + mutator = None + state = 0 + received_data = 0 + + def next_state(self): + data = self.mutator.get_mutation() + self.transport.write(data) + self.mutator.state += 1 + self.received_data = 0 + + def dataReceived(self, data): + if len(self.steps) <= self.state: + self.transport.loseConnection() + return + self.received_data += len(data) + if self.received_data >= self.steps[self.state]['recv']: + print self.received_data + self.next_state() + +class B0wserServer(protocol.ServerFactory): + protocol = B0wserProtocol + mutations = {} + def buildProtocol(self, addr): + p = self.protocol() + p.factory = self + + if addr.host not in self.mutations: + self.mutations[addr.host] = Mutation(p.steps) + p.mutator = self.mutations[addr.host] + return p diff --git a/oonib/oonibackend.py b/oonib/oonibackend.py index fc5bbdb..4ae275e 100755 --- a/oonib/oonibackend.py +++ b/oonib/oonibackend.py @@ -18,6 +18,7 @@ from twisted.names import dns from oonib.httpbackend import HTTPBackend from oonib.dnsbackend import ProxyDNSServer +from oonib.b0wser import B0wserServer # This tells twisted to set the server.version = "Apache" @@ -32,3 +33,6 @@ internet.TCPServer(8002, TCPDNSServer).setServiceParent(serviceCollection) UDPFactory = dns.DNSDatagramProtocol(TCPDNSServer) internet.UDPServer(5354, UDPFactory).setServiceParent(serviceCollection) +# Start the ooni backend thing +b0wser = B0wserServer() +internet.TCPServer(9666, b0wser).setServiceParent(serviceCollection)

1 0

[ooni-probe/master] Fix tcpconnect because we were not passing the main reactor to tests
by art＠torproject.org 11 Jul '12

11 Jul '12

commit 41f44d22174b301ca4c896f2891267ef2cdc7797 Author: Arturo Filastò <hellais(a)torproject.org> Date: Wed Jul 11 15:51:54 2012 +0200 Fix tcpconnect because we were not passing the main reactor to tests Closes #6372 --- ooni/ooniprobe.py | 4 ++-- ooni/plugoo/work.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ooni/ooniprobe.py b/ooni/ooniprobe.py index 261eb74..d6de6a6 100755 --- a/ooni/ooniprobe.py +++ b/ooni/ooniprobe.py @@ -56,7 +56,7 @@ def retrieve_plugoo(): plugoo = retrieve_plugoo() -def runTest(test, options, global_options, reactor=None): +def runTest(test, options, global_options, reactor=reactor): """ Run an OONI probe test by name. @@ -68,7 +68,7 @@ def runTest(test, options, global_options, reactor=None): @param global_options: the global options for OONI """ parallelism = int(global_options['parallelism']) - worker = work.Worker(parallelism) + worker = work.Worker(parallelism, reactor=reactor) test_class = plugoo[test].__class__ report = reports.Report(test, global_options['output']) diff --git a/ooni/plugoo/work.py b/ooni/plugoo/work.py index a8b6595..6106456 100644 --- a/ooni/plugoo/work.py +++ b/ooni/plugoo/work.py @@ -24,11 +24,12 @@ class Worker(object): This is the core of OONI. It takes as input Work Units and runs them concurrently. """ - def __init__(self, maxconcurrent=10): + def __init__(self, maxconcurrent=10, reactor=reactor): """ @param maxconcurrent: how many test instances should be run concurrently. """ + self.reactor = reactor self.maxconcurrent = maxconcurrent self._running = 0 self._queued = [] @@ -54,7 +55,7 @@ class Worker(object): r.trap() if self._running == 0 and not self._queued: - reactor.stop() + self.reactor.stop() return r

1 0

[vidalia/alpha] Update changelog date
by chiiph＠torproject.org 11 Jul '12

11 Jul '12

commit 1da9389ceae78ad48ff3f43ed61af8ec39f0ec91 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jul 10 20:16:46 2012 -0300 Update changelog date --- CHANGELOG | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index be1235b..39abc08 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.3.3 09-Jul-12 +0.3.3 10-Jul-12 New features: o Added plugin prototype for Torrc class. This allows plugins to modify the .torrc configuration file.

1 0

[vidalia/master] Bump version to 0.2.20 and update changelog date
by chiiph＠torproject.org 11 Jul '12

11 Jul '12

commit 66a531f01a1149069b3e2f21952744928de7997f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Jul 10 20:28:51 2012 -0300 Bump version to 0.2.20 and update changelog date --- CHANGELOG | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 942c027..f485707 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -0.2.20 09-Jul-2012 +0.2.20 10-Jul-2012 o Append router status information if Tor is using microdescriptors. o Display paths with their native separators. Resolves ticket 4337. o Do not ignore the Show on Startup checkbox. Fixes bug 5351. diff --git a/CMakeLists.txt b/CMakeLists.txt index e58ee6a..2135867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(VER_MAJOR "0") set(VER_MINOR "2") set(VER_PATCH "20") -set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-git") +set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}") message(STATUS "Configuring Vidalia ${VERSION}") project(Vidalia)

1 0

← Newer
1
...
61
62
63
64
65
66
67
...
95
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2012