March 2014 - tor-commits - lists.torproject.org

[translation/tsum] Update translations for tsum
by translation＠torproject.org 16 Mar '14

16 Mar '14

commit 26474546e018ce94048a57bcf4b485b5d1783b52 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Mar 16 19:15:07 2014 +0000 Update translations for tsum --- cy/short-user-manual_cy_noimg.xhtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cy/short-user-manual_cy_noimg.xhtml b/cy/short-user-manual_cy_noimg.xhtml index 7cc8e37..d2ea2bf 100644 --- a/cy/short-user-manual_cy_noimg.xhtml +++ b/cy/short-user-manual_cy_noimg.xhtml @@ -71,7 +71,7 @@ sub 2048R/EB399FD7 2003-10-16 <p><strong>Your anti-virus program is blocking Tor</strong>: Make sure that your anti-virus program is not preventing Tor from making network connections.</p> <p>If Tor still doesn't work, it's likely that your Internet Service Provider (ISP) is blocking Tor. Very often this can be worked around with <strong>Tor bridges</strong>, hidden relays that aren't as easy to block.</p> <p>If you need help with figuring out why Tor can't connect, send an email to help(a)rt.torproject.org and include the relevant parts from the log file.</p> - <h3 id="how-to-find-a-bridge">How to find a bridge</h3> + <h3 id="how-to-find-a-bridge">Sut i ganfod pont</h3> <p>To use a bridge, you will first have to locate one; you can either browse to <a href="https://bridges.torproject.org/">bridges.torproject.org</a>, or you can send an email to bridges(a)torproject.org. If you do send an email, please make sure that you write <strong>get bridges</strong> in the body of the email. Without this, you will not get a reply. Note that you need to send this email from either a gmail.com or a yahoo.com address.</p> <p>Configuring more than one bridge address will make your Tor connection more stable, in case some of the bridges become unreachable. There is no guarantee that the bridge you are using now will work tomorrow, so you should make a habit of updating your list of bridges every so often.</p> <h3 id="how-to-use-a-bridge">How to use a bridge</h3>

1 0

[bridgedb/master] Move Raptcha.rst → captcha.rst so that Sphinx finds it during builds.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 29bcfe5ec7dfe426ef1ce6c6ba4b285e6badd51f Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 23:00:08 2014 +0000 Move Raptcha.rst → captcha.rst so that Sphinx finds it during builds. --- doc/sphinx/source/bridgedb.Raptcha.rst | 8 -------- doc/sphinx/source/bridgedb.captcha.rst | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/sphinx/source/bridgedb.Raptcha.rst b/doc/sphinx/source/bridgedb.Raptcha.rst deleted file mode 100644 index 633fa61..0000000 --- a/doc/sphinx/source/bridgedb.Raptcha.rst +++ /dev/null @@ -1,8 +0,0 @@ -bridgedb.captcha ----------------- - -.. automodule:: bridgedb.captcha - :members: - :undoc-members: - :private-members: - :show-inheritance: diff --git a/doc/sphinx/source/bridgedb.captcha.rst b/doc/sphinx/source/bridgedb.captcha.rst new file mode 100644 index 0000000..633fa61 --- /dev/null +++ b/doc/sphinx/source/bridgedb.captcha.rst @@ -0,0 +1,8 @@ +bridgedb.captcha +---------------- + +.. automodule:: bridgedb.captcha + :members: + :undoc-members: + :private-members: + :show-inheritance:

1 0

[bridgedb/master] Pep8 and cleanup for bridgedb.Bridges.get_hmac_fn().
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 9307ffbda3a7d0108edd6f078b9c9a934b675239 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 7 16:23:54 2014 +0000 Pep8 and cleanup for bridgedb.Bridges.get_hmac_fn(). --- lib/bridgedb/Bridges.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 3d27ad1..cd77911 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -92,13 +92,17 @@ def get_hmac(key, value): h = hmac.new(key, value, digestmod=DIGESTMOD) return h.digest() -def get_hmac_fn(k, hex=True): +def get_hmac_fn(key, hex=True): """Return a function that computes the hmac of its input using the key k. - If 'hex' is true, the output of the function will be hex-encoded.""" - h = hmac.new(k, digestmod=DIGESTMOD) - def hmac_fn(v): + + :param bool hex: If True, the output of the function will be hex-encoded. + :rtype: callable + :returns: A function which can be uses to generate HMACs. + """ + h = hmac.new(key, digestmod=DIGESTMOD) + def hmac_fn(value): h_tmp = h.copy() - h_tmp.update(v) + h_tmp.update(value) if hex: return h_tmp.hexdigest() else:

1 0

[bridgedb/master] Pep8 fixes for bridgedb.captcha.ReCaptcha.get() method.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 0983e568d64c11058f6d86df1ea6f479f061ad5b Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 19:06:21 2014 +0000 Pep8 fixes for bridgedb.captcha.ReCaptcha.get() method. --- lib/bridgedb/captcha.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 5d36432..2e175f8 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -95,16 +95,17 @@ class ReCaptcha(Captcha): stored at ``ReCaptcha.image`` and the challenge string at ``ReCaptcha.challenge``. """ - if (self.pubkey == '') or (self.privkey == ''): + if not self.pubkey or not self.privkey: raise ReCaptchaKeyError + urlbase = API_SSL_SERVER form = "/noscript?k=%s" % self.pubkey # extract and store image from captcha - html = urllib2.urlopen(urlbase+form).read() + html = urllib2.urlopen(urlbase + form).read() soup = BeautifulSoup(html) - imgurl = urlbase+"/"+ soup.find('img')['src'] - self.challenge = str(soup.find('input', {'name' : 'recaptcha_challenge_field'})['value']) + imgurl = urlbase + "/" + soup.find('img')['src'] + self.challenge = str(soup.find('input', {'name': 'recaptcha_challenge_field'})['value']) self.image = urllib2.urlopen(imgurl).read()

