extern/zrok
1
1
Fork 0
mirror of https://github.com/openziti/zrok.git synced 2024-11-29 03:24:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

update middleware for agent ui to work properly on windows (#221)

Browse Source
This commit is contained in:
Michael Quigley 2024-10-04 12:59:16 -04:00
parent 03c2f1e1a6
commit 5d8da3c589
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
5 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
agent/agentUi/middleware.go
View File

@ -1,6 +1,7 @@
package agentUi
import (
"github.com/sirupsen/logrus"
"io/fs"
"net/http"
"os"
@ -8,6 +9,8 @@ import (
"strings"
)
const staticPath = "dist"
func Middleware(handler http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(r.URL.Path, "/v1") {
@ -15,23 +18,13 @@ func Middleware(handler http.Handler) http.Handler {
return
}
staticPath := "dist"
indexPath := "index.html"
path := filepath.ToSlash(filepath.Join(staticPath, r.URL.Path))
logrus.Debugf("path = %v", path)
// get the absolute path to prevent directory traversal
path, err := filepath.Abs(r.URL.Path)
if err != nil {
// if we failed to get the absolute path respond with a 400 bad request and stop
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
// prepend the path with the path to the static directory
path = filepath.Join(staticPath, path)
_, err = FS.Open(path)
f, err := FS.Open(path)
if os.IsNotExist(err) {
// file does not exist, serve index.gohtml
index, err := FS.ReadFile(filepath.Join(staticPath, indexPath))
index, err := FS.ReadFile(filepath.ToSlash(filepath.Join(staticPath, "index.html")))
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
@ -47,6 +40,7 @@ func Middleware(handler http.Handler) http.Handler {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
defer func() { _ = f.Close() }()
// get the subdirectory of the static dir
if statics, err := fs.Sub(FS, staticPath); err == nil {

1
agent/proctree/impl_windows.go
View File

@ -3,6 +3,7 @@
package proctree
import (
"github.com/kolesnikovae/go-winjob"
"golang.org/x/sys/windows"
"os/exec"
"sync"

1
agent/proctree/proctree.go
View File

@ -2,6 +2,7 @@ package proctree
import (
"fmt"
_ "github.com/kolesnikovae/go-winjob"
"io"
"os/exec"
"sync"

1
go.mod
View File

@ -28,6 +28,7 @@ require (
github.com/jedib0t/go-pretty/v6 v6.4.3
github.com/jessevdk/go-flags v1.6.1
github.com/jmoiron/sqlx v1.3.5
github.com/kolesnikovae/go-winjob v1.0.0
github.com/lib/pq v1.10.9
github.com/mattn/go-sqlite3 v1.14.18
github.com/michaelquigley/cf v0.0.13

3
go.sum
View File

@ -588,6 +588,8 @@ github.com/klauspost/compress v1.17.8/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ib
github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
github.com/kolesnikovae/go-winjob v1.0.0 h1:OKEtCHB3sYNAiqNwGDhf08Y6luM7C8mP+42rp1N6SeE=
github.com/kolesnikovae/go-winjob v1.0.0/go.mod h1:k0joOLP3/NBrRmDQjPV2+oN1TPmEWt6arTNtFjVeQuM=
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
@ -1225,6 +1227,7 @@ golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=