Mirrors/proxytunnel
1
0
Fork 0
mirror of https://github.com/proxytunnel/proxytunnel.git synced 2026-01-23 02:34:59 +00:00
Code Issues Projects Releases Wiki Activity

- Replaced -g/-G (proxy host and port) with -p proxy:post shorthand

Browse source 
- Replaced -d/-D (dest host and port) with -d host:post shorthand
- Added proxy-bouncing support, courtesy of Dag Wieers, authentication
  only works on the FIRST proxy, not on a second proxy !!
- Dropped -n option (dottedquad)


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@88 bc163920-b10d-0410-b2c5-a5491ca2ceef
This commit is contained in:
Mark Janssen 2006-02-06 10:58:26 +00:00
parent d1eb362e81
commit 142cd3e4eb
6 changed files with 123 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,10 +1,15 @@
Changes to proxytunnel version 1.5.x -- not yet released
Changes to proxytunnel version 1.6.0 -- Mon Feb 6 17:00:00 CET 2006
- Replaced -g/-G (proxy host and port) with -p proxy:post shorthand
- Replaced -d/-D (dest host and port) with -d host:post shorthand
- Dropped -n option (dottedquad)
- Small change to make compiler on tandem/hp-nonstop happy
by Roberto Veldhoven
- Small change to work around broken proxies by Stephane Engel
- Changed client_len from size_t to socklen_t (64bit required)
- Makefile vars now no longer override environment versions
- Added proxy-bouncing support, courtesy of Dag Wieers, authentication
only works on the FIRST proxy, not on a second proxy !!
Changes to proxytunnel version 1.5.2 -- Fri Dec 16 09:27:11 CET 2005

143
cmdline.c
View file

