December 2012 - tor-commits - lists.torproject.org

[ooni-probe/master] Update style guide
by art＠torproject.org 06 Dec '12

06 Dec '12

commit 2abcaae24bc7dbd35011241684f41f290b88461a Author: aagbsn <aagbsn(a)extc.org> Date: Mon Dec 3 12:45:06 2012 +0000 Update style guide --- HACKING | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-) diff --git a/HACKING b/HACKING index 66e6d9e..79ba588 100644 --- a/HACKING +++ b/HACKING @@ -168,13 +168,8 @@ Class attributes should also follow camelCase with the first letter non-capital. Functions should follow camelCase with the first letter non-capital. -Functions that are inside the local scope of a class or method should be all -lowercase separated by an underscore. - - - - - +Functions and variables that are inside the local scope of a class or method +should be all lowercase separated by an underscore. Indentation ...........

1 0

[ooni-probe/master] Merge pull request #15 from aagbsn/edit_HACKING
by art＠torproject.org 06 Dec '12

06 Dec '12

commit 7e4dc368fe748c3528d08a8f9dbdd1e04b39730c Merge: 2f584dc 2abcaae Author: Arturo Filastò <hellais(a)gmail.com> Date: Mon Dec 3 05:25:04 2012 -0800 Merge pull request #15 from aagbsn/edit_HACKING Update style guide HACKING | 9 ++------- 1 files changed, 2 insertions(+), 7 deletions(-)

1 0

[ooni-probe/master] Merge branch 'timestamp'
by art＠torproject.org 06 Dec '12

06 Dec '12

commit caf7754283ab310e59cd9a8e187e163d05a0f553 Merge: 86c3cb0 fb477a0 Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 6 14:45:14 2012 +0100 Merge branch 'timestamp' * timestamp: Change the timestamp format to use ISO8601. * Write unittests for timestamp generation functions * Add documentation on how reports will be stored in the backend HACKING | 6 ++-- docs/source/reports.rst | 43 ++++++++++++++++++++++ ooni/config.py | 2 +- ooni/kit/__init__.py | 4 +- ooni/otime.py | 92 +++++++++++++++++++++++++++++++++++++++++++++++ ooni/reporter.py | 14 +++++-- ooni/utils/log.py | 2 +- ooni/utils/otime.py | 51 -------------------------- oonib/report/api.py | 3 +- tests/test_otime.py | 15 ++++++++ 10 files changed, 169 insertions(+), 63 deletions(-)

1 0

[ooni-probe/master] Change the timestamp format to use ISO8601.
by art＠torproject.org 06 Dec '12

06 Dec '12

