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

[arm/release] fix: config description content too long
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e239fd7931d6014306a76648663f6f6b2a92323d Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 08:42:58 2011 -0700 fix: config description content too long Descriptions for configuration options were one cell too long, causing it to draw on top of the border if just the right length. --- src/cli/configPanel.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cli/configPanel.py b/src/cli/configPanel.py index e4a48fc..2e8e1c1 100644 --- a/src/cli/configPanel.py +++ b/src/cli/configPanel.py @@ -601,11 +601,11 @@ class ConfigPanel(panel.Panel): if i != descriptionHeight - 1: # there's more lines to display - msg, remainder = uiTools.cropStr(lineContent, width - 2, 4, 4, uiTools.Ending.HYPHEN, True) + msg, remainder = uiTools.cropStr(lineContent, width - 3, 4, 4, uiTools.Ending.HYPHEN, True) descriptionContent = remainder.strip() + descriptionContent else: # this is the last line, end it with an ellipse - msg = uiTools.cropStr(lineContent, width - 2, 4, 4) + msg = uiTools.cropStr(lineContent, width - 3, 4, 4) self.addstr(3 + i, 2, msg, selectionFormat)

1 0

[arm/release] Merge branch 'torrc-override'
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 5b4c2765384045de454f33f390886a56483a6979 Merge: ce2ff76 d1c16ba Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 6 16:37:52 2011 -0700 Merge branch 'torrc-override' src/cli/wizard.py | 100 ++++++++- src/resources/torrcOverride/override.c | 50 +++++ src/resources/torrcOverride/override.h | 1 + src/resources/torrcOverride/override.py | 363 +++++++++++++++++++++++++++++++ src/settings.cfg | 4 + 5 files changed, 506 insertions(+), 12 deletions(-)

1 0

[arm/release] Forcing redraw when user presses ctrl+L
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 38c2f3662ac8858fabc54a5826c1af601590c9b0 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 8 08:50:15 2011 -0700 Forcing redraw when user presses ctrl+L Triggering a manual redraw when the user presses ctrl+L, which is expected of terminal applications. This addresses: https://trac.torproject.org/projects/tor/ticket/2830 --- src/cli/controller.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index d2c9d73..8b87b1d 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -765,6 +765,9 @@ def drawTorMonitor(stdscr, startTime): overrideKey = cli.popups.showHelpPopup() elif key == ord('w') or key == ord('W'): cli.wizard.showWizard() + elif key == ord('l') - 96: + # force redraw when ctrl+l is pressed + control.redraw() else: for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key)

1 0

[arm/release] fix: torrc validation arg doesn't need root check
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit c8de18c201814f4acfee6d64904c4c7335077846 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 27 13:39:38 2011 -0700 fix: torrc validation arg doesn't need root check --- src/resources/torrcOverride/override.py | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/resources/torrcOverride/override.py b/src/resources/torrcOverride/override.py index dffa3a5..b99ae95 100755 --- a/src/resources/torrcOverride/override.py +++ b/src/resources/torrcOverride/override.py @@ -315,6 +315,17 @@ if __name__ == "__main__": print "This is a script specifically for configuring Linux" sys.exit(1) + if len(sys.argv) == 3 and sys.argv[1] == "--validate": + torrcFile = open(sys.argv[2]) + torrcContents = torrcFile.readlines() + torrcFile.close() + + isValid = isWizardGenerated(torrcContents) + if isValid: print "torrc validated" + else: print "torrc invalid" + + sys.exit(0) + # check that we're running effectively as root if os.geteuid() != 0: print "This script needs to be run as root" @@ -326,14 +337,6 @@ if __name__ == "__main__": init() elif len(sys.argv) == 2 and sys.argv[1] == "--remove": remove() - elif len(sys.argv) == 3 and sys.argv[1] == "--validate": - torrcFile = open(sys.argv[2]) - torrcContents = torrcFile.readlines() - torrcFile.close() - - isValid = isWizardGenerated(torrcContents) - if isValid: print "torrc validated" - else: print "torrc invalid" else: print HELP_MSG sys.exit(1)

