- tor-commits - lists.torproject.org

[arm/master] Padding initial setup options
by atagar＠torproject.org 23 Jun '11

23 Jun '11

commit 5ab244701c1bc56ff57b38371cc62cdbbc6e2bab Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 22 08:44:45 2011 -0700 Padding initial setup options Provides a better looking, more centered appearance. --- src/cli/wizard.py | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 2b7cdf7..f9dd770 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -11,7 +11,7 @@ import cli.controller from util import enum, uiTools # basic configuration types we can run as -RunType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") +RelayType = enum.Enum("RELAY", "EXIT", "BRIDGE", "CLIENT") # other options provided in the prompts CANCEL, BACK = "Cancel", "Back" @@ -24,16 +24,16 @@ def loadConfig(config): config.update(CONFIG) def showWizard(): - myRole = promptRunType() + myRelayType = promptRelayType() -def promptRunType(): +def promptRelayType(): """ Provides a prompt for selecting the general role we'd like Tor to run with. - This returns a RunType enumeration for the selection, or None if the dialog - was canceled. + This returns a RelayType enumeration for the selection, or None if the + dialog was canceled. """ - popup, _, _ = cli.popups.init(23, 58) + popup, _, _ = cli.popups.init(24, 58) if not popup: return control = cli.controller.getController() key, selection = 0, 0 @@ -41,13 +41,13 @@ def promptRunType(): # constructs (enum, label, [description lines]) tuples for our options options = [] - for runType in RunType.values() + [CANCEL]: + for runType in RelayType.values() + [CANCEL]: label = CONFIG["wizard.role.option.label"].get(runType, "") descRemainder = CONFIG["wizard.role.option.description"].get(runType, "") descLines = [] while descRemainder: - descLine, descRemainder = uiTools.cropStr(descRemainder, 54, None, endType = None, getRemainder = True) + descLine, descRemainder = uiTools.cropStr(descRemainder, 52, None, endType = None, getRemainder = True) descLines.append(descLine.strip()) options.append((runType, label, descLines)) @@ -71,6 +71,10 @@ def promptRunType(): _, label, lines = options[i] optionFormat = format | curses.A_STANDOUT if i == selection else format + # appends an extra space to the start to provide nicer centering + label = " " + label + lines = [" " + line for line in lines] + # Curses has a weird bug where there's a one-pixel alignment # difference between bold and regular text, so it looks better # to render the whitespace here as not being bold.

1 0

[arm/master] fix: getstr requests can cause curses crash
by atagar＠torproject.org 23 Jun '11

23 Jun '11

commit 460a76e802bebb57551af5d04bc214f0a6a54a0c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 22 18:41:17 2011 -0700 fix: getstr requests can cause curses crash The getstr function creates a curses subwindow which could make a raw addstr request that, if the initial value overflows the subwindow, causes curses to crash. --- src/util/panel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 3bdcd6f..aa3ca27 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -595,7 +595,7 @@ class Panel(): inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, self.left + x) # prepopulates the initial text - if initialText: inputSubwindow.addstr(0, 0, initialText) + if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1]) # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses

1 0

[arm/master] fix: getstr y argument wasn't being respected
by atagar＠torproject.org 23 Jun '11

23 Jun '11

commit 4f8cd4c475d481453471191e435fa514267986a6 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jun 22 18:58:05 2011 -0700 fix: getstr y argument wasn't being respected Never used the row argument before - forgot to respect it in subwindow creation. --- src/util/panel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index aa3ca27..3f0a98a 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -592,7 +592,7 @@ class Panel(): # temporary subwindow for user input displayWidth = self.getPreferredSize()[1] - inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top, self.left + x) + inputSubwindow = self.parent.subwin(1, displayWidth - x, self.top + y, self.left + x) # prepopulates the initial text if initialText: inputSubwindow.addstr(0, 0, initialText[:displayWidth - x - 1])

1 0

[arm/master] fix: man path for default armrc incorrect
by atagar＠torproject.org 23 Jun '11

23 Jun '11

commit adf5b6d8f99d3f68412e64e0d2fe45cf17b4f238 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jun 23 08:22:25 2011 -0700 fix: man path for default armrc incorrect This was changed a while back but didn't get reflected in the man page. Caught by Jérémy Bobbio (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=631358) --- arm.1 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arm.1 b/arm.1 index 6a1fa19..7743035 100644 --- a/arm.1 +++ b/arm.1 @@ -27,7 +27,7 @@ tor control port arm should attach to (default is \fB127.0.0.1:9051\fR) .TP \fB\-c\fR, \fB\-\-config CONFIG_PATH\fR -user provided configuration file (default is \fB~/.armrc\fR) +user provided configuration file (default is \fB~/.arm/armrc\fR) .TP \fB\-d\fR, \fB\-\-debug\fR

