vanja/gluetun
1
0
Fork 0
mirror of https://github.com/qdm12/gluetun.git synced 2026-07-22 18:36:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

PR review feedback

Browse Source
This commit is contained in:
Quentin McGaw
2026-05-19 15:18:37 +00:00
parent a0a60fbab1
commit 4c735bc558
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+1 -1
View File
@@ -276,7 +276,7 @@ ENV VPN_SERVICE_PROVIDER=pia \
PUID=1000 \ PUID=1000 \
PGID=1000 PGID=1000
ENTRYPOINT ["/gluetun-entrypoint"] ENTRYPOINT ["/gluetun-entrypoint"]
EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp 1080/tcp
HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=3 CMD /gluetun-entrypoint healthcheck HEALTHCHECK --interval=5s --timeout=5s --start-period=10s --retries=3 CMD /gluetun-entrypoint healthcheck
ARG TARGETPLATFORM ARG TARGETPLATFORM
RUN apk add --no-cache --update -l wget && \ RUN apk add --no-cache --update -l wget && \
cmd/gluetun/main.go
+1
View File
@@ -413,6 +413,7 @@ func _main(ctx context.Context, buildInfo models.BuildInformation,
} }
socks5Loop := socks5.NewLoop(socks5.Settings{ socks5Loop := socks5.NewLoop(socks5.Settings{
Enabled: *allSettings.Socks5.Enabled,
Username: *allSettings.Socks5.Username, Username: *allSettings.Socks5.Username,
Password: *allSettings.Socks5.Password, Password: *allSettings.Socks5.Password,
Address: allSettings.Socks5.ListeningAddress, Address: allSettings.Socks5.ListeningAddress,
internal/socks5/response.go
+2 -2
View File
@@ -33,7 +33,7 @@ func (c *socksConn) encodeSuccessResponse(writer io.Writer, socksVersion byte,
) (err error) { ) (err error) {
bindData, err := encodeBindData(bindAddrType, bindAddress, bindPort) bindData, err := encodeBindData(bindAddrType, bindAddress, bindPort)
if err != nil { if err != nil {
return err return fmt.Errorf("encoding bind data: %w", err)
} }
const initialPacketLength = 3 const initialPacketLength = 3
@@ -46,7 +46,7 @@ func (c *socksConn) encodeSuccessResponse(writer io.Writer, socksVersion byte,
_, err = writer.Write(packet) _, err = writer.Write(packet)
if err != nil { if err != nil {
c.logger.Warnf("failed writing success response: %s", err) return fmt.Errorf("writing packet: %w", err)
} }
return nil return nil
} }
internal/socks5/socks5.go
+4 -1
View File
@@ -218,9 +218,12 @@ func decodeRequest(reader io.Reader, expectedVersion byte) (req request, err err
} }
version := header[0] version := header[0]
if header[0] != expectedVersion { switch {
case version != expectedVersion:
return request{}, fmt.Errorf("version is not supported: expected %d and got %d", return request{}, fmt.Errorf("version is not supported: expected %d and got %d",
expectedVersion, version) expectedVersion, version)
case header[2] != 0:
return request{}, fmt.Errorf("reserved header byte must be 0 but got %d", header[2])
} }
req.command = cmdType(header[1]) req.command = cmdType(header[1])