security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing

Browse Source 
preferred keyserver on "keyserver" command line.  Sanity check keyserver
URL before accepting it.

* keyserver-internal.h, g10.c (main), keyserver.c (parse_keyserver_uri):
Add an option to require the scheme:// and change all callers.
(free_keyserver_spec): Make public.
This commit is contained in:
David Shaw 2004-05-08 13:51:14 +00:00
parent 135946bb02
commit 614304a543
5 changed files with 140 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
g10/ChangeLog
View File

@ -1,3 +1,14 @@
2004-05-08 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (keyedit_menu, menu_set_keyserver_url): Allow passing
preferred keyserver on "keyserver" command line. Sanity check
keyserver URL before accepting it.
* keyserver-internal.h, g10.c (main), keyserver.c
(parse_keyserver_uri): Add an option to require the scheme:// and
change all callers.
(free_keyserver_spec): Make public.
2004-05-07 Werner Koch <wk@gnupg.org> 2004-05-07 Werner Koch <wk@gnupg.org>
* sign.c (write_plaintext_packet): Fixed the detection of too * sign.c (write_plaintext_packet): Fixed the detection of too

4
g10/g10.c
View File

@ -2084,10 +2084,10 @@ main( int argc, char **argv )
#endif /* __riscos__ */ #endif /* __riscos__ */
break; break;
case oKeyServer: case oKeyServer:
opt.keyserver=parse_keyserver_uri(pargs.r.ret_str, opt.keyserver=parse_keyserver_uri(pargs.r.ret_str,0,
configname,configlineno); configname,configlineno);
if(!opt.keyserver) if(!opt.keyserver)
log_error(_("could not parse keyserver URI\n")); log_error(_("could not parse keyserver URL\n"));
break; break;
case oKeyServerOptions: case oKeyServerOptions:
if(!parse_keyserver_options(pargs.r.ret_str)) if(!parse_keyserver_options(pargs.r.ret_str))

56
g10/keyedit.c
View File

@ -41,6 +41,7 @@
#include "ttyio.h" #include "ttyio.h"
#include "status.h" #include "status.h"
#include "i18n.h" #include "i18n.h"
#include "keyserver-internal.h"
static void show_prefs( PKT_user_id *uid, int verbose ); static void show_prefs( PKT_user_id *uid, int verbose );
static void show_key_with_all_names( KBNODE keyblock, int only_marked, static void show_key_with_all_names( KBNODE keyblock, int only_marked,
@ -55,7 +56,8 @@ static int menu_addrevoker( KBNODE pub_keyblock,
static int menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock ); static int menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock );
static int menu_set_primary_uid( KBNODE pub_keyblock, KBNODE sec_keyblock ); static int menu_set_primary_uid( KBNODE pub_keyblock, KBNODE sec_keyblock );
static int menu_set_preferences( KBNODE pub_keyblock, KBNODE sec_keyblock ); static int menu_set_preferences( KBNODE pub_keyblock, KBNODE sec_keyblock );
static int menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock ); static int menu_set_keyserver_url (const char *url,
KBNODE pub_keyblock, KBNODE sec_keyblock );
static int menu_select_uid( KBNODE keyblock, int idx ); static int menu_select_uid( KBNODE keyblock, int idx );
static int menu_select_key( KBNODE keyblock, int idx ); static int menu_select_key( KBNODE keyblock, int idx );
static int count_uids( KBNODE keyblock ); static int count_uids( KBNODE keyblock );
@ -1607,7 +1609,9 @@ keyedit_menu( const char *username, STRLIST locusr,
break; break;
case cmdPREFKS: case cmdPREFKS:
if( menu_set_keyserver_url ( keyblock, sec_keyblock ) ) { if( menu_set_keyserver_url ( *arg_string?arg_string:NULL,
keyblock, sec_keyblock ) )
{
merge_keys_and_selfsig( keyblock ); merge_keys_and_selfsig( keyblock );
modified = 1; modified = 1;
redisplay = 1; redisplay = 1;
@ -3173,7 +3177,8 @@ menu_set_preferences (KBNODE pub_keyblock, KBNODE sec_keyblock )
static int static int
menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock ) menu_set_keyserver_url (const char *url,
KBNODE pub_keyblock, KBNODE sec_keyblock )
{ {
PKT_secret_key *sk; /* copy of the main sk */ PKT_secret_key *sk; /* copy of the main sk */
PKT_public_key *main_pk; PKT_public_key *main_pk;
@ -3183,9 +3188,14 @@ menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
int selected, select_all; int selected, select_all;
int modified = 0; int modified = 0;
char *answer; char *answer;
struct keyserver_spec *keyserver;
no_primary_warning(pub_keyblock); no_primary_warning(pub_keyblock);
if(url)
answer=m_strdup(url);
else
{
answer=cpr_get_utf8("keyedit.add_keyserver", answer=cpr_get_utf8("keyedit.add_keyserver",
_("Enter your preferred keyserver URL: ")); _("Enter your preferred keyserver URL: "));
if(answer[0]=='\0' || answer[0]=='\004') if(answer[0]=='\0' || answer[0]=='\004')
@ -3193,6 +3203,16 @@ menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
m_free(answer); m_free(answer);
return 0; return 0;
} }
}
/* Sanity check the format */
keyserver=parse_keyserver_uri(answer,1,NULL,0);
m_free(answer);
if(!keyserver)
{
log_info(_("could not parse keyserver URL\n"));
return 0;
}
select_all = !count_selected_uids (pub_keyblock); select_all = !count_selected_uids (pub_keyblock);
@ -3203,31 +3223,38 @@ menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
main_pk = NULL; main_pk = NULL;
uid = NULL; uid = NULL;
selected = 0; selected = 0;
for ( node=pub_keyblock; node; node = node->next ) { for ( node=pub_keyblock; node; node = node->next )
{
if ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY ) if ( node->pkt->pkttype == PKT_PUBLIC_SUBKEY )
break; /* ready */ break; /* ready */
if ( node->pkt->pkttype == PKT_PUBLIC_KEY ) { if ( node->pkt->pkttype == PKT_PUBLIC_KEY )
{
main_pk = node->pkt->pkt.public_key; main_pk = node->pkt->pkt.public_key;
keyid_from_pk( main_pk, keyid ); keyid_from_pk( main_pk, keyid );
} }
else if ( node->pkt->pkttype == PKT_USER_ID ) { else if ( node->pkt->pkttype == PKT_USER_ID )
{
uid = node->pkt->pkt.user_id; uid = node->pkt->pkt.user_id;
selected = select_all || (node->flag & NODFLG_SELUID); selected = select_all || (node->flag & NODFLG_SELUID);
} }
else if ( main_pk && uid && selected else if ( main_pk && uid && selected
&& node->pkt->pkttype == PKT_SIGNATURE ) { && node->pkt->pkttype == PKT_SIGNATURE )
{
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] if ( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1]
&& (uid && (sig->sig_class&~3) == 0x10) ) { && (uid && (sig->sig_class&~3) == 0x10) )
if( sig->version < 4 ) { {
if( sig->version < 4 )
{
char *user=utf8_to_native(uid->name,strlen(uid->name),0); char *user=utf8_to_native(uid->name,strlen(uid->name),0);
log_info(_("skipping v3 self-signature on user id \"%s\"\n"), log_info(_("skipping v3 self-signature on user id \"%s\"\n"),
user); user);
m_free(user); m_free(user);
} }
else { else
{
/* This is a selfsignature which is to be replaced /* This is a selfsignature which is to be replaced
* We have to ignore v3 signatures because they are * We have to ignore v3 signatures because they are
* not able to carry the preferences */ * not able to carry the preferences */
@ -3239,11 +3266,12 @@ menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
main_pk, uid, NULL, main_pk, uid, NULL,
sk, sk,
keygen_add_keyserver_url, keygen_add_keyserver_url,
answer ); keyserver->uri );
if( rc ) { if( rc )
{
log_error ("update_keysig_packet failed: %s\n", log_error ("update_keysig_packet failed: %s\n",
g10_errstr(rc)); g10_errstr(rc));
m_free(answer); free_keyserver_spec(keyserver);
free_secret_key( sk ); free_secret_key( sk );
return 0; return 0;
} }
@ -3260,7 +3288,7 @@ menu_set_keyserver_url (KBNODE pub_keyblock, KBNODE sec_keyblock )
} }
} }
m_free(answer); free_keyserver_spec(keyserver);
free_secret_key( sk ); free_secret_key( sk );
return modified; return modified;
} }

