From f5f5610944dc9dd056c204a2a2855c01fa58023b Mon Sep 17 00:00:00 2001 From: Hedy Li Date: Mon, 19 Jul 2021 12:59:02 +0800 Subject: [PATCH] go fmt --- config.go | 28 ++++++++++++++-------------- spsrv.go | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/config.go b/config.go index a1fb371..128978e 100644 --- a/config.go +++ b/config.go @@ -1,33 +1,33 @@ package main import ( + "fmt" "github.com/BurntSushi/toml" "io/ioutil" "os" - "fmt" ) type Config struct { - Port int - Hostname string - RootDir string + Port int + Hostname string + RootDir string UserDirEnable bool - UserDir string + UserDir string // UserSlug string DirlistReverse bool - DirlistSort string - DirlistTitles bool + DirlistSort string + DirlistTitles bool } var defaultConf = &Config{ - Port: 300, - Hostname: "localhost", - RootDir: "/var/spartan/", + Port: 300, + Hostname: "localhost", + RootDir: "/var/spartan/", DirlistReverse: false, - DirlistSort: "name", - DirlistTitles: true, - UserDirEnable: false, - UserDir: "public_spartan", + DirlistSort: "name", + DirlistTitles: true, + UserDirEnable: false, + UserDir: "public_spartan", } func LoadConfig(path string) (*Config, error) { diff --git a/spsrv.go b/spsrv.go index 18d5fc4..c136232 100644 --- a/spsrv.go +++ b/spsrv.go @@ -25,10 +25,10 @@ const ( ) var ( - hostname = flag.StringP("hostname", "h", defaultConf.Hostname, "Hostname") - port = flag.IntP("port", "p", defaultConf.Port, "Port to listen to") - rootDir = flag.StringP("dir", "d", defaultConf.RootDir, "Root content directory") - confPath = flag.StringP("config", "c", "/etc/spsrv.conf", "Path to config file") + hostname = flag.StringP("hostname", "h", defaultConf.Hostname, "Hostname") + port = flag.IntP("port", "p", defaultConf.Port, "Port to listen to") + rootDir = flag.StringP("dir", "d", defaultConf.RootDir, "Root content directory") + confPath = flag.StringP("config", "c", "/etc/spsrv.conf", "Path to config file") ) func main() { @@ -100,7 +100,7 @@ func handleConnection(conn io.ReadWriteCloser, conf *Config) { return } log.Println("Handling request:", request) - if strings.Contains(reqPath, ".."){ + if strings.Contains(reqPath, "..") { sendResponseHeader(conn, statusClientError, "Stop it with your directory traversal technique!") return }