fix+chores: rewrite zfw session and change local cache dir location (#20)

Author: Pairman

libxduauth/AuthSession.py

@@ -9,7 +9,7 @@ class AuthSession(Session):
     def __init__(self, name=None, cookies={}, headers={}):
         cookie_name = name if name else self.cookie_name
         self.cookie_path = os.path.expanduser(
-            os.path.join('~', '.xduauth', 'cookies', cookie_name)
+            os.path.join('~', '.cache', 'xduauth', 'cookies', cookie_name)
         )
         os.makedirs(os.path.dirname(self.cookie_path), exist_ok=True)
         if not cookies and hasattr(self, 'cookies'):

libxduauth/sites/zfw.py

@@ -1,28 +1,55 @@
-import re
-
 from bs4 import BeautifulSoup
-from requests import Session
 
+from ..AuthSession import AuthSession
+from ..utils.vcode import get_solver
+from ..utils.rsa import rsa_encrypt_by_pkcs1
 
-class ZFWSession(Session):
-    BASE = 'https://zfw.xidian.edu.cn'
+class ZFWSession(AuthSession):
+    COOKIE_NAME = 'zfw'
+    _BASE = 'zfw.xidian.edu.cn'
+    BASE = f'https://{_BASE}'
 
-    def __init__(self, username, password, *args, **kwargs):
-        super(ZFWSession, self).__init__(*args, **kwargs)
-        self.headers.update({
-            'User-Agent': 'Mobile'
-        })
-        soup = BeautifulSoup(self.get(self.BASE).text, "lxml")
-        vcv = soup.find('input', type='hidden').get('value')
-        error = re.findall(
-            r'请修复以下错误<\/p><ul><li>(.*?)<',
-            self.post(self.BASE + '/login', data={
-                "LoginForm[username]": username,
-                "LoginForm[password]": password,
-                "_csrf": vcv,
-                "login-button": ""
-            }).text
+    def __init__(self, username, password):
+        super().__init__(
+            f'{self.COOKIE_NAME}_{username}', headers={'User-Agent': 'Mobile'}
+        )
+        if self.is_logged_in():
+            return
+        else:
+            self.cookies.clear()
+        form = BeautifulSoup(
+            self.get(self.BASE).text, 'lxml'
+        ).findChild(attrs={'id': 'login-form'})
+        headers = {
+            **self.headers,
+            'X-Requested-With': 'XMLHttpRequest',
+            'X-CSRF-Token': form.find('input', attrs={'name': '_csrf-8800'}).get('value')
+        }
+        enc_password = rsa_encrypt_by_pkcs1(
+            form.find('input', id='public').get('value'), password
         )
-        self.headers.pop('User-Agent')
-        if len(error) > 0:
-            raise ConnectionError(error[0])
+        data = {
+            'LoginForm[username]': username,
+            'LoginForm[password]': enc_password
+        }
+        for _ in range(5):
+            data['LoginForm[verifyCode]'] = get_solver(self._BASE)(self.get(
+                f'{self.BASE}/site/captcha'
+            ).content)
+            res = self.post(
+                f'{self.BASE}/site/validate-user', headers=headers, data=data
+            )
+            if res.status_code == 200 or res.json()['success']:
+                break
+        else:
+            raise ConnectionError('登录失败')
+        res = self.post(self.BASE, headers=headers, data=data)
+        if res.status_code != 302 and res.headers.get(
+            'X-Redirect'
+        ) != 'http://zfw.xidian.edu.cn/home':
+            raise ConnectionError('登录失败')
+
+    def is_logged_in(self):
+        return self.get(
+            f'{self.BASE}/login', allow_redirects=False
+        ).status_code == 302

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="libxduauth",
-    version="1.9.0",
+    version="1.10.0",
     author="Frank",
     author_email="[email protected]",
     description="login utilities for XDU",