August 2011 - tor-commits - lists.torproject.org

[torbrowser/master] stop calling the install-betteprivacy target in makefiles too
by erinn＠torproject.org 20 Aug '11

20 Aug '11

commit 57bd70de17606df28526ad9524f22f64849f66af Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 20:31:12 2011 +0200 stop calling the install-betteprivacy target in makefiles too --- build-scripts/linux.mk | 2 +- build-scripts/osx.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index d725dd0..deba909 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -449,7 +449,7 @@ compressed-bundle_%: LANGCODE=$* make -f linux.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f linux.mk copy-files_$* install-extensions install-betterprivacy install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref + make -f linux.mk copy-files_$* install-extensions install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk index f4a25e1..d101ec1 100644 --- a/build-scripts/osx.mk +++ b/build-scripts/osx.mk @@ -443,7 +443,7 @@ bundle_%: compressed-bundle_%: LANGCODE=$* make -f osx.mk compressed-bundle-localized bundle-localized_%.stamp: - make -f osx.mk copy-files_$* install-extensions install-betterprivacy install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final + make -f osx.mk copy-files_$* install-extensions install-httpseverywhere install-noscript install-lang-extensions patch-vidalia-language patch-firefox-language patch-pidgin-language update-extension-pref final touch bundle-localized_$*.stamp bundle-localized: bundle-localized_$(LANGCODE).stamp

1 0

[torouter/master] Fix mistypo
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 338d496dfeeacbe4d8b277f2c5866ffa51612e40 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:43:31 2011 +0200 Fix mistypo --- packages/torouter-web/src/tui/utils/parsing.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index d6aaf2b..b4dbaee 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -79,7 +79,7 @@ class interfaces: return output def output(self, data): - output = "iface %s" % data['iface'] + output = "iface %s\n" % data['iface'] for item in data.items(): if item[0] != "iface": if type(item[1]) is list: @@ -94,7 +94,7 @@ class interfaces: for entry in self.wifi['post-up']: if re.search("sys_cfg_ssid", entry): print essid - self.wifi['post-up'][i] = 'post-up /usr/bin/uaputl sys_cfg_ssid "' + essid + '"' + self.wifi['post-up'][i] = '/usr/bin/uaputl sys_cfg_ssid "' + essid + '"' i += 1 # XXX currently works for one pre-up entry, must make it work also for arrays

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit b67bbdcbf32737a30da937b9e995195fddf75903 Merge: 338d496 18ce925 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:43:50 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/src/torouter_config.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

1 0

[torouter/master] add other marvel package
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit f76a57a4534722c7facb0432b4ee49e0030c7d1a Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 17:15:15 2011 +0200 add other marvel package --- packages/torouter-prep/src/torouter_config.sh | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/packages/torouter-prep/src/torouter_config.sh b/packages/torouter-prep/src/torouter_config.sh index 12f7ab3..deaa72b 100644 --- a/packages/torouter-prep/src/torouter_config.sh +++ b/packages/torouter-prep/src/torouter_config.sh @@ -43,6 +43,7 @@ apt-get -y remove exim4-base exim4-config exim4-daemon-light dbus # Install the weird wireless control for the DreamPlug apt-get install -y -t sid uaputl +apt-get install -y -t sid uapevent # Install some other packages here: apt-get -y install denyhosts ufw

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by ioerror＠torproject.org 19 Aug '11

19 Aug '11

commit 18ce925004eb3030b91c01beda43a58017607103 Merge: f76a57a fe239d1 Author: Jacob Appelbaum <jacob(a)appelbaum.net> Date: Fri Aug 19 17:25:35 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-web/src/tui/config.py | 5 +- .../torouter-web/src/tui/controllers/network.py | 12 +++++- packages/torouter-web/src/tui/controllers/tor.py | 13 ++++-- .../torouter-web/src/tui/utils/configuration.py | 41 +++++++++++++++----- packages/torouter-web/src/tui/utils/fileio.py | 8 ++-- packages/torouter-web/src/tui/utils/parsing.py | 38 ++++++++++++++++-- 6 files changed, 90 insertions(+), 27 deletions(-)

1 0