commit fb477a0982247974bc5f5979239ed015a17ce3ec Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Dec 6 14:42:38 2012 +0100 Change the timestamp format to use ISO8601. * Write unittests for timestamp generation functions * Add documentation on how reports will be stored in the backend --- HACKING | 6 ++-- docs/source/reports.rst | 43 ++++++++++++++++++++++ ooni/config.py | 2 +- ooni/kit/__init__.py | 4 +- ooni/otime.py | 92 +++++++++++++++++++++++++++++++++++++++++++++++ ooni/reporter.py | 14 +++++-- ooni/utils/log.py | 2 +- ooni/utils/otime.py | 51 -------------------------- oonib/report/api.py | 3 +- tests/test_otime.py | 15 ++++++++ 10 files changed, 169 insertions(+), 63 deletions(-) diff --git a/HACKING b/HACKING index 66e6d9e..f39f1e5 100644 --- a/HACKING +++ b/HACKING @@ -75,6 +75,9 @@ Code Structure Handles running ooni.nettests as well as ooni.plugoo.tests.OONITests. +- ooni/otime.py + Generation of timestamps, time conversions and all the rest + - ooni/kit/ In here go utilities that can be used by tests. @@ -102,9 +105,6 @@ Code Structure Utilities for working with Tor. XXX this code should be removed and merged into txtorcon. -- ooni/utils/otime.py - Generation of timestamps, time conversions and all the rest - - ooni/utils/txscapy.py Tools for making scapy work well with twisted. diff --git a/docs/source/reports.rst b/docs/source/reports.rst new file mode 100644 index 0000000..cf5e008 --- /dev/null +++ b/docs/source/reports.rst @@ -0,0 +1,43 @@ +Reports +======= + +The reports collected by ooniprobe are stored on +https://ooni.torproject.org/reports/`reportFormatVersion`/`CC`/ + +Where `CC` is the two letter country code as specified by +http://en.wikipedia.org/wiki/ISO_3166-2. + +For example the reports for Italy (`CC` is `it`) of the `reportVersion` 0.1 may +be found in: + +:: + https://ooni.torproject.org/reports/0.1/IT/ + + +This directory shall contain the various reports for the test using the +following convention: + +`ISO8601`-AS`probeASNumber`.yamloo + +If a collision is detected then an int (starting with 1) will get appended to +the test. + +For example a report that was created on the first of January 2012 at Noon (UTC +time) sharp from MIT (AS3) will be stored here: + +:: + + https://ooni.torproject.org/reports/0.1/US/2012-01-01T120000Z-AS3.yamloo + + +Report format version changelog +=============================== + +In here shall go details about he major changes to the reporting format. + +version 0.1 +----------- + +Initial format version. + + diff --git a/ooni/config.py b/ooni/config.py index bc255be..b82936f 100644 --- a/ooni/config.py +++ b/ooni/config.py @@ -8,7 +8,7 @@ import yaml from twisted.internet import reactor, threads, defer -from ooni.utils import otime +from ooni import otime from ooni.utils import Storage reports = Storage() diff --git a/ooni/kit/__init__.py b/ooni/kit/__init__.py index 9a24fae..85d2e3c 100644 --- a/ooni/kit/__init__.py +++ b/ooni/kit/__init__.py @@ -1,2 +1,2 @@ -__all__ = ['domclass'] -from . import domclass +#__all__ = ['domclass'] +#from . import domclass diff --git a/ooni/otime.py b/ooni/otime.py new file mode 100644 index 0000000..0af4ec8 --- /dev/null +++ b/ooni/otime.py @@ -0,0 +1,92 @@ +""" +Here is the location for all time and date related utility functions. +""" +import time +from datetime import datetime + +def utcDateNow(): + """ + Returns the datetime object of the current UTC time. + """ + return datetime.utcnow() + +def utcTimeNow(): + """ + Returns seconds since epoch in UTC time, it's of type float. + """ + return time.mktime(time.gmtime()) + +def dateToTime(date): + """ + Takes as input a datetime object and outputs the seconds since epoch. + """ + return time.mktime(date.timetuple()) + +def prettyDateNow(): + """ + Returns a good looking string for the local time. + """ + return datetime.now().ctime() + +def utcPrettyDateNow(): + """ + Returns a good looking string for utc time. + """ + return datetime.utcnow().ctime() + +def timeToPrettyDate(time_val): + return time.ctime(time_val) + +class InvalidTimestampFormat(Exception): + pass + +def fromTimestamp(s): + """ + Converts a string that is output from the timestamp function back to a + datetime object + + Args: + s (str): a ISO8601 formatted string. + ex. 1912-06-23T101234Z" + + Note: we currently only support parsing strings that are generated from the + timestamp function and have no intention in supporting the full standard. + """ + try: + date_part, time_part = s.split('T') + hours, minutes, seconds = time_part[:2], time_part[2:4], time_part[4:6] + year, month, day = date_part.split('-') + except: + raise InvalidTimestampFormat(s) + + return datetime(int(year), int(month), int(day), int(hours), int(minutes), + int(seconds)) + +def timestamp(t=None): + """ + The timestamp for ooni reports follows ISO 8601 in + UTC time format. + We do not inlcude ':' and include seconds. + + Example: + + if the current date is "10:12:34 AM, June 23 1912" (datetime(1912, 6, + 23, 10, 12, 34)) + + the timestamp will be: + + "1912-06-23T101234Z" + + Args: + t (datetime): a datetime object representing the + time to be represented (*MUST* be expressed + in UTC). + + If not specified will default to the current time + in UTC. + """ + if not t: + t = datetime.utcnow() + ISO8601 = "%Y-%m-%dT%H%M%SZ" + return t.strftime(ISO8601) + diff --git a/ooni/reporter.py b/ooni/reporter.py index abbd9c9..29e6049 100644 --- a/ooni/reporter.py +++ b/ooni/reporter.py @@ -20,16 +20,22 @@ from yaml.representer import * from yaml.emitter import * from yaml.serializer import * from yaml.resolver import * - -from scapy.packet import Packet - from twisted.python.util import untilConcludes from twisted.trial import reporter from twisted.internet import defer, reactor from twisted.internet.error import ConnectionRefusedError +from ooni.utils import log + +try: + from scapy.packet import Packet +except ImportError: + log.err("Scapy is not installed.") + + +from ooni import otime +from ooni.utils import geodata from ooni.utils.net import BodyReceiver, StringProducer, userAgents -from ooni.utils import otime, log, geodata from ooni import config diff --git a/ooni/utils/log.py b/ooni/utils/log.py index 170d7b5..3e24804 100644 --- a/ooni/utils/log.py +++ b/ooni/utils/log.py @@ -12,7 +12,7 @@ from twisted.python import log as txlog from twisted.python.failure import Failure from twisted.python.logfile import DailyLogFile -from ooni.utils import otime +from ooni import otime from ooni import config ## Get rid of the annoying "No route found for diff --git a/ooni/utils/otime.py b/ooni/utils/otime.py deleted file mode 100644 index 719230e..0000000 --- a/ooni/utils/otime.py +++ /dev/null @@ -1,51 +0,0 @@ -# -*- encoding: utf-8 -*- -# -# :authors: Arturo Filastò -# :licence: see LICENSE - -""" -Here is the location for all time and date related utility functions. -""" -import time -from datetime import datetime - -def utcDateNow(): - """ - Returns the datetime object of the current UTC time. - """ - return datetime.utcnow() - -def utcTimeNow(): - """ - Returns seconds since epoch in UTC time, it's of type float. - """ - return time.mktime(time.gmtime()) - -def dateToTime(date): - """ - Takes as input a datetime object and outputs the seconds since epoch. - """ - return time.mktime(date.timetuple()) - -def prettyDateNow(): - """ - Returns a good looking string for the local time. - """ - return datetime.now().ctime() - -def utcPrettyDateNow(): - """ - Returns a good looking string for utc time. - """ - return datetime.utcnow().ctime() - -def timeToPrettyDate(time_val): - return time.ctime(time_val) - -def timestamp(): - cur_time = datetime.utcnow() - d_format = "%d_%B_%Y_%H-%M-%S" - pretty = cur_time.strftime(d_format) - return pretty - - diff --git a/oonib/report/api.py b/oonib/report/api.py index 9c42a54..14a4bc1 100644 --- a/oonib/report/api.py +++ b/oonib/report/api.py @@ -16,7 +16,8 @@ from twisted.internet import reactor, defer from cyclone import web -from ooni.utils import randomStr, otime +from ooni import otime +from ooni.utils import randomStr from oonib import models, config from oonib.report import file_collector diff --git a/tests/test_otime.py b/tests/test_otime.py new file mode 100644 index 0000000..80979f2 --- /dev/null +++ b/tests/test_otime.py @@ -0,0 +1,15 @@ +import unittest +from datetime import datetime +from ooni import otime + +test_date = datetime(2002, 6, 26, 22, 45, 49) + +class TestOtime(unittest.TestCase): + def test_timestamp(self): + self.assertEqual(otime.timestamp(test_date), "2002-06-26T224549Z") + + def test_fromTimestamp(self): + time_stamp = otime.timestamp(test_date) + self.assertEqual(test_date, otime.fromTimestamp(time_stamp)) + +

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit a96fe0a08efaf9d4cfc0c7a78d93c2961d266c81 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 12:15:26 2012 +0000 Update translations for vidalia_help --- lv/netview.po | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lv/netview.po b/lv/netview.po index ce2c0dd..bf88f2b 100644 --- a/lv/netview.po +++ b/lv/netview.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-06 11:45+0000\n" +"PO-Revision-Date: 2012-12-06 11:59+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "Tīkla skatītājs" msgid "" "The network viewer lets you see relays in the Tor network and where your " "traffic is going." -msgstr "" +msgstr "Tīkla skatītājs rāda tīkla Tor retranslatorus un Jūsu datplūsmas adresātus." #. type: Content of: <html><body> #: en/netview.html:25 @@ -184,65 +184,65 @@ msgstr "" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:138 msgid "Location" -msgstr "" +msgstr "Atrašanās vieta" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:139 msgid "The geographic location of this Tor relay." -msgstr "" +msgstr "Tor retranslatora ģeogrāfiskā atrašanās vieta." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:142 msgid "IP Address" -msgstr "" +msgstr "IP adrese" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:143 msgid "IP address at which this Tor relay can be reached." -msgstr "" +msgstr "Tor retranslatora sasniegšanas IP adrese." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:146 msgid "Platform" -msgstr "" +msgstr "Platforma" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:148 msgid "" "Operating system information and Tor version on which this relay is " "currently running." -msgstr "" +msgstr "Retranslatora izmanotās operētājsistēmas informācija un Tor versija." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:153 msgid "Bandwidth" -msgstr "" +msgstr "Joslas platums" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:155 msgid "" "Estimated maximum amount of bandwidth that the directory relays have seen " "this relay handle recently." -msgstr "" +msgstr "Novērtētais maksimālais joslas platums, kuru direktorija retranslatori reģistrējuši šo retranslatoru sniedzam pēdējā laikā." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:160 msgid "Uptime" -msgstr "" +msgstr "Esošais darbspējas laiks" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:162 msgid "" "Length of time this relay has been available, which can be used to help " "estimate this relay's stability." -msgstr "" +msgstr "Laiks, kurš rāda cik ilgi retranslators ir pieejams. Šo laiku var izmantot, lai palīdzētu izvērtēt retranslatora stabilitāti." #. type: Content of: <html><body><table><tr><td> #: en/netview.html:167 msgid "Last Updated" -msgstr "" +msgstr "Pēdējo reizi jaunināts" #. type: Content of: <html><body><table><tr><td> #: en/netview.html:168 msgid "Date this relay's information was last updated." -msgstr "" +msgstr "Datums, kurā retranslatora informācija ir pēdējo reizi atjaunota."

