Bugfix: check host syntax for actions "enable", "disable" and "forget"

Author: cyrilst

.cirrus.yml

@@ -2,7 +2,6 @@ task:
   env:
     GOPROXY: https://proxy.golang.org
     matrix:
-      VERSION: 1.14
       VERSION: 1.15
       VERSION: 1.16
 
@@ -11,6 +10,29 @@ task:
 
   name: test-$VERSION
 
+  test_script:
+    - apt-get update
+    - apt-get install -y asciidoc docbook-utils docbook-xml libxml2-utils xsltproc
+    - GOPATH=/tmp/go
+    - PATH="$PATH:$GOPATH/bin"
+    - mkdir -p $GOPATH/src/github.com/cea-hpc
+    - mv /tmp/cirrus-ci-build $GOPATH/src/github.com/cea-hpc/sshproxy
+    - cd $GOPATH/src/github.com/cea-hpc/sshproxy
+    - make
+    - make get-old-deps check
+
+task:
+  env:
+    GOPROXY: https://proxy.golang.org
+    matrix:
+      VERSION: 1.17
+      VERSION: 1.18
+
+  container:
+    image: golang:$VERSION
+
+  name: test-$VERSION
+
   test_script:
     - apt-get update
     - apt-get install -y asciidoc docbook-utils docbook-xml libxml2-utils xsltproc

Makefile

@@ -79,12 +79,13 @@ fmt:
 	$(GO) fmt $(PKGS)
 	$(GO) fmt $(TEST)
 
+get-old-deps:
+	$(GO) get -u honnef.co/go/tools/cmd/[email protected]
+
 get-deps:
-	$(GO) get -u golang.org/x/lint/golint honnef.co/go/tools/cmd/staticcheck
+	$(GO) get -u honnef.co/go/tools/cmd/staticcheck
 
 check:
-	golint $(PKGS)
-	golint $(TEST)
 	$(GO) vet ./...
 	$(GO) vet $(TEST)
 	staticcheck ./...
@@ -97,4 +98,4 @@ test:
 clean:
 	rm -f $(EXE) $(MANDOC) doc/*.xml sshproxy_*.tar.gz
 
-.PHONY: all exe doc install install-doc-man install-binaries fmt get-deps check clean test
+.PHONY: all exe doc install install-doc-man install-binaries package fmt get-old-deps get-deps check test clean

README.asciidoc

@@ -58,7 +58,7 @@ and +sshproxy-replay+ in +/usr/bin+.
 Configuration
 -------------
 
-There are commented configuration files in the +config+ directory.
+There is a commented configuration file in the +config+ directory.
 
 Configure +/etc/sshproxy/sshproxy.yaml+ to suit your needs.
 
@@ -69,7 +69,7 @@ Modify the SSH daemon configuration +/etc/ssh/sshd_config+ by adding:
 Copying
 -------
 
-Copyright (C) 2015-2021 CEA/DAM/DIF
+Copyright (C) 2015-2022 CEA/DAM/DIF
 
 sshproxy is distributed under the CeCILL-B, a French transposition of the BSD
 license. See the included files +Licence_CeCILL-B_V1-en.txt+ (English version)

cmd/sshproxy-dumpd/sshproxy-dumpd.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2021 CEA/DAM/DIF
+// Copyright 2015-2022 CEA/DAM/DIF
 //  Author: Arnaud Guignard <[email protected]>
 //  Contributor: Cyril Servant <[email protected]>
 //

cmd/sshproxy-replay/sshproxy-replay.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2021 CEA/DAM/DIF
+// Copyright 2015-2022 CEA/DAM/DIF
 //  Author: Arnaud Guignard <[email protected]>
 //  Contributor: Cyril Servant <[email protected]>
 //

cmd/sshproxy/commands.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2021 CEA/DAM/DIF
+// Copyright 2015-2022 CEA/DAM/DIF
 //  Author: Arnaud Guignard <[email protected]>
 //  Contributor: Cyril Servant <[email protected]>
 //

cmd/sshproxy/recorder.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2021 CEA/DAM/DIF
+// Copyright 2015-2022 CEA/DAM/DIF
 //  Author: Arnaud Guignard <[email protected]>
 //  Contributor: Cyril Servant <[email protected]>
 //

cmd/sshproxy/sshproxy.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2021 CEA/DAM/DIF
+// Copyright 2015-2022 CEA/DAM/DIF
 //  Author: Arnaud Guignard <[email protected]>
 //  Contributor: Cyril Servant <[email protected]>
 //

cmd/sshproxyctl/sshproxyctl.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2021 CEA/DAM/DIF
+// Copyright 2015-2022 CEA/DAM/DIF
 //  Author: Arnaud Guignard <[email protected]>
 //  Contributor: Cyril Servant <[email protected]>
 //
@@ -16,6 +16,7 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"net"
 	"os"
 	"sort"
 	"strconv"
@@ -550,7 +551,7 @@ The options are:
 }
 
 func getHostPortFromCommandLine(args []string) (string, string, error) {
-	host, port := "", "22"
+	host, port := "", defaultHostPort
 	switch len(args) {
 	case 2:
 		host, port = args[0], args[1]
@@ -564,6 +565,9 @@ func getHostPortFromCommandLine(args []string) (string, string, error) {
 	} else if iport < 0 || iport > 65535 {
 		return "", "", fmt.Errorf("port must be in the 0-65535 range")
 	}
+	if _, _, err := net.SplitHostPort(host + ":" + port); err != nil {
+		return "", "", fmt.Errorf("%s", err)
+	}
 	return host, port, nil
 }
 

config/sshproxy.yaml

@@ -136,7 +136,7 @@
 # command asked by the user. If command_must_match is set to true, then the
 # connection is closed if the original command is not the same as the
 # force_command. command_must_match defaults to false. etcd_keyttl defauts to
-# 0. If a value is set (in seconds), the chosen backen will be remembered for
+# 0. If a value is set (in seconds), the chosen backend will be remembered for
 # this amount of time. Environment variables can be set if needed. The '{user}'
 # pattern will be replaced with the user login.
 #routes: