Implemented the host name auto suggestion, and added Preset feature

application/controller/controller.go

@@ -46,6 +46,7 @@ type handler struct {
 	logger          log.Logger
 	homeCtl         home
 	socketCtl       socket
+	socketVerifyCtl socketVerification
 }
 
 func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -80,6 +81,8 @@ func (h handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 	case "/sshwifty/socket":
 		err = serveController(h.socketCtl, w, r, clientLogger)
+	case "/sshwifty/socket/verify":
+		err = serveController(h.socketVerifyCtl, w, r, clientLogger)
 
 	case "/robots.txt":
 		err = serveStaticCacheData(
@@ -155,12 +158,15 @@ func Builder(cmds command.Commands) server.HandlerBuilder {
 		cfg configuration.Server,
 		logger log.Logger,
 	) http.Handler {
+		socketCtl := newSocketCtl(commonCfg, cfg, cmds)
+
 		return handler{
 			hostNameChecker: commonCfg.HostName + ":",
 			commonCfg:       commonCfg,
 			logger:          logger,
 			homeCtl:         home{},
-			socketCtl:       newSocketCtl(commonCfg, cfg, cmds),
+			socketCtl:       socketCtl,
+			socketVerifyCtl: newSocketVerification(socketCtl, cfg, commonCfg),
 		}
 	}
 }

application/controller/socket.go

@@ -162,54 +162,6 @@ func (s socket) Options(
 	return nil
 }
 
-func (s socket) setServerConfigHeader(hd *http.Header) {
-	hd.Add("X-Heartbeat",
-		strconv.FormatFloat(s.serverCfg.HeartbeatTimeout.Seconds(), 'g', 2, 64))
-	hd.Add("X-Timeout",
-		strconv.FormatFloat(s.serverCfg.ReadTimeout.Seconds(), 'g', 2, 64))
-}
-
-func (s socket) Head(
-	w http.ResponseWriter, r *http.Request, l log.Logger) error {
-	key := r.Header.Get("X-Key")
-	hd := w.Header()
-
-	if len(key) <= 0 {
-		hd.Add("X-Key", s.randomKey)
-
-		if len(s.commonCfg.SharedKey) <= 0 {
-			s.setServerConfigHeader(&hd)
-
-			return nil
-		}
-
-		return ErrSocketAuthFailed
-	}
-
-	if len(key) > 64 {
-		return ErrSocketAuthFailed
-	}
-
-	// Delay the brute force attack. Use it with connection limits (via
-	// iptables or nginx etc)
-	time.Sleep(500 * time.Millisecond)
-
-	decodedKey, decodedKeyErr := base64.StdEncoding.DecodeString(key)
-
-	if decodedKeyErr != nil {
-		return NewError(http.StatusBadRequest, decodedKeyErr.Error())
-	}
-
-	if !hmac.Equal(s.authKey, decodedKey) {
-		return ErrSocketAuthFailed
-	}
-
-	hd.Add("X-Key", s.randomKey)
-	s.setServerConfigHeader(&hd)
-
-	return nil
-}
-
 func (s socket) buildWSFetcher(c *websocket.Conn) rw.FetchReaderFetcher {
 	return func() ([]byte, error) {
 		for {

application/controller/socket_verify.go

@@ -0,0 +1,138 @@
+// Sshwifty - A Web SSH client
+//
+// Copyright (C) 2019-2020 Rui NI <nirui@gmx.com>
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package controller
+
+import (
+	"crypto/hmac"
+	"encoding/base64"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/niruix/sshwifty/application/configuration"
+	"github.com/niruix/sshwifty/application/log"
+)
+
+type socketVerification struct {
+	socket
+
+	heartbeat     string
+	timeout       string
+	configRspBody []byte
+}
+
+type socketRemotePreset struct {
+	Title string            `json:"title"`
+	Type  string            `json:"type"`
+	Host  string            `json:"host"`
+	Meta  map[string]string `json:"meta"`
+}
+
+func buildAccessConfigRespondBody(remotes []configuration.Preset) []byte {
+	presets := make([]socketRemotePreset, len(remotes))
+
+	for i := range presets {
+		presets[i] = socketRemotePreset{
+			Title: remotes[i].Title,
+			Type:  remotes[i].Type,
+			Host:  remotes[i].Host,
+			Meta:  remotes[i].Meta,
+		}
+	}
+
+	mData, mErr := json.Marshal(presets)
+
+	if mErr != nil {
+		panic(fmt.Errorf("Unable to marshal remote data: %s", mErr))
+	}
+
+	return mData
+}
+
+func newSocketVerification(
+	s socket,
+	srvCfg configuration.Server,
+	commCfg configuration.Common,
+) socketVerification {
+	return socketVerification{
+		socket: s,
+		heartbeat: strconv.FormatFloat(
+			srvCfg.HeartbeatTimeout.Seconds(), 'g', 2, 64),
+		timeout: strconv.FormatFloat(
+			srvCfg.ReadTimeout.Seconds(), 'g', 2, 64),
+		configRspBody: buildAccessConfigRespondBody(commCfg.Presets),
+	}
+}
+
+func (s socketVerification) setServerConfigRespond(
+	hd *http.Header, w http.ResponseWriter) {
+	hd.Add("X-Heartbeat", s.heartbeat)
+	hd.Add("X-Timeout", s.timeout)
+
+	if s.commonCfg.OnlyAllowPresetRemotes {
+		hd.Add("X-OnlyAllowPresetRemotes", "yes")
+	}
+
+	hd.Add("Content-Type", "text/json; charset=utf-8")
+
+	w.Write(s.configRspBody)
+}
+
+func (s socketVerification) Get(
+	w http.ResponseWriter, r *http.Request, l log.Logger) error {
+	hd := w.Header()
+
+	key := r.Header.Get("X-Key")
+
+	if len(key) <= 0 {
+		hd.Add("X-Key", s.randomKey)
+
+		if len(s.commonCfg.SharedKey) <= 0 {
+			s.setServerConfigRespond(&hd, w)
+
+			return nil
+		}
+
+		return ErrSocketAuthFailed
+	}
+
+	if len(key) > 64 {
+		return ErrSocketAuthFailed
+	}
+
+	// Delay the brute force attack. Use it with connection limits (via
+	// iptables or nginx etc)
+	time.Sleep(500 * time.Millisecond)
+
+	decodedKey, decodedKeyErr := base64.StdEncoding.DecodeString(key)
+
+	if decodedKeyErr != nil {
+		return NewError(http.StatusBadRequest, decodedKeyErr.Error())
+	}
+
+	if !hmac.Equal(s.authKey, decodedKey) {
+		return ErrSocketAuthFailed
+	}
+
+	hd.Add("X-Key", s.randomKey)
+	s.setServerConfigRespond(&hd, w)
+
+	return nil
+}