@actsecurity/iam-collect 0.1.228 → 0.1.230
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/dist/cjs/awsConfigClients/clients/AwsConfigS3Client.d.ts.map +1 -1
- package/dist/cjs/awsConfigClients/clients/AwsConfigS3Client.js +61 -1
- package/dist/cjs/awsConfigClients/clients/AwsConfigS3Client.js.map +1 -1
- package/dist/cjs/config/version.d.ts +1 -1
- package/dist/cjs/config/version.js +1 -1
- package/dist/cjs/syncs/s3/buckets.d.ts.map +1 -1
- package/dist/cjs/syncs/s3/buckets.js +39 -5
- package/dist/cjs/syncs/s3/buckets.js.map +1 -1
- package/dist/esm/awsConfigClients/clients/AwsConfigS3Client.d.ts.map +1 -1
- package/dist/esm/awsConfigClients/clients/AwsConfigS3Client.js +62 -2
- package/dist/esm/awsConfigClients/clients/AwsConfigS3Client.js.map +1 -1
- package/dist/esm/config/version.d.ts +1 -1
- package/dist/esm/config/version.js +1 -1
- package/dist/esm/syncs/s3/buckets.d.ts.map +1 -1
- package/dist/esm/syncs/s3/buckets.js +40 -6
- package/dist/esm/syncs/s3/buckets.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -170,7 +170,7 @@ If you prefer, you can configure iam-collect to pull data from AWS Config instea
|
|
|
170
170
|
| lambda | Layer Versions | name, version, policy |
|
|
171
171
|
| ram | Shared Resources | resource shares, resource policy |
|
|
172
172
|
| s3 | Access Points | name, bucket, bucket account, policy, block public access configuration, network origin, vpc, alias, endpoints |
|
|
173
|
-
| s3 | Buckets | name, region, tags, policy, block public access configuration, default encryption
|
|
173
|
+
| s3 | Buckets | name, region, tags, policy, ACL, block public access configuration, default encryption |
|
|
174
174
|
| s3 | Multi Region Access Points | name, alias, regions, policy, block public access configuration |
|
|
175
175
|
| s3-object-lambda | Object Lambda Access Points | name, alias, policy, block public access configuration |
|
|
176
176
|
| s3express | Directory Buckets | name, encryption settings, policy |
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigS3Client.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AwsConfigS3Client.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAGtE,OAAO,EAAE,KAAK,sBAAsB,EAAoB,MAAM,8BAA8B,CAAA;AAO5F;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc,CAAC,sBAAsB,CAAC;IAC3E,MAAM,CAAC,QAAQ,CAAC,UAAU,SAAgB;gBAGxC,OAAO,EAAE;QACP,WAAW,EAAE,iCAAiC,CAAA;QAC9C,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAC3B,EACD,aAAa,EAAE,sBAAsB;IAKvC,SAAS,CAAC,gBAAgB,IAAI,IAAI;CASnC"}
|
|
@@ -16,6 +16,7 @@ class AwsConfigS3Client extends AbstractClient_js_1.AbstractClient {
|
|
|
16
16
|
super(options, customContext);
|
|
17
17
|
}
|
|
18
18
|
registerCommands() {
|
|
19
|
+
this.registerCommand(AwsConfigGetBucketAclCommand);
|
|
19
20
|
this.registerCommand(AwsConfigGetBucketPolicyCommand);
|
|
20
21
|
this.registerCommand(AwsConfigGetBucketEncryptionCommand);
|
|
21
22
|
this.registerCommand(AwsConfigGetBucketTaggingCommand);
|
|
@@ -39,6 +40,7 @@ const AwsConfigListBucketsCommand = (0, AwsConfigClientContext_js_1.awsConfigCom
|
|
|
39
40
|
resourceName,
|
|
40
41
|
configuration.name,
|
|
41
42
|
configuration.creationDate,
|
|
43
|
+
supplementaryConfiguration.AccessControlList,
|
|
42
44
|
supplementaryConfiguration.BucketPolicy,
|
|
43
45
|
supplementaryConfiguration.ServerSideEncryptionConfiguration,
|
|
44
46
|
supplementaryConfiguration.PublicAccessBlockConfiguration,
|
|
@@ -52,7 +54,8 @@ const AwsConfigListBucketsCommand = (0, AwsConfigClientContext_js_1.awsConfigCom
|
|
|
52
54
|
const configResults = await (0, awsConfigUtils_js_1.executeConfigQuery)(query, context);
|
|
53
55
|
const buckets = configResults.map((resultString) => {
|
|
54
56
|
const { configItem, configuration, supplementaryConfiguration, tags } = (0, awsConfigUtils_js_1.parseConfigItem)(resultString);
|
|
55
|
-
context.putCache(configItem.resourceName, '
|
|
57
|
+
context.putCache(configItem.resourceName, 'acl', supplementaryConfiguration?.AccessControlList);
|
|
58
|
+
context.putCache(configItem.resourceName, 'policy', supplementaryConfiguration?.BucketPolicy?.policyText);
|
|
56
59
|
context.putCache(configItem.resourceName, 'encryption', supplementaryConfiguration?.ServerSideEncryptionConfiguration);
|
|
57
60
|
context.putCache(configItem.resourceName, 'tags', tags);
|
|
58
61
|
context.putCache(configItem.resourceName, 'publicAccessBlock', supplementaryConfiguration?.PublicAccessBlockConfiguration);
|
|
@@ -100,6 +103,63 @@ const AwsConfigListDirectoryBucketsCommand = (0, AwsConfigClientContext_js_1.aws
|
|
|
100
103
|
};
|
|
101
104
|
}
|
|
102
105
|
});
|
|
106
|
+
/**
|
|
107
|
+
* Config-based implementation of S3 GetBucketAclCommand.
|
|
108
|
+
*
|
|
109
|
+
* @returns ACL owner and grants mapped from AWS Config supplementary data.
|
|
110
|
+
*/
|
|
111
|
+
const AwsConfigGetBucketAclCommand = (0, AwsConfigClientContext_js_1.awsConfigCommand)({
|
|
112
|
+
command: client_s3_1.GetBucketAclCommand,
|
|
113
|
+
execute: async (input, context) => {
|
|
114
|
+
const { Bucket } = input;
|
|
115
|
+
if (!Bucket) {
|
|
116
|
+
throw new Error('Bucket parameter is required');
|
|
117
|
+
}
|
|
118
|
+
return mapConfigAclToSdkOutput(context.getCache(Bucket, 'acl'));
|
|
119
|
+
}
|
|
120
|
+
});
|
|
121
|
+
/**
|
|
122
|
+
* Map an AWS Config access control list to the S3 GetBucketAcl output shape.
|
|
123
|
+
*
|
|
124
|
+
* @param acl the lower-camel AWS Config access control list
|
|
125
|
+
* @returns the SDK-compatible bucket ACL output
|
|
126
|
+
*/
|
|
127
|
+
function mapConfigAclToSdkOutput(acl) {
|
|
128
|
+
if (!acl) {
|
|
129
|
+
return {};
|
|
130
|
+
}
|
|
131
|
+
return {
|
|
132
|
+
Owner: acl.owner
|
|
133
|
+
? {
|
|
134
|
+
ID: acl.owner.id,
|
|
135
|
+
DisplayName: acl.owner.displayName
|
|
136
|
+
}
|
|
137
|
+
: undefined,
|
|
138
|
+
Grants: acl.grantSet?.map((grant) => ({
|
|
139
|
+
Grantee: mapConfigGranteeToSdk(grant.grantee),
|
|
140
|
+
Permission: grant.permission
|
|
141
|
+
}))
|
|
142
|
+
};
|
|
143
|
+
}
|
|
144
|
+
/**
|
|
145
|
+
* Map an AWS Config ACL grantee to the S3 SDK grantee shape.
|
|
146
|
+
*
|
|
147
|
+
* @param grantee the lower-camel AWS Config ACL grantee
|
|
148
|
+
* @returns the SDK-compatible ACL grantee
|
|
149
|
+
*/
|
|
150
|
+
function mapConfigGranteeToSdk(grantee) {
|
|
151
|
+
if (!grantee) {
|
|
152
|
+
return undefined;
|
|
153
|
+
}
|
|
154
|
+
return {
|
|
155
|
+
ID: grantee.id,
|
|
156
|
+
DisplayName: grantee.displayName,
|
|
157
|
+
EmailAddress: grantee.emailAddress,
|
|
158
|
+
URI: grantee.uri,
|
|
159
|
+
Type: grantee.type ??
|
|
160
|
+
(grantee.uri ? 'Group' : grantee.emailAddress ? 'AmazonCustomerByEmail' : 'CanonicalUser')
|
|
161
|
+
};
|
|
162
|
+
}
|
|
103
163
|
/**
|
|
104
164
|
* Config-based implementation of S3 GetBucketPolicyCommand
|
|
105
165
|
* Returns bucket policy from AWS Config supplementary data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigS3Client.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"AwsConfigS3Client.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buckets.d.ts","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buckets.d.ts","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,KAAK,IAAI,EAA8B,MAAM,YAAY,CAAA;AAWlE,eAAO,MAAM,0BAA0B,EAAE,IA+IxC,CAAA"}
|
|
@@ -20,7 +20,7 @@ exports.S3GeneralPurposeBucketSync = {
|
|
|
20
20
|
});
|
|
21
21
|
const augmentedBuckets = await Promise.all(allBuckets.map(async (bucket) => {
|
|
22
22
|
const arn = `arn:${credentials.partition}:s3:::${bucket.Name}`;
|
|
23
|
-
const [tagsJob, blockPublicAccessConfigJob, bucketPolicyJob, encryptionJob, abacEnabledJob] = await Promise.all(syncOptions.workerPool.enqueueAll([
|
|
23
|
+
const [tagsJob, blockPublicAccessConfigJob, bucketPolicyJob, encryptionJob, abacEnabledJob, aclJob] = await Promise.all(syncOptions.workerPool.enqueueAll([
|
|
24
24
|
{
|
|
25
25
|
execute: () => {
|
|
26
26
|
return (0, client_tools_js_1.withDnsRetry)(async () => {
|
|
@@ -60,6 +60,14 @@ exports.S3GeneralPurposeBucketSync = {
|
|
|
60
60
|
});
|
|
61
61
|
},
|
|
62
62
|
properties: {}
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
execute: () => {
|
|
66
|
+
return (0, client_tools_js_1.withDnsRetry)(async () => {
|
|
67
|
+
return getBucketAcl(s3Client, bucket, credentials.accountId, arn);
|
|
68
|
+
});
|
|
69
|
+
},
|
|
70
|
+
properties: {}
|
|
63
71
|
}
|
|
64
72
|
]));
|
|
65
73
|
for (const job of [
|
|
@@ -67,18 +75,20 @@ exports.S3GeneralPurposeBucketSync = {
|
|
|
67
75
|
blockPublicAccessConfigJob,
|
|
68
76
|
bucketPolicyJob,
|
|
69
77
|
encryptionJob,
|
|
70
|
-
abacEnabledJob
|
|
78
|
+
abacEnabledJob,
|
|
79
|
+
aclJob
|
|
71
80
|
]) {
|
|
72
81
|
if (job.status === 'rejected') {
|
|
73
82
|
throw job.reason;
|
|
74
83
|
}
|
|
75
84
|
}
|
|
76
|
-
const [tags, blockPublicAccessConfig, bucketPolicy, encryption, abacEnabled] = [
|
|
85
|
+
const [tags, blockPublicAccessConfig, bucketPolicy, encryption, abacEnabled, acl] = [
|
|
77
86
|
tagsJob.value,
|
|
78
87
|
blockPublicAccessConfigJob.value,
|
|
79
88
|
bucketPolicyJob.value,
|
|
80
89
|
encryptionJob.value,
|
|
81
|
-
abacEnabledJob.value
|
|
90
|
+
abacEnabledJob.value,
|
|
91
|
+
aclJob.value
|
|
82
92
|
];
|
|
83
93
|
return {
|
|
84
94
|
arn,
|
|
@@ -86,6 +96,7 @@ exports.S3GeneralPurposeBucketSync = {
|
|
|
86
96
|
bpa: blockPublicAccessConfig,
|
|
87
97
|
policy: bucketPolicy,
|
|
88
98
|
encryption: encryption?.Rules,
|
|
99
|
+
acl,
|
|
89
100
|
metadata: {
|
|
90
101
|
name: bucket.Name,
|
|
91
102
|
region: region,
|
|
@@ -94,7 +105,7 @@ exports.S3GeneralPurposeBucketSync = {
|
|
|
94
105
|
}
|
|
95
106
|
};
|
|
96
107
|
}));
|
|
97
|
-
(0, sync_js_1.syncData)(augmentedBuckets, storage, accountId, {
|
|
108
|
+
await (0, sync_js_1.syncData)(augmentedBuckets, storage, accountId, {
|
|
98
109
|
service: 's3',
|
|
99
110
|
account: accountId,
|
|
100
111
|
metadata: {
|
|
@@ -141,11 +152,34 @@ async function getBucketPolicy(client, bucket, accountId, arn) {
|
|
|
141
152
|
});
|
|
142
153
|
return policy;
|
|
143
154
|
}
|
|
155
|
+
/**
|
|
156
|
+
* Get the ACL for a bucket.
|
|
157
|
+
*
|
|
158
|
+
* @param client the S3 client to use
|
|
159
|
+
* @param bucket the bucket to get the ACL for
|
|
160
|
+
* @param accountId the account ID of the bucket owner
|
|
161
|
+
* @param arn the ARN of the bucket
|
|
162
|
+
* @returns the bucket ACL owner and grants, if returned by S3
|
|
163
|
+
*/
|
|
164
|
+
async function getBucketAcl(client, bucket, accountId, arn) {
|
|
165
|
+
const command = new client_s3_1.GetBucketAclCommand({
|
|
166
|
+
Bucket: bucket.Name,
|
|
167
|
+
ExpectedBucketOwner: accountId
|
|
168
|
+
});
|
|
169
|
+
const acl = await (0, client_tools_js_1.runAndCatchAccessDeniedWithLog)(arn, 's3', gpBuckets, 'acl', async () => {
|
|
170
|
+
return (0, client_tools_js_1.runAndCatch404)(async () => {
|
|
171
|
+
const { Grants, Owner } = await client.send(command);
|
|
172
|
+
return Grants || Owner ? { Grants, Owner } : undefined;
|
|
173
|
+
});
|
|
174
|
+
});
|
|
175
|
+
return acl;
|
|
176
|
+
}
|
|
144
177
|
/**
|
|
145
178
|
* Get the public access block configuration for a bucket.
|
|
146
179
|
*
|
|
147
180
|
* @param client The S3 client to use.
|
|
148
181
|
* @param bucket the bucket to get the public access settings for
|
|
182
|
+
* @param arn the ARN of the bucket
|
|
149
183
|
* @returns the public access block configuration for the bucket, if any
|
|
150
184
|
*/
|
|
151
185
|
async function getBucketPublicAccessSettings(client, bucket, arn) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buckets.js","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"buckets.js","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigS3Client.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AwsConfigS3Client.d.ts","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,KAAK,iCAAiC,EAAE,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AAGtE,OAAO,EAAE,KAAK,sBAAsB,EAAoB,MAAM,8BAA8B,CAAA;AAO5F;;GAEG;AACH,qBAAa,iBAAkB,SAAQ,cAAc,CAAC,sBAAsB,CAAC;IAC3E,MAAM,CAAC,QAAQ,CAAC,UAAU,SAAgB;gBAGxC,OAAO,EAAE;QACP,WAAW,EAAE,iCAAiC,CAAA;QAC9C,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;KAC3B,EACD,aAAa,EAAE,sBAAsB;IAKvC,SAAS,CAAC,gBAAgB,IAAI,IAAI;CASnC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GetBucketEncryptionCommand, GetBucketPolicyCommand, GetBucketTaggingCommand, GetPublicAccessBlockCommand, ListBucketsCommand, ListDirectoryBucketsCommand, S3Client } from '@aws-sdk/client-s3';
|
|
1
|
+
import { GetBucketAclCommand, GetBucketEncryptionCommand, GetBucketPolicyCommand, GetBucketTaggingCommand, GetPublicAccessBlockCommand, ListBucketsCommand, ListDirectoryBucketsCommand, S3Client } from '@aws-sdk/client-s3';
|
|
2
2
|
import {} from '../../aws/coreAuth.js';
|
|
3
3
|
import { AbstractClient } from '../../customClients/AbstractClient.js';
|
|
4
4
|
import { ResourceNotFoundException } from '../../customClients/ResourceNotFoundException.js';
|
|
@@ -13,6 +13,7 @@ export class AwsConfigS3Client extends AbstractClient {
|
|
|
13
13
|
super(options, customContext);
|
|
14
14
|
}
|
|
15
15
|
registerCommands() {
|
|
16
|
+
this.registerCommand(AwsConfigGetBucketAclCommand);
|
|
16
17
|
this.registerCommand(AwsConfigGetBucketPolicyCommand);
|
|
17
18
|
this.registerCommand(AwsConfigGetBucketEncryptionCommand);
|
|
18
19
|
this.registerCommand(AwsConfigGetBucketTaggingCommand);
|
|
@@ -36,6 +37,7 @@ const AwsConfigListBucketsCommand = awsConfigCommand({
|
|
|
36
37
|
resourceName,
|
|
37
38
|
configuration.name,
|
|
38
39
|
configuration.creationDate,
|
|
40
|
+
supplementaryConfiguration.AccessControlList,
|
|
39
41
|
supplementaryConfiguration.BucketPolicy,
|
|
40
42
|
supplementaryConfiguration.ServerSideEncryptionConfiguration,
|
|
41
43
|
supplementaryConfiguration.PublicAccessBlockConfiguration,
|
|
@@ -49,7 +51,8 @@ const AwsConfigListBucketsCommand = awsConfigCommand({
|
|
|
49
51
|
const configResults = await executeConfigQuery(query, context);
|
|
50
52
|
const buckets = configResults.map((resultString) => {
|
|
51
53
|
const { configItem, configuration, supplementaryConfiguration, tags } = parseConfigItem(resultString);
|
|
52
|
-
context.putCache(configItem.resourceName, '
|
|
54
|
+
context.putCache(configItem.resourceName, 'acl', supplementaryConfiguration?.AccessControlList);
|
|
55
|
+
context.putCache(configItem.resourceName, 'policy', supplementaryConfiguration?.BucketPolicy?.policyText);
|
|
53
56
|
context.putCache(configItem.resourceName, 'encryption', supplementaryConfiguration?.ServerSideEncryptionConfiguration);
|
|
54
57
|
context.putCache(configItem.resourceName, 'tags', tags);
|
|
55
58
|
context.putCache(configItem.resourceName, 'publicAccessBlock', supplementaryConfiguration?.PublicAccessBlockConfiguration);
|
|
@@ -97,6 +100,63 @@ const AwsConfigListDirectoryBucketsCommand = awsConfigCommand({
|
|
|
97
100
|
};
|
|
98
101
|
}
|
|
99
102
|
});
|
|
103
|
+
/**
|
|
104
|
+
* Config-based implementation of S3 GetBucketAclCommand.
|
|
105
|
+
*
|
|
106
|
+
* @returns ACL owner and grants mapped from AWS Config supplementary data.
|
|
107
|
+
*/
|
|
108
|
+
const AwsConfigGetBucketAclCommand = awsConfigCommand({
|
|
109
|
+
command: GetBucketAclCommand,
|
|
110
|
+
execute: async (input, context) => {
|
|
111
|
+
const { Bucket } = input;
|
|
112
|
+
if (!Bucket) {
|
|
113
|
+
throw new Error('Bucket parameter is required');
|
|
114
|
+
}
|
|
115
|
+
return mapConfigAclToSdkOutput(context.getCache(Bucket, 'acl'));
|
|
116
|
+
}
|
|
117
|
+
});
|
|
118
|
+
/**
|
|
119
|
+
* Map an AWS Config access control list to the S3 GetBucketAcl output shape.
|
|
120
|
+
*
|
|
121
|
+
* @param acl the lower-camel AWS Config access control list
|
|
122
|
+
* @returns the SDK-compatible bucket ACL output
|
|
123
|
+
*/
|
|
124
|
+
function mapConfigAclToSdkOutput(acl) {
|
|
125
|
+
if (!acl) {
|
|
126
|
+
return {};
|
|
127
|
+
}
|
|
128
|
+
return {
|
|
129
|
+
Owner: acl.owner
|
|
130
|
+
? {
|
|
131
|
+
ID: acl.owner.id,
|
|
132
|
+
DisplayName: acl.owner.displayName
|
|
133
|
+
}
|
|
134
|
+
: undefined,
|
|
135
|
+
Grants: acl.grantSet?.map((grant) => ({
|
|
136
|
+
Grantee: mapConfigGranteeToSdk(grant.grantee),
|
|
137
|
+
Permission: grant.permission
|
|
138
|
+
}))
|
|
139
|
+
};
|
|
140
|
+
}
|
|
141
|
+
/**
|
|
142
|
+
* Map an AWS Config ACL grantee to the S3 SDK grantee shape.
|
|
143
|
+
*
|
|
144
|
+
* @param grantee the lower-camel AWS Config ACL grantee
|
|
145
|
+
* @returns the SDK-compatible ACL grantee
|
|
146
|
+
*/
|
|
147
|
+
function mapConfigGranteeToSdk(grantee) {
|
|
148
|
+
if (!grantee) {
|
|
149
|
+
return undefined;
|
|
150
|
+
}
|
|
151
|
+
return {
|
|
152
|
+
ID: grantee.id,
|
|
153
|
+
DisplayName: grantee.displayName,
|
|
154
|
+
EmailAddress: grantee.emailAddress,
|
|
155
|
+
URI: grantee.uri,
|
|
156
|
+
Type: grantee.type ??
|
|
157
|
+
(grantee.uri ? 'Group' : grantee.emailAddress ? 'AmazonCustomerByEmail' : 'CanonicalUser')
|
|
158
|
+
};
|
|
159
|
+
}
|
|
100
160
|
/**
|
|
101
161
|
* Config-based implementation of S3 GetBucketPolicyCommand
|
|
102
162
|
* Returns bucket policy from AWS Config supplementary data
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsConfigS3Client.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,kBAAkB,EAClB,2BAA2B,EAC3B,QAAQ,EACT,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAA0C,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAA;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,kDAAkD,CAAA;AAC5F,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,EAA+B,gBAAgB,EAAE,MAAM,8BAA8B,CAAA;AAC5F,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,yBAAyB,EAC1B,MAAM,sBAAsB,CAAA;AAE7B;;GAEG;AACH,MAAM,OAAO,iBAAkB,SAAQ,cAAsC;IAG3E,YACE,OAGC,EACD,aAAqC;QAErC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAA;IAC/B,CAAC;IAES,gBAAgB;QACxB,IAAI,CAAC,eAAe,CAAC,+BAA+B,CAAC,CAAA;QACrD,IAAI,CAAC,eAAe,CAAC,mCAAmC,CAAC,CAAA;QACzD,IAAI,CAAC,eAAe,CAAC,gCAAgC,CAAC,CAAA;QACtD,IAAI,CAAC,eAAe,CAAC,oCAAoC,CAAC,CAAA;QAC1D,IAAI,CAAC,eAAe,CAAC,2BAA2B,CAAC,CAAA;QACjD,IAAI,CAAC,eAAe,CAAC,oCAAoC,CAAC,CAAA;IAC5D,CAAC;;
|
|
1
|
+
{"version":3,"file":"AwsConfigS3Client.js","sourceRoot":"","sources":["../../../../src/awsConfigClients/clients/AwsConfigS3Client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buckets.d.ts","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"buckets.d.ts","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"AAsBA,OAAO,EAAE,KAAK,IAAI,EAA8B,MAAM,YAAY,CAAA;AAWlE,eAAO,MAAM,0BAA0B,EAAE,IA+IxC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { GetBucketAbacCommand, GetBucketEncryptionCommand, GetBucketPolicyCommand, GetBucketTaggingCommand, GetPublicAccessBlockCommand, ListBucketsCommand, S3Client } from '@aws-sdk/client-s3';
|
|
1
|
+
import { GetBucketAbacCommand, GetBucketAclCommand, GetBucketEncryptionCommand, GetBucketPolicyCommand, GetBucketTaggingCommand, GetPublicAccessBlockCommand, ListBucketsCommand, S3Client } from '@aws-sdk/client-s3';
|
|
2
2
|
import {} from '../../aws/coreAuth.js';
|
|
3
3
|
import {} from '../../persistence/AwsIamStore.js';
|
|
4
4
|
import { runAndCatch404, runAndCatchAccessDeniedWithLog, withDnsRetry } from '../../utils/client-tools.js';
|
|
@@ -19,7 +19,7 @@ export const S3GeneralPurposeBucketSync = {
|
|
|
19
19
|
});
|
|
20
20
|
const augmentedBuckets = await Promise.all(allBuckets.map(async (bucket) => {
|
|
21
21
|
const arn = `arn:${credentials.partition}:s3:::${bucket.Name}`;
|
|
22
|
-
const [tagsJob, blockPublicAccessConfigJob, bucketPolicyJob, encryptionJob, abacEnabledJob] = await Promise.all(syncOptions.workerPool.enqueueAll([
|
|
22
|
+
const [tagsJob, blockPublicAccessConfigJob, bucketPolicyJob, encryptionJob, abacEnabledJob, aclJob] = await Promise.all(syncOptions.workerPool.enqueueAll([
|
|
23
23
|
{
|
|
24
24
|
execute: () => {
|
|
25
25
|
return withDnsRetry(async () => {
|
|
@@ -59,6 +59,14 @@ export const S3GeneralPurposeBucketSync = {
|
|
|
59
59
|
});
|
|
60
60
|
},
|
|
61
61
|
properties: {}
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
execute: () => {
|
|
65
|
+
return withDnsRetry(async () => {
|
|
66
|
+
return getBucketAcl(s3Client, bucket, credentials.accountId, arn);
|
|
67
|
+
});
|
|
68
|
+
},
|
|
69
|
+
properties: {}
|
|
62
70
|
}
|
|
63
71
|
]));
|
|
64
72
|
for (const job of [
|
|
@@ -66,18 +74,20 @@ export const S3GeneralPurposeBucketSync = {
|
|
|
66
74
|
blockPublicAccessConfigJob,
|
|
67
75
|
bucketPolicyJob,
|
|
68
76
|
encryptionJob,
|
|
69
|
-
abacEnabledJob
|
|
77
|
+
abacEnabledJob,
|
|
78
|
+
aclJob
|
|
70
79
|
]) {
|
|
71
80
|
if (job.status === 'rejected') {
|
|
72
81
|
throw job.reason;
|
|
73
82
|
}
|
|
74
83
|
}
|
|
75
|
-
const [tags, blockPublicAccessConfig, bucketPolicy, encryption, abacEnabled] = [
|
|
84
|
+
const [tags, blockPublicAccessConfig, bucketPolicy, encryption, abacEnabled, acl] = [
|
|
76
85
|
tagsJob.value,
|
|
77
86
|
blockPublicAccessConfigJob.value,
|
|
78
87
|
bucketPolicyJob.value,
|
|
79
88
|
encryptionJob.value,
|
|
80
|
-
abacEnabledJob.value
|
|
89
|
+
abacEnabledJob.value,
|
|
90
|
+
aclJob.value
|
|
81
91
|
];
|
|
82
92
|
return {
|
|
83
93
|
arn,
|
|
@@ -85,6 +95,7 @@ export const S3GeneralPurposeBucketSync = {
|
|
|
85
95
|
bpa: blockPublicAccessConfig,
|
|
86
96
|
policy: bucketPolicy,
|
|
87
97
|
encryption: encryption?.Rules,
|
|
98
|
+
acl,
|
|
88
99
|
metadata: {
|
|
89
100
|
name: bucket.Name,
|
|
90
101
|
region: region,
|
|
@@ -93,7 +104,7 @@ export const S3GeneralPurposeBucketSync = {
|
|
|
93
104
|
}
|
|
94
105
|
};
|
|
95
106
|
}));
|
|
96
|
-
syncData(augmentedBuckets, storage, accountId, {
|
|
107
|
+
await syncData(augmentedBuckets, storage, accountId, {
|
|
97
108
|
service: 's3',
|
|
98
109
|
account: accountId,
|
|
99
110
|
metadata: {
|
|
@@ -140,11 +151,34 @@ async function getBucketPolicy(client, bucket, accountId, arn) {
|
|
|
140
151
|
});
|
|
141
152
|
return policy;
|
|
142
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* Get the ACL for a bucket.
|
|
156
|
+
*
|
|
157
|
+
* @param client the S3 client to use
|
|
158
|
+
* @param bucket the bucket to get the ACL for
|
|
159
|
+
* @param accountId the account ID of the bucket owner
|
|
160
|
+
* @param arn the ARN of the bucket
|
|
161
|
+
* @returns the bucket ACL owner and grants, if returned by S3
|
|
162
|
+
*/
|
|
163
|
+
async function getBucketAcl(client, bucket, accountId, arn) {
|
|
164
|
+
const command = new GetBucketAclCommand({
|
|
165
|
+
Bucket: bucket.Name,
|
|
166
|
+
ExpectedBucketOwner: accountId
|
|
167
|
+
});
|
|
168
|
+
const acl = await runAndCatchAccessDeniedWithLog(arn, 's3', gpBuckets, 'acl', async () => {
|
|
169
|
+
return runAndCatch404(async () => {
|
|
170
|
+
const { Grants, Owner } = await client.send(command);
|
|
171
|
+
return Grants || Owner ? { Grants, Owner } : undefined;
|
|
172
|
+
});
|
|
173
|
+
});
|
|
174
|
+
return acl;
|
|
175
|
+
}
|
|
143
176
|
/**
|
|
144
177
|
* Get the public access block configuration for a bucket.
|
|
145
178
|
*
|
|
146
179
|
* @param client The S3 client to use.
|
|
147
180
|
* @param bucket the bucket to get the public access settings for
|
|
181
|
+
* @param arn the ARN of the bucket
|
|
148
182
|
* @returns the public access block configuration for the bucket, if any
|
|
149
183
|
*/
|
|
150
184
|
async function getBucketPublicAccessSettings(client, bucket, arn) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buckets.js","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,oBAAoB,EACpB,0BAA0B,EAC1B,sBAAsB,EACtB,uBAAuB,EACvB,2BAA2B,EAC3B,kBAAkB,EAElB,QAAQ,EAET,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EAA0C,MAAM,uBAAuB,CAAA;AAC9E,OAAO,EAAoB,MAAM,kCAAkC,CAAA;AACnE,OAAO,EACL,cAAc,EACd,8BAA8B,EAC9B,YAAY,EACb,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AACzD,OAAO,EAAa,QAAQ,EAAoB,MAAM,YAAY,CAAA;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAQlD,MAAM,SAAS,GAAG,uBAAuB,CAAA;AAEzC,MAAM,CAAC,MAAM,0BAA0B,GAAS;IAC9C,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,KAAK,EACZ,SAAiB,EACjB,MAAc,EACd,WAA8C,EAC9C,OAAoB,EACpB,QAA4B,EAC5B,WAAwB,EACT,EAAE;QACjB,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;QAEvF,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,KAAK,IAAI,EAAE;YAC/C,OAAO,gBAAgB,CACrB,QAAQ,EACR,kBAAkB,EAClB,SAAS,EACT;gBACE,QAAQ,EAAE,mBAAmB;gBAC7B,SAAS,EAAE,mBAAmB;aAC/B,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,CAC3C,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAG,MAAM,OAAO,CAAC,GAAG,CACxC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9B,MAAM,GAAG,GAAG,OAAO,WAAW,CAAC,SAAS,SAAS,MAAM,CAAC,IAAI,EAAE,CAAA;YAE9D,MAAM,CACJ,OAAO,EACP,0BAA0B,EAC1B,eAAe,EACf,aAAa,EACb,cAAc,
|
|
1
|
+
{"version":3,"file":"buckets.js","sourceRoot":"","sources":["../../../../src/syncs/s3/buckets.ts"],"names":[],"mappings":"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"}
|