github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-08-14 02:26:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Separate out plex.direct IP address log filter

Browse source
This commit is contained in:
JonnyWong16 2022-01-27 10:52:07 -08:00
commit 96025c839d
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
1 changed files with 20 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

23
plexpy/logger.py
View file

@ -191,15 +191,31 @@ class PublicIPFilter(RegexFilter):
Log filter for public IP addresses
"""
REGEX = re.compile(
r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[.-]){3}'
r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[.]){3}'
r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
r'(?!\d*-[a-z0-9]{6})'
)
def replace(self, text, ip):
if helpers.is_public_ip(ip):
return text.replace(ip, '.'.join(['***'] * 4))
return text
class PlexDirectIPFilter(RegexFilter):
"""
Log filter for IP addresses in plex.direct URL
"""
REGEX = re.compile(
r'(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)[-]){3}'
r'(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'
r'(?!\d*-[a-z0-9]{6})'
r'(?=\.[a-z0-9]+\.plex\.direct)'
)
def replace(self, text, ip):
if helpers.is_public_ip(ip.replace('-', '.')):
partition = '-' if '-' in ip else '.'
return text.replace(ip, partition.join(['***'] * 4))
return text.replace(ip, '-'.join(['***'] * 4))
return text
@ -321,6 +337,7 @@ def initLogger(console=False, log_dir=False, verbose=False):
handler.addFilter(UsernameFilter())
handler.addFilter(BlacklistFilter())
handler.addFilter(PublicIPFilter())
handler.addFilter(PlexDirectIPFilter())
handler.addFilter(EmailFilter())
handler.addFilter(PlexTokenFilter())