MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-06 04:40:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not attempt to generate URLToken for anonymous downloads (#5078)

Browse Source 
This is a regression since last release - fixes #5076
This commit is contained in:
Harshavardhana 2017-10-17 22:44:27 -07:00 committed by Nitish Tiwari
parent 75865efb0e
commit f25bec6bf1
3 changed files with 58 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
browser/app/js/components/Browse.js
View File

@ -150,16 +150,21 @@ export default class Browse extends React.Component {
if (prefix === currentPath) return if (prefix === currentPath) return
browserHistory.push(utils.pathJoin(currentBucket, encPrefix)) browserHistory.push(utils.pathJoin(currentBucket, encPrefix))
} else { } else {
// Download the selected file. if (!web.LoggedIn()) {
web.CreateURLToken() let url = `${window.location.origin}/minio/download/${currentBucket}/${encPrefix}?token=''`
.then(res => { window.location = url
let url = `${window.location.origin}/minio/download/${currentBucket}/${encPrefix}?token=${res.token}` } else {
window.location = url // Download the selected file.
}) web.CreateURLToken()
.catch(err => dispatch(actions.showAlert({ .then(res => {
type: 'danger', let url = `${window.location.origin}/minio/download/${currentBucket}/${encPrefix}?token=${res.token}`
message: err.message window.location = url
}))) })
.catch(err => dispatch(actions.showAlert({
type: 'danger',
message: err.message
})))
}
} }
} }
@ -421,18 +426,23 @@ export default class Browse extends React.Component {
objects: this.props.checkedObjects, objects: this.props.checkedObjects,
prefix: this.props.currentPath prefix: this.props.currentPath
} }
if (!web.LoggedIn()) {
let requestUrl = location.origin + "/minio/zip?token=''"
this.xhr = new XMLHttpRequest()
dispatch(actions.downloadSelected(requestUrl, req, this.xhr))
} else {
web.CreateURLToken()
.then(res => {
let requestUrl = location.origin + "/minio/zip?token=" + res.token
web.CreateURLToken() this.xhr = new XMLHttpRequest()
.then(res => { dispatch(actions.downloadSelected(requestUrl, req, this.xhr))
let requestUrl = location.origin + "/minio/zip?token=" + res.token })
.catch(err => dispatch(actions.showAlert({
this.xhr = new XMLHttpRequest() type: 'danger',
dispatch(actions.downloadSelected(requestUrl, req, this.xhr)) message: err.message
}) })))
.catch(err => dispatch(actions.showAlert({ }
type: 'danger',
message: err.message
})))
} }
clearSelected() { clearSelected() {

48
browser/ui-assets.go
View File

File diff suppressed because one or more lines are too long

3
cmd/jwt.go
View File

@ -93,6 +93,9 @@ func keyFuncCallback(jwtToken *jwtgo.Token) (interface{}, error) {
} }
func isAuthTokenValid(tokenString string) bool { func isAuthTokenValid(tokenString string) bool {
if tokenString == "" {
return false
}
var claims jwtgo.StandardClaims var claims jwtgo.StandardClaims
jwtToken, err := jwtgo.ParseWithClaims(tokenString, &claims, keyFuncCallback) jwtToken, err := jwtgo.ParseWithClaims(tokenString, &claims, keyFuncCallback)
if err != nil { if err != nil {