Skip to content

Commit e784fc2

Browse files
x4v13r64x4v13r64
authored
Merge pull request nccgroup#598 from nccgroup/develop
release/5.6.0
2 parents 43a931f + 4b1492e commit e784fc2

File tree

69 files changed

+744
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+744
-240
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
[![Travis](https://travis-ci.org/nccgroup/ScoutSuite.svg?branch=master)](https://travis-ci.org/nccgroup/ScoutSuite)
88
[![Coverage Status](https://coveralls.io/repos/github/nccgroup/ScoutSuite/badge.svg?branch=master)](https://coveralls.io/github/nccgroup/ScoutSuite?branch=master)
99
[![CodeCov](https://codecov.io/gh/nccgroup/ScoutSuite/branch/master/graph/badge.svg)](https://codecov.io/gh/nccgroup/ScoutSuite)
10+
[![Total alerts](https://img.shields.io/lgtm/alerts/g/nccgroup/ScoutSuite.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nccgroup/ScoutSuite/alerts/)
1011
[![PyPI version](https://badge.fury.io/py/ScoutSuite.svg)](https://badge.fury.io/py/ScoutSuite)
1112

1213
## Description

‎ScoutSuite/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
__author__ = 'NCC Group'
2-
__version__ = '5.5.0'
2+
__version__ = '5.6.0'
33

44
ERRORS_LIST = []
55

‎ScoutSuite/core/console.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def prompt_value(question, choices=None, default=None, display_choices=True, dis
170170
if choices and display_indices:
171171
for c in choices:
172172
print_error('%3d. %s' % (choices.index(c), c))
173-
print_error('Enter the number corresponding to your choice: ', False)
173+
print_error('Enter the number corresponding to your choice: ')
174174
choice = prompt(test_input)
175175
# Set the default value if empty choice
176176
if not choice or choice == '':

‎ScoutSuite/core/fs.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,6 @@ def save_blob_as_json(filename, blob, force_write):
101101
if prompt_overwrite(filename, force_write):
102102
with open(filename, 'wt') as f:
103103
print_info('%s' % json.dumps(blob, indent=4, separators=(',', ': '), sort_keys=True,
104-
cls=CustomJSONEncoder), file=f)
104+
cls=CustomJSONEncoder))
105105
except Exception as e:
106106
print_exception(e)

‎ScoutSuite/core/ruleset.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ def find_file(self, filename, filetype='rulesets'):
204204
class TmpRuleset(Ruleset):
205205

206206
def __init__(self, cloud_provider, rule_dirs=None, rule_filename=None, rule_args=None, rule_level='danger'):
207+
super().__init__(cloud_provider)
207208
rule_dirs = [] if rule_dirs is None else rule_dirs
208209
rule_args = [] if rule_args is None else rule_args
209210
self.rule_type = 'findings'

‎ScoutSuite/core/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from six import string_types
66
import copy
77

8-
from ScoutSuite.core.console import print_error, print_exception
8+
from ScoutSuite.core.console import print_error
99
from ScoutSuite.core.conditions import pass_conditions, fix_path_string
1010

1111

‎ScoutSuite/data/icmp_message_types.json‎

Lines changed: 245 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,31 +6,259 @@
66
"icmp_message_types": {
77
"-1": "ALL",
88
"0": "Echo Reply",
9+
"1": "Unassigned",
10+
"2": "Unassigned",
911
"3": "Destination Unreachable",
10-
"4": "Source Quench",
12+
"4": "Source Quench (Deprecated)",
1113
"5": "Redirect",
12-
"6": "Alternate Host Address",
14+
"6": "Alternate Host Address (Deprecated)",
15+
"7": "Unassigned",
1316
"8": "Echo",
1417
"9": "Router Advertisement",
1518
"10": "Router Selection",
1619
"11": "Time Exceeded",
1720
"12": "Parameter Problem",
1821
"13": "Timestamp",
1922
"14": "Timestamp Reply",
20-
"15": "Information Request",
21-
"16": "Information Reply",
22-
"17": "Address Mask Request",
23-
"18": "Address Mask Reply",
24-
"30": "Traceroute",
25-
"31": "Datagram Conversion Error",
26-
"32": "Mobile Host Redirect",
27-
"33": "IPv6 Where-Are-You",
28-
"34": "IPv6 I-Am-Here",
29-
"35": "Mobile Registration Request",
30-
"36": "Mobile Registration Reply",
31-
"37": "Domain Name Request",
32-
"38": "Domain Name Reply",
33-
"39": "SKIP",
34-
"40": "Photuris"
23+
"15": "Information Request (Deprecated)",
24+
"16": "Information Reply (Deprecated)",
25+
"17": "Address Mask Request (Deprecated)",
26+
"18": "Address Mask Reply (Deprecated)",
27+
"19": "Reserved (for Security)",
28+
"20": "Reserved (for Robustness Experiment)",
29+
"21": "Reserved (for Robustness Experiment)",
30+
"22": "Reserved (for Robustness Experiment)",
31+
"23": "Reserved (for Robustness Experiment)",
32+
"24": "Reserved (for Robustness Experiment)",
33+
"25": "Reserved (for Robustness Experiment)",
34+
"26": "Reserved (for Robustness Experiment)",
35+
"27": "Reserved (for Robustness Experiment)",
36+
"28": "Reserved (for Robustness Experiment)",
37+
"29": "Reserved (for Robustness Experiment)",
38+
"30": "Traceroute (Deprecated)",
39+
"31": "Datagram Conversion Error (Deprecated)",
40+
"32": "Mobile Host Redirect (Deprecated)",
41+
"33": "IPv6 Where-Are-You (Deprecated)",
42+
"34": "IPv6 I-Am-Here (Deprecated)",
43+
"35": "Mobile Registration Request (Deprecated)",
44+
"36": "Mobile Registration Reply (Deprecated)",
45+
"37": "Domain Name Request (Deprecated)",
46+
"38": "Domain Name Reply (Deprecated)",
47+
"39": "SKIP (Deprecated)",
48+
"40": "Photuris",
49+
"41": "ICMP messages utilized by experimental mobility protocols such as Seamoby",
50+
"42": "Extended Echo Request",
51+
"43": "Extended Echo Reply",
52+
"44": "Unassigned",
53+
"45": "Unassigned",
54+
"46": "Unassigned",
55+
"47": "Unassigned",
56+
"48": "Unassigned",
57+
"49": "Unassigned",
58+
"50": "Unassigned",
59+
"51": "Unassigned",
60+
"52": "Unassigned",
61+
"53": "Unassigned",
62+
"54": "Unassigned",
63+
"55": "Unassigned",
64+
"56": "Unassigned",
65+
"57": "Unassigned",
66+
"58": "Unassigned",
67+
"59": "Unassigned",
68+
"60": "Unassigned",
69+
"61": "Unassigned",
70+
"62": "Unassigned",
71+
"63": "Unassigned",
72+
"64": "Unassigned",
73+
"65": "Unassigned",
74+
"66": "Unassigned",
75+
"67": "Unassigned",
76+
"68": "Unassigned",
77+
"69": "Unassigned",
78+
"70": "Unassigned",
79+
"71": "Unassigned",
80+
"72": "Unassigned",
81+
"73": "Unassigned",
82+
"74": "Unassigned",
83+
"75": "Unassigned",
84+
"76": "Unassigned",
85+
"77": "Unassigned",
86+
"78": "Unassigned",
87+
"79": "Unassigned",
88+
"80": "Unassigned",
89+
"81": "Unassigned",
90+
"82": "Unassigned",
91+
"83": "Unassigned",
92+
"84": "Unassigned",
93+
"85": "Unassigned",
94+
"86": "Unassigned",
95+
"87": "Unassigned",
96+
"88": "Unassigned",
97+
"89": "Unassigned",
98+
"90": "Unassigned",
99+
"91": "Unassigned",
100+
"92": "Unassigned",
101+
"93": "Unassigned",
102+
"94": "Unassigned",
103+
"95": "Unassigned",
104+
"96": "Unassigned",
105+
"97": "Unassigned",
106+
"98": "Unassigned",
107+
"99": "Unassigned",
108+
"100": "Unassigned",
109+
"101": "Unassigned",
110+
"102": "Unassigned",
111+
"103": "Unassigned",
112+
"104": "Unassigned",
113+
"105": "Unassigned",
114+
"106": "Unassigned",
115+
"107": "Unassigned",
116+
"108": "Unassigned",
117+
"109": "Unassigned",
118+
"110": "Unassigned",
119+
"111": "Unassigned",
120+
"112": "Unassigned",
121+
"113": "Unassigned",
122+
"114": "Unassigned",
123+
"115": "Unassigned",
124+
"116": "Unassigned",
125+
"117": "Unassigned",
126+
"118": "Unassigned",
127+
"119": "Unassigned",
128+
"120": "Unassigned",
129+
"121": "Unassigned",
130+
"122": "Unassigned",
131+
"123": "Unassigned",
132+
"124": "Unassigned",
133+
"125": "Unassigned",
134+
"126": "Unassigned",
135+
"127": "Unassigned",
136+
"128": "Unassigned",
137+
"129": "Unassigned",
138+
"130": "Unassigned",
139+
"131": "Unassigned",
140+
"132": "Unassigned",
141+
"133": "Unassigned",
142+
"134": "Unassigned",
143+
"135": "Unassigned",
144+
"136": "Unassigned",
145+
"137": "Unassigned",
146+
"138": "Unassigned",
147+
"139": "Unassigned",
148+
"140": "Unassigned",
149+
"141": "Unassigned",
150+
"142": "Unassigned",
151+
"143": "Unassigned",
152+
"144": "Unassigned",
153+
"145": "Unassigned",
154+
"146": "Unassigned",
155+
"147": "Unassigned",
156+
"148": "Unassigned",
157+
"149": "Unassigned",
158+
"150": "Unassigned",
159+
"151": "Unassigned",
160+
"152": "Unassigned",
161+
"153": "Unassigned",
162+
"154": "Unassigned",
163+
"155": "Unassigned",
164+
"156": "Unassigned",
165+
"157": "Unassigned",
166+
"158": "Unassigned",
167+
"159": "Unassigned",
168+
"160": "Unassigned",
169+
"161": "Unassigned",
170+
"162": "Unassigned",
171+
"163": "Unassigned",
172+
"164": "Unassigned",
173+
"165": "Unassigned",
174+
"166": "Unassigned",
175+
"167": "Unassigned",
176+
"168": "Unassigned",
177+
"169": "Unassigned",
178+
"170": "Unassigned",
179+
"171": "Unassigned",
180+
"172": "Unassigned",
181+
"173": "Unassigned",
182+
"174": "Unassigned",
183+
"175": "Unassigned",
184+
"176": "Unassigned",
185+
"177": "Unassigned",
186+
"178": "Unassigned",
187+
"179": "Unassigned",
188+
"180": "Unassigned",
189+
"181": "Unassigned",
190+
"182": "Unassigned",
191+
"183": "Unassigned",
192+
"184": "Unassigned",
193+
"185": "Unassigned",
194+
"186": "Unassigned",
195+
"187": "Unassigned",
196+
"188": "Unassigned",
197+
"189": "Unassigned",
198+
"190": "Unassigned",
199+
"191": "Unassigned",
200+
"192": "Unassigned",
201+
"193": "Unassigned",
202+
"194": "Unassigned",
203+
"195": "Unassigned",
204+
"196": "Unassigned",
205+
"197": "Unassigned",
206+
"198": "Unassigned",
207+
"199": "Unassigned",
208+
"200": "Unassigned",
209+
"201": "Unassigned",
210+
"202": "Unassigned",
211+
"203": "Unassigned",
212+
"204": "Unassigned",
213+
"205": "Unassigned",
214+
"206": "Unassigned",
215+
"207": "Unassigned",
216+
"208": "Unassigned",
217+
"209": "Unassigned",
218+
"210": "Unassigned",
219+
"211": "Unassigned",
220+
"212": "Unassigned",
221+
"213": "Unassigned",
222+
"214": "Unassigned",
223+
"215": "Unassigned",
224+
"216": "Unassigned",
225+
"217": "Unassigned",
226+
"218": "Unassigned",
227+
"219": "Unassigned",
228+
"220": "Unassigned",
229+
"221": "Unassigned",
230+
"222": "Unassigned",
231+
"223": "Unassigned",
232+
"224": "Unassigned",
233+
"225": "Unassigned",
234+
"226": "Unassigned",
235+
"227": "Unassigned",
236+
"228": "Unassigned",
237+
"229": "Unassigned",
238+
"230": "Unassigned",
239+
"231": "Unassigned",
240+
"232": "Unassigned",
241+
"233": "Unassigned",
242+
"234": "Unassigned",
243+
"235": "Unassigned",
244+
"236": "Unassigned",
245+
"237": "Unassigned",
246+
"238": "Unassigned",
247+
"239": "Unassigned",
248+
"240": "Unassigned",
249+
"241": "Unassigned",
250+
"242": "Unassigned",
251+
"243": "Unassigned",
252+
"244": "Unassigned",
253+
"245": "Unassigned",
254+
"246": "Unassigned",
255+
"247": "Unassigned",
256+
"248": "Unassigned",
257+
"249": "Unassigned",
258+
"250": "Unassigned",
259+
"251": "Unassigned",
260+
"252": "Unassigned",
261+
"253": "RFC3692-style Experiment 1",
262+
"254": "RFC3692-style Experiment 2"
35263
}
36264
}

‎ScoutSuite/output/data/html/partials/aliyun/left_menu_for_aliyun_region.html‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
<!-- Generic left-menu link partial for region-then-resource -->
22
<script id="left_menu_for_region.partial" type="text/x-handlebars-template">
3-
<div id="services.cloudtrail.regions.id.trails.list">
4-
<div class="list-group" >
5-
<div class="list-group-item">
6-
<a href="javascript:updateHash('services.{{service_name}}.regions.id.{{resource_type}}')">Show all <span class="badge float-right btn-info">{{getValueAt 'metadata' service_group service_name 'resources' resource_type 'count'}}</span></a>
7-
</div>
8-
</div>
9-
{{#each items}}
10-
<div class="list-group" id="services.{{../service_name}}.regions.{{@key}}.{{../resource_type}}.list">
11-
<div class="list-group-item active">
12-
<a href="#services.{{../service_name}}.regions.{{@key}}.{{../resource_type}}">{{@key}}</a>
13-
<span class="float-right"><a href="javascript:hideList('services.{{../service_name}}.regions.{{@key}}.{{../resource_type}}.list')"><i class="fa fa-times-circle"></i></a></span>
3+
<div id="services.{{service_name}}.regions.id.{{resource_type}}.list">
4+
<div class="list-group" >
5+
<div class="list-group-item">
6+
<a href="javascript:updateHash('services.{{service_name}}.regions.id.{{resource_type}}')">
7+
Show all <span class="badge float-right btn-info">{{getValueAt 'metadata' service_group service_name 'resources' resource_type 'count'}}</span>
8+
</a>
9+
</div>
1410
</div>
15-
<div class="list-group-item list-sub-element">
16-
{{#each (lookup . ../resource_type)}}
17-
<div class="list-group-item-text" id="services.{{../../service_name}}.regions.{{@../key}}.{{../../resource_type}}.{{@key}}.link">
18-
{{#if scout_link}}
19-
<a href="#{{scout_link}}.view">{{name}}</a>
20-
{{else}}
21-
<a href="#services.{{../../../service_name}}.regions.{{@../key}}.{{../../../resource_type}}.{{@key}}.view">{{name}}</a>
22-
{{/if}}
11+
{{#each items}}
12+
<div class="list-group" id="services.{{../service_name}}.regions.{{@key}}.{{../resource_type}}.list">
13+
<div class="list-group-item active">
14+
<a href="#services.{{../service_name}}.regions.{{@key}}.{{../resource_type}}">{{@key}}</a>
15+
<span class="float-right"><a href="javascript:hideList('services.{{../service_name}}.regions.{{@key}}.{{../resource_type}}.list')"><i class="fa fa-times-circle"></i></a></span>
16+
</div>
17+
<div class="list-group-item list-sub-element">
18+
{{#each (lookup . ../resource_type)}}
19+
<div class="list-group-item-text" id="services.{{../../service_name}}.regions.{{@../key}}.{{../../resource_type}}.{{@key}}.link">
20+
{{#if scout_link}}
21+
<a href="#{{scout_link}}.view">{{name}}</a>
22+
{{else}}
23+
<a href="#services.{{../../../service_name}}.regions.{{@../key}}.{{../../../resource_type}}.{{@key}}.view">{{name}}</a>
24+
{{/if}}
25+
</div>
26+
{{/each}}
2327
</div>
24-
{{/each}}
2528
</div>
26-
</div>
27-
{{/each}}
29+
{{/each}}
2830
</div>
2931
</script>
3032
<script>
31-
Handlebars.registerPartial("left_menu_for_region", $("#left_menu_for_region\\.partial").html());
33+
Handlebars.registerPartial("left_menu_for_region", $("#left_menu_for_region\\.partial").html());
3234
</script>
33-

0 commit comments

Comments
 (0)