[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.10-10-ga2bd4a6

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  a2bd4a64e5b057f291a60a9499f881dd47745e2f (commit)
      from  b0d6e26bf3c8decaa568c9e4a5b2451d9af0b25b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a2bd4a64e5b057f291a60a9499f881dd47745e2f
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 22 20:13:08 2018 +0200

    dirmngr: Prepare for updated WKD specs with ?l= param
    
    * dirmngr/server.c (proc_wkd_get): Tack the raw local address to the
    request.
    --
    
    We append the raw non-canonicalized local address part to the hash.
    Servers who serve the requests from static files will ignore the
    parameters and a test with posteo shows that also services using a
    database ignore the parameter.  The general idea is that service
    providers may use their own canonicalization rules.  The problem is
    that we currently filter the returned key for the full mail address
    and thus we will never see a key if the service did a different
    canonicalization than we.  So consider this to be an experiment.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 256a280c51f9ea862e4bfb0bb530c2a96f9088f9)

diff --git a/dirmngr/server.c b/dirmngr/server.c
index fcf0c1a..d414c0e 100644
--- a/dirmngr/server.c
+++ b/dirmngr/server.c
@@ -957,19 +957,28 @@ proc_wkd_get (ctrl_t ctrl, assuan_context_t ctx, char *line)
     }
   else
     {
-      uri = strconcat ("https://",
-                       domain,
-                       portstr,
-                       "/.well-known/openpgpkey/hu/",
-                       encodedhash,
-                       NULL);
-      no_log = 1;
-      if (uri)
+      char *escapedmbox;
+
+      escapedmbox = http_escape_string (mbox, "%;?&=");
+      if (escapedmbox)
         {
-          err = dirmngr_status_printf (ctrl, "SOURCE", "https://%s%s",
-                                       domain, portstr);
-          if (err)
-            goto leave;
+          uri = strconcat ("https://",
+                           domain,
+                           portstr,
+                           "/.well-known/openpgpkey/hu/",
+                           encodedhash,
+                           "?l=",
+                           escapedmbox,
+                           NULL);
+          xfree (escapedmbox);
+          no_log = 1;
+          if (uri)
+            {
+              err = dirmngr_status_printf (ctrl, "SOURCE", "https://%s%s",
+                                           domain, portstr);
+              if (err)
+                goto leave;
+            }
         }
     }
   if (!uri)

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/server.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org