Skip to content

prevent dir listing for more restricted deployment environment #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tsingakbar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prevent dir listing for more restricted deployment environment #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion golang/websockify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package main

import (
"flag"
"io/fs"
"log"
"net"
"net/http"
Expand Down Expand Up @@ -108,6 +109,28 @@ func serveWs(w http.ResponseWriter, r *http.Request) {
go forwardWeb(ws, vnc)
}

type fsWithoutDirListing struct {
http.FileSystem
}

func (nfs fsWithoutDirListing) Open(path string) (http.File, error) {
f, err := nfs.FileSystem.Open(path)
if err != nil {
return nil, err
}

s, err := f.Stat()
if err != nil {
return nil, err
}
if s.IsDir() {
f.Close()
return nil, fs.ErrPermission
}

return f, nil
}

func main() {
flag.Parse()
log.SetFlags(0)
Expand All @@ -118,7 +141,7 @@ func main() {

if *web != path {
log.Printf("Serving %s at %s", *web, *sourceAddr)
http.Handle("/", http.FileServer(http.Dir(*web)))
http.Handle("/", http.FileServer(fsWithoutDirListing{http.Dir(*web)}))
}
log.Printf("Serving WS of %s at %s", *targetAddr, *sourceAddr)
http.HandleFunc("/websockify", serveWs)
Expand Down