mirrors/object-browser
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix sub path resource matching in list objects (#2444)

Browse Source 
fixes #https://github.com/minio/console/issues/2400 

Used the policy to validate the fix.

```json

{
    "Version": "2012-10-17",
    "Statement": [
        {
            "Effect": "Allow",
            "Action": [
                "s3:ListBucket"
            ],
            "Resource": [
                "arn:aws:s3:::sam-card"
            ]
        },
        {
            "Effect": "Allow",
            "Action": [
                "s3:*"
            ],
            "Resource": [
                "arn:aws:s3:::sam-card/*"
            ]
        },
        {
            "Effect": "Deny",
            "Action": [
                "s3:*"
            ],
            "Resource": [
                "arn:aws:s3:::sam-card/aa/*"
            ]
        }
    ]
}

```
This commit is contained in:
Prakash Senthil Vel
2022-11-11 00:57:40 +05:30
committed by GitHub
parent 7b389fc323
commit e7ec3fe61f
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
View File

@@ -359,9 +359,26 @@ const ListObjects = () => {
const internalPaths = pathSegment.length === 2 ? pathSegment[1] : "";
const bucketName = params.bucketName || "";
const pageTitle = decodeURLString(internalPaths);
const currentPath = pageTitle.split("/").filter((i: string) => i !== "");
let uploadPath = [bucketName];
if (currentPath.length > 0) {
uploadPath = uploadPath.concat(currentPath);
}
const fileUpload = useRef<HTMLInputElement>(null);
const folderUpload = useRef<HTMLInputElement>(null);
const canDownload = hasPermission(bucketName, [IAM_SCOPES.S3_GET_OBJECT]);
const canDelete = hasPermission(bucketName, [IAM_SCOPES.S3_DELETE_OBJECT]);
const canUpload = hasPermission(
uploadPath,
[IAM_SCOPES.S3_PUT_OBJECT],
true,
true
);
useEffect(() => {
if (folderUpload.current !== null) {
folderUpload.current.setAttribute("directory", "");
@@ -1179,9 +1196,6 @@ const ListObjects = () => {
dispatch(setLoadingObjectsList(true));
};
const pageTitle = decodeURLString(internalPaths);
const currentPath = pageTitle.split("/").filter((i: string) => i !== "");
const plSelect = filteredRecords;
const sortASC = plSelect.sort(sortListObjects(currentSortField));
@@ -1231,14 +1245,6 @@ const ListObjects = () => {
});
}
};
let uploadPath = [bucketName];
if (currentPath.length > 0) {
uploadPath = uploadPath.concat(currentPath);
}
const canDownload = hasPermission(bucketName, [IAM_SCOPES.S3_GET_OBJECT]);
const canDelete = hasPermission(bucketName, [IAM_SCOPES.S3_DELETE_OBJECT]);
const canUpload = hasPermission(uploadPath, [IAM_SCOPES.S3_PUT_OBJECT]);
const onClosePanel = (forceRefresh: boolean) => {
dispatch(setSelectedObjectView(null));