More legacy tests and functions

Author: colin969

legacyServer.go

@@ -94,6 +94,7 @@ func ServeLegacy(w http.ResponseWriter, r *http.Request) {
 			// If it's a PHP file, let CGI handle instead
 			for _, ext := range serverSettings.ExtScriptTypes {
 				if filepath.Ext(filePath) == "."+ext {
+					fmt.Printf("[Legacy] Executing script file: %s\n", filepath.ToSlash(filePath))
 					zipfs.Cgi(w, r, serverSettings.PhpCgiPath, filePath)
 					return
 				}
@@ -121,6 +122,10 @@ func ServeLegacy(w http.ResponseWriter, r *http.Request) {
 	if serverSettings.UseInfinityServer {
 		serverUrl := strings.TrimRight(serverSettings.InfinityServerURL, "/")
 		for _, filePath := range append(exactFilePaths, indexFilePaths...) {
+			// Do not attempt to run server side scripts
+			if isScriptFile(filePath) {
+				continue
+			}
 			// Create a new request to the online server
 			relPath, err := filepath.Rel(serverSettings.LegacyHTDOCSPath, filePath)
 			if err != nil {
@@ -148,15 +153,18 @@ func ServeLegacy(w http.ResponseWriter, r *http.Request) {
 
 	// 3. Special Behaviour (MAD4FP)
 	if serverSettings.UseMad4FP {
-		// Clone the entire request, to keep headers intact for better scraping
-		liveReq := r.Clone(r.Context())
-		liveReq.Header.Set("User-Agent", "Flashpoint Game Server MAD4FP")
-		// Perform request
-		resp, err := DoWebRequest(liveReq, client, 0)
-		// If 200, serve and save
-		if err == nil {
-			serveLiveResponse(w, resp, exactContentPath, successCloser, "MAD4FP")
-			return
+		// Do not attempt to run server side scripts
+		if !isScriptUrl(r.URL) {
+			// Clone the entire request, to keep headers intact for better scraping
+			liveReq := r.Clone(r.Context())
+			liveReq.Header.Set("User-Agent", "Flashpoint Game Server MAD4FP")
+			// Perform request
+			resp, err := DoWebRequest(liveReq, client, 0)
+			// If 200, serve and save
+			if err == nil {
+				serveLiveResponse(w, resp, exactContentPath, successCloser, "MAD4FP")
+				return
+			}
 		}
 	}
 
@@ -239,3 +247,21 @@ func DoWebRequest(r *http.Request, client *http.Client, depth int) (*http.Respon
 	}
 	return resp, fmt.Errorf(resp.Status)
 }
+
+func isScriptFile(filePath string) bool {
+	for _, ext := range serverSettings.ExtScriptTypes {
+		if filepath.Ext(filePath) == "."+ext {
+			return true
+		}
+	}
+	return false
+}
+
+func isScriptUrl(u *url.URL) bool {
+	for _, ext := range serverSettings.ExtScriptTypes {
+		if filepath.Ext(u.Path) == "."+ext {
+			return true
+		}
+	}
+	return false
+}

legacyServer_test.go

@@ -38,6 +38,7 @@ var testServerSettings = ServerSettings{
 	ExtIndexTypes: []string{
 		"htm", "html", "php",
 	},
+	PhpCgiPath: `J:\Data\Flashpoint\Legacy\php-cgi.exe`,
 }
 
 func setup(settings *ServerSettings) {
@@ -248,6 +249,39 @@ func TestServeLegacy200Index(t *testing.T) {
 	}
 }
 
+func TestServeLegacy200Script(t *testing.T) {
+	setup(&testServerSettings)
+
+	// Write a test file
+	testStr := "success"
+	testData := []byte(fmt.Sprintf("<?php echo \"%s\"; ?>", testStr))
+	testFile := path.Join(testServerSettings.LegacyHTDOCSPath, "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("GET", "http://example.com/index.php"),
+		response: &legacyServerTestResponse{
+			statusCode: http.StatusOK,
+			headers:    headers,
+		},
+	}
+
+	err = test.run()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
 func TestServeLegacyDisabledOnline(t *testing.T) {
 	setup(&testServerSettings)
 
@@ -287,6 +321,26 @@ func TestServeLegacyOnline200(t *testing.T) {
 	}
 }
 
+func TestServeLegacyOnline200Index(t *testing.T) {
+	settings := testServerSettings
+	settings.UseInfinityServer = true
+	setup(&settings)
+
+	savedFile := path.Join(settings.LegacyHTDOCSPath, "kongregate.com", "ChuckTheSheep", "index.htm")
+	test := &legacyServerTest{
+		request: makeNewRequest("GET", "http://kongregate.com/ChuckTheSheep/"),
+		response: &legacyServerTestResponse{
+			statusCode: http.StatusOK,
+			savedFile:  &savedFile,
+		},
+	}
+
+	err := test.run()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
 func TestServeLegacyDisabledMad4fp(t *testing.T) {
 	setup(&testServerSettings)