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

[torbrowser/maint-2.2] bump libpng to 1.5.12
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit 70654cc58f4ac52163b9b04ec73bf01a901d2669 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 18 17:33:52 2012 +0100 bump libpng to 1.5.12 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 0563102..2b3e508 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.2.37 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c -LIBPNG_VER=1.5.11 +LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable

1 0

[torbrowser/maint-2.2] bump all stable tbbs to 2.2.37-2
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit e46b9c9a0824dc84f3630d594d2fc7a65ccbd2ae Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 20 15:11:33 2012 +0100 bump all stable tbbs to 2.2.37-2 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 12 ++++++++++++ 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 5a07687..0eae006 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index e3562fa..05ee1e2 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 450ac84..8a8b69b 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c8db556..507b873 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.37-2); suite=linux + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + * Disable Firefox crashreporter + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:13 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=linux * Update Tor to 0.2.2.37 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 932ac47..68e5c09 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.37-2); suite=osx + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:11 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=osx * Update Tor to 0.2.2.37 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 1c16910..37653b6 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.37-2); suite=windows + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + * Disable Firefox crashreporter + * Updated Firefox patches: + - Fix Firefox transparency problems with Aero theme on Windows (closes: + #4795) + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:16 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=windows * Update Tor to 0.2.2.37

1 0

[torbrowser/maint-2.3] bump libpng to 1.5.12
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit 70654cc58f4ac52163b9b04ec73bf01a901d2669 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 18 17:33:52 2012 +0100 bump libpng to 1.5.12 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 0563102..2b3e508 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.2.37 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c -LIBPNG_VER=1.5.11 +LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable

1 0

[torbrowser/maint-2.3] bump all stable tbbs to 2.2.37-2
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit e46b9c9a0824dc84f3630d594d2fc7a65ccbd2ae Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 20 15:11:33 2012 +0100 bump all stable tbbs to 2.2.37-2 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 12 ++++++++++++ 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 5a07687..0eae006 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index e3562fa..05ee1e2 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 450ac84..8a8b69b 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c8db556..507b873 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.37-2); suite=linux + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + * Disable Firefox crashreporter + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:13 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=linux * Update Tor to 0.2.2.37 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 932ac47..68e5c09 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.37-2); suite=osx + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:11 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=osx * Update Tor to 0.2.2.37 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 1c16910..37653b6 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.37-2); suite=windows + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + * Disable Firefox crashreporter + * Updated Firefox patches: + - Fix Firefox transparency problems with Aero theme on Windows (closes: + #4795) + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:16 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=windows * Update Tor to 0.2.2.37

1 0

[torbrowser/maint-2.3] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit ed7f332c4dc8f083b61f4834217bfbfe0e5396c2 Merge: 97b8d22 e46b9c9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 20 15:11:49 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/versions.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 12 ++++++++++++ 7 files changed, 39 insertions(+), 10 deletions(-)

1 0

[torbrowser/master] bump all stable tbbs to 2.2.37-2
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit e46b9c9a0824dc84f3630d594d2fc7a65ccbd2ae Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 20 15:11:33 2012 +0100 bump all stable tbbs to 2.2.37-2 --- README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 12 ++++++++++++ 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/README.LINUX-2.2 b/README.LINUX-2.2 index 5a07687..0eae006 100644 --- a/README.LINUX-2.2 +++ b/README.LINUX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.OSX-2.2 b/README.OSX-2.2 index e3562fa..05ee1e2 100644 --- a/README.OSX-2.2 +++ b/README.OSX-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Mac OS X Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/README.WIN-2.2 b/README.WIN-2.2 index 450ac84..8a8b69b 100644 --- a/README.WIN-2.2 +++ b/README.WIN-2.2 @@ -4,11 +4,11 @@ Tor Browser Bundle for Windows Included applications --------------------- -Vidalia 0.2.19 (with Qt 4.8.1) +Vidalia 0.2.20 (with Qt 4.8.1) Tor 0.2.2.37 (with libevent-2.0.19-stable, zlib-1.2.7 and openssl-1.0.1c) -Firefox 10.0.5esr +Firefox 10.0.6esr \_ Torbutton 1.4.6 - |_ NoScript 2.4.4 + |_ NoScript 2.4.8 |_ HTTPS-Everywhere 2.0.5 Usage diff --git a/changelog.linux-2.2 b/changelog.linux-2.2 index c8db556..507b873 100644 --- a/changelog.linux-2.2 +++ b/changelog.linux-2.2 @@ -1,3 +1,12 @@ +Tor Browser Bundle (2.2.37-2); suite=linux + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + * Disable Firefox crashreporter + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:13 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=linux * Update Tor to 0.2.2.37 diff --git a/changelog.osx-2.2 b/changelog.osx-2.2 index 932ac47..68e5c09 100644 --- a/changelog.osx-2.2 +++ b/changelog.osx-2.2 @@ -1,3 +1,11 @@ +Tor Browser Bundle (2.2.37-2); suite=osx + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:11 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=osx * Update Tor to 0.2.2.37 diff --git a/changelog.windows-2.2 b/changelog.windows-2.2 index 1c16910..37653b6 100644 --- a/changelog.windows-2.2 +++ b/changelog.windows-2.2 @@ -1,3 +1,15 @@ +Tor Browser Bundle (2.2.37-2); suite=windows + + * Update Firefox to 10.0.6esr + * Update Vidalia to 0.2.20 + * Update NoScript to 2.4.8 + * Disable Firefox crashreporter + * Updated Firefox patches: + - Fix Firefox transparency problems with Aero theme on Windows (closes: + #4795) + + -- Erinn Clark <erinn(a)torproject.org> Wed Jul 18 17:34:16 BST 2012 + Tor Browser Bundle (2.2.37-1); suite=windows * Update Tor to 0.2.2.37

1 0

[torbrowser/master] bump libpng to 1.5.12
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit 70654cc58f4ac52163b9b04ec73bf01a901d2669 Author: Erinn Clark <erinn(a)torproject.org> Date: Wed Jul 18 17:33:52 2012 +0100 bump libpng to 1.5.12 --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 0563102..2b3e508 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -4,7 +4,7 @@ RELEASE_VER=2.2.37 ZLIB_VER=1.2.7 OPENSSL_VER=1.0.1c -LIBPNG_VER=1.5.11 +LIBPNG_VER=1.5.12 QT_VER=4.8.1 VIDALIA_VER=0.2.20 LIBEVENT_VER=2.0.19-stable

1 0

[torbrowser/master] Merge branch 'maint-2.2' into maint-2.3
by erinn＠torproject.org 20 Jul '12

20 Jul '12

commit ed7f332c4dc8f083b61f4834217bfbfe0e5396c2 Merge: 97b8d22 e46b9c9 Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Jul 20 15:11:49 2012 +0100 Merge branch 'maint-2.2' into maint-2.3 README.LINUX-2.2 | 6 +++--- README.OSX-2.2 | 6 +++--- README.WIN-2.2 | 6 +++--- build-scripts/versions.mk | 2 +- changelog.linux-2.2 | 9 +++++++++ changelog.osx-2.2 | 8 ++++++++ changelog.windows-2.2 | 12 ++++++++++++ 7 files changed, 39 insertions(+), 10 deletions(-)

1 0

[ooni-probe/master] Merge branch 'b0wser_pcap_parse' into b0wserclient
by art＠torproject.org 20 Jul '12

20 Jul '12

commit 13295622691f8aabcfcb49104388be3b6d1c3176 Merge: 6d58815 b9b80c4 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Jul 13 16:41:20 2012 +0200 Merge branch 'b0wser_pcap_parse' into b0wserclient ooni/protocols/b0wser.py | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 61 insertions(+), 0 deletions(-)

1 0

[ooni-probe/master] Refactor code and write minimal client implementation
by art＠torproject.org 20 Jul '12

20 Jul '12

commit 6d588153f83b43fd1ca4b592816f37abc5f8bea8 Author: Arturo Filastò <hellais(a)torproject.org> Date: Thu Jul 12 18:30:18 2012 +0200 Refactor code and write minimal client implementation --- ooni/protocols/b0wser.py | 84 ++++++++++++++++++++++++++++++++++++++++++++++ oonib/b0wser.py | 81 +------------------------------------------- 2 files changed, 85 insertions(+), 80 deletions(-) diff --git a/ooni/protocols/b0wser.py b/ooni/protocols/b0wser.py index ae6b002..e0a3a56 100644 --- a/ooni/protocols/b0wser.py +++ b/ooni/protocols/b0wser.py @@ -102,3 +102,87 @@ class Mutator: print "Mutating %s with idx %s" % (data, self.idx) return self._mutate(data, self.idx) +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}] + mutator = None + + state = 0 + total_states = len(steps) - 1 + received_data = 0 + 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: + print "I have reached the end of the state machine" + print "Censorship fingerprint bruteforced!" + report = {'mutator_state': self.mutator.state()} + self.report(report) + self.transport.loseConnection() + return + self.received_data += len(data) + if self.received_data >= self.steps[self.state]['wait']: + print "Moving to next state %s" % self.state + 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 "State %s, Mutator %s" % (report['proto_state'], + report['mutator_state']) + self.mutator.next_mutation() + + + + 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} + + 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) + + diff --git a/oonib/b0wser.py b/oonib/b0wser.py index 4b01cc7..33501de 100644 --- a/oonib/b0wser.py +++ b/oonib/b0wser.py @@ -2,86 +2,7 @@ from twisted.internet import protocol from twisted.internet.error import ConnectionDone 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}] - mutator = None - - state = 0 - total_states = len(steps) - 1 - received_data = 0 - 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 - self.received_data += len(data) - if self.received_data >= self.steps[self.state]['wait']: - print "Moving to next state %s" % self.state - 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'], - report['mutator_state']) - self.report(report) - - - 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} - - 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) +from ooni.protocols.b0wser import Mutator, B0wserProtocol class B0wserServer(protocol.ServerFactory): """

1 0