Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/scans_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Use Node.js
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: '12.x'
node-version: '20.x'
- uses: codespell-project/actions-codespell@master
with:
check_filenames: true
Expand Down
6 changes: 3 additions & 3 deletions collectors/aws/accessanalyzer/listFindings.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var accessanalyzer = new AWS.AccessAnalyzer(AWSConfig);
async.eachLimit(collection.accessanalyzer.listAnalyzers[AWSConfig.region].data, 15, function(analyzer, cb) {
collection.accessanalyzer.listFindings[AWSConfig.region][analyzer.arn] = {};
Expand Down Expand Up @@ -36,9 +36,9 @@ module.exports = function(AWSConfig, collection, retries, callback) {
var localParams = JSON.parse(JSON.stringify(params || {}));
if (nextToken) localParams['nextToken'] = nextToken;
if (nextToken) {
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindings', localParams, retries, null, null, null, paginateCb);
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindings', localParams, retries, null, null, null, settings, scanAWSConfig, AWSConfig, paginateCb);
} else {
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindings', params, retries, null, null, null, paginateCb);
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindings', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, paginateCb);
}
}

Expand Down
6 changes: 3 additions & 3 deletions collectors/aws/accessanalyzer/listFindingsV2.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var accessanalyzer = new AWS.AccessAnalyzer(AWSConfig);
async.eachLimit(collection.accessanalyzer.listAnalyzers[AWSConfig.region].data, 15, function(analyzer, cb) {
collection.accessanalyzer.listFindingsV2[AWSConfig.region][analyzer.arn] = {};
Expand Down Expand Up @@ -36,9 +36,9 @@ module.exports = function(AWSConfig, collection, retries, callback) {
var localParams = JSON.parse(JSON.stringify(params || {}));
if (nextToken) localParams['nextToken'] = nextToken;
if (nextToken) {
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindingsV2', localParams, retries, null, null, null, paginateCb);
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindingsV2', localParams, retries, null, null, null, settings, scanAWSConfig, AWSConfig, paginateCb);
} else {
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindingsV2', params, retries, null, null, null, paginateCb);
helpers.makeCustomCollectorCall(accessanalyzer, 'listFindingsV2', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, paginateCb);
}
}

Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/apigateway/getClientCertificate.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var apigateway = new AWS.APIGateway(AWSConfig);

async.eachLimit(collection.apigateway.getRestApis[AWSConfig.region].data, 5, function(api, cb){
Expand All @@ -21,7 +21,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
clientCertificateId: stage.clientCertificateId
};

helpers.makeCustomCollectorCall(apigateway, 'getClientCertificate', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(apigateway, 'getClientCertificate', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.apigateway.getClientCertificate[AWSConfig.region][stage.clientCertificateId].err = err;
return pCb();
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/apigateway/getIntegration.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var apigateway = new AWS.APIGateway(AWSConfig);

async.eachLimit(collection.apigateway.getRestApis[AWSConfig.region].data, 5, function(api, cb){
Expand All @@ -29,7 +29,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
restApiId : api.id,
};

helpers.makeCustomCollectorCall(apigateway, 'getIntegration', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(apigateway, 'getIntegration', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.apigateway.getIntegration[AWSConfig.region][api.id][resource.id][methodKey].err = err;
return mCb();
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/appmesh/describeVirtualGateway.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var appmesh = new AWS.AppMesh(AWSConfig);

if (!collection.appmesh ||
Expand All @@ -24,7 +24,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
async.eachLimit(collection.appmesh.listVirtualGateways[AWSConfig.region][mesh.meshName].data.virtualGateways, 3, function(gateway, pCb){
collection.appmesh.describeVirtualGateway[AWSConfig.region][gateway.virtualGatewayName] = {};

helpers.makeCustomCollectorCall(appmesh, 'describeVirtualGateway', {virtualGatewayName: gateway.virtualGatewayName,meshName: mesh.meshName}, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(appmesh, 'describeVirtualGateway', {virtualGatewayName: gateway.virtualGatewayName,meshName: mesh.meshName}, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.appmesh.describeVirtualGateway[AWSConfig.region][gateway.virtualGatewayName].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/autoscaling/describeLaunchConfigurations.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var autoscaling = new AWS.AutoScaling(AWSConfig);

async.eachLimit(collection.autoscaling.describeAutoScalingGroups[AWSConfig.region].data, 15, function(asg, cb){
Expand All @@ -11,7 +11,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
'LaunchConfigurationNames': [asg.LaunchConfigurationName]
};

helpers.makeCustomCollectorCall(autoscaling, 'describeLaunchConfigurations', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(autoscaling, 'describeLaunchConfigurations', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.autoscaling.describeLaunchConfigurations[AWSConfig.region][asg.AutoScalingGroupARN].err = err;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var autoscaling = new AWS.AutoScaling(AWSConfig);

async.eachLimit(collection.autoscaling.describeAutoScalingGroups[AWSConfig.region].data, 15, function(asg, cb){
var params = {
'AutoScalingGroupNames':[asg.AutoScalingGroupName]
};

helpers.makeCustomCollectorCall(autoscaling, 'describeNotificationConfigurations', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(autoscaling, 'describeNotificationConfigurations', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
collection.autoscaling.describeNotificationConfigurations[AWSConfig.region][asg.AutoScalingGroupARN] = {};
if (err || !data) {
collection.autoscaling.describeNotificationConfigurations[AWSConfig.region][asg.AutoScalingGroupARN].err = err;
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudfront/getDistribution.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudfront = new AWS.CloudFront(AWSConfig);

async.eachLimit(collection.cloudfront.listDistributions[AWSConfig.region].data, 15, function(distribution, cb){
Expand All @@ -11,7 +11,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
'Id':distribution.Id
};

helpers.makeCustomCollectorCall(cloudfront, 'getDistribution', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudfront, 'getDistribution', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudfront.getDistribution[AWSConfig.region][distribution.Id].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudtrail/listTags.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudtrail = new AWS.CloudTrail(AWSConfig);

async.eachLimit(collection.cloudtrail.describeTrails[AWSConfig.region].data, 15, function(trail, cb) {
var params = {
ResourceIdList: [trail.TrailARN]
};

helpers.makeCustomCollectorCall(cloudtrail, 'listTags', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudtrail, 'listTags', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
collection.cloudtrail.listTags[AWSConfig.region][trail.TrailARN] = {};
if (err || !data) {
collection.cloudtrail.listTags[AWSConfig.region][trail.TrailARN].err = err;
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getEc2MetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require('../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.ec2.describeInstances[AWSConfig.region].data, 10, function(reservation, cb) {
Expand All @@ -26,7 +26,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params,retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) collection.cloudwatch.getEc2MetricStatistics[AWSConfig.region][instance.InstanceId].err = err;
if (data) collection.cloudwatch.getEc2MetricStatistics[AWSConfig.region][instance.InstanceId].data = data;
});
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getEcMetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.elasticache.describeCacheClusters[AWSConfig.region].data, 10, function(cluster, cb){
Expand All @@ -25,7 +25,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudwatch.getEcMetricStatistics[AWSConfig.region][cluster.CacheClusterId].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getEsMetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.opensearch.listDomainNames[AWSConfig.region].data, 10, function(domain, cb){
Expand All @@ -25,7 +25,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudwatch.getEsMetricStatistics[AWSConfig.region][domain.DomainName].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getRdsMetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.rds.describeDBInstances[AWSConfig.region].data, 10, function(instance, cb){
Expand All @@ -25,7 +25,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudwatch.getRdsMetricStatistics[AWSConfig.region][instance.DBInstanceIdentifier].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getRdsReadIOPSMetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.rds.describeDBInstances[AWSConfig.region].data, 10, function(instance, cb){
Expand All @@ -25,7 +25,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudwatch.getRdsReadIOPSMetricStatistics[AWSConfig.region][instance.DBInstanceIdentifier].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getRdsWriteIOPSMetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.rds.describeDBInstances[AWSConfig.region].data, 10, function(instance, cb){
Expand All @@ -25,7 +25,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudwatch.getRdsWriteIOPSMetricStatistics[AWSConfig.region][instance.DBInstanceIdentifier].err = err;
}
Expand Down
4 changes: 2 additions & 2 deletions collectors/aws/cloudwatch/getredshiftMetricStatistics.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, callback) {
module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var cloudwatch = new AWS.CloudWatch(AWSConfig);

async.eachLimit(collection.redshift.describeClusters[AWSConfig.region].data, 10, function(cluster, cb){
Expand All @@ -25,7 +25,7 @@ module.exports = function(AWSConfig, collection, retries, callback) {
]
};

helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, function(err, data) {
helpers.makeCustomCollectorCall(cloudwatch, 'getMetricStatistics', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.cloudwatch.getredshiftMetricStatistics[AWSConfig.region][cluster.ClusterIdentifier].err = err;
}
Expand Down
28 changes: 28 additions & 0 deletions collectors/aws/codeartifact/getRepositoryPermissionsPolicy.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
var AWS = require('aws-sdk');
var async = require('async');
var helpers = require(__dirname + '/../../../helpers/aws');

module.exports = function(AWSConfig, collection, retries, settings, scanAWSConfig, callback) {
var codeartifact = new AWS.CodeArtifact(AWSConfig);

// Needs both domain and repository, so the generic single-key postcall path cannot be used
async.eachLimit(collection.codeartifact.listRepositories[AWSConfig.region].data, 10, function(repository, cb){
collection.codeartifact.getRepositoryPermissionsPolicy[AWSConfig.region][repository.arn] = {};

var params = {
domain: repository.domainName,
repository: repository.name
};
if (repository.domainOwner) params.domainOwner = repository.domainOwner;

helpers.makeCustomCollectorCall(codeartifact, 'getRepositoryPermissionsPolicy', params, retries, null, null, null, settings, scanAWSConfig, AWSConfig, function(err, data) {
if (err) {
collection.codeartifact.getRepositoryPermissionsPolicy[AWSConfig.region][repository.arn].err = err;
}
if (data) collection.codeartifact.getRepositoryPermissionsPolicy[AWSConfig.region][repository.arn].data = data;
cb();
});
}, function(){
callback();
});
};
Loading
Loading