Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
go-mmproxy
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
hdacloud
go-mmproxy
Commits
dcb98863
Commit
dcb98863
authored
1 year ago
by
Konrad Zemek
Browse files
Options
Downloads
Patches
Plain Diff
Fix parsing addresses.
parent
68755bf0
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
main.go
+22
-10
22 additions, 10 deletions
main.go
tcp.go
+3
-3
3 additions, 3 deletions
tcp.go
udp.go
+3
-3
3 additions, 3 deletions
udp.go
with
28 additions
and
16 deletions
main.go
+
22
−
10
View file @
dcb98863
...
@@ -17,9 +17,12 @@ import (
...
@@ -17,9 +17,12 @@ import (
type
options
struct
{
type
options
struct
{
Protocol
string
Protocol
string
ListenAddr
string
ListenAddrStr
string
TargetAddr4
string
TargetAddr4Str
string
TargetAddr6
string
TargetAddr6Str
string
ListenAddr
netip
.
AddrPort
TargetAddr4
netip
.
AddrPort
TargetAddr6
netip
.
AddrPort
Mark
int
Mark
int
Verbose
int
Verbose
int
allowedSubnetsPath
string
allowedSubnetsPath
string
...
@@ -34,9 +37,9 @@ var Opts options
...
@@ -34,9 +37,9 @@ var Opts options
func
init
()
{
func
init
()
{
flag
.
StringVar
(
&
Opts
.
Protocol
,
"p"
,
"tcp"
,
"Protocol that will be proxied: tcp, udp"
)
flag
.
StringVar
(
&
Opts
.
Protocol
,
"p"
,
"tcp"
,
"Protocol that will be proxied: tcp, udp"
)
flag
.
StringVar
(
&
Opts
.
ListenAddr
,
"l"
,
"0.0.0.0:8443"
,
"Address the proxy listens on"
)
flag
.
StringVar
(
&
Opts
.
ListenAddr
Str
,
"l"
,
"0.0.0.0:8443"
,
"Address the proxy listens on"
)
flag
.
StringVar
(
&
Opts
.
TargetAddr4
,
"4"
,
"127.0.0.1:443"
,
"Address to which IPv4 traffic will be forwarded to"
)
flag
.
StringVar
(
&
Opts
.
TargetAddr4
Str
,
"4"
,
"127.0.0.1:443"
,
"Address to which IPv4 traffic will be forwarded to"
)
flag
.
StringVar
(
&
Opts
.
TargetAddr6
,
"6"
,
"[::1]:443"
,
"Address to which IPv6 traffic will be forwarded to"
)
flag
.
StringVar
(
&
Opts
.
TargetAddr6
Str
,
"6"
,
"[::1]:443"
,
"Address to which IPv6 traffic will be forwarded to"
)
flag
.
IntVar
(
&
Opts
.
Mark
,
"mark"
,
0
,
"The mark that will be set on outbound packets"
)
flag
.
IntVar
(
&
Opts
.
Mark
,
"mark"
,
0
,
"The mark that will be set on outbound packets"
)
flag
.
IntVar
(
&
Opts
.
Verbose
,
"v"
,
0
,
`0 - no logging of individual connections
flag
.
IntVar
(
&
Opts
.
Verbose
,
"v"
,
0
,
`0 - no logging of individual connections
1 - log errors occurring in individual connections
1 - log errors occurring in individual connections
...
@@ -50,7 +53,7 @@ func init() {
...
@@ -50,7 +53,7 @@ func init() {
func
listen
(
listenerNum
int
,
errors
chan
<-
error
)
{
func
listen
(
listenerNum
int
,
errors
chan
<-
error
)
{
logger
:=
Opts
.
Logger
.
With
(
slog
.
Int
(
"listenerNum"
,
listenerNum
),
logger
:=
Opts
.
Logger
.
With
(
slog
.
Int
(
"listenerNum"
,
listenerNum
),
slog
.
String
(
"protocol"
,
Opts
.
Protocol
),
slog
.
String
(
"listenAdr"
,
Opts
.
ListenAddr
))
slog
.
String
(
"protocol"
,
Opts
.
Protocol
),
slog
.
String
(
"listenAdr"
,
Opts
.
ListenAddr
.
String
()
))
listenConfig
:=
net
.
ListenConfig
{}
listenConfig
:=
net
.
ListenConfig
{}
if
Opts
.
Listeners
>
1
{
if
Opts
.
Listeners
>
1
{
...
@@ -126,20 +129,29 @@ func main() {
...
@@ -126,20 +129,29 @@ func main() {
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
if
_
,
err
:=
netip
.
ParseAddr
(
Opts
.
ListenAddr
);
err
!=
nil
{
var
err
error
if
Opts
.
ListenAddr
,
err
=
netip
.
ParseAddrPort
(
Opts
.
ListenAddrStr
);
err
!=
nil
{
Opts
.
Logger
.
Error
(
"listen address is malformed"
,
"error"
,
err
)
Opts
.
Logger
.
Error
(
"listen address is malformed"
,
"error"
,
err
)
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
if
_
,
err
:
=
netip
.
ParseAddr
(
Opts
.
TargetAddr4
);
err
!=
nil
{
if
Opts
.
TargetAddr4
,
err
=
netip
.
ParseAddr
Port
(
Opts
.
TargetAddr4
Str
);
err
!=
nil
{
Opts
.
Logger
.
Error
(
"ipv4 target address is malformed"
,
"error"
,
err
)
Opts
.
Logger
.
Error
(
"ipv4 target address is malformed"
,
"error"
,
err
)
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
if
!
Opts
.
TargetAddr4
.
Addr
()
.
Is4
()
{
Opts
.
Logger
.
Error
(
"ipv4 target address is not IPv4"
)
os
.
Exit
(
1
)
}
if
_
,
err
:
=
netip
.
ParseAddr
(
Opts
.
TargetAddr6
);
err
!=
nil
{
if
Opts
.
TargetAddr6
,
err
=
netip
.
ParseAddr
Port
(
Opts
.
TargetAddr6
Str
);
err
!=
nil
{
Opts
.
Logger
.
Error
(
"ipv6 target address is malformed"
,
"error"
,
err
)
Opts
.
Logger
.
Error
(
"ipv6 target address is malformed"
,
"error"
,
err
)
os
.
Exit
(
1
)
os
.
Exit
(
1
)
}
}
if
!
Opts
.
TargetAddr6
.
Addr
()
.
Is6
()
{
Opts
.
Logger
.
Error
(
"ipv6 target address is not IPv6"
)
os
.
Exit
(
1
)
}
if
Opts
.
udpCloseAfter
<
0
{
if
Opts
.
udpCloseAfter
<
0
{
Opts
.
Logger
.
Error
(
"--close-after has to be >= 0"
,
slog
.
Int
(
"close-after"
,
Opts
.
udpCloseAfter
))
Opts
.
Logger
.
Error
(
"--close-after has to be >= 0"
,
slog
.
Int
(
"close-after"
,
Opts
.
udpCloseAfter
))
...
...
This diff is collapsed.
Click to expand it.
tcp.go
+
3
−
3
View file @
dcb98863
...
@@ -63,7 +63,7 @@ func tcpHandleConnection(conn net.Conn, logger *slog.Logger) {
...
@@ -63,7 +63,7 @@ func tcpHandleConnection(conn net.Conn, logger *slog.Logger) {
if
saddr
!=
nil
{
if
saddr
!=
nil
{
clientAddr
=
saddr
.
String
()
clientAddr
=
saddr
.
String
()
}
}
logger
=
logger
.
With
(
slog
.
String
(
"clientAddr"
,
clientAddr
),
slog
.
String
(
"targetAddr"
,
targetAddr
))
logger
=
logger
.
With
(
slog
.
String
(
"clientAddr"
,
clientAddr
),
slog
.
String
(
"targetAddr"
,
targetAddr
.
String
()
))
if
Opts
.
Verbose
>
1
{
if
Opts
.
Verbose
>
1
{
logger
.
Debug
(
"successfully parsed PROXY header"
)
logger
.
Debug
(
"successfully parsed PROXY header"
)
}
}
...
@@ -72,7 +72,7 @@ func tcpHandleConnection(conn net.Conn, logger *slog.Logger) {
...
@@ -72,7 +72,7 @@ func tcpHandleConnection(conn net.Conn, logger *slog.Logger) {
if
saddr
!=
nil
{
if
saddr
!=
nil
{
dialer
.
Control
=
DialUpstreamControl
(
saddr
.
(
*
net
.
TCPAddr
)
.
Port
)
dialer
.
Control
=
DialUpstreamControl
(
saddr
.
(
*
net
.
TCPAddr
)
.
Port
)
}
}
upstreamConn
,
err
:=
dialer
.
Dial
(
"tcp"
,
targetAddr
)
upstreamConn
,
err
:=
dialer
.
Dial
(
"tcp"
,
targetAddr
.
String
()
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Debug
(
"failed to establish upstream connection"
,
"error"
,
err
,
slog
.
Bool
(
"dropConnection"
,
true
))
logger
.
Debug
(
"failed to establish upstream connection"
,
"error"
,
err
,
slog
.
Bool
(
"dropConnection"
,
true
))
return
return
...
@@ -122,7 +122,7 @@ func tcpHandleConnection(conn net.Conn, logger *slog.Logger) {
...
@@ -122,7 +122,7 @@ func tcpHandleConnection(conn net.Conn, logger *slog.Logger) {
func
TCPListen
(
listenConfig
*
net
.
ListenConfig
,
logger
*
slog
.
Logger
,
errors
chan
<-
error
)
{
func
TCPListen
(
listenConfig
*
net
.
ListenConfig
,
logger
*
slog
.
Logger
,
errors
chan
<-
error
)
{
ctx
:=
context
.
Background
()
ctx
:=
context
.
Background
()
ln
,
err
:=
listenConfig
.
Listen
(
ctx
,
"tcp"
,
Opts
.
ListenAddr
)
ln
,
err
:=
listenConfig
.
Listen
(
ctx
,
"tcp"
,
Opts
.
ListenAddr
.
String
()
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Error
(
"failed to bind listener"
,
"error"
,
err
)
logger
.
Error
(
"failed to bind listener"
,
"error"
,
err
)
errors
<-
err
errors
<-
err
...
...
This diff is collapsed.
Click to expand it.
udp.go
+
3
−
3
View file @
dcb98863
...
@@ -98,7 +98,7 @@ func udpGetSocketFromMap(downstream net.PacketConn, downstreamAddr, saddr net.Ad
...
@@ -98,7 +98,7 @@ func udpGetSocketFromMap(downstream net.PacketConn, downstreamAddr, saddr net.Ad
targetAddr
=
Opts
.
TargetAddr4
targetAddr
=
Opts
.
TargetAddr4
}
}
logger
=
logger
.
With
(
slog
.
String
(
"downstreamAddr"
,
downstreamAddr
.
String
()),
slog
.
String
(
"targetAddr"
,
targetAddr
))
logger
=
logger
.
With
(
slog
.
String
(
"downstreamAddr"
,
downstreamAddr
.
String
()),
slog
.
String
(
"targetAddr"
,
targetAddr
.
String
()
))
dialer
:=
net
.
Dialer
{
LocalAddr
:
saddr
}
dialer
:=
net
.
Dialer
{
LocalAddr
:
saddr
}
if
saddr
!=
nil
{
if
saddr
!=
nil
{
logger
=
logger
.
With
(
slog
.
String
(
"clientAddr"
,
saddr
.
String
()))
logger
=
logger
.
With
(
slog
.
String
(
"clientAddr"
,
saddr
.
String
()))
...
@@ -109,7 +109,7 @@ func udpGetSocketFromMap(downstream net.PacketConn, downstreamAddr, saddr net.Ad
...
@@ -109,7 +109,7 @@ func udpGetSocketFromMap(downstream net.PacketConn, downstreamAddr, saddr net.Ad
logger
.
Debug
(
"new connection"
)
logger
.
Debug
(
"new connection"
)
}
}
conn
,
err
:=
dialer
.
Dial
(
"udp"
,
targetAddr
)
conn
,
err
:=
dialer
.
Dial
(
"udp"
,
targetAddr
.
String
()
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Debug
(
"failed to connect to upstream"
,
"error"
,
err
)
logger
.
Debug
(
"failed to connect to upstream"
,
"error"
,
err
)
return
nil
,
err
return
nil
,
err
...
@@ -132,7 +132,7 @@ func udpGetSocketFromMap(downstream net.PacketConn, downstreamAddr, saddr net.Ad
...
@@ -132,7 +132,7 @@ func udpGetSocketFromMap(downstream net.PacketConn, downstreamAddr, saddr net.Ad
func
UDPListen
(
listenConfig
*
net
.
ListenConfig
,
logger
*
slog
.
Logger
,
errors
chan
<-
error
)
{
func
UDPListen
(
listenConfig
*
net
.
ListenConfig
,
logger
*
slog
.
Logger
,
errors
chan
<-
error
)
{
ctx
:=
context
.
Background
()
ctx
:=
context
.
Background
()
ln
,
err
:=
listenConfig
.
ListenPacket
(
ctx
,
"udp"
,
Opts
.
ListenAddr
)
ln
,
err
:=
listenConfig
.
ListenPacket
(
ctx
,
"udp"
,
Opts
.
ListenAddr
.
String
()
)
if
err
!=
nil
{
if
err
!=
nil
{
logger
.
Error
(
"failed to bind listener"
,
"error"
,
err
)
logger
.
Error
(
"failed to bind listener"
,
"error"
,
err
)
errors
<-
err
errors
<-
err
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment