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

[arm/master] Class and formatting interpretor refactoring
by atagar＠torproject.org 30 Aug '11

30 Aug '11

commit c8d21d593887bb537c144b71f15c7ed38f1880ed Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 29 09:50:15 2011 -0700 Class and formatting interpretor refactoring This moves around the interpretor code a bit to allow for arbitrary attribute drawing and introduce an interpretor class (needed for when implementing the '/write' option). --- src/cli/interpretorPanel.py | 41 +++++---- src/util/torInterpretor.py | 191 ++++++++++++++++++++++--------------------- 2 files changed, 121 insertions(+), 111 deletions(-) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index 95866db..02868ce 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -8,7 +8,7 @@ import curses from util import panel, textInput, torInterpretor, uiTools USAGE_INFO = "to use this panel press enter" -PROMPT_LINE = [(torInterpretor.PROMPT, torInterpretor.Formats.PROMPT), (USAGE_INFO, torInterpretor.Formats.USAGE)] +PROMPT_LINE = [torInterpretor.PROMPT, (USAGE_INFO, torInterpretor.USAGE_FORMAT)] # limits used for cropping BACKLOG_LIMIT = 100 @@ -17,34 +17,37 @@ LINES_LIMIT = 2000 # lazy loaded curses formatting constants FORMATS = {} -def getFormat(format): +def getFormat(formatAttr): """ - Provides the curses drawing attributes for a torInterpretor.Formats enum. - This returns plain formatting if the entry doesn't exist. + Provides the curses drawing attributes for torInterpretor formatting + attributes. Arguments: - format - format enum to fetch + formatAttr - list of formatting attributes """ # initializes formats if they haven't yet been loaded if not FORMATS: - FORMATS[torInterpretor.Formats.PROMPT] = curses.A_BOLD | uiTools.getColor("green") - FORMATS[torInterpretor.Formats.INPUT] = uiTools.getColor("cyan") - FORMATS[torInterpretor.Formats.INPUT_INTERPRETOR] = curses.A_BOLD | uiTools.getColor("magenta") - FORMATS[torInterpretor.Formats.INPUT_CMD] = curses.A_BOLD | uiTools.getColor("green") - FORMATS[torInterpretor.Formats.INPUT_ARG] = curses.A_BOLD | uiTools.getColor("cyan") - FORMATS[torInterpretor.Formats.OUTPUT] = uiTools.getColor("blue") - FORMATS[torInterpretor.Formats.USAGE] = uiTools.getColor("cyan") - FORMATS[torInterpretor.Formats.HELP] = uiTools.getColor("magenta") - FORMATS[torInterpretor.Formats.ERROR] = curses.A_BOLD | uiTools.getColor("red") + for colorEnum in torInterpretor.Color.values(): + FORMATS[colorEnum] = uiTools.getColor(colorEnum.lower()) + + FORMATS[torInterpretor.Attr.BOLD] = curses.A_BOLD + FORMATS[torInterpretor.Attr.UNDERLINE] = curses.A_UNDERLINE + FORMATS[torInterpretor.Attr.HILIGHT] = curses.A_STANDOUT + + cursesFormatting = curses.A_NORMAL + + for attr in formatAttr: + cursesFormatting |= FORMATS.get(attr, curses.A_NORMAL) - return FORMATS.get(format, curses.A_NORMAL) + return cursesFormatting class InterpretorPanel(panel.Panel): def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, "interpretor", 0) self.isInputMode = False self.scroll = 0 + self.interpretor = torInterpretor.ControlInterpretor() self.previousCommands = [] # user input, newest to oldest self.contents = [PROMPT_LINE] # (msg, format enum) tuples being displayed (oldest to newest) @@ -61,18 +64,18 @@ class InterpretorPanel(panel.Panel): self.redraw(True) # intercepts input so user can cycle through the history - torCommands = torInterpretor.TorCommandOptions() + torCommands = torInterpretor.TorControlCompleter() validator = textInput.BasicValidator() validator = textInput.HistoryValidator(self.previousCommands, validator) validator = textInput.TabCompleter(torCommands.getMatches, validator) - xOffset = len(torInterpretor.PROMPT) + xOffset = len(torInterpretor.PROMPT[0]) if len(self.contents) > self.maxY - 1: xOffset += 3 # offset for scrollbar inputLine = min(self.maxY - 1, len(self.contents)) - inputFormat = getFormat(torInterpretor.Formats.INPUT) + inputFormat = getFormat(torInterpretor.INPUT_FORMAT) input = self.getstr(inputLine, xOffset, "", inputFormat, validator = validator) input, isDone = input.strip(), False @@ -84,7 +87,7 @@ class InterpretorPanel(panel.Panel): self.previousCommands = self.previousCommands[:BACKLOG_LIMIT] try: - inputEntry, outputEntry = torInterpretor.handleQuery(input) + inputEntry, outputEntry = self.interpretor.handleQuery(input) except torInterpretor.InterpretorClosed: isDone = True diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index cffe200..c7bcebb 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -8,9 +8,6 @@ import readline # simply importing this provides history to raw_input from util import enum, torTools -PROMPT = ">>> " -Formats = enum.Enum("PROMPT", "INPUT", "INPUT_INTERPRETOR", "INPUT_CMD", "INPUT_ARG", "OUTPUT", "USAGE", "HELP", "ERROR") - TERM_COLORS = ("BLACK", "RED", "GREEN", "YELLOW", "BLUE", "MAGENTA", "CYAN", "WHITE") Color = enum.Enum(*TERM_COLORS) @@ -21,6 +18,16 @@ FG_ENCODING = dict([(Color.values()[i], str(30 + i)) for i in range(8)]) BG_ENCODING = dict([(BgColor.values()[i], str(40 + i)) for i in range(8)]) ATTR_ENCODING = {Attr.BOLD: "1", Attr.UNDERLINE: "4", Attr.HILIGHT: "7"} +PROMPT = (">>> ", (Attr.BOLD, Color.GREEN)) +INPUT_FORMAT = (Color.CYAN, ) +INPUT_INTERPRETOR_FORMAT = (Attr.BOLD, Color.MAGENTA) +INPUT_CMD_FORMAT = (Attr.BOLD, Color.GREEN) +INPUT_ARG_FORMAT = (Attr.BOLD, Color.CYAN) +OUTPUT_FORMAT = (Color.BLUE, ) +USAGE_FORMAT = (Color.CYAN, ) +HELP_FORMAT = (Color.MAGENTA, ) +ERROR_FORMAT = (Attr.BOLD, Color.RED) + CSI = "\x1B[%sm" RESET = CSI % "0" @@ -64,7 +71,7 @@ def format(msg, *attr): return (CSI % ";".join(encodings)) + msg + RESET else: return msg -class TorCommandOptions: +class TorControlCompleter: """ Command autocompleter, fetching the valid options from the attached Tor instance. @@ -169,12 +176,96 @@ class TorCommandOptions: if not state: return cmd else: state -= 1 +class ControlInterpretor: + """ + Interpretor that handles queries to the control port, providing usability + imporvements like irc style help optoins. This tracks input and responses. + """ + + def __init__(self): + self.queries = [] # requests made, newest to oldest + self.contents = [] # (msg, format list) tuples of both input and output (oldest to newest) + + def handleQuery(self, input): + """ + Processes the given input. Requests starting with a '/' are special + commands to the interpretor, and anything else is sent to the control port. + This returns an input/output tuple, each entry being a list of lines, each + line having a list of (msg, format) tuples for the content to be displayed. + This raises a InterpretorClosed if the interpretor should be shut down. + + Arguments: + input - user input to be processed + """ + + input = input.strip() + inputEntry, outputEntry = [PROMPT], [] + conn = torTools.getConn() + + # input falls into three general categories: + # - interpretor command which starts with a '/' + # - controller commands handled by torTools (this allows for caching, + # proper handling by the rest of arm, etc) + # - unrecognized controller command, this has the possability of confusing + # arm... + + if input.startswith("/"): + # interpretor command + inputEntry.append((input, INPUT_INTERPRETOR_FORMAT)) + outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement + + # TODO: add /help option + # TODO: add /write option + else: + # controller command + if " " in input: cmd, arg = input.split(" ", 1) + else: cmd, arg = input, "" + + # makes commands uppercase to match the spec + cmd = cmd.upper() + + inputEntry.append((cmd + " ", INPUT_CMD_FORMAT)) + if arg: inputEntry.append((arg, INPUT_ARG_FORMAT)) + + if cmd == "GETINFO": + try: + response = conn.getInfo(arg, suppressExc = False) + outputEntry.append((response, OUTPUT_FORMAT)) + except Exception, exc: + outputEntry.append((str(exc), ERROR_FORMAT)) + elif cmd == "SETCONF": + if "=" in arg: + param, value = arg.split("=", 1) + + try: + conn.setOption(param.strip(), value.strip()) + except Exception, exc: + outputEntry.append((str(exc), ERROR_FORMAT)) + else: + # TODO: resets the attribute + outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement + else: + try: + response = conn.getTorCtl().sendAndRecv("%s\r\n" % input) + + for entry in response: + # Response entries are tuples with the response code, body, and + # extra info. For instance: + # ('250', 'version=0.2.2.23-alpha (git-b85eb949b528f4d7)', None) + + if len(entry) == 3: + outputEntry.append((entry[1], OUTPUT_FORMAT)) + except Exception, exc: + outputEntry.append((str(exc), ERROR_FORMAT)) + + return (_splitOnNewlines(inputEntry), _splitOnNewlines(outputEntry)) + def prompt(): prompt = format(">>> ", Color.GREEN, Attr.BOLD) input = "" # sets up tab autocompetion - torCommands = TorCommandOptions() + torCommands = TorControlCompleter() readline.parse_and_bind("tab: complete") readline.set_completer(torCommands.complete) @@ -184,17 +275,7 @@ def prompt(): # command by itself. readline.set_completer_delims("\n") - - formatMap = {} # mapping of Format to Color and Attr enums - formatMap[Formats.PROMPT] = (Attr.BOLD, Color.GREEN) - formatMap[Formats.INPUT] = (Color.CYAN, ) - formatMap[Formats.INPUT_INTERPRETOR] = (Attr.BOLD, Color.MAGENTA) - formatMap[Formats.INPUT_CMD] = (Attr.BOLD, Color.GREEN) - formatMap[Formats.INPUT_ARG] = (Attr.BOLD, Color.CYAN) - formatMap[Formats.OUTPUT] = (Color.BLUE, ) - formatMap[Formats.USAGE] = (Color.CYAN, ) - formatMap[Formats.HELP] = (Color.MAGENTA, ) - formatMap[Formats.ERROR] = (Attr.BOLD, Color.RED) + interpretor = ControlInterpretor() while input != "/quit": try: @@ -205,90 +286,16 @@ def prompt(): print break - _, outputEntry = handleQuery(input) + _, outputEntry = interpretor.handleQuery(input) for line in outputEntry: outputLine = "" for msg, msgFormat in line: - outputLine += format(msg, *formatMap[msgFormat]) + outputLine += format(msg, *msgFormat) print outputLine -def handleQuery(input): - """ - Processes the given input. Requests starting with a '/' are special - commands to the interpretor, and anything else is sent to the control port. - This returns an input/output tuple, each entry being a list of lines, each - line having a list of (msg, format) tuples for the content to be displayed. - This raises a InterpretorClosed if the interpretor should be shut down. - - Arguments: - input - user input to be processed - """ - - input = input.strip() - inputEntry, outputEntry = [(PROMPT, Formats.PROMPT)], [] - conn = torTools.getConn() - - # input falls into three general categories: - # - interpretor command which starts with a '/' - # - controller commands handled by torTools (this allows for caching, - # proper handling by the rest of arm, etc) - # - unrecognized controller command, this has the possability of confusing - # arm... - - if input.startswith("/"): - # interpretor command - inputEntry.append((input, Formats.INPUT_INTERPRETOR)) - outputEntry.append(("Not yet implemented...", Formats.ERROR)) # TODO: implement - - # TODO: add /help option - # TODO: add /write option - else: - # controller command - if " " in input: cmd, arg = input.split(" ", 1) - else: cmd, arg = input, "" - - # makes commands uppercase to match the spec - cmd = cmd.upper() - - inputEntry.append((cmd + " ", Formats.INPUT_CMD)) - if arg: inputEntry.append((arg, Formats.INPUT_ARG)) - - if cmd == "GETINFO": - try: - response = conn.getInfo(arg, suppressExc = False) - outputEntry.append((response, Formats.OUTPUT)) - except Exception, exc: - outputEntry.append((str(exc), Formats.ERROR)) - elif cmd == "SETCONF": - if "=" in arg: - param, value = arg.split("=", 1) - - try: - conn.setOption(param.strip(), value.strip()) - except Exception, exc: - outputEntry.append((str(exc), Formats.ERROR)) - else: - # TODO: resets the attribute - outputEntry.append(("Not yet implemented...", Formats.ERROR)) # TODO: implement - else: - try: - response = conn.getTorCtl().sendAndRecv("%s\r\n" % input) - - for entry in response: - # Response entries are tuples with the response code, body, and - # extra info. For instance: - # ('250', 'version=0.2.2.23-alpha (git-b85eb949b528f4d7)', None) - - if len(entry) == 3: - outputEntry.append((entry[1], Formats.OUTPUT)) - except Exception, exc: - outputEntry.append((str(exc), Formats.ERROR)) - - return (_splitOnNewlines(inputEntry), _splitOnNewlines(outputEntry)) - def _splitOnNewlines(entry): """ Splits a list of (msg, format) tuples on newlines into a list of lines.

