From: Yen Chi Hsuan <yan12125@gmail.com>
Date: Sat, 22 Apr 2017 13:44:01 +0000 (+0800)
Subject: [socks] Report errors elegantly when credentails are required but missing
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=54f54fcca7af7e5bbc779cfc73d58d1ed2b4b6ae;p=youtube-dl

[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)
---

diff --git a/ChangeLog b/ChangeLog
index d699acb31..8dc6e6857 100644
--- 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
index 0f5d7bdb2..5d4adbe72 100644
--- 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')