Merge lp:~jks/mailman/hcaptcha into lp:mailman/2.1

[Jouni K. Seppänen]

I noticed that a Mailman 2.1 site I run was being used for sending subscribe confirmation messages to people. I didn't want to implement reCaptcha because of privacy concerns, and hCaptcha seems to be almost a drop-in replacement that at least promises to respect user privacy. This change allows using hCaptcha instead of reCaptcha for guarding the subscription form.

When testing, the dummy keys from https://docs.hcaptcha.com/#localdev may be useful:

Dummy Site Key:10000000-ffff-ffff-ffff-000000000001
Dummy Secret Key:0x0000000000000000000000000000000000000000

[Mark Sapiro (msapiro)]

Mailman 2.1 is end of life. No new features are being implemented.

review: Disapprove (process)

[Jim Popovitch (jimpop)]

If it has life, let it live....

If you love some(thing) set it free...

[Jim Popovitch (jimpop)]

BTW, python2 is fully supported until 2025 in Ubuntu 20.04 LTS (Focal)

https://lists.ubuntu.com/archives/ubuntu-announce/2020-April/000256.html

[Mark Sapiro (msapiro)]

I never said people weren't free to make their own forks. I just said I and the GNU Mailman project weren't going to do it. It's GPL'd. Have at it.

[Jim Popovitch (jimpop)]

If you just want to step aside and move on, then do it.

The question that never gets answered is: There are plenty of people involved with the project, how come you get to decide it dies? Let it die due to inactivity, sure.

[Mark Sapiro (msapiro)]

@jimpop For the last several years the only member of the Gnu Mailman project supporting the actual Mailman 2.1 code base has been me. I get to decide what I am willing to do. I'm not trying to kill Mailman 2.1. I have said I will accept i18n updates and fix security issues and critical bugs. I still actively support Mailman 2.1 users on the <email address hidden> list, but I am not implementing new features. That's all.

[Jim Popovitch (jimpop)]

So let me, jks, and anyone else who wants to jump in, maintain new features.

[Mark Sapiro (msapiro)]

I assume you aren't just asking permission to create and maintain your own branch on Launchpad and add it to your PPA, since you don't need my permission/approval to do that, so I guess you are asking for commit permission on https://code.launchpad.net/~mailman-coders/mailman/2.1 and the ability to add new releases to https://launchpad.net/mailman/2.1/, https://ftp.gnu.org/gnu/mailman/ and https://sourceforge.net/projects/mailman/ and perhaps the ability to update
http://www.list.org, https://www.gnu.org/software/mailman and http://mailman.sourceforge.net/.

If that is the case, I suggest you start by making a proposal to <email address hidden>.

[Jouni K. Seppänen (jks)]

Hey, I just needed to patch my own installation of Mailman and thought that the patch would be useful to others; I didn't propose to take on the burden of maintaining Mailman. Apparently this patch wasn't welcome, which is certainly fair enough.

Perhaps eventually I will find the time and energy to attempt a migration to Mailman 3 and figure out if it already has hCaptcha support or similar protection against subscription spam. Until such time, it seems I'll have to be running a patched version, and perhaps others in a similar situation can find this patch here.

[Jim Popovitch (jimpop)]

> I assume you aren't just asking permission to create and maintain your own
> branch on Launchpad and add it to your PPA, since you don't need my
> permission/approval to do that, so I guess you are asking for commit
> permission on https://code.launchpad.net/~mailman-coders/mailman/2.1 and the
> ability to add new releases to https://launchpad.net/mailman/2.1/,
> https://ftp.gnu.org/gnu/mailman/ and https://sourceforge.net/projects/mailman/
> and perhaps the ability to update
> http://www.list.org, https://www.gnu.org/software/mailman and
> http://mailman.sourceforge.net/.

All that would be wonderful, but that's overkill. What is needed is the ability to approve new features and to commit them into the original and common code base that has been in place for decades now. Sure, anyone can do that in their own fork, but the mm2 project is where it should be done. I understand that your personal opinion is that you don't want to do that. No one should be upset or offended by you deciding that you don't want to do something; people should applaud that.

> If that is the case, I suggest you start by making a proposal to mailman-
> <email address hidden>.

Noted. I don't see a need for any great changes other than one or two additional people to test and approve new features that come up once or twice a year. I'll make a post on the list to ask for one or two others to join me in coming up with a proposal. Thanks.

review: Approve

Unmerged revisions

1861. By Jouni K. Seppänen on 2020-08-23

Allow using hCaptcha in addition to reCaptcha

hCaptcha is allegedly better for user privacy.

=== modified file 'Mailman/Cgi/listinfo.py'
--- Mailman/Cgi/listinfo.py	2019-06-19 23:56:49 +0000
+++ Mailman/Cgi/listinfo.py	2020-08-23 10:21:44 +0000
@@ -263,15 +263,25 @@
     replacements['<mm-fullname-box>'] = mlist.FormatBox('fullname', size=30)
     # If reCAPTCHA is enabled, display its user interface
     if mm_cfg.RECAPTCHA_SITE_KEY:
+        captcha_api = 'https://www.google.com/recaptcha/api.js?hl=%s' % lang
+        div_class = 'g-recaptcha'
+        sitekey = mm_cfg.RECAPTCHA_SITE_KEY
+    elif mm_cfg.HCAPTCHA_SITE_KEY:
+        captcha_api = 'https://hcaptcha.com/1/api.js?hl=%s' % lang
+        div_class = 'h-captcha'
+        sitekey = mm_cfg.HCAPTCHA_SITE_KEY
+    else:
+        captcha_api = None
+    if captcha_api is not None:
         noscript = _('This form requires JavaScript.')
         replacements['<mm-recaptcha-ui>'] = (
             """<tr><td>&nbsp;</td><td>
             <noscript>%s</noscript>
-            <script src="https://www.google.com/recaptcha/api.js?hl=%s">
+            <script src="%s">
             </script>
-            <div class="g-recaptcha" data-sitekey="%s"></div>
+            <div class="%s" data-sitekey="%s"></div>
             </td></tr>"""
-            % (noscript, lang, mm_cfg.RECAPTCHA_SITE_KEY))
+            % (noscript, captcha_api, div_class, sitekey))
     else:
         replacements['<mm-recaptcha-ui>'] = ''
 

=== modified file 'Mailman/Cgi/subscribe.py'
--- Mailman/Cgi/subscribe.py	2020-06-10 22:04:26 +0000
+++ Mailman/Cgi/subscribe.py	2020-08-23 10:21:44 +0000
@@ -39,6 +39,25 @@
 SLASH = '/'
 ERRORSEP = '\n\n<p>'
 COMMASPACE = ', '
+CAPTCHA = {
+    'recaptcha': {
+        'name': 'reCAPTCHA',
+        'verify': 'https://www.google.com/recaptcha/api/siteverify',
+        'secret_key': mm_cfg.RECAPTCHA_SECRET_KEY,
+        'site_key': mm_cfg.RECAPTCHA_SITE_KEY,
+        'value': 'g-recaptcha-response',
+        'include_site_key': False
+    },
+    'hcaptcha': {
+        'name': 'hCAPTCHA',
+        'verify': 'https://hcaptcha.com/siteverify',
+        'secret_key': mm_cfg.HCAPTCHA_SECRET_KEY,
+        'site_key': mm_cfg.HCAPTCHA_SITE_KEY,
+        'value': 'h-captcha-response',
+        'include_site_key': True
+    },
+}
+
 
 # Set up i18n
 _ = i18n._
@@ -136,24 +155,37 @@
              os.environ.get('REMOTE_ADDR',
                             'unidentified origin')))
 
-    # Check reCAPTCHA submission, if enabled
+    # Check reCAPTCHA/hCAPTCHA submission, if enabled
     if mm_cfg.RECAPTCHA_SECRET_KEY:
+        captcha = CAPTCHA['recaptcha']
+    elif mm_cfg.HCAPTCHA_SECRET_KEY:
+        captcha = CAPTCHA['hcaptcha']
+    else:
+        captcha = None
+        
+    if captcha is not None:
+        name = captcha['name']
+        data = {
+            'secret': captcha['secret_key'],
+            'response': cgidata.getvalue(captcha['value'], ''),
+            'remoteip': remote 
+       }
+        if captcha['include_site_key']:
+            data['sitekey'] = captcha['site_key']
         request = urllib2.Request(
-            url = 'https://www.google.com/recaptcha/api/siteverify',
-            data = urllib.urlencode({
-                'secret': mm_cfg.RECAPTCHA_SECRET_KEY,
-                'response': cgidata.getvalue('g-recaptcha-response', ''),
-                'remoteip': remote}))
+            url = captcha['verify'],
+            data = urllib.urlencode(data)
+        )
         try:
             httpresp = urllib2.urlopen(request)
             captcha_response = json.load(httpresp)
             httpresp.close()
             if not captcha_response['success']:
                 e_codes = COMMASPACE.join(captcha_response['error-codes'])
-                results.append(_('reCAPTCHA validation failed: %(e_codes)s'))
+                results.append(_('%(name)s validation failed: %(e_codes)s'))
         except urllib2.URLError, e:
             e_reason = e.reason
-            results.append(_('reCAPTCHA could not be validated: %(e_reason)s'))
+            results.append(_('%(name)s could not be validated: %(e_reason)s'))
 
     # Are we checking the hidden data?
     if mm_cfg.SUBSCRIBE_FORM_SECRET:

=== modified file 'Mailman/Defaults.py.in'
--- Mailman/Defaults.py.in	2020-06-10 22:04:26 +0000
+++ Mailman/Defaults.py.in	2020-08-23 10:21:44 +0000
@@ -156,6 +156,12 @@
 RECAPTCHA_SITE_KEY = None
 RECAPTCHA_SECRET_KEY = None
 
+# Use hCAPTCHA to protect the subscription form from spam bots, as an
+# alternative to the Google reCAPTCHA (at most one of the two can be enabled).
+# Obtain the following keys from https://www.hcaptcha.com
+HCAPTCHA_SITE_KEY = None
+HCAPTCHA_SECRET_KEY = None
+
 # Installation wide ban list.  This is a list of email addresses and regexp
 # patterns (beginning with ^) which are not allowed to subscribe to any lists
 # in the installation.  This supplements the individual list's ban_list.