1 0

[arm/master] Moving content and backlog tracking to interpretor
by atagar＠torproject.org 30 Aug '11

30 Aug '11

commit 59b70998b162c461ec03780e9ca4cabdb7411af4 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 30 09:41:53 2011 -0700 Moving content and backlog tracking to interpretor The interpretor class will be tracking state so moving this information to it from the panel. This will make a common saving function feasable. --- src/cli/interpretorPanel.py | 49 +++++++++++----------------------- src/util/torInterpretor.py | 60 +++++++++++++++++++++++++++++++++++-------- 2 files changed, 65 insertions(+), 44 deletions(-) diff --git a/src/cli/interpretorPanel.py b/src/cli/interpretorPanel.py index 02868ce..cc8b496 100644 --- a/src/cli/interpretorPanel.py +++ b/src/cli/interpretorPanel.py @@ -10,17 +10,12 @@ from util import panel, textInput, torInterpretor, uiTools USAGE_INFO = "to use this panel press enter" PROMPT_LINE = [torInterpretor.PROMPT, (USAGE_INFO, torInterpretor.USAGE_FORMAT)] -# limits used for cropping -BACKLOG_LIMIT = 100 -LINES_LIMIT = 2000 - -# lazy loaded curses formatting constants +# lazy loaded mapping of interpretor attributes to curses formatting constants FORMATS = {} def getFormat(formatAttr): """ - Provides the curses drawing attributes for torInterpretor formatting - attributes. + Provides the curses drawing attributes for torInterpretor formats. Arguments: formatAttr - list of formatting attributes @@ -45,11 +40,10 @@ def getFormat(formatAttr): class InterpretorPanel(panel.Panel): def __init__(self, stdscr): panel.Panel.__init__(self, stdscr, "interpretor", 0) + self.interpretor = torInterpretor.ControlInterpretor() + self.inputCompleter = torInterpretor.TorControlCompleter() self.isInputMode = False self.scroll = 0 - self.interpretor = torInterpretor.ControlInterpretor() - self.previousCommands = [] # user input, newest to oldest - self.contents = [PROMPT_LINE] # (msg, format enum) tuples being displayed (oldest to newest) def prompt(self): """ @@ -64,17 +58,16 @@ class InterpretorPanel(panel.Panel): self.redraw(True) # intercepts input so user can cycle through the history - torCommands = torInterpretor.TorControlCompleter() - validator = textInput.BasicValidator() - validator = textInput.HistoryValidator(self.previousCommands, validator) - validator = textInput.TabCompleter(torCommands.getMatches, validator) + validator = textInput.HistoryValidator(list(reversed(self.interpretor.getBacklog())), validator) + validator = textInput.TabCompleter(self.inputCompleter.getMatches, validator) xOffset = len(torInterpretor.PROMPT[0]) - if len(self.contents) > self.maxY - 1: + displayLength = len(self.interpretor.getDisplayContents(PROMPT_LINE)) + if displayLength > self.maxY - 1: xOffset += 3 # offset for scrollbar - inputLine = min(self.maxY - 1, len(self.contents)) + inputLine = min(self.maxY - 1, displayLength) inputFormat = getFormat(torInterpretor.INPUT_FORMAT) input = self.getstr(inputLine, xOffset, "", inputFormat, validator = validator) input, isDone = input.strip(), False @@ -83,22 +76,10 @@ class InterpretorPanel(panel.Panel): # terminate input when we get a blank line isDone = True else: - self.previousCommands.insert(0, input) - self.previousCommands = self.previousCommands[:BACKLOG_LIMIT] - try: inputEntry, outputEntry = self.interpretor.handleQuery(input) except torInterpretor.InterpretorClosed: isDone = True - - promptEntry = self.contents.pop() # removes old prompt entry - self.contents += inputEntry - self.contents += outputEntry - self.contents.append(promptEntry) - - # if too long then crop lines - cropLines = len(self.contents) - LINES_LIMIT - if cropLines > 0: self.contents = self.contents[cropLines:] if isDone: self.isInputMode = False @@ -112,7 +93,8 @@ class InterpretorPanel(panel.Panel): self.prompt() elif uiTools.isScrollKey(key) and not self.isInputMode: pageHeight = self.getPreferredSize()[0] - 1 - newScroll = uiTools.getScrollPosition(key, self.scroll, pageHeight, len(self.contents)) + displayLength = len(self.interpretor.getDisplayContents(PROMPT_LINE)) + newScroll = uiTools.getScrollPosition(key, self.scroll, pageHeight, displayLength) if self.scroll != newScroll: self.scroll = newScroll @@ -127,17 +109,18 @@ class InterpretorPanel(panel.Panel): self.addstr(0, 0, "Control Interpretor%s:" % usageMsg, curses.A_STANDOUT) xOffset = 0 - if len(self.contents) > height - 1: + displayContents = self.interpretor.getDisplayContents(PROMPT_LINE) + if len(displayContents) > height - 1: # if we're in input mode then make sure the last line is visible if self.isInputMode: - self.scroll = len(self.contents) - height + 1 + self.scroll = len(displayContents) - height + 1 xOffset = 3 - self.addScrollBar(self.scroll, self.scroll + height - 1, len(self.contents), 1) + self.addScrollBar(self.scroll, self.scroll + height - 1, len(displayContents), 1) # draws prior commands and output drawLine = 1 - for entry in self.contents[self.scroll:]: + for entry in displayContents[self.scroll:]: cursor = xOffset for msg, formatEntry in entry: diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index c7bcebb..e062532 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -31,6 +31,10 @@ ERROR_FORMAT = (Attr.BOLD, Color.RED) CSI = "\x1B[%sm" RESET = CSI % "0" +# limits used for cropping +BACKLOG_LIMIT = 100 +CONTENT_LIMIT = 2000 + class InterpretorClosed(Exception): """ Exception raised when the interpretor should be shut down. @@ -92,11 +96,10 @@ class TorControlCompleter: if line.startswith("config/*") or line.startswith("dir-usage"): continue - # strips off the ending asterisk if it accepts a value infoOpt = line.split(" ", 1)[0] - if infoOpt.endswith("*"): - infoOpt = infoOpt[:-1] + # strips off the ending asterisk if it accepts a value + if infoOpt.endswith("*"): infoOpt = infoOpt[:-1] self.commands.append("GETINFO %s" % infoOpt) else: self.commands.append("GETINFO ") @@ -157,7 +160,7 @@ class TorControlCompleter: def getMatches(self, text): """ - Provides all options that match the given input. + Provides all options that match the given input. This is case insensetive. Arguments: text - user input text to be matched against @@ -171,10 +174,9 @@ class TorControlCompleter: the readlines set_completer function. """ - for cmd in self.commands: - if cmd.lower().startswith(text.lower()): - if not state: return cmd - else: state -= 1 + for cmd in self.getMatches(text): + if not state: return cmd + else: state -= 1 class ControlInterpretor: """ @@ -183,8 +185,29 @@ class ControlInterpretor: """ def __init__(self): - self.queries = [] # requests made, newest to oldest - self.contents = [] # (msg, format list) tuples of both input and output (oldest to newest) + self.backlog = [] # prior requests the user has made + self.contents = [] # (msg, format list) tuples for what's been displayed + + def getBacklog(self): + """ + Provides the backlog of prior user input. + """ + + return self.backlog + + def getDisplayContents(self, appendPrompt = None): + """ + Provides a list of lines to be displayed, each being a list of (msg, + format) tuples for the content to be displayed. This is ordered as the + oldest to newest. + + Arguments: + appendPrompt - adds the given line to the end + """ + + if appendPrompt: + return self.contents + [appendPrompt] + else: return self.contents def handleQuery(self, input): """ @@ -199,6 +222,12 @@ class ControlInterpretor: """ input = input.strip() + + # appends new input, cropping if too long + self.backlog.append(input) + backlogCrop = len(self.backlog) - BACKLOG_LIMIT + if backlogCrop > 0: self.backlog = self.backlog[backlogCrop:] + inputEntry, outputEntry = [PROMPT], [] conn = torTools.getConn() @@ -258,7 +287,16 @@ class ControlInterpretor: except Exception, exc: outputEntry.append((str(exc), ERROR_FORMAT)) - return (_splitOnNewlines(inputEntry), _splitOnNewlines(outputEntry)) + # converts to lists split on newlines + inputLines = _splitOnNewlines(inputEntry) + outputLines = _splitOnNewlines(outputEntry) + + # appends new contents, cropping if too long + self.contents += inputLines + outputLines + cropLines = len(self.contents) - CONTENT_LIMIT + if cropLines > 0: self.contents = self.contents[cropLines:] + + return (inputLines, outputLines) def prompt(): prompt = format(">>> ", Color.GREEN, Attr.BOLD)