1 0

[translation/vidalia_help_completed] Update translations for vidalia_help_completed
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit 82a4f81d7cfaa7ec9f4dad31e6241f3e2dba1827 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 11:45:39 2012 +0000 Update translations for vidalia_help_completed --- lv/log.po | 160 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 160 insertions(+), 0 deletions(-) diff --git a/lv/log.po b/lv/log.po new file mode 100644 index 0000000..7b6e55b --- /dev/null +++ b/lv/log.po @@ -0,0 +1,160 @@ +# +# Translators: +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. +msgid "" +msgstr "" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" +"POT-Creation-Date: 2010-06-26 17:00+0200\n" +"PO-Revision-Date: 2012-12-06 11:40+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" +"Language-Team: LANGUAGE <LL(a)li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: lv\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" + +#. type: Content of: <html><body><h1> +#: en/log.html:16 +msgid "Message Log" +msgstr "Ziņojumu žurnāls" + +#. type: Content of: <html><body> +#: en/log.html:19 +msgid "" +"The message log lets you see status information about a running Tor process." +" <a name=\"basic\"/> Each message has a severity associated with it," +" ranging from Error (most serious) to Debug (most verbose). " +"See the help section on <a href=\"#severities\">message severities</a> for " +"more information. <a name=\"severities\"/>" +msgstr "Ziņojumu žurnāls rāda Tor procesa izpildes statusa informāciju. <a name=\"pamata\"/> Katrs ziņojumam piešķirts tam atbilstīgais nozīmīgums, diapazonā no Kļūda (visnopietnākais) līdz Atkļūdot (visizvērstākais). Lūdzu skatiet kļūdu nodaļu par <a href=\"#severities\">ziņojumu nozīmīgums</a> , lai uzzinātu vairāk. <a name=\"nozīmīgums\"/>" + +#. type: Content of: <html><body><h3> +#: en/log.html:28 +msgid "Message Severities" +msgstr "Ziņojumu nozīmīgums" + +#. type: Content of: <html><body> +#: en/log.html:30 +msgid "" +"A message's severity tells you how important the message is. A higher " +"severity message usually indicates that something has gone wrong with Tor. " +"Lower severity messages appear frequently during normal Tor operations and " +"usually do not need to be logged." +msgstr "Ziņojumu nopietnība vēsta par to cik nozīmīgs ir ziņojums. Lielākas nopietnības ziņojums vēsta, ka pastāv ar Tor saistīta problēmsituācija. Mazākas nopietnības ziņojumi bieži tiek rādīti arī normālas Tor'a darbības laikā. Parasti tos nav nepieciešams reģistrēt." + +#. type: Content of: <html><body> +#: en/log.html:37 +msgid "" +"The possible message severities, from most severe to least severe, are:" +msgstr "Iespējamais ziņojumu nozīmīgums, secībā no svarīgākā uz mazāk svarīgo, ir: " + +#. type: Content of: <html><body><ul><li> +#: en/log.html:41 +msgid "" +"Error: Messages that appear when something has gone very wrong and " +"Tor cannot proceed. These messages will be highlighted in red in the " +"message log." +msgstr "Kļūda: Ziņojumi, kuri parādās, kad kaut kas ir nogājis tiešām greizi un Tor nevar turpināt darbu. Ziņojumu žurnālā šādi ziņojumi tiks izcelti ar sarkans." + +#. type: Content of: <html><body><ul><li> +#: en/log.html:46 +msgid "" +"Warning: Messages that only appear when something has gone wrong with" +" Tor, but are not fatal and Tor will continue running. These messages will " +"be highlighted in yellow." +msgstr "Brīdinājums: Ziņojumi, kuri parādās vienīgi kad Tor notikusi darbības kļūda, bet tas nav kritiski un Tor turpinās izpildi. Šādi ziņojumi tiks izcelti ar dzeltens." + +#. type: Content of: <html><body><ul><li> +#: en/log.html:51 +msgid "" +"Notice: Messages that appear infrequently during normal Tor operation" +" and are not considered errors, but you still may care about." +msgstr "Norāde: Ziņojumi, kuri normālas Tor'a darbības laikā parādās salīdzinoši reti, un netiek uzskatīti par kļūdu ziņojumiem. Tomēr tiem var pievērst uzmanību." + +#. type: Content of: <html><body><ul><li> +#: en/log.html:55 +msgid "" +"Info: Messages that appear frequently during normal Tor operation and" +" are not usually of interest to most users." +msgstr "Informācija: Ziņojumi, kuri parādās Tor normālas darbības laikā, un vairumam lietotāju parasti neinteresē." + +#. type: Content of: <html><body><ul><li> +#: en/log.html:59 +msgid "" +"Debug: Extremely verbose messages that are primarily of interest to " +"developers. You should generally not log debug messages unless you know what" +" you are doing." +msgstr "Atkļūdošana: Ļoti izvērsti ziņojumi, kuri pārsvarā informē izstrādātājus. Vispārīgā gadījumā nav nepieciešams reģistrēt atkļūdošanas ziņojumus, izņemot, ja zināt kāpēc tas tā ir jādara." + +#. type: Content of: <html><body> +#: en/log.html:66 +msgid "" +"Most users should only log Error, Warning, and Notice " +"messages." +msgstr "Vairumam lietotāju vajadzētu reģistrēt vienīgi ziņojumus, kuri pieder klasēm Kļūda, Brīdinājums un Norāde." + +#. type: Content of: <html><body> +#: en/log.html:71 +msgid "" +"To select which message severities you would like to see, do the following:" +msgstr "Lai atzīmētu ziņojumu nozīmīgumu, kurus vēlaties redzēt, dariet sekojošo:" + +#. type: Content of: <html><body><ol><li> +#: en/log.html:73 en/log.html:92 +msgid "Open the message log from the Vidalia tray menu." +msgstr "Atvērt ziņojumu žurnālu Vidalia paliktņa izvēlnē." + +#. type: Content of: <html><body><ol><li> +#: en/log.html:74 en/log.html:93 +msgid "Click on Settings at the top of the message log window." +msgstr "Noklikšķināt uz Iestatījumi ziņojumu žurnāla loga augšpusē." + +#. type: Content of: <html><body><ol><li> +#: en/log.html:76 +msgid "" +"Check message severities you would like to see from the Message Filter group" +" on the left and uncheck message severities you would like to hide." +msgstr "Kreisajā pusē Ziņojumu filtra grupā atzīmējiet to ziņojumu nopietnības līmeni, kurus vēlaties redzēt, un noņemiet atzīmi tiem ziņojumu nopietnības līmeņiem, kurus vēlaties paslēpt." + +#. type: Content of: <html><body><ol><li> +#: en/log.html:79 +msgid "Click Save Settings to apply your new message filter." +msgstr "Noklikšķināt Saglabāt iestatījumus , lai lietotu jauno ziņojumu filtru." + +#. type: Content of: <html><body> +#: en/log.html:84 +msgid "<a name=\"logfile\"/>" +msgstr "<a name=\"žurnāldatne\"/>" + +#. type: Content of: <html><body><h3> +#: en/log.html:85 +msgid "Logging to a File" +msgstr "Reģistrēšana datnē" + +#. type: Content of: <html><body> +#: en/log.html:87 +msgid "" +"Vidalia can also write log messages to a file, as well as logging them in " +"the message log window. To enable logging to a file, follow these steps:" +msgstr "Vidalia var gan rakstīt žurnāla ziņojumus datnē, gan reģistrēt tos ziņojumu žurnāla logā. Lai iespējotu reģistrēšanu datnē, veiciet sekojošas darbības:" + +#. type: Content of: <html><body><ol><li> +#: en/log.html:94 +msgid "" +"Check the box labeled Automatically save new log messages to a file." +msgstr "Atzīmēt rūtiņu Jaunus žurnāla ziņojumus automātiski saglabāt datnē." + +#. type: Content of: <html><body><ol><li> +#: en/log.html:96 +msgid "" +"If you would like to change the file to which messages will be written, " +"either type the path and filename into the text box, or click Browse " +"to navigate to a location for your log file." +msgstr "Ja vēlaties mainīt datni, kurā ziņojumi tiks rakstīti, vai nu ierakstiet teksta lodziņā datnes nosaukumu un ceļu uz to, vai arī noklikšķiniet Pārlūkot , lai pārvietotos uz žurnāla datnes atrašanās vietu." + +#. type: Content of: <html><body><ol><li> +#: en/log.html:100 +msgid "Click Save Settings to save your log destination." +msgstr "Noklikšķiniet Saglabāt iestatījumus , lai saglabātu sava žurnāla mērķi."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 06 Dec '12