1 0

[bridgedb/master] Use GimpCaptchProtectedResources in HTTPServer.addServer(), if configured to do so.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit b4af348a3b651b71c7a5a276b8bdb11a9df77a58 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 08:37:47 2014 +0000 Use GimpCaptchProtectedResources in HTTPServer.addServer(), if configured to do so. --- lib/bridgedb/HTTPServer.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 8b65fa6..9411ec1 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -698,13 +698,19 @@ def addWebServer(cfg, dist, sched): includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS) if cfg.RECAPTCHA_ENABLED: - protected = CaptchaProtectedResource( + protected = ReCaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY, recaptchaPubKey=cfg.RECAPTCHA_PUB_KEY, remoteip=cfg.RECAPTCHA_REMOTEIP, useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, resource=resource) httpdist.putChild('bridges', protected) + elif cfg.GIMP_CAPTCHA_ENABLED: + protected = GimpCaptchaProtectedResource( + captchaDir=cfg.GIMP_CAPTCHA_DIR, + useForwardedHeader=cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, + resource=resource) + httpdist.putChild('bridges', protected) else: httpdist.putChild('bridges', resource)

1 0

[bridgedb/master] Move the addition of options.html leaf before bridges.html.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 01b2d27eb0a664c8032ff8a40a1b9b628fce2c4c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 08:36:19 2014 +0000 Move the addition of options.html leaf before bridges.html. --- lib/bridgedb/HTTPServer.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/bridgedb/HTTPServer.py b/lib/bridgedb/HTTPServer.py index 1e4bfac..8b65fa6 100644 --- a/lib/bridgedb/HTTPServer.py +++ b/lib/bridgedb/HTTPServer.py @@ -691,14 +691,12 @@ def addWebServer(cfg, dist, sched): static.File(os.path.join(template_root, 'robots.txt'))) httpdist.putChild('assets', static.File(os.path.join(template_root, 'assets/'))) + httpdist.putChild('options', WebResourceOptions()) resource = WebResourceBridges(dist, sched, cfg.HTTPS_N_BRIDGES_PER_ANSWER, cfg.HTTP_USE_IP_FROM_FORWARDED_HEADER, includeFingerprints=cfg.HTTPS_INCLUDE_FINGERPRINTS) - resource_options = WebResourceOptions() - - httpdist.putChild('options', resource_options) if cfg.RECAPTCHA_ENABLED: protected = CaptchaProtectedResource( recaptchaPrivKey=cfg.RECAPTCHA_PRIV_KEY,

1 0

[bridgedb/master] Add missing period to ReCaptchaKeyError docstring.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 7083cb5c2fa566ee811a91d8b83f6af954fce97c Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 19:01:17 2014 +0000 Add missing period to ReCaptchaKeyError docstring. --- lib/bridgedb/captcha.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index ef1317c..672d75c 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -44,7 +44,7 @@ from zope.interface import Interface, Attribute, implements class ReCaptchaKeyError(Exception): - """Exception raised when recaptcha API keys are not supplied""" + """Exception raised when recaptcha API keys are not supplied.""" def __init__(self): msg = 'You must supply recaptcha API keys'

1 0

[bridgedb/master] Separate key storage from crypto.getKey() to crypto.writeKeyToFile().
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 7cd17a7fe7cc7a18407371fcff9083d79203caf5 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 11 20:23:17 2014 +0000 Separate key storage from crypto.getKey() to crypto.writeKeyToFile(). * ADD a new function, bridgedb.crypto.writeKeyToFile(), which is merely the keyfile writing logic from bridgedb.crypto.getKey(). --- lib/bridgedb/crypto.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/lib/bridgedb/crypto.py b/lib/bridgedb/crypto.py index 054ec11..f5a95ec 100644 --- a/lib/bridgedb/crypto.py +++ b/lib/bridgedb/crypto.py @@ -40,6 +40,26 @@ import OpenSSL.rand #: The hash digest to use for HMACs. DIGESTMOD = hashlib.sha1 + +def writeKeyToFile(key, filename): + """Write **key** to **filename**, with ``0400`` permissions. + + If **filename** doesn't exist, it will be created. If it does exist + already, and is writable by the owner of the current process, then it will + be truncated to zero-length and overwritten. + + :param bytes key: A key (or some other private data) to write to + **filename**. + :param str filename: The path of the file to write to. + :raises: Any exceptions which may occur. + """ + logging.info("Writing key to file: %r" % filename) + flags = os.O_WRONLY | os.O_TRUNC | os.O_CREAT | getattr(os, "O_BIN", 0) + fd = os.open(filename, flags, 0400) + os.write(fd, key) + os.fsync(fd) + os.close(fd) + def getKey(filename): """Load the key stored in ``filename``, or create a new key. @@ -69,11 +89,7 @@ def getKey(filename): except IOError: logging.debug("getKey(): Creating new secret key.") key = OpenSSL.rand.bytes(32) - flags = os.O_WRONLY | os.O_TRUNC | os.O_CREAT | getattr(os, "O_BIN", 0) - fd = os.open(filename, flags, 0400) - os.write(fd, key) - os.fsync(fd) - os.close(fd) + writeKeyToFile(key, filename) else: logging.debug("getKey(): Secret key file found. Loading...") key = fh.read()

1 0

[bridgedb/master] Add challenge Attribute to ICaptcha interface and implementation.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit acc5f2ab0656db5f0bff1e3f0a8061f54aa8b5bd Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 19:04:18 2014 +0000 Add challenge Attribute to ICaptcha interface and implementation. --- lib/bridgedb/captcha.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 672d75c..5d36432 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -53,20 +53,26 @@ class ReCaptchaKeyError(Exception): class GimpCaptchaError(Exception): """General exception raised when a Gimp CAPTCHA cannot be retrieved.""" + class ICaptcha(Interface): """Interface specification for CAPTCHAs.""" - image = Attribute("A CAPTCHA image.") - def get(self): - """Retrieve a new CAPTCHA.""" - return None + image = Attribute( + "A string containing the contents of a CAPTCHA image file.") + challenge = Attribute( + "A unique string associated with the dispursal of this CAPTCHA.") + + def get(): + """Retrieve a new CAPTCHA image.""" + class Captcha(object): - """A generic CAPTCHA object.""" + """A generic CAPTCHA base class.""" implements(ICaptcha) def __init__(self): self.image = None + self.challenge = None def get(self): return self.image @@ -76,10 +82,9 @@ class ReCaptcha(Captcha): """A reCaptcha CAPTCHA.""" def __init__(self, pubkey=None, privkey=None): + super(ReCaptcha, self).__init__() self.pubkey = pubkey self.privkey = privkey - self.image = None - super(ReCaptcha, self).__init__() def get(self): """Retrieve a CAPTCHA from the reCaptcha API server. @@ -111,15 +116,12 @@ class GimpCaptcha(Captcha): :raises GimpCaptchaError: if **cacheDir** is not a directory. """ + super(GimpCaptcha, self).__init__() if not os.path.isdir(cacheDir): raise GimpCaptchaError("Gimp captcha cache isn't a directory: %r" % cacheDir) - - self.image = None - self.challenge = None self.cacheDir = cacheDir self.clientIP = clientIP - super(GimpCaptcha, self).__init__() @classmethod def check(cls, challenge, answer, clientIP=None):

1 0

[bridgedb/master] Import only API_SSL_SERVER from recaptcha.client.captcha in bridgedb.captcha.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit 57e9fff0a54b0f4f0faa1ab40608eaf77cd16f3a Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 4 19:00:24 2014 +0000 Import only API_SSL_SERVER from recaptcha.client.captcha in bridgedb.captcha. --- lib/bridgedb/captcha.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index a76303f..ef1317c 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -39,7 +39,7 @@ import os import urllib2 from BeautifulSoup import BeautifulSoup -from recaptcha.client import captcha as recaptcha +from recaptcha.client.captcha import API_SSL_SERVER from zope.interface import Interface, Attribute, implements @@ -92,7 +92,7 @@ class ReCaptcha(Captcha): """ if (self.pubkey == '') or (self.privkey == ''): raise ReCaptchaKeyError - urlbase = recaptcha.API_SSL_SERVER + urlbase = API_SSL_SERVER form = "/noscript?k=%s" % self.pubkey # extract and store image from captcha

1 0