Force unchunk body for php?

Author: colin969

legacyServer.go

@@ -177,6 +177,7 @@ func ServeLegacy(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// No response from any method, assume not found
+	fmt.Printf("[Legacy] 404 Not Found: %s\n", r.URL)
 	http.NotFound(w, r)
 }
 

legacyServer_test.go

@@ -145,7 +145,7 @@ func TestServeLegacy404(t *testing.T) {
 	setup(&testServerSettings)
 
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "https://example.com/404-example"),
+		request: makeNewRequest("GET", "https://example.com/404-example", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusNotFound,
 		},
@@ -176,7 +176,7 @@ func TestServeLegacy200(t *testing.T) {
 	headers := &http.Header{}
 	headers.Set("Content-Length", strconv.Itoa(len(testData)))
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://example.com/test.txt"),
+		request: makeNewRequest("GET", "http://example.com/test.txt", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			headers:    headers,
@@ -216,7 +216,7 @@ func TestServeLegacy200WithQuery(t *testing.T) {
 	headers := &http.Header{}
 	headers.Set("Content-Length", strconv.Itoa(len(testDataQuery)))
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://example.com/test.txt?query=true"),
+		request: makeNewRequest("GET", "http://example.com/test.txt?query=true", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			headers:    headers,
@@ -248,7 +248,7 @@ func TestServeLegacy200Index(t *testing.T) {
 	headers := &http.Header{}
 	headers.Set("Content-Length", strconv.Itoa(len(testData)))
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://example.com/"),
+		request: makeNewRequest("GET", "http://example.com/", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			headers:    headers,
@@ -281,7 +281,7 @@ func TestServeLegacy200Script(t *testing.T) {
 	headers := &http.Header{}
 	headers.Set("Content-Length", strconv.Itoa(len(testStr)))
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://example.com/index.php"),
+		request: makeNewRequest("GET", "http://example.com/index.php", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			headers:    headers,
@@ -294,11 +294,47 @@ func TestServeLegacy200Script(t *testing.T) {
 	}
 }
 
+func TestServeLegacy200ScriptPost(t *testing.T) {
+	setup(&testServerSettings)
+
+	// Write a test file
+	testStr := "success"
+	testData := []byte(`<?php
+	$data = $_POST['data'];
+	echo "$data"; ?>`)
+	testFile := path.Join(testServerSettings.LegacyCGIBINPath, "example.com", "index.php")
+	// Make directory path
+	err := os.MkdirAll(path.Dir(testFile), os.ModePerm)
+	if err != nil {
+		t.Error(err)
+	}
+	err = os.WriteFile(testFile, testData, os.ModePerm)
+	if err != nil {
+		t.Error(err)
+	}
+
+	headers := &http.Header{}
+	headers.Set("Content-Length", strconv.Itoa(len(testStr)))
+	test := &legacyServerTest{
+		request: makeNewRequest("POST", "http://example.com/index.php", bytes.NewBuffer([]byte(fmt.Sprintf(`data=%s`, testStr)))),
+		response: &legacyServerTestResponse{
+			statusCode: http.StatusOK,
+			headers:    headers,
+		},
+	}
+	test.request.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+
+	err = test.run()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
 func TestServeLegacyDisabledOnline(t *testing.T) {
 	setup(&testServerSettings)
 
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://andkon.com/grey/grey.swf"),
+		request: makeNewRequest("GET", "http://andkon.com/grey/grey.swf", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusNotFound,
 		},
@@ -319,7 +355,7 @@ func TestServeLegacyOnline200(t *testing.T) {
 	headers := &http.Header{}
 	headers.Set("Content-Length", "1065015")
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://andkon.com/grey/grey.swf"),
+		request: makeNewRequest("GET", "http://andkon.com/grey/grey.swf", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			savedFile:  &savedFile,
@@ -340,7 +376,7 @@ func TestServeLegacyOnline200Index(t *testing.T) {
 
 	savedFile := path.Join(settings.LegacyHTDOCSPath, "kongregate.com", "ChuckTheSheep", "index.htm")
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://kongregate.com/ChuckTheSheep/"),
+		request: makeNewRequest("GET", "http://kongregate.com/ChuckTheSheep/", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			savedFile:  &savedFile,
@@ -357,7 +393,7 @@ func TestServeLegacyDisabledMad4fp(t *testing.T) {
 	setup(&testServerSettings)
 
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://flashpointarchive.org/images/logo.svg"),
+		request: makeNewRequest("GET", "http://flashpointarchive.org/images/logo.svg", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusNotFound,
 		},
@@ -376,7 +412,7 @@ func TestServeLegacyMad4fp200(t *testing.T) {
 
 	savedFile := path.Join(settings.LegacyHTDOCSPath, "content", "flashpointarchive.org", "images", "logo.svg")
 	test := &legacyServerTest{
-		request: makeNewRequest("GET", "http://flashpointarchive.org/images/logo.svg"),
+		request: makeNewRequest("GET", "http://flashpointarchive.org/images/logo.svg", nil),
 		response: &legacyServerTestResponse{
 			statusCode: http.StatusOK,
 			savedFile:  &savedFile,
@@ -389,11 +425,10 @@ func TestServeLegacyMad4fp200(t *testing.T) {
 	}
 }
 
-func makeNewRequest(method string, url string) *http.Request {
-	request, err := http.NewRequest(method, url, nil)
+func makeNewRequest(method string, url string, body io.Reader) *http.Request {
+	request, err := http.NewRequest(method, url, body)
 	if err != nil {
 		panic(err)
 	}
-
 	return request
 }

main.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"io"
 	"io/ioutil"
 	"log"
 	"net"
@@ -80,15 +81,17 @@ func initServer() {
 	verboseLogging := flag.Bool("v", false, "should every proxy request be logged to stdout")
 	proxyPort := flag.Int("proxyPort", 22500, "proxy listen port")
 	serverHTTPPort := flag.Int("serverHttpPort", 22501, "zip server http listen port")
-	gameRootPath := flag.String("gameRootPath", "D:\\Flashpoint\\Data\\Games", "This is the path where to find the zips")
+	gameRootPath := flag.String("gameRootPath", serverSettings.GameRootPath, "This is the path where to find the zips")
 	rootPath := flag.String("rootPath", "D:\\Flashpoint", "The path that other relative paths use as a base")
 	apiPrefix := flag.String("apiPrefix", "/fpProxy/api", "apiPrefix is used to prefix any API call.")
 	useMad4FP := flag.Bool("UseMad4FP", false, "flag to turn on/off Mad4FP.")
 	externalLegacyPort := flag.String("externalLegacyPort", "22600", "The port that the external legacy server is running on (if handling legacy is disabled).")
-	legacyHTDOCSPath := flag.String("legacyHTDOCSPath", "D:\\Flashpoint\\Legacy\\htdocs", "This is the path for HTDOCS")
-	phpCgiPath := flag.String("phpCgiPath", "D:\\Flashpoint\\Legacy\\php-cgi.exe", "Path to PHP CGI executable")
+	legacyHTDOCSPath := flag.String("legacyHTDOCSPath", serverSettings.LegacyHTDOCSPath, "This is the path for HTDOCS")
+	phpCgiPath := flag.String("phpCgiPath", serverSettings.PhpCgiPath, "Path to PHP CGI executable")
 	useInfinityServer := flag.Bool("useInfinityServer", false, "Whether to use the infinity server or not")
-	infinityServerURL := flag.String("infinityServerURL", "https://example.com/", "The URL of the infinity server")
+	infinityServerURL := flag.String("infinityServerURL", serverSettings.InfinityServerURL, "The URL of the infinity server")
+	legacyCGIBINPath := flag.String("legacyCGIBINPath", serverSettings.LegacyCGIBINPath, "This is the path for CGI-BIN")
+	handleLegacyRequests := flag.Bool("handleLegacyRequests", false, "Whether to handle legacy requests internally (true) or externally (false)")
 
 	flag.Parse()
 
@@ -104,6 +107,11 @@ func initServer() {
 	serverSettings.ApiPrefix = *apiPrefix
 	serverSettings.UseMad4FP = *useMad4FP
 	serverSettings.ExternalLegacyPort = *externalLegacyPort
+	serverSettings.LegacyCGIBINPath, err = filepath.Abs(path.Join(serverSettings.RootPath, strings.Trim(*legacyCGIBINPath, "\"")))
+	if err != nil {
+		fmt.Printf("Failed to get absolute cgi-bin path")
+		return
+	}
 	serverSettings.LegacyHTDOCSPath, err = filepath.Abs(path.Join(serverSettings.RootPath, strings.Trim(*legacyHTDOCSPath, "\"")))
 	if err != nil {
 		fmt.Printf("Failed to get absolute htdocs path")
@@ -121,11 +129,14 @@ func initServer() {
 	}
 	serverSettings.UseInfinityServer = *useInfinityServer
 	serverSettings.InfinityServerURL = *infinityServerURL
+	serverSettings.HandleLegacyRequests = *handleLegacyRequests
 
 	// Print out all path settings
 	fmt.Printf("Root Path: %s\n", serverSettings.RootPath)
 	fmt.Printf("PHP CGI Path: %s\n", serverSettings.PhpCgiPath)
 	fmt.Printf("Legacy HTDOCS Path: %s\n", serverSettings.LegacyHTDOCSPath)
+	fmt.Printf("Legacy CGI BIN Path: %s\n", serverSettings.LegacyCGIBINPath)
+	fmt.Printf("Games Path: %s\n", serverSettings.GameRootPath)
 
 	//Setup the proxy.
 	proxy = goproxy.NewProxyHttpServer()
@@ -188,6 +199,8 @@ func setContentType(r *http.Request, resp *http.Response) {
 func handleRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http.Response) {
 	// Remove port from host if exists (old apps don't clean it before sending requests?)
 	r.URL.Host = strings.Split(r.URL.Host, ":")[0]
+	// Clone the body into both requests by reading and making 2 new readers
+	contents, _ := ioutil.ReadAll(r.Body)
 
 	// Copy the original request
 	gamezipRequest := &http.Request{
@@ -199,12 +212,9 @@ func handleRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http
 			RawQuery: r.URL.RawQuery,
 		},
 		Header: r.Header,
-		Body:   r.Body,
+		Body:   nil,
 	}
-
-	// Clone the body into both requests by reading and making 2 new readers
-	contents, _ := ioutil.ReadAll(r.Body)
-	gamezipRequest.Body = ioutil.NopCloser(bytes.NewReader(contents))
+	gamezipRequest.Body = io.NopCloser(bytes.NewReader(contents))
 
 	// Make the request to the zip server.
 	client := &http.Client{}
@@ -231,7 +241,7 @@ func handleRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http
 				RawQuery: r.URL.RawQuery,
 			},
 			Header: r.Header,
-			Body:   r.Body,
+			Body:   nil,
 		}
 		// Copy in a new body reader
 		legacyRequest.Body = ioutil.NopCloser(bytes.NewReader(contents))
@@ -273,6 +283,8 @@ func handleRequest(r *http.Request, ctx *goproxy.ProxyCtx) (*http.Request, *http
 	setContentType(r, proxyResp)
 
 	// Add extra headers
+	proxyResp.Header.Set("Access-Control-Allow-Headers", "*")
+	proxyResp.Header.Set("Access-Control-Allow-Methods", "*")
 	proxyResp.Header.Set("Access-Control-Allow-Origin", "*")
 	// Keep Alive
 	if strings.ToLower(r.Header.Get("Connection")) == "keep-alive" {

proxySettings.json

@@ -1,8 +1,11 @@
 {
+  "rootPath": "../",
   "legacyHTDOCSPath": "Legacy/htdocs/",
   "legacyCGIBINPath": "Legacy/cgi-bin/",
   "legacyPHPPath": "Legacy/",
-  "rootPath": "../",
+  "gameRootPath": "Data/Games/",
+  "phpCgiPath": "Legacy/php-cgi.exe",
+  "infinityServerURL": "https://infinity.unstable.life/Flashpoint/Legacy/htdocs/",
   "overridePaths": [
     "../Legacy/middleware_overrides/"
   ],