Merge pull request #1163 from harshavardhana/minio-browser

web: Removing dependency for gpg and downloading assets.
2024-12-24 22:25:54 -05:00 · 2016-02-23 14:16:25 -08:00 · 2016-02-23 14:16:25 -08:00 · 04424ae9c2
commit 04424ae9c2
parent 997141d031 2181003609
11 changed files with 945 additions and 41 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,7 +9,7 @@ site/
 /.idea/
 /Minio.iml
 **/access.log
-ui-assets.go
-ui-assets.asc
 build
-isa-l
+isa-l
+vendor/**/*.js
+vendor/**/*.json
--- a/10
+++ b/10
@ -3,8 +3,6 @@ DOCKER_BIN := $(shell which docker)
 DOCKER_LDFLAGS := '$(LDFLAGS) -extldflags "-static"'
 BUILD_LDFLAGS := '$(LDFLAGS)'
 TAG := latest
-UI_ASSETS := ui-assets.go
-UI_ASSETS_ARMOR := ui-assets.asc

 HOST ?= $(shell uname)
 CPU ?= $(shell uname -m)
@ -69,12 +67,6 @@ getdeps: checkdeps checkgopath
 	@go get -u github.com/remyoudompheng/go-misc/deadcode && echo "Installed deadcode:"
 	@go get -u github.com/client9/misspell/cmd/misspell && echo "Installed misspell:"

-$(UI_ASSETS):
-	@curl -s https://dl.minio.io/assets/server/ui/$(UI_ASSETS_ARMOR) 2>&1 > $(UI_ASSETS_ARMOR) && echo "Downloading signature file $(UI_ASSETS_ARMOR) for verification:"
-	@gpg --batch --no-tty --yes --keyserver pgp.mit.edu --recv-keys F9AAC728 2>&1 > /dev/null && echo "Importing public key:"
-	@curl -s https://dl.minio.io/assets/server/ui/$@ 2>&1 > $@ && echo "Downloading UI assets file $@:"
-	@gpg --batch --no-tty --verify $(UI_ASSETS_ARMOR) $@ 2>&1 > /dev/null && echo "Verifying signature of downloaded assets."
-
 verifiers: getdeps vet fmt lint cyclo spelling

 vet:
@ -151,7 +143,5 @@ clean:
 	@echo "Cleaning up all the generated files:"
 	@rm -fv minio minio.test cover.out
 	@find . -name '*.test' | xargs rm -fv
-	@rm -fv ui-assets.go
-	@rm -fv ui-assets.asc
 	@rm -rf isa-l
 	@rm -rf build
--- a/appveyor.yml
+++ b/appveyor.yml
@ -10,8 +10,6 @@ environment:
  GOPATH: c:\gopath
  GO_EXTLINK_ENABLED: 0
  GO15VENDOREXPERIMENT: 1
-  UI_ASSETS: ui-assets.go
-  UI_ASSETS_ARMOR: ui-assets.asc

 # scripts that run after cloning repository
 install:
@ -36,10 +34,6 @@ install:

 # to run your custom scripts instead of automatic MSBuild
 build_script:
-  - curl -fsSL -o ui-assets.go https://dl.minio.io/assets/server/ui/%UI_ASSETS%
-  - curl -fsSL -o ui-assets.asc  https://dl.minio.io/assets/server/ui/%UI_ASSETS_ARMOR%
-  - gpg --batch --no-tty --yes --keyserver pgp.mit.edu --recv-keys F9AAC728
-  - gpg --batch --no-tty --verify %UI_ASSETS_ARMOR% %UI_ASSETS%
  - go generate github.com/minio/minio/pkg/crypto/sha1
  - go test .
  - go test -race .
