forks/molly-brown
1
0
Fork 0
Code Releases Activity

Make text/gemini extension configurable.

Browse source
This commit is contained in:
Solderpunk 2020-06-08 21:47:33 +02:00
parent 4681d3f971
commit b8034c1576
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
config.go
View file

@ -11,6 +11,7 @@ type Config struct {
KeyPath string KeyPath string
DocBase string DocBase string
HomeDocBase string HomeDocBase string
GeminiExt string
LogPath string LogPath string
TempRedirects map[string]string TempRedirects map[string]string
PermRedirects map[string]string PermRedirects map[string]string
@ -29,6 +30,7 @@ func getConfig(filename string) (Config, error) {
config.KeyPath = "key.pem" config.KeyPath = "key.pem"
config.DocBase = "/var/gemini/" config.DocBase = "/var/gemini/"
config.HomeDocBase = "users" config.HomeDocBase = "users"
config.GeminiExt = "gmi"
config.LogPath = "molly.log" config.LogPath = "molly.log"
config.TempRedirects = make(map[string]string) config.TempRedirects = make(map[string]string)
config.PermRedirects = make(map[string]string) config.PermRedirects = make(map[string]string)

10
handler.go
View file

@ -135,10 +135,10 @@ func handleGeminiRequest(conn net.Conn, config Config, logEntries chan LogEntry)
return return
} }
// Check for index.gmi if path is a directory // Check for index.gmi if path is a directory
index_path := filepath.Join(path, "index.gmi") index_path := filepath.Join(path, "index." + config.GeminiExt)
index_info, err := os.Stat(index_path) index_info, err := os.Stat(index_path)
if err == nil && uint64(index_info.Mode().Perm())&0444 == 0444 { if err == nil && uint64(index_info.Mode().Perm())&0444 == 0444 {
serveFile(index_path, &log, conn) serveFile(index_path, &log, conn, config)
// Serve a generated listing // Serve a generated listing
} else { } else {
conn.Write([]byte("20 text/gemini\r\n")) conn.Write([]byte("20 text/gemini\r\n"))
@ -160,7 +160,7 @@ func handleGeminiRequest(conn net.Conn, config Config, logEntries chan LogEntry)
} }
// Otherwise, serve the file contents // Otherwise, serve the file contents
serveFile(path, &log, conn) serveFile(path, &log, conn, config)
return return
} }
@ -272,11 +272,11 @@ func generatePrettyFileLabel(info os.FileInfo) string {
return fmt.Sprintf("%-40s %s %v", name, size, info.ModTime().Format("Jan _2 2006")) return fmt.Sprintf("%-40s %s %v", name, size, info.ModTime().Format("Jan _2 2006"))
} }
func serveFile(path string, log *LogEntry, conn net.Conn) { func serveFile(path string, log *LogEntry, conn net.Conn, config Config) {
// Get MIME type of files // Get MIME type of files
ext := filepath.Ext(path) ext := filepath.Ext(path)
var mimeType string var mimeType string
if ext == ".gmi" { if ext == "." + config.GeminiExt {
mimeType = "text/gemini" mimeType = "text/gemini"
} else { } else {
mimeType = mime.TypeByExtension(ext) mimeType = mime.TypeByExtension(ext)