Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 3ACE4200CC6 for ; Tue, 18 Jul 2017 19:08:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 3940516733B; Tue, 18 Jul 2017 17:08:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7FA9E167339 for ; Tue, 18 Jul 2017 19:08:19 +0200 (CEST) Received: (qmail 11577 invoked by uid 500); 18 Jul 2017 17:08:18 -0000 Mailing-List: contact commits-help@allura.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@allura.apache.org Delivered-To: mailing list commits@allura.apache.org Received: (qmail 11561 invoked by uid 99); 18 Jul 2017 17:08:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2017 17:08:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1C85E8E77; Tue, 18 Jul 2017 17:08:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kentontaylor@apache.org To: commits@allura.apache.org Message-Id: <67d799e2b67249a19edde2282222b454@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: allura git commit: Skips antispam decoding on plaintext fields Date: Tue, 18 Jul 2017 17:08:15 +0000 (UTC) archived-at: Tue, 18 Jul 2017 17:08:20 -0000 Repository: allura Updated Branches: refs/heads/master 97f59a158 -> cc9b8663c Skips antispam decoding on plaintext fields Project: http://git-wip-us.apache.org/repos/asf/allura/repo Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/cc9b8663 Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/cc9b8663 Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/cc9b8663 Branch: refs/heads/master Commit: cc9b8663c452a4377ddb14824265bf5a872aac47 Parents: 97f59a1 Author: Kenton Taylor Authored: Tue Jul 18 17:08:06 2017 +0000 Committer: Kenton Taylor Committed: Tue Jul 18 17:08:06 2017 +0000 ---------------------------------------------------------------------- Allura/allura/lib/utils.py | 6 +++++- Allura/allura/lib/widgets/auth_widgets.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/allura/blob/cc9b8663/Allura/allura/lib/utils.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/utils.py b/Allura/allura/lib/utils.py index d9f7ced..3fa269e 100644 --- a/Allura/allura/lib/utils.py +++ b/Allura/allura/lib/utils.py @@ -370,7 +370,11 @@ class AntiSpam(object): if obj.spinner != expected_spinner: raise ValueError('Bad spinner value') for k in new_params.keys(): - new_params[obj.dec(k)] = new_params.pop(k) + try: + new_params[obj.dec(k)] = new_params[k] + new_params.pop(k) + except: + pass for fldno in range(obj.num_honey): value = new_params.pop('honey%s' % fldno) if value: http://git-wip-us.apache.org/repos/asf/allura/blob/cc9b8663/Allura/allura/lib/widgets/auth_widgets.py ---------------------------------------------------------------------- diff --git a/Allura/allura/lib/widgets/auth_widgets.py b/Allura/allura/lib/widgets/auth_widgets.py index 7bac270..e25c029 100644 --- a/Allura/allura/lib/widgets/auth_widgets.py +++ b/Allura/allura/lib/widgets/auth_widgets.py @@ -42,7 +42,7 @@ class LoginForm(ForgeForm): }), ew.PasswordField(name=g.antispam.enc('password'), label='Password'), ew.Checkbox( - name='rememberme', + name=g.antispam.enc('rememberme'), label='Remember Me', attrs={'style': 'margin-left: 162px;'}), ew.HiddenField(name='return_to'),