/[winpt]/trunk/Src/wptKeyserver.cpp
ViewVC logotype

Diff of /trunk/Src/wptKeyserver.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 193 by twoaday, Sat Apr 1 12:36:35 2006 UTC revision 222 by twoaday, Thu Jun 1 08:30:46 2006 UTC
# Line 1  Line 1 
1  /* wptKeyserver.cpp - W32 Keyserver Access  /* wptKeyserver.cpp - W32 Keyserver Access
2   *      Copyright (C) 2000-2005 Timo Schulz   *      Copyright (C) 2000-2006 Timo Schulz
3   *      Copyright (C) 2001 Marco Cunha   *      Copyright (C) 2001 Marco Cunha
4   *   *
5   * This file is part of WinPT.   * This file is part of WinPT.
# Line 37  Line 37 
37  #include "wptGPG.h"  #include "wptGPG.h"
38  #include "wptRegistry.h"  #include "wptRegistry.h"
39    
40  /* just map net_errno to a winsock error. */  /* Map net_errno to a winsock error. */
41  #define net_errno ((int)WSAGetLastError ())  #define net_errno ((int)WSAGetLastError ())
42    
43    
44  keyserver server[MAX_KEYSERVERS] = {0};  keyserver server[MAX_KEYSERVERS] = {0};
45  keyserver_proxy_s proxy = {0};  keyserver_proxy_s proxy = {0};
46  static const char *server_list[] = {  static const char *server_list[] = {
     "hkp://gnv.us.ks.cryptnet.net",  
     "hkp://keyserver.kjsl.com",  
47      "hkp://sks.keyserver.penguin.de",      "hkp://sks.keyserver.penguin.de",
48      "hkp://subkeys.pgp.net",      "hkp://subkeys.pgp.net",
49      "ldap://keyserver.pgp.com",      "ldap://keyserver.pgp.com",
# Line 61  char *default_keyserver = NULL; Line 59  char *default_keyserver = NULL;
59  WORD default_keyserver_port = 0;  WORD default_keyserver_port = 0;
60    
61  /* Default socket timeout. */  /* Default socket timeout. */
62  static int default_socket_timeout = 10;  static int default_socket_timeout = 6;
63    
64    
65    /* Wrapper for safe memory allocation. */
66    static char*
67    safe_alloc (DWORD n)
68    {
69        char *p;
70    
71        p = new char[n+1];
72        if (!p)
73            BUG (0);
74        memset (p, 0, n);
75        return p;
76    }
77    
78  /* Basic64 encode the input @inbuf to @outbuf. */  /* Basic64 encode the input @inbuf to @outbuf. */
79  static void  static void
# Line 108  base64_encode (const char *inbuf, char * Line 120  base64_encode (const char *inbuf, char *
120  }  }
121    
122    
123    /* Check that the given buffer contains a valid keyserver URL
124       and return the prefix length, 0 in case of an error. */
125    static int
126    check_URL (const char *buf)
127    {
128        const char *proto[] = {
129            "ldap://",
130            "http://",
131            "finger://",
132            "hkp://",
133            NULL};
134        int i;
135    
136        if (strlen (buf) < 7)
137            return 0;
138    
139        for (i=0; proto[i] != NULL; i++) {
140            if (strstr (buf, proto[i]))
141                return strlen (proto[i]);
142        }
143        return 0;
144    }
145    
146    
147  /* Skip the URL schema and return only the host part of it. */  /* Skip the URL schema and return only the host part of it. */
148  static const char*  static const char*
149  skip_type_prefix (const char *hostname)  skip_type_prefix (const char *hostname)
150  {  {
151      if (hostname && !strncmp (hostname, "http://", 7))      int pos;
152          hostname += 7;  
153      else if (hostname && !strncmp (hostname, "hkp://", 6))      if (!hostname)
154          hostname += 6;          return hostname;
155      else if (hostname && !strncmp (hostname, "finger://", 9))  
156          hostname += 9;      pos = check_URL (hostname);
157      else if (hostname && !strncmp (hostname, "ldap://", 7))      if (pos > 0)
158          hostname += 7;          hostname += pos;
159      return hostname;      return hostname;
160  }  }
161    
# Line 132  check_hkp_response (const char *resp, in Line 168  check_hkp_response (const char *resp, in
168      char *p, *end;      char *p, *end;
169      int ec, len;      int ec, len;
170    
171        log_debug ("check_hkp_response: '%s'\r\n", resp);
172      ec = recv ? WPTERR_WINSOCK_RECVKEY : WPTERR_WINSOCK_SENDKEY;      ec = recv ? WPTERR_WINSOCK_RECVKEY : WPTERR_WINSOCK_SENDKEY;
173      if (!strstr (resp, "HTTP/1.0 200 OK") &&      if (!strstr (resp, "HTTP/1.0 200 OK") &&
174          !strstr (resp, "HTTP/1.1 200 OK")) /* http error */          !strstr (resp, "HTTP/1.1 200 OK")) /* http error */
# Line 140  check_hkp_response (const char *resp, in Line 177  check_hkp_response (const char *resp, in
177          || strstr (resp, "Public Key Server -- Error")          || strstr (resp, "Public Key Server -- Error")
178          || strstr (resp, "No matching keys in database")) {          || strstr (resp, "No matching keys in database")) {
179          p = strstr (resp, "<p>");          p = strstr (resp, "<p>");
180          if (p && strlen (p) < sizeof (hkp_errmsg)) {          if (p && strlen (p) < sizeof (hkp_errmsg)-1) {
181              end = strstr (p, "</p>");              end = strstr (p, "</p>");
182              len = end? (end - p + 1) : strlen (p);              len = end? (end - p + 1) : strlen (p);
183              memset (hkp_errmsg, 0, sizeof (hkp_errmsg));              memset (hkp_errmsg, 0, sizeof (hkp_errmsg));
# Line 211  sock_read (int fd, char *buf, int buflen Line 248  sock_read (int fd, char *buf, int buflen
248      DWORD nread;      DWORD nread;
249      int nleft = buflen;      int nleft = buflen;
250      int rc, n = 0;      int rc, n = 0;
251        
252        if (nbytes)
253            *nbytes = 0;
254      while (nleft > 0) {      while (nleft > 0) {
255          if (n >= default_socket_timeout)          if (n >= default_socket_timeout)
256              return WPTERR_WINSOCK_TIMEOUT;              return WPTERR_WINSOCK_TIMEOUT;
# Line 238  sock_read (int fd, char *buf, int buflen Line 277  sock_read (int fd, char *buf, int buflen
277      return 0;      return 0;
278  }  }
279    
280    
281    /* Helper to create a string from the gpgme data and
282       then release the gpgme data object. */
283    char*
284    data_release_and_get_mem (gpgme_data_t in, int *r_bufferlen)
285    {
286        size_t n;
287        char *buffer, *p;
288    
289        gpg_data_putc (in, '\0');
290        p = gpgme_data_release_and_get_mem (in, &n);
291        buffer = m_strdup (p);
292        if (r_bufferlen)
293            *r_bufferlen = (int)n;
294        gpgme_free (p);
295        return buffer;
296    }
297    
298    
299  /* Read much data as possible from the socket @fd and  /* Read much data as possible from the socket @fd and
300     return the data in @buffer. Caller must free data.     return the data in @buffer. Caller must free data.
301     Return value: 0 on success. */     Return value: 0 on success. */
# Line 245  int Line 303  int
303  sock_read_ext (int fd, char **buffer, int *r_bufferlen)  sock_read_ext (int fd, char **buffer, int *r_bufferlen)
304  {  {
305      gpgme_data_t dh;      gpgme_data_t dh;
306      char buf[1024], *p;      char buf[1024];
307      size_t n=0;      size_t n=0;
308      int nread, rc;      int nread, rc;
309    
310      gpgme_data_new (&dh);      if (gpgme_data_new (&dh))
311            BUG (0);
312      while (n < 10) {      while (n < 10) {
313          rc = sock_select (fd, 1);          rc = sock_select (fd, 1);
314          if (rc == SOCKET_ERROR) {          if (rc == SOCKET_ERROR) {
# Line 267  sock_read_ext (int fd, char **buffer, in Line 326  sock_read_ext (int fd, char **buffer, in
326              gpgme_data_write (dh, buf, nread);              gpgme_data_write (dh, buf, nread);
327          }          }
328      }      }
329      gpg_data_putc (dh, '\0');  
330      p = gpgme_data_release_and_get_mem (dh, &n);      *buffer = data_release_and_get_mem (dh, r_bufferlen);
     *buffer = m_strdup (p);  
     if (r_bufferlen)  
         *r_bufferlen = n;  
     gpgme_free (p);  
331      return 0;      return 0;
332  }  }
333    
# Line 329  wsock_end (void) Line 384  wsock_end (void)
384      }      }
385      kserver_proxy_release (&proxy);      kserver_proxy_release (&proxy);
386      WSACleanup ();      WSACleanup ();
387        log_debug ("wsock_end: cleanup finished.\r\n");
388  }  }
389    
390    
391  /* Return a string representation of a winsock error. */  /* Return a string representation of a winsock error. */
392  const char*  const char*
393  wsock_strerror (void)  wsock_strerror (void)
394  {      {
     static char buf[384];  
395      int ec = WSAGetLastError ();      int ec = WSAGetLastError ();
396            
397        if (!ec)
398            return "";
399      switch (ec) {      switch (ec) {
400      case WSAENETDOWN:      case WSAENETDOWN:
401          return _("The network subsystem has failed");          return _("Network unreachable");
402    
403        case WSAEHOSTUNREACH:
404            return _("Host unreachable");
405    
406      case WSAHOST_NOT_FOUND:      case WSAHOST_NOT_FOUND:
407          return _("Authoritative Answer Host not found");          return _("Could not resolve host name");
408    
409        case WSAECONNREFUSED:
410            return _("Connection refused");
411    
412      case WSAETIMEDOUT:      case WSAETIMEDOUT:
413          return _("The connection has been dropped because of a network failure");      case WSAECONNABORTED:
414            return _("Connection timeout");
415    
416        case WSAENETRESET:
417        case WSAECONNRESET:    
418            return _("Connection resetted by peer");
419    
420        case WSAESHUTDOWN:
421            return _("Socket has been shutdown");
422    
423      default:      default:
424          _snprintf (buf, sizeof (buf) -1, _("Unknown Winsock error ec=%d"),ec);          break;
         return buf;  
425      }      }
426      return NULL;  
427        return "";
428  }  }
429    
430    
# Line 358  wsock_strerror (void) Line 432  wsock_strerror (void)
432  void  void
433  kserver_set_socket_timeout (int nsec)  kserver_set_socket_timeout (int nsec)
434  {  {
435      if (nsec < 0)      if (nsec < 0 || nsec > 3600)
436          nsec = 0;          nsec = 0;
437      default_socket_timeout = nsec;      default_socket_timeout = nsec;
438  }  }
# Line 384  kserver_get_hostname (int idx, int type, Line 458  kserver_get_hostname (int idx, int type,
458          return default_keyserver;          return default_keyserver;
459      }      }
460      else if (!type && idx < DIM (server_list)) {      else if (!type && idx < DIM (server_list)) {
461            /* XXX: handle non HKP servers. */
462          *port = HKP_PORT;          *port = HKP_PORT;
463          return server_list[idx];          return server_list[idx];
464      }      }
# Line 402  kserver_check_inet_connection (void) Line 477  kserver_check_inet_connection (void)
477          closesocket (fd);          closesocket (fd);
478          return 0;          return 0;
479      }      }
480        log_debug ("kserver_check_inet_connection: no inet connection.\r\n");
481      return -1;      return -1;
482  }  }
483    
# Line 413  kserver_check_inet_connection (void) Line 489  kserver_check_inet_connection (void)
489  const char*  const char*
490  kserver_check_keyid (const char *keyid)  kserver_check_keyid (const char *keyid)
491  {        {      
492      static char id[21];      static char id[22];
493    
494      if (strstr (keyid, "@"))      if (strstr (keyid, "@"))
495          return keyid; /* email address */          return keyid; /* email address */
# Line 435  update_proxy_user (const char *proxy_use Line 511  update_proxy_user (const char *proxy_use
511    
512      n = 4*strlen (proxy_user) / 3 + 32 + strlen (proxy_pass) + 2;      n = 4*strlen (proxy_user) / 3 + 32 + strlen (proxy_pass) + 2;
513      free_if_alloc (proxy.base64_user);      free_if_alloc (proxy.base64_user);
514      proxy.base64_user = new char[n];      proxy.base64_user = safe_alloc (n+1);
     if (!proxy.base64_user)  
         BUG (0);  
515      _snprintf (t, sizeof (t)-1, "%s:%s", proxy_user, proxy_pass);      _snprintf (t, sizeof (t)-1, "%s:%s", proxy_user, proxy_pass);
516      base64_encode (t, proxy.base64_user);      base64_encode (t, proxy.base64_user);
517      free_if_alloc (proxy.user);      free_if_alloc (proxy.user);
# Line 445  update_proxy_user (const char *proxy_use Line 519  update_proxy_user (const char *proxy_use
519      proxy.user = m_strdup (proxy_user);      proxy.user = m_strdup (proxy_user);
520      proxy.pass = m_strdup (proxy_pass);      proxy.pass = m_strdup (proxy_pass);
521  }  }
   
   
 /* Check that the given buffer contains a valid keyserver URL. */  
 static int  
 check_URL (const char * buf)  
 {  
     if (strlen (buf) < 7)  
         return -1;  
     if (!strstr (buf, "ldap://")  
         && !strstr (buf, "http://")  
         && !strstr (buf, "finger://")  
         && !strstr (buf, "hkp://"))  
         return -1;  
     return 0;  
 }  
