t

Author: colin969

legacyServer.go

@@ -19,9 +19,10 @@ import (
 // Tries to serve a legacy file if available
 func ServeLegacy(w http.ResponseWriter, r *http.Request) {
 
+	relPath := filepath.ToSlash(path.Join(r.URL.Host, r.URL.Path))
 	// @TODO PERFORM REQUEST MODIFICATION HERE
+	// parseHtaccessPath(serverSettings.LegacyHTDOCSPath, filepath.Dir(relPath), w, r)
 
-	relPath := filepath.ToSlash(path.Join(r.URL.Host, r.URL.Path))
 	relPathWithQuery := filepath.ToSlash(path.Join(r.URL.Host, r.URL.Path+url.PathEscape("?"+r.URL.RawQuery)))
 	hasQuery := r.URL.RawQuery != ""
 
@@ -274,3 +275,48 @@ func isScriptUrl(u *url.URL) bool {
 	}
 	return false
 }
+
+// func parseHtaccessPath(root string, relPath string, w http.ResponseWriter, r *http.Request) error {
+// 	// Go from top to bottom
+// 	fmt.Printf("[Legacy] Parsing htaccess files for path: %s\n", relPath)
+// 	nextDir := relPath
+// 	for {
+// 		if nextDir == "" {
+// 			return nil
+// 		}
+// 		// Find .htaccess file in next directory
+// 		htaccessPath := path.Join(root, nextDir, ".htaccess")
+// 		fmt.Printf("[Legacy] Looking for htaccess file: %s\n", htaccessPath)
+// 		file, err := os.Open(htaccessPath)
+// 		if err != nil && os.IsNotExist(err) {
+// 			return err
+// 		} else {
+// 			fmt.Printf("[Legacy] Found htaccess file: %s\n", htaccessPath)
+// 			contents, err := io.ReadAll(file)
+// 			if err != nil {
+// 				return err
+// 			}
+// 			ast, err := parser.Parse(string(contents))
+
+// 			for _, directive := range ast.Dirs {
+// 				switch directive.Name {
+// 				case "RewriteRule":
+// 					// Expect a split of 3
+// 					if len(directive.Params) != 3 {
+// 						return fmt.Errorf("Invalid RewriteRule directive?")
+// 					}
+// 					src := directive.Params[0]
+// 					dest := directive.Params[1]
+// 					flags := directive.Params[2]
+// 					fmt.Printf("[Legacy] RewriteRule: %s -> %s [%s]\n", src.RawString, dest.RawString, flags.RawString)
+// 					src.Capture([]string{path.Join(r.URL.Host, r.URL.Path)})
+// 					fmt.Printf("[Legacy] var: %s\n", src.VariableName)
+// 					fmt.Printf("[Legacy] ass: %s\n", src.AssignValue)
+// 				default:
+// 				}
+// 			}
+
+// 		}
+// 		nextDir = filepath.Dir(nextDir)
+// 	}
+// }

legacyServer_test.go

@@ -294,6 +294,46 @@ func TestServeLegacy200Script(t *testing.T) {
 	}
 }
 
+func TestServeLegacy200Htaccess(t *testing.T) {
+	htaccessData := []byte(`RewriteEngine On
+RewriteRule ^game$ /redirect [R=301,L]`)
+	htaccessFile := path.Join(testServerSettings.LegacyHTDOCSPath, "example.com", ".htaccess")
+	// Make directory path
+	err := os.MkdirAll(path.Dir(htaccessFile), os.ModePerm)
+	if err != nil {
+		t.Error(err)
+	}
+	err = os.WriteFile(htaccessFile, htaccessData, os.ModePerm)
+	if err != nil {
+		t.Error(err)
+	}
+
+	testData := []byte("success")
+	testFile := path.Join(testServerSettings.LegacyHTDOCSPath, "example.com", "redirect")
+	// 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)
+	}
+
+	test := &legacyServerTest{
+		request: makeNewRequest("GET", "http://example.com/game", nil),
+		response: &legacyServerTestResponse{
+			statusCode: http.StatusOK,
+			body:       testData,
+		},
+	}
+
+	err = test.run()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
 func TestServeLegacy200ScriptPost(t *testing.T) {
 	setup(&testServerSettings)
 

main.go

@@ -37,7 +37,6 @@ type ServerSettings struct {
 	ExtIndexTypes        []string          `json:"extIndexTypes"`
 	ExtMimeTypes         map[string]string `json:"extMimeTypes"`
 	ExtGzippeddTypes     []string          `json:"extGzippedTypes"`
-	UseMad4FP            bool              `json:"useMad4FP"`
 	HandleLegacyRequests bool              `json:"handleLegacyRequests"`
 	ExternalLegacyPort   string            `json:"externalLegacyPort"`
 	LegacyHTDOCSPath     string            `json:"legacyHTDOCSPath"`
@@ -48,6 +47,7 @@ type ServerSettings struct {
 	LegacyOverridePaths  []string          `json:"legacyOverridePaths"`
 	UseInfinityServer    bool              `json:"useInfinityServer"`
 	InfinityServerURL    string            `json:"infinityServerURL"`
+	UseMad4FP            bool              `json:"useMad4FP"`
 	EnableHttpsProxy     bool              `json:"enableHttpsProxy"`
 }