Fix two-factor authentication merge conflicts

Author: python273

vk_api/vk_api.py

@@ -20,10 +20,12 @@
 CAPTCHA_ERROR_CODE = 14
 NEED_VALIDATION_CODE = 17
 HTTP_ERROR_CODE = -1
+TWOFACTOR_CODE = -2
 
 RE_LOGIN_HASH = re.compile(r'name="lg_h" value="([a-z0-9]+)"')
 RE_CAPTCHAID = re.compile(r'sid=(\d+)')
 RE_NUMBER_HASH = re.compile(r"al_page: '3', hash: '([a-z0-9]+)'")
+RE_AUTH_HASH = re.compile(r"hash: '([a-z_0-9]+)'")
 RE_TOKEN_URL = re.compile(r'location\.href = "(.*?)"\+addr;')
 
 RE_PHONE_PREFIX = re.compile(r'phone_number">(.*?)<')
@@ -33,7 +35,9 @@
 
 class VkApi(object):
     def __init__(self, login=None, password=None, number=None, sec_number=None,
-                 token=None, proxies=None, captcha_handler=None,
+                 token=None,
+                 proxies=None,
+                 auth_handler=None, captcha_handler=None,
                  config_filename='vk_config.json',
                  api_version='5.35', app_id=2895443, scope=33554431,
                  client_secret=None):
@@ -51,6 +55,9 @@ def __init__(self, login=None, password=None, number=None, sec_number=None,
         :param proxies: proxy server
                         {'http': 'http://127.0.0.1:8888/',
                         'https': 'https://127.0.0.1:8888/'}
+        :param auth_handler: Функция для обработки двухфакторной аутентификации,
+                              обязана возвращать строку с кодом для
+                              прохождения аутентификации
         :param captcha_handler: Функция для обработки капчи
         :param config_filename: Расположение config файла
 
@@ -88,7 +95,8 @@ def __init__(self, login=None, password=None, number=None, sec_number=None,
         self.error_handlers = {
             NEED_VALIDATION_CODE: self.need_validation_handler,
             CAPTCHA_ERROR_CODE: captcha_handler or self.captcha_handler,
-            TOO_MANY_RPS_CODE: self.too_many_rps_handler
+            TOO_MANY_RPS_CODE: self.too_many_rps_handler,
+            TWOFACTOR_CODE: auth_handler or self.auth_handler
         }
 
     def authorization(self, reauth=False):
@@ -139,6 +147,10 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
 
         remixsid = None
 
+        if 'act=authcheck' in response.url:
+            code = self.error_handlers[TWOFACTOR_CODE]()
+            response = self.twofactor(response, code)
+
         if 'remixsid' in self.http.cookies:
             remixsid = self.http.cookies['remixsid']
         elif 'remixsid6' in self.http.cookies:  # ipv6?
@@ -176,6 +188,28 @@ def vk_login(self, captcha_sid=None, captcha_key=None):
         if 'act=blocked' in response.url:
             raise AccountBlocked('Account is blocked')
 
+    def twofactor(self, response, code):
+        """ Двухфакторная аутентификация
+        :param reponse: запрос, содержащий страницу с приглашением к аутентификации
+        :param code: код, который необходимо ввести для успешной аутентификации
+        """
+        assert code != None, "Empty code doesn't acceptable"
+        assert len(code) == 6, "Length of code cannot be other than 6."
+
+        auth_hash = search_re(RE_AUTH_HASH, response.text)
+        url = 'https://vk.com/al_login.php'
+        if auth_hash:
+            values = {
+                    'act': 'a_authcheck_code',
+                    'code': code,
+                    'remember': 0, # TODO: Fix me(device remembering)
+                    'hash': auth_hash,
+                    }
+            response = self.http.post(url, values, cookies=response.cookies)
+            if url not in response.url:
+                return response
+        raise TwoFactorError('Incorrect code: %s' % code)
+
     def security_check(self, url=None, response=None):
         if url:
             response = self.http.get(url)
@@ -315,6 +349,9 @@ def too_many_rps_handler(self, error):
         time.sleep(0.5)
         return error.try_method()
 
+    def auth_handler(self):
+        raise AuthorizationError("No handler for two-factor authorization.")
+
     def method(self, method, values=None, captcha_sid=None, captcha_key=None):
         """ Использование методов API
 
@@ -444,6 +481,10 @@ class AccountBlocked(AuthorizationError):
     pass
 
 
+class TwoFactorError(AuthorizationError):
+    pass
+
+
 class SecurityCheck(AuthorizationError):
     def __init__(self, phone_prefix=None, phone_postfix=None, response=None):
         self.phone_prefix = phone_prefix