MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-09 21:49:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

fs: Migration should handle bucketConfigs as regular objects. (#4482)

Browse Source 
Current code failed to anticipate the existence of files
which could have been created to corrupt the namespace such
as `policy.json` file created at the bucket top level.

In the current release creating such as file conflicts
with the namespace for future bucket policy operations.
We implemented migration of backend format to avoid situations
such as these.

This PR handles this situation, makes sure that the
erroneous files should have been moved properly.

Fixes #4478
This commit is contained in:
Harshavardhana
2017-06-06 12:15:35 -07:00
committed by GitHub
parent f99987e47c
commit 976870a391
3 changed files with 169 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/fs-v1-helpers.go
View File

@@ -123,24 +123,31 @@ func fsMkdir(dirPath string) (err error) {
return nil
}
func fsStat(statLoc string) (os.FileInfo, error) {
if statLoc == "" {
return nil, traceError(errInvalidArgument)
}
if err := checkPathLength(statLoc); err != nil {
return nil, traceError(err)
}
fi, err := osStat(preparePath(statLoc))
if err != nil {
return nil, traceError(err)
}
return fi, nil
}
// Lookup if directory exists, returns directory
// attributes upon success.
func fsStatDir(statDir string) (os.FileInfo, error) {
if statDir == "" {
return nil, traceError(errInvalidArgument)
}
if err := checkPathLength(statDir); err != nil {
return nil, traceError(err)
}
fi, err := osStat(preparePath(statDir))
fi, err := fsStat(statDir)
if err != nil {
if os.IsNotExist(err) {
if os.IsNotExist(errorCause(err)) {
return nil, traceError(errVolumeNotFound)
} else if os.IsPermission(err) {
} else if os.IsPermission(errorCause(err)) {
return nil, traceError(errVolumeAccessDenied)
}
return nil, traceError(err)
return nil, err
}
if !fi.IsDir() {
@@ -152,26 +159,18 @@ func fsStatDir(statDir string) (os.FileInfo, error) {
// Lookup if file exists, returns file attributes upon success
func fsStatFile(statFile string) (os.FileInfo, error) {
if statFile == "" {
return nil, traceError(errInvalidArgument)
}
if err := checkPathLength(statFile); err != nil {
return nil, traceError(err)
}
fi, err := osStat(preparePath(statFile))
fi, err := fsStat(statFile)
if err != nil {
if os.IsNotExist(err) {
if os.IsNotExist(errorCause(err)) {
return nil, traceError(errFileNotFound)
} else if os.IsPermission(err) {
} else if os.IsPermission(errorCause(err)) {
return nil, traceError(errFileAccessDenied)
} else if isSysErrNotDir(err) {
} else if isSysErrNotDir(errorCause(err)) {
return nil, traceError(errFileAccessDenied)
} else if isSysErrPathNotFound(err) {
} else if isSysErrPathNotFound(errorCause(err)) {
return nil, traceError(errFileNotFound)
}
return nil, traceError(err)
return nil, err
}
if fi.IsDir() {
return nil, traceError(errFileAccessDenied)