Add --text

Author: tehmoon

build.sh

@@ -16,13 +16,9 @@ cd src/cryptocli
 rm -rf cryptocli-*
 rm build.log || true
 
-GOPATH=$(pwd)/.go
-GOPATH=${GOPATH} go get -v ./... || true
-GOPATH=${GOPATH} go get -u -v ./... || true
+go get -v ./...
 
-(cd "$GOPATH/src/github.com/olivere/elastic/"; git fetch -t -f; git reset --hard origin/release-branch.v7)
-
-GOPATH=${GOPATH} go build -o cryptocli-new .
+go build -o cryptocli-new .
 VERSION=$(git log @ -1 --format='%H %d')
 
 compile() {
@@ -48,14 +44,14 @@ compile() {
 		-- write-file --path "${DEST}.zip"
 }
 
-compile darwin amd64
+#compile darwin amd64
 compile linux amd64
-compile linux 386
-compile linux arm64
-compile windows amd64
-compile windows 386
-compile openbsd amd64
-compile netbsd amd64
+#compile linux 386
+#compile linux arm64
+#compile windows amd64
+#compile windows 386
+#compile openbsd amd64
+#compile netbsd amd64
 
 mv cryptocli-new cryptocli
 

src/cryptocli/httpServer.go

@@ -26,6 +26,7 @@ type HTTPServer struct {
 	headers []string
 	showClientHeaders bool
 	showServerHeaders bool
+	text bool
 }
 
 var HTTPServerFormUploadPage = []byte(`
@@ -53,6 +54,7 @@ func (m *HTTPServer) SetFlagSet(fs *pflag.FlagSet, args []string) {
 	fs.StringVar(&m.user, "user", "", "Specify the required user for basic auth")
 	fs.StringVar(&m.password, "password", "", "Specify the required password for basic auth")
 	fs.StringVar(&m.redirect, "redirect-to", "", "Redirect the request to where the download can begin")
+	fs.BoolVar(&m.text, "text", false, "Set headers to show the content as text/plain rather than as an attachment")
 }
 
 func HTTPServerHandleResponse(m *HTTPServer, w http.ResponseWriter, req *http.Request, relay *HTTPServerRelayer) {
@@ -107,8 +109,20 @@ func HTTPServerHandleResponse(m *HTTPServer, w http.ResponseWriter, req *http.Re
 		return
 	}
 
-	w.Header().Add("Content-Type", "application/octet-stream")
-	w.Header().Add("Content-Disposition", "attachment;")
+	if w.Header().Get("Content-Type") == "" {
+		w.Header().Set("Content-Type", "application/octet-stream")
+	}
+
+	if w.Header().Get("Content-Disposition") == "" {
+		w.Header().Set("Content-Disposition", "attachment;")
+	}
+
+	// Override headers if --text is set
+	if m.text {
+		w.Header().Set("Content-Type", "text/plain")
+		w.Header().Set("Content-Disposition", "inline;")
+	}
+
 	if m.showServerHeaders {
 		ShowHTTPServerHeaders(w.Header())
 	}