Skip to content

Commit

Permalink
Actual 8.9.0 release
Browse files Browse the repository at this point in the history
- Fix broken cache (PR #494)
- Add source name and type information based on static mapping of the reverse DNS base domain
  - See [this documentation](https://github.com/domainaware/parsedmarc/tree/master/parsedmarc/resources/maps) for more information, and to learn how to help!
- Replace `multiprocessing.Pool` with `Pipe` + `Process` (PR #491 closes issue #489)
- Remove unused parallel arguments (PR #492 closes issue #490)
  • Loading branch information
seanthegeek committed Mar 25, 2024
1 parent fd0572c commit 6334355
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ Changelog
8.9.0
-----

- Fix broken cache (PR #494)
- Add source name and type information based on static mapping of the reverse DNS base domain
- See [this documentation](https://github.com/domainaware/parsedmarc/tree/master/parsedmarc/resources/maps) for more information, and to learn how to help!
- Replace `multiprocessing.Pool` with `Pipe` + `Process` (PR #491 closes issue #489)
Expand Down
2 changes: 1 addition & 1 deletion parsedmarc/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -760,7 +760,7 @@ def parsed_aggregate_reports_to_csv(reports):
"org_extra_contact_info", "report_id", "begin_date", "end_date",
"errors", "domain", "adkim", "aspf", "p", "sp", "pct", "fo",
"source_ip_address", "source_country", "source_reverse_dns",
"source_base_domain", "source_name", "source_type" "count",
"source_base_domain", "source_name", "source_type", "count",
"spf_aligned", "dkim_aligned", "dmarc_aligned", "disposition",
"policy_override_reasons", "policy_override_comments",
"envelope_from", "header_from",
Expand Down
10 changes: 5 additions & 5 deletions parsedmarc/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ def get_service_from_reverse_dns_base_domain(base_domain):
try:
service = service_map[base_domain]
except KeyError:
service = dict(sname=base_domain, type=None)
service = dict(name=base_domain, type=None)

return service

Expand Down Expand Up @@ -364,14 +364,14 @@ def get_ip_address_info(ip_address, ip_db_path=None, cache=None, offline=False,
info["country"] = country
info["reverse_dns"] = reverse_dns
info["base_domain"] = None
info["service_name"] = None
info["service_type"] = None
info["name"] = None
info["type"] = None
if reverse_dns is not None:
base_domain = get_base_domain(reverse_dns)
service = get_service_from_reverse_dns_base_domain(base_domain)
info["base_domain"] = base_domain
info["service_type"] = service["service_type"]
info["service_name"] = service["service_name"]
info["type"] = service["type"]
info["name"] = service["name"]

if cache is not None:
cache[ip_address] = info
Expand Down

0 comments on commit 6334355

Please sign in to comment.