From 666846d3526280c81726e794df34d50981d04a21 Mon Sep 17 00:00:00 2001
From: ginuerzh <ginuerzh@gmail.com>
Date: Thu, 7 Apr 2022 23:04:46 +0800
Subject: [PATCH] fix ssh in cmd mode

---
 cmd/gost/cmd.go | 8 ++------
 go.mod          | 4 ++--
 go.sum          | 8 ++++----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/cmd/gost/cmd.go b/cmd/gost/cmd.go
index 801f258..af2733d 100644
--- a/cmd/gost/cmd.go
+++ b/cmd/gost/cmd.go
@@ -385,10 +385,8 @@ func buildServiceConfig(url *url.URL) (*config.ServiceConfig, error) {
 		Metadata: m,
 	}
 
-	if svc.Handler.Type == "sshd" {
+	if svc.Listener.Type == "ssh" || svc.Listener.Type == "sshd" {
 		svc.Handler.Auth = nil
-	}
-	if svc.Listener.Type == "sshd" {
 		svc.Listener.Auth = auth
 	}
 
@@ -477,10 +475,8 @@ func buildNodeConfig(url *url.URL) (*config.NodeConfig, error) {
 		Metadata: m,
 	}
 
-	if node.Connector.Type == "sshd" {
+	if node.Dialer.Type == "ssh" || node.Dialer.Type == "sshd" {
 		node.Connector.Auth = nil
-	}
-	if node.Dialer.Type == "sshd" {
 		node.Dialer.Auth = auth
 	}
 
diff --git a/go.mod b/go.mod
index acd5122..e5358bf 100644
--- a/go.mod
+++ b/go.mod
@@ -5,8 +5,8 @@ go 1.18
 replace github.com/templexxx/cpu v0.0.7 => github.com/templexxx/cpu v0.0.10-0.20211111114238-98168dcec14a
 
 require (
-	github.com/go-gost/core v0.0.0-20220405145417-b88025ea6d67
-	github.com/go-gost/x v0.0.0-20220405145519-1415462d23af
+	github.com/go-gost/core v0.0.0-20220407150135-aeda8b11ca46
+	github.com/go-gost/x v0.0.0-20220407150331-d011aefefde5
 )
 
 require (
diff --git a/go.sum b/go.sum
index 0130d1b..9dc5147 100644
--- a/go.sum
+++ b/go.sum
@@ -119,8 +119,8 @@ github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gost/core v0.0.0-20220405145417-b88025ea6d67 h1:qKtSDjOdQcNNLUTifLtI12fcZm6STp9Lsp5Bj962Gx0=
-github.com/go-gost/core v0.0.0-20220405145417-b88025ea6d67/go.mod h1:/LzdiQ+0+3FMhyqw0phjFjXFdOa1fcQR5/bL/7ripCs=
+github.com/go-gost/core v0.0.0-20220407150135-aeda8b11ca46 h1:5Bg5OiSt1thHi03n9oiKptsfYzvgpOHuoLi4eAQOSSs=
+github.com/go-gost/core v0.0.0-20220407150135-aeda8b11ca46/go.mod h1:bHVbCS9da6XtKNYMkMUVcck5UqDDUkyC37erVfs4GXQ=
 github.com/go-gost/gosocks4 v0.0.1 h1:+k1sec8HlELuQV7rWftIkmy8UijzUt2I6t+iMPlGB2s=
 github.com/go-gost/gosocks4 v0.0.1/go.mod h1:3B6L47HbU/qugDg4JnoFPHgJXE43Inz8Bah1QaN9qCc=
 github.com/go-gost/gosocks5 v0.3.1-0.20211109033403-d894d75b7f09 h1:A95M6UWcfZgOuJkQ7QLfG0Hs5peWIUSysCDNz4pfe04=
@@ -129,8 +129,8 @@ github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7 h1:itaaJhQJ19kUXEB
 github.com/go-gost/relay v0.1.1-0.20211123134818-8ef7fd81ffd7/go.mod h1:lcX+23LCQ3khIeASBo+tJ/WbwXFO32/N5YN6ucuYTG8=
 github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e h1:73NGqAs22ey3wJkIYVD/ACEoovuIuOlEzQTEoqrO5+U=
 github.com/go-gost/tls-dissector v0.0.2-0.20211125135007-2b5d5bd9c07e/go.mod h1:/9QfdewqmHdaE362Hv5nDaSWLx3pCmtD870d6GaquXs=
-github.com/go-gost/x v0.0.0-20220405145519-1415462d23af h1:2kHBFYEtlh9sKVXpMeceN8X6+j+KgQTLVKvFxcbcuK4=
-github.com/go-gost/x v0.0.0-20220405145519-1415462d23af/go.mod h1:YwdS24EaGUTpBCoR38EII1Emeq/kZ1Yoke+OlpZDa8M=
+github.com/go-gost/x v0.0.0-20220407150331-d011aefefde5 h1:zznvc1SfEzwTB5bC1/rVZ53/AwWwQMio631zOmqEoK0=
+github.com/go-gost/x v0.0.0-20220407150331-d011aefefde5/go.mod h1:2RT80U+tLybYCbkEnsH4fVytYfgDrjLZ60N5XGkNvsY=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=