@ -57,10 +57,8 @@ cmdline_parser_print_help (void)
#if 0
" -f --nobackground Don't for to background in standalone mode (FIXME)\n"
#endif
" -g STRING --proxyhost=STRING HTTPS Proxy host to connect to\n"
" -G INT --proxyport=INT HTTPS Proxy portnumber to connect to\n"
" -d STRING --desthost=STRING Destination host to built the tunnel to\n"
" -D INT --destport=INT Destination portnumber to built the tunnel to\n"
" -p STRING --proxy=STRING Proxy host:port combination to connect to\n"
" -d STRING --dest=STRING Destination host:port to built the tunnel to\n"
"\nParameters for proxy-authentication (not needed for plain proxies):\n"
" -u STRING --user=STRING Username to send to HTTPS proxy for auth\n"
" -s STRING --pass=STRING Password to send to HTTPS proxy for auth\n"
@ -68,18 +66,18 @@ cmdline_parser_print_help (void)
" -S STRING --passvar=STRING Env var with Password for HTTPS proxy auth\n"
" -N --ntlm Use NTLM Based Authentication\n"
" -t STRING --domain=STRING NTLM Domain (default: autodetect)\n"
" -r STRING --remproxy=STRING Use a remote proxy to tunnel over (2 proxies)\n"
" -H STRING --header=STRING Add STRING to HTTP headers sent to proxy\n\n"
" If you don't provide -s or -S you will be prompted for a password.\n"
"\nMiscellaneous options:\n"
" -n --dottedquad Convert destination hostname to dotted quad\n"
" -v --verbose Turn on verbosity (default=off)\n"
" -q --quiet Suppress messages (default=off)\n", PACKAGE);
printf( "\nExamples:\n"
"%s [ -h | -V ]\n"
"%s -i [ -u user ] -g host -G port -d host -D port [ -n ] [ -v | -q ]\n"
"%s -i [ -U envvar ] -g host -G port -d host -D port [ -n ] [ -v | -q ]\n"
"%s -a port -g host -G port -d host -D port [ -n ] [ -v | -q ]\n", PACKAGE, PACKAGE, PACKAGE, PACKAGE );
"%s -i [ -u user ] -p proxy:port -d host:port [ -v | -q ]\n"
"%s -i [ -U envvar ] -p proxy:port -d host:port [ -v | -q ]\n"
"%s -a port -p proxy:port -d host:port [ -v | -q ]\n", PACKAGE, PACKAGE, PACKAGE, PACKAGE );
#ifndef HAVE_GETOPT_LONG
@ -108,6 +106,7 @@ gengetopt_strdup (char * s)
int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *args_info )
{
int c; /* Character of the parsed option. */
int r; /* Tmd retval */
int missing_required_options = 0;
char * tmp_env_var;
@ -115,11 +114,11 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
args_info->version_given = 0;
args_info->user_given = 0;
args_info->pass_given = 0;
args_info->proxy_given = 0;
args_info->proxyhost_given = 0;
args_info->proxyport_given = 0;
args_info->desthost_given = 0;
args_info->destport_given = 0;
args_info->dottedquad_given = 0;
args_info->dest_given = 0;
args_info->remproxy_given = 0;
args_info->verbose_given = 0;
args_info->ntlm_given = 0;
args_info->inetd_given = 0;
@ -133,10 +132,11 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
args_info->user_arg = NULL; \
args_info->pass_arg = NULL; \
args_info->domain_arg = NULL; \
args_info->proxy_arg = NULL; \
args_info->proxyhost_arg = NULL; \
args_info->desthost_arg = NULL; \
args_info->dest_arg = NULL; \
args_info->remproxy_arg = NULL; \
args_info->header_arg = NULL; \
args_info->dottedquad_flag = 0; \
args_info->verbose_flag = 0; \
args_info->ntlm_flag = 0; \
args_info->inetd_flag = 0; \
@ -168,12 +168,12 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
{ "domain", 1, NULL, 't' },
{ "uservar", 1, NULL, 'U' },
{ "passvar", 1, NULL, 'S' },
{ "proxy", 1, NULL, 'p' },
{ "proxyhost", 1, NULL, 'g' },
{ "proxyport", 1, NULL, 'G' },
{ "desthost", 1, NULL, 'd' },
{ "destport", 1, NULL, 'D' },
{ "dest", 1, NULL, 'd' },
{ "remproxy", 1, NULL, 'r' },
{ "header", 1, NULL, 'H' },
{ "dottedquad", 0, NULL, 'n' },
{ "verbose", 0, NULL, 'v' },
{ "ntlm", 0, NULL, 'N' },
{ "inetd", 0, NULL, 'i' },
@ -182,9 +182,9 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
{ NULL, 0, NULL, 0 }
};
c = getopt_long (argc, argv, "hVia:u:s:t:U:S:g:G:d:D:H:nvNq", long_options, &option_index);
c = getopt_long (argc, argv, "hVia:u:s:t:U:S:p:r:g:G:d:D:H:nvNq", long_options, &option_index);
#else
c = getopt( argc, argv, "hVia:u:s:t:U:S:g:G:d:D:H:nvNq" );
c = getopt( argc, argv, "hVia:u:s:t:U:S:p:r:g:G:d:D:H:nvNq" );
#endif
if (c == -1) break; /* Exit from `while (1)' loop. */
@ -291,47 +291,48 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
break;
case 'g': /* HTTPS Proxy host to connect to. */
if (args_info->proxyhost_given)
{
fprintf (stderr, "%s: `--proxyhost' (`-g') option given more than once\n", PACKAGE);
clear_args ();
exit (1);
}
args_info->proxyhost_given = 1;
args_info->proxyhost_arg = gengetopt_strdup (optarg);
fprintf (stderr, "%s: `-g option is obsolete, use -p\n", PACKAGE);
clear_args ();
exit (1);
break;
case 'G': /* HTTPS Proxy host portnumber to connect to. */
if (args_info->proxyport_given)
{
fprintf (stderr, "%s: `--proxyport' (`-G') option given more than once\n", PACKAGE);
clear_args ();
exit (1);
}
args_info->proxyport_given = 1;
args_info->proxyport_arg = atoi (optarg);
fprintf (stderr, "%s: `-g option is obsolete, use -p\n", PACKAGE);
clear_args ();
exit (1);
break;
case 'p': /* HTTPS Proxy host:port to connect to. */
if (args_info->proxy_given)
{
fprintf (stderr, "%s: `--proxy' (`-p') option given more than once\n", PACKAGE);
clear_args ();
exit (1);
}
args_info->proxy_given = 1;
args_info->proxy_arg = gengetopt_strdup (optarg);
break;
case 'r': /* Use a remote proxy */
if (args_info->remproxy_given)
{
fprintf (stderr, "%s: `--remproxy' (`-r') option given more than once\n", PACKAGE);
clear_args ();
exit (1);
}
args_info->remproxy_given = 1;
args_info->remproxy_arg = gengetopt_strdup (optarg);
break;
case 'd': /* Destination host to built the tunnel to. */
if (args_info->desthost_given)
if (args_info->dest_given)
{
fprintf (stderr, "%s: `--desthost' (`-d') option given more than once\n", PACKAGE);
fprintf (stderr, "%s: `--dest' (`-d') option given more than once\n", PACKAGE);
clear_args ();
exit (1);
}
args_info->desthost_given = 1;
args_info->desthost_arg = gengetopt_strdup (optarg);
break;
case 'D': /* Destination host portnumber to built the tunnel to. */
if (args_info->destport_given)
{
fprintf (stderr, "%s: `--destport' (`-D') option given more than once\n", PACKAGE);
clear_args ();
exit (1);
}
args_info->destport_given = 1;
args_info->destport_arg = atoi (optarg);
args_info->dest_given = 1;
args_info->dest_arg = gengetopt_strdup (optarg);
break;
case 'H': /* Extra headers to send to HTTPS proxy. */
@ -340,10 +341,6 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
args_info->header_arg = gengetopt_strdup (optarg);
break;
case 'n': /* Turn on resolve to Dotted Quad */
args_info->dottedquad_flag = !(args_info->dottedquad_flag);
break;
case 'v': /* Turn on verbosity. */
args_info->verbose_flag = !(args_info->verbose_flag);
break;
@ -368,37 +365,31 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
} /* switch */
} /* while */
if (! args_info->proxyhost_given && ! args_info->proxyport_given
&& ! args_info->desthost_given
&& ! args_info->destport_given )
if (! args_info->proxy_given && ! args_info->dest_given )
{
clear_args ();
cmdline_parser_print_help ();
exit (0);
}
if (! args_info->proxyhost_given)
{
fprintf (stderr, "%s: `--proxyhost' (`-g') option required!\n", PACKAGE);
missing_required_options = 1;
}
if (! args_info->proxyport_given)
{
fprintf (stderr, "%s: `--proxyport' (`-G') option required!\n", PACKAGE);
missing_required_options = 1;
}
if (args_info->proxy_given )
{
char * phost;
int pport;
if (! args_info->desthost_given)
{
fprintf (stderr, "%s: `--desthost' (`-d') option required!\n", PACKAGE);
missing_required_options = 1;
}
phost = malloc( 51 );
if (! args_info->destport_given)
{
fprintf (stderr, "%s: `--destport' (`-D') option required!\n", PACKAGE);
missing_required_options = 1;
}
fprintf( stderr, "%s: proxyhost (pre parse) given, it is: '%s'\n", PACKAGE, args_info->proxy_arg );
r = sscanf( args_info->proxy_arg, "%50[^:]:%d", phost, &pport );
if ( r == 2 )
{
args_info->proxyhost_arg = phost;
args_info->proxyport_arg = pport;
args_info->proxyhost_given = 1;
args_info->proxyport_given = 1;
}
fprintf( stderr, "%s: proxyhost (post parse) is '%s':'%d'\n", PACKAGE, args_info->proxyhost_arg, args_info->proxyport_arg );
}
if ( missing_required_options )
exit (1);