1 0

[arm/release] fix: skipping torrc backup when for system copy
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 784d618b22a800f3abe148b0cb178b12cc7f3d05 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 27 13:35:40 2011 -0700 fix: skipping torrc backup when for system copy The wizard attempts to back up the torrc but, if we're editing the system copy, we'll lack the permissions for this. The override.py makes its own backup so this is fine. --- src/cli/wizard.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 31f2f70..6d9d488 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -353,7 +353,7 @@ def showWizard(): # if the torrc already exists then save it to a _bak file isBackedUp = False - if os.path.exists(torrcLocation): + if os.path.exists(torrcLocation) and not isSystemReplace: try: shutil.copy(torrcLocation, torrcLocation + "_bak") isBackedUp = True

1 0

[arm/release] Use separate file choosers for dir selection and file selection.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit f6178103cceb94e65c911f17e014e5691228e95c Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 14:57:50 2011 +0500 Use separate file choosers for dir selection and file selection. --- src/gui/configPanel.py | 9 ++++++++- src/util/gtkTools.py | 28 +++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index a6f5c07..8c3a5e0 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -33,6 +33,10 @@ def input_conf_value_boolean(option): prompt = "Select value for %s" % option return "1" if gtkTools.input_boolean(prompt) else "0" +def input_conf_value_dir(option): + prompt = "Select value for %s" % option + return gtkTools.input_dir(prompt) + def input_conf_value_filename(option): prompt = "Select value for %s" % option return gtkTools.input_filename(prompt) @@ -106,7 +110,10 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'Boolean': newValue = input_conf_value_boolean(configOption) elif configType == 'Filename': - newValue = input_conf_value_filename(configOption) + if 'Directory' in configOption: + newValue = input_conf_value_dir(configOption) + else: + newValue = input_conf_value_filename(configOption) else: newValue = input_conf_value_text(configOption) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 1d3468f..87b3981 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -288,17 +288,39 @@ def input_boolean(prompt): return choice if response == gtk.RESPONSE_OK else None +def input_dir(prompt): + dialog = gtk.FileChooserDialog(prompt, + None, + gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN, gtk.RESPONSE_OK)) + dialog.set_default_response(gtk.RESPONSE_OK) + + dialog.show_all() + response = dialog.run() + + filename = dialog.get_filename() + + dialog.destroy() + + return filename if response == gtk.RESPONSE_OK else None + def input_filename(prompt): - dialog = gtk.FileSelection(prompt) + dialog = gtk.FileChooserDialog(prompt, + None, + gtk.FILE_CHOOSER_ACTION_SAVE, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN, gtk.RESPONSE_OK)) + dialog.set_default_response(gtk.RESPONSE_OK) dialog.show_all() response = dialog.run() - choice = dialog.get_filename() + filename = dialog.get_filename() dialog.destroy() - return choice if response == gtk.RESPONSE_OK else None + return filename if response == gtk.RESPONSE_OK else None def showError(msg): dialog = gtk.MessageDialog(None,

1 0

[arm/release] Prepopulate data size configs.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 93acdc1831cecb23760cbc1b8a195058c7a23739 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 15:53:41 2011 +0500 Prepopulate data size configs. --- src/gui/configPanel.py | 11 ++++++----- src/util/gtkTools.py | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 8c3a5e0..8be7020 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,9 +13,9 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -def input_conf_value_size(option): +def input_conf_value_size(option, oldValue): prompt = "Enter value for %s" % option - return gtkTools.input_size(prompt) + return gtkTools.input_size(prompt, oldValue) def input_conf_value_int(option): prompt = "Enter value for %s" % option @@ -95,12 +95,13 @@ class ConfigPanel(object, CliConfigPanel): (index,) = path entry = self._wrappedConfImportantContents[index] - configOption = entry.fields[Field.OPTION] - configType = entry.fields[Field.TYPE] + configOption = entry.get(Field.OPTION) + configType = entry.get(Field.TYPE) + oldValue = entry.get(Field.VALUE) newValue = None if configType == 'DataSize': - newValue = input_conf_value_size(configOption) + newValue = input_conf_value_size(configOption, oldValue) elif configType == 'Integer': newValue = input_conf_value_int(configOption) elif configType == 'String': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 87b3981..8a628e2 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -103,7 +103,7 @@ class TreeWrapper(ListWrapper): def response_to_dialog(entry, dialog, response): dialog.response(response) -def input_size(prompt): +def input_size(prompt, default=None): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -117,7 +117,7 @@ def input_size(prompt): dialog.vbox.pack_end(hBox, True, True, 0) spinButton = gtk.SpinButton(None) - spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + spinButton.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) spinButton.set_increments(1, 10) spinButton.set_range(0, 1024) @@ -136,6 +136,16 @@ def input_size(prompt): hBox.pack_end(comboBox, False, False, 0) + if default: + value, units = default.split() + + spinButton.set_value(float(value)) + + model = comboBox.get_model() + modelUnits = [row[0] for row in model] + index = modelUnits.index(units) + comboBox.set_active(index) + dialog.show_all() response = dialog.run() @@ -159,7 +169,7 @@ def input_int(prompt): dialog.set_markup(prompt) spinButton = gtk.SpinButton(None) - spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + spinButton.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) spinButton.set_increments(1, 10) spinButton.set_range(0, 65535) @@ -185,7 +195,7 @@ def input_text(prompt): dialog.set_markup(prompt) entry = gtk.Entry() - entry.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + entry.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) dialog.vbox.pack_end(entry, True, True, 0)

