Skip to content

fix: Fixed error scanning iamUsers without enough permissions #20

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 8, 2022
Merged

fix: Fixed error scanning iamUsers without enough permissions #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 12 additions & 13 deletions src/services/iamUser/data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,20 +303,22 @@ export const listVirtualMFADevices = async (
try {
iam.listVirtualMFADevices(
args,
async (err: AWSError, data: ListVirtualMFADevicesResponse) => {
(err: AWSError, data: ListVirtualMFADevicesResponse) => {
if (err) {
errorLog.generateAwsErrorLog({
functionName: 'iam:listVirtualMFADevices',
err,
})
}

const { VirtualMFADevices = [], IsTruncated, Marker } = data
if (!isEmpty(data)) {
const { VirtualMFADevices = [], IsTruncated, Marker } = data

virtualMFADeviceList.push(...VirtualMFADevices)
virtualMFADeviceList.push(...VirtualMFADevices)

if (IsTruncated) {
listAllVirtualMFADevices(Marker)
if (IsTruncated) {
listAllVirtualMFADevices(Marker)
}
}

resolve(virtualMFADeviceList)
Expand Down Expand Up @@ -345,21 +347,18 @@ export const listIamUsers = async (
iam.listUsers(
{ Marker: marker },
async (err: AWSError, data: ListUsersResponse) => {
/**
* No data
*/

if (isEmpty(data)) {
return resolve(result)
}

if (err) {
errorLog.generateAwsErrorLog({
functionName: 'iam:listUsers',
err,
})
}

// No data
if (isEmpty(data)) {
return resolve(result)
}

const { Users: users = [], IsTruncated, Marker } = data

users.map(user => {
Expand Down
24 changes: 13 additions & 11 deletions src/services/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,10 +569,10 @@ export default class Provider extends CloudGraph.Client {

const config = await this.getAwsConfig(account)
const { accountId } = await this.getIdentity(account)
try {
for (const resource of resourceNames) {
const serviceClass = this.getService(resource)
if (serviceClass && serviceClass.getData) {
for (const resource of resourceNames) {
const serviceClass = this.getService(resource)
if (serviceClass && serviceClass.getData) {
try {
const data = await serviceClass.getData({
regions: configuredRegions,
config,
Expand All @@ -587,17 +587,19 @@ export default class Provider extends CloudGraph.Client {
data,
})
this.logger.success(`${resource} scan completed`)
} else {
this.logger.warn(
`Skipping service ${resource} as there was an issue getting data for it. Is it currently supported?`
} catch (error: any) {
this.logger.error(
`There was an error scanning AWS sdk data for ${resource} resource`
)
this.logger.debug(error)
}
} else {
this.logger.warn(
`Skipping service ${resource} as there was an issue getting data for it. Is it currently supported?`
)
}
this.logger.success(`Account: ${accountId} scan completed`)
} catch (error: any) {
this.logger.error('There was an error scanning AWS sdk data')
this.logger.debug(error)
}
this.logger.success(`Account: ${accountId} scan completed`)
return result
}

Expand Down