263 Commits

This Branch

This Branch

All Branches

• configure: Solaris detection, ld 'soname' option auto detection; other Solaris related fixes
  WHR · 2018-01-11 00:45:40 +08:00
  35a674bdbc
• main.c: fix build error with solaris

  sys/feature_tests.h:362:2: error: #error
  "Compiler or options invalid for pre-UNIX 03 X/Open applications and pre-2001 POSIX applications"

  papadave · 2018-01-10 16:14:21 +00:00
  a1f7007a46
• allocator_thread.c: fix build on FreeBSD due to MAP_ANON

  thx to @Low-power for testing

  rofl0r · 2018-01-10 16:09:09 +00:00
  3366dc3131
• configure: remove bogus uname platform checks

  calling uname in a configure script is entirely bogus, as it will return
  wrong results in crosscompilation scenarios. the only sensible way to
  detect the target platform's peculiarities is to test the preprocessor
  for macros defining the target.

  rofl0r · 2018-01-09 13:50:11 +00:00
  b299193d13
• remove usage of s6_addr16 and s6_addr32

  it turns out that those macros are not portable at all. rather than
  adding workarounds to make it work for every single platform, just
  use plain s6_addr instead.

  rofl0r · 2018-01-09 13:30:02 +00:00
  2f3d33dd47
• allocator_thread.c: define _DARWIN_C_SOURCE so we get MAP_ANON

  https://github.com/nneonneo/osx-10.9-opensource/blob/master/xnu-2422.1.72/bsd/sys/mman.h#L142
  https://opensource.apple.com/source/xnu/xnu-344/bsd/sys/mman.h

  rofl0r · 2017-12-21 16:30:17 +00:00
  d28f4df8e2
• allocator_thread: add assertion that we get the right response

  in order to prevent future bugs like the one fixed in cc7bc891ff
  we need to assure that the response is of the same type as the request -
  if not, some unexpected race condition happened.

  rofl0r · 2017-12-19 00:35:01 +00:00
  03880ce695
• allocator_thread: fix segfault with weechat 2.0

  it was reported that weechat 2.0 on ubuntu 16.04 LTS x86_64 segfaulted like this:
  
  4 0x00007f6bf0e7e0c0 in __stack_chk_fail () at stack_chk_fail.c:28
  5 0x00007f6bf2536bce in at_get_ip_for_host (host=0x339c4d0 "abcdefghijklmnop.onion", len=22) at src/allocator_thread.c:290
   readbuf = {octet = "irc.", as_int = 778269289} msg = {msgtype = ATM_GETNAME, datalen = 13}
  
  what happened was that weechat forked, thus got its own private copy of the VM
  and thus a private copy of the mutex which should prevent parallel use of
  at_get_ip_for_host() & friends. therefore the following race was possible:
  - process A writes a message of type ATM_GETIP into the server pipe
  - process B writes a message of type ATM_GETNAME into the server pipe
  - process A write transaction is finished, and goes into receive mode
  - server thread reads process B's message and responds with a ATM_GETNAME msg
  - process A reads the response which was intended for process B into the 4 byte
    ip address buffer, but ATM_GETNAME are much larger than ATM_GETIP responses,
    resulting in stack corruption.
  
  to prevent this issue, the storage of the mutex must reside in shared memory,
  which we achieve via mmap. alternatively, shm_open() or sysvipc shm stuff could
  be used. the former requires the mmap call to happen before the fork, the latter
  not, however the shm would require a named object in /dev/shm (which requires
  generating a unique name per proxychains instance, and subsequent cleanup).
  so in the end, the mmap is easier to deal with, and we can be reasonably
  certain that our constructor is being run before the hooked application forks.

  rofl0r · 2017-12-19 00:29:23 +00:00
  cc7bc891ff
• allocator_thread: use bigger stacksize for Mac OS X
  rofl0r · 2017-12-15 13:15:13 +00:00
  3b5f41028b
• fix memory leak

  don't leak variable 'space' when the host is numeric
  
  Signed-off-by: Antonio Quartulli <a@unstable.cc>

  Antonio Quartulli · 2017-08-28 15:19:43 +01:00
  46647bee44
• allocator_thread.c: handle EINTR case when reading/writing pipe data

  addressing #163

  rofl0r · 2017-02-23 01:08:24 +00:00
  bb3df1e440
• release 4.12

  the xmas release.

  rofl0r · 2016-12-24 13:14:08 +00:00
  v4.12 7a233fb1f0
• Revert "Makefile: suppress pedantic warnings in user CFLAGS"

  This reverts commit 6ae959e051.
  
  It appears as if -pedantic is special in that there is no option
  to disable it.

  rofl0r · 2016-12-24 12:49:14 +00:00
  cd4ced1d52
