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

Allow policy with "s3:*Object" to download using Console (#2396)

Browse Source
This commit is contained in:
jinapurapu
2022-10-20 18:40:23 -07:00
committed by GitHub
parent dab4eb7664
commit 483d25c3f3
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
portal-ui/src/common/SecureComponent/permissions.ts
View File

@@ -26,6 +26,7 @@ export const IAM_SCOPES = {
S3_GET_BUCKET_POLICY: "s3:GetBucketPolicy",
S3_PUT_BUCKET_POLICY: "s3:PutBucketPolicy",
S3_GET_OBJECT: "s3:GetObject",
S3_STAR_OBJECT: "s3:*Object",
S3_PUT_OBJECT: "s3:PutObject",
S3_GET_OBJECT_LEGAL_HOLD: "s3:GetObjectLegalHold",
S3_PUT_OBJECT_LEGAL_HOLD: "s3:PutObjectLegalHold",

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

@@ -1236,9 +1236,18 @@ const ListObjects = () => {
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 canDownload = hasPermission(bucketName, [
IAM_SCOPES.S3_GET_OBJECT,
IAM_SCOPES.S3_STAR_OBJECT,
]);
const canDelete = hasPermission(bucketName, [
IAM_SCOPES.S3_DELETE_OBJECT,
IAM_SCOPES.S3_STAR_OBJECT,
]);
const canUpload = hasPermission(uploadPath, [
IAM_SCOPES.S3_PUT_OBJECT,
IAM_SCOPES.S3_STAR_OBJECT,
]);
const onClosePanel = (forceRefresh: boolean) => {
dispatch(setSelectedObjectView(null));

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

@@ -45,7 +45,6 @@ import {
IAM_SCOPES,
permissionTooltipHelper,
} from "../../../../../../common/SecureComponent/permissions";
import { AppState, useAppDispatch } from "../../../../../../store";
import {
DeleteIcon,
@@ -431,6 +430,7 @@ const ObjectDetailPanel = ({
]);
const canGetObject = hasPermission(objectResources, [
IAM_SCOPES.S3_GET_OBJECT,
IAM_SCOPES.S3_STAR_OBJECT,
]);
const canDelete = hasPermission(
[bucketName, currentItem, [bucketName, actualInfo.name].join("/")],

3
portal-ui/src/screens/Console/Buckets/ListBuckets/UploadFilesButton.tsx
View File

@@ -69,10 +69,11 @@ const UploadFilesButton = ({
const uploadObjectAllowed = hasPermission(uploadPath, [
IAM_SCOPES.S3_PUT_OBJECT,
IAM_SCOPES.S3_STAR_OBJECT,
]);
const uploadFolderAllowed = hasPermission(
bucketName,
[IAM_SCOPES.S3_PUT_OBJECT],
[IAM_SCOPES.S3_PUT_OBJECT, IAM_SCOPES.S3_STAR_OBJECT],
false,
true
);