Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remediation: AWS Glue Data Catalog CMK Encrypted remediated #590

Closed
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
e1708af
SPLOIT-113: Added Plain Text Parameters plugin for CloudFormation
AkhtarAmir Aug 12, 2020
2122ade
Added vpcEndpointAcceptance plugin and spec file
AkhtarAmir Aug 13, 2020
306d721
SPLOIT-113: Added Plain Text Parameters plugin for CloudFormation
AkhtarAmir Aug 14, 2020
7c8616c
Added plugin and spec file for launch wizard security groups
AkhtarAmir Aug 14, 2020
de52e8a
Merge branch 'master' into feature/ec2-plugin-mark-launch-wizard-secu…
AkhtarAmir Aug 14, 2020
f3b72f6
Merge pull request #1 from AkhtarAmir/feature/ec2-plugin-mark-launch-…
AkhtarAmir Aug 14, 2020
d32cbac
Merge branch 'master' of https://github.com/AkhtarAmir/scans into fea…
AkhtarAmir Aug 14, 2020
3da6672
Refactored code in plaintextParameters plugin and spec file
AkhtarAmir Aug 14, 2020
928c712
Merge pull request #2 from AkhtarAmir/feature/SPLOIT-113
AkhtarAmir Aug 14, 2020
ce65325
SPLOIT-113: Updated custom settings
AkhtarAmir Aug 14, 2020
f3e3ab5
Merge pull request #3 from AkhtarAmir/feature/SPLOIT-113
AkhtarAmir Aug 14, 2020
e70b96a
Made PR requested changes
AkhtarAmir Aug 14, 2020
f62a1d5
SPLOIT-113: Added regex to check if NoEcho is enabled
AkhtarAmir Aug 14, 2020
865e0b6
Merge pull request #4 from AkhtarAmir/feature/SPLOIT-113
AkhtarAmir Aug 14, 2020
9745614
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Aug 15, 2020
1b80ac4
Accommodated PR changes
AkhtarAmir Aug 17, 2020
c0dc834
Fixed eslint issues
AkhtarAmir Aug 18, 2020
7d457bd
Update exports.js
AkhtarAmir Aug 18, 2020
8c2466c
Fixed eslint issues
AkhtarAmir Aug 18, 2020
ccb92ee
Update index.js
AkhtarAmir Aug 18, 2020
93c553d
Update index.js
AkhtarAmir Aug 18, 2020
cf21d1d
Added cloudformation in china and gov regions
AkhtarAmir Aug 18, 2020
aac8ece
Accomodated PR changes
AkhtarAmir Aug 18, 2020
7707dbd
Updated status in result of failure
AkhtarAmir Aug 18, 2020
a4ea92f
SPLOIT-113: Added Plain Text Parameters plugin for CloudFormation
AkhtarAmir Aug 14, 2020
8e5b6be
Added plugin and spec file for launch wizard security groups
AkhtarAmir Aug 14, 2020
a9afe44
Added vpcEndpointAcceptance plugin and spec file
AkhtarAmir Aug 13, 2020
0323a98
Refactored code in plaintextParameters plugin and spec file
AkhtarAmir Aug 14, 2020
aab9f79
SPLOIT-113: Updated custom settings
AkhtarAmir Aug 14, 2020
12d88c1
Made PR requested changes
AkhtarAmir Aug 14, 2020
7dd1a5b
SPLOIT-113: Added regex to check if NoEcho is enabled
AkhtarAmir Aug 14, 2020
c8a23c3
Accommodated PR changes
AkhtarAmir Aug 17, 2020
92821dd
Fixed eslint issues
AkhtarAmir Aug 18, 2020
e32accc
Update index.js
AkhtarAmir Aug 18, 2020
90094a2
Update index.js
AkhtarAmir Aug 18, 2020
c29ab07
Accomodated PR changes
AkhtarAmir Aug 18, 2020
49f1202
Updated status in result of failure
AkhtarAmir Aug 18, 2020
fa70d92
Updated master from upstream/master
AkhtarAmir Aug 21, 2020
357cd0b
SPLOIT-113: Added Plain Text Parameters plugin for CloudFormation
AkhtarAmir Aug 14, 2020
77ca002
Added plugin and spec file for launch wizard security groups
AkhtarAmir Aug 14, 2020
73172b8
Added vpcEndpointAcceptance plugin and spec file
AkhtarAmir Aug 13, 2020
7b448ff
Refactored code in plaintextParameters plugin and spec file
AkhtarAmir Aug 14, 2020
50d9d70
SPLOIT-113: Updated custom settings
AkhtarAmir Aug 14, 2020
46ff92c
Made PR requested changes
AkhtarAmir Aug 14, 2020
ec1e5ef
SPLOIT-113: Added regex to check if NoEcho is enabled
AkhtarAmir Aug 14, 2020
e89dd5e
Accommodated PR changes
AkhtarAmir Aug 17, 2020
4d7ee30
Fixed eslint issues
AkhtarAmir Aug 18, 2020
f5c9bf0
Update index.js
AkhtarAmir Aug 18, 2020
53e18b8
Update index.js
AkhtarAmir Aug 18, 2020
6ec73bc
Accomodated PR changes
AkhtarAmir Aug 18, 2020
2f55a11
Updated status in result of failure
AkhtarAmir Aug 18, 2020
0ba2fbf
SPLOIT-113: Added Plain Text Parameters plugin for CloudFormation
AkhtarAmir Aug 12, 2020
e9415b9
SPLOIT-113: Added Plain Text Parameters plugin for CloudFormation
AkhtarAmir Aug 14, 2020
8820775
Added plugin and spec file for launch wizard security groups
AkhtarAmir Aug 14, 2020
8e6b23b
Added vpcEndpointAcceptance plugin and spec file
AkhtarAmir Aug 13, 2020
82d8406
Refactored code in plaintextParameters plugin and spec file
AkhtarAmir Aug 14, 2020
b022a52
SPLOIT-113: Updated custom settings
AkhtarAmir Aug 14, 2020
d3ee380
Made PR requested changes
AkhtarAmir Aug 14, 2020
560d273
SPLOIT-113: Added regex to check if NoEcho is enabled
AkhtarAmir Aug 14, 2020
9195d32
Accommodated PR changes
AkhtarAmir Aug 17, 2020
0287cc5
Fixed eslint issues
AkhtarAmir Aug 18, 2020
1315ccd
Update exports.js
AkhtarAmir Aug 18, 2020
229461c
Update index.js
AkhtarAmir Aug 18, 2020
f5a3b8b
Update index.js
AkhtarAmir Aug 18, 2020
c574f76
Accomodated PR changes
AkhtarAmir Aug 18, 2020
1a4b495
Updated status in result of failure
AkhtarAmir Aug 18, 2020
a45a9f7
Merge branch 'master' of https://github.com/AkhtarAmir/scans into master
AkhtarAmir Aug 28, 2020
156d027
Removed unnecesary rebase changes
AkhtarAmir Aug 28, 2020
32ee6d9
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Sep 12, 2020
c687820
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Sep 22, 2020
29075e7
Merge branch 'master' of https://github.com/aquasecurity/cloudsploit …
AkhtarAmir Sep 24, 2020
c51edd1
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Sep 25, 2020
0768693
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Oct 16, 2020
2d04307
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Oct 20, 2020
c6b7eb1
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 5, 2020
159f5dd
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 21, 2020
d713e12
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 26, 2020
b63a6d3
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 30, 2020
472380f
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 30, 2020
a95a46b
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 30, 2020
f83f331
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Nov 30, 2020
55b0319
Merge branch 'master' of https://github.com/aquasecurity/cloudsploit
AkhtarAmir Dec 20, 2020
f627c6a
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Dec 22, 2020
6fe875d
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 21, 2021
d129f4b
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 21, 2021
c132394
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 22, 2021
68e9bfe
Merge branch 'master' of https://github.com/aquasecurity/cloudsploit
AkhtarAmir Jan 23, 2021
0cbc28f
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 23, 2021
2fa5e63
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 25, 2021
7319bca
Merge branch 'master' of https://github.com/AkhtarAmir/scans
AkhtarAmir Jan 25, 2021
4c73161
Added superlinter
AkhtarAmir Jan 26, 2021
6cda1ef
Added scans ci
AkhtarAmir Jan 27, 2021
072a98a
Updated Ci file
AkhtarAmir Jan 27, 2021
cb40648
Updated Node version in CI file
AkhtarAmir Jan 27, 2021
b0138cb
removed spech check command
AkhtarAmir Jan 27, 2021
239b8a6
Delete scan_ci.yml
AkhtarAmir Jan 27, 2021
63cd684
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 27, 2021
ab41137
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 27, 2021
f04d8d8
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 27, 2021
9c56577
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 28, 2021
8c3e0ef
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 29, 2021
32f8e04
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 29, 2021
2db8162
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Jan 29, 2021
46cfe9d
Added spellcheck
AkhtarAmir Feb 1, 2021
5f0adec
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Feb 3, 2021
ea01ba2
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Mar 2, 2021
9f518b6
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Mar 5, 2021
0bf276d
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Mar 12, 2021
820a4d8
AWS Glue Data Catalog CMK Encrypted remediated
AkhtarAmir Mar 14, 2021
5271345
Merge remote-tracking branch 'upstream/master' into master
AkhtarAmir Mar 14, 2021
f1e5436
Merge branch 'master' of https://github.com/AkhtarAmir/scans into rem…
AkhtarAmir Mar 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 72 additions & 2 deletions plugins/aws/glue/dataCatalogCmkEncrypted.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,26 @@ module.exports = {
recommended_action: 'Modify Glue data catalog to use CMK instead of AWS-managed Key to encrypt Metadata',
link: 'https://docs.aws.amazon.com/glue/latest/dg/encrypt-glue-data-catalog.html',
apis: ['Glue:getDataCatalogEncryptionSettings', 'KMS:listKeys', 'KMS:describeKey'],
remediation_description: 'Glue data catalog Encryption for the affected regions will be enabled.',
remediation_min_version: '202114032330',
apis_remediate: ['Glue:getDataCatalogEncryptionSettings'],
remediation_inputs: {
kmsKeyArnforDataCatalog: {
name: '(Mandatory) KMS Key Arn',
description: 'The KMS Key Arn used for encryption',
regex: '^arn:(aws|aws-cn|aws-us-gov):(kms):.+',
required: true
}
},
actions: {
remediate: ['Glue:putDataCatalogEncryptionSettings'],
rollback: ['Glue:putDataCatalogEncryptionSettings']
},
permissions: {
remediate: ['glue:PutDataCatalogEncryptionSettings'],
rollback: ['glue:PutDataCatalogEncryptionSettings']
},
realtime_triggers: ['glue:PutDataCatalogEncryptionSettings'],

run: function(cache, settings, callback) {
var results = [];
Expand Down Expand Up @@ -39,8 +59,7 @@ module.exports = {
var describeKey = helpers.addSource(cache, source,
['kms', 'describeKey', region, kmsKeyId]);

if (!describeKey || describeKey.err || !describeKey.data ||
!describeKey.data.KeyMetadata || !describeKey.data.KeyMetadata) {
if (!describeKey || describeKey.err || !describeKey.data || !describeKey.data.KeyMetadata) {
helpers.addResult(results, 3,
`Unable to query KMS key: ${helpers.addError(describeKey)}`,
region, kmsKeyId);
Expand All @@ -66,5 +85,56 @@ module.exports = {
}, function(){
callback(null, results, source);
});
},

remediate: function(config, cache, settings, resource, callback) {
var putCall = this.actions.remediate;
var pluginName = 'dataCatalogCmkEncrypted';

var region = settings.region;

config.region = region;
var params = {};

// create the params necessary for the remediation
if (settings.input &&
settings.input.kmsKeyIdforDataCatalog) {
params = {
DataCatalogEncryptionSettings: {
EncryptionAtRest: {
CatalogEncryptionMode: 'SSE-KMS',
SseAwsKmsKeyId: settings.input.kmsKeyIdforDataCatalog
}
}
};
} else {
return callback('KMS key arn is mandatory to CMK encrypt Glue data catalog');
}

var remediation_file = settings.remediation_file;

remediation_file['pre_remediate']['actions'][pluginName][region] = {
'DataCatalogCMKEncryption': 'Disabled',
'Glue': region
};

// passes the config, put call, and params to the remediate helper function
helpers.remediatePlugin(config, putCall[0], params, function(err) {
if (err) {
remediation_file['remediate']['actions'][pluginName]['error'] = err;
return callback(err, null);
}

let action = params;
action.action = putCall;

remediation_file['post_remediate']['actions'][pluginName][resource] = action;
remediation_file['remediate']['actions'][pluginName][resource] = {
'Action': 'DATA_CATALOG_CMK_ENCRYPTED',
'Glue': region
};
settings.remediation_file = remediation_file;
return callback(null, action);
});
}
};