Merge branch 'dev' into feature-file-upload

Author: Mzack9999

gen_cert.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+openssl genrsa -out server.key 2048
+openssl ecparam -genkey -name secp384r1 -out server.key
+openssl req -new -x509 -sha256 -key server.key -out server.crt -days 3650

simplehttpserver.go

@@ -14,6 +14,9 @@ import (
 type options struct {
 	ListenAddress string
 	Folder        string
+	Certificate   string
+	Key           string
+	HTTPS         bool
 	Verbose       bool
 	Upload        bool
 }
@@ -24,6 +27,9 @@ func main() {
 	flag.StringVar(&opts.ListenAddress, "listen", "0.0.0.0:8000", "Address:Port")
 	flag.StringVar(&opts.Folder, "path", ".", "Folder")
 	flag.BoolVar(&opts.Upload, "upload", false, "Enable upload via PUT")
+	flag.BoolVar(&opts.HTTPS, "https", false, "HTTPS")
+	flag.StringVar(&opts.Certificate, "cert", "", "Certificate")
+	flag.StringVar(&opts.Key, "key", "", "Key")
 	flag.BoolVar(&opts.Verbose, "v", false, "Verbose")
 
 	flag.Parse()
@@ -36,7 +42,14 @@ func main() {
 	if opts.Upload {
 		log.Println("Upload enabled")
 	}
-	fmt.Println(http.ListenAndServe(opts.ListenAddress, loglayer(http.FileServer(http.Dir(opts.Folder)))))
+	if opts.HTTPS {
+		if opts.Certificate == "" || opts.Key == "" {
+			log.Fatal("Certificate or Key file not specified")
+		}
+		fmt.Println(http.ListenAndServeTLS(opts.ListenAddress, opts.Certificate, opts.Key, loglayer(http.FileServer(http.Dir(opts.Folder)))))
+	} else {
+		fmt.Println(http.ListenAndServe(opts.ListenAddress, loglayer(http.FileServer(http.Dir(opts.Folder)))))
+	}
 }
 
 func loglayer(handler http.Handler) http.Handler {