From 4144380dd9f907969aa05ef1d69db00bff29072d Mon Sep 17 00:00:00 2001 From: Romain Bignon Date: Thu, 11 Nov 2010 15:51:16 +0100 Subject: [PATCH] handle LoggedPage --- weboob/backends/bp/browser.py | 3 ++- weboob/backends/bp/pages/__init__.py | 4 ++-- weboob/backends/bp/pages/login.py | 13 ++++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/weboob/backends/bp/browser.py b/weboob/backends/bp/browser.py index 80875551..8e02969f 100644 --- a/weboob/backends/bp/browser.py +++ b/weboob/backends/bp/browser.py @@ -18,7 +18,7 @@ from weboob.tools.browser import BaseBrowser#, BrowserIncorrectPassword -from .pages import LoginPage, CookiePage, AccountList, AccountHistory +from .pages import LoginPage, LoggedPage, CookiePage, AccountList, AccountHistory __all__ = ['BPbrowser'] @@ -29,6 +29,7 @@ class BPbrowser(BaseBrowser): PROTOCOL = 'https' ENCODING = None # refer to the HTML encoding PAGES = { r'.*wsost/OstBrokerWeb/loginform.*': LoginPage, + r'.*voscomptes/canalXHTML/identif.ea': LoggedPage, r'.*voscomptes/canalXHTML/releve/syntheseAssurancesEtComptes.ea': CookiePage, r'.*voscomptes/canalXHTML/releve/liste_comptes.jsp': AccountList, r'.*canalXHTML/relevesCCP/.*': AccountHistory, diff --git a/weboob/backends/bp/pages/__init__.py b/weboob/backends/bp/pages/__init__.py index 13f121cf..cc471da6 100644 --- a/weboob/backends/bp/pages/__init__.py +++ b/weboob/backends/bp/pages/__init__.py @@ -15,9 +15,9 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -from .login import LoginPage +from .login import LoginPage, LoggedPage from .cookie import CookiePage from .accountlist import AccountList from .accounthistory import AccountHistory -__all__ = ['LoginPage', 'CookiePage', "AccountList", 'AccountHistory'] +__all__ = ['LoginPage', 'LoggedPage', 'CookiePage', "AccountList", 'AccountHistory'] diff --git a/weboob/backends/bp/pages/login.py b/weboob/backends/bp/pages/login.py index 2a97e8d7..a0fa8f8a 100644 --- a/weboob/backends/bp/pages/login.py +++ b/weboob/backends/bp/pages/login.py @@ -19,8 +19,8 @@ import hashlib from weboob.tools.browser import BasePage -__all__ = ['LoginPage'] +__all__ = ['LoginPage', 'LoggedPage'] def md5(file): @@ -33,15 +33,15 @@ def md5(file): class LoginPage(BasePage): def on_loaded(self): pass - + def login(self, login, pwd): LOCAL_HASH = ['a02574d7bf67677d2a86b7bfc5e864fe', 'eb85e1cc45dd6bdb3cab65c002d7ac8a', '596e6fbd54d5b111fe5df8a4948e80a4', '9cdc989a4310554e7f5484d0d27a86ce', '0183943de6c0e331f3b9fc49c704ac6d', '291b9987225193ab1347301b241e2187', '163279f1a46082408613d12394e4042a', 'b0a9c740c4cada01eb691b4acda4daea', '3c4307ee92a1f3b571a3c542eafcb330', 'dbccecfa2206bfdb4ca891476404cc68'] process = lambda i: md5(self.browser.retrieve(("https://voscomptesenligne.labanquepostale.fr/wsost/OstBrokerWeb/loginform?imgid=%d&0.25122230781963073" % i ))[0]) Keypad = [ process(i) for i in range(10)] - - - + + + correspondance = [ Keypad.index(i) for i in LOCAL_HASH] Newpassword = "".join([str(correspondance[int(c)]) for c in pwd]) @@ -50,3 +50,6 @@ class LoginPage(BasePage): self.browser["password"] = Newpassword self.browser["username"] = login self.browser.submit() + +class LoggedPage(BasePage): + pass