1 0

[arm/master] Implementing /quit option
by atagar＠torproject.org 30 Aug '11

30 Aug '11

commit 8f4e5b819302db174881fa0d630cf0d0c31ce942 Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 30 09:49:45 2011 -0700 Implementing /quit option --- src/util/torInterpretor.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index e062532..d73e84f 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -241,7 +241,11 @@ class ControlInterpretor: if input.startswith("/"): # interpretor command inputEntry.append((input, INPUT_INTERPRETOR_FORMAT)) - outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement + + if input == "/quit": + raise InterpretorClosed() + else: + outputEntry.append(("Not yet implemented...", ERROR_FORMAT)) # TODO: implement # TODO: add /help option # TODO: add /write option @@ -315,17 +319,16 @@ def prompt(): readline.set_completer_delims("\n") interpretor = ControlInterpretor() - while input != "/quit": + while True: try: input = raw_input(prompt) + _, outputEntry = interpretor.handleQuery(input) except: # moves cursor to the next line and terminates (most commonly # KeyboardInterrupt and EOFErro) print break - _, outputEntry = interpretor.handleQuery(input) - for line in outputEntry: outputLine = ""

1 0

[arm/master] Providing a startup message for interpretor prompt
by atagar＠torproject.org 30 Aug '11

30 Aug '11

commit ad5afa2a945a36a6b1b04e78a91e83876a77301a Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Aug 30 09:57:31 2011 -0700 Providing a startup message for interpretor prompt Simple message giving arm's version and mentoining the /help and /quit options. --- src/util/torInterpretor.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/util/torInterpretor.py b/src/util/torInterpretor.py index d73e84f..266e9e4 100644 --- a/src/util/torInterpretor.py +++ b/src/util/torInterpretor.py @@ -6,8 +6,14 @@ directly, history and tab completion. import readline # simply importing this provides history to raw_input +import version + from util import enum, torTools +INIT_MSG = """Arm %s Control Interpretor +Enter \"/help\" for usage information and \"/quit\" to stop. +""" % version.VERSION + TERM_COLORS = ("BLACK", "RED", "GREEN", "YELLOW", "BLUE", "MAGENTA", "CYAN", "WHITE") Color = enum.Enum(*TERM_COLORS) @@ -319,6 +325,8 @@ def prompt(): readline.set_completer_delims("\n") interpretor = ControlInterpretor() + print INIT_MSG + while True: try: input = raw_input(prompt)

1 0

r24997: {translation} we want to pull translated po not pot (translation/trunk/projects/website/po/.tx)
by Runa Sandvik 30 Aug '11

30 Aug '11

Author: runa Date: 2011-08-30 16:32:15 +0000 (Tue, 30 Aug 2011) New Revision: 24997 Modified: translation/trunk/projects/website/po/.tx/config Log: we want to pull translated po not pot Modified: translation/trunk/projects/website/po/.tx/config =================================================================== --- translation/trunk/projects/website/po/.tx/config 2011-08-30 15:13:48 UTC (rev 24996) +++ translation/trunk/projects/website/po/.tx/config 2011-08-30 16:32:15 UTC (rev 24997) @@ -327,12 +327,12 @@ source_lang = en [torproject.4-press-2011-08-28-tor-022-stable-pot] -file_filter = <lang>/press/4-optional.2011-08-28-tor-022-stable.pot +file_filter = <lang>/press/4-optional.2011-08-28-tor-022-stable.po source_file = templates/press/4-optional.2011-08-28-tor-022-stable.pot source_lang = en [torproject.3-website-donate-thankyou-pot] -file_filter = <lang>/donate/3-low.thankyou.pot +file_filter = <lang>/donate/3-low.thankyou.po source_file = templates/donate/3-low.thankyou.pot source_lang = en

1 0

r24996: {website} Adding GSoC students to volunteer page (website/trunk/about/en)
by Damian Johnson 30 Aug '11

30 Aug '11

Author: atagar Date: 2011-08-30 15:13:48 +0000 (Tue, 30 Aug 2011) New Revision: 24996 Modified: website/trunk/about/en/volunteers.wml Log: Adding GSoC students to volunteer page Modified: website/trunk/about/en/volunteers.wml =================================================================== --- website/trunk/about/en/volunteers.wml 2011-08-30 08:43:39 UTC (rev 24995) +++ website/trunk/about/en/volunteers.wml 2011-08-30 15:13:48 UTC (rev 24996) @@ -12,6 +12,13 @@ <div id="maincol"> <h1>Volunteers</h1> <dl> +<dt>Google Summer of Code, 2011</dt><dd> +Brandon Wiley - <a href="http://stepthreeprivacy.tumblr.com/">Blocking-resistant Transport Evaluation Framework</a> +George Kadianakis - <a href="https://gitorious.org/obfsproxy/pages/Home">Pluggable transports</a> +Julien Voisin - <a href="http://mat-tor.blogspot.com/">Metadata Anonymisation Toolkit</a> +Kamran Khan - <a href="http://code.inspirated.com/gsoc/">GTK+ Frontend and Client Mode Improvements for arm</a> +Max - <a href="https://tails.boum.org/todo/TailsGreeter/blog/">Custom GDM3 startup menu, aka. tails-greeter</a> +Sathya Gunasekaran - <a href="http://gsathya.in/blog/">GSoC : Orbot + ORLib</a></dd> <dt>Anonym, bertagaz, and intrigeri</dt><dd>Maintainers of <a href="https://tails.boum.org/">The Amnesic Incognito Live System</a>.</dd> <dt>Marco Bonetti</dt><dd>Focusing on MobileTor for the iPhone.</dd>