1 0

r24836: {check} dev/shm didn't fix anything, put it back to /tmp, which reall (check/trunk/cgi-bin)
by Andrew Lewman 23 Jun '11

23 Jun '11

Author: phobos Date: 2011-06-23 11:30:47 +0000 (Thu, 23 Jun 2011) New Revision: 24836 Modified: check/trunk/cgi-bin/TorBulkExitList.py Log: dev/shm didn't fix anything, put it back to /tmp,which really needs to be a randomly created dir. Modified: check/trunk/cgi-bin/TorBulkExitList.py =================================================================== --- check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:49:11 UTC (rev 24835) +++ check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 11:30:47 UTC (rev 24836) @@ -9,7 +9,7 @@ DNS.ParseResolvConf() def bulkCheck(RemoteServerIP, RemotePort): - parsedExitList = "/dev/shm/TorBulkCheck/parsed-exit-list" + parsedExitList = "/tmp/TorBulkCheck/parsed-exit-list" cacheFile = parsedExitList + "-" + RemoteServerIP +\ "_" + RemotePort + ".cache" confirmedExits = [] @@ -84,8 +84,8 @@ """ maxListAge = 1600 - parsedListDirPath = "/dev/shm/TorBulkCheck/" - parsedExitList = "/dev/shm/TorBulkCheck/parsed-exit-list" + parsedListDirPath = "/tmp/TorBulkCheck/" + parsedExitList = "/tmp/TorBulkCheck/parsed-exit-list" try: parsedListDir = os.stat(parsedListDirPath)

1 0

r24835: {} add the codeswarm config files that made the movies for tor (in projects/misc/phobos: . codeswarm)
by Andrew Lewman 22 Jun '11

22 Jun '11

