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

[bridgedb/develop] 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/develop] 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

[bridgedb/develop] 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/develop] 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/develop] 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/develop] Add documentation to captcha.Captcha class.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit de58663945df01f45d9cbe637fbbaa801c99c869 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 11 20:50:10 2014 +0000 Add documentation to captcha.Captcha class. --- lib/bridgedb/captcha.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 608882a..728cfaf 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -63,7 +63,13 @@ class ICaptcha(Interface): class Captcha(object): - """A generic CAPTCHA base class.""" + """A generic CAPTCHA base class. + + :ivar str image: The CAPTCHA image. + :ivar str challenge: A challenge string which should permit checking of + the client's CAPTCHA solution in some manner. This should be passed + along to the client with the CAPTCHA image. + """ implements(ICaptcha) def __init__(self):

1 0

[bridgedb/develop] 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/develop] Add more documentation to captcha.ReCaptcha class and its methods.
by isis＠torproject.org 16 Mar '14

16 Mar '14

commit c011ab8cacca785d30d076eb243c98d2988ec396 Author: Isis Lovecruft <isis(a)torproject.org> Date: Tue Mar 11 20:51:01 2014 +0000 Add more documentation to captcha.ReCaptcha class and its methods. --- lib/bridgedb/captcha.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/lib/bridgedb/captcha.py b/lib/bridgedb/captcha.py index 728cfaf..721f72e 100644 --- a/lib/bridgedb/captcha.py +++ b/lib/bridgedb/captcha.py @@ -81,9 +81,19 @@ class Captcha(object): class ReCaptcha(Captcha): - """A reCaptcha CAPTCHA.""" + """A reCaptcha CAPTCHA. + + :ivar str image: The CAPTCHA image. + :ivar str challenge: The ``'recaptcha_challenge_response'`` HTTP form + field to pass to the client along with the CAPTCHA image. + """ def __init__(self, pubkey=None, privkey=None): + """Create a new ReCaptcha CAPTCHA. + + :param str pubkey: The public reCaptcha API key. + :param str privkey: The private reCaptcha API key. + """ super(ReCaptcha, self).__init__() self.pubkey = pubkey self.privkey = privkey @@ -96,6 +106,10 @@ class ReCaptcha(Captcha): HTML to extract the CAPTCHA image and challenge string. The image is stored at ``ReCaptcha.image`` and the challenge string at ``ReCaptcha.challenge``. + + :raises ReCaptchaKeyError: If either the :ivar:`pubkey` or + :ivar:`privkey` are missing. + :raises HTTPError: If the server returned any HTTP error status code. """ if not self.pubkey or not self.privkey: raise ReCaptchaKeyError('You must supply recaptcha API keys') @@ -103,7 +117,7 @@ class ReCaptcha(Captcha): urlbase = API_SSL_SERVER form = "/noscript?k=%s" % self.pubkey - # extract and store image from captcha + # Extract and store image from recaptcha html = urllib2.urlopen(urlbase + form).read() soup = BeautifulSoup(html) imgurl = urlbase + "/" + soup.find('img')['src']

1 0

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

16 Mar '14

commit 194abedd7a842aeb99dbeac9f33bde0daf29f8e7 Author: Isis Lovecruft <isis(a)torproject.org> Date: Fri Mar 7 16:22:12 2014 +0000 Pep8 and docstring cleanup for bridgedb.Bridges.get_hmac(). --- lib/bridgedb/Bridges.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/bridgedb/Bridges.py b/lib/bridgedb/Bridges.py index 531a842..3d27ad1 100644 --- a/lib/bridgedb/Bridges.py +++ b/lib/bridgedb/Bridges.py @@ -87,9 +87,9 @@ def is_valid_fingerprint(fp): toHex = binascii.b2a_hex fromHex = binascii.a2b_hex -def get_hmac(k,v): - """Return the hmac of v using the key k.""" - h = hmac.new(k, v, digestmod=DIGESTMOD) +def get_hmac(key, value): + """Return the hmac of **value** using the **key**.""" + h = hmac.new(key, value, digestmod=DIGESTMOD) return h.digest() def get_hmac_fn(k, hex=True):

1 0

[bridgedb/develop] 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