diff --git a/oortconsole.go b/oortconsole.go
index e6c8756..90f14b3 100644
--- a/oortconsole.go
+++ b/oortconsole.go
@@ -5,6 +5,8 @@ import (
"context"
"encoding/json"
"encoding/base64"
+ "encoding/xml"
+ "html"
"github.com/google/uuid"
"fmt"
"io"
@@ -952,6 +954,9 @@ func handleS3CreateBucket(w http.ResponseWriter, r *http.Request) {
// Enable versioning
exec.Command("mc", "version", "enable", "cosmos/"+internalName).Run()
+ // Enable public streaming for Mornye NAS
+ exec.Command("mc", "anonymous", "set", "download", "cosmos/"+internalName).Run()
+
// Save to DB
scyllaSession.Query(`INSERT INTO cosmos.buckets (bucket_name, owner_email, display_name) VALUES (?, ?, ?)`, internalName, ak, displayName).Exec()
@@ -1302,6 +1307,181 @@ func handleMornyeNASEnableStreaming(w http.ResponseWriter, r *http.Request) {
jsonOK(w, map[string]any{"success": true, "bucket": req.Bucket, "status": "streaming_enabled"})
}
+func escapeDAVPath(p string) string {
+ parts := strings.Split(p, "/")
+ for i, part := range parts {
+ parts[i] = url.PathEscape(part)
+ }
+ return strings.Join(parts, "/")
+}
+
+func xmlEscape(s string) string {
+ var b strings.Builder
+ xml.EscapeText(&b, []byte(s))
+ return b.String()
+}
+
+func mimeForFilename(filename string) string {
+ lower := strings.ToLower(filename)
+ switch {
+ case strings.HasSuffix(lower, ".flac"):
+ return "audio/flac"
+ case strings.HasSuffix(lower, ".mp3"):
+ return "audio/mpeg"
+ case strings.HasSuffix(lower, ".wav"):
+ return "audio/wav"
+ case strings.HasSuffix(lower, ".m4a"):
+ return "audio/mp4"
+ case strings.HasSuffix(lower, ".aac"):
+ return "audio/aac"
+ case strings.HasSuffix(lower, ".ogg"):
+ return "audio/ogg"
+ case strings.HasSuffix(lower, ".opus"):
+ return "audio/opus"
+ case strings.HasSuffix(lower, ".alac"):
+ return "audio/alac"
+ case strings.HasSuffix(lower, ".m3u"), strings.HasSuffix(lower, ".m3u8"):
+ return "audio/x-mpegurl"
+ case strings.HasSuffix(lower, ".lrc"):
+ return "text/plain; charset=utf-8"
+ case strings.HasSuffix(lower, ".json"):
+ return "application/json"
+ default:
+ return "application/octet-stream"
+ }
+}
+
+func handleWebDAVPropfind(w http.ResponseWriter, r *http.Request, username, displayBucket, actualBucket, objectKey string) {
+ mc, err := minio.New(minioEndpoint, &minio.Options{
+ Creds: credentials.NewStaticV4("unityadmin", "UnityAdmin2026!", ""),
+ Secure: false,
+ })
+ if err != nil {
+ http.Error(w, "WebDAV backend error", 500)
+ return
+ }
+
+ depth := r.Header.Get("Depth")
+ if depth == "" {
+ depth = "1"
+ }
+
+ w.Header().Set("Content-Type", "application/xml; charset=\"utf-8\"")
+ w.Header().Set("DAV", "1, 2")
+ w.Header().Set("MS-Author-Via", "DAV")
+ w.Header().Set("Access-Control-Allow-Origin", "*")
+ w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, OPTIONS, PROPFIND")
+ w.Header().Set("Access-Control-Allow-Headers", "Depth, Content-Type, Authorization, Range")
+ w.WriteHeader(207) // HTTP 207 Multi-Status
+
+ var buf strings.Builder
+ buf.WriteString("\n")
+ buf.WriteString("\n")
+
+ rootHref := fmt.Sprintf("/oort/%s/%s/", username, displayBucket)
+
+ if objectKey == "" {
+ // Root collection self entry
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s\n", xmlEscape(rootHref)))
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s\n", xmlEscape(displayBucket)))
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+ buf.WriteString(" HTTP/1.1 200 OK\n")
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+
+ if depth != "0" {
+ ctx := context.Background()
+ for obj := range mc.ListObjects(ctx, actualBucket, minio.ListObjectsOptions{Recursive: true}) {
+ if obj.Err == nil && !strings.HasSuffix(obj.Key, "/") {
+ itemHref := rootHref + escapeDAVPath(obj.Key)
+ mime := mimeForFilename(obj.Key)
+ lastMod := obj.LastModified.UTC().Format(http.TimeFormat)
+ name := filepath.Base(obj.Key)
+
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s\n", xmlEscape(itemHref)))
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s\n", xmlEscape(name)))
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %d\n", obj.Size))
+ buf.WriteString(fmt.Sprintf(" %s\n", mime))
+ buf.WriteString(fmt.Sprintf(" %s\n", lastMod))
+ buf.WriteString(" \n")
+ buf.WriteString(" HTTP/1.1 200 OK\n")
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+ }
+ }
+ }
+ } else {
+ // Specific file PROPFIND
+ ctx := context.Background()
+ objInfo, err := mc.StatObject(ctx, actualBucket, objectKey, minio.StatObjectOptions{})
+ if err != nil {
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s%s\n", xmlEscape(rootHref), xmlEscape(escapeDAVPath(objectKey))))
+ buf.WriteString(" HTTP/1.1 404 Not Found\n")
+ buf.WriteString(" \n")
+ } else {
+ itemHref := rootHref + escapeDAVPath(objInfo.Key)
+ mime := mimeForFilename(objInfo.Key)
+ lastMod := objInfo.LastModified.UTC().Format(http.TimeFormat)
+ name := filepath.Base(objInfo.Key)
+
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s\n", xmlEscape(itemHref)))
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %s\n", xmlEscape(name)))
+ buf.WriteString(" \n")
+ buf.WriteString(fmt.Sprintf(" %d\n", objInfo.Size))
+ buf.WriteString(fmt.Sprintf(" %s\n", mime))
+ buf.WriteString(fmt.Sprintf(" %s\n", lastMod))
+ buf.WriteString(" \n")
+ buf.WriteString(" HTTP/1.1 200 OK\n")
+ buf.WriteString(" \n")
+ buf.WriteString(" \n")
+ }
+ }
+
+ buf.WriteString("\n")
+ w.Write([]byte(buf.String()))
+}
+
+func renderNASDirectoryIndex(w http.ResponseWriter, username, displayBucket string, tracks []MornyeTrackItem) {
+ w.Header().Set("Content-Type", "text/html; charset=utf-8")
+ w.Header().Set("Access-Control-Allow-Origin", "*")
+ w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS, PROPFIND")
+ w.Header().Set("Access-Control-Allow-Headers", "Range, Authorization, Content-Type, Depth")
+ w.Header().Set("DAV", "1, 2")
+
+ var buf strings.Builder
+ buf.WriteString("\n")
+ buf.WriteString(fmt.Sprintf("\n
Index of /oort/%s/%s/\n\n", html.EscapeString(username), html.EscapeString(displayBucket)))
+ buf.WriteString(fmt.Sprintf("Index of /oort/%s/%s/
\n
\nParent Directory\n", html.EscapeString(username), html.EscapeString(displayBucket)))
+
+ for _, t := range tracks {
+ escaped := escapeDAVPath(t.Key)
+ displayName := t.Name
+ if len(displayName) > 55 {
+ displayName = displayName[:52] + "..."
+ }
+ padded := displayName
+ if len(padded) < 55 {
+ padded += strings.Repeat(" ", 55-len(padded))
+ }
+ buf.WriteString(fmt.Sprintf("%s %s %10d\n", escaped, html.EscapeString(padded), t.LastModified, t.Size))
+ }
+
+ buf.WriteString("\n
\nMornye NAS Server at cosmos.linuxguy.space Port 443\n\n")
+ w.Write([]byte(buf.String()))
+}
+
func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path string) {
trimmed := strings.Trim(path, "/")
var displayBucket, objectKey string
@@ -1366,11 +1546,38 @@ func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path
publicBucketCache.Store(cacheKey, actualBucket)
}
+ // WebDAV OPTIONS method handling
+ if r.Method == "OPTIONS" {
+ w.Header().Set("DAV", "1, 2")
+ w.Header().Set("MS-Author-Via", "DAV")
+ w.Header().Set("Allow", "GET, HEAD, POST, PUT, DELETE, OPTIONS, PROPFIND, MKCOL, COPY, MOVE")
+ w.Header().Set("Access-Control-Allow-Origin", "*")
+ w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, POST, PUT, DELETE, OPTIONS, PROPFIND, MKCOL, COPY, MOVE")
+ w.Header().Set("Access-Control-Allow-Headers", "Depth, Content-Type, Authorization, Range, X-Requested-With")
+ w.Header().Set("Access-Control-Expose-Headers", "Content-Range, Content-Length, Accept-Ranges, DAV")
+ w.WriteHeader(http.StatusOK)
+ return
+ }
+
+ // WebDAV PROPFIND method handling
+ if r.Method == "PROPFIND" {
+ handleWebDAVPropfind(w, r, username, displayBucket, actualBucket, objectKey)
+ return
+ }
+
// Check if this is a Mornye NAS root, index.json, or playlist.m3u request
isPlaylist := objectKey == "playlist.m3u" || objectKey == "mornye.m3u" || r.URL.Query().Get("format") == "m3u"
isJSON := objectKey == "index.json" || objectKey == "mornye.json" || r.URL.Query().Get("format") == "json" || strings.Contains(r.Header.Get("Accept"), "application/json")
isRoot := (objectKey == "")
+ if isRoot && r.Method == "HEAD" {
+ w.Header().Set("Content-Type", "text/html; charset=utf-8")
+ w.Header().Set("Access-Control-Allow-Origin", "*")
+ w.Header().Set("DAV", "1, 2")
+ w.WriteHeader(http.StatusOK)
+ return
+ }
+
if isRoot || isPlaylist || isJSON {
mc, err := minio.New(minioEndpoint, &minio.Options{
Creds: credentials.NewStaticV4("unityadmin", "UnityAdmin2026!", ""),
@@ -1395,7 +1602,7 @@ func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path
isAudio := ext == "flac" || ext == "mp3" || ext == "wav" || ext == "m4a" || ext == "aac" || ext == "ogg" || ext == "opus" || ext == "alac"
if isAudio || isRoot {
- streamURL := fmt.Sprintf("https://cosmos.linuxguy.space/oort/%s/%s/%s", username, displayBucket, url.PathEscape(obj.Key))
+ streamURL := fmt.Sprintf("https://cosmos.linuxguy.space/oort/%s/%s/%s", username, displayBucket, escapeDAVPath(obj.Key))
tracks = append(tracks, MornyeTrackItem{
Key: obj.Key,
Name: name,
@@ -1412,7 +1619,8 @@ func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path
w.Header().Set("Access-Control-Allow-Origin", "*")
w.Header().Set("Access-Control-Allow-Headers", "*")
- w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS")
+ w.Header().Set("Access-Control-Allow-Methods", "GET, HEAD, OPTIONS, PROPFIND")
+ w.Header().Set("DAV", "1, 2")
if isPlaylist {
w.Header().Set("Content-Type", "audio/x-mpegurl; charset=utf-8")
@@ -1445,8 +1653,8 @@ func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path
return
}
- // Web player page
- renderMornyeNASWebPlayer(w, username, displayBucket, tracks, totalBytes)
+ // NAS Root: Pure Directory Index for Mornye / HTTP(S) network storage
+ renderNASDirectoryIndex(w, username, displayBucket, tracks)
return
}
@@ -1459,6 +1667,10 @@ func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path
r.URL.Path = targetPath
r.URL.RawPath = targetPath
+ // CRITICAL: Strip any Authorization header before proxying to MinIO.
+ // Mornye or WebDAV clients often send HTTP Basic Auth, which MinIO rejects with 400 InvalidRequest.
+ r.Header.Del("Authorization")
+
proxy.ModifyResponse = func(resp *http.Response) error {
if resp.StatusCode == 403 {
resp.StatusCode = 403
@@ -1500,228 +1712,6 @@ func handleS3PublicProxy(w http.ResponseWriter, r *http.Request, username, path
recordHit(actualBucket, tw.statusCode, tw.bytes, false, r.Header.Get("CF-IPCountry"), "read")
}
-func renderMornyeNASWebPlayer(w http.ResponseWriter, username, displayBucket string, tracks []MornyeTrackItem, totalBytes int64) {
- w.Header().Set("Content-Type", "text/html; charset=utf-8")
- nasURL := fmt.Sprintf("https://cosmos.linuxguy.space/oort/%s/%s/", username, displayBucket)
- playlistURL := fmt.Sprintf("https://cosmos.linuxguy.space/oort/%s/%s/playlist.m3u", username, displayBucket)
- jsonURL := fmt.Sprintf("https://cosmos.linuxguy.space/oort/%s/%s/index.json", username, displayBucket)
-
- var sizeStr string
- tb := float64(totalBytes)
- if tb > 1024*1024*1024 {
- sizeStr = fmt.Sprintf("%.2f GB", tb/(1024*1024*1024))
- } else {
- sizeStr = fmt.Sprintf("%.1f MB", tb/(1024*1024))
- }
-
- tracksJSON, _ := json.Marshal(tracks)
-
- html := fmt.Sprintf(`
-
-
-
-
-Mornye NAS · @%s / %s
-
-
-
-
-
-
-
-
-
- Configure this dedicated URL into your Mornye Music Streaming App to access your network-attached library with lossless byte-range playback:
-
-
-
-
-
-
Tracks: %d audio file(s)
-
Library Size: %s
-
Protocol: RFC 7233 Byte-Range Streaming
-
DAC / Hi-Res: Bit-Perfect 24-bit/192kHz Ready
-
-
-
-
-
-
Music Library
-
-
-
-
-
-
-
- | # |
- Track Name |
- Format |
- Size |
- Actions |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
No track playing
-
Select a track to stream
-
-
-
-
-
-
-
-`,
- username, displayBucket,
- username, displayBucket,
- nasURL, nasURL, playlistURL, jsonURL,
- len(tracks), sizeStr,
- string(tracksJSON),
- )
- w.Write([]byte(html))
-}
-
func handleS3BucketSettings(w http.ResponseWriter, r *http.Request) {
ak, _, defBucket, ok := authS3Console(r)