bridgedb captcha needs review

added component::circumvention/bridgedb owner::nickm parent::5481 priority::medium resolution::fixed status::closed type::task labels

Trac:
Status: new to needs_review
Cc: N/A to aagbsn@extc.org

Trac:
Owner: N/A to nickm
Status: needs_review to assigned

Trac:
Status: assigned to needs_review

It looks like this will now probably conflict with the i18n code?

Also, Main.py was tracked already, in lib/bridgedb/Main.py. Why add a new copy in ./ ?

Did you really mean to add values for RECAPTCHA_PUB_KEY and RECAPTCHA_PRIV_KEY in the source code?

I don't see a configuration option to turn recaptcha support on and off; there should probably be one. Also, the RECAPTCHA_PUB/PRIV_KEY values probably belong there too, not in the source code: editing source files in order to configure a program is very 1990. ;)

Replying to nickm:

It looks like this will now probably conflict with the i18n code?

Also, Main.py was tracked already, in lib/bridgedb/Main.py. Why add a new copy in ./ ?

Oops. Fixed.

Did you really mean to add values for RECAPTCHA_PUB_KEY and RECAPTCHA_PRIV_KEY in the source code? This was a result of a poor design. The values now live in bridgedb.conf, and the default testing configuration does not enable recaptcha support.

I don't see a configuration option to turn recaptcha support on and off; there should probably be one. Also, the RECAPTCHA_PUB/PRIV_KEY values probably belong there too, not in the source code: editing source files in order to configure a program is very 1990. ;)

Very true. I added configuration options RECAPTCHA_ENABLED, RECAPTCHA_PRIV_KEY, RECAPTCHA_PUB_KEY to bridgedb.conf

Code looks good. Two comments:

When rebasing your branch to origin/master, I'm running into conflicts. I'd rather not break anything there. Can you rebase to origin/master and make a new branch with only the recaptcha changes? Feel free to squash commits if that facilitates rebasing.
Can you tell me what libraries I need and what files I should modify to run the recaptcha code? I'm running Debian Lenny.

Thanks!

Trac:
Points: N/A to N/A
Actualpoints: N/A to N/A

Replying to karsten:

Code looks good. Two comments:

When rebasing your branch to origin/master, I'm running into conflicts. I'd rather not break anything there. Can you rebase to origin/master and make a new branch with only the recaptcha changes? Feel free to squash commits if that facilitates rebasing.

ah, squashing commits breaks stuff for people (nick) tracking the repo. I did rebase prior to submitting this for review but git is replaying the entire branch on top of master each time I rebase. What is the best course of action here? I have also attached a patch.

Can you tell me what libraries I need and what files I should modify to run the recaptcha code? I'm running Debian Lenny.

you'll need recaptcha-client (pip install recaptcha-client) or: http://pypi.python.org/pypi/recaptcha-client

and BeautifulSoup (pip install BeautifulSoup) or: http://pypi.python.org/pypi/BeautifulSoup/3.0.4

and a recaptcha.net api key (it's IP-specific)

The following bridgedb.conf options are required: RECAPTCHA_ENABLED = True RECAPTCHA_PUB_KEY = 'your_public_key_here' RECAPTCHA_PRIV_KEY = 'your_private_key_here'

Thanks!

Thanks for your feedback!

Trac:
recaptcha.patch

patch of diff between master and branch recaptcha

So, I found a BRIDGEDB_TEXT[14] that should be a BRIDGEDB_TEXT[15] and otherwise didn't get it running. I think I did all the steps you said in your last comment, and it doesn't give me a warning. But when asking for bridges via HTTPS, BridgeDB still returns three bridges to me without showing me a captcha. I also didn't see an error or something. Any idea what I could be missing?

I reviewed 55e25a97f on https://github.com/aagbsn/bridgedb/tree/fix_recaptcha today and I'd say it overall looks ok. There seem to be a few minor format and other things. Could you run pylint (or similar) over it? - I got errors running 'python setup.py install'. Thanks.

Replying to kaner:

I reviewed 55e25a97f on https://github.com/aagbsn/bridgedb/tree/fix_recaptcha today and I'd say it overall looks ok. There seem to be a few minor format and other things. Could you run pylint (or similar) over it? - I got errors running 'python setup.py install'. Thanks.

Done.