mirror of
git://git.gnupg.org/gnupg.git
synced 2025-05-24 16:43:28 +02:00
FTP keyserver support via gpgkeys_ftp. This is currently off by default.
This commit is contained in:
David Shaw
parent
b883e9642b
commit
95b8456f34
@ -1,3 +1,9 @@
|
|||||||
|
2004-12-21 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* gpgkeys_ftp.c: New.
|
||||||
|
|
||||||
|
* Makefile.am: Build it if requested.
|
||||||
|
|
||||||
2004-12-14 Werner Koch <wk@g10code.com>
|
2004-12-14 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* Makefile.am (install-exec-hook, uninstall-hook): Removed. For
|
* Makefile.am (install-exec-hook, uninstall-hook): Removed. For
|
||||||
|
|||||||
@ -19,11 +19,11 @@
|
|||||||
## Process this file with automake to produce Makefile.in
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||||
EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger
|
EXTRA_PROGRAMS = gpgkeys_ldap gpgkeys_hkp gpgkeys_http gpgkeys_finger gpgkeys_ftp
|
||||||
EXTRA_SCRIPTS = gpgkeys_mailto
|
EXTRA_SCRIPTS = gpgkeys_mailto
|
||||||
libexecdir = @libexecdir@/@PACKAGE@
|
libexecdir = @libexecdir@/@PACKAGE@
|
||||||
|
|
||||||
libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_HTTP@ @GPGKEYS_FINGER@
|
libexec_PROGRAMS = @GPGKEYS_LDAP@ @GPGKEYS_HKP@ @GPGKEYS_HTTP@ @GPGKEYS_FINGER@ @GPGKEYS_FTP@
|
||||||
libexec_SCRIPTS = @GPGKEYS_MAILTO@
|
libexec_SCRIPTS = @GPGKEYS_MAILTO@
|
||||||
noinst_SCRIPTS = gpgkeys_test
|
noinst_SCRIPTS = gpgkeys_test
|
||||||
|
|
||||||
@ -31,6 +31,7 @@ gpgkeys_ldap_SOURCES = gpgkeys_ldap.c ksutil.c ksutil.h
|
|||||||
gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h
|
gpgkeys_hkp_SOURCES = gpgkeys_hkp.c ksutil.c ksutil.h
|
||||||
gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h
|
gpgkeys_http_SOURCES = gpgkeys_http.c ksutil.c ksutil.h
|
||||||
gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h
|
gpgkeys_finger_SOURCES = gpgkeys_finger.c ksutil.c ksutil.h
|
||||||
|
gpgkeys_ftp_SOURCES = gpgkeys_ftp.c ksutil.c ksutil.h
|
||||||
|
|
||||||
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
|
other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
|
||||||
|
|
||||||
@ -38,5 +39,5 @@ gpgkeys_ldap_LDADD = ../util/libutil.a @LDAPLIBS@ @NETLIBS@ $(other_libs) @GETO
|
|||||||
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
gpgkeys_hkp_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||||
gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
gpgkeys_http_LDADD = ../util/libutil.a @NETLIBS@ @SRVLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||||
gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
gpgkeys_finger_LDADD = ../util/libutil.a @NETLIBS@ $(other_libs) @GETOPT@ @W32LIBS@
|
||||||
|
gpgkeys_ftp_CPPFLAGS = @LIBCURL_INCLUDES@
|
||||||
|
gpgkeys_ftp_LDADD = @LIBCURL@ @GETOPT@
|
||||||
|
|||||||
343
keyserver/gpgkeys_ftp.c
Normal file
343
keyserver/gpgkeys_ftp.c
Normal file
@ -0,0 +1,343 @@
|
|||||||
|
/* gpgkeys_ftp.c - fetch a key via FTP
|
||||||
|
* Copyright (C) 2004 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* This file is part of GnuPG.
|
||||||
|
*
|
||||||
|
* GnuPG is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* GnuPG is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <config.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <errno.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#ifdef HAVE_GETOPT_H
|
||||||
|
#include <getopt.h>
|
||||||
|
#endif
|
||||||
|
#include <curl/curl.h>
|
||||||
|
#include "keyserver.h"
|
||||||
|
#include "ksutil.h"
|
||||||
|
|
||||||
|
extern char *optarg;
|
||||||
|
extern int optind;
|
||||||
|
|
||||||
|
#define GET 0
|
||||||
|
#define MAX_LINE 80
|
||||||
|
#define MAX_PATH 1023
|
||||||
|
#define MAX_HOST 79
|
||||||
|
#define MAX_PORT 9
|
||||||
|
#define MAX_URL (3+3+MAX_HOST+1+1+MAX_PORT+1+1+MAX_PATH+1+50)
|
||||||
|
|
||||||
|
#define STRINGIFY(x) #x
|
||||||
|
#define MKSTRING(x) STRINGIFY(x)
|
||||||
|
|
||||||
|
static int verbose=0;
|
||||||
|
static char host[MAX_HOST+1]={'\0'},port[MAX_PORT+1]={'\0'},path[MAX_PATH+1]={'\0'};
|
||||||
|
static FILE *input=NULL,*output=NULL,*console=NULL;
|
||||||
|
static CURL *curl;
|
||||||
|
static char request[MAX_URL]={'\0'};
|
||||||
|
|
||||||
|
static int
|
||||||
|
get_key(char *getkey)
|
||||||
|
{
|
||||||
|
CURLcode res;
|
||||||
|
char errorbuffer[CURL_ERROR_SIZE];
|
||||||
|
|
||||||
|
if(strncmp(getkey,"0x",2)==0)
|
||||||
|
getkey+=2;
|
||||||
|
|
||||||
|
fprintf(output,"KEY 0x%s BEGIN\n",getkey);
|
||||||
|
|
||||||
|
sprintf(request,"ftp://%s%s%s%s%s",host,port[0]?":":"",
|
||||||
|
port[0]?port:"",path[0]?"":"/",path);
|
||||||
|
|
||||||
|
curl_easy_setopt(curl,CURLOPT_URL,request);
|
||||||
|
curl_easy_setopt(curl,CURLOPT_WRITEFUNCTION,fwrite);
|
||||||
|
curl_easy_setopt(curl,CURLOPT_WRITEDATA,output);
|
||||||
|
curl_easy_setopt(curl,CURLOPT_ERRORBUFFER,errorbuffer);
|
||||||
|
|
||||||
|
if(verbose>2)
|
||||||
|
{
|
||||||
|
curl_easy_setopt(curl,CURLOPT_STDERR,console);
|
||||||
|
curl_easy_setopt(curl,CURLOPT_VERBOSE,TRUE);
|
||||||
|
}
|
||||||
|
|
||||||
|
res=curl_easy_perform(curl);
|
||||||
|
if(res!=0)
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: FTP fetch error %d: %s\n",res,errorbuffer);
|
||||||
|
fprintf(output,"KEY 0x%s FAILED %d\n",getkey,
|
||||||
|
(res==CURLE_FTP_COULDNT_RETR_FILE)?KEYSERVER_KEY_NOT_FOUND:
|
||||||
|
KEYSERVER_INTERNAL_ERROR);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
fprintf(output,"KEY 0x%s END\n",getkey);
|
||||||
|
|
||||||
|
return KEYSERVER_OK;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
show_help (FILE *fp)
|
||||||
|
{
|
||||||
|
fprintf (fp,"-h\thelp\n");
|
||||||
|
fprintf (fp,"-V\tversion\n");
|
||||||
|
fprintf (fp,"-o\toutput to this file\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main(int argc,char *argv[])
|
||||||
|
{
|
||||||
|
int arg,action=-1,ret=KEYSERVER_INTERNAL_ERROR;
|
||||||
|
char line[MAX_LINE];
|
||||||
|
char *thekey=NULL;
|
||||||
|
unsigned int timeout=DEFAULT_KEYSERVER_TIMEOUT;
|
||||||
|
|
||||||
|
console=stderr;
|
||||||
|
|
||||||
|
/* Kludge to implement standard GNU options. */
|
||||||
|
if (argc > 1 && !strcmp (argv[1], "--version"))
|
||||||
|
{
|
||||||
|
fputs ("gpgkeys_ftp (GnuPG) " VERSION"\n", stdout);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
else if (argc > 1 && !strcmp (argv[1], "--help"))
|
||||||
|
{
|
||||||
|
show_help (stdout);
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
while((arg=getopt(argc,argv,"hVo:"))!=-1)
|
||||||
|
switch(arg)
|
||||||
|
{
|
||||||
|
default:
|
||||||
|
case 'h':
|
||||||
|
show_help (console);
|
||||||
|
return KEYSERVER_OK;
|
||||||
|
|
||||||
|
case 'V':
|
||||||
|
fprintf(stdout,"%d\n%s\n",KEYSERVER_PROTO_VERSION,VERSION);
|
||||||
|
return KEYSERVER_OK;
|
||||||
|
|
||||||
|
case 'o':
|
||||||
|
output=fopen(optarg,"w");
|
||||||
|
if(output==NULL)
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: Cannot open output file `%s': %s\n",
|
||||||
|
optarg,strerror(errno));
|
||||||
|
return KEYSERVER_INTERNAL_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(argc>optind)
|
||||||
|
{
|
||||||
|
input=fopen(argv[optind],"r");
|
||||||
|
if(input==NULL)
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: Cannot open input file `%s': %s\n",
|
||||||
|
argv[optind],strerror(errno));
|
||||||
|
return KEYSERVER_INTERNAL_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(input==NULL)
|
||||||
|
input=stdin;
|
||||||
|
|
||||||
|
if(output==NULL)
|
||||||
|
output=stdout;
|
||||||
|
|
||||||
|
/* Get the command and info block */
|
||||||
|
|
||||||
|
while(fgets(line,MAX_LINE,input)!=NULL)
|
||||||
|
{
|
||||||
|
int version;
|
||||||
|
char commandstr[7];
|
||||||
|
char optionstr[256];
|
||||||
|
char hash;
|
||||||
|
|
||||||
|
if(line[0]=='\n')
|
||||||
|
break;
|
||||||
|
|
||||||
|
if(sscanf(line,"%c",&hash)==1 && hash=='#')
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if(sscanf(line,"COMMAND %6s\n",commandstr)==1)
|
||||||
|
{
|
||||||
|
commandstr[6]='\0';
|
||||||
|
|
||||||
|
if(strcasecmp(commandstr,"get")==0)
|
||||||
|
action=GET;
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(sscanf(line,"HOST %" MKSTRING(MAX_HOST) "s\n",host)==1)
|
||||||
|
{
|
||||||
|
host[MAX_HOST]='\0';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(sscanf(line,"PORT %" MKSTRING(MAX_PORT) "s\n",port)==1)
|
||||||
|
{
|
||||||
|
port[MAX_PORT]='\0';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(sscanf(line,"PATH %" MKSTRING(MAX_PATH) "s\n",path)==1)
|
||||||
|
{
|
||||||
|
path[MAX_PATH]='\0';
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(sscanf(line,"VERSION %d\n",&version)==1)
|
||||||
|
{
|
||||||
|
if(version!=KEYSERVER_PROTO_VERSION)
|
||||||
|
{
|
||||||
|
ret=KEYSERVER_VERSION_ERROR;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(sscanf(line,"OPTION %255s\n",optionstr)==1)
|
||||||
|
{
|
||||||
|
int no=0;
|
||||||
|
char *start=&optionstr[0];
|
||||||
|
|
||||||
|
optionstr[255]='\0';
|
||||||
|
|
||||||
|
if(strncasecmp(optionstr,"no-",3)==0)
|
||||||
|
{
|
||||||
|
no=1;
|
||||||
|
start=&optionstr[3];
|
||||||
|
}
|
||||||
|
|
||||||
|
if(strcasecmp(start,"verbose")==0)
|
||||||
|
{
|
||||||
|
if(no)
|
||||||
|
verbose--;
|
||||||
|
else
|
||||||
|
verbose++;
|
||||||
|
}
|
||||||
|
else if(strncasecmp(start,"timeout",7)==0)
|
||||||
|
{
|
||||||
|
if(no)
|
||||||
|
timeout=0;
|
||||||
|
else
|
||||||
|
timeout=atoi(&start[8]);
|
||||||
|
}
|
||||||
|
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(timeout && register_timeout()==-1)
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: unable to register timeout handler\n");
|
||||||
|
return KEYSERVER_INTERNAL_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
|
curl_global_init(CURL_GLOBAL_DEFAULT);
|
||||||
|
curl=curl_easy_init();
|
||||||
|
if(!curl)
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: unable to initialize curl\n");
|
||||||
|
ret=KEYSERVER_INTERNAL_ERROR;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* If it's a GET or a SEARCH, the next thing to come in is the
|
||||||
|
keyids. If it's a SEND, then there are no keyids. */
|
||||||
|
|
||||||
|
if(action==GET)
|
||||||
|
{
|
||||||
|
/* Eat the rest of the file */
|
||||||
|
for(;;)
|
||||||
|
{
|
||||||
|
if(fgets(line,MAX_LINE,input)==NULL)
|
||||||
|
break;
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if(line[0]=='\n' || line[0]=='\0')
|
||||||
|
break;
|
||||||
|
|
||||||
|
if(!thekey)
|
||||||
|
{
|
||||||
|
thekey=strdup(line);
|
||||||
|
if(!thekey)
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: out of memory while "
|
||||||
|
"building key list\n");
|
||||||
|
ret=KEYSERVER_NO_MEMORY;
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Trim the trailing \n */
|
||||||
|
thekey[strlen(line)-1]='\0';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
fprintf(console,
|
||||||
|
"gpgkeys: this keyserver type only supports key retrieval\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!thekey || !host[0])
|
||||||
|
{
|
||||||
|
fprintf(console,"gpgkeys: invalid keyserver instructions\n");
|
||||||
|
goto fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Send the response */
|
||||||
|
|
||||||
|
fprintf(output,"VERSION %d\n",KEYSERVER_PROTO_VERSION);
|
||||||
|
fprintf(output,"PROGRAM %s\n\n",VERSION);
|
||||||
|
|
||||||
|
if(verbose>1)
|
||||||
|
{
|
||||||
|
fprintf(console,"Host:\t\t%s\n",host);
|
||||||
|
if(port[0])
|
||||||
|
fprintf(console,"Port:\t\t%s\n",port);
|
||||||
|
if(path[0])
|
||||||
|
fprintf(console,"Path:\t\t%s\n",path);
|
||||||
|
fprintf(console,"Command:\tGET\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
set_timeout(timeout);
|
||||||
|
|
||||||
|
ret=get_key(thekey);
|
||||||
|
|
||||||
|
curl_easy_cleanup(curl);
|
||||||
|
|
||||||
|
fail:
|
||||||
|
|
||||||
|
free(thekey);
|
||||||
|
|
||||||
|
if(input!=stdin)
|
||||||
|
fclose(input);
|
||||||
|
|
||||||
|
if(output!=stdout)
|
||||||
|
fclose(output);
|
||||||
|
|
||||||
|
curl_global_cleanup();
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
@ -1,3 +1,7 @@
|
|||||||
|
2004-12-21 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* libcurl.m4: New.
|
||||||
|
|
||||||
2004-12-18 David Shaw <dshaw@jabberwocky.com>
|
2004-12-18 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
* readline.m4: New.
|
* readline.m4: New.
|
||||||
|
|||||||
41
m4/libcurl.m4
Normal file
41
m4/libcurl.m4
Normal file
@ -0,0 +1,41 @@
|
|||||||
|
dnl Check for libcurl and dependencies
|
||||||
|
dnl Copyright (C) 2004 Free Software Foundation, Inc.
|
||||||
|
dnl
|
||||||
|
dnl This file is free software, distributed under the terms of the GNU
|
||||||
|
dnl General Public License. As a special exception to the GNU General
|
||||||
|
dnl Public License, this file may be distributed as part of a program
|
||||||
|
dnl that contains a configuration script generated by Autoconf, under
|
||||||
|
dnl the same distribution terms as the rest of that program.
|
||||||
|
dnl
|
||||||
|
dnl Defines HAVE_LIBCURL to 1 if a working curl setup is found, and sets
|
||||||
|
dnl @LIBCURL@ and @LIBCURL_INCLUDES@ to the necessary values.
|
||||||
|
dnl $have_libcurl is set to yes or no so other things in configure can
|
||||||
|
dnl make use of it.
|
||||||
|
|
||||||
|
AC_DEFUN([GNUPG_CHECK_LIBCURL],
|
||||||
|
[
|
||||||
|
AC_ARG_WITH(libcurl,
|
||||||
|
AC_HELP_STRING([--with-libcurl=DIR],[look for the curl library in DIR]),
|
||||||
|
[_do_libcurl=$withval],[_do_libcurl=yes])
|
||||||
|
|
||||||
|
if test "$_do_libcurl" != "no" ; then
|
||||||
|
if test -d "$withval" ; then
|
||||||
|
CPPFLAGS="${CPPFLAGS} -I$withval/include"
|
||||||
|
LDFLAGS="${LDFLAGS} -L$withval/lib"
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_MSG_CHECKING([for libcurl])
|
||||||
|
|
||||||
|
if eval curl-config --version 2>/dev/null >/dev/null; then
|
||||||
|
AC_SUBST([LIBCURL_INCLUDES],[`curl-config --cflags`])
|
||||||
|
AC_SUBST([LIBCURL],[`curl-config --libs`])
|
||||||
|
have_libcurl=yes
|
||||||
|
else
|
||||||
|
have_libcurl=no
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_MSG_RESULT([$have_libcurl])
|
||||||
|
|
||||||
|
unset _do_libcurl
|
||||||
|
fi
|
||||||
|
])dnl
|
||||||
Loading…
x
Reference in New Issue
Block a user