logo

youtube-dl

[mirror] Download/Watch videos from video hosters
commit: 54f54fcca7af7e5bbc779cfc73d58d1ed2b4b6ae
parent facfd79f9ad574db7bfcc90cbef01b3a7e7b1262
Author: Yen Chi Hsuan <yan12125@gmail.com>
Date:   Sat, 22 Apr 2017 21:44:01 +0800

[socks] Report errors elegantly when credentails are required but missing

In some non-standard implementations, the server may respond AUTH_USER_PASS
even if's not listed in available authentication methods. (it should
respond AUTH_NO_ACCEPTABLE per standards)

Diffstat:

MChangeLog4++++
Myoutube_dl/socks.py5+++--
2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog @@ -1,5 +1,9 @@ version <unreleased> +Core + +* [socks] Handle cases where credentials are required but missing + Extractors - [azubu] Remove extractor (#12813) * [porn91] Fix extraction (#12814) diff --git a/youtube_dl/socks.py b/youtube_dl/socks.py @@ -193,9 +193,10 @@ class sockssocket(socket.socket): self._check_response_version(SOCKS5_VERSION, version) - if method == Socks5Auth.AUTH_NO_ACCEPTABLE: + if method == Socks5Auth.AUTH_NO_ACCEPTABLE or ( + method == Socks5Auth.AUTH_USER_PASS and (not self._proxy.username or not self._proxy.password)): self.close() - raise Socks5Error(method) + raise Socks5Error(Socks5Auth.AUTH_NO_ACCEPTABLE) if method == Socks5Auth.AUTH_USER_PASS: username = self._proxy.username.encode('utf-8')