From 0e1ef9bc01579328e17e79416fa3c1c7b77adcc8 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 06:08:01 +0200 Subject: Update everything --- module/plugins/accounts/ShareonlineBiz.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 4214b4401..b9509b466 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -2,13 +2,13 @@ import re -from module.plugins.Account import Account +from module.plugins.internal.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.33" + __version__ = "0.34" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 3af8bfcf685f82de097ef6b110dffa77fd529eaf Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 8 Jun 2015 10:01:24 +0200 Subject: [SimpleHoster] Improve logging and file checking --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index b9509b466..9269cf2a1 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -64,5 +64,5 @@ class ShareonlineBiz(Account): html = self.api_response(user, req) err = re.search(r'\*\*(.+?)\*\*', html) if err: - self.logError(err.group(1)) + self.logError(err.group(1).strip()) self.wrongPassword() -- cgit v1.2.3 From c1764e2fea0bb05164c83a876e8cd58b97f58f25 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 16 Jun 2015 17:31:38 +0200 Subject: Update all --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 9269cf2a1..5a3359496 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -16,7 +16,7 @@ class ShareonlineBiz(Account): def api_response(self, user, req): - return req.load("http://api.share-online.biz/cgi-bin", + return self.load("http://api.share-online.biz/cgi-bin", get={'q' : "userdetails", 'aux' : "traffic", 'username': user, -- cgit v1.2.3 From b1759bc440cd6013837697eb8de540914f693ffd Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Tue, 7 Jul 2015 01:23:55 +0200 Subject: No camelCase style anymore --- module/plugins/accounts/ShareonlineBiz.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 5a3359496..56c1d08f2 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.34" + __version__ = "0.35" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" @@ -20,10 +20,10 @@ class ShareonlineBiz(Account): get={'q' : "userdetails", 'aux' : "traffic", 'username': user, - 'password': self.getAccountData(user)['password']}) + 'password': self.get_account_data(user)['password']}) - def loadAccountInfo(self, user, req): + def load_account_info(self, user, req): premium = False validuntil = None trafficleft = -1 @@ -35,7 +35,7 @@ class ShareonlineBiz(Account): key, value = line.split("=") api[key] = value - self.logDebug(api) + self.log_debug(api) if api['a'].lower() != "not_available": req.cj.setCookie("share-online.biz", 'a', api['a']) @@ -64,5 +64,5 @@ class ShareonlineBiz(Account): html = self.api_response(user, req) err = re.search(r'\*\*(.+?)\*\*', html) if err: - self.logError(err.group(1).strip()) - self.wrongPassword() + self.log_error(err.group(1).strip()) + self.wrong_password() -- cgit v1.2.3 From d38e830b7c0b3c6561a0072c74bbccb5fcdf4a61 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 19 Jul 2015 14:43:42 +0200 Subject: New __status__ magic key --- module/plugins/accounts/ShareonlineBiz.py | 1 + 1 file changed, 1 insertion(+) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 56c1d08f2..172e59877 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -9,6 +9,7 @@ class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" __version__ = "0.35" + __status__ = "stable" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 94d017cd2a5c1f194960827a8c7e46afc3682008 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 24 Jul 2015 06:55:49 +0200 Subject: Hotfixes (2) --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 172e59877..180838d82 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -9,7 +9,7 @@ class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" __version__ = "0.35" - __status__ = "stable" + __status__ = "testing" __description__ = """Share-online.biz account plugin""" __license__ = "GPLv3" -- cgit v1.2.3 From 8f17f875f6e28f73ddb10da59c6464bd04922222 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 04:59:27 +0200 Subject: Account rewritten --- module/plugins/accounts/ShareonlineBiz.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 180838d82..85cdfecd9 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -21,10 +21,10 @@ class ShareonlineBiz(Account): get={'q' : "userdetails", 'aux' : "traffic", 'username': user, - 'password': self.get_account_data(user)['password']}) + 'password': self.get_data(user)['password']}) - def load_account_info(self, user, req): + def parse_info(self, user, password, data, req): premium = False validuntil = None trafficleft = -1 @@ -61,9 +61,9 @@ class ShareonlineBiz(Account): 'maxtraffic' : maxtraffic} - def login(self, user, data, req): + def login(self, user, password, data, req): html = self.api_response(user, req) err = re.search(r'\*\*(.+?)\*\*', html) if err: self.log_error(err.group(1).strip()) - self.wrong_password() + self.fail() -- cgit v1.2.3 From a95c217627a1cb651b24e69f20640df40797aff9 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sat, 25 Jul 2015 09:34:18 +0200 Subject: Account rewritten (2) --- module/plugins/accounts/ShareonlineBiz.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 85cdfecd9..31a1a24c6 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -16,12 +16,12 @@ class ShareonlineBiz(Account): __authors__ = [("Walter Purcaro", "vuolter@gmail.com")] - def api_response(self, user, req): + def api_response(self, user, password, req): return self.load("http://api.share-online.biz/cgi-bin", get={'q' : "userdetails", 'aux' : "traffic", 'username': user, - 'password': self.get_data(user)['password']}) + 'password': password}) def parse_info(self, user, password, data, req): @@ -31,7 +31,7 @@ class ShareonlineBiz(Account): maxtraffic = 100 * 1024 * 1024 * 1024 #: 100 GB api = {} - for line in self.api_response(user, req).splitlines(): + for line in self.api_response(user, password, req).splitlines(): if "=" in line: key, value = line.split("=") api[key] = value @@ -62,8 +62,8 @@ class ShareonlineBiz(Account): def login(self, user, password, data, req): - html = self.api_response(user, req) + html = self.api_response(user, password, req) err = re.search(r'\*\*(.+?)\*\*', html) if err: self.log_error(err.group(1).strip()) - self.fail() + self.login_fail() -- cgit v1.2.3 From e91d1b7b50c97fdbec0f99c071d3fd19b25e57bc Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Wed, 29 Jul 2015 12:23:29 +0200 Subject: [Plugin] Fix set_cookies --- module/plugins/accounts/ShareonlineBiz.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 31a1a24c6..1945b2743 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -18,10 +18,10 @@ class ShareonlineBiz(Account): def api_response(self, user, password, req): return self.load("http://api.share-online.biz/cgi-bin", - get={'q' : "userdetails", - 'aux' : "traffic", - 'username': user, - 'password': password}) + get={'q' : "userdetails", + 'aux' : "traffic", + 'username': user, + 'password': password}) def parse_info(self, user, password, data, req): -- cgit v1.2.3 From 1b890dd55ff49ca7d6282f6e92f2fb483fb07eea Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 31 Jul 2015 03:18:42 +0200 Subject: [ShareonlineBiz] Improve account --- module/plugins/accounts/ShareonlineBiz.py | 63 +++++++++++++++++-------------- 1 file changed, 35 insertions(+), 28 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 1945b2743..d7a3c8ed2 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.35" + __version__ = "0.36" __status__ = "testing" __description__ = """Share-online.biz account plugin""" @@ -17,40 +17,45 @@ class ShareonlineBiz(Account): def api_response(self, user, password, req): - return self.load("http://api.share-online.biz/cgi-bin", - get={'q' : "userdetails", - 'aux' : "traffic", - 'username': user, - 'password': password}) + res = self.load("http://api.share-online.biz/cgi-bin", + get={'q' : "userdetails", + 'aux' : "traffic", + 'username': user, + 'password': password}) - - def parse_info(self, user, password, data, req): - premium = False - validuntil = None - trafficleft = -1 - maxtraffic = 100 * 1024 * 1024 * 1024 #: 100 GB + self.log_debug(res) api = {} - for line in self.api_response(user, password, req).splitlines(): + for line in res.splitlines(): if "=" in line: key, value = line.split("=") api[key] = value - self.log_debug(api) + if not api['a']: + self.login_fail(_("Invalid username/password")) - if api['a'].lower() != "not_available": - req.cj.setCookie("share-online.biz", 'a', api['a']) + if api['a'].lower() == "not_available": + self.login_fail(_("No info available")) + + return api - premium = api['group'] in ("PrePaid", "Premium", "Penalty-Premium") - validuntil = float(api['expire_date']) + def parse_info(self, user, password, data, req): + premium = False + validuntil = None + trafficleft = -1 + maxtraffic = 100 * 1024 * 1024 * 1024 #: 100 GB + + api = self.api_response(user, password, req) - traffic = float(api['traffic_1d'].split(";")[0]) + premium = api['group'] in ("PrePaid", "Premium", "Penalty-Premium") + validuntil = float(api['expire_date']) + traffic = float(api['traffic_1d'].split(";")[0]) - if maxtraffic > traffic: - trafficleft = maxtraffic - traffic - else: - trafficleft = -1 + if maxtraffic > traffic: + trafficleft = maxtraffic - traffic + else: + trafficleft = -1 maxtraffic /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 trafficleft /= 1024 #@TODO: Remove `/ 1024` in 0.4.10 @@ -62,8 +67,10 @@ class ShareonlineBiz(Account): def login(self, user, password, data, req): - html = self.api_response(user, password, req) - err = re.search(r'\*\*(.+?)\*\*', html) - if err: - self.log_error(err.group(1).strip()) - self.login_fail() + api = self.api_response(user, password, req) + err = re.search(r'\*\*(.+?)\*\*', api) + + if not err: + req.cj.setCookie("share-online.biz", 'a', api['a']) + else: + self.login_fail(err.group(1)) -- cgit v1.2.3 From 3cfbbd72556af4fb26289ff0b3a38df8e5d5cd0f Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Fri, 31 Jul 2015 03:30:56 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1613 --- module/plugins/accounts/ShareonlineBiz.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index d7a3c8ed2..869005aae 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.36" + __version__ = "0.37" __status__ = "testing" __description__ = """Share-online.biz account plugin""" @@ -21,17 +21,14 @@ class ShareonlineBiz(Account): get={'q' : "userdetails", 'aux' : "traffic", 'username': user, - 'password': password}) + 'password': password}, + decode=False) self.log_debug(res) - api = {} - for line in res.splitlines(): - if "=" in line: - key, value = line.split("=") - api[key] = value + api = dict(line.split("=") for line in res.splitlines() if "=" in line) - if not api['a']: + if not 'a' in api: self.login_fail(_("Invalid username/password")) if api['a'].lower() == "not_available": -- cgit v1.2.3 From b2c14571441069b1ad5997f1f6723161e11f4f05 Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Sun, 2 Aug 2015 08:17:40 +0200 Subject: Fix https://github.com/pyload/pyload/issues/1643 --- module/plugins/accounts/ShareonlineBiz.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 869005aae..a1045bbe7 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -8,7 +8,7 @@ from module.plugins.internal.Account import Account class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.37" + __version__ = "0.38" __status__ = "testing" __description__ = """Share-online.biz account plugin""" @@ -29,7 +29,7 @@ class ShareonlineBiz(Account): api = dict(line.split("=") for line in res.splitlines() if "=" in line) if not 'a' in api: - self.login_fail(_("Invalid username/password")) + self.login_fail(res.strip('*').strip()) if api['a'].lower() == "not_available": self.login_fail(_("No info available")) @@ -65,9 +65,4 @@ class ShareonlineBiz(Account): def login(self, user, password, data, req): api = self.api_response(user, password, req) - err = re.search(r'\*\*(.+?)\*\*', api) - - if not err: - req.cj.setCookie("share-online.biz", 'a', api['a']) - else: - self.login_fail(err.group(1)) + req.cj.setCookie("share-online.biz", 'a', api['a']) -- cgit v1.2.3 From 28e9402033aa53f7a39a40e62cd332d2df6014ba Mon Sep 17 00:00:00 2001 From: J-8 Date: Sun, 2 Aug 2015 17:08:56 +0200 Subject: Fix for issue #1654 Replaced HTTP with HTTPS in order not to reveal user credentials. --- module/plugins/accounts/ShareonlineBiz.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index a1045bbe7..28b2b0c68 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -17,7 +17,7 @@ class ShareonlineBiz(Account): def api_response(self, user, password, req): - res = self.load("http://api.share-online.biz/cgi-bin", + res = self.load("https://api.share-online.biz/cgi-bin", get={'q' : "userdetails", 'aux' : "traffic", 'username': user, -- cgit v1.2.3 From e5ce0acf056dc96c40d5616ab6d2b82f998eefbe Mon Sep 17 00:00:00 2001 From: Walter Purcaro Date: Mon, 3 Aug 2015 00:37:57 +0200 Subject: Use set_cookie instead cj.setCookie --- module/plugins/accounts/ShareonlineBiz.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'module/plugins/accounts/ShareonlineBiz.py') diff --git a/module/plugins/accounts/ShareonlineBiz.py b/module/plugins/accounts/ShareonlineBiz.py index 28b2b0c68..87bbc4632 100644 --- a/module/plugins/accounts/ShareonlineBiz.py +++ b/module/plugins/accounts/ShareonlineBiz.py @@ -3,12 +3,13 @@ import re from module.plugins.internal.Account import Account +from module.plugins.internal.Plugin import set_cookie class ShareonlineBiz(Account): __name__ = "ShareonlineBiz" __type__ = "account" - __version__ = "0.38" + __version__ = "0.39" __status__ = "testing" __description__ = """Share-online.biz account plugin""" @@ -65,4 +66,4 @@ class ShareonlineBiz(Account): def login(self, user, password, data, req): api = self.api_response(user, password, req) - req.cj.setCookie("share-online.biz", 'a', api['a']) + set_cookie(req.cj, "share-online.biz", 'a', api['a']) -- cgit v1.2.3