From be477061e8b7cc74eda8e88611d40e04209a0625 Mon Sep 17 00:00:00 2001 From: bato3 Date: Fri, 27 Jul 2018 14:52:48 +0200 Subject: [PATCH] Make proxy PRIVATE in verbose --- youtube_dl/YoutubeDL.py | 5 ++++- youtube_dl/options.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/youtube_dl/YoutubeDL.py b/youtube_dl/YoutubeDL.py index 38ba43a97..534f60346 100755 --- a/youtube_dl/YoutubeDL.py +++ b/youtube_dl/YoutubeDL.py @@ -2273,7 +2273,10 @@ class YoutubeDL(object): for handler in self._opener.handlers: if hasattr(handler, 'proxies'): proxy_map.update(handler.proxies) - self._write_string('[debug] Proxy map: ' + compat_str(proxy_map) + '\n') + self._write_string('[debug] Proxy map: ' + re.sub( + r'(https?://)(?:(?:[^:/\'"@]+:)?[^@]+)(@)', + r'\1PRIVATE\2', + compat_str(proxy_map)) + '\n') if self.params.get('call_home', False): ipaddr = self.urlopen('https://yt-dl.org/ip').read().decode('utf-8') diff --git a/youtube_dl/options.py b/youtube_dl/options.py index e7d8e8910..efb05b8e9 100644 --- a/youtube_dl/options.py +++ b/youtube_dl/options.py @@ -21,7 +21,7 @@ from .version import __version__ def _hide_login_info(opts): - PRIVATE_OPTS = set(['-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username']) + PRIVATE_OPTS = set(['-p', '--password', '-u', '--username', '--video-password', '--ap-password', '--ap-username', '--proxy']) eqre = re.compile('^(?P' + ('|'.join(re.escape(po) for po in PRIVATE_OPTS)) + ')=.+$') def _scrub_eq(o):