• configure: use quotes for echo calls
  rofl0r · 2016-12-24 12:48:41 +00:00
  cb70ab5f8f
• Fix configure so the right CC gets picked up

  unlike one would expect, setting `CC?=gcc -m32` in config.mak did not actually
  lead to `gcc -m32` being used as compiler when running make, even though CC
  was not declared anywhere else.
  it appears as if the CC variable is implicitly defined by GNU make, so using
  the ?= assignment (meaning "assign only if not already assigned") did not have
  an effect.
  when this configure script and Makefile here were written, they were modeled
  after the interface provided by GNU autoconf (so there are no surprises for the
  user). the assumption was that environment variables passed during configure
  are usually stored and used for the compile, but can be overridden when running
  make by exporting the variables again.
  in reality though they can not be overridden by environment when running make,
  as tests showed.
  because of that, the other user-supplied variables will now be hard-assigned as
  well.
  
  closes #152
  
  commit message by @rofl0r.

  Jatin Rungta · 2016-12-24 12:36:42 +00:00
  c91e6a09ef
• check snprintf return value for error
  rofl0r · 2016-12-20 22:18:21 +00:00
  bf6eeff75a
• Makefile: suppress pedantic warnings in user CFLAGS
  rofl0r · 2016-12-13 20:42:50 +00:00
  6ae959e051
• Avoid using %n$ operand number formats to compile cleanly with ISO C.
  Carlos Maddela · 2016-12-13 20:27:56 +00:00
  5ed5089733
• Prevent empty translation units to satisfy ISO C compilers.
  Carlos Maddela · 2016-12-13 20:27:15 +00:00
  8ddc8a6da3
• Fix format ‘%p’ expects argument of type ‘void *’ warning.
  Carlos Maddela · 2016-12-13 20:12:15 +00:00
  167780ce36
• Fix format specifier for unsigned int.
  Carlos Maddela · 2016-12-13 20:11:37 +00:00
  4b413c902f
• Fix grammar in usage message to keep Lintian happy.
  Carlos Maddela · 2016-12-05 18:37:11 +11:00
  6dcaf533d1
• Fix spelling in log message: doesnt -> doesn't
  Carlos Maddela · 2016-12-05 14:10:09 +11:00
  0bd2130352
• core.c: add HOST header to each CONNECT request

  fixes #92
  closes #93

  forkbomber · 2016-10-16 19:43:00 +00:00
  cf9a16de06
• configure: make buildsystem-set CPPFLAGS non-overridable

  we temporarily store all buildsystem-set conditionals into
  OUR_CPPFLAGS and write it into config.mak as an addition to eventually
  user-supplied CPPFLAGS. this should prevent crucial things we set from
  being overwritten by a user that has CPPFLAGS exported.
  
  fixes #142

  rofl0r · 2016-10-16 11:28:05 +00:00
  c883cd4940
• Fix random_chain on Mac OS X

  On Mac OS X, random chain was broken and returned always the last proxy from the
  config file.  Use fix as suggested by @ravomavain.
  
  Closes #75.

  Jay Taylor · 2016-10-14 21:49:01 +00:00
  0f6b226b15
• configure: do not use mktemp

  apparently mktemp on OSX 10.9.5 requires a parameter.
  instead of playing whack-a-mole with apple we now use the portable
  code from musl's configure script which should work everywhere.
  
  adresses #142

  rofl0r · 2016-10-08 21:02:13 +01:00
  260578d00e
• print error message instead of segfaulting for invalid chain_len

  closes #126

  rofl0r · 2016-06-23 09:27:15 +01:00
  e527b9ee64
• Fix build failure with -pie in user LDFLAGS

  When hardening flags are set by Debian's auto build system,
  the project fails to build due to usage of -pie, which tells the linker
  to build a PIE binary, and since the user LDFLAGS are deliberately put
  later in the command line to override things, this overrides -shared.
  work around by putting it directly in the last position of the linker
  command line.
  
  closes #124
  Commit message authored by commiter.

  Carlos Maddela · 2016-06-09 21:07:33 +01:00
  635ded3393
• Fix trivial compilation warning

  Fix "missing braces around initializer" warning.

  Carlos Maddela · 2016-06-09 12:09:51 +01:00
  993dfc059d
• don't call dlsym() from close() hook

  it turned out that calling dlsym() may call malloc() in turn,
  so we end up with the same deadlock described in the latest commit.
  
  we thus now put all the fds passed to close pre-init into a list
  and close them at init time.
  
  this may finally fix #119.

  rofl0r · 2016-05-26 19:11:18 +01:00
  f1e5f2ba01
