From 983b5a42e11b842633a34d2aaeede9ef06f26553 Mon Sep 17 00:00:00 2001
From: MrMelon54 <github@mrmelon54.com>
Date: Mon, 9 Oct 2023 16:42:50 +0100
Subject: [PATCH] Fix a panic in flow and cd into the test-client in run.sh

---
 server/flow.go        | 2 +-
 server/pages/pages.go | 3 ++-
 test-client/run.sh    | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/flow.go b/server/flow.go
index dab877d..dbdf982 100644
--- a/server/flow.go
+++ b/server/flow.go
@@ -76,7 +76,7 @@ func (h *HttpServer) flowCallback(rw http.ResponseWriter, req *http.Request, _ h
 	q := req.URL.Query()
 	state := q.Get("state")
 	n := strings.IndexByte(state, ':')
-	if !h.manager.CheckNamespace(state[:n]) {
+	if n == -1 || !h.manager.CheckNamespace(state[:n]) {
 		http.Error(rw, "Invalid state namespace", http.StatusBadRequest)
 		return
 	}
diff --git a/server/pages/pages.go b/server/pages/pages.go
index a0c75b0..8a2da41 100644
--- a/server/pages/pages.go
+++ b/server/pages/pages.go
@@ -3,6 +3,7 @@ package pages
 import (
 	"embed"
 	_ "embed"
+	"errors"
 	"github.com/1f349/overlapfs"
 	"html/template"
 	"io"
@@ -26,7 +27,7 @@ func LoadPages(wd string) (err error) {
 		if wd != "" {
 			wwwDir := filepath.Join(wd, "www")
 			err = os.Mkdir(wwwDir, os.ModePerm)
-			if err != nil {
+			if err != nil && !errors.Is(err, os.ErrExist) {
 				return
 			}
 			wdFs := os.DirFS(wwwDir)
diff --git a/test-client/run.sh b/test-client/run.sh
index 60aacf8..d5f47b5 100755
--- a/test-client/run.sh
+++ b/test-client/run.sh
@@ -1,2 +1,4 @@
 #!/bin/bash
+cd "$(dirname -- "$(readlink -f -- "$0";)";)"
+
 python3 -m http.server 2020