Shadowsocks in Go (#220), fixes #211

2020-08-20 19:19:54 -04:00
parent b10a476622
commit c614a192a4
11 changed files with 53 additions and 238 deletions
--- a/2
+++ b/2
@@ -101,8 +101,6 @@ ENTRYPOINT ["/entrypoint"]
 EXPOSE 8000/tcp 8888/tcp 8388/tcp 8388/udp
 HEALTHCHECK --interval=10m --timeout=10s --start-period=30s --retries=2 CMD /entrypoint healthcheck
 RUN apk add -q --progress --no-cache --update openvpn ca-certificates iptables ip6tables unbound tinyproxy tzdata && \
-    echo "http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories && \
-    apk add -q --progress --no-cache --update shadowsocks-libev && \
    rm -rf /var/cache/apk/* /etc/unbound/* /usr/sbin/unbound-* /etc/tinyproxy/tinyproxy.conf && \
    deluser openvpn && \
    deluser tinyproxy && \
--- a/README.md
+++ b/README.md
@@ -227,7 +227,7 @@ That one is important if you want to connect to the container from your LAN for
 | `SHADOWSOCKS_LOG` | `off` | `on`, `off` | Enable logging |
 | `SHADOWSOCKS_PORT` | `8388` | `1024` to `65535` | Internal port number for Shadowsocks to listen on |
 | `SHADOWSOCKS_PASSWORD` | |  | Password to use to connect to Shadowsocks |
-| `SHADOWSOCKS_METHOD` | `chacha20-ietf-poly1305` | One of [these ciphers](https://shadowsocks.org/en/config/quick-guide.html) | Method to use for Shadowsocks |
+| `SHADOWSOCKS_METHOD` | `chacha20-ietf-poly1305` | `chacha20-ietf-poly1305`, `aes-128-gcm`, `aes-256-gcm` | Method to use for Shadowsocks |

 ### Tinyproxy

--- a/cmd/gluetun/main.go
+++ b/cmd/gluetun/main.go
@@ -69,7 +69,6 @@ func _main(background context.Context, args []string) int {
 	routingConf := routing.NewRouting(logger, fileManager)
 	firewallConf := firewall.NewConfigurator(logger, routingConf, fileManager)
 	tinyProxyConf := tinyproxy.NewConfigurator(fileManager, logger)
-	shadowsocksConf := shadowsocks.NewConfigurator(fileManager, logger)
 	streamMerger := command.NewStreamMerger()

 	paramsReader := params.NewReader(logger, fileManager)
@@ -79,11 +78,10 @@ func _main(background context.Context, args []string) int {
 		paramsReader.GetBuildDate()))

 	printVersions(ctx, logger, map[string]func(ctx context.Context) (string, error){
-		"OpenVPN":     ovpnConf.Version,
-		"Unbound":     dnsConf.Version,
-		"IPtables":    firewallConf.Version,
-		"TinyProxy":   tinyProxyConf.Version,
-		"ShadowSocks": shadowsocksConf.Version,
+		"OpenVPN":   ovpnConf.Version,
+		"Unbound":   dnsConf.Version,
+		"IPtables":  firewallConf.Version,
+		"TinyProxy": tinyProxyConf.Version,
 	})

 	allSettings, err := settings.GetAllSettings(paramsReader)
@@ -170,7 +168,7 @@ func _main(background context.Context, args []string) int {
 	restartTinyproxy := tinyproxyLooper.Restart
 	go tinyproxyLooper.Run(ctx, wg)

-	shadowsocksLooper := shadowsocks.NewLooper(shadowsocksConf, firewallConf, allSettings.ShadowSocks, allSettings.DNS, logger, streamMerger, uid, gid, defaultInterface)
+	shadowsocksLooper := shadowsocks.NewLooper(firewallConf, allSettings.ShadowSocks, logger, defaultInterface)
 	restartShadowsocks := shadowsocksLooper.Restart
 	go shadowsocksLooper.Run(ctx, wg)

--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/golang/mock v1.4.4
 	github.com/kyokomi/emoji v2.2.4+incompatible
 	github.com/qdm12/golibs v0.0.0-20200712151944-a0325873bf5a
+	github.com/qdm12/ss-server v0.0.0-20200819005413-6b516c299307
 	github.com/stretchr/testify v1.6.1
 	golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed
 )
--- a/go.sum
+++ b/go.sum
@@ -74,6 +74,10 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/qdm12/golibs v0.0.0-20200712151944-a0325873bf5a h1:IyS72qFm+iXipadmUKXmpJScKXXK2GrD8yYfxXsnIYs=
 github.com/qdm12/golibs v0.0.0-20200712151944-a0325873bf5a/go.mod h1:pikkTN7g7zRuuAnERwqW1yAFq6pYmxrxpjiwGvb0Ysc=
+github.com/qdm12/ss-server v0.0.0-20200819005413-6b516c299307 h1:+LhVxIKpZgUM8ZcopIuc3Yjk+p76dWRdYLQiAA7caZM=
+github.com/qdm12/ss-server v0.0.0-20200819005413-6b516c299307/go.mod h1:ABVUkxubboL3vqBkOwDV9glX1/x7SnYrckBe5d+M/zw=
+github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3 h1:f/FNXud6gA3MNr8meMVVGxhp+QBTqY91tM8HjEuMjGg=
+github.com/riobard/go-bloom v0.0.0-20200614022211-cdc8013cb5b3/go.mod h1:HgjTstvQsPGkxUsCd2KWxErBblirPizecHcpD3ffK+s=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
--- a/internal/shadowsocks/command.go
+++ b/internal/shadowsocks/command.go
@@ -1,41 +0,0 @@
-package shadowsocks
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/qdm12/gluetun/internal/constants"
-)
-
-func (c *configurator) Start(ctx context.Context, server string, port uint16, password string, log bool) (stdout, stderr io.ReadCloser, waitFn func() error, err error) {
-	c.logger.Info("starting shadowsocks server")
-	args := []string{
-		"-c", string(constants.ShadowsocksConf),
-		"-p", fmt.Sprintf("%d", port),
-		"-k", password,
-	}
-	if log {
-		args = append(args, "-v")
-	}
-	stdout, stderr, waitFn, err = c.commander.Start(ctx, "ss-server", args...)
-	return stdout, stderr, waitFn, err
-}
-
-// Version obtains the version of the installed shadowsocks server
-func (c *configurator) Version(ctx context.Context) (string, error) {
-	output, err := c.commander.Run(ctx, "ss-server", "-h")
-	if err != nil {
-		return "", err
-	}
-	lines := strings.Split(output, "\n")
-	if len(lines) < 2 {
-		return "", fmt.Errorf("ss-server -h: not enough lines in %q", output)
-	}
-	words := strings.Fields(lines[1])
-	if len(words) < 2 {
-		return "", fmt.Errorf("ss-server -h: line 2 is too short: %q", lines[1])
-	}
-	return words[1], nil
-}
--- a/internal/shadowsocks/conf.go
+++ b/internal/shadowsocks/conf.go
@@ -1,51 +0,0 @@
-package shadowsocks
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/golibs/files"
-)
-
-func (c *configurator) MakeConf(port uint16, password, method, nameserver string, uid, gid int) (err error) {
-	c.logger.Info("generating configuration file")
-	data := generateConf(port, password, method, nameserver)
-	return c.fileManager.WriteToFile(
-		string(constants.ShadowsocksConf),
-		data,
-		files.Ownership(uid, gid),
-		files.Permissions(0400))
-}
-
-func generateConf(port uint16, password, method, nameserver string) (data []byte) {
-	conf := struct {
-		Server       string            `json:"server"`
-		User         string            `json:"user"`
-		Method       string            `json:"method"`
-		Timeout      uint              `json:"timeout"`
-		FastOpen     bool              `json:"fast_open"`
-		Mode         string            `json:"mode"`
-		PortPassword map[string]string `json:"port_password"`
-		Workers      uint              `json:"workers"`
-		Interface    string            `json:"interface"`
-		Nameserver   *string           `json:"nameserver,omitempty"`
-	}{
-		Server:   "0.0.0.0",
-		User:     "nonrootuser",
-		Method:   method,
-		Timeout:  30,
-		FastOpen: false,
-		Mode:     "tcp_and_udp",
-		PortPassword: map[string]string{
-			fmt.Sprintf("%d", port): password,
-		},
-		Workers:   2,
-		Interface: "tun",
-	}
-	if len(nameserver) > 0 {
-		conf.Nameserver = &nameserver
-	}
-	data, _ = json.Marshal(conf)
-	return data
-}
--- a/internal/shadowsocks/conf_test.go
+++ b/internal/shadowsocks/conf_test.go
@@ -1,81 +0,0 @@
-package shadowsocks
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/golang/mock/gomock"
-	"github.com/qdm12/gluetun/internal/constants"
-	"github.com/qdm12/golibs/files"
-	"github.com/qdm12/golibs/files/mock_files"
-	"github.com/qdm12/golibs/logging/mock_logging"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func Test_generateConf(t *testing.T) {
-	t.Parallel()
-	tests := map[string]struct {
-		port       uint16
-		password   string
-		nameserver string
-		data       []byte
-	}{
-		"no data": {
-			data: []byte(`{"server":"0.0.0.0","user":"nonrootuser","method":"chacha20-ietf-poly1305","timeout":30,"fast_open":false,"mode":"tcp_and_udp","port_password":{"0":""},"workers":2,"interface":"tun"}`),
-		},
-		"data": {
-			port:       2000,
-			password:   "abcde",
-			nameserver: "127.0.0.1",
-			data:       []byte(`{"server":"0.0.0.0","user":"nonrootuser","method":"chacha20-ietf-poly1305","timeout":30,"fast_open":false,"mode":"tcp_and_udp","port_password":{"2000":"abcde"},"workers":2,"interface":"tun","nameserver":"127.0.0.1"}`),
-		},
-	}
-	for name, tc := range tests {
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			data := generateConf(tc.port, tc.password, "chacha20-ietf-poly1305", tc.nameserver)
-			assert.Equal(t, tc.data, data)
-		})
-	}
-}
-
-func Test_MakeConf(t *testing.T) {
-	t.Parallel()
-	tests := map[string]struct {
-		writeErr error
-		err      error
-	}{
-		"no write error": {},
-		"write error": {
-			writeErr: fmt.Errorf("error"),
-			err:      fmt.Errorf("error"),
-		},
-	}
-	for name, tc := range tests {
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			mockCtrl := gomock.NewController(t)
-			defer mockCtrl.Finish()
-			logger := mock_logging.NewMockLogger(mockCtrl)
-			logger.EXPECT().Info("generating configuration file").Times(1)
-			fileManager := mock_files.NewMockFileManager(mockCtrl)
-			fileManager.EXPECT().WriteToFile(
-				string(constants.ShadowsocksConf),
-				[]byte(`{"server":"0.0.0.0","user":"nonrootuser","method":"chacha20-ietf-poly1305","timeout":30,"fast_open":false,"mode":"tcp_and_udp","port_password":{"2000":"abcde"},"workers":2,"interface":"tun","nameserver":"127.0.0.1"}`),
-				gomock.AssignableToTypeOf(files.Ownership(0, 0)),
-				gomock.AssignableToTypeOf(files.Ownership(0, 0)),
-			).Return(tc.writeErr).Times(1)
-			c := &configurator{logger: logger, fileManager: fileManager}
-			err := c.MakeConf(2000, "abcde", "chacha20-ietf-poly1305", "127.0.0.1", 1000, 1001)
-			if tc.err != nil {
-				require.Error(t, err)
-				assert.Equal(t, tc.err.Error(), err.Error())
-			} else {
-				assert.NoError(t, err)
-			}
-		})
-	}
-}
--- a/internal/shadowsocks/logadapter.go
+++ b/internal/shadowsocks/logadapter.go
@@ -0,0 +1,32 @@
+package shadowsocks
+
+import "github.com/qdm12/golibs/logging"
+
+type logAdapter struct {
+	logger  logging.Logger
+	enabled bool
+}
+
+func (l *logAdapter) Info(s string) {
+	if l.enabled {
+		l.logger.Info(s)
+	}
+}
+
+func (l *logAdapter) Debug(s string) {
+	if l.enabled {
+		l.logger.Debug(s)
+	}
+}
+func (l *logAdapter) Error(s string) {
+	if l.enabled {
+		l.logger.Error(s)
+	}
+}
+
+func adaptLogger(logger logging.Logger, enabled bool) *logAdapter {
+	return &logAdapter{
+		logger:  logger,
+		enabled: enabled,
+	}
+}
--- a/internal/shadowsocks/loop.go
+++ b/internal/shadowsocks/loop.go
@@ -2,13 +2,14 @@ package shadowsocks

 import (
 	"context"
+	"fmt"
 	"sync"
 	"time"

 	"github.com/qdm12/gluetun/internal/firewall"
 	"github.com/qdm12/gluetun/internal/settings"
-	"github.com/qdm12/golibs/command"
 	"github.com/qdm12/golibs/logging"
+	shadowsockslib "github.com/qdm12/ss-server/pkg"
 )

 type Looper interface {
@@ -21,15 +22,10 @@ type Looper interface {
 }

 type looper struct {
-	conf             Configurator
 	firewallConf     firewall.Configurator
 	settings         settings.ShadowSocks
 	settingsMutex    sync.RWMutex
-	dnsSettings      settings.DNS // TODO
 	logger           logging.Logger
-	streamMerger     command.StreamMerger
-	uid              int
-	gid              int
 	defaultInterface string
 	restart          chan struct{}
 	start            chan struct{}
@@ -44,17 +40,12 @@ func (l *looper) logAndWait(ctx context.Context, err error) {
 	<-ctx.Done()
 }

-func NewLooper(conf Configurator, firewallConf firewall.Configurator, settings settings.ShadowSocks, dnsSettings settings.DNS,
-	logger logging.Logger, streamMerger command.StreamMerger, uid, gid int, defaultInterface string) Looper {
+func NewLooper(firewallConf firewall.Configurator, settings settings.ShadowSocks,
+	logger logging.Logger, defaultInterface string) Looper {
 	return &looper{
-		conf:             conf,
 		firewallConf:     firewallConf,
 		settings:         settings,
-		dnsSettings:      dnsSettings,
 		logger:           logger.WithPrefix("shadowsocks: "),
-		streamMerger:     streamMerger,
-		uid:              uid,
-		gid:              gid,
 		defaultInterface: defaultInterface,
 		restart:          make(chan struct{}),
 		start:            make(chan struct{}),
@@ -126,12 +117,8 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
 			}
 		}

-		nameserver := l.dnsSettings.PlaintextAddress.String()
-		if l.dnsSettings.Enabled {
-			nameserver = "127.0.0.1"
-		}
 		settings := l.GetSettings()
-		err := l.conf.MakeConf(settings.Port, settings.Password, settings.Method, nameserver, l.uid, l.gid)
+		server, err := shadowsockslib.NewServer(settings.Method, settings.Password, adaptLogger(l.logger, settings.Log))
 		if err != nil {
 			l.logAndWait(ctx, err)
 			continue
@@ -150,19 +137,16 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup) {
 		previousPort = settings.Port

 		shadowsocksCtx, shadowsocksCancel := context.WithCancel(context.Background())
-		stdout, stderr, waitFn, err := l.conf.Start(shadowsocksCtx, "0.0.0.0", settings.Port, settings.Password, settings.Log)
+
+		waitError := make(chan error)
+		go func() {
+			waitError <- server.Listen(shadowsocksCtx, fmt.Sprintf("0.0.0.0:%d", settings.Port))
+		}()
 		if err != nil {
 			shadowsocksCancel()
 			l.logAndWait(ctx, err)
 			continue
 		}
-		go l.streamMerger.Merge(shadowsocksCtx, stdout, command.MergeName("shadowsocks"))
-		go l.streamMerger.Merge(shadowsocksCtx, stderr, command.MergeName("shadowsocks error"))
-		waitError := make(chan error)
-		go func() {
-			err := waitFn() // blocking
-			waitError <- err
-		}()

 		stayHere := true
 		for stayHere {
--- a/internal/shadowsocks/shadowsocks.go
+++ b/internal/shadowsocks/shadowsocks.go
@@ -1,29 +0,0 @@
-package shadowsocks
-
-import (
-	"context"
-	"io"
-
-	"github.com/qdm12/golibs/command"
-	"github.com/qdm12/golibs/files"
-	"github.com/qdm12/golibs/logging"
-)
-
-type Configurator interface {
-	Version(ctx context.Context) (string, error)
-	MakeConf(port uint16, password, method, nameserver string, uid, gid int) (err error)
-	Start(ctx context.Context, server string, port uint16, password string, log bool) (stdout, stderr io.ReadCloser, waitFn func() error, err error)
-}
-
-type configurator struct {
-	fileManager files.FileManager
-	logger      logging.Logger
-	commander   command.Commander
-}
-
-func NewConfigurator(fileManager files.FileManager, logger logging.Logger) Configurator {
-	return &configurator{
-		fileManager: fileManager,
-		logger:      logger.WithPrefix("shadowsocks configurator: "),
-		commander:   command.NewCommander()}
-}