Implemented the host name auto suggestion, and added Preset feature

application/configuration/config.go

@@ -120,21 +120,33 @@ func (s Server) Verify() error {
 	return nil
 }
 
+// Preset contains data of a static remote host
+type Preset struct {
+	Title string
+	Type  string
+	Host  string
+	Meta  map[string]string
+}
+
 // Configuration contains configuration of the application
 type Configuration struct {
-	HostName    string
-	SharedKey   string
-	Dialer      network.Dial
-	DialTimeout time.Duration
-	Servers     []Server
+	HostName               string
+	SharedKey              string
+	Dialer                 network.Dial
+	DialTimeout            time.Duration
+	Servers                []Server
+	Presets                []Preset
+	OnlyAllowPresetRemotes bool
 }
 
 // Common settings shared by mulitple servers
 type Common struct {
-	HostName    string
-	SharedKey   string
-	Dialer      network.Dial
-	DialTimeout time.Duration
+	HostName               string
+	SharedKey              string
+	Dialer                 network.Dial
+	DialTimeout            time.Duration
+	Presets                []Preset
+	OnlyAllowPresetRemotes bool
 }
 
 // Verify verifies current setting
@@ -164,6 +176,16 @@ func (c Configuration) Common() Common {
 		dialer = network.TCPDial()
 	}
 
+	if c.OnlyAllowPresetRemotes {
+		accessList := make(network.AllowedHosts, len(c.Presets))
+
+		for _, k := range c.Presets {
+			accessList[k.Host] = struct{}{}
+		}
+
+		dialer = network.AccessControlDial(accessList, dialer)
+	}
+
 	dialTimeout := c.DialTimeout
 
 	if dialTimeout <= 1*time.Second {
@@ -171,10 +193,12 @@ func (c Configuration) Common() Common {
 	}
 
 	return Common{
-		HostName:    c.HostName,
-		SharedKey:   c.SharedKey,
-		Dialer:      c.Dialer,
-		DialTimeout: c.DialTimeout,
+		HostName:               c.HostName,
+		SharedKey:              c.SharedKey,
+		Dialer:                 dialer,
+		DialTimeout:            c.DialTimeout,
+		Presets:                c.Presets,
+		OnlyAllowPresetRemotes: c.OnlyAllowPresetRemotes,
 	}
 }
 

application/configuration/loader_enviro.go

@@ -18,6 +18,7 @@
 package configuration
 
 import (
+	"encoding/json"
 	"fmt"
 	"os"
 	"strconv"
@@ -102,12 +103,27 @@ func Enviro() Loader {
 			TLSCertificateKeyFile: parseEviro("SSHWIFTY_TLSCERTIFICATEKEYFILE"),
 		}
 
+		presets := make([]Preset, 0, 16)
+		presetStr := strings.TrimSpace(parseEviro("SSHWIFTY_PRESETS"))
+
+		if len(presetStr) > 0 {
+			jErr := json.Unmarshal([]byte(presetStr), &presets)
+
+			if jErr != nil {
+				return enviroTypeName, Configuration{}, fmt.Errorf(
+					"Invalid \"SSHWIFTY_PRESETS\": %s", jErr)
+			}
+		}
+
 		return enviroTypeName, Configuration{
 			HostName:    cfg.HostName,
 			SharedKey:   cfg.SharedKey,
 			Dialer:      dialer,
 			DialTimeout: time.Duration(cfg.DialTimeout) * time.Second,
 			Servers:     []Server{cfgSer.build()},
+			Presets:     presets,
+			OnlyAllowPresetRemotes: len(
+				parseEviro("SSHWIFTY_ONLYALLOWPRESETREMOTES")) > 0,
 		}, nil
 	}
 }

application/configuration/loader_file.go

@@ -27,9 +27,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/niruix/sshwifty/application/network"
-
 	"github.com/niruix/sshwifty/application/log"
+	"github.com/niruix/sshwifty/application/network"
 )
 
 const (
@@ -78,14 +77,49 @@ func (f *fileCfgServer) build() Server {
 	}
 }
 
+type fileCfgPreset struct {
+	Title string
+	Type  string
+	Host  string
+	Meta  map[string]string
+}
+
+func (f fileCfgPreset) build() Preset {
+	return Preset{
+		Title: f.Title,
+		Type:  strings.TrimSpace(f.Type),
+		Host:  f.Host,
+		Meta:  f.Meta,
+	}
+}
+
 type fileCfgCommon struct {
-	HostName       string           // Host name
-	SharedKey      string           // Shared key, empty to enable public access
-	DialTimeout    int              // DialTimeout, min 5s
-	Socks5         string           // Socks5 server address, optional
-	Socks5User     string           // Login user for socks5 server, optional
-	Socks5Password string           // Login pass for socks5 server, optional
-	Servers        []*fileCfgServer // Servers
+	// Host name
+	HostName string
+
+	// Shared key, empty to enable public access
+	SharedKey string
+
+	// DialTimeout, min 5s
+	DialTimeout int
+
+	// Socks5 server address, optional
+	Socks5 string
+
+	// Login user for socks5 server, optional
+	Socks5User string
+
+	// Login pass for socks5 server, optional
+	Socks5Password string
+
+	// Servers
+	Servers []*fileCfgServer
+
+	// Remotes
+	Presets []*fileCfgPreset
+
+	// Allow predefined remotes only
+	OnlyAllowPresetRemotes bool
 }
 
 func (f fileCfgCommon) build() (fileCfgCommon, network.Dial, error) {
@@ -111,13 +145,15 @@ func (f fileCfgCommon) build() (fileCfgCommon, network.Dial, error) {
 	}
 
 	return fileCfgCommon{
-		HostName:       f.HostName,
-		SharedKey:      f.SharedKey,
-		DialTimeout:    dialTimeout,
-		Socks5:         f.Socks5,
-		Socks5User:     f.Socks5User,
-		Socks5Password: f.Socks5Password,
-		Servers:        f.Servers,
+		HostName:               f.HostName,
+		SharedKey:              f.SharedKey,
+		DialTimeout:            dialTimeout,
+		Socks5:                 f.Socks5,
+		Socks5User:             f.Socks5User,
+		Socks5Password:         f.Socks5Password,
+		Servers:                f.Servers,
+		Presets:                f.Presets,
+		OnlyAllowPresetRemotes: f.OnlyAllowPresetRemotes,
 	}, dialer, nil
 }
 
@@ -151,12 +187,21 @@ func loadFile(filePath string) (string, Configuration, error) {
 		servers[i] = finalCfg.Servers[i].build()
 	}
 
+	presets := make([]Preset, len(finalCfg.Presets))
+
+	for i := range presets {
+		presets[i] = finalCfg.Presets[i].build()
+	}
+
 	return fileTypeName, Configuration{
-		HostName:    finalCfg.HostName,
-		SharedKey:   finalCfg.SharedKey,
-		Dialer:      dialer,
-		DialTimeout: time.Duration(finalCfg.DialTimeout) * time.Second,
-		Servers:     servers,
+		HostName:  finalCfg.HostName,
+		SharedKey: finalCfg.SharedKey,
+		Dialer:    dialer,
+		DialTimeout: time.Duration(finalCfg.DialTimeout) *
+			time.Second,
+		Servers:                servers,
+		Presets:                presets,
+		OnlyAllowPresetRemotes: cfg.OnlyAllowPresetRemotes,
 	}, nil
 }