diff --git a/src/README.md b/src/README.md index 43f1aab..d589c6b 100644 --- a/src/README.md +++ b/src/README.md @@ -45,6 +45,7 @@ digraph G { bundle_download -> index_bundle_names index_bundle_names -> html_bundle index_bundle_names -> html_index + index_bundle_names -> html_reverse_domains "." -> bundle_combine bundle_combine -> index_reverse_domains index_reverse_domains -> html_reverse_domains diff --git a/src/bundle_combine.py b/src/bundle_combine.py index 848f3c7..03f73c7 100755 --- a/src/bundle_combine.py +++ b/src/bundle_combine.py @@ -4,7 +4,7 @@ import os import re import sys import common_lib as mylib -import tracker_download as tracker +import tracker_download THRESHOLD_PERCENT_OF_LOGS = 0.33 # domain appears in % recordings @@ -49,7 +49,7 @@ def json_combine(bundle_id): try: ddic[key][1].append(num) except KeyError: - ddic[key] = (tracker.is_tracker(key), [num]) + ddic[key] = (tracker_download.is_tracker(key), [num]) res = {'rec_len': []} pardom = {} diff --git a/src/html_bundle.py b/src/html_bundle.py index 0a2252c..00a49a5 100755 --- a/src/html_bundle.py +++ b/src/html_bundle.py @@ -116,11 +116,11 @@ def gen_html(bundle_id, obj): { gen_dom_tags(obj['tracker'], isSub=True, onlyTrackers=True) }

-

Overlapping Domains ({ len(obj['pardom']) }):

+

Domains ({ len(obj['pardom']) }):

{ gen_dotgraph(obj['pardom']) } { gen_dom_tags(obj['pardom'], isSub=False) } -

Overlapping Subdomains ({ len(obj['subdom']) }):

+

Subdomains ({ len(obj['subdom']) }):

{ gen_dotgraph(obj['subdom']) } { gen_dom_tags(obj['subdom'], isSub=True) } diff --git a/src/z_dependency.png b/src/z_dependency.png index 3d60482..a1ce1b6 100644 Binary files a/src/z_dependency.png and b/src/z_dependency.png differ