third-party-mirrors/sslh
1
0
Fork 0
mirror of https://github.com/yrutschle/sslh.git synced 2025-04-12 07:10:03 +03:00
Code Issues Packages Projects Releases Wiki Activity
859 Commits 3 Branches 42 Tags
Commit Graph

859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Latchezar Tzvetkoff
7499c26e9e
Cleanup error checking logic in bind_peer() (#412) 
Thanks for the cleanup!
 2023-11-15 22:02:21 +01:00
Yves Rutschle
90a55b6f9d document Windows build and docker repositories 2023-11-15 21:49:44 +01:00
Yves Rutschle
1f66e2e093 add sslh-ev 2023-11-15 21:46:42 +01:00
Yves Rutschle
92d2326016
Merge pull request #408 from pcrow/master 
Fix transparent mode in a multi-stage chain
 2023-10-07 21:15:58 +02:00
Preston Crow
81eed9d56a Transparent mode in a multi-stage chain will fail after the first step 
because the (ip,port) is already bound.  With this change, the bind is
retried with a different port to at least keep the same IP address, which
for most uses is all that is needed.  I've tested this on my own system
where sslh is used downstream from stunnel, with both in transparent mode.
 2023-10-06 17:50:25 -04:00
Yves Rutschle
490a44723b fix install to build sslh-fork (fix #407) 2023-10-05 11:53:09 +02:00
Yves Rutschle
23fb1eba6f remove obsolete intermediate sslh target 2023-10-03 09:34:38 +02:00
Yves Rutschle
be66848e2d
Merge pull request #406 from ffontaine/master 
Makefile: add USE_LIBEV
 2023-10-03 09:32:42 +02:00
Fabrice Fontaine
3e93c1d43d Makefile: add USE_LIBEV 
Add USE_LIBEV to avoid the following build failure without libev raised
since version 2.0 and
711c11c820:

sslh-ev.c:24:10: fatal error: ev.h: Aucun fichier ou dossier de ce type
   24 | #include <ev.h>
      |          ^~~~~~

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
 2023-10-01 18:53:43 +02:00
Yves Rutschle
1b26eb50a5 Changelog for resolve_on_forward fix v2.0.1 2023-09-24 09:25:52 +02:00
Yves Rutschle
e0f15a31b7 resolve name at connection time for UDP too 2023-09-12 21:39:51 +02:00
Yves Rutschle
c2551c011e update to Conf::Libconfig 1.0.3 API 2023-09-12 21:35:23 +02:00
Yves Rutschle
e2c3ed61a8 update to Conf::Libconfig 1.0.3 API 2023-09-12 21:35:10 +02:00
Yves Rutschle
1b0c6d0b8d add resolve_on_forward in tests 2023-09-06 18:01:52 +02:00
Yves Rutschle
0562eb4b07 fix resolve_on_forward use (fix #405) 2023-09-06 15:48:13 +02:00
Yves Rutschle
93600d1fb1
Merge pull request #299 from amake/patch-1 
Allow supplying additional CFLAGS
v2.0.0 v2.0 		2023-08-31 15:26:42 +02:00
Yves Rutschle
04f258e705
Merge branch 'master' into patch-1 2023-08-31 15:26:22 +02:00
Yves Rutschle
1fb888bbf2 remove magic numbers with correct sizeof 2023-08-31 15:18:22 +02:00
Yves Rutschle
1f0cab2aee
Merge pull request #342 from utoni/fix/ovpn-probe-read-overflow 
fix possible buffer overflow
 2023-08-31 15:15:50 +02:00
Yves Rutschle
ff9328fa6c Merge branch 'utoni-fix/cppcheck-complains' 2023-08-31 15:13:57 +02:00
Yves Rutschle
e941e8dd2e fix cppcheck complains 2023-08-31 15:10:53 +02:00
Yves Rűtschlé
8930ec395e Initial support for the landlock LSM 2023-08-29 17:20:51 +02:00
Yves Rutschle
54fe4b2f47
Merge pull request #401 from rnhmjoj/master 
fix handling of IPv6 UDP connections
 2023-08-26 21:32:22 +02:00
rnhmjoj
33129481cf
fix handling of IPv6 UDP connections 
Problem:
IPv6 addresses are 4 bytes long and don't fit inside a `sockaddr`, so
`recvfrom` will truncate the address to the first half.
When generating a reply, the remaining half of the address is filled
with garbage and the packet is subsequently delivered to the wrong host,
if not immediately dropped.

Solution:
replace `sockaddr` with `sockaddr_storage`, the latter is guaranteed to
be large enough to hold an IPv6 address and pointers can be cast to
`sockaddr *` when needed.
 2023-08-22 11:44:09 +02:00
Yves Rűtschlé
4cc0867753 remove dependency of sslh-conf.c to sslhconf.cfg (fix #283) 2023-08-13 10:38:39 +02:00
Yves Rutschle
4728730abc
Merge pull request #392 from klementng/docker/transparent-patch 
Docker: ipv6 transparent patch
 2023-08-10 08:21:39 +02:00
clement
9e7b4b751f sync and resolve merge conflict 2023-08-09 23:36:01 +08:00
Clement
b11f2620ab
Add clarification on --transparent mode for docker 2023-08-09 22:57:47 +08:00
Yves Rutschle
056c283145
Merge pull request #393 from oliv3r/dev/cleanup 
container: Cleanup some style issues
 2023-08-09 08:25:22 +02:00
Olliver Schinagl
00beb9595d
container: Cleanup some style issues 
Commit 5635dc5142aa ("Enable --transparent mode for docker") made a
little bit of a mess of the Dockerfile and container-entrypoint.sh.

A few issues are, but not limited to; trailing whitespaces, incorrect
indentation, removed final newline, component sortability just to name a
few.

This MR fixes that and cleans up those files again.

One thing not touched was the enable/disablement of `set +e` to exit the
script on error. It is nicer/cleaner to solve this in a different way,
but that adds to much complexity.

While here, make the container architecture and alpine version
configurable, allowing us to build multi-arch images from the CI in the
future.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
 2023-08-08 09:01:51 +02:00
clement
27f3e9075a update examples 2023-08-08 08:11:08 +08:00
clement
3912330040 add proper ipv6 checking 2023-08-08 08:02:54 +08:00
Yves Rutschle
4cbff962db
Merge pull request #386 from oliv3r/dev/fix_version_tag 
version: Do not put a slash in the version tag
 2023-07-30 23:12:32 +02:00
Yves Rutschle
29c949e051
Merge pull request #389 from jsoref/spelling 
Spelling
 2023-07-30 23:09:03 +02:00
Yves Rutschle
e8a84e6c22
Merge pull request #388 from klementng/master 
Enable --transparent mode for docker
 2023-07-30 23:01:38 +02:00
Josh Soref
42476d3cdc spelling: version 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:13 -04:00
Josh Soref
f48f74c004 spelling: unprivileged 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:13 -04:00
Josh Soref
3af02d5c44 spelling: transparent 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:13 -04:00
Josh Soref
9e6d5cc13a spelling: theoretical 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
74fe57147b spelling: tentative 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
9acec69b9a spelling: successful 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
2a81ec0650 spelling: subsequent 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
596a4ee5b4 spelling: shortopts 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
dbfeb480fe spelling: return 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
6b8a203691 spelling: responsibility 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
95e351e150 spelling: privileges 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
4b4c585107 spelling: parenthesis 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
0217e842d2 spelling: overridden 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
877ef1d27c spelling: other 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00
Josh Soref
b1bfd5aee3 spelling: nonexistent 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-07-30 01:43:12 -04:00