1 0

[metrics-web/master] Reorder blog posts, so that the newest are on top.
by karsten＠torproject.org 30 Aug '11

30 Aug '11

commit 22f25bc48e0794227465ef5a2e9631545fc67013 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 30 12:09:34 2011 +0200 Reorder blog posts, so that the newest are on top. --- web/WEB-INF/papers.jsp | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/WEB-INF/papers.jsp b/web/WEB-INF/papers.jsp index a7c005a..558d616 100644 --- a/web/WEB-INF/papers.jsp +++ b/web/WEB-INF/papers.jsp @@ -99,12 +99,12 @@ research or describe new interesting research questions that can (partly) be answered with metrics data. <ul> - <li>Research problem: measuring the safety of the Tor network - (<a href="https://blog.torproject.org/blog/research-problem-measuring-safety-tor-netw…">link</a>, - February 5, 2011).</li> <li>Research problem: better guard rotation parameters (<a href="https://blog.torproject.org/blog/research-problem-better-guard-rotation-par…">link</a>, August 20, 2011).</li> + <li>Research problem: measuring the safety of the Tor network + (<a href="https://blog.torproject.org/blog/research-problem-measuring-safety-tor-netw…">link</a>, + February 5, 2011).</li> </ul> </div> </div>

1 0

[metrics-web/master] Add Roger's guard blog post.
by karsten＠torproject.org 30 Aug '11

30 Aug '11

commit 3785b74fd2f90557c6a9c6d306afd3efe2e7a5fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 30 12:04:43 2011 +0200 Add Roger's guard blog post. --- web/WEB-INF/papers.jsp | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/WEB-INF/papers.jsp b/web/WEB-INF/papers.jsp index a4ce6c2..a7c005a 100644 --- a/web/WEB-INF/papers.jsp +++ b/web/WEB-INF/papers.jsp @@ -102,6 +102,9 @@ <li>Research problem: measuring the safety of the Tor network (<a href="https://blog.torproject.org/blog/research-problem-measuring-safety-tor-netw…">link</a>, February 5, 2011).</li> + <li>Research problem: better guard rotation parameters + (<a href="https://blog.torproject.org/blog/research-problem-better-guard-rotation-par…">link</a>, + August 20, 2011).</li> </ul> </div> </div>

1 0

[metrics-web/master] Add data formats page to the website.
by karsten＠torproject.org 30 Aug '11

30 Aug '11

