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

gettor/services/email/sendmail.py

+6 −2
Original line number Diff line number Diff line
@@ -235,7 +235,11 @@ class Sendmail(object): 
                yield self.conn.remove_request(

                    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:

            log.error("Error sending email: {}.".format(e))
 
            log.error(

                strings.redact_emails("Error sending email:{}.".format(e))

                )

gettor/utils/strings.py

+5 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ the Tor Browser. 
import json

import os

import inspect

import re



strings = {}

translations = {}
@@ -115,6 +116,10 @@ def load_strings(current_locale): 
        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):

    """