1 0

[arm/release] Use file selection dialogs for filename confs.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit 8f793419458866575f08d69dc1d8e15d0107f2b3 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 14:34:09 2011 +0500 Use file selection dialogs for filename confs. --- src/gui/configPanel.py | 10 ++++++++-- src/util/gtkTools.py | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 582034a..a6f5c07 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -33,10 +33,12 @@ def input_conf_value_boolean(option): prompt = "Select value for %s" % option return "1" if gtkTools.input_boolean(prompt) else "0" +def input_conf_value_filename(option): + prompt = "Select value for %s" % option + return gtkTools.input_filename(prompt) + class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): - print entry.get(Field.OPTION), ":", entry.get(Field.TYPE) - option = entry.get(Field.OPTION) value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) @@ -97,10 +99,14 @@ class ConfigPanel(object, CliConfigPanel): newValue = input_conf_value_size(configOption) elif configType == 'Integer': newValue = input_conf_value_int(configOption) + elif configType == 'String': + newValue = input_conf_value_text(configOption) elif configType == 'LineList': newValue = input_conf_value_list(configOption) elif configType == 'Boolean': newValue = input_conf_value_boolean(configOption) + elif configType == 'Filename': + newValue = input_conf_value_filename(configOption) else: newValue = input_conf_value_text(configOption) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index afd4fef..1d3468f 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -288,6 +288,18 @@ def input_boolean(prompt): return choice if response == gtk.RESPONSE_OK else None +def input_filename(prompt): + dialog = gtk.FileSelection(prompt) + + dialog.show_all() + response = dialog.run() + + choice = dialog.get_filename() + + dialog.destroy() + + return choice if response == gtk.RESPONSE_OK else None + def showError(msg): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0

