This commit is contained in:
2024-10-15 22:23:09 +02:00
parent 6cf141bfd9
commit 403ded509a
2 changed files with 24 additions and 27 deletions

View File

@@ -5,6 +5,7 @@ import (
"net/http" "net/http"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5"
"github.com/go-chi/chi/v5/middleware" "github.com/go-chi/chi/v5/middleware"
@@ -36,17 +37,7 @@ func main() {
workdir = "./data" workdir = "./data"
} }
settings, err := database.GetSettings(1) // Assuming user ID 1 for now fs := filesystem.New(workdir)
if err != nil {
log.Print("Settings not found, using default settings")
}
fs := filesystem.New(workdir, &settings)
if settings.Settings.GitEnabled {
if err := fs.InitializeGitRepo(); err != nil {
log.Fatal(err)
}
}
// Set up router // Set up router
r := chi.NewRouter() r := chi.NewRouter()
@@ -64,21 +55,27 @@ func main() {
staticPath = "../frontend/dist" staticPath = "../frontend/dist"
} }
fileServer := http.FileServer(http.Dir(staticPath)) fileServer := http.FileServer(http.Dir(staticPath))
r.Get("/*", func(w http.ResponseWriter, r *http.Request) { r.Get(
"/*",
func(w http.ResponseWriter, r *http.Request) {
requestedPath := r.URL.Path requestedPath := r.URL.Path
validatedPath, err := filesystem.ValidatePath(staticPath, requestedPath)
if err != nil { fullPath := filepath.Join(staticPath, requestedPath)
cleanPath := filepath.Clean(fullPath)
if !strings.HasPrefix(cleanPath, staticPath) {
http.Error(w, "Invalid path", http.StatusBadRequest) http.Error(w, "Invalid path", http.StatusBadRequest)
return return
} }
_, err = os.Stat(validatedPath) _, err = os.Stat(cleanPath)
if os.IsNotExist(err) { if os.IsNotExist(err) {
http.ServeFile(w, r, filepath.Join(staticPath, "index.html")) http.ServeFile(w, r, filepath.Join(staticPath, "index.html"))
return return
} }
http.StripPrefix("/", fileServer).ServeHTTP(w, r) http.StripPrefix("/", fileServer).ServeHTTP(w, r)
}) },
)
// Start server // Start server
port := os.Getenv("NOVAMD_PORT") port := os.Getenv("NOVAMD_PORT")