522            
523    
524  /* Get the port number from the given protocol. */  /* Get the port number from the given protocol. */
# Line 467  static int Line 526  static int
526  port_from_proto (int proto)  port_from_proto (int proto)
527  {  {
528      switch (proto) {      switch (proto) {
529      case KSPROTO_LDAP: return 0;      case KSPROTO_LDAP:   return 0;
530      case KSPROTO_FINGER: return FINGER_PORT;      case KSPROTO_FINGER: return FINGER_PORT;
531      case KSPROTO_HTTP: return HKP_PORT;      case KSPROTO_HTTP:   return HKP_PORT;
532      }      }
533      return 0;      return 0;
534  }  }
# Line 479  port_from_proto (int proto) Line 538  port_from_proto (int proto)
538  static int  static int
539  proto_from_URL (const char *buf)  proto_from_URL (const char *buf)
540  {  {
541      if (strstr( buf, "ldap"))      if (strstr (buf, "ldap"))
542          return KSPROTO_LDAP;          return KSPROTO_LDAP;
543      else if (strstr( buf, "finger"))      else if (strstr( buf, "finger"))
544          return KSPROTO_FINGER;          return KSPROTO_FINGER;
# Line 487  proto_from_URL (const char *buf) Line 546  proto_from_URL (const char *buf)
546  }  }
547    
548    
549    /* Set the default keyserver.
550       If @hostname is NULL, use the predefined keyserver. */
551  void  void
552  keyserver_set_default (const char *hostname, WORD port)  keyserver_set_default (const char *hostname, WORD port)
553  {  {
554        if (!port)
555            port = HKP_PORT;
556      if (hostname != NULL) {      if (hostname != NULL) {
557          free_if_alloc (default_keyserver);          free_if_alloc (default_keyserver);
558          default_keyserver = m_strdup (hostname);          default_keyserver = m_strdup (hostname);
         if (!default_keyserver)  
             BUG (0);  
559          default_keyserver_port = port;          default_keyserver_port = port;
560      }      }
561      if (!port)      if (!default_keyserver) {
         port = HKP_PORT;  
     if (!default_keyserver)  
562          default_keyserver = m_strdup (DEF_HKP_KEYSERVER);          default_keyserver = m_strdup (DEF_HKP_KEYSERVER);
563            default_keyserver_port = HKP_PORT;
564        }
565      server[0].name =  m_strdup (default_keyserver);      server[0].name =  m_strdup (default_keyserver);
566      server[0].used = 1;      server[0].used = 1;
567      server[0].port = port;      server[0].port = port;
# Line 588  kserver_load_conf (const char *conf) Line 649  kserver_load_conf (const char *conf)
649      /* check if the host has a http:// prefix and skip it */      /* check if the host has a http:// prefix and skip it */
650      if (proxy.host && !strncmp (proxy.host, "http://", 7)) {      if (proxy.host && !strncmp (proxy.host, "http://", 7)) {
651          char *host = m_strdup (proxy.host+7);          char *host = m_strdup (proxy.host+7);
         if (!host)  
             BUG (0);  
652          free_if_alloc (proxy.host);          free_if_alloc (proxy.host);
653          proxy.host = host;          proxy.host = host;
654      }      }
# Line 608  kserver_load_conf (const char *conf) Line 667  kserver_load_conf (const char *conf)
667          s = (char *)skip_whitespace (buf);          s = (char *)skip_whitespace (buf);
668          if (*s == '#' || strlen (s) < 7)          if (*s == '#' || strlen (s) < 7)
669              continue;              continue;
670          if (check_URL (s)) {          chk_pos = check_URL (s);
671            if (!chk_pos) {
672              msg_box (NULL, _("All entries of this file must have a valid prefix.\n"              msg_box (NULL, _("All entries of this file must have a valid prefix.\n"
673                               "Currently HKP/HTTP, LDAP and FINGER are supported.\n"),                               "Currently HKP/HTTP, LDAP and FINGER are supported.\n"),
674                               _("Keyserver Error"), MB_ERR);                               _("Keyserver Error"), MB_ERR);
675              continue;              continue;
676          }          }
         chk_pos = 6;  
         if (strstr (s, "finger"))  
             chk_pos = 10;  
677          p = strchr (s+chk_pos, ':');          p = strchr (s+chk_pos, ':');
678          server[pos].used = 1;          server[pos].used = 1;
679          server[pos].proto = proto_from_URL (s);          server[pos].proto = proto_from_URL (s);
# Line 627  kserver_load_conf (const char *conf) Line 684  kserver_load_conf (const char *conf)
684              server[pos].port = atol (p+1);              server[pos].port = atol (p+1);
685              if (server[pos].port < 0 || server[pos].port > 65536)              if (server[pos].port < 0 || server[pos].port > 65536)
686                  server[pos].port = HKP_PORT;                  server[pos].port = HKP_PORT;
687              server[pos].name = new char [(p-s)+2];              server[pos].name = safe_alloc ((p-s)+2);
             if (!server[pos].name)  
                 BUG (0);  
688              memset (server[pos].name, 0, (p-s)+2);              memset (server[pos].name, 0, (p-s)+2);
689              memcpy (server[pos].name, s, (p-s));              memcpy (server[pos].name, s, (p-s));
690          }          }
# Line 658  kserver_load_conf (const char *conf) Line 713  kserver_load_conf (const char *conf)
713     Return value: 0 on success */     Return value: 0 on success */
714  int  int
715  kserver_connect (const char *hostname, WORD port, int *conn_fd)  kserver_connect (const char *hostname, WORD port, int *conn_fd)
716  {  {        
     int rc, fd;  
     DWORD iaddr;  
     char host[128] = {0};  
717      struct hostent *hp;      struct hostent *hp;
718      struct sockaddr_in sock;      struct sockaddr_in sock;
719        char host[128] = {0};
720        DWORD iaddr;
721        int rc, fd;
722    
723      log_debug ("kserver_connect: %s:%d\r\n", hostname, port);      log_debug ("kserver_connect: %s:%d\r\n", hostname, port);
724    
# Line 673  kserver_connect (const char *hostname, W Line 728  kserver_connect (const char *hostname, W
728          *conn_fd = 0;          *conn_fd = 0;
729      hostname = skip_type_prefix (hostname);      hostname = skip_type_prefix (hostname);
730            
731        if (proxy.host && proxy.proto == PROXY_PROTO_HTTP)
732            port = proxy.port;
733      memset (&sock, 0, sizeof (sock));      memset (&sock, 0, sizeof (sock));
734      sock.sin_family = AF_INET;      sock.sin_family = AF_INET;
735      sock.sin_port = proxy.host? htons (proxy.port) : htons (port);      sock.sin_port = htons (port);
736      if (proxy.host)      if (proxy.host)
737          strncpy (host, proxy.host, 127);          strncpy (host, proxy.host, 127);
738      else      else
739          strncpy (host, hostname, 127);          strncpy (host, hostname, 127);
740        
741      if ((iaddr = inet_addr (host)) != INADDR_NONE)      if ((iaddr = inet_addr (host)) != INADDR_NONE)
742          memcpy (&sock.sin_addr, &iaddr, sizeof (iaddr));          memcpy (&sock.sin_addr, &iaddr, sizeof (iaddr));
743      else if ((hp = gethostbyname (host))) {      else if ((hp = gethostbyname (host))) {
# Line 719  kserver_connect (const char *hostname, W Line 776  kserver_connect (const char *hostname, W
776  }  }
777    
778    
779    /* Check if the URL needs to be encoded or not. */
780  static bool  static bool
781  URL_must_encoded (const char *url)  URL_must_encoded (const char *url)
782  {  {
# Line 730  URL_must_encoded (const char *url) Line 788  URL_must_encoded (const char *url)
788    
789  /* Perform URL encoding of the given data. */  /* Perform URL encoding of the given data. */
790  static char*  static char*
791  URL_encode (const char *url, size_t ulen, size_t *ret_nlen)  URL_encode (const char *url, DWORD ulen, DWORD *ret_nlen)
792  {  {
793      gpgme_data_t hd;      gpgme_data_t hd;
794      char numbuf[5], *pp, *p;      char numbuf[5], *p;
795      size_t i, n;      size_t i;
796        int nlen;
797    
798      gpgme_data_new (&hd);      if (gpgme_data_new (&hd))
799            BUG (0);
800      for (i=0; i < ulen; i++) {      for (i=0; i < ulen; i++) {
801          if (isalnum (url[i]) || url[i] == '-')          if (isalnum (url[i]) || url[i] == '-')
802              gpg_data_putc (hd, url[i]);              gpg_data_putc (hd, url[i]);
# Line 747  URL_encode (const char *url, size_t ulen Line 807  URL_encode (const char *url, size_t ulen
807              gpgme_data_write (hd, numbuf, strlen (numbuf));              gpgme_data_write (hd, numbuf, strlen (numbuf));
808          }          }
809      }      }
     gpg_data_putc (hd, '\0');  
810    
811      /* Copy memory to avoid that we need to use gpgme_free later. */      p = data_release_and_get_mem (hd, &nlen);
     pp = gpgme_data_release_and_get_mem (hd, &n);  
     p = m_strdup (pp);  
     gpgme_free (pp);  
812      if (ret_nlen)      if (ret_nlen)
813          *ret_nlen = n;          *ret_nlen = nlen;
814      return p;      return p;
815  }  }
816    
# Line 762  URL_encode (const char *url, size_t ulen Line 818  URL_encode (const char *url, size_t ulen
818  /* Format a request for the given keyid (send). */  /* Format a request for the given keyid (send). */
819  static char*  static char*
820  kserver_send_request (const char *hostname, WORD port,  kserver_send_request (const char *hostname, WORD port,
821                        const char *pubkey, int octets)                        const char *pubkey, DWORD octets)
822  {  {
823      char *request = NULL;      const char *fmt;
824      char *enc_pubkey = NULL;      char *request;
825      size_t enc_octets;      char *enc_pubkey;
826        DWORD enc_octets;
827      int reqlen;      int reqlen;
828    
829      log_debug ("kserver_send_request: %s:%d\r\n", hostname, port);      log_debug ("kserver_send_request: %s:%d\r\n", hostname, port);
830    
831      if (!port)      if (!port)
832          port = HKP_PORT;          port = HKP_PORT;
     reqlen = 512 + strlen (hostname) + 2*strlen (pubkey);  
     request = new char[reqlen];  
     if (!request)  
         BUG (0);  
833      enc_pubkey = URL_encode (pubkey, octets, &enc_octets);      enc_pubkey = URL_encode (pubkey, octets, &enc_octets);
834      if (!enc_pubkey || !enc_octets) {      reqlen = 2*strlen (hostname) + 2*32/*port*/ + enc_octets + 32 /*len*/ + 1;
         free_if_alloc (request);  
         return NULL;  
     }  
835            
836      if (proxy.user && proxy.proto == PROXY_PROTO_HTTP) {      if (proxy.user && proxy.proto == PROXY_PROTO_HTTP) {
837          _snprintf (request, reqlen-1,          fmt = "POST http://%s:%d/pks/add HTTP/1.0\r\n"
838                     "POST http://%s:%d/pks/add HTTP/1.0\r\n"                "Referer: \r\n"
839                     "Referer: \r\n"                "User-Agent: WinPT/W32\r\n"
840                     "User-Agent: WinPT/W32\r\n"                "Host: %s:%d\r\n"
841                     "Host: %s:%d\r\n"                "Proxy-Authorization: Basic %s\r\n"
842                     "Proxy-Authorization: Basic %s\r\n"                "Content-type: application/x-www-form-urlencoded\r\n"
843                     "Content-type: application/x-www-form-urlencoded\r\n"                "Content-length: %d\r\n"
844                     "Content-length: %d\r\n"                "\r\n"
845                     "\r\n"                "keytext=%s"
846                     "keytext=%s"                "\r\n";
847                     "\n",          reqlen += strlen (fmt) + strlen (proxy.base64_user) + 1;
848                     skip_type_prefix (hostname), port, hostname, port,          request = safe_alloc (reqlen+1);
849            _snprintf (request, reqlen, fmt,
850                       skip_type_prefix (hostname), port, hostname, port,
851                     proxy.base64_user, enc_octets+9, enc_pubkey);                     proxy.base64_user, enc_octets+9, enc_pubkey);
852      }      }
853      else {      else {
854          _snprintf (request, reqlen-1,          fmt = "POST /pks/add HTTP/1.0\r\n"
855                     "POST /pks/add HTTP/1.0\r\n"                "Referer: \r\n"
856                     "Referer: \r\n"                "User-Agent: WinPT/W32\r\n"
857                     "User-Agent: WinPT/W32\r\n"                "Host: %s:%d\r\n"
858                     "Host: %s:%d\r\n"                "Content-type: application/x-www-form-urlencoded\r\n"
859                     "Content-type: application/x-www-form-urlencoded\r\n"                "Content-length: %d\r\n"
860                     "Content-length: %d\r\n"                "\r\n"
861                     "\r\n"                "keytext=%s"
862                     "keytext=%s"                "\r\n";
863                     "\n",          reqlen += strlen (fmt)+1;
864                     skip_type_prefix (hostname), port,          request = safe_alloc (reqlen+1);
865            _snprintf (request, reqlen, fmt,
866                       skip_type_prefix (hostname), port,
867                     enc_octets+9, enc_pubkey);                     enc_octets+9, enc_pubkey);
868      }      }
     free_if_alloc (enc_pubkey);  
869    
870      log_debug ("%s\r\n", request);      free_if_alloc (enc_pubkey);
871        log_debug ("request:\r\n%s\r\n", request);
872      return request;      return request;
873  }  }
874    
875    
876    /* Interface for receiving a public key. */
877  int  int
878  kserver_recvkey_ext (const char *hostname, WORD port, const char *keyid,  kserver_recvkey (const char *hostname, WORD port, const char *keyid,
879                       char **r_key, int *r_keylen)                   char **r_key, int *r_keylen)
880  {  {
881        const char *fmt;
882      char *request = NULL;      char *request = NULL;
883      int conn_fd;      int conn_fd;
884      int rc, n;      int rc, reqlen;
885    
886      if (!port)      if (!port)
887          port = HKP_PORT;          port = HKP_PORT;
888      hkp_err = 0; /* reset */          hkp_err = 0; /* reset */
889      rc = kserver_connect (hostname, port, &conn_fd);      rc = kserver_connect (hostname, port, &conn_fd);
890      if (rc)      if (rc)
891          goto leave;          goto leave;
892        
893      request = new char[300+1];      reqlen = strlen (hostname)+32+strlen (keyid)+1;
     if (!request)  
         BUG (0);  
       
894      if (proxy.host && proxy.user && proxy.proto == PROXY_PROTO_HTTP) {      if (proxy.host && proxy.user && proxy.proto == PROXY_PROTO_HTTP) {
895          _snprintf (request, 300,          fmt = "GET http://%s:%d/pks/lookup?op=get&search=%s HTTP/1.0\r\n"
896              "GET http://%s:%d/pks/lookup?op=get&search=%s HTTP/1.0\r\n"                "Proxy-Authorization: Basic %s\r\n\r\n";
897              "Proxy-Authorization: Basic %s\r\n\r\n",          reqlen =+ strlen (fmt) + strlen (proxy.base64_user)+1;
898              skip_type_prefix (hostname), port, keyid, proxy.base64_user);          request = safe_alloc (reqlen+1);
899            _snprintf (request, reqlen, fmt, skip_type_prefix (hostname), port,
900                       keyid, proxy.base64_user);
901      }      }
902      else if (proxy.host && proxy.proto == PROXY_PROTO_HTTP) {      else if (proxy.host && proxy.proto == PROXY_PROTO_HTTP) {
903          _snprintf (request, 300,          fmt = "GET http://%s:%d/pks/lookup?op=get&search=%s HTTP/1.0\r\n\r\n";
904              "GET http://%s:%d/pks/lookup?op=get&search=%s HTTP/1.0\r\n\r\n",          reqlen += strlen (fmt)+1;
905              skip_type_prefix (hostname), port, keyid);          request = safe_alloc (reqlen+1);
906      }              _snprintf (request, reqlen, fmt, skip_type_prefix (hostname),
907                                             port, keyid);
908        }
909      else {      else {
910          _snprintf (request, 300,          fmt = "GET /pks/lookup?op=get&search=%s HTTP/1.0\r\n\r\n";
911              "GET /pks/lookup?op=get&search=%s HTTP/1.0\r\n\r\n", keyid);          reqlen += strlen (fmt)+1;
912            request = safe_alloc (reqlen+1);
913            _snprintf (request, reqlen, fmt, keyid);
914      }      }
915    
916      log_debug ("%s\r\n", request);      log_debug ("request:\r\n%s\r\n", request);
917            
918      rc = sock_write (conn_fd, request, strlen (request));      rc = sock_write (conn_fd, request, strlen (request));
919      if (rc == SOCKET_ERROR) {      if (rc == SOCKET_ERROR) {
# Line 862  kserver_recvkey_ext (const char *hostnam Line 921  kserver_recvkey_ext (const char *hostnam
921          goto leave;          goto leave;
922      }      }
923            
924      rc = sock_read_ext (conn_fd, r_key, &n);      rc = sock_read_ext (conn_fd, r_key, r_keylen);
925      if (rc == SOCKET_ERROR) {      if (rc == SOCKET_ERROR) {
926          rc = WPTERR_WINSOCK_RECVKEY;          rc = WPTERR_WINSOCK_RECVKEY;
927          goto leave;          goto leave;
928      }      }
929    
930      if (r_keylen)      log_debug ("response:\r\n%s\r\n", *r_key);
         *r_keylen = n;  
     log_debug ("%s\r\n", *r_key);  
931      rc = check_hkp_response (*r_key, 1);      rc = check_hkp_response (*r_key, 1);
932      if (rc)      if (rc)
933          goto leave;          goto leave;
# Line 883  leave: Line 940  leave:
940      return rc;      return rc;
941  }  }
942    
 /* Interface for receiving a public key. */  
 int  
 kserver_recvkey (const char *hostname, WORD port, const char *keyid,  
                  char *key, int maxkeylen)  
 {  
     char *tmpkey;  
     int rc, nread=0;  
   
     /* XXX: just a wrapper around the new method, replace it  
             soon as possible. */  
     rc = kserver_recvkey_ext (hostname, port, keyid, &tmpkey, &nread);  
     if (rc)  
         return rc;  
   
     if (nread > maxkeylen) {  
         free_if_alloc (tmpkey);  
         return WPTERR_GENERAL;  
     }  
     strcpy (key, tmpkey);  
     free_if_alloc (tmpkey);  
     return 0;  
 }  
   
943    
944  /* Interface to send a public key. */  /* Interface to send a public key. */
945  int  int
946  kserver_sendkey (const char *hostname, WORD port, const char *pubkey, int len )  kserver_sendkey (const char *hostname, WORD port, const char *pubkey, int len )
947  {  {
948      char *request = NULL;      char *request = NULL;
949      char log[2048];      char log[2048] = {0};
950      int conn_fd, n;      int conn_fd, n;
951      int rc;      int rc;
952            
# Line 939  kserver_sendkey (const char *hostname, W Line 973  kserver_sendkey (const char *hostname, W
973          goto leave;          goto leave;
974      }      }
975    
976      log_debug ("kserver_sendkey:\r\n%s\r\n", log);      log_debug ("kserver_sendkey: read %d bytes\r\n%s\r\n", n, log);
977      rc = check_hkp_response (log, 0);      rc = check_hkp_response (log, 0);
978      if (rc)      if (rc)
979          goto leave;          goto leave;
# Line 961  kserver_search_chkresp (int fd) Line 995  kserver_search_chkresp (int fd)
995      int n=0;      int n=0;
996            
997      /* parse response 'HTTP/1.0 500 OK' */      /* parse response 'HTTP/1.0 500 OK' */
998      if (sock_getline (fd, buf, 127, &n))      if (sock_getline (fd, buf, sizeof (buf)-1, &n))
999          return WPTERR_KEYSERVER_NOTFOUND;          return WPTERR_KEYSERVER_NOTFOUND;
1000    
1001      log_debug ("kserver_search_chkpresp: %s\r\n", buf);      log_debug ("kserver_search_chkpresp: %s\r\n", buf);
# Line 982  kserver_search_end (int conn_fd) Line 1016  kserver_search_end (int conn_fd)
1016  }  }
1017    
1018    
1019  /* Begin keyserver search procedure. */  /* Extract the amount of keys from the info record. */
1020    static int
1021    count_keys_in_response (char *buf)
1022    {
1023        char *p;
1024        int recno = 0;
1025        int n = 0;
1026    
1027        /* info:1:4 */
1028        if (strncmp (buf, "info", 4))
1029            return 0;
1030        p = strtok (buf, ":");
1031        while (p != NULL) {
1032            recno++;
1033            if (recno == 3)
1034                n = atoi (p);
1035            p = strtok (NULL, ":");
1036        }
1037        return n;
1038    }
1039    
1040    
1041    /* Start the keyserver search.
1042       Connect to host @hostname and port @port.
1043       The pattern are given in @pattern.
1044       The socket is returned in @conn_fd and @nkeys contains
1045       the amount of keys which were found. */
1046  int  int
1047  kserver_search_begin (const char *hostname, WORD port,  kserver_search_begin (const char *hostname, WORD port,
1048                        const char *pattern, int *conn_fd)                        const char *pattern, int *conn_fd, int *nkeys)
1049  {  {
1050        const char *fmt;
1051      char *request = NULL;      char *request = NULL;
1052      char *enc_patt = NULL;      char *enc_patt = NULL;
1053      int n;      char status[128];
1054      int rc, sock_fd;      int rc, sock_fd;
1055        int reqlen;
1056            
1057        *conn_fd = 0;
1058    
1059      rc = kserver_connect (hostname, port, &sock_fd);      rc = kserver_connect (hostname, port, &sock_fd);
1060      if (rc) {      if (rc)
         *conn_fd = 0;  
1061          goto leave;          goto leave;
     }  
1062    
1063      enc_patt = URL_encode (pattern, strlen (pattern), NULL);      enc_patt = URL_encode (pattern, strlen (pattern), NULL);
1064      n = 140 + strlen (enc_patt) + strlen (hostname) + 32 + 2;      reqlen = strlen (enc_patt) + strlen (hostname) + 32 + 1;
1065      if (proxy.base64_user)  
         n += strlen (proxy.base64_user) + 1;  
     request = new char[n+1];  
     if (!request)  
         BUG (0);  
       
1066      if (proxy.host && proxy.user && proxy.proto == PROXY_PROTO_HTTP) {      if (proxy.host && proxy.user && proxy.proto == PROXY_PROTO_HTTP) {
1067          _snprintf (request, n,          fmt = "GET http://%s:%d/pks/lookup?options=mr&op=index&search=%s HTTP/1.0\r\n"
1068              "GET http://%s:%d/pks/lookup?op=index&search=%s HTTP/1.0\r\n"                "Proxy-Authorization: Basic %s\r\n\r\n";
1069              "Proxy-Authorization: Basic %s\r\n\r\n",          reqlen += strlen (proxy.base64_user) + strlen (fmt) + 1;
1070              skip_type_prefix (hostname), port, enc_patt, proxy.base64_user);          request = safe_alloc (reqlen+1);
1071            _snprintf (request, reqlen, fmt, skip_type_prefix (hostname), port,
1072                       enc_patt, proxy.base64_user);
1073      }          }    
1074      else if (proxy.host && proxy.proto == PROXY_PROTO_HTTP) {      else if (proxy.host && proxy.proto == PROXY_PROTO_HTTP) {
1075          _snprintf (request, n,          fmt = "GET http://%s:%d/pks/lookup?options=mr&op=index&search=%s HTTP/1.0\r\n\r\n";
1076              "GET http://%s:%d/pks/lookup?op=index&search=%s HTTP/1.0\r\n\r\n",          reqlen += strlen (fmt)+1;
1077              skip_type_prefix (hostname), port, enc_patt);          request = safe_alloc (reqlen+1);
1078            _snprintf (request, reqlen, skip_type_prefix (hostname), port,
1079                                enc_patt);
1080      }      }
1081      else {      else {
1082          _snprintf (request, n,          fmt = "GET /pks/lookup?options=mr&op=index&search=%s HTTP/1.0\r\n\r\n";
1083                     "GET /pks/lookup?op=index&search=%s HTTP/1.0\r\n\r\n",          reqlen += strlen (fmt)+1;
1084                     enc_patt);          request = safe_alloc (reqlen+1);
1085            _snprintf (request, reqlen, fmt, enc_patt);
1086      }      }
1087        
1088      log_debug ("kserver_search_begin:\r\n%s\r\n", request);      log_debug ("kserver_search_begin:\r\n%s\r\n", request);
       
1089      if (sock_write (sock_fd, request, strlen (request)) == SOCKET_ERROR) {      if (sock_write (sock_fd, request, strlen (request)) == SOCKET_ERROR) {
1090          rc = WPTERR_GENERAL;          rc = WPTERR_GENERAL;
1091          goto leave;          goto leave;
# Line 1034  kserver_search_begin (const char *hostna Line 1095  kserver_search_begin (const char *hostna
1095      if (rc) {      if (rc) {
1096          closesocket (sock_fd);          closesocket (sock_fd);
1097          sock_fd = 0;          sock_fd = 0;
1098            goto leave;
1099        }
1100    
1101        /* Skip all lines until we reach the "info:" record. */
1102        for (;;) {
1103            if (sock_getline (sock_fd, status, sizeof (status)-1, &reqlen)) {      
1104                log_debug ("kserver_search_begin: retrieving status line failed.\r\n");
1105                closesocket (sock_fd);
1106                sock_fd = 0;
1107                rc = WPTERR_GENERAL;
1108                break;
1109            }
1110            if (!strncmp (status, "info:", 5))
1111                break;
1112      }      }
1113    
1114        if (!rc)
1115            *nkeys = count_keys_in_response (status);
1116      *conn_fd = sock_fd;      *conn_fd = sock_fd;
1117            
1118  leave:  leave:
# Line 1045  leave: Line 1122  leave:
1122  }  }
1123    
1124    
1125    /* Parse a single pub record returned by the keyserver. */
1126    static void
1127    parse_pub_record (keyserver_key_s *key, char *buf)
1128    {
1129        enum pub_rec_t {ID=1, KEYID, ALGO, SIZE, CREATE, EXPIRE};
1130        char *p;
1131        int recno = 0;
1132    
1133        /* pub:BF3DF9B4:17:1024:925411133:: */
1134        p = strtok (buf, ":");
1135        while (p != NULL) {
1136            recno++;
1137            switch (recno) {
1138            case ID:
1139                break;
1140    
1141  /* Convert an iso date @iso_date (YYYY-MM-DD) into the locale          case KEYID:
1142     representation and store it into @loc_date.              free_if_alloc (key->keyid);
1143     Return value: 0 on success. */              key->keyid = m_strdup (p);
1144  static int              break;
1145  parse_iso_date (const char *iso_date, char *loc_date, size_t loclen)  
1146            case ALGO:
1147                key->algo = atoi (p);
1148                break;
1149                
1150            case SIZE:
1151                key->bits = atoi (p);
1152                break;
1153    
1154            case CREATE:
1155                key->creation = strtoul (p, NULL, 10);
1156                break;
1157    
1158            case EXPIRE:
1159                key->expires = strtoul (p, NULL, 10);
1160                break;
1161            }
1162            p = strtok (NULL, ":");
1163        }
1164        
1165    }
1166    
1167    
1168    /* Parse a single user id returned by the keyserver. */
1169    static void
1170    parse_uid_record (keyserver_key_s *key, char *buf)
1171  {  {
1172      SYSTEMTIME st;      enum uid_rec_t {ID=1, UID, CREATE, EXPIRE};
1173      char buf[16] = {0}, *p;      keyserver_uid_s *u, *n;
1174      int pos=0;      char *p;
1175        int recno = 0;
1176    
1177        /* uid:Timo Schulz <[email protected]>:1138440360:: */
1178        u = new keyserver_uid_s;
1179        memset (u, 0, sizeof *u);
1180    
1181      strncpy (buf, iso_date, sizeof (buf)-1);      p = strtok (buf, ":");
     p = strtok (buf, "-");  
1182      while (p != NULL) {      while (p != NULL) {
1183          switch (pos) {          recno++;
1184          case 0: st.wYear  = (WORD)atoi (p); pos++; break;  
1185          case 1: st.wMonth = (WORD)atoi (p); pos++; break;          switch (recno) {
1186          case 2: st.wDay   = (WORD)atoi (p); pos++; break;          case ID:
1187          default: break;              break;
1188    
1189            case UID:
1190                unhexify_buffer (p, &u->uid);
1191                break;
1192    
1193            case CREATE:
1194                u->creation = strtoul (p, NULL, 10);
1195                break;
1196    
1197            case EXPIRE:
1198                u->expires = strtoul (p, NULL, 10);
1199                break;
1200          }          }
1201          p = strtok (NULL, "-");  
1202            p = strtok (NULL, ":");
1203        }
1204        if (!key->uids)
1205            key->uids = u;
1206        else {
1207            for (n = key->uids; n->next; n=n->next)
1208                ;
1209            n->next = u;
1210      }      }
     if (pos != 3)  
         return -1;  
       
     if (!GetDateFormat (LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st,  
                         NULL, loc_date, loclen))  
         return -1;  
     return 0;  
1211  }  }
1212    
1213    
1214    /* Peek the next 3 bytes to check if the next line
1215       would be a new "pub" record. In this case, return
1216       -1 as an EOF indication, 0 otherwise. */
1217    static int
1218    is_key_eof (int fd)
1219    {
1220        char buf[64];
1221        int n;
1222    
1223        n = recv (fd, buf, 3, MSG_PEEK);
1224        if (n < 3 || strncmp (buf, "pub", 3))
1225            return 0;
1226        return -1;
1227    }
1228    
1229    
1230    /* Return the next key from the search response. */
1231  int  int
1232  kserver_search_next (int fd, keyserver_key *key)  kserver_search_next (int fd, keyserver_key_s **r_key)
1233  {  {
1234      char buf[1024], *p;      keyserver_uid_s *uid, *u = NULL;
1235      int uidlen, nbytes, pos = 0;      keyserver_key_s *key;
1236        char buf[512];
1237        int n = 0;
1238        long max = 0;
1239    
1240      log_debug ("keyserver_search_next:\r\n");      log_debug ("keyserver_search_next:\r\n");
1241            *r_key = NULL;
     if (sock_getline (fd, buf, sizeof (buf) - 1, &nbytes))  
         return WPTERR_GENERAL;  
1242    
1243      /* XXX: use maschine readable option. */      key = new keyserver_key_s;
1244      log_debug ("%s\r\n", buf);      memset (key, 0, sizeof *key);
1245            for (;;) {
1246      if (!strncmp (buf, "pub", 3)) {          if (sock_getline (fd, buf, sizeof (buf)-1, &n))
1247          int revoked = strstr (buf, "KEY REVOKED") != NULL? 1 : 0;              break;
1248          key->bits = atol (buf+3);          /*log_debug ("record: '%s'\r\n", buf); */
1249          p = strchr (buf, '>');          if (!strncmp (buf, "pub", 3))
1250          if (!p)              parse_pub_record (key, buf);
1251              goto fail;          else
1252          pos = p - buf + 1;              parse_uid_record (key, buf);
1253          memcpy (key->keyid, buf + pos, 8);          if (is_key_eof (fd))
1254          key->keyid[8] = '\0';              break;
1255          p = strstr (buf, "</a>");      }
         if (!p)  
             goto fail;  
         pos = p - buf + 5;  
         memcpy (key->date, buf + pos, 10);  
         key->date[10] = '\0';  
         parse_iso_date (key->date, key->date, sizeof (key->date)-1);  
         if (revoked) {  
             strcpy (key->uid, "KEY REVOKED: not checked");  
             return 0;  
         }  
         pos += 10;  
         p = buf + pos + 1;  
         while (p && *p != '>')  
             p++;  
         p++;  
         uidlen = strlen (p) - 10;  
         if (!strstr (p, "&lt;") && !strstr (p, "&gt;")) {  
             pos=0;  
             while (p && *p && pos < sizeof (key->uid)-1) {  
                 if (*p == '<')  
                     break;  
                 key->uid[pos++] = *p++;  
             }  
             key->uid[pos] ='\0';  
             return 0;  
         }  
1256    
1257          if (uidlen > sizeof (key->uid)-1)      /* the uid with the newest self sig is used as the
1258              uidlen = sizeof (key->uid)-1;         primary user id. */
1259          memcpy (key->uid, p, uidlen);      for (uid = key->uids; uid; uid = uid->next) {
1260          key->uid[uidlen] = '\0';          if (uid->creation > max) {
1261          strcat (key->uid, ">");              max = uid->creation;
1262          p = strchr (key->uid, '&');              u = uid;
         if (p) {  
             key->uid[(p-key->uid)] = '<';  
             memmove (key->uid+(p-key->uid)+1, key->uid+(p-key->uid)+4,  
                      strlen (key->uid)-3);  
1263          }          }
         return 0;  
1264      }      }
1265    
1266  fail:      key->main_uid = u? u : key->uids;
1267      key->bits = 0;      *r_key = key;
     memset (key, 0, sizeof *key);  
1268      return 0;      return 0;
1269  }  }
1270    
1271    
1272    /* Release the keyserver key @key and all its elements. */
1273    void
1274    kserver_release_key (keyserver_key_s *key)
1275    {
1276        keyserver_uid_s *u;
1277    
1278        while (key->uids) {
1279            u = key->uids->next;
1280            free_if_alloc (key->uids->uid);
1281            free_if_alloc (key->uids);
1282            key->uids = u;
1283        }
1284        free_if_alloc (key->keyid);
1285        free_if_alloc (key);
1286    }
1287    
1288    
1289  /* Release mbmers in the proxy context @ctx. */  /* Release mbmers in the proxy context @ctx. */
1290  void  void
1291  kserver_proxy_release (keyserver_proxy_t ctx)  kserver_proxy_release (keyserver_proxy_t ctx)
# Line 1188  spawn_application (char *cmdl) Line 1324  spawn_application (char *cmdl)
1324  }  }
1325    
1326    
1327  /* Receive an key via LDAP from host @host with the keyid @keyid.  static FILE*
1328     @key contains the key on success. */  do_spawn_ldap_helper (const char *host, const char *keyid)
1329  int  {
1330  ldap_recvkey (const char *host, const char *keyid, char *key, int maxkeylen)      FILE *fp = NULL;
1331  {          char *p, *sep;
1332      FILE *fp;      char *ksprg;
1333      const char *s;      char outf[256], inf[256];
1334      char *ksprg = NULL, *p = NULL, *sep;      size_t n;
     char inf[256], outf[256], buf[512];  
     DWORD n;  
     int start_key = 0, failed = 0;  
     int rc = 0;  
1335    
1336      p = get_gnupg_prog ();      p = get_gnupg_prog ();
1337      n = strlen (p) + 1 + 128;      n = strlen (p) + 1 + 128;
1338      ksprg = new char[n+1];      ksprg = safe_alloc (n+1);
1339      if (!ksprg)      if (!ksprg)
1340          BUG (0);          BUG (0);
1341      sep = strrchr (p, '\\');      sep = strrchr (p, '\\');
# Line 1215  ldap_recvkey (const char *host, const ch Line 1347  ldap_recvkey (const char *host, const ch
1347      if (file_exist_check (ksprg)) {      if (file_exist_check (ksprg)) {
1348          log_box ("LDAP Keyserver Plugin", MB_ERR,          log_box ("LDAP Keyserver Plugin", MB_ERR,
1349                   "%s: could not find LDAP keyserver module!", ksprg);                   "%s: could not find LDAP keyserver module!", ksprg);
1350          rc = -1;          fp = NULL;
1351          goto leave;          goto leave;
1352      }      }
1353      get_temp_name (outf, sizeof (outf)-1, keyid);      get_temp_name (outf, sizeof (outf)-1, keyid);
# Line 1224  ldap_recvkey (const char *host, const ch Line 1356  ldap_recvkey (const char *host, const ch
1356      if (!fp) {      if (!fp) {
1357          log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", inf,          log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", inf,
1358                   winpt_strerror (WPTERR_FILE_OPEN));                   winpt_strerror (WPTERR_FILE_OPEN));
         rc = -1;  
1359          goto leave;          goto leave;
1360      }      }
1361      fprintf (fp,      fprintf (fp,
# Line 1238  ldap_recvkey (const char *host, const ch Line 1369  ldap_recvkey (const char *host, const ch
1369          host? skip_type_prefix (host): "64.94.85.200", keyid);          host? skip_type_prefix (host): "64.94.85.200", keyid);
1370      fclose (fp);      fclose (fp);
1371    
1372      p = new char[strlen (ksprg) + strlen (inf) + strlen (outf) + 32];      p = safe_alloc (strlen (ksprg) + strlen (inf) + strlen (outf) + 32);
     if (!p)  
         BUG (NULL);  
