stryan/secretshop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more clean up for dirpage gen

Browse Source
This commit is contained in:
Steve 2020-02-21 16:41:16 -05:00
parent 5c6e304701
commit 694693e93c
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
server.go
View File

@ -32,7 +32,7 @@ var (
ServerContextKey = &contextKey{"gemini-server"} ServerContextKey = &contextKey{"gemini-server"}
// LocalAddrContextKey is a context key. It can be used in // LocalAddrContextKey is a context key. It can be used in
// Gopher handlers with context.WithValue to access the address // Gemini handlers with context.WithValue to access the address
// the local address the connection arrived on. // the local address the connection arrived on.
// The associated value will be of type net.Addr. // The associated value will be of type net.Addr.
LocalAddrContextKey = &contextKey{"local-addr"} LocalAddrContextKey = &contextKey{"local-addr"}
@ -169,7 +169,7 @@ func (s *Server) ParseRequest(req string) Response {
return Response{STATUS_NOT_FOUND, "Couldn't find file", ""} return Response{STATUS_NOT_FOUND, "Couldn't find file", ""}
case os.IsNotExist(err) || os.IsPermission(err): case os.IsNotExist(err) || os.IsPermission(err):
return Response{STATUS_NOT_FOUND, "File does not exist", ""} return Response{STATUS_NOT_FOUND, "File does not exist", ""}
case uint64(fi.Mode().Perm())&0444 != 0444: case isNotWorldReadable(fi):
return Response{STATUS_TEMPORARY_FAILURE, "Unable to access file", ""} return Response{STATUS_TEMPORARY_FAILURE, "Unable to access file", ""}
case fi.IsDir(): case fi.IsDir():
if strings.HasSuffix(u.Path, "/") { if strings.HasSuffix(u.Path, "/") {
@ -185,6 +185,10 @@ func (s *Server) ParseRequest(req string) Response {
func generateFile(selector string) Response { func generateFile(selector string) Response {
meta := mime.TypeByExtension(filepath.Ext(selector)) meta := mime.TypeByExtension(filepath.Ext(selector))
if meta == "" {
//assume plain UTF-8 text
meta = "text/gemini; charset=utf-8"
}
file, err := os.Open(selector) file, err := os.Open(selector)
if err != nil { if err != nil {
panic("Failed to read file") panic("Failed to read file")
@ -195,32 +199,26 @@ func generateFile(selector string) Response {
} }
func generateDirectory(path string) Response { func generateDirectory(path string) Response {
var listing string var dirpage string
files, err := ioutil.ReadDir(path) files, err := ioutil.ReadDir(path)
if err != nil { if err != nil {
log.Println(err) log.Println(err)
return Response{STATUS_TEMPORARY_FAILURE, "Unable to show directory listing", ""} return Response{STATUS_TEMPORARY_FAILURE, "Unable to show directory dirpage", ""}
} }
// Unashamedly based off solderpunks directory generation code dirpage = "# Directory Contents\r\n"
// https://tildegit.org/solderpunk/molly-brown/src/branch/master/handler.go
listing = "# Directory listing\r\n"
for _, file := range files { for _, file := range files {
// Skip dotfiles // Don't list hidden files
if strings.HasPrefix(file.Name(), ".") { if isNotWorldReadable(file) || strings.HasPrefix(file.Name(), ".") {
continue
}
// Only list world readable files
if uint64(file.Mode().Perm())&0444 != 0444 {
continue continue
} }
if file.Name() == "index.gmi" || file.Name() == "index.gemini" { if file.Name() == "index.gmi" || file.Name() == "index.gemini" {
//Found an index file, return that instead //Found an index file, return that instead
return generateFile(path + file.Name()) return generateFile(path + file.Name())
} else { } else {
listing += fmt.Sprintf("=> %s %s\r\n", file.Name(), file.Name()) dirpage += fmt.Sprintf("=> %s %s\r\n", file.Name(), file.Name())
} }
} }
return Response{STATUS_SUCCESS, "text/gemini", listing} return Response{STATUS_SUCCESS, "text/gemini", dirpage}
} }
func (c *conn) sendResponse(r Response) error { func (c *conn) sendResponse(r Response) error {
@ -230,3 +228,7 @@ func (c *conn) sendResponse(r Response) error {
} }
return nil return nil
} }
func isNotWorldReadable(file os.FileInfo) bool {
return uint64(file.Mode().Perm())&0444 != 0444
}