@mavogel/awscdk-rootmail 0.0.293 → 0.0.294
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/.jsii +2 -2
- package/lib/rootmail.js +1 -1
- package/lib/ses-receive.js +1 -1
- package/node_modules/@aws-sdk/client-cloudwatch-logs/package.json +11 -11
- package/node_modules/@aws-sdk/client-route-53/package.json +11 -11
- package/node_modules/@aws-sdk/client-s3/dist-cjs/index.js +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-es/protocols/Aws_restXml.js +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/CreateBucketCommand.d.ts +13 -13
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/DeleteObjectTaggingCommand.d.ts +11 -11
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/GetObjectCommand.d.ts +19 -19
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/GetObjectTaggingCommand.d.ts +19 -19
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/HeadObjectCommand.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/PutObjectCommand.d.ts +40 -40
- package/node_modules/@aws-sdk/client-s3/dist-types/commands/UploadPartCopyCommand.d.ts +13 -13
- package/node_modules/@aws-sdk/client-s3/dist-types/models/models_0.d.ts +76 -71
- package/node_modules/@aws-sdk/client-s3/dist-types/models/models_1.d.ts +43 -43
- package/node_modules/@aws-sdk/client-s3/dist-types/runtimeConfig.browser.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/runtimeConfig.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/runtimeConfig.native.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/ts3.4/models/models_0.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/ts3.4/runtimeConfig.browser.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/ts3.4/runtimeConfig.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/dist-types/ts3.4/runtimeConfig.native.d.ts +1 -0
- package/node_modules/@aws-sdk/client-s3/package.json +16 -16
- package/node_modules/@aws-sdk/client-ses/package.json +11 -11
- package/node_modules/@aws-sdk/client-ssm/package.json +11 -11
- package/node_modules/@aws-sdk/client-sso/package.json +10 -10
- package/node_modules/@aws-sdk/core/package.json +3 -3
- package/node_modules/@aws-sdk/credential-provider-env/package.json +2 -2
- package/node_modules/@aws-sdk/credential-provider-http/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-ini/package.json +8 -8
- package/node_modules/@aws-sdk/credential-provider-node/package.json +7 -7
- package/node_modules/@aws-sdk/credential-provider-process/package.json +2 -2
- package/node_modules/@aws-sdk/credential-provider-sso/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +3 -3
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-cjs/index.js +14 -9
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-es/flexibleChecksumsMiddleware.js +4 -1
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-es/resolveFlexibleChecksumsConfig.js +1 -0
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-types/configuration.d.ts +4 -0
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-types/resolveFlexibleChecksumsConfig.d.ts +17 -0
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-types/ts3.4/configuration.d.ts +1 -0
- package/node_modules/@aws-sdk/middleware-flexible-checksums/dist-types/ts3.4/resolveFlexibleChecksumsConfig.d.ts +2 -0
- package/node_modules/@aws-sdk/middleware-flexible-checksums/package.json +3 -3
- package/node_modules/@aws-sdk/middleware-sdk-s3/dist-cjs/index.js +2 -1
- package/node_modules/@aws-sdk/middleware-sdk-s3/dist-es/check-content-length-header.js +2 -1
- package/node_modules/@aws-sdk/middleware-sdk-s3/package.json +5 -5
- package/node_modules/@aws-sdk/middleware-user-agent/package.json +3 -3
- package/node_modules/@aws-sdk/nested-clients/package.json +10 -10
- package/node_modules/@aws-sdk/signature-v4-multi-region/package.json +2 -2
- package/node_modules/@aws-sdk/token-providers/package.json +2 -2
- package/node_modules/@aws-sdk/util-user-agent-node/package.json +2 -2
- package/node_modules/@smithy/core/package.json +2 -2
- package/node_modules/@smithy/middleware-endpoint/package.json +2 -2
- package/node_modules/@smithy/middleware-retry/package.json +2 -2
- package/node_modules/@smithy/smithy-client/package.json +4 -4
- package/node_modules/@smithy/util-defaults-mode-browser/package.json +2 -2
- package/node_modules/@smithy/util-defaults-mode-node/package.json +2 -2
- package/node_modules/@smithy/util-stream/dist-cjs/ByteArrayCollector.js +35 -0
- package/node_modules/@smithy/util-stream/dist-cjs/createBufferedReadable.js +61 -0
- package/node_modules/@smithy/util-stream/dist-cjs/createBufferedReadableStream.js +104 -0
- package/node_modules/@smithy/util-stream/dist-cjs/index.js +9 -7
- package/node_modules/@smithy/util-stream/dist-es/ByteArrayCollector.js +31 -0
- package/node_modules/@smithy/util-stream/dist-es/createBufferedReadable.js +57 -0
- package/node_modules/@smithy/util-stream/dist-es/createBufferedReadableStream.js +95 -0
- package/node_modules/@smithy/util-stream/dist-es/index.js +4 -3
- package/node_modules/@smithy/util-stream/dist-types/ByteArrayCollector.d.ts +13 -0
- package/node_modules/@smithy/util-stream/dist-types/createBufferedReadable.d.ts +13 -0
- package/node_modules/@smithy/util-stream/dist-types/createBufferedReadableStream.d.ts +49 -0
- package/node_modules/@smithy/util-stream/dist-types/index.d.ts +4 -3
- package/node_modules/@smithy/util-stream/dist-types/ts3.4/ByteArrayCollector.d.ts +13 -0
- package/node_modules/@smithy/util-stream/dist-types/ts3.4/createBufferedReadable.d.ts +13 -0
- package/node_modules/@smithy/util-stream/dist-types/ts3.4/createBufferedReadableStream.d.ts +53 -0
- package/node_modules/@smithy/util-stream/dist-types/ts3.4/index.d.ts +4 -3
- package/node_modules/@smithy/util-stream/package.json +5 -2
- package/node_modules/cdk-nag/.jsii +42 -4
- package/node_modules/cdk-nag/API.md +29 -4
- package/node_modules/cdk-nag/lib/ignore-suppression-conditions.js +5 -5
- package/node_modules/cdk-nag/lib/nag-logger.js +2 -2
- package/node_modules/cdk-nag/lib/nag-pack.js +1 -1
- package/node_modules/cdk-nag/lib/nag-rules.d.ts +11 -0
- package/node_modules/cdk-nag/lib/nag-rules.js +15 -2
- package/node_modules/cdk-nag/lib/nag-suppressions.js +1 -1
- package/node_modules/cdk-nag/lib/packs/aws-solutions.js +1 -1
- package/node_modules/cdk-nag/lib/packs/hipaa-security.js +1 -1
- package/node_modules/cdk-nag/lib/packs/nist-800-53-r4.js +1 -1
- package/node_modules/cdk-nag/lib/packs/nist-800-53-r5.js +1 -1
- package/node_modules/cdk-nag/lib/packs/pci-dss-321.js +1 -1
- package/node_modules/cdk-nag/lib/rules/apigw/APIGWAssociatedWithWAF.js +4 -4
- package/node_modules/cdk-nag/lib/rules/apigw/APIGWRequestValidation.js +3 -3
- package/node_modules/cdk-nag/lib/rules/cloudfront/CloudFrontDistributionS3OriginAccessControl.js +4 -4
- package/node_modules/cdk-nag/lib/rules/dynamodb/DynamoDBAutoScalingEnabled.js +3 -3
- package/node_modules/cdk-nag/lib/rules/dynamodb/DynamoDBInBackupPlan.js +2 -2
- package/node_modules/cdk-nag/lib/rules/ec2/EC2EBSInBackupPlan.js +2 -2
- package/node_modules/cdk-nag/lib/rules/ec2/EC2EBSVolumeEncrypted.js +2 -2
- package/node_modules/cdk-nag/lib/rules/ec2/EC2IMDSv2Enabled.js +4 -4
- package/node_modules/cdk-nag/lib/rules/efs/EFSInBackupPlan.js +2 -2
- package/node_modules/cdk-nag/lib/rules/elb/ALBWAFEnabled.js +2 -2
- package/node_modules/cdk-nag/lib/rules/emr/EMREncryptionInTransit.js +3 -3
- package/node_modules/cdk-nag/lib/rules/emr/EMRLocalDiskEncryption.js +3 -3
- package/node_modules/cdk-nag/lib/rules/glue/GlueEncryptedCloudWatchLogs.js +4 -4
- package/node_modules/cdk-nag/lib/rules/glue/GlueJobBookmarkEncrypted.js +3 -3
- package/node_modules/cdk-nag/lib/rules/iam/IAMGroupHasUsers.js +2 -2
- package/node_modules/cdk-nag/lib/rules/lex/LexBotAliasEncryptedConversationLogs.js +3 -3
- package/node_modules/cdk-nag/lib/rules/rds/RDSInBackupPlan.js +2 -2
- package/node_modules/cdk-nag/lib/rules/redshift/RedshiftClusterUserActivityLogging.js +3 -3
- package/node_modules/cdk-nag/lib/rules/redshift/RedshiftRequireTlsSSL.js +3 -3
- package/node_modules/cdk-nag/lib/rules/s3/S3BucketLoggingEnabled.js +2 -2
- package/node_modules/cdk-nag/lib/rules/s3/S3BucketSSLRequestsOnly.js +4 -4
- package/node_modules/cdk-nag/lib/rules/s3/S3WebBucketOAIAccess.js +3 -3
- package/node_modules/cdk-nag/lib/rules/secretsmanager/SecretsManagerRotationEnabled.js +5 -5
- package/node_modules/cdk-nag/lib/rules/sns/SNSTopicSSLPublishOnly.js +3 -3
- package/node_modules/cdk-nag/lib/rules/sqs/SQSQueueDLQ.js +2 -2
- package/node_modules/cdk-nag/lib/rules/sqs/SQSQueueSSLRequestsOnly.js +3 -3
- package/node_modules/cdk-nag/lib/rules/vpc/VPCFlowLogsEnabled.js +3 -3
- package/node_modules/cdk-nag/lib/rules/waf/WAFv2LoggingEnabled.js +2 -2
- package/node_modules/cdk-nag/package.json +2 -2
- package/package.json +1 -1
|
@@ -20,7 +20,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
20
20
|
(logging.destinationBucketName == undefined &&
|
|
21
21
|
logging.logFilePrefix == undefined)) {
|
|
22
22
|
let found = false;
|
|
23
|
-
const bucketLogicalId = nag_rules_1.NagRules.
|
|
23
|
+
const bucketLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
24
24
|
const bucketName = aws_cdk_lib_1.Stack.of(node).resolve(node.bucketName);
|
|
25
25
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
26
26
|
if (child instanceof aws_s3_1.CfnBucket) {
|
|
@@ -55,4 +55,4 @@ function isMatchingBucket(node, bucketLogicalId, bucketName) {
|
|
|
55
55
|
}
|
|
56
56
|
return false;
|
|
57
57
|
}
|
|
58
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
58
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUzNCdWNrZXRMb2dnaW5nRW5hYmxlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ydWxlcy9zMy9TM0J1Y2tldExvZ2dpbmdFbmFibGVkLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUE7OztFQUdFO0FBQ0YsK0JBQTZCO0FBQzdCLDZDQUFpRDtBQUNqRCwrQ0FBK0M7QUFDL0MsK0NBQThEO0FBQzlELDZFQUF3RTtBQUV4RTs7O0dBR0c7QUFDSCxrQkFBZSxNQUFNLENBQUMsY0FBYyxDQUNsQyxDQUFDLElBQWlCLEVBQXFCLEVBQUU7SUFDdkMsSUFBSSxJQUFJLFlBQVksa0JBQVMsRUFBRSxDQUFDO1FBQzlCLE1BQU0sT0FBTyxHQUFHLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsb0JBQW9CLENBQUMsQ0FBQztRQUNsRSxJQUNFLE9BQU8sSUFBSSxTQUFTO1lBQ3BCLENBQUMsT0FBTyxDQUFDLHFCQUFxQixJQUFJLFNBQVM7Z0JBQ3pDLE9BQU8sQ0FBQyxhQUFhLElBQUksU0FBUyxDQUFDLEVBQ3JDLENBQUM7WUFDRCxJQUFJLEtBQUssR0FBRyxLQUFLLENBQUM7WUFDbEIsTUFBTSxlQUFlLEdBQUcsb0JBQVEsQ0FBQyw0QkFBNEIsQ0FDM0QsSUFBSSxFQUNKLElBQUksQ0FBQyxHQUFHLENBQ1QsQ0FBQztZQUNGLE1BQU0sVUFBVSxHQUFHLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLENBQUM7WUFDM0QsS0FBSyxNQUFNLEtBQUssSUFBSSxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FBQztnQkFDbEQsSUFBSSxLQUFLLFlBQVksa0JBQVMsRUFBRSxDQUFDO29CQUMvQixJQUFJLGdCQUFnQixDQUFDLEtBQUssRUFBRSxlQUFlLEVBQUUsVUFBVSxDQUFDLEVBQUUsQ0FBQzt3QkFDekQsS0FBSyxHQUFHLElBQUksQ0FBQzt3QkFDYixNQUFNO29CQUNSLENBQUM7Z0JBQ0gsQ0FBQztZQUNILENBQUM7WUFDRCxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7Z0JBQ1gsT0FBTyw2QkFBaUIsQ0FBQyxhQUFhLENBQUM7WUFDekMsQ0FBQztRQUNILENBQUM7UUFDRCxPQUFPLDZCQUFpQixDQUFDLFNBQVMsQ0FBQztJQUNyQyxDQUFDO1NBQU0sQ0FBQztRQUNOLE9BQU8sNkJBQWlCLENBQUMsY0FBYyxDQUFDO0lBQzFDLENBQUM7QUFDSCxDQUFDLEVBQ0QsTUFBTSxFQUNOLEVBQUUsS0FBSyxFQUFFLElBQUEsWUFBSyxFQUFDLFVBQVUsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUNsQyxDQUFDO0FBRUY7Ozs7OztHQU1HO0FBQ0gsU0FBUyxnQkFBZ0IsQ0FDdkIsSUFBZSxFQUNmLGVBQXVCLEVBQ3ZCLFVBQThCO0lBRTlCLE1BQU0scUJBQXFCLEdBQUcsSUFBQSwyQ0FBbUIsRUFDL0MsbUJBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUNwQixtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLG9CQUFvQixDQUFDLEVBQUUscUJBQXFCLENBQ3pFLENBQ0YsQ0FBQztJQUNGLElBQ0UsSUFBSSxNQUFNLENBQUMsR0FBRyxlQUFlLFdBQVcsQ0FBQyxDQUFDLElBQUksQ0FBQyxxQkFBcUIsQ0FBQztRQUNyRSxVQUFVLEtBQUsscUJBQXFCLEVBQ3BDLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG5TUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuKi9cbmltcG9ydCB7IHBhcnNlIH0gZnJvbSAncGF0aCc7XG5pbXBvcnQgeyBDZm5SZXNvdXJjZSwgU3RhY2sgfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgeyBDZm5CdWNrZXQgfSBmcm9tICdhd3MtY2RrLWxpYi9hd3MtczMnO1xuaW1wb3J0IHsgTmFnUnVsZUNvbXBsaWFuY2UsIE5hZ1J1bGVzIH0gZnJvbSAnLi4vLi4vbmFnLXJ1bGVzJztcbmltcG9ydCB7IGZsYXR0ZW5DZm5SZWZlcmVuY2UgfSBmcm9tICcuLi8uLi91dGlscy9mbGF0dGVuLWNmbi1yZWZlcmVuY2UnO1xuXG4vKipcbiAqIFMzIEJ1Y2tldHMgaGF2ZSBzZXJ2ZXIgYWNjZXNzIGxvZ3MgZW5hYmxlZFxuICogQHBhcmFtIG5vZGUgdGhlIENmblJlc291cmNlIHRvIGNoZWNrXG4gKi9cbmV4cG9ydCBkZWZhdWx0IE9iamVjdC5kZWZpbmVQcm9wZXJ0eShcbiAgKG5vZGU6IENmblJlc291cmNlKTogTmFnUnVsZUNvbXBsaWFuY2UgPT4ge1xuICAgIGlmIChub2RlIGluc3RhbmNlb2YgQ2ZuQnVja2V0KSB7XG4gICAgICBjb25zdCBsb2dnaW5nID0gU3RhY2sub2Yobm9kZSkucmVzb2x2ZShub2RlLmxvZ2dpbmdDb25maWd1cmF0aW9uKTtcbiAgICAgIGlmIChcbiAgICAgICAgbG9nZ2luZyA9PSB1bmRlZmluZWQgfHxcbiAgICAgICAgKGxvZ2dpbmcuZGVzdGluYXRpb25CdWNrZXROYW1lID09IHVuZGVmaW5lZCAmJlxuICAgICAgICAgIGxvZ2dpbmcubG9nRmlsZVByZWZpeCA9PSB1bmRlZmluZWQpXG4gICAgICApIHtcbiAgICAgICAgbGV0IGZvdW5kID0gZmFsc2U7XG4gICAgICAgIGNvbnN0IGJ1Y2tldExvZ2ljYWxJZCA9IE5hZ1J1bGVzLnJlc29sdmVSZXNvdXJjZUZyb21JbnRyaW5zaWMoXG4gICAgICAgICAgbm9kZSxcbiAgICAgICAgICBub2RlLnJlZlxuICAgICAgICApO1xuICAgICAgICBjb25zdCBidWNrZXROYW1lID0gU3RhY2sub2Yobm9kZSkucmVzb2x2ZShub2RlLmJ1Y2tldE5hbWUpO1xuICAgICAgICBmb3IgKGNvbnN0IGNoaWxkIG9mIFN0YWNrLm9mKG5vZGUpLm5vZGUuZmluZEFsbCgpKSB7XG4gICAgICAgICAgaWYgKGNoaWxkIGluc3RhbmNlb2YgQ2ZuQnVja2V0KSB7XG4gICAgICAgICAgICBpZiAoaXNNYXRjaGluZ0J1Y2tldChjaGlsZCwgYnVja2V0TG9naWNhbElkLCBidWNrZXROYW1lKSkge1xuICAgICAgICAgICAgICBmb3VuZCA9IHRydWU7XG4gICAgICAgICAgICAgIGJyZWFrO1xuICAgICAgICAgICAgfVxuICAgICAgICAgIH1cbiAgICAgICAgfVxuICAgICAgICBpZiAoIWZvdW5kKSB7XG4gICAgICAgICAgcmV0dXJuIE5hZ1J1bGVDb21wbGlhbmNlLk5PTl9DT01QTElBTlQ7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICAgIHJldHVybiBOYWdSdWxlQ29tcGxpYW5jZS5DT01QTElBTlQ7XG4gICAgfSBlbHNlIHtcbiAgICAgIHJldHVybiBOYWdSdWxlQ29tcGxpYW5jZS5OT1RfQVBQTElDQUJMRTtcbiAgICB9XG4gIH0sXG4gICduYW1lJyxcbiAgeyB2YWx1ZTogcGFyc2UoX19maWxlbmFtZSkubmFtZSB9XG4pO1xuXG4vKipcbiAqIEhlbHBlciBmdW5jdGlvbiB0byBjaGVjayB3aGV0aGVyIGEgZ2l2ZW4gUzMgQnVja2V0IHVzZXMgdGhlIHRhcmdldCBTMyBidWNrZXQgZm9yIGFjY2VzcyBsb2dzXG4gKiBAcGFyYW0gbm9kZSB0aGUgQ2ZuQnVja2V0IHRvIGNoZWNrXG4gKiBAcGFyYW0gYnVja2V0TG9naWNhbElkIHRoZSBDZm4gTG9naWNhbCBJRCBvZiB0aGUgdGFyZ2V0IGJ1Y2tldFxuICogQHBhcmFtIGJ1Y2tldE5hbWUgdGhlIG5hbWUgb2YgdGhlIHRhcmdldCBidWNrZXRcbiAqIHJldHVybnMgd2hldGhlciB0aGUgQ2ZuQnVja2V0IHVzZXMgdGhlIHRhcmdldCBTMyBidWNrZXQgZm9yIGFjY2VzcyBsb2dzXG4gKi9cbmZ1bmN0aW9uIGlzTWF0Y2hpbmdCdWNrZXQoXG4gIG5vZGU6IENmbkJ1Y2tldCxcbiAgYnVja2V0TG9naWNhbElkOiBzdHJpbmcsXG4gIGJ1Y2tldE5hbWU6IHN0cmluZyB8IHVuZGVmaW5lZFxuKTogYm9vbGVhbiB7XG4gIGNvbnN0IGRlc3RpbmF0aW9uQnVja2V0TmFtZSA9IGZsYXR0ZW5DZm5SZWZlcmVuY2UoXG4gICAgU3RhY2sub2Yobm9kZSkucmVzb2x2ZShcbiAgICAgIFN0YWNrLm9mKG5vZGUpLnJlc29sdmUobm9kZS5sb2dnaW5nQ29uZmlndXJhdGlvbik/LmRlc3RpbmF0aW9uQnVja2V0TmFtZVxuICAgIClcbiAgKTtcbiAgaWYgKFxuICAgIG5ldyBSZWdFeHAoYCR7YnVja2V0TG9naWNhbElkfSg/IVtcXFxcd10pYCkudGVzdChkZXN0aW5hdGlvbkJ1Y2tldE5hbWUpIHx8XG4gICAgYnVja2V0TmFtZSA9PT0gZGVzdGluYXRpb25CdWNrZXROYW1lXG4gICkge1xuICAgIHJldHVybiB0cnVlO1xuICB9XG4gIHJldHVybiBmYWxzZTtcbn1cbiJdfQ==
|
|
@@ -14,7 +14,7 @@ const nag_rules_1 = require("../../nag-rules");
|
|
|
14
14
|
*/
|
|
15
15
|
exports.default = Object.defineProperty((node) => {
|
|
16
16
|
if (node instanceof aws_s3_1.CfnBucket) {
|
|
17
|
-
const bucketLogicalId = nag_rules_1.NagRules.
|
|
17
|
+
const bucketLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
18
18
|
const bucketName = aws_cdk_lib_1.Stack.of(node).resolve(node.bucketName);
|
|
19
19
|
let found = false;
|
|
20
20
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
@@ -32,7 +32,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
32
32
|
return nag_rules_1.NagRuleCompliance.COMPLIANT;
|
|
33
33
|
}
|
|
34
34
|
else if (node instanceof aws_s3_1.CfnBucketPolicy) {
|
|
35
|
-
const bucketLogicalId = nag_rules_1.NagRules.
|
|
35
|
+
const bucketLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.bucket);
|
|
36
36
|
return isCompliantPolicy(node, bucketLogicalId, node.bucket)
|
|
37
37
|
? nag_rules_1.NagRuleCompliance.COMPLIANT
|
|
38
38
|
: nag_rules_1.NagRuleCompliance.NON_COMPLIANT;
|
|
@@ -49,7 +49,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
49
49
|
* @returns Whether the CfnBucketPolicy belongs to th egiven bucket.
|
|
50
50
|
*/
|
|
51
51
|
function isMatchingPolicy(node, bucketLogicalId, bucketName) {
|
|
52
|
-
const bucket = nag_rules_1.NagRules.
|
|
52
|
+
const bucket = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.bucket);
|
|
53
53
|
return bucket === bucketLogicalId || bucket === bucketName;
|
|
54
54
|
}
|
|
55
55
|
/**
|
|
@@ -159,4 +159,4 @@ function checkMatchingResources(node, bucketLogicalId, bucketName, resources) {
|
|
|
159
159
|
}
|
|
160
160
|
return false;
|
|
161
161
|
}
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3BucketSSLRequestsOnly.js","sourceRoot":"","sources":["../../../src/rules/s3/S3BucketSSLRequestsOnly.ts"],"names":[],"mappings":"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","sourcesContent":["/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\nimport { parse } from 'path';\nimport { CfnResource, Stack } from 'aws-cdk-lib';\nimport { CfnBucket, CfnBucketPolicy } from 'aws-cdk-lib/aws-s3';\nimport { NagRuleCompliance, NagRules } from '../../nag-rules';\n\n/**\n * S3 Buckets and bucket policies require requests to use SSL\n * @param node the CfnResource to check\n */\n\nexport default Object.defineProperty(\n  (node: CfnResource): NagRuleCompliance => {\n    if (node instanceof CfnBucket) {\n      const bucketLogicalId = NagRules.resolveResourceFromInstrinsic(\n        node,\n        node.ref\n      );\n      const bucketName = Stack.of(node).resolve(node.bucketName);\n      let found = false;\n      for (const child of Stack.of(node).node.findAll()) {\n        if (child instanceof CfnBucketPolicy) {\n          if (\n            isMatchingPolicy(child, bucketLogicalId, bucketName) &&\n            isCompliantPolicy(child, bucketLogicalId, bucketName)\n          ) {\n            found = true;\n            break;\n          }\n        }\n      }\n      if (!found) {\n        return NagRuleCompliance.NON_COMPLIANT;\n      }\n      return NagRuleCompliance.COMPLIANT;\n    } else if (node instanceof CfnBucketPolicy) {\n      const bucketLogicalId = NagRules.resolveResourceFromInstrinsic(\n        node,\n        node.bucket\n      );\n      return isCompliantPolicy(node, bucketLogicalId, node.bucket)\n        ? NagRuleCompliance.COMPLIANT\n        : NagRuleCompliance.NON_COMPLIANT;\n    } else {\n      return NagRuleCompliance.NOT_APPLICABLE;\n    }\n  },\n  'name',\n  { value: parse(__filename).name }\n);\n\n/**\n * Helper function to check whether the Bucket Policy belongs to the given bucket\n * @param node The CfnBucketPolicy to check.\n * @param bucketLogicalId The Cfn Logical ID of the bucket.\n * @param bucketName The name of the bucket.\n * @returns Whether the CfnBucketPolicy belongs to th egiven bucket.\n */\nfunction isMatchingPolicy(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined\n): boolean {\n  const bucket = NagRules.resolveResourceFromInstrinsic(node, node.bucket);\n  return bucket === bucketLogicalId || bucket === bucketName;\n}\n\n/**\n * Helper function to check whether the Bucket Policy requires SSL on the given bucket.\n * @param node The CfnBucketPolicy to check.\n * @param bucketLogicalId The Cfn Logical ID of the bucket.\n * @param bucketName The name of the bucket.\n * @returns Whether the CfnBucketPolicy requires SSL on the given bucket.\n */\nfunction isCompliantPolicy(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined\n): boolean {\n  const resolvedPolicyDocument = Stack.of(node).resolve(node.policyDocument);\n  for (const statement of resolvedPolicyDocument.Statement) {\n    const resolvedStatement = Stack.of(node).resolve(statement);\n    const secureTransport =\n      resolvedStatement?.Condition?.Bool?.['aws:SecureTransport'];\n    if (\n      resolvedStatement.Effect === 'Deny' &&\n      checkMatchingAction(resolvedStatement.Action) === true &&\n      checkMatchingPrincipal(resolvedStatement.Principal) === true &&\n      (secureTransport === 'false' || secureTransport === false) &&\n      checkMatchingResources(\n        node,\n        bucketLogicalId,\n        bucketName,\n        resolvedStatement.Resource\n      ) === true\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to all actions\n * @param node The CfnBucketPolicy to check\n * @param actions The action in the bucket policy\n * @returns Whether the CfnBucketPolicy applies to all actions\n */\nfunction checkMatchingAction(actions: any): boolean {\n  if (Array.isArray(actions)) {\n    for (const action of actions) {\n      if (action === '*' || action.toLowerCase() === 's3:*') {\n        return true;\n      }\n    }\n  } else if (actions === '*' || actions.toLowerCase() === 's3:*') {\n    return true;\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to all principals\n * @param node The CfnBucketPolicy to check\n * @param principal The principals in the bucket policy\n * @returns Whether the CfnBucketPolicy applies to all principals\n */\nfunction checkMatchingPrincipal(principals: any): boolean {\n  if (principals === '*') {\n    return true;\n  }\n  const awsPrincipal = principals.AWS;\n  if (Array.isArray(awsPrincipal)) {\n    for (const account of awsPrincipal) {\n      if (account === '*') {\n        return true;\n      }\n    }\n  } else if (awsPrincipal === '*') {\n    return true;\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to the bucket and all of it's resources\n * @param node The CfnBucketPolicy to check\n * @param bucketLogicalId The Cfn Logical ID of the bucket\n * @param bucketName The name of the bucket\n * @param resources The resources in the bucket policy\n * @returns Whether the Bucket Policy applies to the bucket and all of it's resources\n */\nfunction checkMatchingResources(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined,\n  resources: any\n): boolean {\n  if (!Array.isArray(resources)) {\n    return false;\n  }\n  const bucketResourceRegexes = Array<string>();\n  const bucketObjectsRegexes = Array<string>();\n  bucketResourceRegexes.push(`(${bucketLogicalId}(?![\\\\w\\\\-]))`);\n  bucketObjectsRegexes.push(`(${bucketLogicalId}(?![\\\\w\\\\-]).*\\\\/\\\\*)`);\n  if (bucketName !== undefined) {\n    bucketResourceRegexes.push(`(${bucketName}(?![\\\\w\\\\-]))`);\n    bucketObjectsRegexes.push(`(${bucketName}(?![\\\\w\\\\-]).*\\\\/\\\\*)`);\n  }\n  const fullBucketResourceRegex = new RegExp(bucketResourceRegexes.join('|'));\n  const fullBucketObjectsRegex = new RegExp(bucketObjectsRegexes.join('|'));\n  let matchedBucketResource = false;\n  let matchedObjectsResource = false;\n  for (const resource of resources) {\n    const resolvedResourceString = JSON.stringify(\n      Stack.of(node).resolve(resource)\n    );\n    if (\n      matchedBucketResource === false &&\n      fullBucketResourceRegex.test(resolvedResourceString) &&\n      !resolvedResourceString.includes('/')\n    ) {\n      matchedBucketResource = true;\n    } else if (\n      matchedObjectsResource === false &&\n      fullBucketObjectsRegex.test(resolvedResourceString) &&\n      resolvedResourceString.indexOf('/') ===\n        resolvedResourceString.lastIndexOf('/')\n    ) {\n      matchedObjectsResource = true;\n    }\n    if (matchedBucketResource === true && matchedObjectsResource === true) {\n      return true;\n    }\n  }\n  return false;\n}\n"]}
|
|
162
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3BucketSSLRequestsOnly.js","sourceRoot":"","sources":["../../../src/rules/s3/S3BucketSSLRequestsOnly.ts"],"names":[],"mappings":"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","sourcesContent":["/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\nimport { parse } from 'path';\nimport { CfnResource, Stack } from 'aws-cdk-lib';\nimport { CfnBucket, CfnBucketPolicy } from 'aws-cdk-lib/aws-s3';\nimport { NagRuleCompliance, NagRules } from '../../nag-rules';\n\n/**\n * S3 Buckets and bucket policies require requests to use SSL\n * @param node the CfnResource to check\n */\n\nexport default Object.defineProperty(\n  (node: CfnResource): NagRuleCompliance => {\n    if (node instanceof CfnBucket) {\n      const bucketLogicalId = NagRules.resolveResourceFromIntrinsic(\n        node,\n        node.ref\n      );\n      const bucketName = Stack.of(node).resolve(node.bucketName);\n      let found = false;\n      for (const child of Stack.of(node).node.findAll()) {\n        if (child instanceof CfnBucketPolicy) {\n          if (\n            isMatchingPolicy(child, bucketLogicalId, bucketName) &&\n            isCompliantPolicy(child, bucketLogicalId, bucketName)\n          ) {\n            found = true;\n            break;\n          }\n        }\n      }\n      if (!found) {\n        return NagRuleCompliance.NON_COMPLIANT;\n      }\n      return NagRuleCompliance.COMPLIANT;\n    } else if (node instanceof CfnBucketPolicy) {\n      const bucketLogicalId = NagRules.resolveResourceFromIntrinsic(\n        node,\n        node.bucket\n      );\n      return isCompliantPolicy(node, bucketLogicalId, node.bucket)\n        ? NagRuleCompliance.COMPLIANT\n        : NagRuleCompliance.NON_COMPLIANT;\n    } else {\n      return NagRuleCompliance.NOT_APPLICABLE;\n    }\n  },\n  'name',\n  { value: parse(__filename).name }\n);\n\n/**\n * Helper function to check whether the Bucket Policy belongs to the given bucket\n * @param node The CfnBucketPolicy to check.\n * @param bucketLogicalId The Cfn Logical ID of the bucket.\n * @param bucketName The name of the bucket.\n * @returns Whether the CfnBucketPolicy belongs to th egiven bucket.\n */\nfunction isMatchingPolicy(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined\n): boolean {\n  const bucket = NagRules.resolveResourceFromIntrinsic(node, node.bucket);\n  return bucket === bucketLogicalId || bucket === bucketName;\n}\n\n/**\n * Helper function to check whether the Bucket Policy requires SSL on the given bucket.\n * @param node The CfnBucketPolicy to check.\n * @param bucketLogicalId The Cfn Logical ID of the bucket.\n * @param bucketName The name of the bucket.\n * @returns Whether the CfnBucketPolicy requires SSL on the given bucket.\n */\nfunction isCompliantPolicy(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined\n): boolean {\n  const resolvedPolicyDocument = Stack.of(node).resolve(node.policyDocument);\n  for (const statement of resolvedPolicyDocument.Statement) {\n    const resolvedStatement = Stack.of(node).resolve(statement);\n    const secureTransport =\n      resolvedStatement?.Condition?.Bool?.['aws:SecureTransport'];\n    if (\n      resolvedStatement.Effect === 'Deny' &&\n      checkMatchingAction(resolvedStatement.Action) === true &&\n      checkMatchingPrincipal(resolvedStatement.Principal) === true &&\n      (secureTransport === 'false' || secureTransport === false) &&\n      checkMatchingResources(\n        node,\n        bucketLogicalId,\n        bucketName,\n        resolvedStatement.Resource\n      ) === true\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to all actions\n * @param node The CfnBucketPolicy to check\n * @param actions The action in the bucket policy\n * @returns Whether the CfnBucketPolicy applies to all actions\n */\nfunction checkMatchingAction(actions: any): boolean {\n  if (Array.isArray(actions)) {\n    for (const action of actions) {\n      if (action === '*' || action.toLowerCase() === 's3:*') {\n        return true;\n      }\n    }\n  } else if (actions === '*' || actions.toLowerCase() === 's3:*') {\n    return true;\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to all principals\n * @param node The CfnBucketPolicy to check\n * @param principal The principals in the bucket policy\n * @returns Whether the CfnBucketPolicy applies to all principals\n */\nfunction checkMatchingPrincipal(principals: any): boolean {\n  if (principals === '*') {\n    return true;\n  }\n  const awsPrincipal = principals.AWS;\n  if (Array.isArray(awsPrincipal)) {\n    for (const account of awsPrincipal) {\n      if (account === '*') {\n        return true;\n      }\n    }\n  } else if (awsPrincipal === '*') {\n    return true;\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to the bucket and all of it's resources\n * @param node The CfnBucketPolicy to check\n * @param bucketLogicalId The Cfn Logical ID of the bucket\n * @param bucketName The name of the bucket\n * @param resources The resources in the bucket policy\n * @returns Whether the Bucket Policy applies to the bucket and all of it's resources\n */\nfunction checkMatchingResources(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined,\n  resources: any\n): boolean {\n  if (!Array.isArray(resources)) {\n    return false;\n  }\n  const bucketResourceRegexes = Array<string>();\n  const bucketObjectsRegexes = Array<string>();\n  bucketResourceRegexes.push(`(${bucketLogicalId}(?![\\\\w\\\\-]))`);\n  bucketObjectsRegexes.push(`(${bucketLogicalId}(?![\\\\w\\\\-]).*\\\\/\\\\*)`);\n  if (bucketName !== undefined) {\n    bucketResourceRegexes.push(`(${bucketName}(?![\\\\w\\\\-]))`);\n    bucketObjectsRegexes.push(`(${bucketName}(?![\\\\w\\\\-]).*\\\\/\\\\*)`);\n  }\n  const fullBucketResourceRegex = new RegExp(bucketResourceRegexes.join('|'));\n  const fullBucketObjectsRegex = new RegExp(bucketObjectsRegexes.join('|'));\n  let matchedBucketResource = false;\n  let matchedObjectsResource = false;\n  for (const resource of resources) {\n    const resolvedResourceString = JSON.stringify(\n      Stack.of(node).resolve(resource)\n    );\n    if (\n      matchedBucketResource === false &&\n      fullBucketResourceRegex.test(resolvedResourceString) &&\n      !resolvedResourceString.includes('/')\n    ) {\n      matchedBucketResource = true;\n    } else if (\n      matchedObjectsResource === false &&\n      fullBucketObjectsRegex.test(resolvedResourceString) &&\n      resolvedResourceString.indexOf('/') ===\n        resolvedResourceString.lastIndexOf('/')\n    ) {\n      matchedObjectsResource = true;\n    }\n    if (matchedBucketResource === true && matchedObjectsResource === true) {\n      return true;\n    }\n  }\n  return false;\n}\n"]}
|
|
@@ -15,7 +15,7 @@ const nag_rules_1 = require("../../nag-rules");
|
|
|
15
15
|
exports.default = Object.defineProperty((node) => {
|
|
16
16
|
if (node instanceof aws_s3_1.CfnBucket) {
|
|
17
17
|
if (node.websiteConfiguration !== undefined) {
|
|
18
|
-
const bucketLogicalId = nag_rules_1.NagRules.
|
|
18
|
+
const bucketLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
19
19
|
const bucketName = aws_cdk_lib_1.Stack.of(node).resolve(node.bucketName);
|
|
20
20
|
let found = false;
|
|
21
21
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
@@ -43,7 +43,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
43
43
|
* @returns Whether the CfnBucketPolicy allows for open access on the given bucket.
|
|
44
44
|
*/
|
|
45
45
|
function isMatchingCompliantPolicy(node, bucketLogicalId, bucketName) {
|
|
46
|
-
const bucket = nag_rules_1.NagRules.
|
|
46
|
+
const bucket = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.bucket);
|
|
47
47
|
if (bucket !== bucketLogicalId && bucket !== bucketName) {
|
|
48
48
|
return false;
|
|
49
49
|
}
|
|
@@ -105,4 +105,4 @@ function checkMatchingActions(actions) {
|
|
|
105
105
|
function normalizeArray(arrOrStr) {
|
|
106
106
|
return Array.isArray(arrOrStr) ? arrOrStr : [arrOrStr];
|
|
107
107
|
}
|
|
108
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
108
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"S3WebBucketOAIAccess.js","sourceRoot":"","sources":["../../../src/rules/s3/S3WebBucketOAIAccess.ts"],"names":[],"mappings":";;AAAA;;;EAGE;AACF,+BAA6B;AAC7B,6CAAiD;AACjD,+CAAgE;AAChE,+CAA8D;AAE9D;;;GAGG;AACH,kBAAe,MAAM,CAAC,cAAc,CAClC,CAAC,IAAiB,EAAqB,EAAE;IACvC,IAAI,IAAI,YAAY,kBAAS,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,oBAAoB,KAAK,SAAS,EAAE,CAAC;YAC5C,MAAM,eAAe,GAAG,oBAAQ,CAAC,4BAA4B,CAC3D,IAAI,EACJ,IAAI,CAAC,GAAG,CACT,CAAC;YACF,MAAM,UAAU,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAC3D,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,KAAK,MAAM,KAAK,IAAI,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBAClD,IAAI,KAAK,YAAY,wBAAe,EAAE,CAAC;oBACrC,IAAI,yBAAyB,CAAC,KAAK,EAAE,eAAe,EAAE,UAAU,CAAC,EAAE,CAAC;wBAClE,KAAK,GAAG,IAAI,CAAC;oBACf,CAAC;gBACH,CAAC;YACH,CAAC;YACD,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,OAAO,6BAAiB,CAAC,aAAa,CAAC;YACzC,CAAC;QACH,CAAC;QACD,OAAO,6BAAiB,CAAC,SAAS,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,6BAAiB,CAAC,cAAc,CAAC;IAC1C,CAAC;AACH,CAAC,EACD,MAAM,EACN,EAAE,KAAK,EAAE,IAAA,YAAK,EAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClC,CAAC;AAEF;;;;;;GAMG;AACH,SAAS,yBAAyB,CAChC,IAAqB,EACrB,eAAuB,EACvB,UAA8B;IAE9B,MAAM,MAAM,GAAG,oBAAQ,CAAC,4BAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxE,IAAI,MAAM,KAAK,eAAe,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;QACxD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,sBAAsB,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC3E,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,KAAK,MAAM,SAAS,IAAI,sBAAsB,CAAC,SAAS,EAAE,CAAC;QACzD,MAAM,iBAAiB,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,iBAAiB,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;YACzC,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;gBACrD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,IAAI,iBAAiB,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;gBACnD,IAAI,oBAAoB,CAAC,cAAc,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;oBACnE,KAAK,GAAG,IAAI,CAAC;gBACf,CAAC;qBAAM,CAAC;oBACN,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;GAKG;AACH,SAAS,mBAAmB,CAAC,UAAe;IAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;AACxD,CAAC;AAED;;;;;GAKG;AACH,SAAS,iBAAiB,CAAC,UAAe;IACxC,MAAM,mBAAmB,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,CACvE,mCAAmC,CACpC,CAAC;IACF,MAAM,0BAA0B,GAAG,CAAC,CAAC,UAAU,EAAE,aAAa,CAAC;IAC/D,OAAO,mBAAmB,IAAI,0BAA0B,CAAC;AAC3D,CAAC;AAED;;;;;GAKG;AACH,SAAS,oBAAoB,CAAC,OAAiB;IAC7C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IACE,MAAM,CAAC,WAAW,EAAE,KAAK,cAAc;YACvC,MAAM,CAAC,WAAW,EAAE,KAAK,cAAc,EACvC,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,cAAc,CAAI,QAAiB;IAC1C,OAAO,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;AACzD,CAAC","sourcesContent":["/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\nimport { parse } from 'path';\nimport { CfnResource, Stack } from 'aws-cdk-lib';\nimport { CfnBucket, CfnBucketPolicy } from 'aws-cdk-lib/aws-s3';\nimport { NagRuleCompliance, NagRules } from '../../nag-rules';\n\n/**\n * S3 static website buckets do not have an open world bucket policy and use CloudFront Origin Access Identities in the bucket policy for limited getObject and/or putObject permissions\n * @param node the CfnResource to check\n */\nexport default Object.defineProperty(\n  (node: CfnResource): NagRuleCompliance => {\n    if (node instanceof CfnBucket) {\n      if (node.websiteConfiguration !== undefined) {\n        const bucketLogicalId = NagRules.resolveResourceFromIntrinsic(\n          node,\n          node.ref\n        );\n        const bucketName = Stack.of(node).resolve(node.bucketName);\n        let found = false;\n        for (const child of Stack.of(node).node.findAll()) {\n          if (child instanceof CfnBucketPolicy) {\n            if (isMatchingCompliantPolicy(child, bucketLogicalId, bucketName)) {\n              found = true;\n            }\n          }\n        }\n        if (!found) {\n          return NagRuleCompliance.NON_COMPLIANT;\n        }\n      }\n      return NagRuleCompliance.COMPLIANT;\n    } else {\n      return NagRuleCompliance.NOT_APPLICABLE;\n    }\n  },\n  'name',\n  { value: parse(__filename).name }\n);\n\n/**\n * Helper function to check whether the Bucket Policy does not allow for open access  and uses a restricted OAI Policy for access on the given bucket.\n * @param node The CfnBucketPolicy to check.\n * @param bucketLogicalId The Cfn Logical ID of the bucket.\n * @param bucketName The name of the bucket.\n * @returns Whether the CfnBucketPolicy allows for open access on the given bucket.\n */\nfunction isMatchingCompliantPolicy(\n  node: CfnBucketPolicy,\n  bucketLogicalId: string,\n  bucketName: string | undefined\n): boolean {\n  const bucket = NagRules.resolveResourceFromIntrinsic(node, node.bucket);\n  if (bucket !== bucketLogicalId && bucket !== bucketName) {\n    return false;\n  }\n  const resolvedPolicyDocument = Stack.of(node).resolve(node.policyDocument);\n  let found = false;\n  for (const statement of resolvedPolicyDocument.Statement) {\n    const resolvedStatement = Stack.of(node).resolve(statement);\n    if (resolvedStatement.Effect === 'Allow') {\n      if (checkStarPrincipals(resolvedStatement.Principal)) {\n        return false;\n      }\n      if (checkOAIPrincipal(resolvedStatement.Principal)) {\n        if (checkMatchingActions(normalizeArray(resolvedStatement.Action))) {\n          found = true;\n        } else {\n          return false;\n        }\n      }\n    }\n  }\n  return found;\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to all principals\n * @param node The CfnBucketPolicy to check\n * @param principal The principals in the bucket policy\n * @returns Whether the CfnBucketPolicy applies to all principals\n */\nfunction checkStarPrincipals(principals: any): boolean {\n  return JSON.stringify(principals ?? '').includes('*');\n}\n\n/**\n * Helper function to check whether the Bucket Policy applies to a CloudFront OAI\n * @param node The CfnBucketPolicy to check\n * @param principal The principals in the bucket policy\n * @returns Whether the CfnBucketPolicy applies to a CloudFront OAI\n */\nfunction checkOAIPrincipal(principals: any): boolean {\n  const usesAWSPrincipalOAI = JSON.stringify(principals.AWS ?? '').includes(\n    'CloudFront Origin Access Identity'\n  );\n  const usesCanonicalUserPrincipal = !!principals?.CanonicalUser;\n  return usesAWSPrincipalOAI || usesCanonicalUserPrincipal;\n}\n\n/**\n * Helper function to check whether the statement applies to only GetObject and/or PutObject actions\n * @param node The statement to check\n * @param actions The action in the bucket statement\n * @returns Whether the statement applies to only GetObject and/or PutObject actions\n */\nfunction checkMatchingActions(actions: string[]): boolean {\n  for (const action of actions) {\n    if (\n      action.toLowerCase() !== 's3:getobject' &&\n      action.toLowerCase() !== 's3:putobject'\n    ) {\n      return false;\n    }\n  }\n  return true;\n}\n\nfunction normalizeArray<T>(arrOrStr: T[] | T): T[] {\n  return Array.isArray(arrOrStr) ? arrOrStr : [arrOrStr];\n}\n"]}
|
|
@@ -14,7 +14,7 @@ const nag_rules_1 = require("../../nag-rules");
|
|
|
14
14
|
*/
|
|
15
15
|
exports.default = Object.defineProperty((node) => {
|
|
16
16
|
if (node instanceof aws_secretsmanager_1.CfnSecret) {
|
|
17
|
-
const secretLogicalId = nag_rules_1.NagRules.
|
|
17
|
+
const secretLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
18
18
|
const secretTargetAttachmentLogicalIds = Array();
|
|
19
19
|
const cfnSecretTargetAttachments = Array();
|
|
20
20
|
const cfnRotationSchedules = Array();
|
|
@@ -58,9 +58,9 @@ exports.default = Object.defineProperty((node) => {
|
|
|
58
58
|
* Returns the Logical ID if the attachment if is associated with the secret, otherwise and empty string.
|
|
59
59
|
*/
|
|
60
60
|
function getMatchingSecretTargetAttachment(node, secretLogicalId) {
|
|
61
|
-
const resourceSecretId = nag_rules_1.NagRules.
|
|
61
|
+
const resourceSecretId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.secretId);
|
|
62
62
|
if (secretLogicalId === resourceSecretId) {
|
|
63
|
-
return nag_rules_1.NagRules.
|
|
63
|
+
return nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
64
64
|
}
|
|
65
65
|
return '';
|
|
66
66
|
}
|
|
@@ -72,7 +72,7 @@ function getMatchingSecretTargetAttachment(node, secretLogicalId) {
|
|
|
72
72
|
* Returns whether the CfnRotationSchedule is associated with the given secret.
|
|
73
73
|
*/
|
|
74
74
|
function isMatchingRotationSchedule(node, secretLogicalId, secretTargetAttachmentLogicalIds) {
|
|
75
|
-
const resourceSecretId = nag_rules_1.NagRules.
|
|
75
|
+
const resourceSecretId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.secretId);
|
|
76
76
|
if (secretLogicalId === resourceSecretId ||
|
|
77
77
|
secretTargetAttachmentLogicalIds.includes(resourceSecretId)) {
|
|
78
78
|
if (aws_cdk_lib_1.Stack.of(node).resolve(node.hostedRotationLambda) === undefined &&
|
|
@@ -91,4 +91,4 @@ function isMatchingRotationSchedule(node, secretLogicalId, secretTargetAttachmen
|
|
|
91
91
|
}
|
|
92
92
|
return false;
|
|
93
93
|
}
|
|
94
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
94
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SecretsManagerRotationEnabled.js","sourceRoot":"","sources":["../../../src/rules/secretsmanager/SecretsManagerRotationEnabled.ts"],"names":[],"mappings":";;AAAA;;;EAGE;AACF,+BAA6B;AAC7B,6CAAiD;AACjD,uEAIwC;AACxC,+CAA8D;AAE9D;;;GAGG;AACH,kBAAe,MAAM,CAAC,cAAc,CAClC,CAAC,IAAiB,EAAqB,EAAE;IACvC,IAAI,IAAI,YAAY,8BAAS,EAAE,CAAC;QAC9B,MAAM,eAAe,GAAG,oBAAQ,CAAC,4BAA4B,CAC3D,IAAI,EACJ,IAAI,CAAC,GAAG,CACT,CAAC;QACF,MAAM,gCAAgC,GAAG,KAAK,EAAU,CAAC;QACzD,MAAM,0BAA0B,GAAG,KAAK,EAA6B,CAAC;QACtE,MAAM,oBAAoB,GAAG,KAAK,EAAuB,CAAC;QAC1D,KAAK,MAAM,KAAK,IAAI,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;YAClD,IAAI,KAAK,YAAY,8CAAyB,EAAE,CAAC;gBAC/C,0BAA0B,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,KAAK,YAAY,wCAAmB,EAAE,CAAC;gBAChD,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QACD,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,6BAAiB,CAAC,aAAa,CAAC;QACzC,CAAC;QACD,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,KAAK,MAAM,KAAK,IAAI,0BAA0B,EAAE,CAAC;YAC/C,MAAM,mBAAmB,GAAG,iCAAiC,CAC3D,KAAK,EACL,eAAe,CAChB,CAAC;YACF,IAAI,mBAAmB,EAAE,CAAC;gBACxB,gCAAgC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,KAAK,MAAM,KAAK,IAAI,oBAAoB,EAAE,CAAC;YACzC,IACE,0BAA0B,CACxB,KAAK,EACL,eAAe,EACf,gCAAgC,CACjC,EACD,CAAC;gBACD,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;YACR,CAAC;QACH,CAAC;QACD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,6BAAiB,CAAC,aAAa,CAAC;QACzC,CAAC;QACD,OAAO,6BAAiB,CAAC,SAAS,CAAC;IACrC,CAAC;SAAM,CAAC;QACN,OAAO,6BAAiB,CAAC,cAAc,CAAC;IAC1C,CAAC;AACH,CAAC,EACD,MAAM,EACN,EAAE,KAAK,EAAE,IAAA,YAAK,EAAC,UAAU,CAAC,CAAC,IAAI,EAAE,CAClC,CAAC;AAEF;;;;;GAKG;AACH,SAAS,iCAAiC,CACxC,IAA+B,EAC/B,eAAuB;IAEvB,MAAM,gBAAgB,GAAG,oBAAQ,CAAC,4BAA4B,CAC5D,IAAI,EACJ,IAAI,CAAC,QAAQ,CACd,CAAC;IACF,IAAI,eAAe,KAAK,gBAAgB,EAAE,CAAC;QACzC,OAAO,oBAAQ,CAAC,4BAA4B,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAED;;;;;;GAMG;AACH,SAAS,0BAA0B,CACjC,IAAyB,EACzB,eAAuB,EACvB,gCAA0C;IAE1C,MAAM,gBAAgB,GAAG,oBAAQ,CAAC,4BAA4B,CAC5D,IAAI,EACJ,IAAI,CAAC,QAAQ,CACd,CAAC;IACF,IACE,eAAe,KAAK,gBAAgB;QACpC,gCAAgC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAC3D,CAAC;QACD,IACE,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,KAAK,SAAS;YAC/D,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,SAAS,EAC5D,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,aAAa,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACjE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,MAAM,sBAAsB,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CACnD,aAAa,CAAC,sBAAsB,CACrC,CAAC;YACF,MAAM,kBAAkB,GAAG,mBAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,OAAO,CAC/C,aAAa,CAAC,kBAAkB,CACjC,CAAC;YACF,IACE,sBAAsB,KAAK,SAAS;gBACpC,kBAAkB,KAAK,SAAS,EAChC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC","sourcesContent":["/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\nimport { parse } from 'path';\nimport { CfnResource, Stack } from 'aws-cdk-lib';\nimport {\n  CfnSecret,\n  CfnRotationSchedule,\n  CfnSecretTargetAttachment,\n} from 'aws-cdk-lib/aws-secretsmanager';\nimport { NagRuleCompliance, NagRules } from '../../nag-rules';\n\n/**\n * Secrets have automatic rotation scheduled\n * @param node the CfnResource to check\n */\nexport default Object.defineProperty(\n  (node: CfnResource): NagRuleCompliance => {\n    if (node instanceof CfnSecret) {\n      const secretLogicalId = NagRules.resolveResourceFromIntrinsic(\n        node,\n        node.ref\n      );\n      const secretTargetAttachmentLogicalIds = Array<string>();\n      const cfnSecretTargetAttachments = Array<CfnSecretTargetAttachment>();\n      const cfnRotationSchedules = Array<CfnRotationSchedule>();\n      for (const child of Stack.of(node).node.findAll()) {\n        if (child instanceof CfnSecretTargetAttachment) {\n          cfnSecretTargetAttachments.push(child);\n        } else if (child instanceof CfnRotationSchedule) {\n          cfnRotationSchedules.push(child);\n        }\n      }\n      if (cfnRotationSchedules.length === 0) {\n        return NagRuleCompliance.NON_COMPLIANT;\n      }\n      let found = false;\n      for (const child of cfnSecretTargetAttachments) {\n        const attachmentLogicalId = getMatchingSecretTargetAttachment(\n          child,\n          secretLogicalId\n        );\n        if (attachmentLogicalId) {\n          secretTargetAttachmentLogicalIds.push(attachmentLogicalId);\n        }\n      }\n      for (const child of cfnRotationSchedules) {\n        if (\n          isMatchingRotationSchedule(\n            child,\n            secretLogicalId,\n            secretTargetAttachmentLogicalIds\n          )\n        ) {\n          found = true;\n          break;\n        }\n      }\n      if (!found) {\n        return NagRuleCompliance.NON_COMPLIANT;\n      }\n      return NagRuleCompliance.COMPLIANT;\n    } else {\n      return NagRuleCompliance.NOT_APPLICABLE;\n    }\n  },\n  'name',\n  { value: parse(__filename).name }\n);\n\n/**\n * Helper function to check whether a given Secret Target Attachment is associated with the given secret.\n * @param node The CfnTargetAttachment to check.\n * @param secretLogicalId The Cfn Logical ID of the secret.\n * Returns the Logical ID if the attachment if is associated with the secret, otherwise and empty string.\n */\nfunction getMatchingSecretTargetAttachment(\n  node: CfnSecretTargetAttachment,\n  secretLogicalId: string\n): string {\n  const resourceSecretId = NagRules.resolveResourceFromIntrinsic(\n    node,\n    node.secretId\n  );\n  if (secretLogicalId === resourceSecretId) {\n    return NagRules.resolveResourceFromIntrinsic(node, node.ref);\n  }\n  return '';\n}\n\n/**\n * Helper function to check whether a given Rotation Schedule is associated with the given secret.\n * @param node The CfnRotationSchedule to check.\n * @param secretLogicalId The Cfn Logical ID of the secret.\n * @param secretTargetAttachmentLogicalIds The Cfn Logical IDs of any Secret Target Attachments associated with the given secret.\n * Returns whether the CfnRotationSchedule is associated with the given secret.\n */\nfunction isMatchingRotationSchedule(\n  node: CfnRotationSchedule,\n  secretLogicalId: string,\n  secretTargetAttachmentLogicalIds: string[]\n): boolean {\n  const resourceSecretId = NagRules.resolveResourceFromIntrinsic(\n    node,\n    node.secretId\n  );\n  if (\n    secretLogicalId === resourceSecretId ||\n    secretTargetAttachmentLogicalIds.includes(resourceSecretId)\n  ) {\n    if (\n      Stack.of(node).resolve(node.hostedRotationLambda) === undefined &&\n      Stack.of(node).resolve(node.rotationLambdaArn) === undefined\n    ) {\n      return false;\n    }\n    const rotationRules = Stack.of(node).resolve(node.rotationRules);\n    if (rotationRules !== undefined) {\n      const automaticallyAfterDays = Stack.of(node).resolve(\n        rotationRules.automaticallyAfterDays\n      );\n      const scheduleExpression = Stack.of(node).resolve(\n        rotationRules.scheduleExpression\n      );\n      if (\n        automaticallyAfterDays !== undefined ||\n        scheduleExpression !== undefined\n      ) {\n        return true;\n      }\n    }\n  }\n  return false;\n}\n"]}
|
|
@@ -16,7 +16,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
16
16
|
if (node instanceof aws_sns_1.CfnTopic) {
|
|
17
17
|
const topicKey = aws_cdk_lib_1.Stack.of(node).resolve(node.kmsMasterKeyId);
|
|
18
18
|
if (topicKey === undefined) {
|
|
19
|
-
const topicLogicalId = nag_rules_1.NagRules.
|
|
19
|
+
const topicLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
20
20
|
const topicName = aws_cdk_lib_1.Stack.of(node).resolve(node.topicName);
|
|
21
21
|
let found = false;
|
|
22
22
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
@@ -47,7 +47,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
47
47
|
function isMatchingCompliantPolicy(node, topicLogicalId, topicName) {
|
|
48
48
|
let found = false;
|
|
49
49
|
for (const topic of node.topics) {
|
|
50
|
-
const resolvedTopic = nag_rules_1.NagRules.
|
|
50
|
+
const resolvedTopic = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, topic);
|
|
51
51
|
if (resolvedTopic === topicLogicalId ||
|
|
52
52
|
(topicName !== undefined && resolvedTopic.endsWith(topicName))) {
|
|
53
53
|
found = true;
|
|
@@ -112,4 +112,4 @@ function checkMatchingPrincipal(principals) {
|
|
|
112
112
|
}
|
|
113
113
|
return false;
|
|
114
114
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
115
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SNSTopicSSLPublishOnly.js","sourceRoot":"","sources":["../../../src/rules/sns/SNSTopicSSLPublishOnly.ts"],"names":[],"mappings":"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","sourcesContent":["/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\nimport { parse } from 'path';\nimport { CfnResource, Stack } from 'aws-cdk-lib';\nimport { CfnTopic, CfnTopicPolicy } from 'aws-cdk-lib/aws-sns';\nimport { NagRuleCompliance, NagRules } from '../../nag-rules';\n\n/**\n * SNS topics require SSL requests for publishing\n * @param node the CfnResource to check\n */\nexport default Object.defineProperty(\n  (node: CfnResource): NagRuleCompliance => {\n    if (node instanceof CfnTopic) {\n      const topicKey = Stack.of(node).resolve(node.kmsMasterKeyId);\n      if (topicKey === undefined) {\n        const topicLogicalId = NagRules.resolveResourceFromIntrinsic(\n          node,\n          node.ref\n        );\n        const topicName = Stack.of(node).resolve(node.topicName);\n        let found = false;\n        for (const child of Stack.of(node).node.findAll()) {\n          if (child instanceof CfnTopicPolicy) {\n            if (isMatchingCompliantPolicy(child, topicLogicalId, topicName)) {\n              found = true;\n              break;\n            }\n          }\n        }\n        if (!found) {\n          return NagRuleCompliance.NON_COMPLIANT;\n        }\n      }\n      return NagRuleCompliance.COMPLIANT;\n    } else {\n      return NagRuleCompliance.NOT_APPLICABLE;\n    }\n  },\n  'name',\n  { value: parse(__filename).name }\n);\n\n/**\n * Helper function to check whether the topic Policy requires SSL on the given topic.\n * @param node The CfnTopicPolicy to check.\n * @param topicLogicalId The Cfn Logical ID of the topic.\n * @param topicName The name of the topic.\n * @returns Whether the CfnTopicPolicy requires SSL on the given topic.\n */\nfunction isMatchingCompliantPolicy(\n  node: CfnTopicPolicy,\n  topicLogicalId: string,\n  topicName: string | undefined\n): boolean {\n  let found = false;\n  for (const topic of node.topics) {\n    const resolvedTopic = NagRules.resolveResourceFromIntrinsic(node, topic);\n    if (\n      resolvedTopic === topicLogicalId ||\n      (topicName !== undefined && (<string>resolvedTopic).endsWith(topicName))\n    ) {\n      found = true;\n      break;\n    }\n  }\n  if (!found) {\n    return false;\n  }\n  const resolvedPolicyDocument = Stack.of(node).resolve(node.policyDocument);\n  for (const statement of resolvedPolicyDocument.Statement) {\n    const resolvedStatement = Stack.of(node).resolve(statement);\n    const secureTransport =\n      resolvedStatement?.Condition?.Bool?.['aws:SecureTransport'];\n    if (\n      resolvedStatement.Effect === 'Deny' &&\n      checkMatchingAction(resolvedStatement.Action) === true &&\n      checkMatchingPrincipal(resolvedStatement.Principal) === true &&\n      (secureTransport === 'false' || secureTransport === false)\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the topic Policy applies to topic actions\n * @param node The CfnTopicPolicy to check\n * @param actions The action in the topic policy\n * @returns Whether the CfnTopicPolicy applies to topic actions\n */\nfunction checkMatchingAction(actions: any): boolean {\n  if (Array.isArray(actions)) {\n    for (const action of actions) {\n      if (action.toLowerCase() === 'sns:publish') {\n        return true;\n      }\n    }\n  } else if (actions.toLowerCase() === 'sns:publish') {\n    return true;\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the topic Policy applies to all principals\n * @param node The CfnTopicPolicy to check\n * @param principal The principals in the topic policy\n * @returns Whether the CfnTopicPolicy applies to all principals\n */\nfunction checkMatchingPrincipal(principals: any): boolean {\n  if (principals === '*') {\n    return true;\n  }\n  const awsPrincipal = principals.AWS;\n  if (Array.isArray(awsPrincipal)) {\n    for (const account of awsPrincipal) {\n      if (account === '*') {\n        return true;\n      }\n    }\n  } else if (awsPrincipal === '*') {\n    return true;\n  }\n  return false;\n}\n"]}
|
|
@@ -18,7 +18,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
18
18
|
if (node instanceof aws_sqs_1.CfnQueue) {
|
|
19
19
|
const redrivePolicy = aws_cdk_lib_1.Stack.of(node).resolve(node.redrivePolicy);
|
|
20
20
|
if (redrivePolicy === undefined) {
|
|
21
|
-
const queueLogicalId = nag_rules_1.NagRules.
|
|
21
|
+
const queueLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
22
22
|
const queueName = aws_cdk_lib_1.Stack.of(node).resolve(node.queueName);
|
|
23
23
|
let found = false;
|
|
24
24
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
@@ -79,4 +79,4 @@ function isMatchingLambdaFunction(node, queueLogicalId, queueName) {
|
|
|
79
79
|
}
|
|
80
80
|
return false;
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU1FTUXVldWVETFEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvcnVsZXMvc3FzL1NRU1F1ZXVlRExRLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUE7OztFQUdFO0FBQ0YsK0JBQTZCO0FBQzdCLDZDQUFpRDtBQUNqRCx1REFBcUQ7QUFDckQsaURBQStDO0FBQy9DLCtDQUE4RDtBQUM5RCw2RUFBd0U7QUFFeEU7OztHQUdHO0FBQ0gsa0JBQWUsTUFBTSxDQUFDLGNBQWMsQ0FDbEMsQ0FBQyxJQUFpQixFQUFxQixFQUFFO0lBQ3ZDLElBQUksSUFBSSxZQUFZLGtCQUFRLEVBQUUsQ0FBQztRQUM3QixNQUFNLGFBQWEsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLGFBQWEsQ0FBQyxDQUFDO1FBQ2pFLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRSxDQUFDO1lBQ2hDLE1BQU0sY0FBYyxHQUFHLG9CQUFRLENBQUMsNEJBQTRCLENBQzFELElBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUM7WUFDRixNQUFNLFNBQVMsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1lBQ3pELElBQUksS0FBSyxHQUFHLEtBQUssQ0FBQztZQUNsQixLQUFLLE1BQU0sS0FBSyxJQUFJLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO2dCQUNsRCxJQUFJLEtBQUssWUFBWSxrQkFBUSxFQUFFLENBQUM7b0JBQzlCLElBQUksZUFBZSxDQUFDLEtBQUssRUFBRSxjQUFjLEVBQUUsU0FBUyxDQUFDLEVBQUUsQ0FBQzt3QkFDdEQsS0FBSyxHQUFHLElBQUksQ0FBQzt3QkFDYixNQUFNO29CQUNSLENBQUM7Z0JBQ0gsQ0FBQztxQkFBTSxJQUFJLEtBQUssWUFBWSx3QkFBVyxFQUFFLENBQUM7b0JBQ3hDLElBQUksd0JBQXdCLENBQUMsS0FBSyxFQUFFLGNBQWMsRUFBRSxTQUFTLENBQUMsRUFBRSxDQUFDO3dCQUMvRCxLQUFLLEdBQUcsSUFBSSxDQUFDO3dCQUNiLE1BQU07b0JBQ1IsQ0FBQztnQkFDSCxDQUFDO1lBQ0gsQ0FBQztZQUNELElBQUksQ0FBQyxLQUFLLEVBQUUsQ0FBQztnQkFDWCxPQUFPLDZCQUFpQixDQUFDLGFBQWEsQ0FBQztZQUN6QyxDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sNkJBQWlCLENBQUMsU0FBUyxDQUFDO0lBQ3JDLENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyw2QkFBaUIsQ0FBQyxjQUFjLENBQUM7SUFDMUMsQ0FBQztBQUNILENBQUMsRUFDRCxNQUFNLEVBQ04sRUFBRSxLQUFLLEVBQUUsSUFBQSxZQUFLLEVBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQ2xDLENBQUM7QUFFRjs7Ozs7O0dBTUc7QUFDSCxTQUFTLGVBQWUsQ0FDdEIsSUFBYyxFQUNkLGNBQXNCLEVBQ3RCLFNBQTZCO0lBRTdCLE1BQU0sYUFBYSxHQUFHLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsYUFBYSxDQUFDLENBQUM7SUFDakUsTUFBTSxtQkFBbUIsR0FBRyxJQUFBLDJDQUFtQixFQUM3QyxhQUFhLEVBQUUsbUJBQW1CLElBQUksRUFBRSxDQUN6QyxDQUFDO0lBQ0YsSUFDRSxJQUFJLE1BQU0sQ0FBQyxHQUFHLGNBQWMsV0FBVyxDQUFDLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDO1FBQ2xFLENBQUMsU0FBUyxLQUFLLFNBQVM7WUFDdEIsSUFBSSxNQUFNLENBQUMsSUFBSSxTQUFTLGtCQUFrQixDQUFDLENBQUMsSUFBSSxDQUFDLG1CQUFtQixDQUFDLENBQUMsRUFDeEUsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUNELE9BQU8sS0FBSyxDQUFDO0FBQ2YsQ0FBQztBQUVEOzs7Ozs7R0FNRztBQUNILFNBQVMsd0JBQXdCLENBQy9CLElBQWlCLEVBQ2pCLGNBQXNCLEVBQ3RCLFNBQTZCO0lBRTdCLE1BQU0sZ0JBQWdCLEdBQUcsbUJBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDO0lBQ3ZFLE1BQU0sU0FBUyxHQUFHLElBQUEsMkNBQW1CLEVBQ25DLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxnQkFBZ0IsRUFBRSxTQUFTLENBQUMsSUFBSSxFQUFFLENBQzFELENBQUM7SUFDRixJQUNFLElBQUksTUFBTSxDQUFDLEdBQUcsY0FBYyxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDO1FBQ3hELENBQUMsU0FBUyxLQUFLLFNBQVM7WUFDdEIsSUFBSSxNQUFNLENBQUMsSUFBSSxTQUFTLGtCQUFrQixDQUFDLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQzlELENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG5TUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuKi9cbmltcG9ydCB7IHBhcnNlIH0gZnJvbSAncGF0aCc7XG5pbXBvcnQgeyBDZm5SZXNvdXJjZSwgU3RhY2sgfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgeyBDZm5GdW5jdGlvbiB9IGZyb20gJ2F3cy1jZGstbGliL2F3cy1sYW1iZGEnO1xuaW1wb3J0IHsgQ2ZuUXVldWUgfSBmcm9tICdhd3MtY2RrLWxpYi9hd3Mtc3FzJztcbmltcG9ydCB7IE5hZ1J1bGVDb21wbGlhbmNlLCBOYWdSdWxlcyB9IGZyb20gJy4uLy4uL25hZy1ydWxlcyc7XG5pbXBvcnQgeyBmbGF0dGVuQ2ZuUmVmZXJlbmNlIH0gZnJvbSAnLi4vLi4vdXRpbHMvZmxhdHRlbi1jZm4tcmVmZXJlbmNlJztcblxuLyoqXG4gKiBTUVMgcXVldWVzIGhhdmUgYSBkZWFkLWxldHRlciBxdWV1ZSBlbmFibGVkIGlmIHRoZXkgYXJlIG5vdCB1c2VkIGFzIGEgZGVhZC1sZXR0ZXIgcXVldWVcbiAqIEBwYXJhbSBub2RlIHRoZSBDZm5SZXNvdXJjZSB0byBjaGVja1xuICovXG5leHBvcnQgZGVmYXVsdCBPYmplY3QuZGVmaW5lUHJvcGVydHkoXG4gIChub2RlOiBDZm5SZXNvdXJjZSk6IE5hZ1J1bGVDb21wbGlhbmNlID0+IHtcbiAgICBpZiAobm9kZSBpbnN0YW5jZW9mIENmblF1ZXVlKSB7XG4gICAgICBjb25zdCByZWRyaXZlUG9saWN5ID0gU3RhY2sub2Yobm9kZSkucmVzb2x2ZShub2RlLnJlZHJpdmVQb2xpY3kpO1xuICAgICAgaWYgKHJlZHJpdmVQb2xpY3kgPT09IHVuZGVmaW5lZCkge1xuICAgICAgICBjb25zdCBxdWV1ZUxvZ2ljYWxJZCA9IE5hZ1J1bGVzLnJlc29sdmVSZXNvdXJjZUZyb21JbnRyaW5zaWMoXG4gICAgICAgICAgbm9kZSxcbiAgICAgICAgICBub2RlLnJlZlxuICAgICAgICApO1xuICAgICAgICBjb25zdCBxdWV1ZU5hbWUgPSBTdGFjay5vZihub2RlKS5yZXNvbHZlKG5vZGUucXVldWVOYW1lKTtcbiAgICAgICAgbGV0IGZvdW5kID0gZmFsc2U7XG4gICAgICAgIGZvciAoY29uc3QgY2hpbGQgb2YgU3RhY2sub2Yobm9kZSkubm9kZS5maW5kQWxsKCkpIHtcbiAgICAgICAgICBpZiAoY2hpbGQgaW5zdGFuY2VvZiBDZm5RdWV1ZSkge1xuICAgICAgICAgICAgaWYgKGlzTWF0Y2hpbmdRdWV1ZShjaGlsZCwgcXVldWVMb2dpY2FsSWQsIHF1ZXVlTmFtZSkpIHtcbiAgICAgICAgICAgICAgZm91bmQgPSB0cnVlO1xuICAgICAgICAgICAgICBicmVhaztcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9IGVsc2UgaWYgKGNoaWxkIGluc3RhbmNlb2YgQ2ZuRnVuY3Rpb24pIHtcbiAgICAgICAgICAgIGlmIChpc01hdGNoaW5nTGFtYmRhRnVuY3Rpb24oY2hpbGQsIHF1ZXVlTG9naWNhbElkLCBxdWV1ZU5hbWUpKSB7XG4gICAgICAgICAgICAgIGZvdW5kID0gdHJ1ZTtcbiAgICAgICAgICAgICAgYnJlYWs7XG4gICAgICAgICAgICB9XG4gICAgICAgICAgfVxuICAgICAgICB9XG4gICAgICAgIGlmICghZm91bmQpIHtcbiAgICAgICAgICByZXR1cm4gTmFnUnVsZUNvbXBsaWFuY2UuTk9OX0NPTVBMSUFOVDtcbiAgICAgICAgfVxuICAgICAgfVxuICAgICAgcmV0dXJuIE5hZ1J1bGVDb21wbGlhbmNlLkNPTVBMSUFOVDtcbiAgICB9IGVsc2Uge1xuICAgICAgcmV0dXJuIE5hZ1J1bGVDb21wbGlhbmNlLk5PVF9BUFBMSUNBQkxFO1xuICAgIH1cbiAgfSxcbiAgJ25hbWUnLFxuICB7IHZhbHVlOiBwYXJzZShfX2ZpbGVuYW1lKS5uYW1lIH1cbik7XG5cbi8qKlxuICogSGVscGVyIGZ1bmN0aW9uIHRvIGNoZWNrIHdoZXRoZXIgYSBnaXZlbiBTUVMgUXVldWUgdXNlcyB0aGUgdGFyZ2V0IFNRUyBxdWV1ZSBhcyBhIERMUVxuICogQHBhcmFtIG5vZGUgdGhlIENmblF1ZXVlIHRvIGNoZWNrXG4gKiBAcGFyYW0gcXVldWVMb2dpY2FsSWQgdGhlIENmbiBMb2dpY2FsIElEIG9mIHRoZSB0YXJnZXQgcXVldWVcbiAqIEBwYXJhbSBxdWV1ZU5hbWUgdGhlIG5hbWUgb2YgdGhlIHRhcmdldCBxdWV1ZVxuICogcmV0dXJucyB3aGV0aGVyIHRoZSBDZm5RdWV1ZSB1c2VzIHRoZSB0YXJnZXQgU1FTIHF1ZXVlIGFzIGEgRExRXG4gKi9cbmZ1bmN0aW9uIGlzTWF0Y2hpbmdRdWV1ZShcbiAgbm9kZTogQ2ZuUXVldWUsXG4gIHF1ZXVlTG9naWNhbElkOiBzdHJpbmcsXG4gIHF1ZXVlTmFtZTogc3RyaW5nIHwgdW5kZWZpbmVkXG4pOiBib29sZWFuIHtcbiAgY29uc3QgcmVkcml2ZVBvbGljeSA9IFN0YWNrLm9mKG5vZGUpLnJlc29sdmUobm9kZS5yZWRyaXZlUG9saWN5KTtcbiAgY29uc3QgZGVhZExldHRlclRhcmdldEFybiA9IGZsYXR0ZW5DZm5SZWZlcmVuY2UoXG4gICAgcmVkcml2ZVBvbGljeT8uZGVhZExldHRlclRhcmdldEFybiA/PyAnJ1xuICApO1xuICBpZiAoXG4gICAgbmV3IFJlZ0V4cChgJHtxdWV1ZUxvZ2ljYWxJZH0oPyFbXFxcXHddKWApLnRlc3QoZGVhZExldHRlclRhcmdldEFybikgfHxcbiAgICAocXVldWVOYW1lICE9PSB1bmRlZmluZWQgJiZcbiAgICAgIG5ldyBSZWdFeHAoYDoke3F1ZXVlTmFtZX0oPyFbXFxcXHdcXFxcLV9cXFxcLl0pYCkudGVzdChkZWFkTGV0dGVyVGFyZ2V0QXJuKSlcbiAgKSB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cbiAgcmV0dXJuIGZhbHNlO1xufVxuXG4vKipcbiAqIEhlbHBlciBmdW5jdGlvbiB0byBjaGVjayB3aGV0aGVyIGEgZ2l2ZW4gTGFtYmRhIEZ1bmN0aW9uIHVzZXMgdGhlIHRhcmdldCBTUVMgcXVldWUgYXMgYSBETFFcbiAqIEBwYXJhbSBub2RlIHRoZSBDZm5GdW5jdGlvbiB0byBjaGVja1xuICogQHBhcmFtIHF1ZXVlTG9naWNhbElkIHRoZSBDZm4gTG9naWNhbCBJRCBvZiB0aGUgdGFyZ2V0IHF1ZXVlXG4gKiBAcGFyYW0gcXVldWVOYW1lIHRoZSBuYW1lIG9mIHRoZSB0YXJnZXQgcXVldWVcbiAqIHJldHVybnMgd2hldGhlciB0aGUgQ2ZuRnVuY3Rpb24gdXNlcyB0aGUgdGFyZ2V0IFNRUyBxdWV1ZSBhcyBhIERMUVxuICovXG5mdW5jdGlvbiBpc01hdGNoaW5nTGFtYmRhRnVuY3Rpb24oXG4gIG5vZGU6IENmbkZ1bmN0aW9uLFxuICBxdWV1ZUxvZ2ljYWxJZDogc3RyaW5nLFxuICBxdWV1ZU5hbWU6IHN0cmluZyB8IHVuZGVmaW5lZFxuKTogYm9vbGVhbiB7XG4gIGNvbnN0IGRlYWRMZXR0ZXJDb25maWcgPSBTdGFjay5vZihub2RlKS5yZXNvbHZlKG5vZGUuZGVhZExldHRlckNvbmZpZyk7XG4gIGNvbnN0IHRhcmdldEFybiA9IGZsYXR0ZW5DZm5SZWZlcmVuY2UoXG4gICAgU3RhY2sub2Yobm9kZSkucmVzb2x2ZShkZWFkTGV0dGVyQ29uZmlnPy50YXJnZXRBcm4pID8/ICcnXG4gICk7XG4gIGlmIChcbiAgICBuZXcgUmVnRXhwKGAke3F1ZXVlTG9naWNhbElkfSg/IVtcXFxcd10pYCkudGVzdCh0YXJnZXRBcm4pIHx8XG4gICAgKHF1ZXVlTmFtZSAhPT0gdW5kZWZpbmVkICYmXG4gICAgICBuZXcgUmVnRXhwKGA6JHtxdWV1ZU5hbWV9KD8hW1xcXFx3XFxcXC1fXFxcXC5dKWApLnRlc3QodGFyZ2V0QXJuKSlcbiAgKSB7XG4gICAgcmV0dXJuIHRydWU7XG4gIH1cbiAgcmV0dXJuIGZhbHNlO1xufVxuIl19
|
|
@@ -14,7 +14,7 @@ const nag_rules_1 = require("../../nag-rules");
|
|
|
14
14
|
*/
|
|
15
15
|
exports.default = Object.defineProperty((node) => {
|
|
16
16
|
if (node instanceof aws_sqs_1.CfnQueue) {
|
|
17
|
-
const queueLogicalId = nag_rules_1.NagRules.
|
|
17
|
+
const queueLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
18
18
|
const queueName = aws_cdk_lib_1.Stack.of(node).resolve(node.queueName);
|
|
19
19
|
let found = false;
|
|
20
20
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
@@ -44,7 +44,7 @@ exports.default = Object.defineProperty((node) => {
|
|
|
44
44
|
function isMatchingCompliantPolicy(node, queueLogicalId, queueName) {
|
|
45
45
|
let found = false;
|
|
46
46
|
for (const queue of node.queues) {
|
|
47
|
-
const resolvedQueue = nag_rules_1.NagRules.
|
|
47
|
+
const resolvedQueue = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, queue);
|
|
48
48
|
if (resolvedQueue === queueLogicalId ||
|
|
49
49
|
(queueName !== undefined && resolvedQueue.endsWith(queueName))) {
|
|
50
50
|
found = true;
|
|
@@ -109,4 +109,4 @@ function checkMatchingPrincipal(principals) {
|
|
|
109
109
|
}
|
|
110
110
|
return false;
|
|
111
111
|
}
|
|
112
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
112
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQSQueueSSLRequestsOnly.js","sourceRoot":"","sources":["../../../src/rules/sqs/SQSQueueSSLRequestsOnly.ts"],"names":[],"mappings":"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","sourcesContent":["/*\nCopyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\nSPDX-License-Identifier: Apache-2.0\n*/\nimport { parse } from 'path';\nimport { CfnResource, Stack } from 'aws-cdk-lib';\nimport { CfnQueue, CfnQueuePolicy } from 'aws-cdk-lib/aws-sqs';\nimport { NagRuleCompliance, NagRules } from '../../nag-rules';\n\n/**\n * SQS queues require SSL requests\n * @param node the CfnResource to check\n */\nexport default Object.defineProperty(\n  (node: CfnResource): NagRuleCompliance => {\n    if (node instanceof CfnQueue) {\n      const queueLogicalId = NagRules.resolveResourceFromIntrinsic(\n        node,\n        node.ref\n      );\n      const queueName = Stack.of(node).resolve(node.queueName);\n      let found = false;\n      for (const child of Stack.of(node).node.findAll()) {\n        if (child instanceof CfnQueuePolicy) {\n          if (isMatchingCompliantPolicy(child, queueLogicalId, queueName)) {\n            found = true;\n            break;\n          }\n        }\n      }\n      if (!found) {\n        return NagRuleCompliance.NON_COMPLIANT;\n      }\n      return NagRuleCompliance.COMPLIANT;\n    } else {\n      return NagRuleCompliance.NOT_APPLICABLE;\n    }\n  },\n  'name',\n  { value: parse(__filename).name }\n);\n\n/**\n * Helper function to check whether the queue Policy requires SSL on the given queue.\n * @param node The CfnQueuePolicy to check.\n * @param queueLogicalId The Cfn Logical ID of the queue.\n * @param queueName The name of the queue.\n * @returns Whether the CfnQueuePolicy requires SSL on the given queue.\n */\nfunction isMatchingCompliantPolicy(\n  node: CfnQueuePolicy,\n  queueLogicalId: string,\n  queueName: string | undefined\n): boolean {\n  let found = false;\n  for (const queue of node.queues) {\n    const resolvedQueue = NagRules.resolveResourceFromIntrinsic(node, queue);\n    if (\n      resolvedQueue === queueLogicalId ||\n      (queueName !== undefined && (<string>resolvedQueue).endsWith(queueName))\n    ) {\n      found = true;\n      break;\n    }\n  }\n  if (!found) {\n    return false;\n  }\n  const resolvedPolicyDocument = Stack.of(node).resolve(node.policyDocument);\n  for (const statement of resolvedPolicyDocument.Statement) {\n    const resolvedStatement = Stack.of(node).resolve(statement);\n    const secureTransport =\n      resolvedStatement?.Condition?.Bool?.['aws:SecureTransport'];\n    if (\n      resolvedStatement.Effect === 'Deny' &&\n      checkMatchingAction(resolvedStatement.Action) === true &&\n      checkMatchingPrincipal(resolvedStatement.Principal) === true &&\n      (secureTransport === 'false' || secureTransport === false)\n    ) {\n      return true;\n    }\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the queue Policy applies to queue actions\n * @param node The CfnQueuePolicy to check\n * @param actions The action in the queue policy\n * @returns Whether the CfnQueuePolicy applies to queue actions\n */\nfunction checkMatchingAction(actions: any): boolean {\n  if (Array.isArray(actions)) {\n    for (const action of actions) {\n      if (action === '*' || action.toLowerCase() === 'sqs:*') {\n        return true;\n      }\n    }\n  } else if (actions === '*' || actions.toLowerCase() === 'sqs:*') {\n    return true;\n  }\n  return false;\n}\n\n/**\n * Helper function to check whether the queue Policy applies to all principals\n * @param node The CfnQueuePolicy to check\n * @param principal The principals in the queue policy\n * @returns Whether the CfnQueuePolicy applies to all principals\n */\nfunction checkMatchingPrincipal(principals: any): boolean {\n  if (principals === '*') {\n    return true;\n  }\n  const awsPrincipal = principals.AWS;\n  if (Array.isArray(awsPrincipal)) {\n    for (const account of awsPrincipal) {\n      if (account === '*') {\n        return true;\n      }\n    }\n  } else if (awsPrincipal === '*') {\n    return true;\n  }\n  return false;\n}\n"]}
|
|
@@ -14,7 +14,7 @@ const nag_rules_1 = require("../../nag-rules");
|
|
|
14
14
|
*/
|
|
15
15
|
exports.default = Object.defineProperty((node) => {
|
|
16
16
|
if (node instanceof aws_ec2_1.CfnVPC) {
|
|
17
|
-
const vpcLogicalId = nag_rules_1.NagRules.
|
|
17
|
+
const vpcLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
18
18
|
let found = false;
|
|
19
19
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
20
20
|
if (child instanceof aws_ec2_1.CfnFlowLog) {
|
|
@@ -39,10 +39,10 @@ exports.default = Object.defineProperty((node) => {
|
|
|
39
39
|
* returns whether the CfnFlowLog is compliant
|
|
40
40
|
*/
|
|
41
41
|
function isMatchingCompliantFlowLog(node, vpcLogicalId) {
|
|
42
|
-
const resourceLogicalId = nag_rules_1.NagRules.
|
|
42
|
+
const resourceLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.resourceId);
|
|
43
43
|
if (node.resourceType === 'VPC' && resourceLogicalId === vpcLogicalId) {
|
|
44
44
|
return true;
|
|
45
45
|
}
|
|
46
46
|
return false;
|
|
47
47
|
}
|
|
48
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
48
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVlBDRmxvd0xvZ3NFbmFibGVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3J1bGVzL3ZwYy9WUENGbG93TG9nc0VuYWJsZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQTs7O0VBR0U7QUFDRiwrQkFBNkI7QUFDN0IsNkNBQWlEO0FBQ2pELGlEQUF5RDtBQUN6RCwrQ0FBOEQ7QUFFOUQ7OztHQUdHO0FBQ0gsa0JBQWUsTUFBTSxDQUFDLGNBQWMsQ0FDbEMsQ0FBQyxJQUFpQixFQUFxQixFQUFFO0lBQ3ZDLElBQUksSUFBSSxZQUFZLGdCQUFNLEVBQUUsQ0FBQztRQUMzQixNQUFNLFlBQVksR0FBRyxvQkFBUSxDQUFDLDRCQUE0QixDQUN4RCxJQUFJLEVBQ0osSUFBSSxDQUFDLEdBQUcsQ0FDVCxDQUFDO1FBQ0YsSUFBSSxLQUFLLEdBQUcsS0FBSyxDQUFDO1FBQ2xCLEtBQUssTUFBTSxLQUFLLElBQUksbUJBQUssQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUM7WUFDbEQsSUFBSSxLQUFLLFlBQVksb0JBQVUsRUFBRSxDQUFDO2dCQUNoQyxJQUFJLDBCQUEwQixDQUFDLEtBQUssRUFBRSxZQUFZLENBQUMsRUFBRSxDQUFDO29CQUNwRCxLQUFLLEdBQUcsSUFBSSxDQUFDO29CQUNiLE1BQU07Z0JBQ1IsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ1gsT0FBTyw2QkFBaUIsQ0FBQyxhQUFhLENBQUM7UUFDekMsQ0FBQztRQUNELE9BQU8sNkJBQWlCLENBQUMsU0FBUyxDQUFDO0lBQ3JDLENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyw2QkFBaUIsQ0FBQyxjQUFjLENBQUM7SUFDMUMsQ0FBQztBQUNILENBQUMsRUFDRCxNQUFNLEVBQ04sRUFBRSxLQUFLLEVBQUUsSUFBQSxZQUFLLEVBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQ2xDLENBQUM7QUFFRjs7OztHQUlHO0FBQ0gsU0FBUywwQkFBMEIsQ0FDakMsSUFBZ0IsRUFDaEIsWUFBb0I7SUFFcEIsTUFBTSxpQkFBaUIsR0FBRyxvQkFBUSxDQUFDLDRCQUE0QixDQUM3RCxJQUFJLEVBQ0osSUFBSSxDQUFDLFVBQVUsQ0FDaEIsQ0FBQztJQUNGLElBQUksSUFBSSxDQUFDLFlBQVksS0FBSyxLQUFLLElBQUksaUJBQWlCLEtBQUssWUFBWSxFQUFFLENBQUM7UUFDdEUsT0FBTyxJQUFJLENBQUM7SUFDZCxDQUFDO0lBQ0QsT0FBTyxLQUFLLENBQUM7QUFDZixDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLypcbkNvcHlyaWdodCBBbWF6b24uY29tLCBJbmMuIG9yIGl0cyBhZmZpbGlhdGVzLiBBbGwgUmlnaHRzIFJlc2VydmVkLlxuU1BEWC1MaWNlbnNlLUlkZW50aWZpZXI6IEFwYWNoZS0yLjBcbiovXG5pbXBvcnQgeyBwYXJzZSB9IGZyb20gJ3BhdGgnO1xuaW1wb3J0IHsgQ2ZuUmVzb3VyY2UsIFN0YWNrIH0gZnJvbSAnYXdzLWNkay1saWInO1xuaW1wb3J0IHsgQ2ZuVlBDLCBDZm5GbG93TG9nIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLWVjMic7XG5pbXBvcnQgeyBOYWdSdWxlQ29tcGxpYW5jZSwgTmFnUnVsZXMgfSBmcm9tICcuLi8uLi9uYWctcnVsZXMnO1xuXG4vKipcbiAqIFZQQ3MgaGF2ZSBGbG93IExvZ3MgZW5hYmxlZFxuICogQHBhcmFtIG5vZGUgdGhlIENmblJlc291cmNlIHRvIGNoZWNrXG4gKi9cbmV4cG9ydCBkZWZhdWx0IE9iamVjdC5kZWZpbmVQcm9wZXJ0eShcbiAgKG5vZGU6IENmblJlc291cmNlKTogTmFnUnVsZUNvbXBsaWFuY2UgPT4ge1xuICAgIGlmIChub2RlIGluc3RhbmNlb2YgQ2ZuVlBDKSB7XG4gICAgICBjb25zdCB2cGNMb2dpY2FsSWQgPSBOYWdSdWxlcy5yZXNvbHZlUmVzb3VyY2VGcm9tSW50cmluc2ljKFxuICAgICAgICBub2RlLFxuICAgICAgICBub2RlLnJlZlxuICAgICAgKTtcbiAgICAgIGxldCBmb3VuZCA9IGZhbHNlO1xuICAgICAgZm9yIChjb25zdCBjaGlsZCBvZiBTdGFjay5vZihub2RlKS5ub2RlLmZpbmRBbGwoKSkge1xuICAgICAgICBpZiAoY2hpbGQgaW5zdGFuY2VvZiBDZm5GbG93TG9nKSB7XG4gICAgICAgICAgaWYgKGlzTWF0Y2hpbmdDb21wbGlhbnRGbG93TG9nKGNoaWxkLCB2cGNMb2dpY2FsSWQpKSB7XG4gICAgICAgICAgICBmb3VuZCA9IHRydWU7XG4gICAgICAgICAgICBicmVhaztcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICAgIGlmICghZm91bmQpIHtcbiAgICAgICAgcmV0dXJuIE5hZ1J1bGVDb21wbGlhbmNlLk5PTl9DT01QTElBTlQ7XG4gICAgICB9XG4gICAgICByZXR1cm4gTmFnUnVsZUNvbXBsaWFuY2UuQ09NUExJQU5UO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4gTmFnUnVsZUNvbXBsaWFuY2UuTk9UX0FQUExJQ0FCTEU7XG4gICAgfVxuICB9LFxuICAnbmFtZScsXG4gIHsgdmFsdWU6IHBhcnNlKF9fZmlsZW5hbWUpLm5hbWUgfVxuKTtcblxuLyoqXG4gKiBIZWxwZXIgZnVuY3Rpb24gdG8gY2hlY2sgd2hldGhlciBhIGdpdmVuIEZsb3cgTG9nIGlzIGNvbXBsaWFudCBhbmQgYXNzb2NpYXRlZCB3aXRoIHRoZSBnaXZlbiBWUENcbiAqIEBwYXJhbSBub2RlIHRoZSBDZm5GbG93TG9nIHRvIGNoZWNrXG4gKiByZXR1cm5zIHdoZXRoZXIgdGhlIENmbkZsb3dMb2cgaXMgY29tcGxpYW50XG4gKi9cbmZ1bmN0aW9uIGlzTWF0Y2hpbmdDb21wbGlhbnRGbG93TG9nKFxuICBub2RlOiBDZm5GbG93TG9nLFxuICB2cGNMb2dpY2FsSWQ6IHN0cmluZ1xuKTogYm9vbGVhbiB7XG4gIGNvbnN0IHJlc291cmNlTG9naWNhbElkID0gTmFnUnVsZXMucmVzb2x2ZVJlc291cmNlRnJvbUludHJpbnNpYyhcbiAgICBub2RlLFxuICAgIG5vZGUucmVzb3VyY2VJZFxuICApO1xuICBpZiAobm9kZS5yZXNvdXJjZVR5cGUgPT09ICdWUEMnICYmIHJlc291cmNlTG9naWNhbElkID09PSB2cGNMb2dpY2FsSWQpIHtcbiAgICByZXR1cm4gdHJ1ZTtcbiAgfVxuICByZXR1cm4gZmFsc2U7XG59XG4iXX0=
|
|
@@ -14,7 +14,7 @@ const nag_rules_1 = require("../../nag-rules");
|
|
|
14
14
|
*/
|
|
15
15
|
exports.default = Object.defineProperty((node) => {
|
|
16
16
|
if (node instanceof aws_wafv2_1.CfnWebACL) {
|
|
17
|
-
const webAclLogicalId = nag_rules_1.NagRules.
|
|
17
|
+
const webAclLogicalId = nag_rules_1.NagRules.resolveResourceFromIntrinsic(node, node.ref);
|
|
18
18
|
const webAclName = aws_cdk_lib_1.Stack.of(node).resolve(node.name);
|
|
19
19
|
let found = false;
|
|
20
20
|
for (const child of aws_cdk_lib_1.Stack.of(node).node.findAll()) {
|
|
@@ -50,4 +50,4 @@ function isMatchingLoggingConfiguration(node, webAclLogicalId, webAclName) {
|
|
|
50
50
|
}
|
|
51
51
|
return false;
|
|
52
52
|
}
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiV0FGdjJMb2dnaW5nRW5hYmxlZC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9ydWxlcy93YWYvV0FGdjJMb2dnaW5nRW5hYmxlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBOzs7RUFHRTtBQUNGLCtCQUE2QjtBQUM3Qiw2Q0FBaUQ7QUFDakQscURBQTJFO0FBQzNFLCtDQUE4RDtBQUU5RDs7O0dBR0c7QUFDSCxrQkFBZSxNQUFNLENBQUMsY0FBYyxDQUNsQyxDQUFDLElBQWlCLEVBQXFCLEVBQUU7SUFDdkMsSUFBSSxJQUFJLFlBQVkscUJBQVMsRUFBRSxDQUFDO1FBQzlCLE1BQU0sZUFBZSxHQUFHLG9CQUFRLENBQUMsNEJBQTRCLENBQzNELElBQUksRUFDSixJQUFJLENBQUMsR0FBRyxDQUNULENBQUM7UUFDRixNQUFNLFVBQVUsR0FBRyxtQkFBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3JELElBQUksS0FBSyxHQUFHLEtBQUssQ0FBQztRQUNsQixLQUFLLE1BQU0sS0FBSyxJQUFJLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLElBQUksQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO1lBQ2xELElBQUksS0FBSyxZQUFZLG1DQUF1QixFQUFFLENBQUM7Z0JBQzdDLElBQ0UsOEJBQThCLENBQUMsS0FBSyxFQUFFLGVBQWUsRUFBRSxVQUFVLENBQUMsRUFDbEUsQ0FBQztvQkFDRCxLQUFLLEdBQUcsSUFBSSxDQUFDO29CQUNiLE1BQU07Z0JBQ1IsQ0FBQztZQUNILENBQUM7UUFDSCxDQUFDO1FBQ0QsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ1gsT0FBTyw2QkFBaUIsQ0FBQyxhQUFhLENBQUM7UUFDekMsQ0FBQztRQUNELE9BQU8sNkJBQWlCLENBQUMsU0FBUyxDQUFDO0lBQ3JDLENBQUM7U0FBTSxDQUFDO1FBQ04sT0FBTyw2QkFBaUIsQ0FBQyxjQUFjLENBQUM7SUFDMUMsQ0FBQztBQUNILENBQUMsRUFDRCxNQUFNLEVBQ04sRUFBRSxLQUFLLEVBQUUsSUFBQSxZQUFLLEVBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxFQUFFLENBQ2xDLENBQUM7QUFFRjs7Ozs7O0dBTUc7QUFDSCxTQUFTLDhCQUE4QixDQUNyQyxJQUE2QixFQUM3QixlQUF1QixFQUN2QixVQUE4QjtJQUU5QixNQUFNLFdBQVcsR0FBRyxJQUFJLENBQUMsU0FBUyxDQUFDLG1CQUFLLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztJQUM3RSxJQUNFLElBQUksTUFBTSxDQUFDLEdBQUcsZUFBZSxXQUFXLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDO1FBQzNELENBQUMsVUFBVSxJQUFJLFNBQVM7WUFDdEIsSUFBSSxNQUFNLENBQUMsV0FBVyxVQUFVLGtCQUFrQixDQUFDLENBQUMsSUFBSSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQ3hFLENBQUM7UUFDRCxPQUFPLElBQUksQ0FBQztJQUNkLENBQUM7SUFDRCxPQUFPLEtBQUssQ0FBQztBQUNmLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvKlxuQ29weXJpZ2h0IEFtYXpvbi5jb20sIEluYy4gb3IgaXRzIGFmZmlsaWF0ZXMuIEFsbCBSaWdodHMgUmVzZXJ2ZWQuXG5TUERYLUxpY2Vuc2UtSWRlbnRpZmllcjogQXBhY2hlLTIuMFxuKi9cbmltcG9ydCB7IHBhcnNlIH0gZnJvbSAncGF0aCc7XG5pbXBvcnQgeyBDZm5SZXNvdXJjZSwgU3RhY2sgfSBmcm9tICdhd3MtY2RrLWxpYic7XG5pbXBvcnQgeyBDZm5XZWJBQ0wsIENmbkxvZ2dpbmdDb25maWd1cmF0aW9uIH0gZnJvbSAnYXdzLWNkay1saWIvYXdzLXdhZnYyJztcbmltcG9ydCB7IE5hZ1J1bGVDb21wbGlhbmNlLCBOYWdSdWxlcyB9IGZyb20gJy4uLy4uL25hZy1ydWxlcyc7XG5cbi8qKlxuICogV0FGdjIgd2ViIEFDTHMgaGF2ZSBsb2dnaW5nIGVuYWJsZWRcbiAqIEBwYXJhbSBub2RlIHRoZSBDZm5SZXNvdXJjZSB0byBjaGVja1xuICovXG5leHBvcnQgZGVmYXVsdCBPYmplY3QuZGVmaW5lUHJvcGVydHkoXG4gIChub2RlOiBDZm5SZXNvdXJjZSk6IE5hZ1J1bGVDb21wbGlhbmNlID0+IHtcbiAgICBpZiAobm9kZSBpbnN0YW5jZW9mIENmbldlYkFDTCkge1xuICAgICAgY29uc3Qgd2ViQWNsTG9naWNhbElkID0gTmFnUnVsZXMucmVzb2x2ZVJlc291cmNlRnJvbUludHJpbnNpYyhcbiAgICAgICAgbm9kZSxcbiAgICAgICAgbm9kZS5yZWZcbiAgICAgICk7XG4gICAgICBjb25zdCB3ZWJBY2xOYW1lID0gU3RhY2sub2Yobm9kZSkucmVzb2x2ZShub2RlLm5hbWUpO1xuICAgICAgbGV0IGZvdW5kID0gZmFsc2U7XG4gICAgICBmb3IgKGNvbnN0IGNoaWxkIG9mIFN0YWNrLm9mKG5vZGUpLm5vZGUuZmluZEFsbCgpKSB7XG4gICAgICAgIGlmIChjaGlsZCBpbnN0YW5jZW9mIENmbkxvZ2dpbmdDb25maWd1cmF0aW9uKSB7XG4gICAgICAgICAgaWYgKFxuICAgICAgICAgICAgaXNNYXRjaGluZ0xvZ2dpbmdDb25maWd1cmF0aW9uKGNoaWxkLCB3ZWJBY2xMb2dpY2FsSWQsIHdlYkFjbE5hbWUpXG4gICAgICAgICAgKSB7XG4gICAgICAgICAgICBmb3VuZCA9IHRydWU7XG4gICAgICAgICAgICBicmVhaztcbiAgICAgICAgICB9XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICAgIGlmICghZm91bmQpIHtcbiAgICAgICAgcmV0dXJuIE5hZ1J1bGVDb21wbGlhbmNlLk5PTl9DT01QTElBTlQ7XG4gICAgICB9XG4gICAgICByZXR1cm4gTmFnUnVsZUNvbXBsaWFuY2UuQ09NUExJQU5UO1xuICAgIH0gZWxzZSB7XG4gICAgICByZXR1cm4gTmFnUnVsZUNvbXBsaWFuY2UuTk9UX0FQUExJQ0FCTEU7XG4gICAgfVxuICB9LFxuICAnbmFtZScsXG4gIHsgdmFsdWU6IHBhcnNlKF9fZmlsZW5hbWUpLm5hbWUgfVxuKTtcblxuLyoqXG4gKiBIZWxwZXIgZnVuY3Rpb24gdG8gY2hlY2sgd2hldGhlciB0aGUgTG9nZ2luZyBDb25maWd1cmF0aW9uIGNvbnRhaW5zIHRoZSBnaXZlbiBXZWIgQUNMXG4gKiBAcGFyYW0gbm9kZSB0aGUgQ2ZuTG9nZ2luZ0NvbmZpZ3VyYXRpb24gdG8gY2hlY2tcbiAqIEBwYXJhbSB3ZWJBY2xMb2dpY2FsSWQgdGhlIENmbiBMb2dpY2FsIElEIG9mIHRoZSBXZWIgQUNMXG4gKiBAcGFyYW0gd2ViQWNsTmFtZSB0aGUgbmFtZSBvZiB0aGUgV2ViIEFDTFxuICogcmV0dXJucyB3aGV0aGVyIHRoZSBDZm5Mb2dnaW5nQ29uZmlndXJhdGlvbiBjb250YWlucyB0aGUgZ2l2ZW4gV2ViIEFDTFxuICovXG5mdW5jdGlvbiBpc01hdGNoaW5nTG9nZ2luZ0NvbmZpZ3VyYXRpb24oXG4gIG5vZGU6IENmbkxvZ2dpbmdDb25maWd1cmF0aW9uLFxuICB3ZWJBY2xMb2dpY2FsSWQ6IHN0cmluZyxcbiAgd2ViQWNsTmFtZTogc3RyaW5nIHwgdW5kZWZpbmVkXG4pOiBib29sZWFuIHtcbiAgY29uc3QgcmVzb3VyY2VBcm4gPSBKU09OLnN0cmluZ2lmeShTdGFjay5vZihub2RlKS5yZXNvbHZlKG5vZGUucmVzb3VyY2VBcm4pKTtcbiAgaWYgKFxuICAgIG5ldyBSZWdFeHAoYCR7d2ViQWNsTG9naWNhbElkfSg/IVtcXFxcd10pYCkudGVzdChyZXNvdXJjZUFybikgfHxcbiAgICAod2ViQWNsTmFtZSAhPSB1bmRlZmluZWQgJiZcbiAgICAgIG5ldyBSZWdFeHAoYHdlYmFjbFxcLyR7d2ViQWNsTmFtZX0oPyFbXFxcXHdcXFxcLV9cXFxcLl0pYCkudGVzdChyZXNvdXJjZUFybikpXG4gICkge1xuICAgIHJldHVybiB0cnVlO1xuICB9XG4gIHJldHVybiBmYWxzZTtcbn1cbiJdfQ==
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"jsii-pacmak": "^1.106.0",
|
|
62
62
|
"jsii-rosetta": "~5.6.0",
|
|
63
63
|
"prettier": "^2.8.8",
|
|
64
|
-
"projen": "^0.91.
|
|
64
|
+
"projen": "^0.91.11",
|
|
65
65
|
"ts-jest": "^27",
|
|
66
66
|
"typescript": "^4.9.5"
|
|
67
67
|
},
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"publishConfig": {
|
|
78
78
|
"access": "public"
|
|
79
79
|
},
|
|
80
|
-
"version": "2.35.
|
|
80
|
+
"version": "2.35.22",
|
|
81
81
|
"jest": {
|
|
82
82
|
"coverageProvider": "v8",
|
|
83
83
|
"testMatch": [
|