security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity

* http.c (send_request, http_open, http_open_document): Pass in auth

Browse Source 
and proxyauth that can override the in-url auth.
This commit is contained in:
David Shaw 2005-06-22 04:12:40 +00:00
parent b967d27173
commit c8d1036b26
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/ChangeLog
View File

@ -1,5 +1,8 @@
2005-06-21 David Shaw <dshaw@jabberwocky.com> 2005-06-21 David Shaw <dshaw@jabberwocky.com>
* http.c (send_request, http_open, http_open_document): Pass in
auth and proxyauth that can override the in-url auth.
* http.c (send_request): Need == after the radix64-encoded basic * http.c (send_request): Need == after the radix64-encoded basic
auth string. auth string.

21
util/http.c
View File

@ -69,7 +69,7 @@ static int remove_escapes( byte *string );
static int insert_escapes( byte *buffer, const byte *string, static int insert_escapes( byte *buffer, const byte *string,
const byte *special ); const byte *special );
static URI_TUPLE parse_tuple( byte *string ); static URI_TUPLE parse_tuple( byte *string );
static int send_request( HTTP_HD hd, const char *proxy ); static int send_request( HTTP_HD hd, const char *proxy, const char *proxyauth);
static byte *build_rel_path( PARSED_URI uri ); static byte *build_rel_path( PARSED_URI uri );
static int parse_response( HTTP_HD hd ); static int parse_response( HTTP_HD hd );
@ -146,7 +146,8 @@ make_radix64_string( const byte *data, size_t len )
int int
http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url, http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
unsigned int flags, const char *proxy ) const char *auth, unsigned int flags, const char *proxy,
const char *proxyauth )
{ {
int rc; int rc;
@ -162,7 +163,9 @@ http_open( HTTP_HD hd, HTTP_REQ_TYPE reqtype, const char *url,
rc = parse_uri( &hd->uri, url ); rc = parse_uri( &hd->uri, url );
if( !rc ) { if( !rc ) {
rc = send_request( hd, proxy ); if(auth)
hd->uri->auth=auth;
rc = send_request( hd, proxy, proxyauth );
if( !rc ) { if( !rc ) {
hd->fp_write = iobuf_sockopen( hd->sock , "w" ); hd->fp_write = iobuf_sockopen( hd->sock , "w" );
if( hd->fp_write ) if( hd->fp_write )
@ -225,12 +228,13 @@ http_wait_response( HTTP_HD hd, unsigned int *ret_status )
int int
http_open_document( HTTP_HD hd, const char *document, http_open_document( HTTP_HD hd, const char *document, const char *auth,
unsigned int flags, const char *proxy ) unsigned int flags, const char *proxy,
const char *proxyauth )
{ {
int rc; int rc;
rc = http_open( hd, HTTP_REQ_GET, document, flags, proxy ); rc = http_open(hd, HTTP_REQ_GET, document, auth, flags, proxy, proxyauth );
if( rc ) if( rc )
return rc; return rc;
@ -503,7 +507,7 @@ parse_tuple( byte *string )
* Returns 0 if the request was successful * Returns 0 if the request was successful
*/ */
static int static int
send_request( HTTP_HD hd, const char *proxy ) send_request( HTTP_HD hd, const char *proxy, const char *proxyauth )
{ {
const byte *server; const byte *server;
byte *request, *p; byte *request, *p;
@ -527,6 +531,9 @@ send_request( HTTP_HD hd, const char *proxy )
} }
hd->sock = connect_server( *uri->host? uri->host : "localhost", hd->sock = connect_server( *uri->host? uri->host : "localhost",
uri->port? uri->port : 80, 0, NULL ); uri->port? uri->port : 80, 0, NULL );
if(proxyauth)
uri->auth=proxyauth;
if(uri->auth) if(uri->auth)
{ {
char *x=make_radix64_string(uri->auth,strlen(uri->auth)); char *x=make_radix64_string(uri->auth,strlen(uri->auth));