security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

dirmngr: Fix regression in KS_GET for mail address pattern.

Browse Source 
* dirmngr/ks-engine-hkp.c (ks_hkp_search): Munge mail address pattern.
(ks_hkp_get): Allow for mail addresses.
-

Before the keyserver changes in 2.2.28 gpg passed dirmngr a pail
address as an exact pattern (e.g. "=foo@example.org").  Since 2.2.28
the mail address is detected gpg gpg and we see for example
"<foo@example.org>".  This patch fixes this to turn a mail address
into an exact match again.

GnuPG-bug-id: 5497
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2021-06-21 09:22:17 +02:00
parent 029924a46e
commit d5126efd89
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dirmngr/ks-engine-hkp.c
View File

@ -1485,6 +1485,7 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
gpg_error_t err; gpg_error_t err;
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
char fprbuf[2+64+1]; char fprbuf[2+64+1];
char *namebuffer = NULL;
char *hostport = NULL; char *hostport = NULL;
char *request = NULL; char *request = NULL;
estream_t fp = NULL; estream_t fp = NULL;
@ -1509,10 +1510,26 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
{ {
case KEYDB_SEARCH_MODE_EXACT: case KEYDB_SEARCH_MODE_EXACT:
case KEYDB_SEARCH_MODE_SUBSTR: case KEYDB_SEARCH_MODE_SUBSTR:
case KEYDB_SEARCH_MODE_MAIL:
case KEYDB_SEARCH_MODE_MAILSUB: case KEYDB_SEARCH_MODE_MAILSUB:
pattern = desc.u.name; pattern = desc.u.name;
break; break;
case KEYDB_SEARCH_MODE_MAIL:
namebuffer = xtrystrdup (desc.u.name);
if (!namebuffer)
{
err = gpg_error_from_syserror ();
goto leave;
}
/* Strip trailing angle bracket. */
if (namebuffer[0] && namebuffer[1]
&& namebuffer[strlen (namebuffer)-1] == '>')
namebuffer[strlen(namebuffer)-1] = 0;
/* Strip optional leading angle bracket. */
if (*namebuffer == '<' && namebuffer[1])
pattern = namebuffer + 1;
else
pattern = namebuffer;
break;
case KEYDB_SEARCH_MODE_SHORT_KID: case KEYDB_SEARCH_MODE_SHORT_KID:
snprintf (fprbuf, sizeof fprbuf, "0x%08lX", (ulong)desc.u.kid[1]); snprintf (fprbuf, sizeof fprbuf, "0x%08lX", (ulong)desc.u.kid[1]);
pattern = fprbuf; pattern = fprbuf;
@ -1616,6 +1633,7 @@ ks_hkp_search (ctrl_t ctrl, parsed_uri_t uri, const char *pattern,
xfree (request); xfree (request);
xfree (hostport); xfree (hostport);
xfree (httphost); xfree (httphost);
xfree (namebuffer);
return err; return err;
} }
@ -1631,6 +1649,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
KEYDB_SEARCH_DESC desc; KEYDB_SEARCH_DESC desc;
char kidbuf[2+64+1]; char kidbuf[2+64+1];
const char *exactname = NULL; const char *exactname = NULL;
char *namebuffer = NULL;
char *searchkey = NULL; char *searchkey = NULL;
char *hostport = NULL; char *hostport = NULL;
char *request = NULL; char *request = NULL;
@ -1676,6 +1695,24 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
exactname = desc.u.name; exactname = desc.u.name;
break; break;
case KEYDB_SEARCH_MODE_MAIL:
namebuffer = xtrystrdup (desc.u.name);
if (!namebuffer)
{
err = gpg_error_from_syserror ();
goto leave;
}
/* Strip trailing angle bracket. */
if (namebuffer[0] && namebuffer[1]
&& namebuffer[strlen (namebuffer)-1] == '>')
namebuffer[strlen(namebuffer)-1] = 0;
/* Strip optional leading angle bracket. */
if (*namebuffer == '<' && namebuffer[1])
exactname = namebuffer + 1;
else
exactname = namebuffer;
break;
default: default:
return gpg_error (GPG_ERR_INV_USER_ID); return gpg_error (GPG_ERR_INV_USER_ID);
} }
@ -1737,6 +1774,7 @@ ks_hkp_get (ctrl_t ctrl, parsed_uri_t uri, const char *keyspec, estream_t *r_fp)
leave: leave:
es_fclose (fp); es_fclose (fp);
xfree (namebuffer);
xfree (request); xfree (request);
xfree (hostport); xfree (hostport);
xfree (httphost); xfree (httphost);