Version
{version}
- Memory
- {memory}
- Platform
{platform}
diff --git a/browser/app/js/browser/ChangePasswordModal.js b/browser/app/js/browser/ChangePasswordModal.js
index e95eec1b6..af95f4ccc 100644
--- a/browser/app/js/browser/ChangePasswordModal.js
+++ b/browser/app/js/browser/ChangePasswordModal.js
@@ -80,13 +80,6 @@ export class ChangePasswordModal extends React.Component {
generateAuth(e) {
const { serverInfo } = this.props
- // Generate random access key only for root user
- if (!serverInfo.userInfo.isIAMUser) {
- this.setState({
- newAccessKey: getRandomAccessKey()
- })
- }
-
this.setState({
newSecretKey: getRandomSecretKey(),
newSecretKeyVisible: true
@@ -100,10 +93,16 @@ export class ChangePasswordModal extends React.Component {
return false
}
- // When credentials are set on ENV, password change not allowed for owner
- if (serverInfo.info.isEnvCreds && !serverInfo.userInfo.isIAMUser) {
+ // Password change is not allowed for temporary users(STS)
+ if(serverInfo.userInfo.isTempUser) {
return false
}
+
+ // Password change is only allowed for regular users
+ if (!serverInfo.userInfo.isIAMUser) {
+ return false
+ }
+
return true
}
@@ -186,24 +185,6 @@ export class ChangePasswordModal extends React.Component {
- {!serverInfo.userInfo.isIAMUser && (
- {
- this.setState({ newAccessKey: e.target.value })
- }}
- readonly={serverInfo.userInfo.isIAMUser}
- />
- )}
-
{
this.setState({
diff --git a/browser/app/js/browser/Login.js b/browser/app/js/browser/Login.js
index 19674a548..92ae308b9 100644
--- a/browser/app/js/browser/Login.js
+++ b/browser/app/js/browser/Login.js
@@ -22,14 +22,18 @@ import Alert from "../alert/Alert"
import * as actionsAlert from "../alert/actions"
import InputGroup from "./InputGroup"
import web from "../web"
-import { Redirect } from "react-router-dom"
+import { Redirect, Link } from "react-router-dom"
+import qs from "query-string"
+import storage from "local-storage-fallback"
+import history from "../history"
export class Login extends React.Component {
constructor(props) {
super(props)
this.state = {
accessKey: "",
- secretKey: ""
+ secretKey: "",
+ discoveryDoc: {}
}
}
@@ -83,6 +87,14 @@ export class Login extends React.Component {
document.body.classList.add("is-guest")
}
+ componentDidMount() {
+ web.GetDiscoveryDoc().then(({ DiscoveryDoc }) => {
+ this.setState({
+ discoveryDoc: DiscoveryDoc
+ })
+ })
+ }
+
componentWillUnmount() {
document.body.classList.remove("is-guest")
}
@@ -127,6 +139,15 @@ export class Login extends React.Component {
+ {this.state.discoveryDoc &&
+ this.state.discoveryDoc.authorization_endpoint && (
+
+
+ )}
or
+
+ Log in with OpenID
+
+
diff --git a/browser/app/js/browser/OpenIDLogin.js b/browser/app/js/browser/OpenIDLogin.js
new file mode 100644
index 000000000..3c6544762
--- /dev/null
+++ b/browser/app/js/browser/OpenIDLogin.js
@@ -0,0 +1,170 @@
+/*
+ * MinIO Cloud Storage (C) 2019 MinIO, Inc.
+ *
+ * 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.
+ */
+
+import React from "react"
+import { connect } from "react-redux"
+import logo from "../../img/logo.svg"
+import Alert from "../alert/Alert"
+import * as actionsAlert from "../alert/actions"
+import InputGroup from "./InputGroup"
+import web from "../web"
+import { Redirect } from "react-router-dom"
+import qs from "query-string"
+import { getRandomString } from "../utils"
+import storage from "local-storage-fallback"
+import jwtDecode from "jwt-decode"
+
+export class OpenIDLogin extends React.Component {
+ constructor(props) {
+ super(props)
+ this.state = {
+ clientID: "",
+ discoveryDoc: {}
+ }
+ this.clientIDChange = this.clientIDChange.bind(this)
+ this.handleSubmit = this.handleSubmit.bind(this)
+ }
+
+ clientIDChange(e) {
+ this.setState({
+ clientID: e.target.value
+ })
+ }
+
+ handleSubmit(event) {
+ event.preventDefault()
+ const { showAlert } = this.props
+ let message = ""
+ if (this.state.clientID === "") {
+ message = "Client ID cannot be empty"
+ }
+ if (message) {
+ showAlert("danger", message)
+ return
+ }
+
+ if (this.state.discoveryDoc && this.state.discoveryDoc.authorization_endpoint) {
+ const redirectURI = window.location.href.split("#")[0]
+ var params = new URLSearchParams()
+ params.set("response_type", "id_token")
+ params.set("scope", "openid")
+ params.set("client_id", this.state.clientID)
+ params.set("redirect_uri", redirectURI)
+
+ // Store nonce in localstorage to check again after the redirect
+ const nonce = getRandomString(16)
+ params.set("nonce", nonce)
+ storage.setItem("openIDKey", nonce)
+
+ const authURL = `${
+ this.state.discoveryDoc.authorization_endpoint
+ }?${params.toString()}`
+ window.location = authURL
+ }
+ }
+
+ componentWillMount() {
+ const { clearAlert } = this.props
+ // Clear out any stale message in the alert of previous page
+ clearAlert()
+ document.body.classList.add("is-guest")
+
+ web.GetDiscoveryDoc().then(({ DiscoveryDoc }) => {
+ this.setState({
+ discoveryDoc: DiscoveryDoc
+ })
+ })
+ }
+
+ componentDidMount() {
+ const values = qs.parse(this.props.location.hash)
+ if (values.error) {
+ this.props.showAlert("danger", values.error_description)
+ return
+ }
+
+ if (values.id_token) {
+ // Check nonce on the token to prevent replay attacks
+ const tokenJSON = jwtDecode(values.id_token)
+ if (storage.getItem("openIDKey") !== tokenJSON.nonce) {
+ this.props.showAlert("danger", "Invalid auth token")
+ return
+ }
+
+ web.LoginSTS({ token: values.id_token }).then(() => {
+ storage.removeItem("openIDKey")
+ this.forceUpdate()
+ return
+ })
+ }
+ }
+
+ componentWillUnmount() {
+ document.body.classList.remove("is-guest")
+ }
+
+ render() {
+ const { clearAlert, alert } = this.props
+ if (web.LoggedIn()) {
+ return {
it("should initially have the is-guest class", () => {
const wrapper = shallow(
- {
it("should throw an alert if the keys are empty in login form", () => {
const wrapper = mount(
- {
it("should call web.Login with correct arguments if both keys are entered", () => {
const wrapper = mount(
- {
})
wrapper.find("form").simulate("submit")
expect(web.Login).toHaveBeenCalledWith({
- "username": "accessKey",
+ "username": "accessKey",
"password": "secretKey"
})
})
diff --git a/browser/app/js/browser/__tests__/actions.test.js b/browser/app/js/browser/__tests__/actions.test.js
index fc247a2da..5c4609942 100644
--- a/browser/app/js/browser/__tests__/actions.test.js
+++ b/browser/app/js/browser/__tests__/actions.test.js
@@ -25,7 +25,6 @@ jest.mock("../../web", () => ({
ServerInfo: jest.fn(() => {
return Promise.resolve({
MinioVersion: "test",
- MinioMemory: "test",
MinioPlatform: "test",
MinioRuntime: "test",
MinioGlobalInfo: "test"
@@ -55,7 +54,6 @@ describe("Common actions", () => {
type: "common/SET_SERVER_INFO",
serverInfo: {
version: "test",
- memory: "test",
platform: "test",
runtime: "test",
info: "test"
diff --git a/browser/app/js/browser/__tests__/reducer.test.js b/browser/app/js/browser/__tests__/reducer.test.js
index 490499d32..3fe08627d 100644
--- a/browser/app/js/browser/__tests__/reducer.test.js
+++ b/browser/app/js/browser/__tests__/reducer.test.js
@@ -76,7 +76,6 @@ describe("common reducer", () => {
type: actionsCommon.SET_SERVER_INFO,
serverInfo: {
version: "test",
- memory: "test",
platform: "test",
runtime: "test",
info: "test"
@@ -84,7 +83,6 @@ describe("common reducer", () => {
}).serverInfo
).toEqual({
version: "test",
- memory: "test",
platform: "test",
runtime: "test",
info: "test"
diff --git a/browser/app/js/browser/actions.js b/browser/app/js/browser/actions.js
index b75661970..3ea3bb72b 100644
--- a/browser/app/js/browser/actions.js
+++ b/browser/app/js/browser/actions.js
@@ -51,7 +51,6 @@ export const fetchServerInfo = () => {
return web.ServerInfo().then(res => {
const serverInfo = {
version: res.MinioVersion,
- memory: res.MinioMemory,
platform: res.MinioPlatform,
runtime: res.MinioRuntime,
info: res.MinioGlobalInfo,
diff --git a/browser/app/js/utils.js b/browser/app/js/utils.js
index bbf19aa6a..7f41dd37d 100644
--- a/browser/app/js/utils.js
+++ b/browser/app/js/utils.js
@@ -107,3 +107,13 @@ export const getRandomSecretKey = () => {
const base64Str = btoa(binStr)
return base64Str.replace(/\//g, "+").substr(0, 40)
}
+
+export const getRandomString = length => {
+ var text = ""
+ var possible =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
+ for (var i = 0; i < length; i++) {
+ text += possible.charAt(Math.floor(Math.random() * possible.length))
+ }
+ return text
+}
diff --git a/browser/app/js/web.js b/browser/app/js/web.js
index 14eadc526..89aef2b72 100644
--- a/browser/app/js/web.js
+++ b/browser/app/js/web.js
@@ -75,6 +75,16 @@ class Web {
GetToken() {
return storage.getItem('token')
}
+ GetDiscoveryDoc() {
+ return this.makeCall("GetDiscoveryDoc")
+ }
+ LoginSTS(args) {
+ return this.makeCall('LoginSTS', args)
+ .then(res => {
+ storage.setItem('token', `${res.token}`)
+ return res
+ })
+ }
ServerInfo() {
return this.makeCall('ServerInfo')
}
@@ -125,4 +135,4 @@ class Web {
const web = new Web(`${window.location.protocol}//${window.location.host}${minioBrowserPrefix}/webrpc`);
-export default web;
\ No newline at end of file
+export default web;
diff --git a/browser/app/less/inc/login.less b/browser/app/less/inc/login.less
index d092199dc..ccaa487e0 100644
--- a/browser/app/less/inc/login.less
+++ b/browser/app/less/inc/login.less
@@ -95,6 +95,40 @@
}
}
+.openid-login {
+ margin-top: 30px;
+}
+
+.openid-btn {
+ display: inline-block;
+ margin-top: 30px;
+ border-width: 1px;
+ border-style: solid;
+ opacity: 0.6;
+ font-size: 14px;
+ &:hover {
+ color: @link-color;
+ opacity: 1;
+ }
+}
+
+.or {
+ display:flex;
+ justify-content:center;
+ align-items: center;
+ color:grey;
+ }
+
+.or:after,
+.or:before {
+ content: "";
+ display: block;
+ background: grey;
+ width: 10px;
+ height: 1px;
+ margin: 0 10px;
+}
+
/*------------------------------
Chrome autofill fix
-------------------------------*/
diff --git a/browser/package-lock.json b/browser/package-lock.json
index f85e455bb..126b0bb44 100644
--- a/browser/package-lock.json
+++ b/browser/package-lock.json
@@ -8459,6 +8459,24 @@
"prepend-http": "^1.0.0",
"query-string": "^4.1.0",
"sort-keys": "^1.0.0"
+ },
+ "dependencies": {
+ "query-string": {
+ "version": "4.3.4",
+ "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
+ "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
+ "dev": true,
+ "requires": {
+ "object-assign": "^4.1.0",
+ "strict-uri-encode": "^1.0.0"
+ }
+ },
+ "strict-uri-encode": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
+ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
+ "dev": true
+ }
}
},
"npm-path": {
@@ -10287,13 +10305,13 @@
"integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A=="
},
"query-string": {
- "version": "4.3.4",
- "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz",
- "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=",
- "dev": true,
+ "version": "6.8.2",
+ "resolved": "https://registry.npmjs.org/query-string/-/query-string-6.8.2.tgz",
+ "integrity": "sha512-J3Qi8XZJXh93t2FiKyd/7Ec6GNifsjKXUsVFkSBj/kjLsDylWhnCz4NT1bkPcKotttPW+QbKGqqPH8OoI2pdqw==",
"requires": {
- "object-assign": "^4.1.0",
- "strict-uri-encode": "^1.0.0"
+ "decode-uri-component": "^0.2.0",
+ "split-on-first": "^1.0.0",
+ "strict-uri-encode": "^2.0.0"
}
},
"querystring": {
@@ -12142,6 +12160,11 @@
}
}
},
+ "split-on-first": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz",
+ "integrity": "sha512-43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw=="
+ },
"split-string": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -12312,10 +12335,9 @@
"integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI="
},
"strict-uri-encode": {
- "version": "1.1.0",
- "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz",
- "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
- "dev": true
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
+ "integrity": "sha1-ucczDHBChi9rFC3CdLvMWGbONUY="
},
"string-length": {
"version": "2.0.0",
diff --git a/browser/package.json b/browser/package.json
index 35c43811d..9d4033503 100644
--- a/browser/package.json
+++ b/browser/package.json
@@ -75,6 +75,7 @@
"mime-db": "^1.25.0",
"mime-types": "^2.1.13",
"moment": "^2.24.0",
+ "query-string": "^6.8.2",
"react": "^16.2.0",
"react-addons-test-utils": "^0.14.8",
"react-bootstrap": "^0.32.0",
diff --git a/browser/ui-assets.go b/browser/ui-assets.go
index 354158b59..20a7a7fe7 100644
--- a/browser/ui-assets.go
+++ b/browser/ui-assets.go
@@ -1,4 +1,4 @@
-// Code generated by go-bindata.
+// Package browser Code generated by go-bindata. (@generated) DO NOT EDIT.
// sources:
// production/chrome.png
// production/favicon-16x16.png
@@ -6,12 +6,10 @@
// production/favicon-96x96.png
// production/firefox.png
// production/index.html
-// production/index_bundle-2019-10-10T06-01-52Z.js
+// production/index_bundle-2019-10-23T04-04-41Z.js
// production/loader.css
// production/logo.svg
// production/safari.png
-// DO NOT EDIT!
-
package browser
import (
@@ -35,21 +33,32 @@ type bindataFileInfo struct {
modTime time.Time
}
+// Name return file name
func (fi bindataFileInfo) Name() string {
return fi.name
}
+
+// Size return file size
func (fi bindataFileInfo) Size() int64 {
return fi.size
}
+
+// Mode return file mode
func (fi bindataFileInfo) Mode() os.FileMode {
return fi.mode
}
+
+// Mode return file modify time
func (fi bindataFileInfo) ModTime() time.Time {
return fi.modTime
}
+
+// IsDir return file whether a directory
func (fi bindataFileInfo) IsDir() bool {
- return false
+ return fi.mode&os.ModeDir != 0
}
+
+// Sys return file is sys mode
func (fi bindataFileInfo) Sys() interface{} {
return nil
}
@@ -66,7 +75,7 @@ func productionChromePng() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/chrome.png", size: 3726, mode: os.FileMode(420), modTime: time.Unix(1570687319, 0)}
+ info := bindataFileInfo{name: "production/chrome.png", size: 3726, mode: os.FileMode(420), modTime: time.Unix(1571803505, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -83,7 +92,7 @@ func productionFavicon16x16Png() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/favicon-16x16.png", size: 14906, mode: os.FileMode(420), modTime: time.Unix(1570687319, 0)}
+ info := bindataFileInfo{name: "production/favicon-16x16.png", size: 14906, mode: os.FileMode(420), modTime: time.Unix(1571803505, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -100,7 +109,7 @@ func productionFavicon32x32Png() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/favicon-32x32.png", size: 16066, mode: os.FileMode(420), modTime: time.Unix(1570687319, 0)}
+ info := bindataFileInfo{name: "production/favicon-32x32.png", size: 16066, mode: os.FileMode(420), modTime: time.Unix(1571803505, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -117,7 +126,7 @@ func productionFavicon96x96Png() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/favicon-96x96.png", size: 17029, mode: os.FileMode(420), modTime: time.Unix(1570687319, 0)}
+ info := bindataFileInfo{name: "production/favicon-96x96.png", size: 17029, mode: os.FileMode(420), modTime: time.Unix(1571803505, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -134,7 +143,7 @@ func productionFirefoxPng() (*asset, error) {
return nil, err
}
- info := bindataFileInfo{name: "production/firefox.png", size: 4795, mode: os.FileMode(420), modTime: time.Unix(1570687319, 0)}
+ info := bindataFileInfo{name: "production/firefox.png", size: 4795, mode: os.FileMode(420), modTime: time.Unix(1571803505, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -194,8 +203,8 @@ var _productionIndexHTML = []byte(`
-
-
+
+
+ {alertBox}
+
+ )
+ }
+}
+
+const mapDispatchToProps = dispatch => {
+ return {
+ showAlert: (type, message) =>
+ dispatch(actionsAlert.set({ type: type, message: message })),
+ clearAlert: () => dispatch(actionsAlert.clear())
+ }
+}
+
+export default connect(
+ state => state,
+ mapDispatchToProps
+)(OpenIDLogin)
diff --git a/browser/app/js/browser/__tests__/AboutModal.test.js b/browser/app/js/browser/__tests__/AboutModal.test.js
index e5c6a5c81..2b53ab57d 100644
--- a/browser/app/js/browser/__tests__/AboutModal.test.js
+++ b/browser/app/js/browser/__tests__/AboutModal.test.js
@@ -21,7 +21,6 @@ import { AboutModal } from "../AboutModal"
describe("AboutModal", () => {
const serverInfo = {
version: "test",
- memory: "test",
platform: "test",
runtime: "test"
}
diff --git a/browser/app/js/browser/__tests__/BrowserDropdown.test.js b/browser/app/js/browser/__tests__/BrowserDropdown.test.js
index f8d192cee..407722421 100644
--- a/browser/app/js/browser/__tests__/BrowserDropdown.test.js
+++ b/browser/app/js/browser/__tests__/BrowserDropdown.test.js
@@ -21,7 +21,6 @@ import { BrowserDropdown } from "../BrowserDropdown"
describe("BrowserDropdown", () => {
const serverInfo = {
version: "test",
- memory: "test",
platform: "test",
runtime: "test"
}
diff --git a/browser/app/js/browser/__tests__/ChangePasswordModal.test.js b/browser/app/js/browser/__tests__/ChangePasswordModal.test.js
index 57c762c5c..a5e53c9b6 100644
--- a/browser/app/js/browser/__tests__/ChangePasswordModal.test.js
+++ b/browser/app/js/browser/__tests__/ChangePasswordModal.test.js
@@ -54,11 +54,10 @@ jest.mock("../../utils", () => ({
describe("ChangePasswordModal", () => {
const serverInfo = {
version: "test",
- memory: "test",
platform: "test",
runtime: "test",
- info: { isEnvCreds: false },
- userInfo: { isIAMUser: false }
+ info: {},
+ userInfo: { isIAMUser: true }
}
it("should render without crashing", () => {
@@ -76,10 +75,9 @@ describe("ChangePasswordModal", () => {
).toBe("Credentials of this user cannot be updated through MinIO Browser.")
})
- it("should not allow changing password when isEnvCreds is true and not IAM user", () => {
+ it("should not allow changing password when not IAM user", () => {
const newServerInfo = {
...serverInfo,
- info: { isEnvCreds: true },
userInfo: { isIAMUser: false }
}
const wrapper = shallow(
+
+
+
+
+ 
+
+
+ {window.location.host}
+