Skip to content

Commit 00a98a4

Browse files
0xdabbad000xdabbad00
authored
Merge pull request #509 from 0xdabbad00/fixes
Bug fixes
2 parents 1bf9094 + ffef16c commit 00a98a4

File tree

9 files changed

+143
-29
lines changed

9 files changed

+143
-29
lines changed

‎account-data/demo/us-east-1/iam-get-account-authorization-details.json

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,119 @@
11
{
22
"GroupDetailList": [],
33
"Policies": [
4+
{
5+
"Arn": "arn:aws:iam::aws:policy/service-role/AmazonEC2RoleforSSM",
6+
"AttachmentCount": 1,
7+
"CreateDate": "2016-11-10T17:20:15+00:00",
8+
"DefaultVersionId": "v8",
9+
"IsAttachable": true,
10+
"Path": "/job-function/",
11+
"PermissionsBoundaryUsageCount": 0,
12+
"PolicyId": "ANPAID22R6XPJATWOFDK6",
13+
"PolicyName": "AmazonEC2RoleforSSM",
14+
"PolicyVersionList": [
15+
{
16+
"Document": {
17+
"Version": "2012-10-17",
18+
"Statement": [
19+
{
20+
"Effect": "Allow",
21+
"Action": [
22+
"ssm:DescribeAssociation",
23+
"ssm:GetDeployablePatchSnapshotForInstance",
24+
"ssm:GetDocument",
25+
"ssm:DescribeDocument",
26+
"ssm:GetManifest",
27+
"ssm:GetParameters",
28+
"ssm:ListAssociations",
29+
"ssm:ListInstanceAssociations",
30+
"ssm:PutInventory",
31+
"ssm:PutComplianceItems",
32+
"ssm:PutConfigurePackageResult",
33+
"ssm:UpdateAssociationStatus",
34+
"ssm:UpdateInstanceAssociationStatus",
35+
"ssm:UpdateInstanceInformation"
36+
],
37+
"Resource": "*"
38+
},
39+
{
40+
"Effect": "Allow",
41+
"Action": [
42+
"ssmmessages:CreateControlChannel",
43+
"ssmmessages:CreateDataChannel",
44+
"ssmmessages:OpenControlChannel",
45+
"ssmmessages:OpenDataChannel"
46+
],
47+
"Resource": "*"
48+
},
49+
{
50+
"Effect": "Allow",
51+
"Action": [
52+
"ec2messages:AcknowledgeMessage",
53+
"ec2messages:DeleteMessage",
54+
"ec2messages:FailMessage",
55+
"ec2messages:GetEndpoint",
56+
"ec2messages:GetMessages",
57+
"ec2messages:SendReply"
58+
],
59+
"Resource": "*"
60+
},
61+
{
62+
"Effect": "Allow",
63+
"Action": [
64+
"cloudwatch:PutMetricData"
65+
],
66+
"Resource": "*"
67+
},
68+
{
69+
"Effect": "Allow",
70+
"Action": [
71+
"ec2:DescribeInstanceStatus"
72+
],
73+
"Resource": "*"
74+
},
75+
{
76+
"Effect": "Allow",
77+
"Action": [
78+
"ds:CreateComputer",
79+
"ds:DescribeDirectories"
80+
],
81+
"Resource": "*"
82+
},
83+
{
84+
"Effect": "Allow",
85+
"Action": [
86+
"logs:CreateLogGroup",
87+
"logs:CreateLogStream",
88+
"logs:DescribeLogGroups",
89+
"logs:DescribeLogStreams",
90+
"logs:PutLogEvents"
91+
],
92+
"Resource": "*"
93+
},
94+
{
95+
"Effect": "Allow",
96+
"Action": [
97+
"s3:GetBucketLocation",
98+
"s3:PutObject",
99+
"s3:GetObject",
100+
"s3:GetEncryptionConfiguration",
101+
"s3:AbortMultipartUpload",
102+
"s3:ListMultipartUploadParts",
103+
"s3:ListBucket",
104+
"s3:ListBucketMultipartUploads"
105+
],
106+
"Resource": "*"
107+
}
108+
]
109+
},
110+
"VersionId": "v8",
111+
"IsDefaultVersion": true,
112+
"CreateDate": "2019-01-24T19:20:51Z"
113+
}
114+
],
115+
"UpdateDate": "2019-05-07T18:55:12Z"
116+
},
4117
{
5118
"PolicyName": "BAD_MFA_POLICY",
6119
"PermissionsBoundaryUsageCount": 0,

‎cloudmapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import pkgutil
3131
import importlib
3232

33-
__version__ = "2.6.3"
33+
__version__ = "2.6.4"
3434

3535

3636
def show_help(commands):

‎collect_commands.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,5 +382,5 @@
382382
Request: describe-organization
383383
- Service: organizations
384384
Request: list-accounts
385-
- Service: kafka
386-
Request: list-clusters
385+
# - Service: kafka
386+
# Request: list-clusters

‎shared/audit.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ def load_audit_config():
6262
audit_override = yaml.safe_load(f)
6363

6464
# Over-write the values from audit_config
65-
for finding_id in audit_override:
66-
for k in audit_override[finding_id]:
67-
audit_config[finding_id][k] = audit_override[finding_id][k]
65+
if audit_override:
66+
for finding_id in audit_override:
67+
for k in audit_override[finding_id]:
68+
audit_config[finding_id][k] = audit_override[finding_id][k]
6869
return audit_config
6970

7071

‎stats_config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
- name: Lambda functions
5151
query: .Functions|length
5252
source: lambda-list-functions
53-
- name: Kafka clusters
54-
query: .ClusterInfoList|length
55-
source: kafka-list-clusters
53+
# - name: Kafka clusters
54+
# query: .ClusterInfoList|length
55+
# source: kafka-list-clusters
5656
# Verbose resources
5757
- name: Route53 hosted zones
5858
query: .HostedZones|length

‎templates/iam_report.html

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@
1212

1313
<title>CloudMapper IAM Report</title>
1414

15-
<link href="/css/bootstrap.css" rel="stylesheet">
16-
<link href="/css/lato.css" rel="stylesheet">
15+
<link href="../css/bootstrap.css" rel="stylesheet">
16+
<link href="../css/lato.css" rel="stylesheet">
1717

18-
<link href="/css/report.css" rel="stylesheet">
18+
<link href="../css/report.css" rel="stylesheet">
1919

20-
<link href="/css/font-awesome.css" rel="stylesheet">
20+
<link href="../css/font-awesome.css" rel="stylesheet">
2121

22-
<script src="/js/chart.js"></script>
23-
<script src="/js/iam_report.js"></script>
22+
<script src="../js/chart.js"></script>
23+
<script src="../js/iam_report.js"></script>
2424

25-
<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64" type="image/vnd.microsoft.icon">
25+
<link rel="icon" href="../favicon.ico" sizes="16x16 32x32 64x64" type="image/vnd.microsoft.icon">
2626
</head>
2727

2828
<body>

‎templates/report.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212

1313
<title>CloudMapper AWS Security Report</title>
1414

15-
<link href="/css/bootstrap.css" rel="stylesheet">
16-
<link href="/css/lato.css" rel="stylesheet">
15+
<link href="../css/bootstrap.css" rel="stylesheet">
16+
<link href="../css/lato.css" rel="stylesheet">
1717

18-
<link href="/css/report.css" rel="stylesheet">
18+
<link href="../css/report.css" rel="stylesheet">
1919

20-
<script src="/js/chart.js"></script>
21-
<script src="/js/report.js"></script>
20+
<script src="../js/chart.js"></script>
21+
<script src="../js/report.js"></script>
2222

23-
<link rel="icon" href="/favicon.ico" sizes="16x16 32x32 64x64" type="image/vnd.microsoft.icon">
23+
<link rel="icon" href="../favicon.ico" sizes="16x16 32x32 64x64" type="image/vnd.microsoft.icon">
2424
</head>
2525

2626
<body>

‎web/css/lato.css

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33
font-family: 'Lato';
44
font-style: normal;
55
font-weight: 300;
6-
src: local('Lato Light'), local('Lato-Light'), url(/fonts/lato-light.woff) format('woff');
6+
src: local('Lato Light'), local('Lato-Light'), url(../fonts/lato-light.woff) format('woff');
77
}
88
@font-face {
99
font-family: 'Lato';
1010
font-style: normal;
1111
font-weight: 400;
12-
src: local('Lato Regular'), local('Lato-Regular'), url(/fonts/lato-regular.woff) format('woff');
12+
src: local('Lato Regular'), local('Lato-Regular'), url(../fonts/lato-regular.woff) format('woff');
1313
}
1414
@font-face {
1515
font-family: 'Lato';
1616
font-style: normal;
1717
font-weight: 700;
18-
src: local('Lato Bold'), local('Lato-Bold'), url(/fonts/lato-bold.woff) format('woff');
18+
src: local('Lato Bold'), local('Lato-Bold'), url(../fonts/lato-bold.woff) format('woff');
1919
}
2020
@font-face {
2121
font-family: 'Lato';
2222
font-style: italic;
2323
font-weight: 300;
24-
src: local('Lato Light Italic'), local('Lato-LightItalic'), url(/fonts/lato-lightitalic.woff) format('woff');
24+
src: local('Lato Light Italic'), local('Lato-LightItalic'), url(../fonts/lato-lightitalic.woff) format('woff');
2525
}
2626
@font-face {
2727
font-family: 'Lato';
2828
font-style: italic;
2929
font-weight: 400;
30-
src: local('Lato Italic'), local('Lato-Italic'), url(/fonts/lato-italic.woff) format('woff');
30+
src: local('Lato Italic'), local('Lato-Italic'), url(../fonts/lato-italic.woff) format('woff');
3131
}
3232
@font-face {
3333
font-family: 'Lato';
3434
font-style: italic;
3535
font-weight: 700;
36-
src: local('Lato Bold Italic'), local('Lato-BoldItalic'), url(/fonts/lato-bolditalic.woff) format('woff');
36+
src: local('Lato Bold Italic'), local('Lato-BoldItalic'), url(../fonts/lato-bolditalic.woff) format('woff');
3737
}

‎web/js/cloudmap.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ $(window).on('load', function(){
3737

3838
$.when(
3939
$.getJSON("./data.json"),
40-
$.getJSON("/style.json")
40+
$.getJSON("./style.json")
4141
).done(function(datafile, stylefile) {
4242
loadCytoscape({
4343
wheelSensitivity: 0.1,

0 commit comments

Comments
 (0)