06 Dec '12

commit d8f92eb1709db8f627ab4c3d3400c4fafbf4a497 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 6 11:45:29 2012 +0000 Update translations for vidalia_help --- lv/log.po | 14 +++++++------- lv/netview.po | 23 +++++++++++------------ 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/lv/log.po b/lv/log.po index 843cf4e..7b6e55b 100644 --- a/lv/log.po +++ b/lv/log.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2012-12-04 18:34+0000\n" +"PO-Revision-Date: 2012-12-06 11:40+0000\n" "Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -42,7 +42,7 @@ msgid "" "severity message usually indicates that something has gone wrong with Tor. " "Lower severity messages appear frequently during normal Tor operations and " "usually do not need to be logged." -msgstr "" +msgstr "Ziņojumu nopietnība vēsta par to cik nozīmīgs ir ziņojums. Lielākas nopietnības ziņojums vēsta, ka pastāv ar Tor saistīta problēmsituācija. Mazākas nopietnības ziņojumi bieži tiek rādīti arī normālas Tor'a darbības laikā. Parasti tos nav nepieciešams reģistrēt." #. type: Content of: <html><body> #: en/log.html:37 @@ -71,7 +71,7 @@ msgstr "Brīdinājums: Ziņojumi, kuri parādās vienīgi kad Tor notikus msgid "" "Notice: Messages that appear infrequently during normal Tor operation" " and are not considered errors, but you still may care about." -msgstr "" +msgstr "Norāde: Ziņojumi, kuri normālas Tor'a darbības laikā parādās salīdzinoši reti, un netiek uzskatīti par kļūdu ziņojumiem. Tomēr tiem var pievērst uzmanību." #. type: Content of: <html><body><ul><li> #: en/log.html:55 @@ -86,7 +86,7 @@ msgid "" "Debug: Extremely verbose messages that are primarily of interest to " "developers. You should generally not log debug messages unless you know what" " you are doing." -msgstr "" +msgstr "Atkļūdošana: Ļoti izvērsti ziņojumi, kuri pārsvarā informē izstrādātājus. Vispārīgā gadījumā nav nepieciešams reģistrēt atkļūdošanas ziņojumus, izņemot, ja zināt kāpēc tas tā ir jādara." #. type: Content of: <html><body> #: en/log.html:66 @@ -116,7 +116,7 @@ msgstr "Noklikšķināt uz Iestatījumi ziņojumu žurnāla loga augšpus msgid "" "Check message severities you would like to see from the Message Filter group" " on the left and uncheck message severities you would like to hide." -msgstr "" +msgstr "Kreisajā pusē Ziņojumu filtra grupā atzīmējiet to ziņojumu nopietnības līmeni, kurus vēlaties redzēt, un noņemiet atzīmi tiem ziņojumu nopietnības līmeņiem, kurus vēlaties paslēpt." #. type: Content of: <html><body><ol><li> #: en/log.html:79 @@ -138,7 +138,7 @@ msgstr "Reģistrēšana datnē" msgid "" "Vidalia can also write log messages to a file, as well as logging them in " "the message log window. To enable logging to a file, follow these steps:" -msgstr "" +msgstr "Vidalia var gan rakstīt žurnāla ziņojumus datnē, gan reģistrēt tos ziņojumu žurnāla logā. Lai iespējotu reģistrēšanu datnē, veiciet sekojošas darbības:" #. type: Content of: <html><body><ol><li> #: en/log.html:94 @@ -152,7 +152,7 @@ msgid "" "If you would like to change the file to which messages will be written, " "either type the path and filename into the text box, or click Browse " "to navigate to a location for your log file." -msgstr "" +msgstr "Ja vēlaties mainīt datni, kurā ziņojumi tiks rakstīti, vai nu ierakstiet teksta lodziņā datnes nosaukumu un ceļu uz to, vai arī noklikšķiniet Pārlūkot , lai pārvietotos uz žurnāla datnes atrašanās vietu." #. type: Content of: <html><body><ol><li> #: en/log.html:100 diff --git a/lv/netview.po b/lv/netview.po index 28e0dd9..ce2c0dd 100644 --- a/lv/netview.po +++ b/lv/netview.po @@ -1,23 +1,24 @@ # # Translators: +# Ojars Balcers <ojars.balcers(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2010-11-30 05:03+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2012-12-06 11:45+0000\n" +"Last-Translator: Ojars Balcers <ojars.balcers(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: lv\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n" #. type: Content of: <html><body><h1> #: en/netview.html:16 msgid "Network Viewer" -msgstr "" +msgstr "Tīkla skatītājs" #. type: Content of: <html><body> #: en/netview.html:20 @@ -29,12 +30,12 @@ msgstr "" #. type: Content of: <html><body> #: en/netview.html:25 msgid "<a name=\"overview\"/>" -msgstr "" +msgstr "<a name=\"apskats\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:26 msgid "Overview" -msgstr "" +msgstr "Apskats" #. type: Content of: <html><body> #: en/netview.html:28 @@ -49,12 +50,12 @@ msgstr "" #. type: Content of: <html><body> #: en/netview.html:35 msgid "<a name=\"netmap\"/>" -msgstr "" +msgstr "<a name=\"tīkla karte\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:36 msgid "Network Map" -msgstr "" +msgstr "Tīkla karte" #. type: Content of: <html><body> #: en/netview.html:38 @@ -98,12 +99,12 @@ msgstr "" #. type: Content of: <html><body> #: en/netview.html:66 msgid "<a name=\"relaylist\"/>" -msgstr "" +msgstr "<a name=\"retranslatoru saraksts\"/>" #. type: Content of: <html><body><h3> #: en/netview.html:67 msgid "Relay Status" -msgstr "" +msgstr "Retranslatora statuss" #. type: Content of: <html><body> #: en/netview.html:69 @@ -245,5 +246,3 @@ msgstr "" #: en/netview.html:168 msgid "Date this relay's information was last updated." msgstr "" - -

