From 3c9f376276c4f59bfaf93195441cde402fb1d333 Mon Sep 17 00:00:00 2001 From: Mikhail Osipov Date: Sun, 19 Sep 2021 15:33:16 +0300 Subject: tunneld: allow / for reverse --- pkg/server/hook/hook.go | 5 ++--- pkg/test/auth_test.go | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'pkg') diff --git a/pkg/server/hook/hook.go b/pkg/server/hook/hook.go index 1464272..c4eb1bb 100644 --- a/pkg/server/hook/hook.go +++ b/pkg/server/hook/hook.go @@ -117,9 +117,8 @@ func New(desc string) (H, error) { name, opts := opts.Parse(desc) reverse := false - if strings.HasPrefix(name, "-") { - name = name[1:] - reverse = true + if len(name) > 0 && strings.Contains("-/", name[:1]) { + name, reverse = name[1:], true } if hookType, ok := hooks[name]; !ok { diff --git a/pkg/test/auth_test.go b/pkg/test/auth_test.go index 3b84874..dedafa8 100644 --- a/pkg/test/auth_test.go +++ b/pkg/test/auth_test.go @@ -11,7 +11,7 @@ func TestAuthHook(t *testing.T) { c := e.newInstance() c.Exec("add name T listen,addr=-:0 auth aes dial,addr=@[tunnel.X.listen]") - c.Exec("add name X listen,addr=-:0 -aes -auth dial,addr=@[addr]") + c.Exec("add name X listen,addr=-:0 /aes /auth dial,addr=@[addr]") c.Exec("set tunnel.X.secret secret") c.Exec("set tunnel.T.secret secret") -- cgit v1.2.3-70-g09d2