From 7e7ae29d89f9528ce61920cdf670e8b2551908b8 Mon Sep 17 00:00:00 2001
From: Krishna Srinivas <krishna@minio.io>
Date: Mon, 6 Nov 2017 15:59:37 -0800
Subject: [PATCH] browser: Remove hardcoding of minioBrowserPrefix=/minio
 (#5048)

This enable reverse proxy of minio-browser. Fixes #5040
---
 browser/app/index.html              | 12 ++++++------
 browser/app/index.js                |  2 +-
 browser/app/js/actions.js           |  2 +-
 browser/app/js/components/Browse.js |  7 +++----
 browser/app/js/constants.js         |  4 +++-
 cmd/web-router.go                   | 16 ++++++++++++----
 6 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/browser/app/index.html b/browser/app/index.html
index dfc0f555b..f6282728a 100644
--- a/browser/app/index.html
+++ b/browser/app/index.html
@@ -5,13 +5,13 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <title>Minio Browser</title>
-        <link rel="stylesheet" href="/minio/loader.css" type="text/css">
+        <link rel="stylesheet" href="loader.css" type="text/css">
     </head>
 
     <body>
         <div class="page-load">
             <div class="pl-inner">
-                <img src="/minio/logo.svg" alt="">
+                <img src="logo.svg" alt="">
             </div>
         </div>
         <div id="root"></div>
@@ -27,19 +27,19 @@
                     <ul>
                         <li>
                             <a href="http://www.google.com/chrome/">
-                                <img src="/minio/chrome.png" alt="">
+                                <img src="chrome.png" alt="">
                                 <div>Chrome</div>
                             </a>
                         </li>
                         <li>
                             <a href="https://www.mozilla.org/en-US/firefox/new/">
-                                <img src="/minio/firefox.png" alt="">
+                                <img src="firefox.png" alt="">
                                 <div>Firefox</div>
                             </a>
                         </li>
                         <li>
                             <a href="https://www.apple.com/safari/">
-                                <img src="/minio/safari.png" alt="">
+                                <img src="safari.png" alt="">
                                 <div>Safari</div>
                             </a>
                         </li>
@@ -51,6 +51,6 @@
         <![endif]-->
 
         <script>currentUiVersion = 'MINIO_UI_VERSION'</script>
-        <script src="/minio/index_bundle.js"></script>
+        <script src="index_bundle.js"></script>
     </body>
 </html>
diff --git a/browser/app/index.js b/browser/app/index.js
index e0a0a6e11..255de4d86 100644
--- a/browser/app/index.js
+++ b/browser/app/index.js
@@ -81,7 +81,7 @@ ReactDOM.render((
   <Provider store={ store } web={ web }>
     <Router history={ browserHistory }>
       <Route path='/' component={ App }>
-        <Route path='minio' component={ App }>
+        <Route path={ minioBrowserPrefix } component={ App }>
           <IndexRoute component={ Browse } onEnter={ authNeeded } />
           <Route path='login' component={ Login } onEnter={ authNotNeeded } />
           <Route path=':bucket' component={ Browse } onEnter={ authNeeded } />
diff --git a/browser/app/js/actions.js b/browser/app/js/actions.js
index 374b2a428..25c3d0832 100644
--- a/browser/app/js/actions.js
+++ b/browser/app/js/actions.js
@@ -465,7 +465,7 @@ export const uploadFile = (file, xhr) => {
   return (dispatch, getState) => {
     const {currentBucket, currentPath} = getState()
     const objectName = `${currentPath}${file.name}`
-    const uploadUrl = `${window.location.origin}/minio/upload/${currentBucket}/${objectName}`
+    const uploadUrl = `${window.location.origin}${minioBrowserPrefix}/upload/${currentBucket}/${objectName}`
     // The slug is a unique identifer for the file upload.
     const slug = `${currentBucket}-${currentPath}-${file.name}`
 
diff --git a/browser/app/js/components/Browse.js b/browser/app/js/components/Browse.js
index 9f6f7b033..4d66937cc 100644
--- a/browser/app/js/components/Browse.js
+++ b/browser/app/js/components/Browse.js
@@ -157,7 +157,7 @@ export default class Browse extends React.Component {
         // Download the selected file.
         web.CreateURLToken()
           .then(res => {
-            let url = `${window.location.origin}/minio/download/${currentBucket}/${encPrefix}?token=${res.token}`
+            let url = `${window.location.origin}${minioBrowserPrefix}/download/${currentBucket}/${encPrefix}?token=${res.token}`
             window.location = url
           })
           .catch(err => dispatch(actions.showAlert({
@@ -433,8 +433,7 @@ export default class Browse extends React.Component {
     } else {
       web.CreateURLToken()
         .then(res => {
-          let requestUrl = location.origin + "/minio/zip?token=" + res.token
-
+          let requestUrl = location.origin + minioBrowserPrefix + "/zip?token=" + res.token
           this.xhr = new XMLHttpRequest()
           dispatch(actions.downloadSelected(requestUrl, req, this.xhr))
         })
@@ -503,7 +502,7 @@ export default class Browse extends React.Component {
                                 settingsFunc={ this.showSettings.bind(this) }
                                 logoutFunc={ this.logout.bind(this) } />
     } else {
-      loginButton = <a className='btn btn-danger' href='/minio/login'>Login</a>
+      loginButton = <a className='btn btn-danger' href={minioBrowserPrefix+'/login'}>Login</a>
     }
 
     if (web.LoggedIn()) {
diff --git a/browser/app/js/constants.js b/browser/app/js/constants.js
index 8f2dc34c2..177000bbf 100644
--- a/browser/app/js/constants.js
+++ b/browser/app/js/constants.js
@@ -17,7 +17,9 @@
 // File for all the browser constants.
 
 // minioBrowserPrefix absolute path.
-export const minioBrowserPrefix = '/minio'
+var p = window.location.pathname
+export const minioBrowserPrefix = p.slice(0, p.indexOf("/", 1))
+
 export const READ_ONLY = 'readonly'
 export const WRITE_ONLY = 'writeonly'
 export const READ_WRITE = 'readwrite'
diff --git a/cmd/web-router.go b/cmd/web-router.go
index 76a388ad3..f4324f271 100644
--- a/cmd/web-router.go
+++ b/cmd/web-router.go
@@ -19,6 +19,7 @@ package cmd
 import (
 	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/elazarl/go-bindata-assetfs"
 	"github.com/gorilla/handlers"
@@ -55,7 +56,7 @@ func assetFS() *assetfs.AssetFS {
 }
 
 // specialAssets are files which are unique files not embedded inside index_bundle.js.
-const specialAssets = "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.ico$"
 
 // registerWebRouter - registers web router for serving minio browser.
 func registerWebRouter(mux *router.Router) error {
@@ -90,13 +91,20 @@ func registerWebRouter(mux *router.Router) error {
 	webBrowserRouter.Methods("POST").Path("/zip").Queries("token", "{token:.*}").HandlerFunc(web.DownloadZip)
 
 	// Add compression for assets.
-	compressedAssets := handlers.CompressHandler(http.StripPrefix(minioReservedBucketPath, http.FileServer(assetFS())))
+	h := http.FileServer(assetFS())
+	compressedAssets := handlers.CompressHandler(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		idx := strings.LastIndex(r.URL.Path, slashSeparator)
+		if idx != -1 {
+			r.URL.Path = r.URL.Path[idx+1:]
+		}
+		h.ServeHTTP(w, r)
+	}))
 
 	// Serve javascript files and favicon from assets.
-	webBrowserRouter.Path(fmt.Sprintf("/{assets:[^/]+.js|%s}", specialAssets)).Handler(compressedAssets)
+	webBrowserRouter.Path(fmt.Sprintf("/{assets:%s}", specialAssets)).Handler(compressedAssets)
 
 	// Serve index.html for rest of the requests.
-	webBrowserRouter.Path("/{index:.*}").Handler(indexHandler{http.StripPrefix(minioReservedBucketPath, http.FileServer(assetFS()))})
+	webBrowserRouter.Path("/{index:.*}").Handler(indexHandler{http.StripPrefix(minioReservedBucketPath, h)})
 
 	return nil
 }
