From e82141f755e296651ef333eaef6b9f10a0858eb6 Mon Sep 17 00:00:00 2001 From: Nitzo Date: Sun, 21 Feb 2016 23:48:32 +0200 Subject: [OneFichierCom] Update --- module/plugins/accounts/OneFichierCom.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) (limited to 'module') diff --git a/module/plugins/accounts/OneFichierCom.py b/module/plugins/accounts/OneFichierCom.py index 4b5bba9e2..b590374ac 100644 --- a/module/plugins/accounts/OneFichierCom.py +++ b/module/plugins/accounts/OneFichierCom.py @@ -6,6 +6,7 @@ import time import pycurl from module.plugins.internal.Account import Account +from module.network.HTTPRequest import BadHeader class OneFichierCom(Account): @@ -50,12 +51,20 @@ class OneFichierCom(Account): def signin(self, user, password, data): self.req.http.c.setopt(pycurl.REFERER, "https://1fichier.com/login.pl?lg=en") - html = self.load("https://1fichier.com/login.pl?lg=en", - post={'mail' : user, - 'pass' : password, - 'It' : "on", - 'purge' : "off", - 'valider': "Send"}) - - if '>Invalid email address' in html or '>Invalid password' in html: - self.fail_login() + try: + html = self.load("https://1fichier.com/login.pl?lg=en", + post={'mail' : user, + 'pass' : password, + 'It' : "on", + 'purge' : "off", + 'valider': "Send"}) + + if any(_x in html for _x in + ('>Invalid username or Password', '>Invalid email address', '>Invalid password')): + self.fail_login() + + except BadHeader, e: + if e.code == 403: + self.fail_login() + else: + raise -- cgit v1.2.3