cleanup
This commit is contained in:
parent
5b079317f8
commit
fd68be8991
13
email_dns.py
13
email_dns.py
@ -45,8 +45,13 @@ dkim_selectors = { # <selector>._domainkey.<domain>
|
|||||||
'mandrill': [
|
'mandrill': [
|
||||||
'mandrill'
|
'mandrill'
|
||||||
],
|
],
|
||||||
|
# Mailgun (Very generic, thank you, Mailgun)
|
||||||
'mailgun': [
|
'mailgun': [
|
||||||
'pic', 'smtp', # Mailgun (Very generic, thank you, Mailgun)
|
'pic', 'smtp',
|
||||||
|
],
|
||||||
|
# Bloomerang (using SendGrid backend)
|
||||||
|
'bloomerang': [
|
||||||
|
'blm', 'blm2',
|
||||||
],
|
],
|
||||||
'bullhorn': [
|
'bullhorn': [
|
||||||
'bh'
|
'bh'
|
||||||
@ -68,7 +73,7 @@ def process_args(args: list) -> list:
|
|||||||
|
|
||||||
return domains
|
return domains
|
||||||
|
|
||||||
def safe_resolve(name: str, type: str) -> resolver.Answer:
|
def safe_resolve(name: str, type: str) -> resolver.Answer | None:
|
||||||
try:
|
try:
|
||||||
answer = resolver.resolve(name, type)
|
answer = resolver.resolve(name, type)
|
||||||
return answer
|
return answer
|
||||||
@ -79,7 +84,9 @@ def safe_resolve(name: str, type: str) -> resolver.Answer:
|
|||||||
return None
|
return None
|
||||||
|
|
||||||
class Domain:
|
class Domain:
|
||||||
|
|
||||||
# def __init__(self, name: str, mx: str = [], spf: str = None, dkim: list = [], dmarc: str = None) -> None:
|
# def __init__(self, name: str, mx: str = [], spf: str = None, dkim: list = [], dmarc: str = None) -> None:
|
||||||
|
|
||||||
def __init__(self, name: str) -> None:
|
def __init__(self, name: str) -> None:
|
||||||
self.name = name
|
self.name = name
|
||||||
self.mx = []
|
self.mx = []
|
||||||
@ -104,7 +111,7 @@ class Domain:
|
|||||||
for a in answer:
|
for a in answer:
|
||||||
if str(a).lower().find('v=spf1') != -1:
|
if str(a).lower().find('v=spf1') != -1:
|
||||||
self.spf = str(a).replace('"', '')
|
self.spf = str(a).replace('"', '')
|
||||||
# TODO: Recurse through includes
|
# TODO: Recurse through includes?
|
||||||
# matches = re.search(r'(?:include:)(.*)(?=\s)', str(a).lower())
|
# matches = re.search(r'(?:include:)(.*)(?=\s)', str(a).lower())
|
||||||
# domains = set()
|
# domains = set()
|
||||||
# if matches:
|
# if matches:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user