1 0

[onionoo/master] Handle non-positive offsets and limits.
by karsten＠torproject.org 06 Dec '12

06 Dec '12

commit b4b90b045c1ef257d08951954bb44ec59aec909f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 6 09:09:55 2012 +0100 Handle non-positive offsets and limits. Non-positive offsets were previously ignored, which is still the case. However, non-positive limits were ignored, too, which seems wrong. If a client wants even less than none documents, we shouldn't respond with all documents we have. Instead, we should return an empty response. --- src/org/torproject/onionoo/ResourceServlet.java | 12 ++++-------- web/index.html | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/onionoo/ResourceServlet.java b/src/org/torproject/onionoo/ResourceServlet.java index bc075b0..0fa9174 100644 --- a/src/org/torproject/onionoo/ResourceServlet.java +++ b/src/org/torproject/onionoo/ResourceServlet.java @@ -330,16 +330,12 @@ public class ResourceServlet extends HttpServlet { response.sendError(HttpServletResponse.SC_BAD_REQUEST); return; } - if (limit >= 0) { - while (limit < orderedRelays.size()) { - orderedRelays.remove(orderedRelays.size() - 1); - } + while (!orderedRelays.isEmpty() && limit < orderedRelays.size()) { + orderedRelays.remove(orderedRelays.size() - 1); } limit -= orderedRelays.size(); - if (limit >= 0) { - while (limit < orderedBridges.size()) { - orderedBridges.remove(orderedBridges.size() - 1); - } + while (!orderedBridges.isEmpty() && limit < orderedBridges.size()) { + orderedBridges.remove(orderedBridges.size() - 1); } } diff --git a/web/index.html b/web/index.html index e29c0b8..ca87016 100755 --- a/web/index.html +++ b/web/index.html @@ -684,10 +684,14 @@ undefined. <tr><td>offset</td><td>Skip the given number of relays and/or bridges. Relays are skipped first, then bridges. +Non-positive offset values are treated as zero and don't change the +result. </td></tr> <tr><td>limit</td><td>Limit result to the given number of relays and/or bridges. Relays are kept first, then bridges. +Non-positive limit values are treated as zero and lead to an empty +result. When used together with offset, the offsetting step precedes the limiting step. </td></tr>