--- a/buildscripts/checkdeps.sh
+++ b/buildscripts/checkdeps.sh
@ -23,7 +23,6 @@ _init() {
    GIT_VERSION="1.0"
    YASM_VERSION="1.2.0"
    CURL_VERSION="7.12.0"
-    GPG_VERSION="1.3"
    GO_VERSION="1.5.1"
    OSX_VERSION="10.8"
    UNAME=$(uname -sm)
@ -184,16 +183,6 @@ check_deps() {
        MISSING="${MISSING} git"
    fi

-    check_version "$(env gpg --version 2>/dev/null | sed -e 's/^.* \([0-9.\].*\).*$/\1/' -e 's/^\([0-9.\]*\).*/\1/g' | head -1)" "${GPG_VERSION}"
-    if [ $? -ge 2 ]; then
-        MISSING="${MISSING} gpg"
-    fi
-
-    check_version "$(env curl --version 2>/dev/null | sed -e 's/^.* \([0-9.\].*\).*$/\1/' -e 's/^\([0-9.\]*\).*/\1/g' | head -1)" "${CURL_VERSION}"
-    if [ $? -ge 2 ]; then
-        MISSING="${MISSING} curl"
-    fi
-
    check_version "$(env yasm --version 2>/dev/null | sed 's/^.* \([0-9.]*\).*$/\1/' | head -1)" "${YASM_VERSION}"
    if [ $? -ge 2 ]; then
        MISSING="${MISSING} yasm(${YASM_VERSION})"
--- a/routers.go
+++ b/routers.go
@ -20,6 +20,7 @@ import (
 	"net"
 	"net/http"

+	"github.com/elazarl/go-bindata-assetfs"
 	router "github.com/gorilla/mux"
 	jsonrpc "github.com/gorilla/rpc/v2"
 	"github.com/gorilla/rpc/v2/json2"
@ -27,6 +28,7 @@ import (
 	"github.com/minio/minio/pkg/fs"
 	"github.com/minio/minio/pkg/probe"
 	"github.com/minio/minio/pkg/s3/signature4"
+	"github.com/minio/miniobrowser"
 )

 // storageAPI container for S3 compatible API.
@ -67,6 +69,17 @@ func (h indexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	h.handler.ServeHTTP(w, r)
 }

+const assetPrefix = "production"
+
+func assetFS() *assetfs.AssetFS {
+	return &assetfs.AssetFS{
+		Asset:     miniobrowser.Asset,
+		AssetDir:  miniobrowser.AssetDir,
+		AssetInfo: miniobrowser.AssetInfo,
+		Prefix:    assetPrefix,
+	}
+}
+
 // registerAPIHandlers - register all the handlers to their respective paths
 func registerAPIHandlers(mux *router.Router, a storageAPI, w *webAPI) {
 	// Minio rpc router
--- a/vendor/github.com/minio/miniobrowser/INSTALLGO.md
+++ b/vendor/github.com/minio/miniobrowser/INSTALLGO.md
@ -0,0 +1,84 @@
+## Ubuntu (Kylin) 14.04
+### Build Dependencies
+This installation document assumes Ubuntu 14.04+ on x86-64 platform.
+
+##### Install Git, GCC
+```sh
+$ sudo apt-get install git build-essential
+```
+
+##### Install Go 1.5+
+
+Download Go 1.5+ from [https://golang.org/dl/](https://golang.org/dl/).
+
+```sh
+$ wget https://storage.googleapis.com/golang/go1.5.3.linux-amd64.tar.gz
+$ mkdir -p ${HOME}/bin/
+$ mkdir -p ${HOME}/go/
+$ tar -C ${HOME}/bin/ -xzf go1.5.3.linux-amd64.tar.gz
+```
+##### Setup GOROOT and GOPATH
+
+Add the following exports to your ``~/.bashrc``. Environment variable GOROOT specifies the location of your golang binaries
+and GOPATH specifies the location of your project workspace.
+
+```sh
+export GOROOT=${HOME}/bin/go
+export GOPATH=${HOME}/go
+export PATH=$PATH:${HOME}/bin/go/bin:${GOPATH}/bin
+```
+##### Source the new enviornment
+
+```sh
+$ source ~/.bashrc
+```
+
+##### Testing it all
+
+```sh
+$ go env
+```
+
+## OS X (Yosemite) 10.10
+### Build Dependencies
+This installation document assumes OS X Yosemite 10.10+ on x86-64 platform.
+
+##### Install brew
+```sh
+$ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+```
+
+##### Install Git, Python
+```sh
+$ brew install git python
+```
+
+##### Install Go 1.5+
+
+Install golang binaries using `brew`
+
+```sh
+$ brew install go
+$ mkdir -p $HOME/go
+```
+
+##### Setup GOROOT and GOPATH
+
+Add the following exports to your ``~/.bash_profile``. Environment variable GOROOT specifies the location of your golang binaries
+and GOPATH specifies the location of your project workspace.
+
+```sh
+export GOPATH=${HOME}/go
+export GOVERSION=$(brew list go | head -n 1 | cut -d '/' -f 6)
+export GOROOT=$(brew --prefix)/Cellar/go/${GOVERSION}/libexec
+export PATH=$PATH:${GOPATH}/bin
+```
+##### Source the new enviornment
+```sh
+$ source ~/.bash_profile
+```
+##### Testing it all
+
+```sh
+$ go env
+```
--- a/vendor/github.com/minio/miniobrowser/LICENSE
+++ b/vendor/github.com/minio/miniobrowser/LICENSE
@ -0,0 +1,202 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
--- a/vendor/github.com/minio/miniobrowser/README.md
+++ b/vendor/github.com/minio/miniobrowser/README.md
@ -0,0 +1,43 @@
+# Minio File Browser
+<blockquote>
+This project is still a work in progress.
+</blockquote>
+
+``MinioBrowser`` provides minimal set of UI to manage buckets and objects on ``minio`` server. ``MinioBrowser`` is written in javascript and released under [Apache license v2](./LICENSE).
+
+## Installation
+
+```sh
+$ git clone https://github.com/minio/MinioBrowser
+$ npm install
+$ bower install
+```
+
+### Install `go-bindata` and `go-bindata-assetfs`
+
+If you do not have a working Golang environment, please follow [Install Golang](./INSTALLGO.md).
+
+```sh
+$ go get github.com/jteeuwen/go-bindata/...
+$ go get github.com/elazarl/go-bindata-assetfs/...
+```
+
+## For development environment with live reload
+
+```
+$ npm run dev
+```
+
+### For generating development version of assetfs
+
+The supplied resource is already compressed. Doing it again would not add any value and may even increase the size of the data, use `nocompress` flag to avoid it.
+
+```sh
+$ npm run build
+```
+
+## For generating release version of assetfs
+
+```
+$ npm run release
+```
--- a/vendor/github.com/minio/miniobrowser/ui-assets.go
+++ b/vendor/github.com/minio/miniobrowser/ui-assets.go
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@ -1,6 +1,6 @@
 {
 	"comment": "",
-	"ignore": "",
+	"ignore": "appengine test",
 	"package": [
 		{
 			"path": "github.com/Sirupsen/logrus",
@ -77,6 +77,11 @@
 			"revision": "280f16a52008d3ebba1bd64398b9b082e6738386",
 			"revisionTime": "2016-02-07T03:45:25-08:00"
 		},
+		{
+			"path": "github.com/minio/miniobrowser",
+			"revision": "b2835d0f671b5d539269bd2d9191b7c9c6ed87b3",
+			"revisionTime": "2016-02-23T13:18:37-08:00"
+		},
 		{
 			"path": "github.com/mitchellh/go-homedir",
 			"revision": "d682a8f0cf139663a984ff12528da460ca963de9",
--- a/web-handlers.go
+++ b/web-handlers.go
@ -33,6 +33,7 @@ import (
 	"github.com/gorilla/rpc/v2/json2"
 	"github.com/minio/minio-go"
 	"github.com/minio/minio/pkg/disk"
+	"github.com/minio/miniobrowser"
 )

 // isJWTReqAuthenticated validates if any incoming request to be a
@ -62,7 +63,7 @@ type GenericArgs struct{}

 // GetUIVersion - get UI version
 func (web webAPI) GetUIVersion(r *http.Request, args *GenericArgs, reply *GenericRep) error {
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -103,7 +104,7 @@ func (web *webAPI) ServerInfo(r *http.Request, args *ServerInfoArgs, reply *Serv
 	reply.MinioMemory = mem
 	reply.MinioPlatform = platform
 	reply.MinioRuntime = goruntime
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -126,7 +127,7 @@ func (web *webAPI) DiskInfo(r *http.Request, args *DiskInfoArgs, reply *DiskInfo
 		return &json2.Error{Message: e.Error()}
 	}
 	reply.DiskInfo = info
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -140,7 +141,7 @@ func (web *webAPI) MakeBucket(r *http.Request, args *MakeBucketArgs, reply *Gene
 	if !isJWTReqAuthenticated(r) {
 		return &json2.Error{Message: "Unauthorized request"}
 	}
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	e := web.Client.MakeBucket(args.BucketName, "", "")
 	if e != nil {
 		return &json2.Error{Message: e.Error()}
@ -183,7 +184,7 @@ func (web *webAPI) ListBuckets(r *http.Request, args *ListBucketsArgs, reply *Li
 			})
 		}
 	}
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -240,7 +241,7 @@ func (web *webAPI) ListObjects(r *http.Request, args *ListObjectsArgs, reply *Li
 		}
 		reply.Objects = append(reply.Objects, objectInfo)
 	}
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -276,7 +277,7 @@ func (web *webAPI) PutObjectURL(r *http.Request, args *PutObjectURLArgs, reply *
 		return &json2.Error{Message: e.Error()}
 	}
 	reply.URL = signedURLStr
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -322,7 +323,7 @@ func (web *webAPI) GetObjectURL(r *http.Request, args *GetObjectURLArgs, reply *
 		return &json2.Error{Message: e.Error()}
 	}
 	reply.URL = signedURLStr
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	return nil
 }

@ -338,7 +339,7 @@ func (web *webAPI) RemoveObject(r *http.Request, args *RemoveObjectArgs, reply *
 	if !isJWTReqAuthenticated(r) {
 		return &json2.Error{Message: "Unauthorized request"}
 	}
-	reply.UIVersion = uiVersion
+	reply.UIVersion = miniobrowser.UIVersion
 	e := web.Client.RemoveObject(args.BucketName, args.ObjectName)
 	if e != nil {
 		return &json2.Error{Message: e.Error()}
@ -367,7 +368,7 @@ func (web *webAPI) Login(r *http.Request, args *LoginArgs, reply *LoginRep) erro
 			return &json2.Error{Message: err.Cause.Error(), Data: err.String()}
 		}
 		reply.Token = token
-		reply.UIVersion = uiVersion
+		reply.UIVersion = miniobrowser.UIVersion
 		return nil
 	}
 	return &json2.Error{Message: "Invalid credentials"}