From 7b6921b8d61b2e13ec1b3b39b2de6e12500db9fe Mon Sep 17 00:00:00 2001
From: Caleb Gardner <calebq23@gmail.com>
Date: Sat, 15 Apr 2023 17:48:31 -0500
Subject: [PATCH] Simplified tls keys

---
 web.go | 34 +++++++++++++++-------------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/web.go b/web.go
index 540bb93..a38db70 100644
--- a/web.go
+++ b/web.go
@@ -26,27 +26,12 @@ func webserver() {
 		quitChan <- "web arg"
 		return
 	}
-	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	http.Handle("/SWAssistant/", swaHandler{})
 	http.Handle("/", http.FileServer(http.Dir(path)))
+	http.Handle("/SWAssistant/", swaHandler{})
+	http.Handle("/CDR/", cdrHandler{})
 	http.Handle("rpg.darkstorm.tech/", sup{})
 	http.DefaultTransport.(*http.Transport).TLSClientConfig = &tls.Config{InsecureSkipVerify: true}
-	tlsConf := &tls.Config{
-		InsecureSkipVerify: true,
-	}
-	cert, err := tls.LoadX509KeyPair(keyPath+"/cert.pem", keyPath+"/key.pem")
-	if err != nil {
-		log.Println("Error while serving website:", err)
-		quitChan <- "web err"
-		return
-	}
-	tlsConf.Certificates = append(tlsConf.Certificates, cert)
-	serve := http.Server{
-		Addr:      ":443",
-		TLSConfig: tlsConf,
-	}
-	err = serve.ListenAndServeTLS("", "")
-	// err := http.ListenAndServeTLS(":443", keyPath+"/cert.pem", keyPath+"/key.pem", nil)
+	err := http.ListenAndServeTLS(":443", keyPath+"/cert.pem", keyPath+"/key.pem", nil)
 	log.Println("Error while serving website:", err)
 	quitChan <- "web err"
 }
@@ -65,7 +50,7 @@ func (s sup) ServeHTTP(writer http.ResponseWriter, req *http.Request) {
 
 type swaHandler struct{}
 
-func (s swaHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request) {
+func (swaHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request) {
 	if _, err := os.Open(path.Join(flag.Arg(0) + req.URL.EscapedPath())); strings.Contains(req.URL.EscapedPath(), "#") || err == nil {
 		http.FileServer(http.Dir(flag.Arg(0))).ServeHTTP(writer, req)
 	} else {
@@ -73,3 +58,14 @@ func (s swaHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request) {
 		// log.Println("https://darkstorm.tech/SWAssistant/#" + strings.TrimPrefix(req.URL.EscapedPath(), "/SWAssistant"))
 	}
 }
+
+type cdrHandler struct{}
+
+func (cdrHandler) ServeHTTP(writer http.ResponseWriter, req *http.Request) {
+	if _, err := os.Open(path.Join(flag.Arg(0) + req.URL.EscapedPath())); strings.Contains(req.URL.EscapedPath(), "#") || err == nil {
+		http.FileServer(http.Dir(flag.Arg(0))).ServeHTTP(writer, req)
+	} else {
+		http.Redirect(writer, req, "https://darkstorm.tech/CDR/#"+strings.TrimPrefix(req.URL.EscapedPath(), "/CDR"), http.StatusFound)
+		// log.Println("https://darkstorm.tech/SWAssistant/#" + strings.TrimPrefix(req.URL.EscapedPath(), "/SWAssistant"))
+	}
+}