security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

* gpgv.c: Stub.

Browse Source 
* keyserver-internal.h, keyserver.c (keyserver_spawn, keyserver_work,
keygerver_getname): New keyserver_getname function to fetch keys by name.

* getkey.c (get_pubkey_byname): Call it here to enable locating keys by
full mailbox from a keyserver a la PKA.  Try PKA first, though, as it is
likely to be faster.
This commit is contained in:
David Shaw 2005-12-23 21:33:32 +00:00
parent da9a10d2b0
commit 8b9c16ed0a
5 changed files with 123 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
g10/ChangeLog
View File

@ -1,3 +1,15 @@
2005-12-23 David Shaw <dshaw@jabberwocky.com>
* gpgv.c: Stub.
* keyserver-internal.h, keyserver.c (keyserver_spawn,
keyserver_work, keygerver_getname): New keyserver_getname function
to fetch keys by name.
* getkey.c (get_pubkey_byname): Call it here to enable locating
keys by full mailbox from a keyserver a la PKA. Try PKA first,
though, as it is likely to be faster.
2005-12-20 Werner Koch <wk@g10code.com> 2005-12-20 Werner Koch <wk@g10code.com>
* gpg.c: New option --allow-pka-lookup. * gpg.c: New option --allow-pka-lookup.

74
g10/getkey.c
View File

@ -905,42 +905,60 @@ get_pubkey_byname (PKT_public_key *pk,
KEYDB_HANDLE *ret_kdbhd, int include_unusable ) KEYDB_HANDLE *ret_kdbhd, int include_unusable )
{ {
int rc; int rc;
int again = 0; int tried_ks=0, tried_pka=0;
STRLIST namelist = NULL; STRLIST namelist = NULL;
add_to_strlist( &namelist, name ); add_to_strlist( &namelist, name );
retry: retry:
rc = key_byname( NULL, namelist, pk, NULL, 0, rc = key_byname( NULL, namelist, pk, NULL, 0,
include_unusable, ret_keyblock, ret_kdbhd); include_unusable, ret_keyblock, ret_kdbhd);
if (rc == G10ERR_NO_PUBKEY
&& !again if (rc == G10ERR_NO_PUBKEY && is_valid_mailbox(name))
&& opt.allow_pka_lookup
&& (opt.keyserver_options.options&KEYSERVER_AUTO_PKA_RETRIEVE)
&& is_valid_mailbox (name))
{ {
/* If the requested name resembles a valid mailbox and if(!tried_pka
automatic retrieval via PKA records has been enabled, we && opt.allow_pka_lookup
try to import the key via the URI and try again. */ && (opt.keyserver_options.options&KEYSERVER_AUTO_PKA_RETRIEVE))
unsigned char fpr[MAX_FINGERPRINT_LEN]; {
char *uri; /* If the requested name resembles a valid mailbox and
struct keyserver_spec *spec; automatic retrieval via PKA records has been enabled, we
try to import the key via the URI and try again. */
unsigned char fpr[MAX_FINGERPRINT_LEN];
char *uri;
struct keyserver_spec *spec;
int try=1;
tried_pka=1;
uri = get_pka_info (name, fpr); uri = get_pka_info (name, fpr);
if (uri) if (uri)
{ {
spec = parse_keyserver_uri (uri, 0, NULL, 0); spec = parse_keyserver_uri (uri, 0, NULL, 0);
if (spec) if (spec)
{ {
glo_ctrl.in_auto_key_retrieve++; glo_ctrl.in_auto_key_retrieve++;
if (!keyserver_import_fprint (fpr, 20, spec)) try=keyserver_import_fprint (fpr, 20, spec);
again = 1; glo_ctrl.in_auto_key_retrieve--;
glo_ctrl.in_auto_key_retrieve--; free_keyserver_spec (spec);
free_keyserver_spec (spec); }
} xfree (uri);
xfree (uri); }
} if (try==0)
if (again) goto retry;
goto retry; }
/* Try keyserver last as it is likely to be the slowest.
Strictly speaking, we don't need to only use a valid mailbox
for the getname search, but it helps cut down on a problem
with searching for something like "john" and getting a lot of
keys back. */
if(!tried_ks
&& (opt.keyserver_options.options&KEYSERVER_AUTO_KEY_RETRIEVE))
{
tried_ks=1;
if(keyserver_getname(name)==0)
goto retry;
}
} }
free_strlist( namelist ); free_strlist( namelist );

2
g10/gpgv.c
View File

@ -291,6 +291,8 @@ keyserver_import_fprint (const byte *fprint, size_t fprint_len,
return -1; return -1;
} }
int
keyserver_getname(const char *name) { return -1; }
/* Stub: /* Stub:
* No encryption here but mainproc links to these functions. * No encryption here but mainproc links to these functions.

1
g10/keyserver-internal.h
View File

@ -41,5 +41,6 @@ int keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver);
int keyserver_refresh(STRLIST users); int keyserver_refresh(STRLIST users);
int keyserver_search(STRLIST tokens); int keyserver_search(STRLIST tokens);
int keyserver_fetch(STRLIST urilist); int keyserver_fetch(STRLIST urilist);
int keyserver_getname(const char *name);
#endif /* !_KEYSERVER_INTERNAL_H_ */ #endif /* !_KEYSERVER_INTERNAL_H_ */

