go-gost/gost
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update config

Browse Source
This commit is contained in:
ginuerzh
2022-01-03 23:45:49 +08:00
parent 14537d16ea
commit 566e930010
42 changed files with 412 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/connector/http/connector.go
View File

@ -23,6 +23,7 @@ func init() {
}
type httpConnector struct {
user *url.Userinfo
md metadata
logger logger.Logger
}
@ -34,6 +35,7 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &httpConnector{
user: options.User,
logger: options.Logger,
}
}
@ -65,7 +67,7 @@ func (c *httpConnector) Connect(ctx context.Context, conn net.Conn, network, add
}
req.Header.Set("Proxy-Connection", "keep-alive")
if user := c.md.User; user != nil {
if user := c.user; user != nil {
u := user.Username()
p, _ := user.Password()
req.Header.Set("Proxy-Authorization",

12
pkg/connector/http/metadata.go
View File

@ -2,8 +2,6 @@ package http
import (
"net/http"
"net/url"
"strings"
"time"
mdata "github.com/go-gost/gost/pkg/metadata"
@ -11,7 +9,6 @@ import (
type metadata struct {
connectTimeout time.Duration
User *url.Userinfo
header http.Header
}
@ -24,15 +21,6 @@ func (c *httpConnector) parseMetadata(md mdata.Metadata) (err error) {
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.User = url.User(ss[0])
} else {
c.md.User = url.UserPassword(ss[0], ss[1])
}
}
if mm := mdata.GetStringMapString(md, header); len(mm) > 0 {
hd := http.Header{}
for k, v := range mm {

4
pkg/connector/http2/connector.go
View File

@ -24,6 +24,7 @@ func init() {
}
type http2Connector struct {
user *url.Userinfo
md metadata
logger logger.Logger
}
@ -35,6 +36,7 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &http2Connector{
user: options.User,
logger: options.Logger,
}
}
@ -74,7 +76,7 @@ func (c *http2Connector) Connect(ctx context.Context, conn net.Conn, network, ad
req.Header.Set("User-Agent", c.md.UserAgent)
}
if user := c.md.User; user != nil {
if user := c.user; user != nil {
u := user.Username()
p, _ := user.Password()
req.Header.Set("Proxy-Authorization",

13
pkg/connector/http2/metadata.go
View File

@ -1,8 +1,6 @@
package http2
import (
"net/url"
"strings"
"time"
mdata "github.com/go-gost/gost/pkg/metadata"
@ -15,14 +13,12 @@ const (
type metadata struct {
connectTimeout time.Duration
UserAgent string
User *url.Userinfo
}
func (c *http2Connector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
userAgent = "userAgent"
user = "user"
)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
@ -31,14 +27,5 @@ func (c *http2Connector) parseMetadata(md mdata.Metadata) (err error) {
c.md.UserAgent = defaultUserAgent
}
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.User = url.User(ss[0])
} else {
c.md.User = url.UserPassword(ss[0], ss[1])
}
}
return
}

8
pkg/connector/option.go
View File

@ -1,17 +1,25 @@
package connector
import (
"net/url"
"time"
"github.com/go-gost/gost/pkg/logger"
)
type Options struct {
User *url.Userinfo
Logger logger.Logger
}
type Option func(opts *Options)
func UserOption(user *url.Userinfo) Option {
return func(opts *Options) {
opts.User = user
}
}
func LoggerOption(logger logger.Logger) Option {
return func(opts *Options) {
opts.Logger = logger

6
pkg/connector/relay/bind.go
View File

@ -79,10 +79,10 @@ func (c *relayConnector) bind(conn net.Conn, cmd uint8, network, address string)
Flags: cmd,
}
if c.md.user != nil {
pwd, _ := c.md.user.Password()
if c.user != nil {
pwd, _ := c.user.Password()
req.Features = append(req.Features, &relay.UserAuthFeature{
Username: c.md.user.Username(),
Username: c.user.Username(),
Password: pwd,
})
}

9
pkg/connector/relay/connector.go
View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"net"
"net/url"
"time"
"github.com/go-gost/gost/pkg/common/util/socks"
@ -19,6 +20,7 @@ func init() {
}
type relayConnector struct {
user *url.Userinfo
logger logger.Logger
md metadata
}
@ -30,6 +32,7 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &relayConnector{
user: options.User,
logger: options.Logger,
}
}
@ -71,10 +74,10 @@ func (c *relayConnector) Connect(ctx context.Context, conn net.Conn, network, ad
}
}
if c.md.user != nil {
pwd, _ := c.md.user.Password()
if c.user != nil {
pwd, _ := c.user.Password()
req.Features = append(req.Features, &relay.UserAuthFeature{
Username: c.md.user.Username(),
Username: c.user.Username(),
Password: pwd,
})
}

12
pkg/connector/relay/metadata.go
View File

@ -1,8 +1,6 @@
package relay
import (
"net/url"
"strings"
"time"
mdata "github.com/go-gost/gost/pkg/metadata"
@ -10,25 +8,15 @@ import (
type metadata struct {
connectTimeout time.Duration
user *url.Userinfo
noDelay bool
}
func (c *relayConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
user = "user"
connectTimeout = "connectTimeout"
noDelay = "nodelay"
)
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.user = url.User(ss[0])
} else {
c.md.user = url.UserPassword(ss[0], ss[1])
}
}
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.noDelay = mdata.GetBool(md, noDelay)

9
pkg/connector/socks/v4/connector.go
View File

@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"net"
"net/url"
"strconv"
"time"
@ -21,6 +22,7 @@ func init() {
}
type socks4Connector struct {
user *url.Userinfo
md metadata
logger logger.Logger
}
@ -32,6 +34,7 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &socks4Connector{
user: options.User,
logger: options.Logger,
}
}
@ -96,7 +99,11 @@ func (c *socks4Connector) Connect(ctx context.Context, conn net.Conn, network, a
defer conn.SetDeadline(time.Time{})
}
req := gosocks4.NewRequest(gosocks4.CmdConnect, addr, nil)
var userid []byte
if c.user != nil && c.user.Username() != "" {
userid = []byte(c.user.Username())
}
req := gosocks4.NewRequest(gosocks4.CmdConnect, addr, userid)
if err := req.Write(conn); err != nil {
c.logger.Error(err)
return nil, err

6
pkg/connector/socks/v4/metadata.go
View File

@ -1,7 +1,6 @@
package v4
import (
"net/url"
"time"
mdata "github.com/go-gost/gost/pkg/metadata"
@ -9,20 +8,15 @@ import (
type metadata struct {
connectTimeout time.Duration
User *url.Userinfo
disable4a bool
}
func (c *socks4Connector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
user = "user"
disable4a = "disable4a"
)
if v := mdata.GetString(md, user); v != "" {
c.md.User = url.User(v)
}
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.disable4a = mdata.GetBool(md, disable4a)

5
pkg/connector/socks/v5/connector.go
View File

@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"net"
"net/url"
"time"
"github.com/go-gost/gosocks5"
@ -23,6 +24,7 @@ func init() {
type socks5Connector struct {
selector gosocks5.Selector
user *url.Userinfo
logger logger.Logger
md metadata
}
@ -34,6 +36,7 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &socks5Connector{
user: options.User,
logger: options.Logger,
}
}
@ -49,7 +52,7 @@ func (c *socks5Connector) Init(md md.Metadata) (err error) {
gosocks5.MethodUserPass,
},
logger: c.logger,
User: c.md.User,
User: c.user,
TLSConfig: c.md.tlsConfig,
}
if !c.md.noTLS {

13
pkg/connector/socks/v5/metadata.go
View File

@ -2,8 +2,6 @@ package v5
import (
"crypto/tls"
"net/url"
"strings"
"time"
mdata "github.com/go-gost/gost/pkg/metadata"
@ -11,7 +9,6 @@ import (
type metadata struct {
connectTimeout time.Duration
User *url.Userinfo
tlsConfig *tls.Config
noTLS bool
}
@ -19,19 +16,9 @@ type metadata struct {
func (c *socks5Connector) parseMetadata(md mdata.Metadata) (err error) {
const (
connectTimeout = "timeout"
user = "user"
noTLS = "notls"
)
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
c.md.User = url.User(ss[0])
} else {
c.md.User = url.UserPassword(ss[0], ss[1])
}
}
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.noTLS = mdata.GetBool(md, noTLS)

21
pkg/connector/ss/connector.go
View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"net"
"net/url"
"time"
"github.com/go-gost/gosocks5"
@ -13,6 +14,7 @@ import (
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
"github.com/shadowsocks/go-shadowsocks2/core"
)
func init() {
@ -20,6 +22,8 @@ func init() {
}
type ssConnector struct {
user *url.Userinfo
cipher core.Cipher
md metadata
logger logger.Logger
}
@ -31,12 +35,23 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &ssConnector{
user: options.User,
logger: options.Logger,
}
}
func (c *ssConnector) Init(md md.Metadata) (err error) {
return c.parseMetadata(md)
if err = c.parseMetadata(md); err != nil {
return
}
if c.user != nil {
method := c.user.Username()
password, _ := c.user.Password()
c.cipher, err = ss.ShadowCipher(method, password, c.md.key)
}
return
}
func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
@ -80,8 +95,8 @@ func (c *ssConnector) Connect(ctx context.Context, conn net.Conn, network, addre
defer conn.SetDeadline(time.Time{})
}
if c.md.cipher != nil {
conn = c.md.cipher.StreamConn(conn)
if c.cipher != nil {
conn = c.cipher.StreamConn(conn)
}
var sc net.Conn

21
pkg/connector/ss/metadata.go
View File

@ -1,42 +1,25 @@
package ss
import (
"strings"
"time"
"github.com/go-gost/gost/pkg/common/util/ss"
mdata "github.com/go-gost/gost/pkg/metadata"
"github.com/shadowsocks/go-shadowsocks2/core"
)
type metadata struct {
cipher core.Cipher
key string
connectTimeout time.Duration
noDelay bool
}
func (c *ssConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
user = "user"
key = "key"
connectTimeout = "timeout"
noDelay = "nodelay"
)
var method, password string
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
method = ss[0]
} else {
method, password = ss[0], ss[1]
}
}
c.md.cipher, err = ss.ShadowCipher(method, password, mdata.GetString(md, key))
if err != nil {
return
}
c.md.key = mdata.GetString(md, key)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
c.md.noDelay = mdata.GetBool(md, noDelay)

25
pkg/connector/ss/udp/connector.go
View File

@ -4,6 +4,7 @@ import (
"context"
"fmt"
"net"
"net/url"
"time"
"github.com/go-gost/gost/pkg/common/util/socks"
@ -12,6 +13,7 @@ import (
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
"github.com/shadowsocks/go-shadowsocks2/core"
)
func init() {
@ -19,6 +21,8 @@ func init() {
}
type ssuConnector struct {
user *url.Userinfo
cipher core.Cipher
md metadata
logger logger.Logger
}
@ -30,12 +34,23 @@ func NewConnector(opts ...connector.Option) connector.Connector {
}
return &ssuConnector{
user: options.User,
logger: options.Logger,
}
}
func (c *ssuConnector) Init(md md.Metadata) (err error) {
return c.parseMetadata(md)
if err = c.parseMetadata(md); err != nil {
return
}
if c.user != nil {
method := c.user.Username()
password, _ := c.user.Password()
c.cipher, err = ss.ShadowCipher(method, password, c.md.key)
}
return
}
func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, address string, opts ...connector.ConnectOption) (net.Conn, error) {
@ -67,16 +82,16 @@ func (c *ssuConnector) Connect(ctx context.Context, conn net.Conn, network, addr
pc, ok := conn.(net.PacketConn)
if ok {
if c.md.cipher != nil {
pc = c.md.cipher.PacketConn(pc)
if c.cipher != nil {
pc = c.cipher.PacketConn(pc)
}
// standard UDP relay
return ss.UDPClientConn(pc, conn.RemoteAddr(), taddr, c.md.bufferSize), nil
}
if c.md.cipher != nil {
conn = ss.ShadowConn(c.md.cipher.StreamConn(conn), nil)
if c.cipher != nil {
conn = ss.ShadowConn(c.cipher.StreamConn(conn), nil)
}
// UDP over TCP

21
pkg/connector/ss/udp/metadata.go
View File

@ -2,42 +2,25 @@ package ss
import (
"math"
"strings"
"time"
"github.com/go-gost/gost/pkg/common/util/ss"
mdata "github.com/go-gost/gost/pkg/metadata"
"github.com/shadowsocks/go-shadowsocks2/core"
)
type metadata struct {
cipher core.Cipher
key string
connectTimeout time.Duration
bufferSize int
}
func (c *ssuConnector) parseMetadata(md mdata.Metadata) (err error) {
const (
user = "user"
key = "key"
connectTimeout = "timeout"
bufferSize = "bufferSize" // udp buffer size
)
var method, password string
if v := mdata.GetString(md, user); v != "" {
ss := strings.SplitN(v, ":", 2)
if len(ss) == 1 {
method = ss[0]
} else {
method, password = ss[0], ss[1]
}
}
c.md.cipher, err = ss.ShadowCipher(method, password, mdata.GetString(md, key))
if err != nil {
return
}
c.md.key = mdata.GetString(md, key)
c.md.connectTimeout = mdata.GetDuration(md, connectTimeout)
if bs := mdata.GetInt(md, bufferSize); bs > 0 {