12
cmdline.h
View file

@ -27,12 +27,12 @@ struct gengetopt_args_info {
char * user_arg; /* Username to send to HTTPS proxy for auth. */
char * pass_arg; /* Password to send to HTTPS proxy for auth. */
char * domain_arg; /* NTLM Domain override */
char * proxy_arg; /* HTTPS Proxy host to connect to. */
char * proxyhost_arg; /* HTTPS Proxy host to connect to. */
int proxyport_arg; /* HTTPS Proxy host portnumber to connect to. */
char * desthost_arg; /* Destination host to built the tunnel to. */
char * dest_arg; /* Destination host to built the tunnel to. */
char * header_arg; /* Extra headers to send to HTTPS proxy */
int destport_arg; /* Dest host portnumber to built the tunnel to. */
int dottedquad_flag; /* Resolve hostname to dottedquad notation. */
char * remproxy_arg; /* Remote proxy to tunnel to. */
int verbose_flag; /* Turn on verbosity (default=off). */
int ntlm_flag; /* Turn on ntlm (default=off). */
int inetd_flag; /* Turn on inetd (default=off). */
@ -44,11 +44,11 @@ struct gengetopt_args_info {
int user_given; /* Whether user was given. */
int pass_given; /* Whether pass was given. */
int domain_given; /* Whether domain was given. */
int proxy_given; /* Whether proxyhost was given. */
int proxyhost_given; /* Whether proxyhost was given. */
int proxyport_given; /* Whether proxyport was given. */
int desthost_given; /* Whether desthost was given. */
int destport_given; /* Whether destport was given. */
int dottedquad_given; /* Whether dottedquad was given. */
int dest_given; /* Whether dest was given. */
int remproxy_given; /* Whether remproxy was given. */
int verbose_given; /* Whether verbose was given. */
int ntlm_given; /* Whether ntlm was given. */
int inetd_given; /* Whether inetd was given. */

2
config.h
View file

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define VERSION "1.5.2"
#define VERSION "1.6.0"
#define PACKAGE "Proxytunnel"
#define PURPOSE "Build generic tunnels through HTTPS proxies"
#define AUTHORS "Jos Visser (Muppet) <josv@osp.nl>, Mark Janssen (Maniac) <maniac@maniac.nl>"

76
http.c
View file

@ -87,41 +87,16 @@ void proxy_protocol()
/*
* Create the proxy CONNECT command into buf
*/
if( args_info.dottedquad_flag )
if (args_info.remproxy_given )
{
static char ipbuf[16]; /* IPv4: 'xxx.xxx.xxx.xxx' + \0 = 16 */
struct hostent * he = gethostbyname( args_info.desthost_arg );
if ( he )
{
sprintf( ipbuf, "%d.%d.%d.%d",
he->h_addr[0] & 255,
he->h_addr[1] & 255,
he->h_addr[2] & 255,
he->h_addr[3] & 255 );
if( args_info.verbose_flag )
{
message( "DEBUG: ipbuf = '%s'\n", ipbuf );
message( "DEBUG: desthost = '%s'\n",
args_info.desthost_arg );
}
args_info.desthost_arg = ipbuf;
if( args_info.verbose_flag )
message( "DEBUG: desthost = '%s'\n",
args_info.desthost_arg );
}
else if( args_info.verbose_flag )
message( "Can't lookup dest host: %s.\n",
args_info.desthost_arg );
message( "Tunneling to %s (remote proxy)\n", args_info.remproxy_arg );
sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.remproxy_arg );
}
else
{
message( "Tunneling to %s (destination)\n", args_info.dest_arg );
sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.dest_arg );
}
sprintf( buf, "CONNECT %s:%d HTTP/1.0\r\n",
args_info.desthost_arg, args_info.destport_arg );
if ( args_info.user_given && args_info.pass_given )
{
@ -167,9 +142,42 @@ void proxy_protocol()
/*
* Read the first line of the response and analyze it
*/
readline();
analyze_HTTP();
if (args_info.remproxy_given ) {
/*
* Clean buffer for next analysis
*/
while ( strcmp( buf, "\r\n" ) != 0 ) readline();
message( "Tunneling to %s (destination)\n", args_info.dest_arg );
sprintf( buf, "CONNECT %s HTTP/1.0\r\n", args_info.dest_arg );
/*
* Add extra header(s)
*/
if ( args_info.header_given )
sprintf( buf, "%s%s\r\n", buf, args_info.header_arg );
sprintf( buf, "%sProxy-Connection: Keep-Alive\r\n\r\n", buf );
if( args_info.verbose_flag )
message( "DEBUG: Send: '%s'\n", buf);
/*
* Send the CONNECT instruction to the proxy
*/
if( send( sd, buf, strlen( buf ), 0 ) < 0 )
{
my_perror( "Socket write error" );
exit( 1 );
}
/*
* Read the first line of the response and analyze it
*/
analyze_HTTP();
}
/*
* Then, repeat reading lines of the responses until a blank line
* (which signifies the end of the response) is encountered.

2
io.c
View file

@ -59,7 +59,7 @@ void readline()
*p = 0;
if( args_info.verbose_flag )
message( "%s", buf );
message( "DEBUG: recv: '%s'", buf );
}
/*