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

fix log usage

Browse Source
This commit is contained in:
ginuerzh
2022-01-26 16:45:57 +08:00
parent 04dfc8c4c3
commit 713586729b
16 changed files with 183 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/dialer/forward/ssh/conn.go → pkg/dialer/sshd/conn.go
View File

@ -1,4 +1,4 @@
package ssh
package sshd
import (
"net"

45
pkg/dialer/forward/ssh/dialer.go → pkg/dialer/sshd/dialer.go
View File

@ -1,4 +1,4 @@
package ssh
package sshd
import (
"context"
@ -10,7 +10,6 @@ import (
"github.com/go-gost/gost/pkg/dialer"
ssh_util "github.com/go-gost/gost/pkg/internal/util/ssh"
"github.com/go-gost/gost/pkg/logger"
md "github.com/go-gost/gost/pkg/metadata"
"github.com/go-gost/gost/pkg/registry"
"golang.org/x/crypto/ssh"
@ -20,28 +19,28 @@ func init() {
registry.RegisterDialer("sshd", NewDialer)
}
type forwardDialer struct {
type sshdDialer struct {
user *url.Userinfo
sessions map[string]*sshSession
sessionMutex sync.Mutex
logger logger.Logger
md metadata
options dialer.Options
}
func NewDialer(opts ...dialer.Option) dialer.Dialer {
options := &dialer.Options{}
options := dialer.Options{}
for _, opt := range opts {
opt(options)
opt(&options)
}
return &forwardDialer{
return &sshdDialer{
user: options.User,
sessions: make(map[string]*sshSession),
logger: options.Logger,
options: options,
}
}
func (d *forwardDialer) Init(md md.Metadata) (err error) {
func (d *sshdDialer) Init(md md.Metadata) (err error) {
if err = d.parseMetadata(md); err != nil {
return
}
@ -50,11 +49,11 @@ func (d *forwardDialer) Init(md md.Metadata) (err error) {
}
// Multiplex implements dialer.Multiplexer interface.
func (d *forwardDialer) Multiplex() bool {
func (d *sshdDialer) Multiplex() bool {
return true
}
func (d *forwardDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
func (d *sshdDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
var options dialer.DialOptions
for _, opt := range opts {
opt(&options)
@ -85,7 +84,7 @@ func (d *forwardDialer) Dial(ctx context.Context, addr string, opts ...dialer.Di
}
// Handshake implements dialer.Handshaker
func (d *forwardDialer) Handshake(ctx context.Context, conn net.Conn, options ...dialer.HandshakeOption) (net.Conn, error) {
func (d *sshdDialer) Handshake(ctx context.Context, conn net.Conn, options ...dialer.HandshakeOption) (net.Conn, error) {
opts := &dialer.HandshakeOptions{}
for _, option := range options {
option(opts)
@ -99,10 +98,12 @@ func (d *forwardDialer) Handshake(ctx context.Context, conn net.Conn, options ..
defer conn.SetDeadline(time.Time{})
}
log := d.options.Logger
session, ok := d.sessions[opts.Addr]
if session != nil && session.conn != conn {
err := errors.New("ssh: unrecognized connection")
d.logger.Error(err)
log.Error(err)
conn.Close()
delete(d.sessions, opts.Addr)
return nil, err
@ -111,7 +112,7 @@ func (d *forwardDialer) Handshake(ctx context.Context, conn net.Conn, options ..
if !ok || session.client == nil {
s, err := d.initSession(ctx, opts.Addr, conn)
if err != nil {
d.logger.Error(err)
log.Error(err)
conn.Close()
delete(d.sessions, opts.Addr)
return nil, err
@ -119,7 +120,7 @@ func (d *forwardDialer) Handshake(ctx context.Context, conn net.Conn, options ..
session = s
go func() {
s.wait()
d.logger.Debug("session closed")
log.Debug("session closed")
}()
d.sessions[opts.Addr] = session
}
@ -131,14 +132,16 @@ func (d *forwardDialer) Handshake(ctx context.Context, conn net.Conn, options ..
return ssh_util.NewClientConn(session.conn, session.client), nil
}
func (d *forwardDialer) dial(ctx context.Context, network, addr string, opts *dialer.DialOptions) (net.Conn, error) {
func (d *sshdDialer) dial(ctx context.Context, network, addr string, opts *dialer.DialOptions) (net.Conn, error) {
log := d.options.Logger
dial := opts.DialFunc
if dial != nil {
conn, err := dial(ctx, addr)
if err != nil {
d.logger.Error(err)
log.Error(err)
} else {
d.logger.WithFields(map[string]interface{}{
log.WithFields(map[string]interface{}{
"src": conn.LocalAddr().String(),
"dst": addr,
}).Debug("dial with dial func")
@ -149,9 +152,9 @@ func (d *forwardDialer) dial(ctx context.Context, network, addr string, opts *di
var netd net.Dialer
conn, err := netd.DialContext(ctx, network, addr)
if err != nil {
d.logger.Error(err)
log.Error(err)
} else {
d.logger.WithFields(map[string]interface{}{
log.WithFields(map[string]interface{}{
"src": conn.LocalAddr().String(),
"dst": addr,
}).Debugf("dial direct %s/%s", addr, network)
@ -159,7 +162,7 @@ func (d *forwardDialer) dial(ctx context.Context, network, addr string, opts *di
return conn, err
}
func (d *forwardDialer) initSession(ctx context.Context, addr string, conn net.Conn) (*sshSession, error) {
func (d *sshdDialer) initSession(ctx context.Context, addr string, conn net.Conn) (*sshSession, error) {
config := ssh.ClientConfig{
// Timeout: timeout,
HostKeyCallback: ssh.InsecureIgnoreHostKey(),

4
pkg/dialer/forward/ssh/metadata.go → pkg/dialer/sshd/metadata.go
View File

@ -1,4 +1,4 @@
package ssh
package sshd
import (
"io/ioutil"
@ -13,7 +13,7 @@ type metadata struct {
signer ssh.Signer
}
func (d *forwardDialer) parseMetadata(md mdata.Metadata) (err error) {
func (d *sshdDialer) parseMetadata(md mdata.Metadata) (err error) {
const (
handshakeTimeout = "handshakeTimeout"
privateKeyFile = "privateKeyFile"