diff options
Diffstat (limited to 'parse.go')
| -rw-r--r-- | parse.go | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -241,7 +241,10 @@ func parseServerDirectives(server *Server, buf *bufio.Reader) error { case "host": server.Hostnames = append(server.Hostnames, parseHost(rest)...) case "servertls": - server.TLS, err = parseServerTLS(rest) + if server.TLS != nil { + return fmt.Errorf("duplicate servertls directives in %s server", server.Type) + } + server.tlsCertFile, server.tlsKeyFile, server.TLS, err = parseServerTLS(rest) if err != nil { return err } @@ -302,20 +305,21 @@ func validateRoute(serverType string, dir *RouteDirective) error { return nil } -func parseServerTLS(text string) (*tls.Config, error) { +func parseServerTLS(text string) (string, string, *tls.Config, error) { spl := strings.Split(text, " ") if len(spl) != 4 { - return nil, errors.New("invalid 'servertls' directive") + return "", "", nil, errors.New("invalid 'servertls' directive") } if spl[0] == "cert" { spl[0], spl[1], spl[2], spl[3] = spl[2], spl[3], spl[0], spl[1] } if spl[0] != "key" || spl[2] != "cert" { - return nil, errors.New("invalid 'servertls' directive") + return "", "", nil, errors.New("invalid 'servertls' directive") } - return gemini.FileTLS(spl[3], spl[1]) + conf, err := gemini.FileTLS(spl[3], spl[1]) + return spl[3], spl[1], conf, err } func parseHost(text string) []string { |