Code review

Author: publicarray

package/src/synoedit/http_response.go

@@ -27,6 +27,7 @@ import (
 type HTTPResponse struct {
 	statusCode  int
 	Status      string
+	Server      string
 	ContentType string
 }
 
@@ -35,15 +36,16 @@ func NewHTTPResponse(statusCode int, statusMessage string) *HTTPResponse {
 	HTTPResponse := HTTPResponse{
 		statusCode:  statusCode,
 		Status:      "Status: " + fmt.Sprintf("%v", statusCode) + " " + statusMessage + "\r\n",
+		Server:      "Server: synoedit " + AppVersion + "\r\n",
 		ContentType: "Content-Type: text/html; charset=utf-8\r\n",
 	}
 	return &HTTPResponse
 }
 
 // Print http response to stdout
 func (HTTPResponse *HTTPResponse) print(str ...string) {
-	fmt.Print(HTTPResponse.Status + HTTPResponse.ContentType + "\r\n\r\n")
-	fmt.Println(strings.Join(str, " "))
+	fmt.Print(HTTPResponse.Status + HTTPResponse.ContentType + HTTPResponse.Server + "\r\n")
+	fmt.Print(strings.Join(str, " "))
 	os.Exit(0)
 }
 
@@ -66,3 +68,17 @@ func notFound(str ...string) {
 	NewHTTPResponse(404, "Not Found").print(strings.Join(str, " "))
 	os.Exit(0)
 }
+
+// Return HTML with OK status message
+func okHTML(str ...string) {
+	NewHTTPResponse(200, "OK").print(strings.Join(str, " "))
+	os.Exit(0)
+}
+
+// Return plain text with OK status message
+func okPlain(str ...string) {
+	okPlainRes := NewHTTPResponse(200, "OK")
+	okPlainRes.ContentType = "Content-Type: text/plain;\r\n"
+	okPlainRes.print(strings.Join(str, " "))
+	os.Exit(0)
+}

package/src/synoedit/main.go

@@ -146,28 +146,21 @@ func main() {
 			output := ExecuteAction(appName)
 
 			if ajax == "true" {
-				fmt.Print("Status: 200 OK\r\nContent-Type: text/plain;\r\n\r\n")
-				fmt.Print(output)
-				return
+				okPlain(output)
 			}
 			renderHTML(fileData, "Not implemented", "")
-			return
 		}
 
 		if fileData != "" && appName != "" && fileName != "" {
 			filePath := GetFilePath(appName, fileName)
 			SaveFile(filePath, fileData)
 
 			if ajax == "true" {
-				fmt.Print("Status: 200 OK\r\nContent-Type: text/plain;\r\n\r\n")
-				fmt.Print("File saved successfully!")
-				return
+				okPlain("File saved successfully!")
 			}
 			renderHTML(fileData, "File saved successfully!", "") // not complete
-			return
 		}
 		logError("No valid data submitted.")
-		return
 	}
 
 	if method == "GET" { // GET
@@ -180,9 +173,7 @@ func main() {
 
 		if ajax := readGet().Get("ajax"); ajax == "true" {
 			// expect an ajax response
-			fmt.Print("Status: 200 OK\r\nContent-Type: text/plain;\r\n\r\n")
-			fmt.Print(fileData)
-			return
+			okPlain(fileData)
 		}
 		// else respond with full html
 		renderHTML(fileData, "", "") // not complete

package/ui/test.sh

@@ -30,18 +30,18 @@ echo "example.com" > test/dnscrypt-proxy/target/var/domains-whitelist.txt
 export REQUEST_METHOD=GET
 export SERVER_PROTOCOL=HTTP/1.1
 mkdir -p test
-./index.cgi --dev | tail -n +4 > test/index.html
+./index.cgi --dev | tail -n +5 > test/index.html
 fixLinks test/index.html
 
 ## test GET file
 export REQUEST_METHOD=GET
 export QUERY_STRING="ajax=true&app=dnscrypt-proxy&file=domains-whitelist.txt"
-./index.cgi --dev | tail -n +4 > test/file.html
+./index.cgi --dev | tail -n +5 > test/file.html
 fixLinks test/file.html
 
 export REQUEST_METHOD=GET
 export QUERY_STRING="app=dnscrypt-proxy&file=domains-whitelist.txt"
-./index.cgi --dev | tail -n +4 > test/file2.html
+./index.cgi --dev | tail -n +5 > test/file2.html
 fixLinks test/file2.html
 
 export REQUEST_METHOD=POST
@@ -50,7 +50,7 @@ data="$(urlencode "google.com")"
 # echo "$data" > post.txt
 
 # echo "ListenAddresses=0.0.0.0%3A1053+&ServerNames=cloudflare+google+ " | ./index.cgi --dev
-echo "ajax=true&app=dnscrypt-proxy&file=domains-whitelist.txt&fileContent=$data" | ./index.cgi --dev | tail -n +4 > test/post.html
+echo "ajax=true&app=dnscrypt-proxy&file=domains-whitelist.txt&fileContent=$data" | ./index.cgi --dev | tail -n +5 > test/post.html
 fixLinks test/post.html
 
 export REQUEST_METHOD=POST