CIRCL
/
lookyloo
mirror of https://github.com/CIRCL/lookyloo
2
0
Fork 0
Code Issues Releases Wiki Activity

fix: Incorrect typing

pull/79/head
Raphaël Vinot 2020-06-11 15:32:43 +02:00
parent 1c408af3b0
commit 9873d3ebc3
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lookyloo/lookyloo.py
View File

@ -14,7 +14,7 @@ from pathlib import Path
import pickle import pickle
import smtplib import smtplib
import socket import socket
from typing import Union, Dict, List, Tuple, Optional, Any, MutableMapping, Set from typing import Union, Dict, List, Tuple, Optional, Any, MutableMapping, Set, Iterable
from urllib.parse import urlsplit from urllib.parse import urlsplit
from uuid import uuid4 from uuid import uuid4
from zipfile import ZipFile from zipfile import ZipFile
@ -488,34 +488,34 @@ class Lookyloo():
# Optional: Cookies sent to server in request -> map to nodes who set the cookie in response # Optional: Cookies sent to server in request -> map to nodes who set the cookie in response
if hasattr(url, 'cookies_sent'): if hasattr(url, 'cookies_sent'):
to_display: Dict[str, Set[Tuple[str, str]]] = defaultdict(set) to_display_sent: Dict[str, Set[Iterable[Optional[str]]]] = defaultdict(set)
for cookie, contexts in url.cookies_sent.items(): for cookie, contexts in url.cookies_sent.items():
if not contexts: if not contexts:
# Locally created? # Locally created?
to_display[cookie].add(('Unknown origin', )) to_display_sent[cookie].add(('Unknown origin', ))
continue continue
for context in contexts: for context in contexts:
to_display[cookie].add((context['setter'].hostname, context['setter'].hostnode_uuid)) to_display_sent[cookie].add((context['setter'].hostname, context['setter'].hostnode_uuid))
to_append['cookies_sent'] = to_display to_append['cookies_sent'] = to_display_sent
# Optional: Cookies received from server in response -> map to nodes who send the cookie in request # Optional: Cookies received from server in response -> map to nodes who send the cookie in request
if hasattr(url, 'cookies_received'): if hasattr(url, 'cookies_received'):
to_display = {'3rd_party': defaultdict(set), 'sent': defaultdict(set), 'not_sent': defaultdict(set)} to_display_received: Dict[str, Dict[str, Set[Iterable[Optional[str]]]]] = {'3rd_party': defaultdict(set), 'sent': defaultdict(set), 'not_sent': defaultdict(set)}
for domain, c_received, is_3rd_party in url.cookies_received: for domain, c_received, is_3rd_party in url.cookies_received:
if c_received not in ct.root_hartree.cookies_sent: if c_received not in ct.root_hartree.cookies_sent:
# This cookie is never sent. # This cookie is never sent.
if is_3rd_party: if is_3rd_party:
to_display['3rd_party'][c_received].add((domain, )) to_display_received['3rd_party'][c_received].add((domain, ))
else: else:
to_display['not_sent'][c_received].add((domain, )) to_display_received['not_sent'][c_received].add((domain, ))
continue continue
for url_node in ct.root_hartree.cookies_sent[c_received]: for url_node in ct.root_hartree.cookies_sent[c_received]:
if is_3rd_party: if is_3rd_party:
to_display['3rd_party'][c_received].add((url_node.hostname, url_node.hostnode_uuid)) to_display_received['3rd_party'][c_received].add((url_node.hostname, url_node.hostnode_uuid))
else: else:
to_display['sent'][c_received].add((url_node.hostname, url_node.hostnode_uuid)) to_display_received['sent'][c_received].add((url_node.hostname, url_node.hostnode_uuid))
to_append['cookies_received'] = to_display to_append['cookies_received'] = to_display_received
urls.append(to_append) urls.append(to_append)
return hostnode, urls return hostnode, urls