87
g10/keyserver.c
View File

@ -43,10 +43,6 @@
#include "keyserver-internal.h" #include "keyserver-internal.h"
#include "util.h" #include "util.h"
#define GET 0
#define SEND 1
#define SEARCH 2
#define GPGKEYS_PREFIX "gpgkeys_" #define GPGKEYS_PREFIX "gpgkeys_"
#if defined(HAVE_LIBCURL) || defined(FAKE_CURL) #if defined(HAVE_LIBCURL) || defined(FAKE_CURL)
@ -69,6 +65,8 @@ struct keyrec
unsigned int lines; unsigned int lines;
}; };
enum ks_action {KS_UNKNOWN=0,KS_GET,KS_GETNAME,KS_SEND,KS_SEARCH};
/* Tell remote processes about these options */ /* Tell remote processes about these options */
#define REMOTE_TELL (KEYSERVER_INCLUDE_REVOKED|KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_TRY_DNS_SRV) #define REMOTE_TELL (KEYSERVER_INCLUDE_REVOKED|KEYSERVER_INCLUDE_SUBKEYS|KEYSERVER_TRY_DNS_SRV)
@ -96,8 +94,9 @@ static struct parse_options keyserver_opts[]=
{NULL,0,NULL,NULL} {NULL,0,NULL,NULL}
}; };
static int keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, static int keyserver_work(enum ks_action action,STRLIST list,
int count,struct keyserver_spec *keyserver); KEYDB_SEARCH_DESC *desc,int count,
struct keyserver_spec *keyserver);
int int
parse_keyserver_options(char *options) parse_keyserver_options(char *options)
@ -679,7 +678,7 @@ show_prompt(KEYDB_SEARCH_DESC *desc,int numdesc,int count,const char *search)
while((num=strsep(&split," ,"))!=NULL) while((num=strsep(&split," ,"))!=NULL)
if(atoi(num)>=1 && atoi(num)<=numdesc) if(atoi(num)>=1 && atoi(num)<=numdesc)
keyserver_work(GET,NULL,&desc[atoi(num)-1],1,opt.keyserver); keyserver_work(KS_GET,NULL,&desc[atoi(num)-1],1,opt.keyserver);
xfree(answer); xfree(answer);
return 1; return 1;
@ -880,7 +879,7 @@ curl_cant_handle(const char *scheme,unsigned int direct_uri)
#define KEYSERVER_ARGS_NOKEEP " -o \"%o\" \"%i\"" #define KEYSERVER_ARGS_NOKEEP " -o \"%o\" \"%i\""
static int static int
keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
int count,int *prog,struct keyserver_spec *keyserver) int count,int *prog,struct keyserver_spec *keyserver)
{ {
int ret=0,i,gotversion=0,outofband=0; int ret=0,i,gotversion=0,outofband=0;
@ -1014,7 +1013,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
switch(action) switch(action)
{ {
case GET: case KS_GET:
{ {
fprintf(spawn->tochild,"COMMAND GET\n\n"); fprintf(spawn->tochild,"COMMAND GET\n\n");
@ -1080,7 +1079,29 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
break; break;
} }
case SEND: case KS_GETNAME:
{
STRLIST key;
fprintf(spawn->tochild,"COMMAND GETNAME\n\n");
/* Which names do we want? */
for(key=list;key!=NULL;key=key->next)
fprintf(spawn->tochild,"%s\n",key->d);
fprintf(spawn->tochild,"\n");
if(keyserver->host)
log_info(_("searching for names from %s server %s\n"),
keyserver->scheme,keyserver->host);
else
log_info(_("searching for names from %s\n"),keyserver->uri);
break;
}
case KS_SEND:
{ {
STRLIST key; STRLIST key;
@ -1240,7 +1261,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
break; break;
} }
case SEARCH: case KS_SEARCH:
{ {
STRLIST key; STRLIST key;
@ -1344,7 +1365,8 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
if(!outofband) if(!outofband)
switch(action) switch(action)
{ {
case GET: case KS_GET:
case KS_GETNAME:
{ {
void *stats_handle; void *stats_handle;
@ -1367,10 +1389,10 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
} }
/* Nothing to do here */ /* Nothing to do here */
case SEND: case KS_SEND:
break; break;
case SEARCH: case KS_SEARCH:
keyserver_search_prompt(spawn->fromchild,searchstr); keyserver_search_prompt(spawn->fromchild,searchstr);
break; break;
@ -1390,7 +1412,7 @@ keyserver_spawn(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
} }
static int static int
keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc, keyserver_work(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
int count,struct keyserver_spec *keyserver) int count,struct keyserver_spec *keyserver)
{ {
int rc=0,ret=0; int rc=0,ret=0;
@ -1422,8 +1444,8 @@ keyserver_work(int action,STRLIST list,KEYDB_SEARCH_DESC *desc,
case KEYSERVER_NOT_SUPPORTED: case KEYSERVER_NOT_SUPPORTED:
log_error(_("action `%s' not supported with keyserver " log_error(_("action `%s' not supported with keyserver "
"scheme `%s'\n"), "scheme `%s'\n"),
action==GET?"get":action==SEND?"send": action==KS_GET?"get":action==KS_SEND?"send":
action==SEARCH?"search":"unknown", action==KS_SEARCH?"search":"unknown",
keyserver->scheme); keyserver->scheme);
break; break;
@ -1483,7 +1505,7 @@ keyserver_export(STRLIST users)
if(sl) if(sl)
{ {
rc=keyserver_work(SEND,sl,NULL,0,opt.keyserver); rc=keyserver_work(KS_SEND,sl,NULL,0,opt.keyserver);
free_strlist(sl); free_strlist(sl);
} }
@ -1521,7 +1543,7 @@ keyserver_import(STRLIST users)
} }
if(count>0) if(count>0)
rc=keyserver_work(GET,NULL,desc,count,opt.keyserver); rc=keyserver_work(KS_GET,NULL,desc,count,opt.keyserver);
xfree(desc); xfree(desc);
@ -1545,7 +1567,7 @@ keyserver_import_fprint(const byte *fprint,size_t fprint_len,
memcpy(desc.u.fpr,fprint,fprint_len); memcpy(desc.u.fpr,fprint,fprint_len);
return keyserver_work(GET,NULL,&desc,1,keyserver); return keyserver_work(KS_GET,NULL,&desc,1,keyserver);
} }
int int
@ -1559,7 +1581,7 @@ keyserver_import_keyid(u32 *keyid,struct keyserver_spec *keyserver)
desc.u.kid[0]=keyid[0]; desc.u.kid[0]=keyid[0];
desc.u.kid[1]=keyid[1]; desc.u.kid[1]=keyid[1];
return keyserver_work(GET,NULL,&desc,1,keyserver); return keyserver_work(KS_GET,NULL,&desc,1,keyserver);
} }
/* code mostly stolen from do_export_stream */ /* code mostly stolen from do_export_stream */
@ -1763,7 +1785,7 @@ keyserver_refresh(STRLIST users)
Note that a preferred keyserver without a scheme:// Note that a preferred keyserver without a scheme://
will be interpreted as hkp:// */ will be interpreted as hkp:// */
rc=keyserver_work(GET,NULL,&desc[i],1,keyserver); rc=keyserver_work(KS_GET,NULL,&desc[i],1,keyserver);
if(rc) if(rc)
log_info(_("WARNING: unable to refresh key %s" log_info(_("WARNING: unable to refresh key %s"
" via %s: %s\n"),keystr_from_desc(&desc[i]), " via %s: %s\n"),keystr_from_desc(&desc[i]),
@ -1793,7 +1815,7 @@ keyserver_refresh(STRLIST users)
count,opt.keyserver->uri); count,opt.keyserver->uri);
} }
rc=keyserver_work(GET,NULL,desc,numdesc,opt.keyserver); rc=keyserver_work(KS_GET,NULL,desc,numdesc,opt.keyserver);
} }
xfree(desc); xfree(desc);
@ -1812,7 +1834,7 @@ int
keyserver_search(STRLIST tokens) keyserver_search(STRLIST tokens)
{ {
if(tokens) if(tokens)
return keyserver_work(SEARCH,tokens,NULL,0,opt.keyserver); return keyserver_work(KS_SEARCH,tokens,NULL,0,opt.keyserver);
else else
return 0; return 0;
} }
@ -1852,7 +1874,7 @@ keyserver_fetch(STRLIST urilist)
*/ */
spec->flags.direct_uri=1; spec->flags.direct_uri=1;
rc=keyserver_work(GET,NULL,&desc,1,spec); rc=keyserver_work(KS_GET,NULL,&desc,1,spec);
if(rc) if(rc)
log_info (_("WARNING: unable to fetch URI %s: %s\n"), log_info (_("WARNING: unable to fetch URI %s: %s\n"),
sl->d,g10_errstr(rc)); sl->d,g10_errstr(rc));
@ -1872,3 +1894,18 @@ keyserver_fetch(STRLIST urilist)
return 0; return 0;
} }
int
keyserver_getname(const char *name)
{
STRLIST list=NULL;
int rc;
append_to_strlist(&list,name);
rc=keyserver_work(KS_GETNAME,list,NULL,0,opt.keyserver);
free_strlist(list);
return rc;
}