-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Feature socks udp associate #250
Open
Meteorite
wants to merge
8
commits into
jpillora:master
Choose a base branch
from
Meteorite:feature-socks-udp-associate
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b26d812
fix verbose flag setting to tunnel's logger
Meteorite cc9cbd1
add socks5 server implementation with udp associate support
Meteorite 8a65a5f
move socks server from outbound party to inbound, use local socks ser…
Meteorite ab740d3
Merge branch 'jpillora:master' into feature-socks-udp-associate
Meteorite f2c29b2
extract share/socks5 to a library github.com/meteorite/socks5
Meteorite 1b27102
rename according to PR review
Meteorite 639c06c
update deps to resolve PR conflict
Meteorite e0db485
Merge branch 'master' into feature-socks-udp-associate
Meteorite File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,135 @@ | ||
| package tunnel | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/gob" | ||
| "fmt" | ||
| "github.com/jpillora/chisel/share/cio" | ||
| "github.com/meteorite/scope" | ||
| "github.com/meteorite/socks5" | ||
| "golang.org/x/crypto/ssh" | ||
| "log" | ||
| "net" | ||
| ) | ||
|
|
||
| type socksHandler struct { | ||
| p *Proxy | ||
| udpLocalAddr *socks5.AddrSpec | ||
| sl *log.Logger | ||
| udp *socks5.SingleUDPPortAssociate | ||
| } | ||
|
|
||
| func newSocksHandler(p *Proxy, localUDPAddr *net.UDPAddr, sl *log.Logger) *socksHandler { | ||
| return &socksHandler{ | ||
| p: p, | ||
| udpLocalAddr: &socks5.AddrSpec{ | ||
| IP: localUDPAddr.IP, | ||
| Port: localUDPAddr.Port, | ||
| }, | ||
| sl: sl, | ||
| } | ||
| } | ||
|
|
||
| func (h *socksHandler) OnStartServe(ctxServer socks5.ContextGo, _ net.Listener) error { | ||
| h.udp = socks5.MakeSingleUDPPortAssociate(h.udpLocalAddr, h, h.sl) | ||
| return h.udp.ListenAndServeUDPPort(ctxServer, "udp") | ||
| } | ||
|
|
||
| func (h *socksHandler) ErrLog() socks5.ErrorLogger { | ||
| return h.sl | ||
| } | ||
|
|
||
| func (h *socksHandler) OnConnect(ctx context.Context, conn net.Conn, req *socks5.Request) error { | ||
| return h.p.pipeRemote(ctx, conn, req.DestAddr.Address()+"/sot", func(dst ssh.Channel) error { | ||
| code := []byte{0} | ||
| _, err := dst.Read(code) | ||
| if err != nil { | ||
| return fmt.Errorf("can't receive socks code from server: %w", err) | ||
| } | ||
| if code[0] != socks5.ReplySucceeded { | ||
| if err = req.SendError(conn, code[0]); err != nil { | ||
| return fmt.Errorf("failed to send reply to client: %w", err) | ||
| } | ||
| return fmt.Errorf("can't connect to destination server (code: %d)", code[0]) | ||
| } | ||
| if err := req.SendConnectSuccess(conn); err != nil { | ||
| return fmt.Errorf("failed to send reply to client: %w", err) | ||
| } | ||
| return nil | ||
| }) | ||
| } | ||
|
|
||
| func (h *socksHandler) OnAssociate(_ context.Context, conn net.Conn, _ *socks5.Request) error { | ||
| return h.udp.OnAssociate(conn) | ||
| } | ||
|
|
||
| func (h *socksHandler) MaxUDPPacketSize() uint { | ||
| return maxMTU | ||
| } | ||
|
|
||
|
|
||
| type socksUdpConnector struct { | ||
| *cio.Logger | ||
| outbound *udpChannel | ||
| } | ||
|
|
||
| func (h *socksHandler) MakeRemoteUDPConn( | ||
| ctxClient socks5.ContextGo, _ socks5.ContextGo, sendBack socks5.UDPSendBack, onBroken func(), | ||
| ) (socks5.RemoteUDPConn, error) { | ||
| sshConn := h.p.sshTun.getSSH(ctxClient.Ctx()) | ||
| if sshConn == nil { | ||
| return nil, fmt.Errorf("ssh-conn nil") | ||
| } | ||
| dstSpec := "/sou" //just "/sou" since the remote destination address is sent with each packet | ||
| rwc, reqs, err := sshConn.OpenChannel("chisel", []byte(dstSpec)) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("ssh-chan error: %w", err) | ||
| } | ||
| ctxClient.GoNoError(func() { ssh.DiscardRequests(reqs) }) | ||
|
|
||
| c := &socksUdpConnector{ | ||
| Logger: h.p.Logger, | ||
| outbound: &udpChannel{ | ||
| r: gob.NewDecoder(rwc), | ||
| w: gob.NewEncoder(rwc), | ||
| c: rwc, | ||
| }, | ||
| } | ||
| ctxClient.GoNoError(func() { | ||
| defer onBroken() | ||
| defer scope.Closer(ctxClient.Ctx(), c.outbound.c).Close() | ||
|
|
||
| for { | ||
| //receive from channel, including source address | ||
| p := udpPacket{} | ||
| c.Debugf("reading next udp packet from ssh channel to remote") | ||
| if err := c.outbound.decode(&p); err != nil { | ||
| c.Debugf("decode error: %s", err) | ||
| return | ||
| } | ||
|
|
||
| //parse source address | ||
| fromAddr, err := socks5.ParseHostPort(p.Src) | ||
| if err != nil { | ||
| c.Debugf("error parsing received packet source spec: %s: %s", p.Src, err) | ||
| continue | ||
| } | ||
|
|
||
| //write back to inbound udp | ||
| err = sendBack(fromAddr, p.Payload) | ||
| if err != nil { | ||
| c.Debugf("send back error: %s", err) | ||
| return | ||
| } | ||
| } | ||
| }) | ||
| c.Debugf("new ssh channel for udp is created") | ||
| return c, nil | ||
| } | ||
|
|
||
| func (c *socksUdpConnector) Send(_ context.Context, data []byte, remoteAddr *socks5.AddrSpec) error { | ||
| return c.outbound.encode(remoteAddr.Address(), data) | ||
| } | ||
| func (c *socksUdpConnector) Close() error { | ||
| return c.outbound.c.Close() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please
go mod tidyThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Already did it.
testifyis here ingo.sum, because new dependencies (github.com/meteorite/scopeandgithub.com/meteorite/socks5) use it for their tests:so, it is a transitive dependency (needed to do
go test all). Note, it is not ingo.mod.