• don't call INIT() from close hook

  it was observed that it is a bad idea to initialize the entire
  infrastructure used by proxychains from the close hook,
  because the following scenario will lead to a deadlock:
  
  - it is possible that the dynlinker executes the initializer code of
    other shared libs first
  - if that code directly or indirectly calls malloc()
  - which calls close() if it decided to use an mmap based allocation
  - will now call our close(), which does
  - call pthread_once which requires a lock
  - creates a thread which calls malloc()
  - which in turn calls our close() another time
  - and our close is still in locked state.
  
  so it seems the only save thing to do is to just get the address
  of the original close function, and call that when we're in a
  pre-init state.
  this may hold for other functions that do lazy initialization as well,
  however for those just calling the original function is probably
  undesired since that could result in unproxified connections.
  it will be needed to analyze on a per-function basis what the best
  thing to do is, and finally rely only on the execution of the init
  function from the gcc initializer.
  
  should fix #119

  rofl0r · 2016-05-26 10:48:32 +01:00
  8870140ff0
• release 4.11
  rofl0r · 2016-02-09 20:12:51 +00:00
  v4.11 aea9172653
• README: add 'Known Problems' section
  rofl0r · 2016-02-09 20:11:40 +00:00
  afdbfcf40c
• configure: whitespace cleanup in help text
  rofl0r · 2016-02-04 12:56:00 +00:00
  058adbcac2
• add check for broken OpenBSD fclose()

  http://marc.info/?l=openbsd-bugs&m=145280872431093&w=2
  
  closes #95

  rofl0r · 2016-02-04 12:49:49 +00:00
  b64c89e0e4
• improve hostsreader test code
  rofl0r · 2016-02-04 09:38:16 +00:00
  a1c31e73b6
• Fix bug in hostsreader

  hostsreader_get() used to assign the IP address to both `name` and `ip`
  fields in `struct hostsreader`, which led to proxychains effectively
  ignoring the contents of /etc/hosts.

  Alexander Batischev · 2016-02-04 09:37:06 +00:00
  f85cecdabe
• getnameinfo: support ipv6 as well
  rofl0r · 2015-12-06 13:01:56 +00:00
  672bf7661d
• test_getnameinfo: improve, check ipv6
  rofl0r · 2015-12-06 13:01:07 +00:00
  4c3be5e1e3
• mute warning in debug mode
  rofl0r · 2015-12-06 12:57:45 +00:00
  0e0e35927c
• factor out setup_hooks()
  rofl0r · 2015-12-02 12:14:58 +00:00
  205004fa2a
• debug.c: fix for ipv6 changes

  closes #94

  rofl0r · 2015-12-01 20:37:27 +00:00
  50c84176da
• configure: check for availability of s6_addr16

  this should fix the build of the recently added ipv6 code on MacOS X,
  OpenBSD and eventually FreeBSD.
  
  closes #83
  closes #85
  
  thanks to @cam13 and @vonnyfly for reporting/testing.

  rofl0r · 2015-10-01 14:14:23 +01:00
  1294d0a004
• README: fix omission and whitespace
  rofl0r · 2015-09-19 11:09:41 +01:00
  e9bf9623ba
• remove obsolete config.mak example

  config.mak is autogenerated by the configure script since a long time.
  there's no need to supply the example anymore, and it appears a lot
  of people are looking into the directory expecting to find a binary
  distribution.

  rofl0r · 2015-09-15 22:00:43 +01:00
  8a7081409e
• connect(): handle ipv4-mapped ipv6 addresses

  if an ipv4-mapped ipv6 address is detected, the ip is converted
  into v4 format because it may actually be one of our remote dns ips.
  it was reported that a program called "maven", when getting handed our
  fake ips in the remote dns subnet, converts the ip to v6 prior to calling
  connect():
  [proxychains] Strict chain ... 127.0.0.1:1080 ... ::ffff:224.0.0.1:443
  <--socket error or timeout!
  
  fixes #77

  rofl0r · 2015-09-15 21:19:51 +01:00
  32df7ff152
• add testcase for ipv4-mapped ipv6 address
  rofl0r · 2015-09-15 21:14:58 +01:00
  097c7f9125
• preliminary ipv6 support

  only basic testing was done (with 2 socks5 proxies listening on ::1)
  but seems to work as intended.
  
  ipv6 support for the hostsreader (/etc/hosts) is not implemented so far.

  rofl0r · 2015-08-10 17:00:26 +01:00
  2237749567
• fix socks5 bug: always requested user auth cap

  since "user" always points to a statically allocated string buffer,
  the test for if(user)... was bogus.
  use ulen instead.
  
  this bug should only be visible on socks servers that require auth
  if username was not passed, so it was probably not really an issue.

  rofl0r · 2015-06-14 12:10:32 +01:00
  9969dd3a22