`)
@@ -266,7 +283,7 @@ func MakeAlbumPage(album musicindex.Album) AlbumPage {
p.Album = album
p.bodyHTML = b.String()
- return p
+ return
}
func (p AlbumPage) SourceFile() string { return "base.html" }
diff --git a/server/server.go b/server/server.go
index ea8040d..a0a8ca9 100644
--- a/server/server.go
+++ b/server/server.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2026 Jeremy Baxter.
+// HTTP music server
+
package server
import (
@@ -25,6 +28,16 @@ var artistPages map[string]map[string]ArtistPage
// mapping of artist names to album names to pages
var albumPages map[string]map[string]AlbumPage
+func httpErrorReason(w http.ResponseWriter, error int, reason string) {
+ errorName := fmt.Sprintf("%d %s", error, http.StatusText(error))
+ w.WriteHeader(error)
+ writePage(MakeErrorPage(errorName, reason), w)
+}
+
+func httpError(w http.ResponseWriter, error int) {
+ httpErrorReason(w, error, "")
+}
+
func doIndexPage(w http.ResponseWriter, req *http.Request) {
writePage(indexPage, w)
}
@@ -61,13 +74,13 @@ func detectTextType(fileName string) string {
func serveStaticFiles(w http.ResponseWriter, req *http.Request) {
if strings.HasPrefix(req.RequestURI, "/static/templates/") {
- http.Error(w, "forbidden", http.StatusForbidden)
+ httpError(w, http.StatusForbidden)
return
}
contents, err := staticFS.ReadFile(req.RequestURI[1:])
if err != nil {
- http.Error(w, err.Error(), http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
return
}
@@ -83,30 +96,31 @@ func serveStaticFiles(w http.ResponseWriter, req *http.Request) {
func serveMediaDirectory(w http.ResponseWriter, req *http.Request) {
path, err := url.QueryUnescape("/" + strings.SplitN(req.RequestURI[1:], "/", 2)[1])
if err != nil {
- http.Error(w, "bad request", http.StatusBadRequest)
+ httpError(w, http.StatusBadRequest)
return
}
filePath := musicindex.MediaDirectory() + path
- if strings.Contains(path, "/..") || strings.Contains(path, "/.") {
- http.Error(w, "forbidden", http.StatusForbidden)
+ if strings.Contains(path, "/../") || strings.Contains(path, "/./") {
+ httpError(w, http.StatusForbidden)
return
}
stat, err := os.Stat(filePath)
if err != nil {
- http.Error(w, "not found", http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
return
}
if stat.IsDir() {
- http.Error(w, "is a directory; maybe you are looking for " + path, http.StatusForbidden)
+ httpErrorReason(w, http.StatusForbidden,
+ "is a directory; maybe you are looking for " + path)
return
}
f, err := os.Open(filePath)
if err != nil {
- http.Error(w, "not found", http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
return
}
defer f.Close()
@@ -117,14 +131,14 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
// test artist
rx, err := regexp.Compile("^/([^/?]+)/?(\\?.*)?$")
if err != nil {
- http.Error(w, "internal server error", http.StatusInternalServerError)
+ httpError(w, http.StatusInternalServerError)
return
}
if (rx.MatchString(req.RequestURI)) {
artist, err := url.QueryUnescape(rx.FindStringSubmatch(req.RequestURI)[1])
if err != nil {
- http.Error(w, "bad request", http.StatusBadRequest)
+ httpError(w, http.StatusBadRequest)
return
}
if musicindex.ArtistExists(artist) {
@@ -139,14 +153,14 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
}
// artist not found
- http.Error(w, "not found", http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
return
}
// test album tarball
rx, err = regexp.Compile("^/([^/?]+)/([^/?]+)\\.tar\\.gz$")
if err != nil {
- http.Error(w, "internal server error", http.StatusInternalServerError)
+ httpError(w, http.StatusInternalServerError)
return
}
@@ -154,12 +168,12 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
captures := rx.FindStringSubmatch(req.RequestURI)
artist, err := url.QueryUnescape(captures[1])
if err != nil {
- http.Error(w, "bad request", http.StatusBadRequest)
+ httpError(w, http.StatusBadRequest)
return
}
albumName, err := url.QueryUnescape(captures[2])
if err != nil {
- http.Error(w, "bad request", http.StatusBadRequest)
+ httpError(w, http.StatusBadRequest)
return
}
@@ -168,8 +182,7 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
if ok {
f, err := os.Open(album.Tarball)
if err != nil {
- http.Error(w, "internal server error: " + err.Error(),
- http.StatusInternalServerError)
+ httpErrorReason(w, http.StatusInternalServerError, err.Error())
return
}
defer f.Close()
@@ -184,14 +197,14 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
}
// artist or album not found
- http.Error(w, "not found", http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
return
}
// test album
rx, err = regexp.Compile("^/([^/?]+)/([^/?]+)/?(\\?.*)?$")
if err != nil {
- http.Error(w, "internal server error", http.StatusInternalServerError)
+ httpErrorReason(w, http.StatusInternalServerError, err.Error())
return
}
@@ -199,12 +212,12 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
captures := rx.FindStringSubmatch(req.RequestURI)
artist, err := url.QueryUnescape(captures[1])
if err != nil {
- http.Error(w, "bad request", http.StatusBadRequest)
+ httpError(w, http.StatusBadRequest)
return
}
albumName, err := url.QueryUnescape(captures[2])
if err != nil {
- http.Error(w, "bad request", http.StatusBadRequest)
+ httpError(w, http.StatusBadRequest)
return
}
@@ -217,12 +230,12 @@ func handleArtistAlbumPage(w http.ResponseWriter, req *http.Request) {
}
// artist or album not found
- http.Error(w, "not found", http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
return
}
// illegal URI format
- http.Error(w, "not found", http.StatusNotFound)
+ httpError(w, http.StatusNotFound)
}
func RunOn(address string) {
diff --git a/util/util.go b/util/util.go
index 77149eb..abe7e6c 100644
--- a/util/util.go
+++ b/util/util.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2026 Jeremy Baxter.
+// Reusable utility functions
+
package util
import (
@@ -83,9 +86,13 @@ func HashOf(s string) string {
return fmt.Sprintf("%x", h.Sum(nil))
}
+func Interactive() bool {
+ return term.IsTerminal(int(os.Stderr.Fd()))
+}
+
// print only if interactive
func Iprint(format string, args ...any) {
- if term.IsTerminal(int(os.Stderr.Fd())) {
+ if Interactive() {
fmt.Fprintf(os.Stderr, format, args...)
}
}