Merge pull request #21 from toxicvengeance/user-agent

add default user-agent to mta-sts policy lookups
Snawoot · Apr 16, 2019 · 1bd5c28 · 1bd5c28
2 parents 4ad115f + aa32aee
commit 1bd5c28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/postfix_mta_sts_resolver/defaults.py b/postfix_mta_sts_resolver/defaults.py
@@ -13,3 +13,4 @@
 SQLITE_TIMEOUT = 5
 REDIS_TIMEOUT = 5
 CACHE_GRACE = 60
+USER_AGENT = "postfix-mta-sts-resolver"
diff --git a/postfix_mta_sts_resolver/resolver.py b/postfix_mta_sts_resolver/resolver.py
@@ -28,6 +28,8 @@ def __init__(self, *, timeout=defaults.TIMEOUT, loop):
         self._http_timeout = aiohttp.ClientTimeout(total=timeout)
         self._proxy_info = aiohttp.helpers.proxies_from_env().get('https',
                                                                   None)
+        self._headers = {}
+
         if self._proxy_info is None:
             self._proxy = None
             self._proxy_auth = None
@@ -86,14 +88,17 @@ async def resolve(self, domain, last_known_id=None):
                           domain +
                           '/.well-known/mta-sts.txt')
 
+        # Construct headers for MTA-STS policy fetch
+        self._headers["User-Agent"] = defaults.USER_AGENT
+
         # Fetch actual policy
         try:
             async with aiohttp.ClientSession(loop=self._loop,
                                              timeout=self._http_timeout) \
                                                  as session:
                 async with session.get(sts_policy_url,
                                        allow_redirects=False,
-                                       proxy=self._proxy,
+                                       proxy=self._proxy, headers=self._headers,
                                        proxy_auth=self._proxy_auth) as resp:
                     if resp.status != 200:
                         raise BadSTSPolicy()