From be73a72f930da0fd2b0ecb7c10e2278c517513d2 Mon Sep 17 00:00:00 2001
From: Leon Brocard <acme@astray.com>
Date: Wed, 25 Feb 2026 13:48:17 +0100
Subject: [PATCH] serve http: add fallback embedded favicon

Browsers make a request to /favicon.ico when visiting pages generated
by the HTTP server.

Previously, if remotes did not have a /favicon.ico then the server
responded with a 404, causing browsers to show a default icon.

This adds a tiny fallback embedded PNG rclone favicon to help users
identify the rclone browser tab.
---
 cmd/serve/http/favicon.png  | Bin 0 -> 704 bytes
 cmd/serve/http/http.go      |  26 +++++++++++++++++++
 cmd/serve/http/http_test.go |  50 ++++++++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+)
 create mode 100644 cmd/serve/http/favicon.png

diff --git a/cmd/serve/http/favicon.png b/cmd/serve/http/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..346e037853c762ff99e593f06d9eaf5415fd6d9f
GIT binary patch
literal 704
zcmV;x0zdtUP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80007qNkl<ZcmZOd
z2H5iWCnE!()_MSvB#WXjytZw7$F^<Twr$(CZQHhOn{D6ub6D}>CA+30zAoQ$(&_&{
zeGu|tHBRCdB5?~Nkp-{6tneZ@0I_isIs6^o9O6PGD*G$E3}PT2w2N(cdPG1xib0&%
z6xa+gu^R2s0viww(U|Tv{9lMh7_w`=pBKRpMKu2QQlJw=qpHPkszNkccquReqKLxB
z7QcB5cOi=2UJ5LR;0`unDTX=t-64o#td|1u@lE=cbALubRPs^C;!JrNqL}L{oPa!7
zf!h!h=`;mWLp0hn*cI@*li-gr0ph@ZyrvXb3(@$K0*9~+-<gH~k1G%t{`Uzl1ku<}
zXhO(Sckq`Q{wDTAT$tq({x;4*G#U~(0OI2qKJ+cn5#mA!e)cKwJwhRhv+ef>{zO;+
zL^0`E_&<n*XdFXD#KTWMzS8V~ogs>X1a*gKgyAEjKplw2BD~|`uze3lar>#o#`}bP
zf}IeJvaguz_4o0mzwRfVmI#3;78?bQKokothP{P-xc$^Ryy~FD9EjqoQ6K=K7-TW1
z8AMUuL4i>a#Sx>xR)}JQ$&k+x08w1S2Q~#(Llm2g0s|q6NF>$_c>_lv8dhs99%3Mh
z`9^_q5RFs#Uo$K-#6%Oks(k-nT!3hlF$#Q+TM&&fOh;1;$5~`FnnO$+L1#3<JcL3t
zPUH1wC!@j;hYnR=ef77e+g)Ozl6pOu3UO#G0}>zr;=uyEp%(ZA^B@j2W=K{<KwKDt
z*R1XdO5rZV#x8uou;f?{u@QnMPVb1mK_g7VNyH!$CovB>G)G4g%)(JzLl{CZ2gUKe
mKFwL7_wj~@Yrt!E-+2VlFwwy13z&!i0000<MNUMnLSTZec{1hz

literal 0
HcmV?d00001

diff --git a/cmd/serve/http/http.go b/cmd/serve/http/http.go
index e45c0ab85..1c7dbaba2 100644
--- a/cmd/serve/http/http.go
+++ b/cmd/serve/http/http.go
@@ -3,6 +3,7 @@ package http
 
 import (
 	"context"
+	_ "embed"
 	"errors"
 	"fmt"
 	"io"
@@ -57,6 +58,9 @@ var DefaultOpt = Options{
 // Opt is options set by command line flags
 var Opt = DefaultOpt
 
+//go:embed favicon.png
+var faviconData []byte
+
 func init() {
 	fs.RegisterGlobalOptions(fs.OptionsInfo{Name: "http", Opt: &Opt, Options: OptionsInfo})
 }
@@ -201,6 +205,7 @@ func newServer(ctx context.Context, f fs.Fs, opt *Options, vfsOpt *vfscommon.Opt
 		middleware.SetHeader("Accept-Ranges", "bytes"),
 		middleware.SetHeader("Server", "rclone/"+fs.Version),
 	)
+	router.Get("/favicon.ico", s.serveFavicon)
 	router.Get("/*", s.handler)
 	router.Head("/*", s.handler)
 
@@ -225,6 +230,27 @@ func (s *HTTP) Shutdown() error {
 	return s.server.Shutdown()
 }
 
+// serveFavicon serves the remote's favicon.ico if it exists, otherwise
+// the rclone favicon
+func (s *HTTP) serveFavicon(w http.ResponseWriter, r *http.Request) {
+	ctx := r.Context()
+	VFS, err := s.getVFS(ctx)
+	if err == nil {
+		node, err := VFS.Stat("favicon.ico")
+		if err == nil && node.IsFile() {
+			// Remote has favicon.ico, serve it as a regular file
+			s.serveFile(w, r, "favicon.ico")
+			return
+		}
+	}
+	// Serve the embedded rclone favicon
+	w.Header().Set("Content-Type", "image/png")
+	w.Header().Set("Cache-Control", "max-age=86400")
+	if _, err := w.Write(faviconData); err != nil {
+		fs.Debugf(nil, "Failed to write favicon: %v", err)
+	}
+}
+
 // handler reads incoming requests and dispatches them
 func (s *HTTP) handler(w http.ResponseWriter, r *http.Request) {
 	isDir := strings.HasSuffix(r.URL.Path, "/")
diff --git a/cmd/serve/http/http_test.go b/cmd/serve/http/http_test.go
index 5d8ccdc06..79ac7e151 100644
--- a/cmd/serve/http/http_test.go
+++ b/cmd/serve/http/http_test.go
@@ -297,6 +297,56 @@ func TestAuthProxy(t *testing.T) {
 	testGET(t, true)
 }
 
+func TestFavicon(t *testing.T) {
+	ctx := context.Background()
+
+	doGet := func(testURL, path string) *http.Response {
+		req, err := http.NewRequest("GET", testURL+path, nil)
+		require.NoError(t, err)
+		req.SetBasicAuth(testUser, testPass)
+		resp, err := http.DefaultClient.Do(req)
+		require.NoError(t, err)
+		return resp
+	}
+
+	t.Run("fallback", func(t *testing.T) {
+		// testdata/files has no favicon.ico, so the embedded fallback is served
+		f, err := fs.NewFs(ctx, "testdata/files")
+		require.NoError(t, err)
+		s, testURL := start(ctx, t, f)
+		defer func() { assert.NoError(t, s.server.Shutdown()) }()
+
+		resp := doGet(testURL, "favicon.ico")
+		defer func() { _ = resp.Body.Close() }()
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+		assert.Equal(t, "image/png", resp.Header.Get("Content-Type"))
+		assert.Equal(t, "max-age=86400", resp.Header.Get("Cache-Control"))
+		body, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		assert.Equal(t, faviconData, body)
+	})
+
+	t.Run("remote override", func(t *testing.T) {
+		// Start a server on a temp dir that already contains a custom favicon.ico,
+		// so the VFS sees it at init time and serves it instead of the fallback.
+		dir := t.TempDir()
+		customFavicon := []byte("custom favicon data")
+		require.NoError(t, os.WriteFile(filepath.Join(dir, "favicon.ico"), customFavicon, 0666))
+
+		f, err := fs.NewFs(ctx, dir)
+		require.NoError(t, err)
+		s, testURL := start(ctx, t, f)
+		defer func() { assert.NoError(t, s.server.Shutdown()) }()
+
+		resp := doGet(testURL, "favicon.ico")
+		defer func() { _ = resp.Body.Close() }()
+		assert.Equal(t, http.StatusOK, resp.StatusCode)
+		body, err := io.ReadAll(resp.Body)
+		require.NoError(t, err)
+		assert.Equal(t, customFavicon, body)
+	})
+}
+
 func TestRc(t *testing.T) {
 	servetest.TestRc(t, rc.Params{
 		"type":           "http",