Commit ae30ca5e authored by hanneloresx's avatar hanneloresx Committed by Cecylia Bocovich
Browse files

Redact email addr from error msgs

Addresses issue #34058 to scrub logs of personal info.
parent dd2818ee
...@@ -235,7 +235,11 @@ class Sendmail(object): ...@@ -235,7 +235,11 @@ class Sendmail(object):
yield self.conn.remove_request( yield self.conn.remove_request(
id=id, service="email", date=date id=id, service="email", date=date
) )
log.error("Error sending email: {}.".format(e)) log.error(
strings.redact_emails("Error sending email:{}.".format(e))
)
except Exception as e: except Exception as e:
log.error("Error sending email: {}.".format(e)) log.error(
strings.redact_emails("Error sending email:{}.".format(e))
)
...@@ -13,6 +13,7 @@ the Tor Browser. ...@@ -13,6 +13,7 @@ the Tor Browser.
import json import json
import os import os
import inspect import inspect
import re
strings = {} strings = {}
translations = {} translations = {}
...@@ -115,6 +116,10 @@ def load_strings(current_locale): ...@@ -115,6 +116,10 @@ def load_strings(current_locale):
strings[s] = translations[current_locale][s] strings[s] = translations[current_locale][s]
def redact_emails(text):
redacted_text = re.sub(r'[\w\.+-]+@[\w\.+-]+', '[REDACTED_EMAIL]', text)
return redacted_text
def translated(k): def translated(k):
""" """
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment