Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add support for the PROXY protocol #184

Draft
wants to merge 130 commits into
base: master
Choose a base branch
from
Draft

feat: add support for the PROXY protocol #184

wants to merge 130 commits into from
+1,407 −162

Conversation

sbruens
Copy link

@sbruens sbruens commented Jun 18, 2024

sbruens added 27 commits May 31, 2024 17:03
@sbruens
Create a new config format so we can expand listener configuration fo…
1b82d33 
…r proxy protocol.
@sbruens
Remove unused fakeAddr.
a4c2007
@sbruens
Split startPort up between TCP and UDP.
72b27d7
@sbruens
Use listeners to configure TCP and/or UDP services as needed.
fddfc57
@sbruens
Remove commented out line.
c1ee12f
@sbruens
Use ElementsMatch to compare the services irrespective of element o…
354301e 
…rdering.
@sbruens
Do not ignore the keys field if services is used as well.
751d164
@sbruens
Add some more tests for failure scenarios and empty files.
6297304
@sbruens
Remove unused GetPort().
0ac0a72
@sbruens
Move ResolveAddr to config.go.
794f860
@sbruens
Remove use of net.Addr type.
01b7e8a
@sbruens
Pull listener creation into its own function.
87a1565
@sbruens
Move listener validation/creation to config.go.
51a13a7
@sbruens
Use a custom type for listener type.
f8d7aa5
@sbruens
Fix accept handler.
1952036
@sbruens
Add doc comment.
7212265
@sbruens
Fix tests still supplying the port.
6e2068d
@sbruens
Move old config parsing to loadConfig.
7114434
@sbruens
Lowercase readConfig.
1b2dd42
@sbruens
Add support for PROXY protocol on TCP.
744b2cf
@sbruens
Create a Listen func to create proxy or direct listeners based on t…
c5fb99a 
…he config.
@sbruens
Update config test.
802e689
@sbruens
Wrap direct listener inside proxy protocol listener.
e085d4c
@sbruens
Move listeners into tcp.go.
98ccbce
@sbruens
Fix tests.
d83e6ba
@sbruens
Rename IClientStreamConn to ClientStreamConn.
870b379
@sbruens
Rename WrapStreamAccepter to WrapStreamListener.
00d484b
fortuna
fortuna requested changes Jun 18, 2024
View reviewed changes
cmd/outline-ss-server/config.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/config.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
go.sum Show resolved Hide resolved
service/tcp.go Outdated Show resolved Hide resolved
service/tcp.go Outdated Show resolved Hide resolved
service/tcp.go Outdated Show resolved Hide resolved
service/tcp.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/config_example.yml Show resolved Hide resolved
@sbruens
Rename shared to virtual as they are not actually shared.
547e9e6
@sbruens
Simplify listenAddr.
c6774c8
@sbruens
Fix use of the ref count.
df2f9d0
@sbruens
Add simple test case for early closing of stream listener.
c678372
@sbruens
Add tests for creating stream listeners.
e41abab
@sbruens
Merge branch 'sbruens/shared-listeners' into sbruens/proxy
b626a1c
@sbruens
Create handlers on demand.
f9432d2
@sbruens
Merge branch 'sbruens/proxy' into sbruens/proxy-protocol
f43fbec
@sbruens
Refactor create methods.
6b11f4f
@sbruens
Merge branch 'sbruens/shared-listeners' into sbruens/proxy
3e03394
@sbruens
Merge branch 'sbruens/proxy' into sbruens/proxy-protocol
37678cf
@sbruens
Use errors.Is().
9924713
@sbruens
Fix proxy post-merge.
c8d8332
@sbruens
Check if the command is UNKNOWN (v1) or LOCAL (v2).
827be3c
@sbruens
Add test scenarios for client addr.
2622b5e
@sbruens
Address review comments.
fe8bbdd
@sbruens
Use a mutex to ensure another user doesn't acquire a new closer while…
36a0a1d 
… we're closing it.
@sbruens
Move mutex up.
aeb2652
@sbruens
Manage the ref counting next to the listener creation.
8873b10
@sbruens
Do the lazy initialization inside an anonymous function.
899d13d
@sbruens
Fix concurrent access to acceptCh and closeCh.
80e5d49
@sbruens
Use / in key instead of -.
aa00f2e
@sbruens
Return error from stopping listeners.
e658b90
@sbruens
Use channels to ensure virtualPacketConns get closed.
fede4d8
@sbruens
Add more test cases for packet listeners.
4730d74
@sbruens
Merge branch 'sbruens/shared-listeners' into sbruens/proxy
30bbdfa
@sbruens
Merge branch 'sbruens/proxy' into sbruens/proxy-protocol
57d46a2
Base automatically changed from sbruens/proxy to master September 4, 2024 19:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fortuna fortuna fortuna requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@sbruens @fortuna