[torouter/master] Use correct tmp filenames and paths
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit fe239d1d9e8a590798abc31cd7bf7cf11324cfd5 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:33:58 2011 +0200 Use correct tmp filenames and paths --- packages/torouter-web/src/tui/config.py | 5 +++-- packages/torouter-web/src/tui/utils/fileio.py | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/torouter-web/src/tui/config.py b/packages/torouter-web/src/tui/config.py index f3f8dcc..73087f2 100644 --- a/packages/torouter-web/src/tui/config.py +++ b/packages/torouter-web/src/tui/config.py @@ -11,7 +11,8 @@ globals = {} # Add your own (username, password) pair authinfo = ("test", "test") -interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" +#interfaces_file = os.getcwd() + "/../../torouter-prep/configs/interfaces" #torrc_file = os.getcwd() + "/../../torouter-prep/configs/torrc" -torrc_file = "/tmp/torrc" +torrc_file = "/var/tmp/tor-tui/torrc" +interfaces_file = "/var/tmp/tor-tui/interfaces" diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index 5b88504..c6574b7 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -1,12 +1,12 @@ import os def write(files): - tmp_dir = "/var/tmp/tor-tui" + tmp_dir = "/var/tmp/tor-tui/" tmpfiles = [] for file in files: if not os.path.exists(tmp_dir): os.mkdir(tmp_dir) - tmpfile = tmp_dir + file[0].split("/")[-1:][0] + ".tmp" + tmpfile = tmp_dir + file[0].split("/")[-1:][0] tmpfiles.append((tmpfile,file[0])) # open the tmp file for write f = open(tmpfile, 'w')

1 0

