ecliptik
/
molly-brown
forked from solderpunk/molly-brown
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix trailing slash redirects.

This commit is contained in:
Solderpunk 2020-06-04 21:32:20 +02:00
parent 920f06597f
commit de119aa0bb
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
handler.go
View File

@ -115,10 +115,17 @@ func handleGeminiRequest(conn net.Conn, config Config, logEntries chan LogEntry)
log.Status = 31
return
}
// Check for index.gmi if path is a directory
index_path := filepath.Join(path, "index.gmi")
index_info, err := os.Stat(index_path)
if err == nil && uint64(index_info.Mode().Perm())&0444 == 0444 {
serveFile(index_path, log, conn)
// Serve a generated listing
conn.Write([]byte("20 text/gemini\r\n"))
log.Status = 20
conn.Write([]byte(generateDirectoryListing(path)))
} else {
conn.Write([]byte("20 text/gemini\r\n"))
log.Status = 20
conn.Write([]byte(generateDirectoryListing(path)))
}
return
}
@ -150,17 +157,6 @@ func resolvePath(path string, config Config) (string, os.FileInfo, error) {
if err != nil {
return "", nil, err
}
// Check for index.gmi if path is a directory
if info.IsDir() {
index_path := filepath.Join(path, "index.gmi")
index_info, err := os.Stat(index_path)
if err == nil {
path = index_path
info = index_info
} else if os.IsPermission(err) {
return "", nil, err
}
}
return path, info, nil
}