[arm/release] Support integer confs.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit e72dad26709f7260af4567a53c4b334681eb3072 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 14:25:07 2011 +0500 Support integer confs. --- src/gui/configPanel.py | 8 ++++++++ src/util/gtkTools.py | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index b87c1b3..582034a 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -17,6 +17,10 @@ def input_conf_value_size(option): prompt = "Enter value for %s" % option return gtkTools.input_size(prompt) +def input_conf_value_int(option): + prompt = "Enter value for %s" % option + return gtkTools.input_int(prompt) + def input_conf_value_list(option): prompt = "Enter value for %s" % option return gtkTools.input_list(prompt) @@ -31,6 +35,8 @@ def input_conf_value_boolean(option): class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): + print entry.get(Field.OPTION), ":", entry.get(Field.TYPE) + option = entry.get(Field.OPTION) value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) @@ -89,6 +95,8 @@ class ConfigPanel(object, CliConfigPanel): if configType == 'DataSize': newValue = input_conf_value_size(configOption) + elif configType == 'Integer': + newValue = input_conf_value_int(configOption) elif configType == 'LineList': newValue = input_conf_value_list(configOption) elif configType == 'Boolean': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 37e818e..afd4fef 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -149,6 +149,32 @@ def input_size(prompt): return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None +def input_int(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + spinButton = gtk.SpinButton(None) + spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + + spinButton.set_increments(1, 10) + spinButton.set_range(0, 65535) + + dialog.vbox.pack_end(spinButton, True, True, 0) + + dialog.show_all() + response = dialog.run() + + value = spinButton.get_value_as_int() + + dialog.destroy() + + return "%d" % (value) if response == gtk.RESPONSE_OK else None + def input_text(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0

[arm/release] Use spinbutton for value and combobox for units of data size confs.
by atagar＠torproject.org 25 Sep '11

25 Sep '11

commit d640992c3c499ffdcfee9d5002da8f6930e59f14 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 28 16:35:25 2011 +0500 Use spinbutton for value and combobox for units of data size confs. --- src/gui/configPanel.py | 18 ++++++++++----- src/util/gtkTools.py | 54 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 7b1ea42..c5b631a 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,13 +13,17 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -def inputConfValueText(option): +def input_conf_value_size(option): prompt = "Enter value for %s" % option - return gtkTools.inputText(prompt) + return gtkTools.input_size(prompt) -def inputConfValueBoolean(option): +def input_conf_value_text(option): + prompt = "Enter value for %s" % option + return gtkTools.input_text(prompt) + +def input_conf_value_boolean(option): prompt = "Select value for %s" % option - return "1" if gtkTools.inputBoolean(prompt) else "0" + return "1" if gtkTools.input_boolean(prompt) else "0" class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): @@ -80,9 +84,11 @@ class ConfigPanel(object, CliConfigPanel): newValue = None if configType == 'DataSize': - newValue = inputConfValueText(configOption) + newValue = input_conf_value_size(configOption) elif configType == 'Boolean': - newValue = inputConfValueBoolean(configOption) + newValue = input_conf_value_boolean(configOption) + else: + newValue = input_conf_value_text(configOption) if newValue: try: diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index cc2d361..860a587 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -100,10 +100,56 @@ class TreeWrapper(ListWrapper): row = self._create_row_from_value(value) self.model.append(None, row) -def responseToDialog(entry, dialog, response): +def response_to_dialog(entry, dialog, response): dialog.response(response) -def inputText(prompt): +def input_size(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + hBox = gtk.HBox() + + dialog.vbox.pack_end(hBox, True, True, 0) + + spinButton = gtk.SpinButton(None) + spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + + spinButton.set_increments(1, 10) + spinButton.set_range(0, 1024) + + hBox.pack_start(spinButton, True, True, 0) + + comboBox = gtk.combo_box_new_text() + + comboBox.append_text("B") + comboBox.append_text("KB") + comboBox.append_text("MB") + comboBox.append_text("GB") + comboBox.append_text("TB") + comboBox.append_text("PB") + comboBox.set_active(0) + + hBox.pack_end(comboBox, False, False, 0) + + dialog.show_all() + response = dialog.run() + + value = spinButton.get_value_as_int() + + model = comboBox.get_model() + active = comboBox.get_active() + (units,) = model[active] + + dialog.destroy() + + return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None + +def input_text(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -113,7 +159,7 @@ def inputText(prompt): dialog.set_markup(prompt) entry = gtk.Entry() - entry.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK) + entry.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) dialog.vbox.pack_end(entry, True, True, 0) @@ -125,7 +171,7 @@ def inputText(prompt): return text if response == gtk.RESPONSE_OK else None -def inputBoolean(prompt): +def input_boolean(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION,

1 0