From 7ab641d239e502e09c6f05dfc7efd069fcf3c314 Mon Sep 17 00:00:00 2001 From: Mikhail Osipov Date: Sat, 29 Feb 2020 01:09:33 +0300 Subject: fix hook variable check --- pkg/server/hook/auth.go | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'pkg/server/hook/auth.go') diff --git a/pkg/server/hook/auth.go b/pkg/server/hook/auth.go index fc19c2a..8d7d23e 100644 --- a/pkg/server/hook/auth.go +++ b/pkg/server/hook/auth.go @@ -122,17 +122,9 @@ func (a *auth) Recv(rq, wq queue.Q) (err error) { return queue.IoCopy(r, wq.Writer()) } -func getAuthSecret(env env.Env) string { - if v := env.Eval("@{tunnel.@{tunnel}.secret}"); v != "" { - return v - } - - return env.Get("secret") -} - func (h authHook) Open(env env.Env) (interface{}, error) { a := &auth{ - secret: getAuthSecret(env), + secret: getHookVar(env, "secret"), recvChallenge: make(chan struct{}), recvHash: make(chan struct{}), fail: make(chan struct{}), -- cgit v1.2.3-70-g09d2