List for cgit developers and users
 help / color / mirror / Atom feed
From: john at keeping.me.uk (John Keeping)
Subject: [PATCH] Encode value and field before calculating cookie digest,  the same way secure_value() does
Date: Sat, 16 Jun 2018 17:28:27 +0100	[thread overview]
Message-ID: <20180616162827.GE1922@john.keeping.me.uk> (raw)
In-Reply-To: <20180412175431.33587-1-thevlad@gmail.com>

On Thu, Apr 12, 2018 at 08:54:31PM +0300, thevlad at gmail.com wrote:
> From: Vlad Safronov <thevlad at gmail.com>
> 
> Bugfix: Encode value and field before calculating cookie digest, the same way as secure_value() does
> so validating will work correctly on encoded values.

Missing sign-off (see [1] for what this means).

[1] https://elinux.org/Developer_Certificate_Of_Origin

However, I don't think this change is correct.  secure_value() places
the encoded strings into the authstr, which is what validate_value() is
reading, so field and value are already URL encoded here.

This is why field is url_decode()'d later in this function before
comparing with the expected value.

> ---
>  filters/simple-authentication.lua | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/filters/simple-authentication.lua b/filters/simple-authentication.lua
> index de34d09..b40a819 100644
> --- a/filters/simple-authentication.lua
> +++ b/filters/simple-authentication.lua
> @@ -230,6 +230,8 @@ function validate_value(expected_field, cookie)
>  		return nil
>  	end
>  
> +	value = url_encode(value)
> +	field = url_encode(field)
>  	-- Lua hashes strings, so these comparisons are time invariant.
>  	if hmac ~= crypto.hmac.digest("sha1", field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt, secret) then
>  		return nil
> -- 
> 2.17.0


  reply	other threads:[~2018-06-16 16:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-12 17:54 thevlad
2018-06-16 16:28 ` john [this message]
     [not found]   ` <CALR6X0_NbTSKE0DPDoni7H6M6d1HoXco=PBCJQRQOeVZGaGwZw@mail.gmail.com>
     [not found]     ` <20180617175023.GM1922@john.keeping.me.uk>
2018-06-17 19:03       ` thevlad

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180616162827.GE1922@john.keeping.me.uk \
    --to=cgit@lists.zx2c4.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).