MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[web-router] update the white list for favicons (#8024)

Browse Source
This commit is contained in:
Jakob Ackermann 2019-08-12 07:17:02 +02:00 committed by Harshavardhana
parent 35427a017d
commit 1b258da108
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/generic-handlers.go
View File

@ -178,7 +178,9 @@ func getRedirectLocation(urlPath string) (rLocation string) {
SlashSeparator, SlashSeparator,
"/webrpc", "/webrpc",
"/login", "/login",
"/favicon.ico", "/favicon-16x16.png",
"/favicon-32x32.png",
"/favicon-96x96.png",
}, urlPath) { }, urlPath) {
rLocation = minioReservedBucketPath + urlPath rLocation = minioReservedBucketPath + urlPath
} }

18
cmd/generic-handlers_test.go
View File

@ -53,12 +53,22 @@ func TestRedirectLocation(t *testing.T) {
location: minioReservedBucketPath + "/login", location: minioReservedBucketPath + "/login",
}, },
{ {
// 5. When urlPath is '/favicon.ico' // 5. When urlPath is '/favicon-16x16.png'
urlPath: "/favicon.ico", urlPath: "/favicon-16x16.png",
location: minioReservedBucketPath + "/favicon.ico", location: minioReservedBucketPath + "/favicon-16x16.png",
}, },
{ {
// 6. When urlPath is '/unknown' // 6. When urlPath is '/favicon-16x16.png'
urlPath: "/favicon-32x32.png",
location: minioReservedBucketPath + "/favicon-32x32.png",
},
{
// 7. When urlPath is '/favicon-96x96.png'
urlPath: "/favicon-96x96.png",
location: minioReservedBucketPath + "/favicon-96x96.png",
},
{
// 8. When urlPath is '/unknown'
urlPath: "/unknown", urlPath: "/unknown",
location: "", location: "",
}, },

2
cmd/web-router.go
View File

@ -56,7 +56,7 @@ func assetFS() *assetfs.AssetFS {
} }
// specialAssets are files which are unique files not embedded inside index_bundle.js. // specialAssets are files which are unique files not embedded inside index_bundle.js.
const specialAssets = "index_bundle.*.js|loader.css|logo.svg|firefox.png|safari.png|chrome.png|favicon.ico" const specialAssets = "index_bundle.*.js|loader.css|logo.svg|firefox.png|safari.png|chrome.png|favicon-16x16.png|favicon-32x32.png|favicon-96x96.png"
// registerWebRouter - registers web router for serving minio browser. // registerWebRouter - registers web router for serving minio browser.
func registerWebRouter(router *mux.Router) error { func registerWebRouter(router *mux.Router) error {