commit b4229122520556f26e5eb3d3e67abc0e49d988ca Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 30 11:29:00 2011 +0200 Add data formats page to the website. --- etc/web.xml | 11 + .../ernie/web/ResearchFormatsServlet.java | 16 + web/WEB-INF/banner.jsp | 4 + web/WEB-INF/data.jsp | 21 +- web/WEB-INF/formats.jsp | 852 ++++++++++++++++++++ 5 files changed, 898 insertions(+), 6 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index dbaa0a2..5c48bc0 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -108,6 +108,17 @@ </servlet-mapping> <servlet> + <servlet-name>ResearchFormats</servlet-name> + <servlet-class> + org.torproject.ernie.web.ResearchFormatsServlet + </servlet-class> + </servlet> + <servlet-mapping> + <servlet-name>ResearchFormats</servlet-name> + <url-pattern>/formats.html</url-pattern> + </servlet-mapping> + + <servlet> <servlet-name>Status</servlet-name> <servlet-class> org.torproject.ernie.web.StatusServlet diff --git a/src/org/torproject/ernie/web/ResearchFormatsServlet.java b/src/org/torproject/ernie/web/ResearchFormatsServlet.java new file mode 100644 index 0000000..f61b7e5 --- /dev/null +++ b/src/org/torproject/ernie/web/ResearchFormatsServlet.java @@ -0,0 +1,16 @@ +package org.torproject.ernie.web; + +import javax.servlet.*; +import javax.servlet.http.*; +import java.io.*; + +public class ResearchFormatsServlet extends HttpServlet { + public void doGet(HttpServletRequest request, + HttpServletResponse response) throws IOException, ServletException { + + /* Forward the request to the JSP that does all the hard work. */ + request.getRequestDispatcher("WEB-INF/formats.jsp").forward(request, + response); + } +} + diff --git a/web/WEB-INF/banner.jsp b/web/WEB-INF/banner.jsp index 048ac5b..da3b705 100644 --- a/web/WEB-INF/banner.jsp +++ b/web/WEB-INF/banner.jsp @@ -59,6 +59,7 @@ <%} else if (currentPage.endsWith("research.jsp") || currentPage.endsWith("papers.jsp") || currentPage.endsWith("data.jsp") || + currentPage.endsWith("formats.jsp") || currentPage.endsWith("tools.jsp")) { %> @@ -68,6 +69,9 @@ <a <%if (currentPage.endsWith("data.jsp")) { %>class="current"<%} else {%> href="/data.html"<%} %>>Data</a> + <a <%if (currentPage.endsWith("formats.jsp")) { + %>class="current"<%} else {%> href="/formats.html"<%} + %>>Formats</a> <a <%if (currentPage.endsWith("tools.jsp")) { %>class="current"<%} else {%> href="/tools.html"<%} %>>Tools</a> diff --git a/web/WEB-INF/data.jsp b/web/WEB-INF/data.jsp index 85cd3cc..1cccf2c 100644 --- a/web/WEB-INF/data.jsp +++ b/web/WEB-INF/data.jsp @@ -38,7 +38,8 @@ The relay descriptor archives contain all documents that the directory authorities make available about the network of relays. These documents include network statuses, server (relay) - descriptors, and extra-info descriptors: + descriptors, and extra-info descriptors. + The data formats are described <a href="formats.html">here</a>. <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> <c:forEach var="item" items="${relayDescriptors}" > <fmt:formatDate var="longDate" pattern="MMMM yyyy" @@ -132,7 +133,9 @@ country codes and including those in the sanitized descriptors, because it was tough to maintain; if your research requires this or any other detail, contact us and we'll sort something out. The - files below contain all documents of a given month: + files below contain all documents of a given month. + The sanitizing process is described + <a href="formats.html#bridgedesc">here</a>. <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> <c:forEach var="item" items="${bridgeDescriptors}" > <fmt:formatDate var="longDate" pattern="MMMM yyyy" @@ -157,6 +160,8 @@ they are assigned to a local file. We are archiving sanitized versions of these files here to analyze how the pool assignment affects a bridge's usage. + The data format and sanitizing process is described + <a href="formats.html#bridgepool">here</a>. <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> <c:forEach var="item" items="${bridgePoolAssignments}" > <fmt:formatDate var="longDate" pattern="MMMM yyyy" @@ -177,7 +182,9 @@ recording the time needed to do so. These measurements take place on moria, siv, and torperf and use an unmodified Tor client. The files below contain the output of the torperf application and are - updated every hour: + updated every hour. + The data format is described + <a href="formats.html#torperf">here</a>. <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> <c:forEach var="item" items="${torperfData}" > <tr> @@ -238,9 +245,11 @@ <h3>Exit lists</h3> We are archiving the bulk exit lists used by - <a href="https://check.torproject.org/">Tor Check</a> (see - <a href="https://www.torproject.org/tordnsel/exitlist-spec.txt">exitlist-spec.txt</a>) - containing the IP addresses that exit relays exit from: + <a href="https://check.torproject.org/">Tor Check</a> + containing the IP addresses that exit relays exit from. + The data format is described in + <a href="https://www.torproject.org/tordnsel/exitlist-spec.txt">exitlist-spec.txt</a> + and <a href="formats.html#exitlist">here</a>. <table width="100%" border="0" cellpadding="5" cellspacing="0" summary=""> <c:forEach var="item" items="${exitLists}" > <fmt:formatDate var="longDate" pattern="MMMM yyyy" diff --git a/web/WEB-INF/formats.jsp b/web/WEB-INF/formats.jsp new file mode 100644 index 0000000..0326d5b --- /dev/null +++ b/web/WEB-INF/formats.jsp @@ -0,0 +1,852 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> + <title>Tor Metrics Portal: Data Formats</title> + <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> + <link href="/css/stylesheet-ltr.css" type="text/css" rel="stylesheet"> + <link href="/images/favicon.ico" type="image/x-icon" rel="shortcut icon"> +</head> +<body> +<div class="center"> +<%@ include file="banner.jsp"%> +<div class="main-column"> +<h2>Tor Metrics Portal: Data Formats</h2> + + + +Statistical analysis in the Tor network can be performed using various +kinds of data. +This page gives an overview of three major data sources for +statistics in the Tor network: + +<ol> +<li>First, we recap measuring the Tor network from public directory +information (<a href="papers/hotpets09.pdf">PDF</a>) by describing the +data format of +<a href="#serverdesc">server descriptors and network statuses</a>, +and we explain the sanitzation process of (non-public) +<a href="#bridgedesc">bridge directory information</a>.</li> +<li>Second, we describe the numerous aggregate statistics that relays +publish about their usage (<a href="papers/wecsr10.pdf">PDF</a>), +including +<a href="#bytehist">byte histories</a>, +<a href="#dirreqstats">directory request statistics</a>, +<a href="#entrystats">connecting client statistics</a>, +<a href="#bridgestats">bridge user statistics</a>, +<a href="#cellstats">cell-queue statistics</a>, +<a href="#exitstats">exit-port statistics</a>, and +<a href="#bidistats">bidirectional connection use</a>.</li> +<li>Third, we delineate the output of various Tor services like +<a href="#bridgepool">BridgeDB</a>, +<a href="#gettor">GetTor</a>, or +<a href="#exitlist">Tor Check</a> as well as specific measurement tools like +<a href="#torperf">Torperf</a>.</li> +</ol> + + +All data described in this report are available for download on the +<a href="data.html">data</a> page. +This page is based on a technical report +(<a href="papers/data-2011-03-14.pdf">PDF</a>) +and is very likely more recent than the report. + +<hr> + + +<a name="serverdesc"></a> +<h3>Server descriptors and network statuses</h3> + + +Relays in the Tor network report their capabilities by publishing server +descriptors to the directory authorities. +The directory authorities confirm reachability of relays and assign flags +to help clients make good path selections. +Every hour, the directory authorities publish a network status consensus +with all known running relays at the time. +Both server descriptors and network statuses constitute a solid data basis +for statistical analysis in the Tor network. +We described the approach to measure the Tor network from public directory +information in the HotPETS 2009 paper +(<a href="papers/hotpets09.pdf">PDF</a>) and provide interactive +<a href="graphs.html">graphs</a> on the metrics +website. +We briefly describe the most interesting pieces of the +two descriptor formats that can be used for statistics. + + + +The server descriptors published by relays at least once every 18 hours +contain the necessary information for clients to build circuits using a +given relay. +These server descriptors can also be useful for statistical analysis of +the Tor network infrastructure. + + + +We assume that the majority of server descriptors are correct. +But when performing statistical analysis on server descriptors, one has to +keep in mind that only a small subset of the information written to server +descriptors is confirmed by the trusted directory authorities. +In theory, relays can provide false information in their server +descriptors, even though the incentive to do so is probably low. + + +<blockquote> + +Server descriptor published by relay <tt>blugmagie</tt> (without +cryptographic keys and hashes): + + +<tt>router blutmagie 192.251.226.206 443 0 80</tt> +<tt>platform Tor 0.2.2.20-alpha on Linux x86_64</tt> +<tt>opt protocols Link 1 2 Circuit 1</tt> +<tt>published 2010-12-27 14:35:27</tt> +<tt>opt fingerprint 6297 B13A 687B 521A 59C6 BD79 188A 2501 EC03 A065</tt> +<tt>uptime 445412</tt> +<tt>bandwidth 14336000 18432000 15905178</tt> +<tt>opt extra-info-digest 5C1D5D6F8B243304079BC15CD96C7FCCB88322D4</tt> +<tt>opt caches-extra-info</tt> +<tt>onion-key</tt> +<tt>[...]</tt> +<tt>signing-key</tt> +<tt>[...]</tt> +<tt>family $66CA87E164F1CFCE8C3BB5C095217A28578B8BAF + $67EC84376D9C4C467DCE8621AACA109160B5264E + $7B698D327F1695590408FED95CDEE1565774D136</tt> +<tt>opt hidden-service-dir</tt> +<tt>contact abuse(a)blutmagie.de</tt> +<tt>reject 0.0.0.0/8:*</tt> +<tt>reject 169.254.0.0/16:*</tt> +<tt>reject 127.0.0.0/8:*</tt> +<tt>reject 192.168.0.0/16:*</tt> +<tt>reject 10.0.0.0/8:*</tt> +<tt>reject 172.16.0.0/12:*</tt> +<tt>reject 192.251.226.206:*</tt> +<tt>reject *:25</tt> +<tt>reject *:119</tt> +<tt>reject *:135-139</tt> +<tt>reject *:445</tt> +<tt>reject *:465</tt> +<tt>reject *:563</tt> +<tt>reject *:587</tt> +<tt>reject *:1214</tt> +<tt>reject *:4661-4666</tt> +<tt>reject *:6346-6429</tt> +<tt>reject *:6660-6999</tt> +<tt>accept *:*</tt> +<tt>router-signature</tt> +<tt>[...]</tt> + +</blockquote> + + +The document above shows an example server descriptor. +The following data fields in server descriptors may be relevant to +statistical analysis: + + +<ul> +<li>IP address and ports: Relays provide their IP address +and ports where they accept requests to build circuits and directory +requests. +These data fields are contained in the first line of a server descriptor +starting with <tt>router</tt>. +Note that in rare cases, the IP address provided here can be different +from the IP address used for exiting to the Internet. +The latter can be found in the exit lists produced by Tor Check as +described in the <a href="#exitlist">Tor Check exit lists</a> section below. +</li> +<li>Operating system and Tor software version: Relays include +their operating system and Tor software version in their server +descriptors in the <tt>platform</tt> line. +While this information is very likely correct in most cases, a few relay +operators may try to impede hacking attempts by providing false platform +strings.</li> +<li>Uptime: Relays include the number of seconds since the +last restart in their server descriptor in the <tt>uptime</tt> line.</li> +<li>Own measured bandwidth: Relays report the bandwidth that +they are willing to provide on average and for short periods of time. +Relays also perform periodic bandwidth self-tests and report their actual +available bandwidth. +The latter was used by clients to weight relays in the path selection +algorithm and was sometimes subject to manipulation by malicious relays. +All three bandwidth values can be found in a server descriptor's +<tt>bandwidth</tt> line. +With the introduction of +<a href="http://gitweb.torproject.org/torflow.git/">bandwidth scanners</a>, the self-reported relay +bandwidth in server descriptors has become less +relevant.</li> +<li>Relay family: Some relay operators who run more than one +relay organize their relays in relay families, so that clients don't pick +more than one of these relays for a single circuit. +Each relay belonging to a relay family lists the members of that family +either by nickname or fingerprint in its server descriptor in the +<tt>family</tt> line.</li> +<li>Exit policy: Relays define their exit policy by including +firewall-like rules which outgoing connections they reject or accept in +the <tt>reject</tt> and <tt>accept</tt> lines.</li> +</ul> + + +These are just a subset of the fields in a server descriptor that seem +relevant for statistical analysis. +For a complete list of fields in server descriptors, see the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory +protocol specification</a>. + + + +Every hour, the directory authorities publish a new network status that +contains a list of all running relays. +The directory authorities confirm reachability of the contained relays and +assign flags based on the relays' characteristics. +The entries in a network status reference the last published server +descriptor of a relay. + + + +The network statuses are relevant for statistical analysis, because they +constitute trusted snapshots of the Tor network. +Anyone can publish as many server descriptors as they want, but only the +directory authorities can confirm that a relay was running at a given +time. +Most statistics on the Tor network infrastructure rely on network statuses +and possibly combine them with the referenced server descriptors. +The document below shows the network status entry referencing +the server descriptor above. +In addition to the reachability information, network statuses contain the +following fields that may be relevant for statistical analysis: + + +<blockquote> + +Network status entry of relay <tt>blutmagie</tt>: + + +<tt>r blutmagie YpexOmh7UhpZxr15GIolAewDoGU + lFY7WmD/yvVFp9drmZzNeTxZ6dw 2010-12-27 14:35:27 192.251.226.206 + 443 80</tt> +<tt>s Exit Fast Guard HSDir Named Running Stable V2Dir Valid</tt> +<tt>v Tor 0.2.2.20-alpha</tt> +<tt>w Bandwidth=30800</tt> +<tt>p reject 25,119,135-139,445,465,563,587,1214,4661-4666,6346-6429, + 6660-6999</tt> + +</blockquote> + +<ul> +<li>Relay flags: The directory authorities assign flags to +relays based on their characteristics to the line starting with <tt>s</tt>. +Examples are the <tt>Exit</tt> flag if a relay permits exiting to the +Internet and the <tt>Guard</tt> flag if a relay is stable enough to be +picked as guard node</li> +<li>Relay version: The directory authorities include the +version part of the platform string written to server descriptors in the +network status in the line starting with <tt>v</tt>.</li> +<li>Bandwidth weights: The network status contains a bandwidth +weight for every relay in the lines with <tt>w</tt> that clients shall use +for weighting relays in their path selection algorithm. +This bandwidth weight is either the self-reported bandwidth of the relay +or the bandwidth measured by the bandwidth scanners.</li> +<li>Exit policy summary: Every entry in a network status +contains a summary version of a relay's exit policy in the line starting +with <tt>p</tt>. +This summary is a list of accepted or rejected ports for exit to most IP +addresses.</li> +</ul> +<hr> + + +<a name="bridgedesc"></a> +<h3>Sanitized bridge descriptors</h3> + +Bridges in the Tor network publish server descriptors to the bridge +authority which in turn generates a bridge network status. +We cannot, however, make the bridge server descriptors and bridge network +statuses available for statistical analysis as we do with the relay server +descriptors and relay network statuses. +The problem is that bridge server descriptors and network statuses contain +bridge IP addresses and other sensitive information that shall not be made +publicly available. +We therefore sanitize bridge descriptors by removing all potentially +identifying information and publish sanitized versions of the descriptors. +The processing steps for sanitizing bridge descriptors are as follows: + +<ol> +<li>Replace the bridge identity with its SHA1 value: Clients +can request a bridge's current descriptor by sending its identity string +to the bridge authority. +This is a feature to make bridges on dynamic IP addresses useful. +Therefore, the original identities (and anything that could be used to +derive them) need to be removed from the descriptors. +The bridge identity is replaced with its SHA1 hash value. +The idea is to have a consistent replacement that remains stable over +months or even years (without keeping a secret for a keyed hash function).</li> +<li>Remove all cryptographic keys and signatures: It would be +straightforward to learn about the bridge identity from the bridge's +public key. +Replacing keys by newly generated ones seemed to be unnecessary (and would +involve keeping a state over months/years), so that all cryptographic +objects have simply been removed.</li> +<li>Replace IP address with IP address hash: Of course, the IP +address needs to be removed, too. +It is replaced with <tt>10.x.x.x</tt> with <tt>x.x.x</tt> being the 3 byte +output of <tt>H(IP address | bridge identity | secret)[:3]</tt>. +The input <tt>IP address</tt> is the 4-byte long binary representation of +the bridge's current IP address. +The <tt>bridge identity</tt> is the 20-byte long binary representation of +the bridge's long-term identity fingerprint. +The <tt>secret</tt> is a 31-byte long secure random string that changes once +per month for all descriptors and statuses published in that month. +<tt>H()</tt> is SHA-256. +The <tt>[:3]</tt> operator means that we pick the 3 most significant bytes +of the result.</li> +<li>Replace contact information: If there is contact +information in a descriptor, the contact line is changed to +<tt>somebody</tt>.</li> +<li>Replace nickname with Unnamed: The bridge nicknames might +give hints on the location of the bridge if chosen without care; e.g. a +bridge nickname might be very similar to the operators' relay nicknames +which might be located on adjacent IP addresses. +All bridge nicknames are therefore replaced with the string +<tt>Unnamed</tt>.</li> +</ol> + + +The two documents below show an example bridge server +descriptor that is referenced from a bridge network status entry. +For more details about this process, see the +<a href="https://gitweb.torproject.org/metrics-db.git">metrics data processor</a> software. + + +<blockquote> + +Sanitized bridge server descriptor: + + +<tt>router Unnamed 10.74.150.129 443 0 0</tt> +<tt>platform Tor 0.2.2.19-alpha (git-1988927edecce4c7) on Linux i686</tt> +<tt>opt protocols Link 1 2 Circuit 1</tt> +<tt>published 2010-12-27 18:55:01</tt> +<tt>opt fingerprint A5FA 7F38 B02A 415E 72FE 614C 64A1 E5A9 2BA9 9BBD</tt> +<tt>uptime 2347112</tt> +<tt>bandwidth 5242880 10485760 1016594</tt> +<tt>opt extra-info-digest 86E6E9E68707AF586FFD09A36FAC236ADA0D11CC</tt> +<tt>opt hidden-service-dir</tt> +<tt>contact somebody</tt> +<tt>reject *:*</tt> + +</blockquote> + +<blockquote> + +Sanitized bridge network status entry: + + +<tt>r Unnamed pfp/OLAqQV5y/mFMZKHlqSupm70 dByzfWWLas9cen7PtZ3XGYIJHt4 + 2010-12-27 18:55:01 10.74.150.129 443 0</tt> +<tt>s Fast Guard HSDir Running Stable Valid</tt> + +</blockquote> +<hr> + + +<a name="bytehist"></a> +<h3>Byte histories</h3> + + +Relays include aggregate statistics in their descriptors that they upload +to the directory authorities. +These aggregate statistics are contained in extra-info descriptors that +are published in companion with server descriptors. +Extra-info descriptors are not required for clients to build circuits. +An extra-info descriptor belonging to a server descriptor is referenced by +its SHA1 hash value. + + + +Byte histories were the first statistical data that relays published about +their usage. +Relays report the number of written and read bytes in 15-minute intervals +throughout the last 24 hours. +The extra-info descriptor in the document below contains the byte +histories in the two lines starting with <tt>write-history</tt> and +<tt>read-history</tt>. +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + + +<blockquote> + +Extra-info descriptor published by relay <tt>blutmagie</tt> +(without cryptographic signature and with long lines being truncated): + + +<tt>extra-info blutmagie 6297B13A687B521A59C6BD79188A2501EC03A065</tt> +<tt>published 2010-12-27 14:35:27</tt> +<tt>write-history 2010-12-27 14:34:05 (900 s) 12902389760,12902402048,12859373568,12894131200,[...]</tt> +<tt>read-history 2010-12-27 14:34:05 (900 s) 12770249728,12833485824,12661140480,12872439808,[...]</tt> +<tt>dirreq-write-history 2010-12-27 14:26:13 (900 s) 51731456,60808192,56740864,54948864,[...]</tt> +<tt>dirreq-read-history 2010-12-27 14:26:13 (900 s) 4747264,4767744,4511744,4752384,[...]</tt> +<tt>dirreq-stats-end 2010-12-27 10:51:09 (86400 s)</tt> +<tt>dirreq-v3-ips us=2000,de=1344,fr=744,kr=712,[...]</tt> +<tt>dirreq-v2-ips ??=8,au=8,cn=8,cz=8,[...]</tt> +<tt>dirreq-v3-reqs us=2368,de=1680,kr=1048,fr=800,[...]</tt> +<tt>dirreq-v2-reqs id=48,??=8,au=8,cn=8,[...]</tt> +<tt>dirreq-v3-resp ok=12504,not-enough-sigs=0,unavailable=0,not-found=0,not-modified=0,busy=128</tt> +<tt>dirreq-v2-resp ok=64,unavailable=0,not-found=8,not-modified=0,busy=8</tt> +<tt>dirreq-v2-share 1.03%</tt> +<tt>dirreq-v3-share 1.03%</tt> +<tt>dirreq-v3-direct-dl complete=316,timeout=4,running=0,min=4649,d1=36436,d2=68056,q1=76600,d3=87891,d4=131294,md=173579,d6=229695,d7=294528,q3=332053,d8=376301,d9=530252,max=2129698</tt> +<tt>dirreq-v2-direct-dl complete=16,timeout=52,running=0,min=9769,d1=9769,d2=9844,q1=9981,d3=9981,d4=27297,md=33640,d6=60814,d7=205884,q3=205884,d8=361137,d9=628256,max=956009</tt> +<tt>dirreq-v3-tunneled-dl complete=12088,timeout=92,running=4,min=534,d1=31351,d2=49166,q1=58490,d3=70774,d4=88192,md=109778,d6=152389,d7=203435,q3=246377,d8=323837,d9=559237,max=26601000</tt> +<tt>dirreq-v2-tunneled-dl complete=0,timeout=0,running=0</tt> +<tt>entry-stats-end 2010-12-27 10:51:09 (86400 s)</tt> +<tt>entry-ips de=11024,us=10672,ir=5936,fr=5040,[...]</tt> +<tt>exit-stats-end 2010-12-27 10:51:09 (86400 s)</tt> +<tt>exit-kibibytes-written 80=6758009,443=498987,4000=227483,5004=1182656,11000=22767,19371=1428809,31551=8212,41500=965584,51413=3772428,56424=1912605,other=175227777</tt> +<tt>exit-kibibytes-read 80=197075167,443=5954607,4000=1660990,5004=1808563,11000=1893893,19371=130360,31551=7588414,41500=756287,51413=2994144,56424=1646509,other=288412366</tt> +<tt>exit-streams-opened 80=5095484,443=359256,4000=4508,5004=22288,11000=124,19371=24,31551=40,41500=96,51413=16840,56424=28,other=1970964</tt> + +</blockquote> +<hr> + + +<a name="dirreqstats"></a> +<h3>Directory requests</h3> + + +The directory authorities and directory mirrors report statistical data +about processed directory requests. +Starting with Tor version 0.2.2.15-alpha, all directories report the +number of written and read bytes for answering directory requests. +The format is similar to the format of byte histories as described in the +previous section. +The relevant lines are <tt>dirreq-write-history</tt> and +<tt>dirreq-read-history</tt> in the document listed in the +<a href="#bytehist">Byte histories</a> section above. +These two lines contain the subset of total read and written bytes that +the directory mirror spent on responding to any kind of directory request, +including network statuses, server descriptors, extra-info descriptors, +authority certificates, etc. + + + +The directories further report statistics on answering directory requests +for network statuses only. +For Tor versions before 0.2.3.x, relay operators had to manually enable +these statistics, which is why only a few directories report them. +The lines starting with <tt>dirreq-v3-</tt> all belong to the directory +request statistics (the lines starting with <tt>dirreq-v2-</tt> report +similar statistics for version 2 of the directory protocol which is +deprecated at the time of writing this report). +The following fields may be relevant for statistical analysis: + + +<ul> +<li>Unique IP addresses: The numbers in <tt>dirreq-v3-ips</tt> +denote the unique IP addresses of clients requesting network statuses by +country.</li> +<li>Network status requests: The numbers in +<tt>dirreq-v3-reqs</tt> constitute the total network status requests by +country.</li> +<li>Request share: The percentage in <tt>dirreq-v3-share</tt> is +an estimate of the share of directory requests that the reporting relay +expects to see in the Tor network. +In a tech report (<a href="papers/countingusers-2010-11-30.pdf">PDF</a>) +we found that this estimate isn't very useful +for statistical analysis because of the different approaches that clients +take to select directory mirrors. +The fraction of written directory bytes (<tt>dirreq-write-history</tt>) can +be used to derive a better metric for the share of directory requests.</li> +<li>Network status responses: The directories also report +whether they could provide the requested network status to clients in +<tt>dirreq-v3-resp</tt>. +This information was mostly used to diagnose error rates in version 2 of +the directory protocol where a lot of directories replied to network +status requests with <tt>503 Busy</tt>. +In version 3 of the directory protocol, most responses contain the status +code <tt>200 OK</tt>.</li> +<li>Network status download times: The line +<tt>dirreq-v3-direct-dl</tt> contains statistics on the download of network +statuses via the relay's directory port. +The line <tt>dirreq-v3-tunneled-dl</tt> contains similar statistics on +downloads via a 1-hop circuit between client and directory (which is the +common approach in version 3 of the directory protocol). +Relays report how many requests have been completed, have timed out, and +are still running at the end of a 24-hour time interval as well as the +minimum, maximum, median, quartiles, and deciles of download times.</li> +</ul> + + +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + +<hr> + + +<a name="entrystats"></a> +<h3>Connecting clients</h3> + + +Relays can be configured to report per-country statistics on directly +connecting clients. +This metric includes clients connecting to a relay in order to build +circuits and clients creating a 1-hop circuit to request directory +information. +In practice, the latter number outweighs the former number. +The <tt>entry-ips</tt> line in the document listed in the +<a href="#bytehist">Byte histories</a> section above +shows the number +of unique IP addresses connecting to the relay by country. +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + +<hr> + + +<a name="bridgestats"></a> +<h3>Bridge users</h3> + + +Bridges report statistics on connecting bridge clients in their extra-info +descriptors. +The document below shows a bridge extra-info descriptor +with the bridge user statistics in the <tt>bridge-ips</tt> line. + +<blockquote> + +Sanitized bridge extra-info descriptor: + + +<tt>extra-info Unnamed A5FA7F38B02A415E72FE614C64A1E5A92BA99BBD</tt> +<tt>published 2010-12-27 18:55:01</tt> +<tt>write-history 2010-12-27 18:43:50 (900 s) 151712768,176698368,180030464,163150848,[...]</tt> +<tt>read-history 2010-12-27 18:43:50 (900 s) 148109312,172274688,172168192,161094656,[...]</tt> +<tt>bridge-stats-end 2010-12-27 14:56:29 (86400 s)</tt> +<tt>bridge-ips sa=48,us=40,de=32,ir=32,[...]</tt> + +</blockquote> + + +Bridges running Tor version 0.2.2.3-alpha or earlier report bridge users +in a similar line starting with <tt>geoip-client-origins</tt>. +The reason for switching to <tt>bridge-ips</tt> was that the measurement +interval in <tt>geoip-client-origins</tt> had a variable length, whereas the +measurement interval in 0.2.2.4-alpha and later is set to exactly +24 hours. +In order to clearly distinguish the new measurement intervals from the old +ones, the new keywords have been introduced. +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + +<hr> + + +<a name="cellstats"></a> +<h3>Cell-queue statistics</h3> + + +Relays can be configured to report aggregate statistics on their cell +queues. +These statistics include average processed cells, average number of queued +cells, and average time that cells spend in circuits. +Circuits are split into deciles based on the number of processed cells. +The statistics are provided for circuit deciles from loudest to quietest +circuits. +The document below shows the cell statistics contained in an +extra-info descriptor by relay <tt>gabelmoo</tt>. +An early analysis of cell-queue statistics can be found in a tech report +(<a href="papers/bufferstats-2009-08-25.pdf">PDF</a>). +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + + +<blockquote> + +Cell statistics in extra-info descriptor by relay <tt>gabelmoo</tt>: + + +<tt>cell-stats-end 2010-12-27 09:59:50 (86400 s)</tt> +<tt>cell-processed-cells 4563,153,42,15,7,7,6,5,4,2</tt> +<tt>cell-queued-cells 9.39,0.98,0.09,0.01,0.00,0.00,0.00,0.01,0.00, + 0.01</tt> +<tt>cell-time-in-queue 2248,807,277,92,49,22,52,55,81,148</tt> +<tt>cell-circuits-per-decile 7233</tt> + +</blockquote> +<hr> + + +<a name="exitstats"></a> +<h3>Exit-port statistics</h3> + + +Exit relays running Tor version 0.2.1.1-alpha or higher can be configured +to report aggregate statistics on exiting connections. +These relays report the number of opened streams, written and read bytes +by exiting port. +Until version 0.2.2.19-alpha, relays reported all ports exceeding a +threshold of 0.01 % of all written and read exit bytes. +Starting with version 0.2.2.20-alpha, relays only report the top 10 ports +in exit-port statistics in order not to exceed the maximum extra-info +descriptor length of 50 KB. +The document listed in the +<a href="#bytehist">Byte histories</a> section above contains +exit-port statistics in the lines starting with <tt>exit-</tt>. +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + +<hr> + + +<a name="bidistats"></a> +<h3>Bidirectional connection use</h3> + + +Relays running Tor version 0.2.3.1-alpha or higher can be configured to +report what fraction of connections is used uni- or bi-directionally. +Every 10 seconds, relays determine for every connection whether they read +and wrote less than a threshold of 20 KiB. +Connections below this threshold are labeled as "Below Threshold". +For the remaining connections, relays report whether they read/wrote at +least 10 times as many bytes as they wrote/read. +If so, they classify a connection as "Mostly reading" or "Mostly +writing," respectively. +All other connections are classified as "Both reading and writing." +After classifying connections, read and write counters are reset for the +next 10-second interval. +Statistics are aggregated over 24 hours. +The document below shows the bidirectional connection use +statistics in an extra-info descriptor by relay <tt>zweifaltigkeit</tt>. +The four numbers denote the number of connections "Below threshold," +"Mostly reading," "Mostly writing," and "Both reading and writing." +More details about these statistics can be found in the <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/dir-spec.txt">directory protocol +specification</a>. + + +<blockquote> + +Bidirectional connection use statistic in extra-info descriptor +by relay <tt>zweifaltigkeit</tt>: + + +<tt>conn-bi-direct 2010-12-28 15:55:11 (86400 s) 387465,45285,55361,81786</tt> + +</blockquote> +<hr> + + +<a name="torperf"></a> +<h3>Torperf output files</h3> + + +Torperf is a little tool that measures Tor's performance as users +experience it. +Torperf uses a trivial SOCKS client to download files of various sizes +over the Tor network and notes how long substeps take. +Torperf can be +<a href="https://metrics.torproject.org/tools.html">downloaded</a> +from the metrics +website. + + + +Torperf can produce two output files: <tt>.data</tt> and <tt>.extradata</tt>. +The <tt>.data</tt> file contains timestamps for nine substeps and the byte +summaries for downloading a test file via Tor. +The document below shows an example output of a Torperf run. +The timestamps in the upper part of this output are seconds and +nanoseconds since 1970-01-01 00:00:00.000000. + + + +Torperf can be configured to write <tt>.extradata</tt> files by attaching +a Tor controller and writing certain controller events to disk. +The content of a <tt>.extradata</tt> line is shown in the lower part of +the document below. +The first column indicates if this circuit was actually used to fetch +the data (<tt>ok</tt>) or if Tor chose a different circuit because this +circuit was problematic (<tt>error</tt>). +For every <tt>error</tt> entry there should be a following <tt>ok</tt> entry, +unless the network of the Torperf instance is dead or the resource is +unavailable. +The circuit build completion time in the <tt>.extradata</tt> line is the +time between Torperf sent a SOCKS request and received a SOCKS response in +the <tt>.data</tt> file. +The three or more hops of the circuit are listed by relay fingerprint and +nickname. +An <tt>=</tt> sign between the two means that a relay has the <tt>Named</tt> +flag, whereas the <tt>~</tt> sign means it doesn't. + + +<blockquote> + +Torperf output lines for a single request to download a 50 KiB +file (reformatted and annotated with comments): + + + +<tt># Timestamps and byte summaries contained in .data files:</tt> +<tt>1293543301 762678 # Connection process started</tt> +<tt>1293543301 762704 # After socket is created</tt> +<tt>1293543301 763074 # After socket is connected</tt> +<tt>1293543301 763190 # After authentication methods are (SOCKS 5 only)</tt> +<tt>1293543301 763816 # After SOCKS request is sent</tt> +<tt>1293543302 901783 # After SOCKS response is received</tt> +<tt>1293543302 901818 # After HTTP request is written</tt> +<tt>1293543304 445732 # After first response is received</tt> +<tt>1293543305 456664 # After payload is complete</tt> +<tt>75 # Written bytes</tt> +<tt>51442 # Read bytes</tt> +<tt></tt> +<tt># Path information contained in .extradata files:</tt> +<tt>ok # Status code</tt> +<tt>1293543302 # Circuit build completion time</tt> +<tt>$2F265B37920BDFE474BF795739978EEFA4427510=fejk4 # 1st hop</tt> +<tt>$66CA87E164F1CFCE8C3BB5C095217A28578B8BAF=blutmagie3 # 2nd hop</tt> +<tt>$76997E6557828E8E57F70FDFBD93FB3AA470C620~Amunet8 # 3rd hop</tt> + +</blockquote> +<hr> + + +<a name="bridgepool"></a> +<h3>BridgeDB pool assignment files</h3> + + +BridgeDB is the software that receives bridge network statuses containing +the information which bridges are running from the bridge authority, +assigns these bridges to persistent distribution rings, and hands them out +to bridge users. +BridgeDB periodically dumps the list of running bridges with information +about the rings, subrings, and file buckets to which they are assigned to +a local file. +The sanitized versions of these lists containing SHA-1 hashes of bridge +fingerprints instead of the original fingerprints are available for +statistical analysis. + + +<blockquote> + +BridgeDB pool assignment file from March 13, 2011: + + +<tt>bridge-pool-assignment 2011-03-13 14:38:03</tt> +<tt>00b834117566035736fc6bd4ece950eace8e057a unallocated</tt> +<tt>00e923e7a8d87d28954fee7503e480f3a03ce4ee email port=443 flag=stable</tt> +<tt>0103bb5b00ad3102b2dbafe9ce709a0a7c1060e4 https ring=2 port=443 flag=stable</tt> +<tt>[...]</tt> + +</blockquote> + + +The document above shows a BridgeDB pool assignment file +from March 13, 2011. +Every such file begins with a line containing the timestamp when BridgeDB +wrote this file. +Subsequent lines always start with the SHA-1 hash of a bridge fingerprint, +followed by ring, subring, and/or file bucket information. +There are currently three distributor ring types in BridgeDB: + + +<ol> +<li>unallocated: These bridges are not distributed by BridgeDB, +but are either reserved for manual distribution or are written to file +buckets for distribution via an external tool. +If a bridge in the <tt>unallocated</tt> ring is assigned to a file bucket, +this is noted by <tt>bucket=$bucketname</tt>.</li> +<li>email: These bridges are distributed via an e-mail +autoresponder. Bridges can be assigned to subrings by their OR port or +relay flag which is defined by <tt>port=$port</tt> and/or <tt>flag=$flag</tt>. +</li> +<li>https: These bridges are distributed via https server. +There are multiple https rings to further distribute bridges by IP address +ranges, which is denoted by <tt>ring=$ring</tt>. +Bridges in the <tt>https</tt> ring can also be assigned to subrings by +OR port or relay flag which is defined by <tt>port=$port</tt> and/or +<tt>flag=$flag</tt>.</li> +</ol> +<hr> + + +<a name="gettor"></a> +<h3>GetTor statistics file</h3> + + +GetTor allows users to fetch the Tor software via email. +GetTor keeps internal statistics on the number of packages requested +every day and writes these statistics to a file. +The document below shows the statistics file for December 27, 2010. +The <tt>None</tt> entry stands for requests that don't ask for a specific +bundle, e.g. requests for the bundle list. + + +<blockquote> + +GetTor statistics file for December 27, 2010: + + +<tt>2010-12-27 - None:167 macosx-i386-bundle:0 macosx-ppc-bundle:0 +source-bundle:2 tor-browser-bundle:0 tor-browser-bundle_ar:0 +tor-browser-bundle_de:0 tor-browser-bundle_en:39 +tor-browser-bundle_es:0 tor-browser-bundle_fa:5 +tor-browser-bundle_fr:0 tor-browser-bundle_it:0 +tor-browser-bundle_nl:0 tor-browser-bundle_pl:0 +tor-browser-bundle_pt:0 tor-browser-bundle_ru:0 +tor-browser-bundle_zh_CN:77 tor-im-browser-bundle:0 +tor-im-browser-bundle_ar:0 tor-im-browser-bundle_de:0 +tor-im-browser-bundle_en:1 tor-im-browser-bundle_es:0 +tor-im-browser-bundle_fa:0 tor-im-browser-bundle_fr:0 +tor-im-browser-bundle_it:0 tor-im-browser-bundle_nl:0 +tor-im-browser-bundle_pl:0 tor-im-browser-bundle_pt:0 +tor-im-browser-bundle_ru:0 tor-im-browser-bundle_zh_CN:0</tt> + +</blockquote> +<hr> + + +<a name="exitlist"> +<h3>Tor Check exit lists</h3> + + +<a href="https://www.torproject.org/tordnsel/dist/">TorDNSEL</a> is an +implementation of the active testing, DNS-based exit list +for Tor exit +nodes. +Tor Check makes the list of known exits and corresponding exit IP +addresses available in a specific format. +The document below shows an entry of the exit list written on +December 28, 2010 at 15:21:44 UTC. +This entry means that the relay with fingerprint <tt>63Ba..</tt> which +published a descriptor at 07:35:55 and was contained in a version 2 +network status from 08:10:11 uses two different IP addresses for exiting. +The first address <tt>91.102.152.236</tt> was found in a test performed at +07:10:30. +When looking at the corresponding server descriptor, one finds that this +is also the IP address on which the relay accepts connections from inside +the Tor network. +A second test performed at 10:35:30 reveals that the relay also uses IP +address <tt>91.102.152.227</tt> for exiting. + + +<blockquote> + +Exit list entry written on December 28, 2010 at 15:21:44 UTC: + + +<tt>ExitNode 63BA28370F543D175173E414D5450590D73E22DC</tt> +<tt>Published 2010-12-28 07:35:55</tt> +<tt>LastStatus 2010-12-28 08:10:11</tt> +<tt>ExitAddress 91.102.152.236 2010-12-28 07:10:30</tt> +<tt>ExitAddress 91.102.152.227 2010-12-28 10:35:30</tt> + +</blockquote> + +</div> +</div> +<div class="bottom" id="bottom"> +<%@ include file="footer.jsp"%> +</div> +</body> +</html> +

1 0

r24995: {website} update script to include various .wmi files for fa translati (website/trunk)
by Runa Sandvik 30 Aug '11

30 Aug '11

Author: runa Date: 2011-08-30 08:43:39 +0000 (Tue, 30 Aug 2011) New Revision: 24995 Modified: website/trunk/po2wml.sh Log: update script to include various .wmi files for fa translations Modified: website/trunk/po2wml.sh =================================================================== --- website/trunk/po2wml.sh 2011-08-30 08:30:18 UTC (rev 24994) +++ website/trunk/po2wml.sh 2011-08-30 08:43:39 UTC (rev 24995) @@ -389,6 +389,36 @@ echo '#include "ar/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" fi + # If the file is a Farsi translation, include the + # correct header, css, menu files and footer + if [ $lang = "fa" ] + then + # Head + orig_head=`grep '#include "head.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + temp_head=`echo $orig_head | sed s@head.wmi@fa/head.wmi@` + new_head=`echo $temp_head 'STYLESHEET="css/master-rtl.css"'` + sed -i "s@$orig_head@$new_head@" "$wmldir/$subdir/$lang/$wmlfile" + + # Side (not all files include this) + orig_side=`grep '#include "side.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_side" ] + then + new_side=`echo '#include "fa/side.wmi"'` + sed -i "s@$orig_side@$new_side@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Info (not all files include this) + orig_info=`grep '#include "info.wmi"' "$wmldir/$subdir/$lang/$wmlfile"` + if [ -n "$orig_info" ] + then + new_info=`echo '#include "fa/info.wmi"'` + sed -i "s@$orig_info@$new_info@" "$wmldir/$subdir/$lang/$wmlfile" + fi + + # Footer + echo '#include "fa/foot.wmi"' >> "$wmldir/$subdir/$lang/$wmlfile" + fi + # If the directory does not include sidenav.wmi, # copy it from the English directory (only if # the English directory has this file)

1 0