Re: mutt and GPG - adding new keys (slightly OT)

[Walter Hofmann]

On Wed, 06 Oct 1999, Abhay Ghaisas wrote:

>         Also, is there any way I can get keys from key-servers from
> behind a fire-wall?

GPG doesn't support getting keys via a http proxy, but I wrote a patch
for it; it is attached. 

Apply the patch tp gpg-1.0.0 and set http_proxy, eg.

export http_proxy=http://proxy:80/

gpg will then forward requests via that proxy.


I have two wishes: If you (or anyone else) tries this patch, could you
let me know if it worked for you? (I only tried it on my own computer.)
Does anyone know an email address where I can submit this patch so that
the gpg people take a look at it?

Walter

diff -ur gnupg-1.0.0/util/http.c gnupg-1.0.0-proxy/util/http.c
--- gnupg-1.0.0/util/http.c     Sun May 23 13:30:06 1999
+++ gnupg-1.0.0-proxy/util/http.c       Thu Sep  9 19:20:48 1999
@@ -128,7 +128,6 @@
        return G10ERR_GENERAL;
     iobuf_close( hd->fp_write );
     hd->fp_write = NULL;
-    shutdown( hd->sock, 1 );
     hd->in_data = 0;
 
     hd->fp_read = iobuf_fdopen( hd->sock , "r" );
@@ -139,6 +138,8 @@
     if( !rc && ret_status )
        *ret_status = hd->status_code;
 
+    shutdown( hd->sock, 1 );
+
     return rc;
 }
 
@@ -427,22 +428,55 @@
     byte *request, *p;
     ushort port;
     int rc;
+    const char *proxy_url;
+    PARSED_URI proxy_uri;
+    int use_proxy = 0;
+    const byte *proxy_server;
+    ushort proxy_port;
 
     server = *hd->uri->host? hd->uri->host : "localhost";
     port   = hd->uri->port?  hd->uri->port : 80;
 
-    hd->sock = connect_server( server, port );
+    proxy_url = getenv( "http_proxy" );
+    if (proxy_url) {
+        rc = parse_uri( &proxy_uri, proxy_url );
+        if (rc) {
+            log_error("cannot parse $http_proxy\n");
+            release_parsed_uri( proxy_uri );
+        }
+        else {
+            use_proxy = 1;
+            proxy_server = *proxy_uri->host? proxy_uri->host : "localhost";
+            proxy_port   = proxy_uri->port?  proxy_uri->port : 80;
+            log_info("requesting key via proxy %s:%d\n", proxy_server, proxy_port);
+        }
+    }  
+       
+    if (use_proxy)
+        hd->sock = connect_server( proxy_server, proxy_port );
+    else
+        hd->sock = connect_server( server, port );
+
     if( hd->sock == -1 )
        return G10ERR_NETWORK;
 
     p = build_rel_path( hd->uri );
-    request = m_alloc( strlen(p) + 20 );
-    sprintf( request, "%s %s%s HTTP/1.0\r\n",
-                         hd->req_type == HTTP_REQ_GET ? "GET" :
-                         hd->req_type == HTTP_REQ_HEAD? "HEAD":
-                         hd->req_type == HTTP_REQ_POST? "POST": "OOPS",
-                                                 *p == '/'? "":"/", p );
+    request = m_alloc( strlen(p) + strlen(server) + 40 );
+    if (use_proxy)
+        sprintf( request, "%s http://%s:%d%s%s HTTP/1.0\r\n\r",
+                  hd->req_type == HTTP_REQ_GET ? "GET" :
+                  hd->req_type == HTTP_REQ_HEAD? "HEAD":
+                  hd->req_type == HTTP_REQ_POST? "POST": "OOPS",
+                    server, port, *p == '/'? "":"/", p );
+    else
+        sprintf( request, "%s %s%s HTTP/1.0\r\n\r",
+                  hd->req_type == HTTP_REQ_GET ? "GET" :
+                  hd->req_type == HTTP_REQ_HEAD? "HEAD":
+                  hd->req_type == HTTP_REQ_POST? "POST": "OOPS",
+                    *p == '/'? "":"/", p );
     m_free(p);
+    if (use_proxy)
+        release_parsed_uri( proxy_uri );
 
     rc = write_server( hd->sock, request, strlen(request) );
     m_free( request );

PGP signature