[torouter/master] Allow writing to network/interfaces file for wireless network settings
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 0fb54f161f5344f5a7e764801e202337b6d0e451 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:27:01 2011 +0200 Allow writing to network/interfaces file for wireless network settings --- .../torouter-web/src/tui/controllers/network.py | 12 +++++- .../torouter-web/src/tui/utils/configuration.py | 41 +++++++++++++++----- packages/torouter-web/src/tui/utils/fileio.py | 4 +- packages/torouter-web/src/tui/utils/parsing.py | 38 ++++++++++++++++-- 4 files changed, 77 insertions(+), 18 deletions(-) diff --git a/packages/torouter-web/src/tui/controllers/network.py b/packages/torouter-web/src/tui/controllers/network.py index bf48f54..690dc3f 100644 --- a/packages/torouter-web/src/tui/controllers/network.py +++ b/packages/torouter-web/src/tui/controllers/network.py @@ -2,7 +2,7 @@ import web from tui import config from tui import view from tui.view import render -from tui.utils import session,configuration,parsing +from tui.utils import session, configuration, parsing, fileio """ This function is used to generate the network @@ -75,6 +75,16 @@ Wireless network configuration page class wireless: # XXX do all the backend stuff def update_config(self, data): + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + itfc.set_ssid(data.essid) + itfc.set_mac(data.mac) + itfc.wifi['netmask'] = data.netmask + itfc.wifi['address'] = data.address + filecontent = itfc.exclude_output("uap0") + itfc.output(itfc.wifi) + files = [('/etc/network/interfaces', filecontent)] + fileio.write(files) + #print itfc.output(itfc.wifi) return True def GET(self): diff --git a/packages/torouter-web/src/tui/utils/configuration.py b/packages/torouter-web/src/tui/utils/configuration.py index 7133443..336aa54 100644 --- a/packages/torouter-web/src/tui/utils/configuration.py +++ b/packages/torouter-web/src/tui/utils/configuration.py @@ -1,15 +1,32 @@ import web +import re +from tui.utils import parsing from tui import config def get(name): conf = {} - # XXX The content of these functions are just - # skeletons + itfc = parsing.interfaces(config.interfaces_file) + itfc.parse() + if name == "wireless": - conf['essid'] = "Torouter" - conf['encryption'] = "WPA2" - conf['mac'] = "00:66:66:66:66:66" - conf['key'] = "ljdasjkbcuBH12389Ba" + conf['essid'] = "tor" + conf['mac'] = "00:11:22:33:44:55" + for entry in itfc.wifi['post-up']: + if re.search("sys_cfg_ssid", entry): + conf['essid'] = entry.split(" ")[2].split("\"")[1] + + if type(itfc.wifi['pre-up']) is str: + conf['mac'] = itfc.wifi['pre-up'].split(" ")[4] + else: + for entry in itfc.wifi['pre-up']: + if re.search("ether", entry): + print "hahah" + conf['mac'] = entry.split(" ")[4] + + conf['netmask'] = itfc.wifi['netmask'] + conf['address'] = itfc.wifi['address'] + conf['encryption'] = "open" + conf['key'] = "" return conf elif name == "firewall": conf['el1'] = "Element 1" @@ -43,13 +60,17 @@ def get_form(name): c = get(name) return web.form.Form( web.form.Textbox(name='essid', - description='Wireless ESSID', value=c['essid']), + description='ESSID', value=c['essid']), web.form.Textbox(name='mac', - description='Wireless MAC address', value=c['mac']), + description='MAC address', value=c['mac']), + web.form.Textbox(name='address', + description='IP address', value=c['address']), + web.form.Textbox(name='netmask', + description='Netmask address', value=c['netmask']), web.form.Dropdown(name='enctype', args=['WPA2', 'WPA', 'WEP (not reccomended)', 'open'], - description='Wireless encryption scheme', value=c['encryption']), + description='Encryption scheme', value=c['encryption']), web.form.Password(name='key', - description='key', value=c['key']), + description='Key', value=c['key']), web.form.Button('save') ) elif name == "firewall": diff --git a/packages/torouter-web/src/tui/utils/fileio.py b/packages/torouter-web/src/tui/utils/fileio.py index 0675f3f..5b88504 100644 --- a/packages/torouter-web/src/tui/utils/fileio.py +++ b/packages/torouter-web/src/tui/utils/fileio.py @@ -15,8 +15,8 @@ def write(files): f.close() # rename all the file. This operation is atomic - for file in tmpfiles: - os.rename(file[0], file[1]) + #for file in tmpfiles: + # os.rename(file[0], file[1]) # for testing #files = [('/tmp/file1','blablbal'),('/tmp/file2','The content'),('/tmp/file3','The content 3')] diff --git a/packages/torouter-web/src/tui/utils/parsing.py b/packages/torouter-web/src/tui/utils/parsing.py index daf4436..d6aaf2b 100644 --- a/packages/torouter-web/src/tui/utils/parsing.py +++ b/packages/torouter-web/src/tui/utils/parsing.py @@ -1,15 +1,29 @@ # These functions are for parsing /etc/network/interface # files, they will be used inside torouter to visualize # and edit configuration -import os +import os, re class interfaces: def __init__(self,filename): + self.filename = filename self.fp = open(filename, "r") self.wifi = {} self.eth1 = {} self.eth0 = {} - + + def exclude_output(self, iexclude): + iface = None + output = "" + self.fp = open(self.filename, "r") + for line in self.fp.readlines(): + if line.lstrip().startswith("iface"): + iface = line.split(" ")[1] + if iface == iexclude: + continue + else: + output += line + return output + def parse_line(self, line, iface): name = line.split(" ")[0] values = " ".join(line.split(" ")[1:]).rstrip() @@ -65,14 +79,28 @@ class interfaces: return output def output(self, data): - print "iface %s" % data['iface'] + output = "iface %s" % data['iface'] for item in data.items(): if item[0] != "iface": if type(item[1]) is list: for i in item[1]: - print "%s %s" % (item[0], i) + output += item[0] + " " + i + "\n" else: - print "%s %s" % (item[0],item[1]) + output += item[0] + " " + item[1] + "\n" + return output + + def set_ssid(self, essid): + i = 0 + for entry in self.wifi['post-up']: + if re.search("sys_cfg_ssid", entry): + print essid + self.wifi['post-up'][i] = 'post-up /usr/bin/uaputl sys_cfg_ssid "' + essid + '"' + i += 1 + + # XXX currently works for one pre-up entry, must make it work also for arrays + def set_mac(self, mac): + self.wifi['pre-up'] = 'ifconfig uap0 hw ether ' + mac + class torrc: def __init__(self,filename):

1 0

[torouter/master] Fix XSRF
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 107256ba90d51bd5c981cf0b167f68c8f64d652c Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 16:03:50 2011 +0200 Fix XSRF --- packages/torouter-web/src/tui/controllers/tor.py | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/torouter-web/src/tui/controllers/tor.py b/packages/torouter-web/src/tui/controllers/tor.py index bc66623..491c6b7 100644 --- a/packages/torouter-web/src/tui/controllers/tor.py +++ b/packages/torouter-web/src/tui/controllers/tor.py @@ -37,10 +37,13 @@ class torrc: return render.base(render.torconfig(output)) def POST(self): - self.update_config(web.input()) - trc = parsing.torrc(config.torrc_file) - trc.parse() - output = trc.html_output() - return render.base(render.torstatus(output,config.torrc_file)) + if session.is_logged() > 0: + self.update_config(web.input()) + trc = parsing.torrc(config.torrc_file) + trc.parse() + output = trc.html_output() + return render.base(render.torstatus(output,config.torrc_file)) + else: + return render.base(render.login())

1 0

[torouter/master] Merge branch 'master' of ssh://git-rw.torproject.org/torouter
by hellais＠torproject.org 19 Aug '11

19 Aug '11

commit 73b830c7244046c4d1a9b32004a6ec18afd99d92 Merge: 0fb54f1 5e40918 Author: Arturo Filastò <hellais(a)torproject.org> Date: Fri Aug 19 17:27:47 2011 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/torouter packages/torouter-prep/configs/sources.list | 5 +++-- packages/torouter-prep/configs/torrc | 9 ++++----- packages/torouter-prep/src/torouter_config.sh | 6 ++++++ 3 files changed, 13 insertions(+), 7 deletions(-)

1 0

[torbrowser/master] bump tbb linux to 1.1.13-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too
by erinn＠torproject.org 19 Aug '11

19 Aug '11

commit 1f6f8323165c1f1834855e9f0dae3d5447a1f2aa Author: Erinn Clark <erinn(a)torproject.org> Date: Fri Aug 19 15:46:53 2011 +0200 bump tbb linux to 1.1.13-dev, update tor to 0.2.2.31-rc, vidalia to 0.2.13, firefox to 3.6.20, libevent to 2.0.13-stable, remove betterprivacy, and update noscript and https-everywhere too --- README.Linux | 23 ++++++++++++++++------- build-scripts/linux.mk | 14 +++++++------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/README.Linux b/README.Linux index b5325b1..9dbee53 100644 --- a/README.Linux +++ b/README.Linux @@ -4,13 +4,12 @@ Tor Browser Bundle for GNU/Linux Included applications --------------------- -Vidalia 0.2.12 (with Qt 4.6.2) -Tor 0.2.2.30-rc (with libevent-2.0.12-stable, zlib-1.2.5 and openssl-0.9.8p) -Firefox 3.6.19 +Vidalia 0.2.13 (with Qt 4.6.2) +Tor 0.2.2.31-rc (with libevent-2.0.13-stable, zlib-1.2.5 and openssl-0.9.8p) +Firefox 3.6.20 \_ Torbutton 1.2.5 - |_ NoScript 2.1.1.2 - |_ BetterPrivacy 1.51 - |_ HTTPS Everywhere 1.0.0development.4 + |_ NoScript 2.1.2.6 + |_ HTTPS Everywhere 1.0.0development.5 Usage ----- @@ -29,9 +28,19 @@ To exit, close Firefox. Vidalia will automatically clean up and exit. Changelog --------- +1.1.13: Released 2011-08-19 + Update Tor to 0.2.2.31-rc + Update Vidalia to 0.2.13 + Update Firefox to 3.6.20 + Update Libevent to 2.0.13-stable + Update NoScript to 2.1.2.6 + Update HTTPS-Everywhere to 1.0.0development.5 + Remove BetterPrivacy until we can figure out how to make it safe in all + bundles (see #3597) + 1.1.12: Released 2011-07-13 Update Tor to 0.2.2.30-rc - Update Firefox to 3.6.1999999999 + Update Firefox to 3.6.19 Update NoScript to 2.1.1.2 Update HTTPS-Everywhere to 1.0.0development.4 diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk index aa5c919..e007388 100644 --- a/build-scripts/linux.mk +++ b/build-scripts/linux.mk @@ -41,19 +41,19 @@ BUILT_DIR=$(FETCH_DIR)/built TBB_FINAL=$(BUILT_DIR)/TBBL ## Versions for our source packages -HTTPSEVERY_VER=1.0.0development.4 -FIREFOX_VER=3.6.19 -LIBEVENT_VER=2.0.12-stable +HTTPSEVERY_VER=1.0.0development.5 +FIREFOX_VER=3.6.20 +LIBEVENT_VER=2.0.13-stable LIBPNG_VER=1.4.3 -NOSCRIPT_VER=2.1.1.2 +NOSCRIPT_VER=2.1.2.6 OPENSSL_VER=0.9.8p OTR_VER=3.2.0 PIDGIN_VER=2.6.4 POLIPO_VER=1.0.4.1 QT_VER=4.6.2 -TOR_VER=0.2.2.30-rc +TOR_VER=0.2.2.31-rc TORBUTTON_VER=1.2.5 -VIDALIA_VER=0.2.12 +VIDALIA_VER=0.2.13 ZLIB_VER=1.2.5 ## Extension IDs @@ -216,7 +216,7 @@ NAME=tor-browser DISTDIR=tbbl-dist ## Version and name of the compressed bundle (also used for source) -VERSION=1.1.12-dev +VERSION=1.1.13-dev DEFAULT_COMPRESSED_BASENAME=tor-browser-gnu-linux-$(ARCH_TYPE)-$(VERSION)- IM_COMPRESSED_BASENAME=tor-im-browser-gnu-linux-$(VERSION)- DEFAULT_COMPRESSED_NAME=$(DEFAULT_COMPRESSED_BASENAME)$(VERSION)

1 0