This commit is contained in:
Hedy Li 2021-07-19 12:59:02 +08:00
parent 7006d7e6a4
commit f5f5610944
Signed by: hedy
GPG Key ID: B51B5A8D1B176372
2 changed files with 19 additions and 19 deletions

View File

@ -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) {

View File

@ -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
}