Merge branch 'master' of https://github.com/cloudflare/flan into feature/html_reports - Commit ea0bfc6a - STRLCPY/flan

Merge branch 'master' of https://github.com/cloudflare/flan into feature/html_reports
```
# Conflicts:
#	Makefile
```
sw committed 4 years ago

ea0bfc6a

2 parents
c768fc36
b73f07b9

Total 4 files Show one by one

■ ■ ■ ■ ■ ■

.gitignore

1 + __pycache__
2 +

All occurrences

■ ■ ■ ■ ■ ■

Makefile

		skipped 2 lines
3	3
4	4		container_name = flan_$(shell date +'%s')
5	5		start :
6		-	docker run --name $(container_name) -v "$(shell pwd)/shared:/shared:Z" flan_scan
	6	+	docker run --name $(container_name) -v "$(CURDIR)/shared:/shared:Z" flan_scan
7	7
8	8		md :
9		-	docker run --name $(container_name) -v "$(shell pwd)/shared:/shared:Z" -e format=md flan_scan
	9	+	docker run --name $(container_name) -v "$(CURDIR)/shared:/shared:Z" -e format=md flan_scan
10	10
11	11		html :
12		-	docker run --name $(container_name) -v "$(shell pwd)/shared:/shared:Z" -e format=html flan_scan
	12	+	docker run --name $(container_name) -v "$(CURDIR)/shared:/shared:Z" -e format=html flan_scan
13	13
14	14		json :
15		-	docker run --name $(container_name) -v "$(shell pwd)/shared:/shared:Z" -e format=json flan_scan
16		-
	15	+	docker run --name $(container_name) -v "$(CURDIR)/shared:/shared:Z" -e format=json flan_scan

■ ■ ■ ■ ■ ■

contrib/descriptions/cveproject.py

		skipped 28 lines
29	29		response.raise_for_status()
30	30		cve_json = response.json()
31	31		description = cve_json['description']['description_data'][0]['value']
32		-	self.cache[vuln] = description
33		-	return VulnDescription(description, self.nist_uri_template.format(vuln))
	32	+	vuln_description = VulnDescription(description, self.nist_uri_template.format(vuln))
	33	+	self.cache[vuln] = vuln_description
	34	+	return vuln_description
34	35		except HTTPError as he:
35	36		return VulnDescription('', 'Description fetching error: ' + str(he))
36	37
		skipped 2 lines

■ ■ ■ ■ ■ ■

contrib/parsers/flan_xml_parser.py

		skipped 112 lines
113	113		if not ip_addr:
114	114		return
115	115
116		-	if host['status']['@state'] == 'up' and 'port' in host['ports']:
	116	+	if host['status']['@state'] == 'up' and 'ports' in host.keys() and 'port' in host['ports']:
117	117		ports = host['ports']['port']
118	118		if isinstance(ports, list):
119	119		for p in ports:
		skipped 37 lines

Please wait...

Page is in error, reload to recover