Author: phobos Date: 2011-06-23 02:49:11 +0000 (Thu, 23 Jun 2011) New Revision: 24835 Added: projects/misc/phobos/codeswarm/ projects/misc/phobos/codeswarm/tor-web.config projects/misc/phobos/codeswarm/tor.config Log: add the codeswarm config files that made the movies for tor website commits and tor git commits. Added: projects/misc/phobos/codeswarm/tor-web.config =================================================================== --- projects/misc/phobos/codeswarm/tor-web.config (rev 0) +++ projects/misc/phobos/codeswarm/tor-web.config 2011-06-23 02:49:11 UTC (rev 24835) @@ -0,0 +1,125 @@ +# This is a sample configuration file for code_swarm + +# Frame width +Width=640 + +# Frame height +Height=480 + +# Input file +InputFile=data/tor-website-svn.xml + +# Particle sprite file +ParticleSpriteFile=src/particle.png + +#Font Settings +Font=SansSerif +FontSize=11 +BoldFontSize=14 + +# Project time per frame +#MillisecondsPerFrame=21600000 + +# Maximum number of Background processes +MaxThreads=4 + +# Optional Method instead of MillisecondsPerFrame +FramesPerDay=4 + +# Background in R,G,B +Background=0,0,0 + +# Color assignment rules +# Keep in order, do not skip numbers. Numbers start +# at 1. +# +# Pattern: "Label", "regex", R,G,B, R,G,B +# Label is optional. If it is omitted, the regex +# will be used. +# +ColorAssign1="HTML",".*.html", 86,51,122, 86,51,122 +ColorAssign2="WML",".*.wml", 0,153,51, 0,153,51 +ColorAssign3="Text Files",".*.txt", 102,0,255, 102,0,255 +ColorAssign4="JPG",".*.jpg", 0,255,255, 0,255,255 +ColorAssign5="LaTeX",".*.tex", 255,255,0, 255,255,0 +ColorAssign6="Shell Scripts",".*.sh", 119,68,119, 119,68,119 +ColorAssign7="PDF",".*.pdf", 255,0,0, 255,0,0 +ColorAssign8="PNG",".*.png", 204,255,0, 204,255,0 +ColorAssign9="Manual Pages",".*.1", 238,102,68, 238,102,68 +ColorAssign10="Perl",".*.pl", 238,68,119, 238,68,119 + +# Save each frame to an image? +TakeSnapshots=true + +# Where to save each frame +SnapshotLocation=frames/code_swarm-#####.png + +# Draw names (combinatory) : +# Draw sharp names? +DrawNamesSharp=true +# And draw a glow around names? (Runs slower) +DrawNamesHalos=false + +# Draw files (combinatory) : +# Draw sharp files +DrawFilesSharp=false +# Draw fuzzy files +DrawFilesFuzzy=true +# Draw jelly files +DrawFilesJelly=true + +# Show the Legend at start +ShowLegend=true + +# Show the History at start +ShowHistory=true + +# Show the Date at start +ShowDate=true + +# Show edges between authors and files, mostly for debug purpose +ShowEdges=false + +# Turn on Debug counts. +ShowDebug=false + +# Natural distance of files to people +EdgeLength=75 + +# Amount of life to decrement +EdgeDecrement=-2 +FileDecrement=-2 +PersonDecrement=-1 + +#Speeds. +#Optional: NodeSpeed=7.0, If used, FileSpeed and PersonSpeed need not be set. +# +FileSpeed=7.0 +PersonSpeed=2.0 + +#Masses +FileMass=1.0 +PersonMass=10.0 + +# Life of an Edge +EdgeLife=250 + +# Life of a File +FileLife=200 + +# Life of a Person +PersonLife=255 + +# Highlight percent. +# This is the amount of time that the person or +# file will be highlighted. +HighlightPct=5 + +## Physics engine selection and configuration +# Directory physics engine config files reside in. +PhysicsEngineConfigDir=physics_engine +# Force calculation algorithms ("PhysicsEngineLegacy", "PhysicsEngineSimple"...) : +PhysicsEngineSelection=PhysicsEngineLegacy + +# OpenGL is experimental. Use at your own risk. +UseOpenGL=false Added: projects/misc/phobos/codeswarm/tor.config =================================================================== --- projects/misc/phobos/codeswarm/tor.config (rev 0) +++ projects/misc/phobos/codeswarm/tor.config 2011-06-23 02:49:11 UTC (rev 24835) @@ -0,0 +1,125 @@ +# This is a sample configuration file for code_swarm + +# Frame width +Width=640 + +# Frame height +Height=480 + +# Input file +InputFile=data/tor-git-activity.xml + +# Particle sprite file +ParticleSpriteFile=src/particle.png + +#Font Settings +Font=SansSerif +FontSize=11 +BoldFontSize=14 + +# Project time per frame +#MillisecondsPerFrame=21600000 + +# Maximum number of Background processes +MaxThreads=4 + +# Optional Method instead of MillisecondsPerFrame +FramesPerDay=4 + +# Background in R,G,B +Background=0,0,0 + +# Color assignment rules +# Keep in order, do not skip numbers. Numbers start +# at 1. +# +# Pattern: "Label", "regex", R,G,B, R,G,B +# Label is optional. If it is omitted, the regex +# will be used. +# +ColorAssign1="C Code",".*.c", 86,51,122, 86,51,122 +ColorAssign2="Headers",".*.h", 0,153,51, 0,153,51 +ColorAssign3="Text Files",".*.txt", 102,0,255, 102,0,255 +ColorAssign4="Makefile","Makefile.*", 0,255,255, 0,255,255 +ColorAssign5="LaTeX",".*.tex", 255,255,0, 255,255,0 +ColorAssign6="Shell Scripts",".*.sh", 119,68,119, 119,68,119 +ColorAssign7="PDF",".*.pdf", 255,0,0, 255,0,0 +ColorAssign8="Ruby",".*.rb", 204,255,0, 204,255,0 +ColorAssign9="Manual Pages",".*.1", 238,102,68, 238,102,68 +ColorAssign10="Perl",".*.pl", 238,68,119, 238,68,119 + +# Save each frame to an image? +TakeSnapshots=true + +# Where to save each frame +SnapshotLocation=frames/code_swarm-#####.png + +# Draw names (combinatory) : +# Draw sharp names? +DrawNamesSharp=true +# And draw a glow around names? (Runs slower) +DrawNamesHalos=false + +# Draw files (combinatory) : +# Draw sharp files +DrawFilesSharp=false +# Draw fuzzy files +DrawFilesFuzzy=true +# Draw jelly files +DrawFilesJelly=true + +# Show the Legend at start +ShowLegend=true + +# Show the History at start +ShowHistory=true + +# Show the Date at start +ShowDate=true + +# Show edges between authors and files, mostly for debug purpose +ShowEdges=false + +# Turn on Debug counts. +ShowDebug=false + +# Natural distance of files to people +EdgeLength=75 + +# Amount of life to decrement +EdgeDecrement=-2 +FileDecrement=-2 +PersonDecrement=-1 + +#Speeds. +#Optional: NodeSpeed=7.0, If used, FileSpeed and PersonSpeed need not be set. +# +FileSpeed=7.0 +PersonSpeed=2.0 + +#Masses +FileMass=1.0 +PersonMass=10.0 + +# Life of an Edge +EdgeLife=250 + +# Life of a File +FileLife=200 + +# Life of a Person +PersonLife=255 + +# Highlight percent. +# This is the amount of time that the person or +# file will be highlighted. +HighlightPct=5 + +## Physics engine selection and configuration +# Directory physics engine config files reside in. +PhysicsEngineConfigDir=physics_engine +# Force calculation algorithms ("PhysicsEngineLegacy", "PhysicsEngineSimple"...) : +PhysicsEngineSelection=PhysicsEngineLegacy + +# OpenGL is experimental. Use at your own risk. +UseOpenGL=false