1 0

[torspec/master] Adjust Krawczyk's construction to be RFC5869.
by nickm＠torproject.org 06 Dec '12

06 Dec '12

commit 35d872981166ef4b1fca2fe9766de530346e2873 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 3 10:30:05 2012 -0500 Adjust Krawczyk's construction to be RFC5869. --- proposals/216-ntor-handshake.txt | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/proposals/216-ntor-handshake.txt b/proposals/216-ntor-handshake.txt index c6c6579..2ee9b14 100644 --- a/proposals/216-ntor-handshake.txt +++ b/proposals/216-ntor-handshake.txt @@ -103,13 +103,13 @@ Key expansion: where K0==g^xy, and K is divvied up into Df, Db, Kf, and Kb portions. - Instead, let's have it be + Instead, let's have it be HKDF-SHA256 as defined in RFC5869: - K = K_0 | K_1 | K_2 | K_3 | ... + K = K_1 | K_2 | K_3 | ... - Where K_0 = H(m_expand | INT8(i) , KEY_SEED ) + Where K_1 = H(m_expand | INT8(1) , KEY_SEED ) and K_(i+1) = H(K_i | m_expand | INT8(i) , KEY_SEED ) - and m_expend is an arbitrarily chosen value, + and m_expand is an arbitrarily chosen value, and INT8(i) is a octet with the value "i". Ian says this is due to a construction from Krawczyk at @@ -117,6 +117,9 @@ Key expansion: Let m_expand be PROTOID | ":key_expand" + In RFC5869's vocabulary, this is HKDF-SHA256 with info == m_expand, + salt == t_key, and IKM == secret_input. + Performance notes: In Tor's current circuit creation handshake, the client does:

