X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=torbrowser-launcher;h=c743692e34ca10fd06dcb998f0b85968e221a5ff;hb=0fc1153f8a5affcc6834c36ec71894dcb758e5b0;hp=502a92c454f80141807b956bed6e760194d40cd0;hpb=bee3e0ed4614300bca0d0a60181ea18298245515;p=torbrowser-launcher.git diff --git a/torbrowser-launcher b/torbrowser-launcher index 502a92c..c743692 100755 --- a/torbrowser-launcher +++ b/torbrowser-launcher @@ -1,4 +1,31 @@ #!/usr/bin/env python +""" +Tor Browser Launcher +https://github.com/micahflee/torbrowser-launcher/ + +Copyright (c) 2013 Micah Lee + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. +""" import gettext gettext.install('torbrowser-launcher', '/usr/share/torbrowser-launcher/locale') @@ -35,120 +62,34 @@ class VerifyTorProjectCert(ClientContextFactory): def verifyHostname(self, connection, cert, errno, depth, preverifyOK): return cert.digest('sha256') == self.torproject_ca.digest('sha256') +class TBLCommon: -class TorBrowserLauncher: - def __init__(self): + def __init__(self, tbl_version): + print _('Initializing Tor Browser Launcher') + self.tbl_version = tbl_version + # initialize the app - self.set_gui(None, '', []) self.discover_arch_lang() self.build_paths() - self.mkdir(self.paths['dir']['download']) - self.mkdir(self.paths['dir']['tbb']) + self.mkdir(self.paths['data_dir']) + self.load_settings() + self.mkdir(self.paths['download_dir']) + self.mkdir(self.paths['tbb'][self.settings['preferred']]['dir']) self.init_gnupg() + self.available_versions = { + 'tbb_stable': _('Tor Browser Bundle - stable'), + 'tbb_alpha': _('Tor Browser Bundle - alpha'), + 'obs_tbb': _('Obsfproxy Tor Browser Bundle') + } + # allow buttons to have icons try: - settings = gtk.settings_get_default() - settings.props.gtk_button_images = True + gtk_settings = gtk.settings_get_default() + gtk_settings.props.gtk_button_images = True except: pass - self.launch_gui = True - - # if we haven't already hit an error - if self.gui != 'error': - # load settings - if self.load_settings(): - self.build_paths(self.settings['latest_version']) - - # is tbb already running and we just need to open a new firefox? - if self.settings['installed_version']: - vidalia_pid = None - firefox_pid = None - for p in psutil.process_iter(): - try: - if p.exe == self.paths['file']['vidalia_bin']: - vidalia_pid = p.exe - if p.exe == self.paths['file']['firefox_bin']: - firefox_pid = p.exe - except: - pass - - if vidalia_pid and not firefox_pid: - print _('Vidalia is already open, but firefox is closed. Launching new firefox.') - subprocess.Popen([self.paths['file']['firefox_bin'], '-no-remote', '-profile', self.paths['file']['firefox_profile']]) - return - - # how long was it since the last update check? - # 86400 seconds = 24 hours - current_timestamp = int(time.time()) - if current_timestamp - self.settings['last_update_check_timestamp'] >= 86400: - # check for update - print 'Checking for update' - self.set_gui('task', _("Checking for Tor Browser update."), - ['download_update_check', - 'attempt_update']) - - else: - # no need to check for update - print _('Checked for update within 24 hours, skipping') - self.start_launcher() - - else: - self.set_gui('error', _("Error loading settings. Delete ~/.torbrowser and try again."), []) - - if self.launch_gui: - # set up the window - self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) - self.window.set_title(_("Tor Browser")) - self.window.set_icon_from_file(self.paths['file']['icon']) - self.window.set_position(gtk.WIN_POS_CENTER) - self.window.set_border_width(10) - self.window.connect("delete_event", self.delete_event) - self.window.connect("destroy", self.destroy) - - # build the rest of the UI - self.build_ui() - - # download or run TBB - def start_launcher(self): - # is TBB already installed? - if os.path.isfile(self.paths['file']['start']) and os.access(self.paths['file']['start'], os.X_OK): - if self.settings['installed_version'] == self.settings['latest_version']: - # current version of tbb is installed, launch it - self.run(False) - self.launch_gui = False - elif self.settings['installed_version'] < self.settings['latest_version']: - # there is a tbb upgrade available - self.set_gui('task', _("Your Tor Browser is out of date."), - ['download_tarball', - 'download_tarball_sig', - 'verify', - 'extract', - 'run']) - else: - # for some reason the installed tbb is newer than the current version? - self.set_gui('error', _("Something is wrong. The version of Tor Browser Bundle you have installed is newer than the current version?"), []) - - # not installed - else: - # are the tarball and sig already downloaded? - if os.path.isfile(self.paths['file']['tarball']) and os.path.isfile(self.paths['file']['tarball_sig']): - # start the gui with verify - self.set_gui('task', _("Installing Tor Browser."), - ['verify', - 'extract', - 'run']) - - # first run - else: - self.set_gui('task', _("Downloading and installing Tor Browser."), - ['download_tarball', - 'download_tarball_sig', - 'verify', - 'extract', - 'run']) - # discover the architecture and language def discover_arch_lang(self): # figure out the architecture @@ -189,38 +130,50 @@ class TorBrowserLauncher: if tbb_version: tarball_filename = 'tor-browser-gnu-linux-'+self.architecture+'-'+tbb_version+'-dev-'+self.language+'.tar.gz' - self.paths['file']['tarball'] = tbb_data+'/download/'+tarball_filename - self.paths['file']['tarball_sig'] = tbb_data+'/download/'+tarball_filename+'.asc' - self.paths['url']['tarball'] = 'https://www.torproject.org/dist/torbrowser/linux/'+tarball_filename - self.paths['url']['tarball_sig'] = 'https://www.torproject.org/dist/torbrowser/linux/'+tarball_filename+'.asc' - self.paths['filename']['tarball'] = tarball_filename - self.paths['filename']['tarball_sig'] = tarball_filename+'.asc' + self.paths['tarball_file'] = tbb_data+'/download/'+tarball_filename + self.paths['tarball_sig_file'] = tbb_data+'/download/'+tarball_filename+'.asc' + self.paths['tarball_url'] = 'https://www.torproject.org/dist/torbrowser/linux/'+tarball_filename + self.paths['tarball_sig_url'] = 'https://www.torproject.org/dist/torbrowser/linux/'+tarball_filename+'.asc' + self.paths['tarball_filename'] = tarball_filename + self.paths['tarball_sig_filename'] = tarball_filename+'.asc' else: self.paths = { - 'dir': { - 'data': tbb_data, - 'download': tbb_data+'/download', - 'tbb': tbb_data+'/tbb/'+self.architecture, - 'gnupg_homedir': tbb_data+'/gnupg_homedir' - }, - 'file': { - 'settings': tbb_data+'/settings', - 'version': tbb_data+'/version', - 'start': tbb_data+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser', - 'vidalia_bin': tbb_data+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/App/vidalia', - 'firefox_bin': tbb_data+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/App/Firefox/firefox', - 'firefox_profile': tbb_data+'/tbb/'+self.architecture+'/tor-browser_'+self.language+'/Data/profile', - 'update_check': tbb_data+'/download/RecommendedTBBVersions', - 'icon': '/usr/share/pixmaps/torbrowser80.xpm', - 'torproject_pem': '/usr/share/torbrowser-launcher/torproject.pem', - 'erinn_key': '/usr/share/torbrowser-launcher/erinn.asc', - 'sebastian_key': '/usr/share/torbrowser-launcher/sebastian.asc' - }, - 'url': { - 'update_check': 'https://check.torproject.org/RecommendedTBBVersions' - }, - 'filename': {} + 'tbl_bin': '/usr/bin/torbrowser-launcher', + 'icon_file': '/usr/share/pixmaps/torbrowser80.xpm', + 'torproject_pem': '/usr/share/torbrowser-launcher/torproject.pem', + 'erinn_key': '/usr/share/torbrowser-launcher/erinn.asc', + 'sebastian_key': '/usr/share/torbrowser-launcher/sebastian.asc', + 'alexandre_key': '/usr/share/torbrowser-launcher/alexandre.asc', + 'data_dir': tbb_data, + 'download_dir': tbb_data+'/download', + 'gnupg_homedir': tbb_data+'/gnupg_homedir', + 'settings_file': tbb_data+'/settings', + 'update_check_url': 'https://check.torproject.org/RecommendedTBBVersions', + 'update_check_file': tbb_data+'/download/RecommendedTBBVersions', + 'tbb': { + 'tbb_stable': { + 'dir': tbb_data+'/tbb/stable/'+self.architecture, + 'start': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser', + 'vidalia_bin': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/App/vidalia', + 'firefox_bin': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/App/Firefox/firefox', + 'firefox_profile': tbb_data+'/tbb/stable/'+self.architecture+'/tor-browser_'+self.language+'/Data/profile', + }, + 'tbb_alpha': { + 'dir': tbb_data+'/tbb/alpha/'+self.architecture, + 'start': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser', + 'vidalia_bin': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/App/vidalia', + 'firefox_bin': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/App/Firefox/firefox', + 'firefox_profile': tbb_data+'/tbb/alpha/'+self.architecture+'/tor-browser_'+self.language+'/Data/profile', + }, + 'obs_tbb': { + 'dir': tbb_data+'/tbb/obs/'+self.architecture, + 'start': tbb_data+'/tbb/obs/'+self.architecture+'/tor-browser_'+self.language+'/start-tor-browser', + 'vidalia_bin': tbb_data+'/tbb/obs/'+self.architecture+'/tor-browser_'+self.language+'/App/vidalia', + 'firefox_bin': tbb_data+'/tbb/obs/'+self.architecture+'/tor-browser_'+self.language+'/App/Firefox/firefox', + 'firefox_profile': tbb_data+'/tbb/obs/'+self.architecture+'/tor-browser_'+self.language+'/Data/profile', + } + } } # create a directory @@ -230,26 +183,391 @@ class TorBrowserLauncher: os.makedirs(path, 0700) return True except: - self.set_gui('error', _("Cannot create directory {0}").format(path), [], False) + print _("Cannot create directory {0}").format(path) return False if not os.access(path, os.W_OK): - self.set_gui('error', _("{0} is not writable").format(path), [], False) + print _("{0} is not writable").format(path) return False return True # if gnupg_homedir isn't set up, set it up def init_gnupg(self): - if not os.path.exists(self.paths['dir']['gnupg_homedir']): - print _('Creating GnuPG homedir'), self.paths['dir']['gnupg_homedir'] - if self.mkdir(self.paths['dir']['gnupg_homedir']): + if not os.path.exists(self.paths['gnupg_homedir']): + print _('Creating GnuPG homedir'), self.paths['gnupg_homedir'] + if self.mkdir(self.paths['gnupg_homedir']): # import keys print _('Importing keys') - p1 = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['dir']['gnupg_homedir'], '--import', self.paths['file']['erinn_key']]) - p2 = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['dir']['gnupg_homedir'], '--import', self.paths['file']['sebastian_key']]) - # wait for keys to import before moving on - p1.wait() - p2.wait() + subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['erinn_key']]).wait() + subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['sebastian_key']]).wait() + subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['gnupg_homedir'], '--import', self.paths['alexandre_key']]).wait() + + # load settings + def load_settings(self): + default_settings = { + 'tbl_version': self.tbl_version, + 'preferred': 'tbb_stable', + 'installed_version': { + 'tbb_stable': False, + 'tbb_alpha': False, + 'obs_tbb': False + }, + 'latest_version': { + 'tbb_stable': '0', + 'tbb_alpha': '0', + 'obs_tbb': '0', + }, + 'update_over_tor': True, + 'check_for_updates': False, + 'last_update_check_timestamp': 0 + } + + if os.path.isfile(self.paths['settings_file']): + settings = pickle.load(open(self.paths['settings_file'])) + + # what version settings is this? + if not 'tbl_version' in settings: + settings['tbl_version'] = '0.0.1' + + # sanity checks for current version + if settings['tbl_version'] == self.tbl_version: + good_settings = True + if not 'preferred' in settings: + good_settings = False + if not 'installed_version' in settings: + good_settings = False + if not 'tbb_stable' in settings['installed_version']: + good_settings = False + if not 'tbb_alpha' in settings['installed_version']: + good_settings = False + if not 'obs_tbb' in settings['installed_version']: + good_settings = False + if not 'latest_version' in settings: + good_settings = False + if not 'tbb_stable' in settings['latest_version']: + good_settings = False + if not 'tbb_alpha' in settings['latest_version']: + good_settings = False + if not 'obs_tbb' in settings['latest_version']: + good_settings = False + if not 'update_over_tor' in settings: + good_settings = False + if not 'check_for_updates' in settings: + good_settings = False + if not 'last_update_check_timestamp' in settings: + good_settings = False + + if good_settings: + self.settings = settings + else: + setting.settings = default_settings + + # settings migrations for previous versions + elif settings['tbl_version'] == '0.0.1': + self.settings = default_settings + self.settings['installed_version']['tbb_alpha'] = settings['installed_version'] + self.save_settings() + + # move tbb alpha + self.mkdir(self.paths['tbb']['tbb_alpha']['dir']) + # todo: move already-installed TBB alpha to new location + if os.path.exists(self.paths['data_dir']+'/tbb/x86_64'): + pass + if os.path.exists(self.paths['data_dir']+'/tbb/i686'): + pass + + else: + self.settings = default_settings + self.save_settings() + + # save settings + def save_settings(self): + pickle.dump(self.settings, open(self.paths['settings_file'], 'w')) + return True + + # get the process id of a program + def get_pid(self, bin_path, python = False): + pid = None + + for p in psutil.process_iter(): + try: + if p.pid != os.getpid(): + exe = None + if python: + if len(p.cmdline) > 1: + if 'python' in p.cmdline[0]: + exe = p.cmdline[1] + else: + if len(p.cmdline) > 0: + exe = p.cmdline[0] + + if exe == bin_path: + pid = p.pid + + except: + pass + + return pid + + # bring program's x window to front + def bring_window_to_front(self, pid): + # figure out the window id + win_id = None + p = subprocess.Popen(['wmctrl', '-l', '-p'], stdout=subprocess.PIPE) + for line in p.stdout.readlines(): + line_split = line.split() + cur_win_id = line_split[0] + cur_win_pid = int(line_split[2]) + if cur_win_pid == pid: + win_id = cur_win_id + + # bring to front + if win_id: + subprocess.call(['wmctrl', '-i', '-a', win_id]) + +class TBLSettings: + def __init__(self, common): + print _('Starting settings dialog') + self.common = common + + # set up the window + self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) + self.window.set_title(_("Tor Browser Launcher Settings")) + self.window.set_icon_from_file(self.common.paths['icon_file']) + self.window.set_position(gtk.WIN_POS_CENTER) + self.window.set_border_width(10) + self.window.connect("delete_event", self.delete_event) + self.window.connect("destroy", self.destroy) + + # build the rest of the UI + self.box = gtk.VBox(False, 10) + self.window.add(self.box) + self.box.show() + + self.hbox = gtk.HBox(False, 10) + self.box.pack_start(self.hbox, True, True, 0) + self.hbox.show() + + self.settings_box = gtk.VBox(False, 10) + self.hbox.pack_start(self.settings_box, True, True, 0) + self.settings_box.show() + + self.labels_box = gtk.VBox(False, 10) + self.hbox.pack_start(self.labels_box, True, True, 0) + self.labels_box.show() + + # preferred version + self.pref_ver_box = gtk.HBox(False, 10) + self.settings_box.pack_start(self.pref_ver_box, True, True, 0) + self.pref_ver_box.show() + + self.pref_ver_label = gtk.Label(_('I prefer')) + self.pref_ver_label.set_line_wrap(True) + self.pref_ver_box.pack_start(self.pref_ver_label, True, True, 0) + self.pref_ver_label.show() + + options = [] + for i in self.common.available_versions: + options.append(self.common.available_versions[i]) + options.sort() + + self.pref_ver = gtk.combo_box_new_text() + for option in options: + self.pref_ver.append_text(option) + self.pref_ver.set_active(0) + self.pref_ver_box.pack_start(self.pref_ver, True, True, 0) + self.pref_ver.show() + + # download over tor + self.tor_update_checkbox = gtk.CheckButton(_("Download updates over Tor (recommended)")) + self.settings_box.pack_start(self.tor_update_checkbox, True, True, 0) + self.tor_update_checkbox.show() + + # check for updates + self.update_checkbox = gtk.CheckButton(_("Check for updates next launch")) + self.settings_box.pack_start(self.update_checkbox, True, True, 0) + self.update_checkbox.show() + + # labels + if(self.common.settings['installed_version']): + self.label1 = gtk.Label(_('Installed version:\n{0}').format(self.common.settings['installed_version'])) + else: + self.label1 = gtk.Label(_('Not installed')) + self.label1.set_line_wrap(True) + self.labels_box.pack_start(self.label1, True, True, 0) + self.label1.show() + + if(self.common.settings['last_update_check_timestamp'] > 0): + self.label1 = gtk.Label(_('Last checked for updates:\n{0}').format(time.strftime("%B %d, %Y %I:%M %P", time.gmtime(self.common.settings['last_update_check_timestamp'])))) + else: + self.label1 = gtk.Label(_('Never checked for updates')) + self.label1.set_line_wrap(True) + self.labels_box.pack_start(self.label1, True, True, 0) + self.label1.show() + + # button box + self.button_box = gtk.HButtonBox() + self.button_box.set_layout(gtk.BUTTONBOX_SPREAD) + self.box.pack_start(self.button_box, True, True, 0) + self.button_box.show() + + # save and launch button + save_launch_image = gtk.Image() + save_launch_image.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON) + self.save_launch_button = gtk.Button(_("Launch Tor Browser")) + self.save_launch_button.set_image(save_launch_image) + self.save_launch_button.connect("clicked", self.save_launch, None) + self.button_box.add(self.save_launch_button) + self.save_launch_button.show() + + # save and exit button + save_exit_image = gtk.Image() + save_exit_image.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON) + self.save_exit_button = gtk.Button(_("Save & Exit")) + self.save_exit_button.set_image(save_exit_image) + self.save_exit_button.connect("clicked", self.save_exit, None) + self.button_box.add(self.save_exit_button) + self.save_exit_button.show() + + # cancel button + cancel_image = gtk.Image() + cancel_image.set_from_stock(gtk.STOCK_CANCEL, gtk.ICON_SIZE_BUTTON) + self.cancel_button = gtk.Button(_("Cancel")) + self.cancel_button.set_image(cancel_image) + self.cancel_button.connect("clicked", self.destroy, None) + self.button_box.add(self.cancel_button) + self.cancel_button.show() + + # show the window + self.window.show() + + # start gtk + gtk.main() + + # save and launch + def save_launch(self, widget, data=None): + self.save() + p = subprocess.Popen([self.common.paths['tbl_bin']]) + self.destroy(False) + # save and exit + def save_exit(self, widget, data=None): + self.save() + self.destroy(False) + + # save settings + def save(self): + pass + + # exit + def delete_event(self, widget, event, data=None): + return False + def destroy(self, widget, data=None): + gtk.main_quit() + + +class TBLLauncher: + def __init__(self, common): + print _('Starting launcher dialog') + self.common = common + + # init launcher + self.set_gui(None, '', []) + self.launch_gui = True + self.common.build_paths(self.common.settings['latest_version'][self.common.settings['preferred']]) + + # is vidalia already running and we just need to open a new firefox? + if self.common.settings['installed_version']: + vidalia_pid = self.common.get_pid('./App/vidalia') + firefox_pid = self.common.get_pid(self.common.paths['tbb'][self.common.settings['preferred']]['firefox_bin']) + + if vidalia_pid and not firefox_pid: + print _('Vidalia is already open, but Firefox is closed. Launching new Firefox.') + self.common.bring_window_to_front(vidalia_pid) + subprocess.Popen([self.common.paths['tbb'][self.common.settings['preferred']]['firefox_bin'], '-no-remote', '-profile', self.common.paths['tbb'][self.common.settings['preferred']]['firefox_profile']]) + return + elif vidalia_pid and firefox_pid: + print _('Vidalia and Firefox are already open, bringing them to focus') + + # bring firefox to front, then vidalia + self.common.bring_window_to_front(firefox_pid) + self.common.bring_window_to_front(vidalia_pid) + return + + # check for updates? + check_for_updates = False + if self.common.settings['check_for_updates']: + check_for_updates = True + + if not check_for_updates: + # how long was it since the last update check? + # 86400 seconds = 24 hours + current_timestamp = int(time.time()) + if current_timestamp - self.common.settings['last_update_check_timestamp'] >= 86400: + check_for_updates = True + + if check_for_updates: + # check for update + print 'Checking for update' + self.set_gui('task', _("Checking for Tor Browser update."), + ['download_update_check', + 'attempt_update']) + else: + # no need to check for update + print _('Checked for update within 24 hours, skipping') + self.start_launcher() + + if self.launch_gui: + # set up the window + self.window = gtk.Window(gtk.WINDOW_TOPLEVEL) + self.window.set_title(_("Tor Browser")) + self.window.set_icon_from_file(self.common.paths['icon_file']) + self.window.set_position(gtk.WIN_POS_CENTER) + self.window.set_border_width(10) + self.window.connect("delete_event", self.delete_event) + self.window.connect("destroy", self.destroy) + + # build the rest of the UI + self.build_ui() + + # download or run TBB + def start_launcher(self): + # is TBB already installed? + if os.path.isfile(self.common.paths['tbb'][self.common.settings['preferred']]['start']) and os.access(self.common.paths['tbb'][self.common.settings['preferred']]['start'], os.X_OK): + if self.common.settings['installed_version'] == self.common.settings['latest_version'][self.common.settings['preferred']]: + # current version of tbb is installed, launch it + self.run(False) + self.launch_gui = False + elif self.common.settings['installed_version'] < self.common.settings['latest_version'][self.common.settings['preferred']]: + # there is a tbb upgrade available + self.set_gui('task', _("Your Tor Browser is out of date."), + ['download_tarball', + 'download_tarball_sig', + 'verify', + 'extract', + 'run']) + else: + # for some reason the installed tbb is newer than the current version? + self.set_gui('error', _("Something is wrong. The version of Tor Browser Bundle you have installed is newer than the current version?"), []) + + # not installed + else: + # are the tarball and sig already downloaded? + if os.path.isfile(self.common.paths['tarball_file']) and os.path.isfile(self.common.paths['tarball_sig_file']): + # start the gui with verify + self.set_gui('task', _("Installing Tor Browser."), + ['verify', + 'extract', + 'run']) + + # first run + else: + self.set_gui('task', _("Downloading and installing Tor Browser."), + ['download_tarball', + 'download_tarball_sig', + 'verify', + 'extract', + 'run']) + # there are different GUIs that might appear, this sets which one we want def set_gui(self, gui, message, tasks, autostart=True): self.gui = gui @@ -260,7 +578,7 @@ class TorBrowserLauncher: # set all gtk variables to False def clear_ui(self): - if hasattr(self, 'box'): + if hasattr(self, 'box') and hasattr(self.box, 'destroy'): self.box.destroy() self.box = False @@ -272,6 +590,8 @@ class TorBrowserLauncher: # build the application's UI def build_ui(self): + self.clear_ui() + self.box = gtk.VBox(False, 20) self.window.add(self.box) @@ -282,11 +602,6 @@ class TorBrowserLauncher: self.box.pack_start(self.label, True, True, 0) self.label.show() - #self.label2 = gtk.Label("You can fix the problem by deleting:\n"+self.paths['dir']['data']+"\n\nHowever, you will lose all your bookmarks and other Tor Browser preferences.") - #self.label2.set_line_wrap(True) - #self.box.pack_start(self.label2, True, True, 0) - #self.label2.show() - # exit button exit_image = gtk.Image() exit_image.set_from_stock(gtk.STOCK_CANCEL, gtk.ICON_SIZE_BUTTON) @@ -318,7 +633,7 @@ class TorBrowserLauncher: # start button start_image = gtk.Image() start_image.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_BUTTON) - self.start_button = gtk.Button("Start") + self.start_button = gtk.Button(_("Start")) self.start_button.set_image(start_image) self.start_button.connect("clicked", self.start, None) self.button_box.add(self.start_button) @@ -328,7 +643,7 @@ class TorBrowserLauncher: # exit button exit_image = gtk.Image() exit_image.set_from_stock(gtk.STOCK_CANCEL, gtk.ICON_SIZE_BUTTON) - self.exit_button = gtk.Button("Exit") + self.exit_button = gtk.Button(_("Exit")) self.exit_button.set_image(exit_image) self.exit_button.connect("clicked", self.destroy, None) self.button_box.add(self.exit_button) @@ -363,31 +678,31 @@ class TorBrowserLauncher: self.gui_task_i += 1 if task == 'download_update_check': - print _('Downloading'), self.paths['url']['update_check'] - self.download('update check', self.paths['url']['update_check'], self.paths['file']['update_check']) + print _('Downloading'), self.common.paths['update_check_url'] + self.download('update check', self.common.paths['update_check_url'], self.common.paths['update_check_file']) if task == 'attempt_update': print _('Checking to see if update it needed') self.attempt_update() elif task == 'download_tarball': - print _('Downloading'), self.paths['url']['tarball'] - self.download('tarball', self.paths['url']['tarball'], self.paths['file']['tarball']) + print _('Downloading'), self.common.paths['tarball_url'] + self.download('tarball', self.common.paths['tarball_url'], self.common.paths['tarball_file']) elif task == 'download_tarball_sig': - print _('Downloading'), self.paths['url']['tarball_sig'] - self.download('signature', self.paths['url']['tarball_sig'], self.paths['file']['tarball_sig']) + print _('Downloading'), self.common.paths['tarball_sig_url'] + self.download('signature', self.common.paths['tarball_sig_url'], self.common.paths['tarball_sig_file']) elif task == 'verify': print _('Verifying signature') self.verify() elif task == 'extract': - print _('Extracting'), self.paths['filename']['tarball'] + print _('Extracting'), self.common.paths['tarball_filename'] self.extract() elif task == 'run': - print _('Running'), self.paths['file']['start'] + print _('Running'), self.common.paths['tbb'][self.common.settings['preferred']]['start'] self.run() elif task == 'start_over': @@ -448,7 +763,7 @@ class TorBrowserLauncher: self.progressbar.show() self.refresh_gtk() - agent = Agent(reactor, VerifyTorProjectCert(self.paths['file']['torproject_pem'])) + agent = Agent(reactor, VerifyTorProjectCert(self.common.paths['torproject_pem'])) d = agent.request('GET', url, Headers({'User-Agent': ['torbrowser-launcher']}), None) @@ -462,7 +777,7 @@ class TorBrowserLauncher: def attempt_update(self): # load the update check file try: - versions = json.load(open(self.paths['file']['update_check'])) + versions = json.load(open(self.common.paths['update_check_file'])) latest_version = None end = '-Linux' @@ -471,10 +786,11 @@ class TorBrowserLauncher: latest_version = str(version) if latest_version: - self.settings['latest_version'] = latest_version[:-len(end)] - self.settings['last_update_check_timestamp'] = int(time.time()) - self.save_settings() - self.build_paths(self.settings['latest_version']) + self.common.settings['latest_version'][self.common.settings['preferred']] = latest_version[:-len(end)] + self.common.settings['last_update_check_timestamp'] = int(time.time()) + self.common.settings['check_for_updates'] = False + self.common.save_settings() + self.common.build_paths(self.common.settings['latest_version'][self.common.settings['preferred']]) self.start_launcher() else: @@ -495,7 +811,7 @@ class TorBrowserLauncher: self.progressbar.set_text(_('Verifying Signature')) self.progressbar.show() - p = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.paths['dir']['gnupg_homedir'], '--verify', self.paths['file']['tarball_sig']]) + p = subprocess.Popen(['/usr/bin/gpg', '--homedir', self.common.paths['gnupg_homedir'], '--verify', self.common.paths['tarball_sig_file']]) self.pulse_until_process_exits(p) if p.returncode == 0: @@ -516,22 +832,22 @@ class TorBrowserLauncher: self.refresh_gtk() # make sure this file is a tarfile - if tarfile.is_tarfile(self.paths['file']['tarball']): - tf = tarfile.open(self.paths['file']['tarball']) - tf.extractall(self.paths['dir']['tbb']) + if tarfile.is_tarfile(self.common.paths['tarball_file']): + tf = tarfile.open(self.common.paths['tarball_file']) + tf.extractall(self.common.paths['tbb'][self.common.settings['preferred']]['dir']) else: self.set_gui('task', _("Tor Browser Launcher doesn't understand the file format of {0}"), ['start_over'], False) self.clear_ui() self.build_ui() # installation is finished, so save installed_version - self.settings['installed_version'] = self.settings['latest_version'] - self.save_settings() + self.common.settings['installed_version'] = self.common.settings['latest_version'] + self.common.save_settings() self.run_task() def run(self, run_next_task = True): - subprocess.Popen([self.paths['file']['start']]) + subprocess.Popen([self.common.paths['tbb'][self.common.settings['preferred']]['start']]) if run_next_task: self.run_task() @@ -548,32 +864,7 @@ class TorBrowserLauncher: self.gui_tasks = ['download_tarball', 'download_tarball_sig', 'verify', 'extract', 'run'] self.gui_task_i = 0 self.start(None) - - # load settings - def load_settings(self): - if os.path.isfile(self.paths['file']['settings']): - self.settings = pickle.load(open(self.paths['file']['settings'])) - # sanity checks - if not 'installed_version' in self.settings: - return False - if not 'latest_version' in self.settings: - return False - if not 'last_update_check_timestamp' in self.settings: - return False - else: - self.settings = { - 'installed_version': False, - 'latest_version': '0', - 'last_update_check_timestamp': 0 - } - self.save_settings() - return True - - # save settings - def save_settings(self): - pickle.dump(self.settings, open(self.paths['file']['settings'], 'w')) - return True - + # refresh gtk def refresh_gtk(self): while gtk.events_pending(): @@ -589,11 +880,27 @@ class TorBrowserLauncher: reactor.stop() if __name__ == "__main__": - tor_browser_launcher_version = '0.1' + tor_browser_launcher_version = '0.0.2' print _('Tor Browser Launcher') + print _('By Micah Lee, licensed under GPLv3') print _('version {0}').format(tor_browser_launcher_version) print 'https://github.com/micahflee/torbrowser-launcher' - app = TorBrowserLauncher() + common = TBLCommon(tor_browser_launcher_version) + + # is torbrowser-launcher already running? + tbl_pid = common.get_pid(common.paths['tbl_bin'], True) + if tbl_pid: + print _('Tor Browser Launcher is already running (pid {0}), bringing to front').format(tbl_pid) + common.bring_window_to_front(tbl_pid) + sys.exit() + + if '-settings' in sys.argv: + # settings mode + app = TBLSettings(common) + + else: + # launcher mode + app = TBLLauncher(common)