PyPtt 2.3.2__tar.gz → 2.3.3__tar.gz

{pyptt-2.3.2 → pyptt-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.2
+Version: 2.3.3
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)

{pyptt-2.3.2 → pyptt-2.3.3}/PyPtt/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '2.3.2'
+__version__ = '2.3.3'
 __author__ = 'CodingMan'
 __email__ = 'pttcodingman@gmail.com'
 

{pyptt-2.3.2 → pyptt-2.3.3}/PyPtt/_api_change_pw.py

@@ -13,8 +13,6 @@ def change_pw(api, new_password: str) -> None:
 
     log.logger.info(i18n.change_pw)
 
-    new_password = new_password[:8]
-
     cmd_list = []
     cmd_list.append(command.go_main_menu)
     cmd_list.append('U')
@@ -29,9 +27,12 @@ def change_pw(api, new_password: str) -> None:
         connect_core.TargetUnit('設定聯絡信箱後才能修改密碼', exceptions_=exceptions.SetContactMailFirst()),
         connect_core.TargetUnit('您輸入的密碼不正確', exceptions_=exceptions.WrongPassword()),
         connect_core.TargetUnit('請您確定(Y/N)？', response='Y' + command.enter),
-        connect_core.TargetUnit('檢查新密碼', response=new_password + command.enter, max_match=1),
-        connect_core.TargetUnit('設定新密碼', response=new_password + command.enter, max_match=1),
-        connect_core.TargetUnit('輸入原密碼', response=api._ptt_pw + command.enter, max_match=1),
+        # 只比對「新密碼」/「原密碼」, 不含前後綴與冒號: 正式站目前是「請設定新密碼：」
+        # 「請檢查新密碼：」「請輸入原密碼：」(全形冒號), pttbbs #112 之後上游改成兩步同名的
+        # 「新密碼:」(半形), 兩種寫法都涵蓋。新密碼要吃設定與確認兩次, 故 max_match=2。
+        # 「新密碼」必須排在「原密碼」前面: 新版輸入完原密碼後該行仍留在畫面上, 兩者會同時出現。
+        connect_core.TargetUnit('新密碼', response=new_password + command.enter, max_match=2, secret=True),
+        connect_core.TargetUnit('原密碼', response=api._ptt_pw + command.enter, max_match=1, secret=True),
         connect_core.TargetUnit('設定個人資料與密碼', break_detect=True)
     ]
 

{pyptt-2.3.2 → pyptt-2.3.3}/PyPtt/_api_give_money.py

@@ -78,7 +78,7 @@ def give_money(api, ptt_id: str, money: int, red_bag_title: str, red_bag_content
         connect_core.TargetUnit('按任意鍵繼續', break_detect=True),
         edit_red_bag_target,
         connect_core.TargetUnit('要修改紅包袋嗎', response=command.enter),
-        connect_core.TargetUnit('完成交易前要重新確認您的身份', response=api._ptt_pw + command.enter),
+        connect_core.TargetUnit('完成交易前要重新確認您的身份', response=api._ptt_pw + command.enter, secret=True),
         connect_core.TargetUnit('他是你的小主人，是否匿名？', response='n' + command.enter),
         connect_core.TargetUnit('要給他多少Ptt幣呢?', response=command.tab + str(money) + command.enter),
         connect_core.TargetUnit('這位幸運兒的id', response=ptt_id + command.enter),

{pyptt-2.3.2 → pyptt-2.3.3}/PyPtt/_api_loginout.py

@@ -68,7 +68,9 @@ def login(api, ptt_id: str, ptt_pw: str, kick_other_session: bool) -> None:
         api.process_picks = int(pattern.search(screen).group(0))
 
     ptt_id = ptt_id[:12].strip()
-    ptt_pw = ptt_pw[:8].strip()
+    # 不截斷密碼: 舊版 PTT 由 server 端忽略第 8 字之後的部分, 新版 (pttbbs #112, bcrypt)
+    # 則支援 72 字元, 兩邊都必須送出完整密碼才會正確。
+    ptt_pw = ptt_pw.strip()
 
     api.ptt_id = ptt_id
     api._ptt_pw = ptt_pw

{pyptt-2.3.2 → pyptt-2.3.3}/PyPtt.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: PyPtt
-Version: 2.3.2
+Version: 2.3.3
 Summary: PyPtt github: https://github.com/PyPtt/PyPtt
 Author-email: CodingMan <pttcodingman@gmail.com>
 License: GNU Lesser General Public License v3 (LGPLv3)