1 0

[torspec/master] Tweaks/additions to ntor proposal:
by nickm＠torproject.org 06 Dec '12

06 Dec '12

commit 630b334bb0727653f561b477e3cd1ce8a7905c04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 6 02:03:10 2012 -0500 Tweaks/additions to ntor proposal: * Specify node IDs as ID_LENGTH bytes long. * Make t_key not be a prefix of m_expand. Cosmetic but why not. * Rename the directory identifier for the keys. * Specify where they go in the microdescriptor * Change the handshake type to 0x0002, so that 0x0001 can be reserved for CREATE_FAST. * Explain how to stuff these in EXTEND/EXTENDED/CREATE/CREATE2 cells, so clients can use ntor even when the previous node doesn't grok EXTEND2. * Add test vectors which I hope are right for HKDF-SHA256. --- proposals/216-ntor-handshake.txt | 52 ++++++++++++++++++++++++++++++++++--- 1 files changed, 47 insertions(+), 5 deletions(-) diff --git a/proposals/216-ntor-handshake.txt b/proposals/216-ntor-handshake.txt index 2ee9b14..cb36ea1 100644 --- a/proposals/216-ntor-handshake.txt +++ b/proposals/216-ntor-handshake.txt @@ -36,6 +36,8 @@ Notation: Let KEYID be a collision-resistant (but not necessarily preimage-resistant) hash function on members of G, of output length H_LENGTH bytes. + Let each node have a unique identifier, ID_LENGTH bytes in length. + Instantiation: Let's call this PROTOID "ntor-curve25519-sha256-1" (We might want to make @@ -43,7 +45,7 @@ Instantiation: Set H(x,t) == HMAC_SHA256 with message x and key t. So H_LENGTH == 32. Set t_mac == PROTOID | ":mac" - t_key == PROTOID | ":key" + t_key == PROTOID | ":key_extract" t_verify == PROTOID | ":verify" Set EXP(a,b) == curve25519(.,b,a), and g == 9 . Let KEYGEN() do the @@ -64,7 +66,7 @@ Protocol: To send a create cell, the client generates a keypair x,X = KEYGEN(), and sends a CREATE cell with contents: - NODEID: ID -- H_LENGTH bytes + NODEID: ID -- ID_LENGTH bytes KEYID: KEYID(B) -- H_LENGTH bytes CLIENT_PK: X -- G_LENGTH bytes @@ -148,20 +150,60 @@ Integrating with the rest of Tor: Add a new optional entry to router descriptors and microdescriptors: - "onion-key-ntor" SP Base64Key NL + "ntor-onion-key" SP Base64Key NL where Base64Key is a base-64 encoded 32-byte value, with padding omitted. - Add a new consensus method to tell servers to copy "onion-key-ntor" + Add a new consensus method to tell servers to copy "ntor-onion-key" entries to from router descriptors to microdescriptors. + In microdescriptors, "ntor-onion-key" can go right after the "onion-key" + line. + Add a "UseNTorHandshake" configuration option and a corresponding consensus parameter to control whether clients use the ntor handshake. If the configuration option is "auto", clients should obey the consensus parameter. Have the configuration default be "auto" and the consensus value initially be "0". - Reserve the handshake type [00 01] for this handshake in CREATE2 and + Reserve the handshake type [00 02] for this handshake in CREATE2 and EXTEND2 cells. + Specify that this handshake type can be used in EXTEND/EXTENDED/ + CREATE/CREATED cells as follows: instead of a 190-byte TAP onionskin, send + the 16-byte string "ntorNTORntorNTOR", followed by the client's ntor + message. Instead of a 148-byte TAP response, send the server's ntor + response. (We need this so that a client can extend from an 0.2.3 server, + which doesn't know about CREATE2/CREATED2/EXTEND/EXTENDED2.) + +Test vectors for HKDF-SHA256: + + These are some test vectors for HKDF-SHA256 using the values for M_EXPAND + and T_KEY above, taking 100 bytes of key material. + + INPUT: "" (The empty string) + OUTPUT: d3490ed48b12a48f9547861583573fe3f19aafe3 + f81dc7fc75eeed96d741b3290f941576c1f9f0b2 + d463d1ec7ab2c6bf71cdd7f826c6298c00dbfe67 + 11635d7005f0269493edf6046cc7e7dcf6abe0d2 + 0c77cf363e8ffe358927817a3d3e73712cee28d8 + + INPUT: "Tor" (546f72) + OUTPUT: 5521492a85139a8d9107a2d5c0d9c91610d0f959 + 89975ebee6c02a4f8d622a6cfdf9b7c7edd3832e + 2760ded1eac309b76f8d66c4a3c4d6225429b3a0 + 16e3c3d45911152fc87bc2de9630c3961be9fdb9 + f93197ea8e5977180801926d3321fa21513e59ac + + INPUT: "AN ALARMING ITEM TO FIND ON YOUR CREDIT-RATING STATEMENT" + (414e20414c41524d494e47204954454d20544f2046494e44204f4e20 + 594f5552204352454449542d524154494e472053544154454d454e54) + OUTPUT: a2aa9b50da7e481d30463adb8f233ff06e9571a0 + ca6ab6df0fb206fa34e5bc78d063fc291501beec + 53b36e5a0e434561200c5f8bd13e0f88b3459600 + b4dc21d69363e2895321c06184879d94b18f0784 + 11be70b767c7fc40679a9440a0c95ea83a23efbf + + +

1 0