1 0

r24834: {check} missed on /tmp path. (check/trunk/cgi-bin)
by Andrew Lewman 22 Jun '11

22 Jun '11

Author: phobos Date: 2011-06-23 02:36:23 +0000 (Thu, 23 Jun 2011) New Revision: 24834 Modified: check/trunk/cgi-bin/TorBulkExitList.py Log: missed on /tmp path. Modified: check/trunk/cgi-bin/TorBulkExitList.py =================================================================== --- check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:33:10 UTC (rev 24833) +++ check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:36:23 UTC (rev 24834) @@ -9,7 +9,7 @@ DNS.ParseResolvConf() def bulkCheck(RemoteServerIP, RemotePort): - parsedExitList = "/tmp/TorBulkCheck/parsed-exit-list" + parsedExitList = "/dev/shm/TorBulkCheck/parsed-exit-list" cacheFile = parsedExitList + "-" + RemoteServerIP +\ "_" + RemotePort + ".cache" confirmedExits = []

1 0

r24833: {check} at least use an IP for the client that we control. (check/trunk/cgi-bin)
by Andrew Lewman 22 Jun '11

22 Jun '11

Author: phobos Date: 2011-06-23 02:33:10 +0000 (Thu, 23 Jun 2011) New Revision: 24833 Modified: check/trunk/cgi-bin/TorBulkExitList.py Log: at least use an IP for the client that we control. Modified: check/trunk/cgi-bin/TorBulkExitList.py =================================================================== --- check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:31:32 UTC (rev 24832) +++ check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:33:10 UTC (rev 24833) @@ -144,7 +144,7 @@ return possibleExits -def isUsingTor(clientIp, ELTarget = "209.237.247.217", ELPort = "80"): +def isUsingTor(clientIp, ELTarget = "38.229.70.31", ELPort = "80"): ELExitNode = ".".join(reversed(clientIp.strip().split('.'))) ELTarget = ".".join(reversed(ELTarget.strip().split('.')))

1 0

r24832: {check} comment out RawExitListURL because it isnt used and confuses (check/trunk/cgi-bin)
by Andrew Lewman 22 Jun '11

22 Jun '11

Author: phobos Date: 2011-06-23 02:31:32 +0000 (Thu, 23 Jun 2011) New Revision: 24832 Modified: check/trunk/cgi-bin/TorBulkExitList.py Log: comment out RawExitListURL because it isnt used and confuses me, change to an actual tmpfs. Modified: check/trunk/cgi-bin/TorBulkExitList.py =================================================================== --- check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:30:21 UTC (rev 24831) +++ check/trunk/cgi-bin/TorBulkExitList.py 2011-06-23 02:31:32 UTC (rev 24832) @@ -69,7 +69,7 @@ # Someday, do a real http get request here # read into buffer, return buffer RawExitList with contents. # follow instructions from http://docs.python.org/lib/module-urllib.html - RawExitListURL = "http://exitlist.torproject.org/exitAddresses" + # RawExitListURL = "http://exitlist.torproject.org/exitAddresses" # Currently fake this and return a static file: RawExitList = '/srv/check.torproject.org/tordnsel/state/exit-addresses' @@ -84,8 +84,8 @@ """ maxListAge = 1600 - parsedListDirPath = "/tmp/TorBulkCheck/" - parsedExitList = "/tmp/TorBulkCheck/parsed-exit-list" + parsedListDirPath = "/dev/shm/TorBulkCheck/" + parsedExitList = "/dev/shm/TorBulkCheck/parsed-exit-list" try: parsedListDir = os.stat(parsedListDirPath)

1 0

r24831: {check} fix the ElTarget IP address. (check/trunk/cgi-bin)
by Andrew Lewman 22 Jun '11

22 Jun '11

Author: phobos Date: 2011-06-23 02:30:21 +0000 (Thu, 23 Jun 2011) New Revision: 24831 Modified: check/trunk/cgi-bin/TorCheck.py Log: fix the ElTarget IP address. Modified: check/trunk/cgi-bin/TorCheck.py =================================================================== --- check/trunk/cgi-bin/TorCheck.py 2011-06-21 12:58:44 UTC (rev 24830) +++ check/trunk/cgi-bin/TorCheck.py 2011-06-23 02:30:21 UTC (rev 24831) @@ -57,7 +57,7 @@ # ELPort is now set by the caller # We'll try to reach this host - ElTarget = "31.70.229.38" + ElTarget = "38.229.70.31" # This is the ExitList DNS server we want to query ELHost = "ip-port.exitlist.torproject.org"

1 0