projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
79d1f8e
)
Remove sensitive data from logging in messages
author
Sergey M․
<dstftw@gmail.com>
Sat, 11 Nov 2017 13:49:03 +0000
(20:49 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 11 Nov 2017 13:52:12 +0000
(20:52 +0700)
14 files changed:
youtube_dl/extractor/animeondemand.py
patch
|
blob
|
history
youtube_dl/extractor/atresplayer.py
patch
|
blob
|
history
youtube_dl/extractor/bambuser.py
patch
|
blob
|
history
youtube_dl/extractor/dramafever.py
patch
|
blob
|
history
youtube_dl/extractor/funimation.py
patch
|
blob
|
history
youtube_dl/extractor/noco.py
patch
|
blob
|
history
youtube_dl/extractor/patreon.py
patch
|
blob
|
history
youtube_dl/extractor/pluralsight.py
patch
|
blob
|
history
youtube_dl/extractor/roosterteeth.py
patch
|
blob
|
history
youtube_dl/extractor/safari.py
patch
|
blob
|
history
youtube_dl/extractor/twitch.py
patch
|
blob
|
history
youtube_dl/extractor/udemy.py
patch
|
blob
|
history
youtube_dl/extractor/viki.py
patch
|
blob
|
history
youtube_dl/extractor/vk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/animeondemand.py
b/youtube_dl/extractor/animeondemand.py
index 69d36331157010cf5411316096b1a940be5422c1..34c2b363ea3fbb69765be83b57244913e48c85c5 100644
(file)
--- a/
youtube_dl/extractor/animeondemand.py
+++ b/
youtube_dl/extractor/animeondemand.py
@@
-78,7
+78,7
@@
class AnimeOnDemandIE(InfoExtractor):
post_url = urljoin(self._LOGIN_URL, post_url)
response = self._download_webpage(
post_url = urljoin(self._LOGIN_URL, post_url)
response = self._download_webpage(
- post_url, None, 'Logging in
as %s' % username
,
+ post_url, None, 'Logging in
'
,
data=urlencode_postdata(login_form), headers={
'Referer': self._LOGIN_URL,
})
data=urlencode_postdata(login_form), headers={
'Referer': self._LOGIN_URL,
})
diff --git
a/youtube_dl/extractor/atresplayer.py
b/youtube_dl/extractor/atresplayer.py
index 01fa308ff1f150214fe4d996eb0bbc922387b320..1a31ebe0820d67df4b768e8102a134b34cfff0c5 100644
(file)
--- a/
youtube_dl/extractor/atresplayer.py
+++ b/
youtube_dl/extractor/atresplayer.py
@@
-87,7
+87,7
@@
class AtresPlayerIE(InfoExtractor):
self._LOGIN_URL, urlencode_postdata(login_form))
request.add_header('Content-Type', 'application/x-www-form-urlencoded')
response = self._download_webpage(
self._LOGIN_URL, urlencode_postdata(login_form))
request.add_header('Content-Type', 'application/x-www-form-urlencoded')
response = self._download_webpage(
- request, None, 'Logging in
as %s' % username
)
+ request, None, 'Logging in
'
)
error = self._html_search_regex(
r'(?s)<ul[^>]+class="[^"]*\blist_error\b[^"]*">(.+?)</ul>',
error = self._html_search_regex(
r'(?s)<ul[^>]+class="[^"]*\blist_error\b[^"]*">(.+?)</ul>',
diff --git
a/youtube_dl/extractor/bambuser.py
b/youtube_dl/extractor/bambuser.py
index 0eb1930c2d24bb01acd57292d4fe7e1b9a330bff..633c57553d9a9e769f726a664e08061217763ced 100644
(file)
--- a/
youtube_dl/extractor/bambuser.py
+++ b/
youtube_dl/extractor/bambuser.py
@@
-59,7
+59,7
@@
class BambuserIE(InfoExtractor):
self._LOGIN_URL, urlencode_postdata(login_form))
request.add_header('Referer', self._LOGIN_URL)
response = self._download_webpage(
self._LOGIN_URL, urlencode_postdata(login_form))
request.add_header('Referer', self._LOGIN_URL)
response = self._download_webpage(
- request, None, 'Logging in
as %s' % username
)
+ request, None, 'Logging in
'
)
login_error = self._html_search_regex(
r'(?s)<div class="messages error">(.+?)</div>',
login_error = self._html_search_regex(
r'(?s)<div class="messages error">(.+?)</div>',
diff --git
a/youtube_dl/extractor/dramafever.py
b/youtube_dl/extractor/dramafever.py
index 95883a037f537de47a0ee9f3f18d913eb9ec1647..6b60e542b37418473e1ee2a959cb6ae08a60d2e5 100644
(file)
--- a/
youtube_dl/extractor/dramafever.py
+++ b/
youtube_dl/extractor/dramafever.py
@@
-54,7
+54,7
@@
class DramaFeverBaseIE(AMPIE):
request = sanitized_Request(
self._LOGIN_URL, urlencode_postdata(login_form))
response = self._download_webpage(
request = sanitized_Request(
self._LOGIN_URL, urlencode_postdata(login_form))
response = self._download_webpage(
- request, None, 'Logging in
as %s' % username
)
+ request, None, 'Logging in
'
)
if all(logout_pattern not in response
for logout_pattern in ['href="/accounts/logout/"', '>Log out<']):
if all(logout_pattern not in response
for logout_pattern in ['href="/accounts/logout/"', '>Log out<']):
diff --git
a/youtube_dl/extractor/funimation.py
b/youtube_dl/extractor/funimation.py
index 8c37509ec60f132671952c8ad018e4ba79a5fac6..107f658baf2c393036dd4d2c770c01258e29e1a9 100644
(file)
--- a/
youtube_dl/extractor/funimation.py
+++ b/
youtube_dl/extractor/funimation.py
@@
-57,7
+57,7
@@
class FunimationIE(InfoExtractor):
try:
data = self._download_json(
'https://prod-api-funimationnow.dadcdigital.com/api/auth/login/',
try:
data = self._download_json(
'https://prod-api-funimationnow.dadcdigital.com/api/auth/login/',
- None, 'Logging in
as %s' % username
, data=urlencode_postdata({
+ None, 'Logging in
'
, data=urlencode_postdata({
'username': username,
'password': password,
}))
'username': username,
'password': password,
}))
diff --git
a/youtube_dl/extractor/noco.py
b/youtube_dl/extractor/noco.py
index 8b83e1f760141bc1a6a0ff4c56761e09b6e3d920..a9f9b10c47b8b9f481a8ab3f88705b1b0e76eb0f 100644
(file)
--- a/
youtube_dl/extractor/noco.py
+++ b/
youtube_dl/extractor/noco.py
@@
-70,7
+70,7
@@
class NocoIE(InfoExtractor):
return
login = self._download_json(
return
login = self._download_json(
- self._LOGIN_URL, None, 'Logging in
as %s' % username
,
+ self._LOGIN_URL, None, 'Logging in
'
,
data=urlencode_postdata({
'a': 'login',
'cookie': '1',
data=urlencode_postdata({
'a': 'login',
'cookie': '1',
diff --git
a/youtube_dl/extractor/patreon.py
b/youtube_dl/extractor/patreon.py
index a6a2c273f240db52c967a12a96484261bd37664a..d4b1d34ca8486442139409eda90ed95be6c0ffc9 100644
(file)
--- a/
youtube_dl/extractor/patreon.py
+++ b/
youtube_dl/extractor/patreon.py
@@
-67,7
+67,7
@@
class PatreonIE(InfoExtractor):
'https://www.patreon.com/processLogin',
compat_urllib_parse_urlencode(login_form).encode('utf-8')
)
'https://www.patreon.com/processLogin',
compat_urllib_parse_urlencode(login_form).encode('utf-8')
)
- login_page = self._download_webpage(request, None, note='Logging in
as %s' % username
)
+ login_page = self._download_webpage(request, None, note='Logging in
'
)
if re.search(r'onLoginFailed', login_page):
raise ExtractorError('Unable to login, incorrect username and/or password', expected=True)
if re.search(r'onLoginFailed', login_page):
raise ExtractorError('Unable to login, incorrect username and/or password', expected=True)
diff --git
a/youtube_dl/extractor/pluralsight.py
b/youtube_dl/extractor/pluralsight.py
index f6a9131b19bf693511a84cfa3118d89030053c6d..4bf0aa786abc1acd185472ca987d8a6db554f2d9 100644
(file)
--- a/
youtube_dl/extractor/pluralsight.py
+++ b/
youtube_dl/extractor/pluralsight.py
@@
-116,7
+116,7
@@
class PluralsightIE(PluralsightBaseIE):
post_url = compat_urlparse.urljoin(self._LOGIN_URL, post_url)
response = self._download_webpage(
post_url = compat_urlparse.urljoin(self._LOGIN_URL, post_url)
response = self._download_webpage(
- post_url, None, 'Logging in
as %s' % username
,
+ post_url, None, 'Logging in
'
,
data=urlencode_postdata(login_form),
headers={'Content-Type': 'application/x-www-form-urlencoded'})
data=urlencode_postdata(login_form),
headers={'Content-Type': 'application/x-www-form-urlencoded'})
diff --git
a/youtube_dl/extractor/roosterteeth.py
b/youtube_dl/extractor/roosterteeth.py
index 46dfc78f5edac0e9e8ef66f37efa4bbd7afcf3ea..8b703800ecbd595c5cb1e188fdb830b5ed1cfa35 100644
(file)
--- a/
youtube_dl/extractor/roosterteeth.py
+++ b/
youtube_dl/extractor/roosterteeth.py
@@
-68,7
+68,7
@@
class RoosterTeethIE(InfoExtractor):
login_request = self._download_webpage(
self._LOGIN_URL, None,
login_request = self._download_webpage(
self._LOGIN_URL, None,
- note='Logging in
as %s' % username
,
+ note='Logging in
'
,
data=urlencode_postdata(login_form),
headers={
'Referer': self._LOGIN_URL,
data=urlencode_postdata(login_form),
headers={
'Referer': self._LOGIN_URL,
diff --git
a/youtube_dl/extractor/safari.py
b/youtube_dl/extractor/safari.py
index 909a6ba97993f161c6c39646b073185733626d18..cc6698f882a5859883372b32dc71578ebe37da8a 100644
(file)
--- a/
youtube_dl/extractor/safari.py
+++ b/
youtube_dl/extractor/safari.py
@@
-61,7
+61,7
@@
class SafariBaseIE(InfoExtractor):
request = sanitized_Request(
self._LOGIN_URL, urlencode_postdata(login_form), headers=headers)
login_page = self._download_webpage(
request = sanitized_Request(
self._LOGIN_URL, urlencode_postdata(login_form), headers=headers)
login_page = self._download_webpage(
- request, None, 'Logging in
as %s' % username
)
+ request, None, 'Logging in
'
)
if not is_logged(login_page):
raise ExtractorError(
if not is_logged(login_page):
raise ExtractorError(
diff --git
a/youtube_dl/extractor/twitch.py
b/youtube_dl/extractor/twitch.py
index fefcd28078f6c69058366fbb7b8f9e616508fbb6..bf57eac01f2f42dd5dd4d4fc7bdce55f08ee7513 100644
(file)
--- a/
youtube_dl/extractor/twitch.py
+++ b/
youtube_dl/extractor/twitch.py
@@
-101,7
+101,7
@@
class TwitchBaseIE(InfoExtractor):
fail(clean_html(login_page))
redirect_page, handle = login_step(
fail(clean_html(login_page))
redirect_page, handle = login_step(
- login_page, handle, 'Logging in
as %s' % username
, {
+ login_page, handle, 'Logging in
'
, {
'username': username,
'password': password,
})
'username': username,
'password': password,
})
diff --git
a/youtube_dl/extractor/udemy.py
b/youtube_dl/extractor/udemy.py
index 207c4a6a7ee8131c3e2e5d5823aefb336ad47c47..c248ea72784cf58b43c74725315ac00aa6c61bf5 100644
(file)
--- a/
youtube_dl/extractor/udemy.py
+++ b/
youtube_dl/extractor/udemy.py
@@
-164,7
+164,7
@@
class UdemyIE(InfoExtractor):
})
response = self._download_webpage(
})
response = self._download_webpage(
- self._LOGIN_URL, None, 'Logging in
as %s' % username
,
+ self._LOGIN_URL, None, 'Logging in
'
,
data=urlencode_postdata(login_form),
headers={
'Referer': self._ORIGIN_URL,
data=urlencode_postdata(login_form),
headers={
'Referer': self._ORIGIN_URL,
diff --git
a/youtube_dl/extractor/viki.py
b/youtube_dl/extractor/viki.py
index 853e5c75f431da9bbc7383c31006d29c705bb881..ad2a2a4b70fdde18548e4dde62fcf9ccfc264ba4 100644
(file)
--- a/
youtube_dl/extractor/viki.py
+++ b/
youtube_dl/extractor/viki.py
@@
-99,7
+99,7
@@
class VikiBaseIE(InfoExtractor):
login = self._call_api(
'sessions.json', None,
login = self._call_api(
'sessions.json', None,
- 'Logging in
as %s' % username
, post_data=login_form)
+ 'Logging in
'
, post_data=login_form)
self._token = login.get('token')
if not self._token:
self._token = login.get('token')
if not self._token:
diff --git
a/youtube_dl/extractor/vk.py
b/youtube_dl/extractor/vk.py
index 105e172d539d4376e4534df31266c489f3d62518..0d8376522db12cd5c2568d108b928e9d675602e7 100644
(file)
--- a/
youtube_dl/extractor/vk.py
+++ b/
youtube_dl/extractor/vk.py
@@
-67,7
+67,7
@@
class VKBaseIE(InfoExtractor):
login_page = self._download_webpage(
'https://login.vk.com/?act=login', None,
login_page = self._download_webpage(
'https://login.vk.com/?act=login', None,
- note='Logging in
as %s' % username
,
+ note='Logging in
'
,
data=urlencode_postdata(login_form))
if re.search(r'onLoginFailed', login_page):
data=urlencode_postdata(login_form))
if re.search(r'onLoginFailed', login_page):