Commit graph

51 commits

Author SHA1 Message Date
e9hack
b6daf27b8f Fixed NTLM authentication
- analyse_HTTP: Read first something from the connection before analyse it
- analyse_HTTP: Accepte a TAB as a second delimiter during parsing an answer from a proxy.
- proxy_protocol(): In case of NTLM authentication, this function is called twice recursively.
  Use variable ntlm_challenge as marker of the state of the authentication to avoid endless
  recursive calls in case of an error and avoid to try to connect to the remote proxy twice.
2024-11-29 12:41:27 +01:00
Mark Janssen -- Sig-I/O Automatisering
8bbfccb7b5
Update version / copyright dates 2020-05-07 17:17:41 +02:00
Mark Janssen -- Sig-I/O Automatisering
8395e7a258
Apply debian patch: 001_apache_bug_29744_workaround.patch 2020-05-07 17:04:20 +02:00
Dirk Stoecker
6ae9190486 fix compiler warning 2018-03-12 17:47:13 +01:00
Stephen Kent
5a7692f28f Add SSL certificate verification support and enable it by default
Disable SSL certificate verification with -z/--no-check-certificate
2016-08-18 10:24:11 -07:00
Mathieu CARBONNEAUX
583d6ac96e SNI support
add SNI support
2016-08-07 19:47:51 +02:00
Daniel Jonka
fc46781880 allow to specify own Host Header in CONNECT method via -o on commandline
(from thieso2's fork of proxytunnel)
2016-02-03 17:28:22 +01:00
Mark Janssen
8953ac383c Forgot one \r\n (only in debug-info, not in used code)
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@248 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-09-26 14:46:24 +00:00
Mark Janssen
40a56608bd Use HTTP/1.1, so we can connect over JoikuSpot accesspoints
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@247 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-09-26 14:24:59 +00:00
Mark Janssen
632919f59c Cleanup some ifdefs
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@222 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-02-26 23:32:02 +00:00
Mark Janssen
b5bde0c35e Remote proxy encryption
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@221 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-02-22 21:34:13 +00:00
Dag Wieers
f515473938 Changed basicauth interface.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@206 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-27 13:19:17 +00:00
Dag Wieers
5cffce4172 Cosmetic changes and vim improvements.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@204 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-27 10:04:23 +00:00
Dag Wieers
4ab2eb5b48 Reformatted sourcecode.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@203 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-22 23:52:42 +00:00
Mark Janssen
fc32748906 Rework indentation
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@199 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-22 22:29:08 +00:00
Dag Wieers
074b2a0f8c Cosmetic cleanup using tabs. Added vim config instruction to not use spaces.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@197 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-22 17:11:59 +00:00
Dag Wieers
3756010135 Output formatting changes.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@193 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-21 21:38:55 +00:00
Mark Janssen
14000b71c2 Header processing fixes
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@190 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-21 16:26:23 +00:00
Dag Wieers
06af6e1548 Fix the unknown number of args with strzcat.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@188 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-21 12:57:05 +00:00
Dag Wieers
4ff3677231 Fixed weird character in prefixed output.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@187 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-20 22:00:30 +00:00
Dag Wieers
bef1f87532 Finally fixed strzcat on 64bit.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@180 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-20 12:06:15 +00:00
Dag Wieers
baaca8a6c4 More output updates
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@179 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-20 11:15:47 +00:00
Mark Janssen
b11ad35a2c Do basic-auth on remote proxy if username/password given
(So auth is provided to local and remove proxy)


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@178 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-20 02:04:31 +00:00
Mark Janssen
dfc4dbdb57 Change strzcat into strlcat's until strzcat works good on 64bit
Fix some spacing


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@177 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-20 01:02:44 +00:00
Dag Wieers
24b37ca6c6 Improved verbose output, easier for the eyes
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@175 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-19 04:05:39 +00:00
Dag Wieers
f6147e785a Added strzcat function to append strings to buffer.
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@171 bc163920-b10d-0410-b2c5-a5491ca2ceef
2008-01-19 03:28:34 +00:00
Mark Janssen
917a5c435d revert last patch, I had NTLM working with r154, this broke again with 155
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@157 bc163920-b10d-0410-b2c5-a5491ca2ceef
2007-04-13 08:54:13 +00:00
Mark Janssen
9fd5bfe8d5 NTLM/SSL fixes by Taco IJsselmuiden <taco@varda.nl>
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@155 bc163920-b10d-0410-b2c5-a5491ca2ceef
2007-04-12 11:31:17 +00:00
Mark Janssen
bbda7f9734 - Applied (reworked) changes from Mark Cave-Ayland to support -E option
encrypting data to the proxy with SSL (untested by me)
- Change version to 1.6.4


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@143 bc163920-b10d-0410-b2c5-a5491ca2ceef
2007-02-12 20:48:17 +00:00
Mark Janssen
42913f3c39 Allow multiple -H/--header options to be specified
for proxies that need multiple headers to be coaxed into tunneling


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@142 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-10-05 09:55:55 +00:00
Dag Wieers
e6893458fe Improve output with bad setups (non-existing local proxy or remote non-proxy servers)
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@137 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-09-01 14:51:28 +00:00
Mark Janssen
4e5e275810 Signal Handling (dag-)
Reworked debug output (dag-)


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@135 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-09-01 08:32:53 +00:00
Mark Janssen
cfca8d719f Clear-up analyze_HTTP message, should be clear to the user now what happened
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@133 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-08-31 15:04:42 +00:00
Mark Janssen
7f7f772444 Fosdem changes
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@120 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-26 09:13:40 +00:00
Mark Janssen
860e177e53 Cleanup setproctitle, changed return-type of readline()
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@111 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-11 00:21:16 +00:00
Mark Janssen
52a0712ba5 Moved lots of NTLM messages to verbose mode. Removed some messages in quiet mode
Undone some sprintf->snprintf conversions, broken


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@107 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-09 10:02:54 +00:00
Mark Janssen
bdb7fdfb87 Replaced a few sprintf's to snprintf's
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@105 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-08 10:54:33 +00:00
Mark Janssen
c64ea2d874 Removed some debugging output, moved some to 'verbose' mode
Updated darwin makefile


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@102 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-08 09:18:52 +00:00
Mark Janssen
cd31841d7b Update copyright headers (2006)
Remove permission setting in makefile-install part, to make packagebuilders happy
Added link for more info on -r option to README


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@93 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-06 13:05:30 +00:00
Mark Janssen
f51bdbda82 Fixed compiler-warnings for gcc-4... mostly type-checking
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@90 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-02-06 11:36:53 +00:00
Mark Janssen
142cd3e4eb - Replaced -g/-G (proxy host and port) with -p proxy:post shorthand
- 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
2006-02-06 10:58:26 +00:00
Mark Janssen
81a01b0f2b HP-Nonstop/Tandem compile fix
Workaround for broken proxies


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@84 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-01-16 15:51:04 +00:00
Mark Janssen
7c4a0b9c6b change function-return to make hp's compiler happy
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@83 bc163920-b10d-0410-b2c5-a5491ca2ceef
2006-01-11 12:52:04 +00:00
Mark Janssen
bf7f2a5b47 Version 1.5.0
Added NTLM support


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@71 bc163920-b10d-0410-b2c5-a5491ca2ceef
2005-08-15 10:50:21 +00:00
Mark Janssen
a8fbfeaedf Revert strtok change... breaks proxytunnel
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@61 bc163920-b10d-0410-b2c5-a5491ca2ceef
2004-10-01 07:03:58 +00:00
Mark Janssen
eee59dcf16 - Added patch by drwr that fixes some compiler warnings and introduces
Makefile.cc for non-gnu compilers

- Small fix in strtok parsing in http.c apparently fixes problems with some
  not quite conformant proxyservers


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@59 bc163920-b10d-0410-b2c5-a5491ca2ceef
2004-10-01 06:55:35 +00:00
Mark Janssen
18a37716b0 Added small warning fix from: Jon Scobie <scobiej@yahoo.co.uk>
Updated version to 1.1.3


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@53 bc163920-b10d-0410-b2c5-a5491ca2ceef
2003-12-02 12:14:14 +00:00
Mark Janssen
f231ee9cc2 Some more minor fixes, should work again now
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@41 bc163920-b10d-0410-b2c5-a5491ca2ceef
2002-05-14 13:34:45 +00:00
Mark Janssen
faddb15d1c Some things I forgot
git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@40 bc163920-b10d-0410-b2c5-a5491ca2ceef
2002-05-14 13:01:31 +00:00
Mark Janssen
888dce8506 Added option to specify additional headers to be sent to the HTTPS proxy
(Ex: --header "MyCustomHeader: MyValue)
Based on Dieter Heiliger's <dieter.heiliger@gmx.de> idea for a User-Agent header


git-svn-id: https://proxytunnel.svn.sourceforge.net/svnroot/proxytunnel/trunk/proxytunnel@39 bc163920-b10d-0410-b2c5-a5491ca2ceef
2002-05-14 10:19:56 +00:00