3
g10/keyserver-internal.h
View File

@ -9,7 +9,8 @@
#include "types.h" #include "types.h"
int parse_keyserver_options(char *options); int parse_keyserver_options(char *options);
struct keyserver_spec *parse_keyserver_uri(char *uri, void free_keyserver_spec(struct keyserver_spec *keyserver);
struct keyserver_spec *parse_keyserver_uri(char *uri,int require_scheme,
const char *configname, const char *configname,
unsigned int configlineno); unsigned int configlineno);
int keyserver_export(STRLIST users); int keyserver_export(STRLIST users);

14
g10/keyserver.c
View File

@ -135,7 +135,7 @@ parse_keyserver_options(char *options)
return ret; return ret;
} }
static void void
free_keyserver_spec(struct keyserver_spec *keyserver) free_keyserver_spec(struct keyserver_spec *keyserver)
{ {
m_free(keyserver->uri); m_free(keyserver->uri);
@ -146,7 +146,8 @@ free_keyserver_spec(struct keyserver_spec *keyserver)
} }
struct keyserver_spec * struct keyserver_spec *
parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno) parse_keyserver_uri(char *uri,int require_scheme,
const char *configname,unsigned int configlineno)
{ {
int assume_hkp=0; int assume_hkp=0;
struct keyserver_spec *keyserver; struct keyserver_spec *keyserver;
@ -163,6 +164,9 @@ parse_keyserver_uri(char *uri,const char *configname,unsigned int configlineno)
scheme=strsep(&uri,":"); scheme=strsep(&uri,":");
if(uri==NULL) if(uri==NULL)
{ {
if(require_scheme)
return NULL;
/* Assume HKP if there is no scheme */ /* Assume HKP if there is no scheme */
assume_hkp=1; assume_hkp=1;
uri=scheme; uri=scheme;
@ -1361,9 +1365,11 @@ keyidlist(STRLIST users,KEYDB_SEARCH_DESC **klist,int *count,int fakev3)
dupe[plen]='\0'; dupe[plen]='\0';
/* Make up a keyserver structure and do an /* Make up a keyserver structure and do an
import for this key. */ import for this key. Note that a preferred
keyserver without a scheme:// will be
interpreted as hkp:// */
keyserver=parse_keyserver_uri(dupe,NULL,0); keyserver=parse_keyserver_uri(dupe,0,NULL,0);
m_free(dupe); m_free(dupe);
if(keyserver) if(keyserver)