1373      sprintf (p, "%s -o %s %s", ksprg, outf, inf);      sprintf (p, "%s -o %s %s", ksprg, outf, inf);
1374      if (spawn_application (p)) {      if (spawn_application (p)) {
1375          rc = -1;          fp = NULL;
1376          goto leave;          goto leave;
1377      }      }
   
1378      fp = fopen (outf, "rb");      fp = fopen (outf, "rb");
1379      if (!fp) {      if (!fp)
1380          log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", outf,          log_box ("LDAP Keyserver Plugin", MB_ERR, "%s: %s", outf,
1381                   winpt_strerror (WPTERR_FILE_OPEN));                   winpt_strerror (WPTERR_FILE_OPEN));
1382          rc = -1;  
1383          goto leave;  leave:
1384      }      DeleteFile (inf);
1385      memset (key, 0, maxkeylen);      DeleteFile (outf);
1386        free_if_alloc (p);
1387        free_if_alloc (ksprg);
1388        return fp;
1389    }
1390    
1391    /* Receive an key via LDAP from host @host with the keyid @keyid.
1392       @key contains the key on success. */
1393    int
1394    ldap_recvkey (const char *host, const char *keyid,
1395                  char **r_key, int *r_keylen)
1396    {  
1397        gpgme_data_t raw;
1398        FILE *fp;
1399        const char *s;
1400        char buf[512];
1401        int start_key = 0, failed = 0;
1402        int rc = 0;
1403    
1404        fp = do_spawn_ldap_helper (host, keyid);
1405        if (!fp)
1406            return WPTERR_GENERAL;
1407    
1408        if (gpgme_data_new (&raw))
1409            BUG (0);
1410      while (!feof (fp)) {      while (!feof (fp)) {
1411          s = fgets (buf, sizeof (buf)-1, fp);          s = fgets (buf, sizeof (buf)-1, fp);
1412          if (!s)          if (!s)
# Line 1266  ldap_recvkey (const char *host, const ch Line 1418  ldap_recvkey (const char *host, const ch
1418          if (!start_key && strstr (s, "KEY") && strstr (s, "BEGIN")) {          if (!start_key && strstr (s, "KEY") && strstr (s, "BEGIN")) {
1419              start_key = 1;              start_key = 1;
1420              continue;              continue;
1421          }                }
1422          if (!start_key)          if (!start_key)
1423              continue;              continue;
1424          strcat (key, buf);          gpgme_data_write (raw, buf, strlen (buf));
1425          maxkeylen -= strlen (buf);          if (strstr (s, "KEY") && strstr (s, "END"))
         if (maxkeylen < 0 || (strstr (s, "KEY") && strstr (s, "END")))  
1426              break;              break;
1427      }      }
1428      fclose (fp);      fclose (fp);
1429    
1430  leave:      if (failed)
     if (failed || !strlen (key))  
1431          rc = WPTERR_WINSOCK_RECVKEY;          rc = WPTERR_WINSOCK_RECVKEY;
1432      DeleteFile (inf);      *r_key = data_release_and_get_mem (raw, r_keylen);
     DeleteFile (outf);  
     free_if_alloc (p);  
     free_if_alloc (ksprg);  
1433      return rc;      return rc;
1434  }  }
1435    
# Line 1290  leave: Line 1437  leave:
1437  /* Receive an key via FINGER from host @host with the user @user.  /* Receive an key via FINGER from host @host with the user @user.
1438     On success @key contains the key. */     On success @key contains the key. */
1439  int  int
1440  finger_recvkey (const char *host, const char *user, char *key, int maxkeylen)  finger_recvkey (const char *host, const char *user,
1441                    char **r_key, int *r_keylen)
1442  {  {
1443      char buf[128];      gpgme_data_t raw;
1444        char buf[256];
1445      int fd, nread;      int fd, nread;
1446      int start_key = 0;      int start_key = 0;
1447      int rc=0;      int rc=0;
# Line 1304  finger_recvkey (const char *host, const Line 1453  finger_recvkey (const char *host, const
1453      sock_write (fd, user, strlen (user));      sock_write (fd, user, strlen (user));
1454      sock_write (fd, "\r\n", 2);      sock_write (fd, "\r\n", 2);
1455    
1456      memset (key, 0, maxkeylen);      if (gpgme_data_new (&raw))
1457      while (maxkeylen > 0) {          BUG (0);
1458    
1459        for (;;) {
1460          if (sock_getline (fd, buf, sizeof (buf), &nread))          if (sock_getline (fd, buf, sizeof (buf), &nread))
1461              break;              break;
1462          strcat (buf, "\n");          strcat (buf, "\n");
1463          if (strstr (buf, "BEGIN PGP PUBLIC KEY BLOCK")) {          if (strstr (buf, "BEGIN PGP PUBLIC KEY BLOCK")) {
1464              strcat (key, buf);              gpgme_data_write (raw, buf, nread);
1465              start_key = 1;              start_key = 1;
             maxkeylen -= nread;  
1466          }          }
1467          else if (strstr (buf, "END PGP PUBLIC KEY BLOCK" ) && start_key) {          else if (strstr (buf, "END PGP PUBLIC KEY BLOCK" ) && start_key) {
1468              strcat (key, buf);              gpgme_data_write (raw, buf, nread);
1469              start_key--;              start_key--;
             maxkeylen -= nread;  
1470              break;              break;
1471          }          }
1472          else if (start_key) {          else if (start_key)
1473              strcat (key, buf);              gpgme_data_write (raw, buf, nread);
             maxkeylen -= nread;  
         }  
1474      }      }
1475    
1476      closesocket (fd);      closesocket (fd);
1477      if (start_key != 0)      if (start_key != 0)
1478          rc = WPTERR_WINSOCK_RECVKEY;          rc = WPTERR_WINSOCK_RECVKEY;
1479        *r_key = data_release_and_get_mem (raw, r_keylen);
1480      return rc;      return rc;
1481  }  }
1482    
# Line 1347  check_IP_or_hostname (const char *name) Line 1496  check_IP_or_hostname (const char *name)
1496      }      }
1497      return 0;      return 0;
1498  }  }
1499    
1500    
1501    /* Split the URL @r_keyserver into the host and the port
1502       part if possible. */
1503    gpgme_error_t
1504    parse_keyserver_url (char **r_keyserver, unsigned short *r_port)
1505    {
1506        char *p;
1507        char *url = *r_keyserver;
1508    
1509        /* no port is given so use the default port. */
1510        p = strrchr (url, ':');
1511        if (p == strchr (url, ':')) {
1512            int port = port_from_proto (proto_from_URL (url));
1513            if (!port)
1514                port = HKP_PORT;
1515            *r_port = port;
1516            return 0;
1517        }
1518        /* XXX: remove / in .de/:11371 */
1519        *r_keyserver = substr (url, 0, (p-url));    
1520        *r_port = atoi (url+(p-url)+1);
1521        free_if_alloc (url);
1522        return 0;
1523    }
Legend:
Removed from v.193  
changed lines
  Added in v.222
[email protected]
 ViewVC Help
Powered by ViewVC 1.1.26