GZIP and better ports

2 files changed, 51 insertions, 4 deletions

diff --git a/main.go b/main.go
index eb30bf7..28b865f 100644
--- a/main.go
+++ b/main.go
@@ -1,12 +1,18 @@
 package main
 
 import (
+	"flag"
 	"log"
 	"net/http"
 	"os"
 	"strings"
 )
 
+var (
+	fullchain = "/etc/letsencrypt/live/alexscerba.com/fullchain.pem"
+	privkey   = "/etc/letsencrypt/live/alexscerba.com/privkey.pem"
+)
+
 type application struct {
 	errorLog *log.Logger
 	infoLog  *log.Logger
@@ -36,6 +42,9 @@ func (app *application) wwwRedirect(h http.Handler) http.Handler {
 }
 
 func main() {
+	addr := flag.String("addr", ":4000", "HTTP Network Address")
+	flag.Parse() // required before flag is used
+
 	infoLog := log.New(os.Stdout, "INFO\t", log.Ldate|log.Ltime)
 	errorLog := log.New(os.Stderr, "ERROR\t", log.Ldate|log.Ltime|log.Lshortfile)
 
@@ -59,8 +68,14 @@ func main() {
 
 	www := app.wwwRedirect(mux)
 
-	infoLog.Println("Starting server...")
-	go http.ListenAndServe(":80", http.HandlerFunc(app.httpsRedirect))
-	errorLog.Fatal(http.ListenAndServeTLS(":443", "/etc/letsencrypt/live/alexscerba.com/fullchain.pem", "/etc/letsencrypt/live/alexscerba.com/privkey.pem", www))
-	//errorLog.Fatal(http.ListenAndServe(":4000", mux)) // for local dev because I'm lazy
+	if *addr == ":443" {
+		infoLog.Printf("Starting TLS server on %s...\n", *addr)
+		go http.ListenAndServe(":80", www)
+		err := http.ListenAndServeTLS(*addr, fullchain, privkey, gzipHandler(www))
+		log.Fatal(err)
+	} else {
+		infoLog.Printf("Starting server on %s...\n", *addr)
+		err := http.ListenAndServe(*addr, gzipHandler(www))
+		log.Fatal(err)
+	}
 }
diff --git a/middle.go b/middle.go
new file mode 100644
index 0000000..29b49a6
--- /dev/null
+++ b/middle.go
@@ -0,0 +1,32 @@
+package main
+
+import (
+	"compress/gzip"
+	"io"
+	"net/http"
+	"strings"
+)
+
+type gzipResponseWriter struct {
+	io.Writer
+	http.ResponseWriter
+}
+
+func (grw gzipResponseWriter) Write(data []byte) (int, error) {
+	return grw.Writer.Write(data)
+}
+
+func gzipHandler(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if !strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
+			next.ServeHTTP(w, r)
+			return
+		}
+
+		w.Header().Set("Content-Encoding", "gzip")
+		gzipWriter := gzip.NewWriter(w)
+		defer gzipWriter.Close()
+		gzippedResponseWriter := gzipResponseWriter{Writer: gzipWriter, ResponseWriter: w}
+		next.ServeHTTP(gzippedResponseWriter, r)
+	})
+}