summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorGravatar GammaC0de <GammaC0de@users.noreply.github.com> 2015-12-26 14:52:41 +0100
committerGravatar GammaC0de <GammaC0de@users.noreply.github.com> 2015-12-26 14:52:41 +0100
commit348d41b6a157276ee3ddb500567126309da0df17 (patch)
tree68affe233c7fa6bb7087087f53daa428e7185439 /module
parent[UgouploadNet] update (diff)
parent[Account] reimplement safe_info with deepcopy (diff)
downloadpyload-348d41b6a157276ee3ddb500567126309da0df17.tar.xz
Merge pull request #2150 from GammaC0de/patch-11
[Plugin] censor ACCOUNT request data
Diffstat (limited to 'module')
-rw-r--r--module/plugins/internal/Account.py7
-rw-r--r--module/plugins/internal/Plugin.py4
2 files changed, 7 insertions, 4 deletions
diff --git a/module/plugins/internal/Account.py b/module/plugins/internal/Account.py
index 1c03f0b1c..fcfe7e0b7 100644
--- a/module/plugins/internal/Account.py
+++ b/module/plugins/internal/Account.py
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
+import copy
import random
import re
import threading
@@ -12,7 +13,7 @@ from module.plugins.internal.utils import compare_time, isiterable, lock, parse_
class Account(Plugin):
__name__ = "Account"
__type__ = "account"
- __version__ = "0.65"
+ __version__ = "0.66"
__status__ = "stable"
__description__ = """Base account plugin"""
@@ -237,7 +238,9 @@ class Account(Plugin):
self.syncback()
- self.log_debug("Account info for user `%s`: %s" % (self.user, self.info))
+ safe_info = copy.deepcopy(self.info)
+ safe_info['login']['password'] = "**********"
+ self.log_debug("Account info for user `%s`: %s" % (self.user, safe_info))
return self.info
diff --git a/module/plugins/internal/Plugin.py b/module/plugins/internal/Plugin.py
index 274cff301..e439dd912 100644
--- a/module/plugins/internal/Plugin.py
+++ b/module/plugins/internal/Plugin.py
@@ -20,7 +20,7 @@ from module.plugins.internal.utils import *
class Plugin(object):
__name__ = "Plugin"
__type__ = "plugin"
- __version__ = "0.59"
+ __version__ = "0.60"
__status__ = "stable"
__config__ = [] #: [("name", "type", "desc", "default")]
@@ -214,7 +214,7 @@ class Plugin(object):
"""
if self.pyload.debug:
self.log_debug("LOAD URL " + url,
- *["%s=%s" % (key, val) for key, val in locals().items() if key not in ("self", "url", "_[1]")])
+ *["%s=%s" % (key, "{********}" if self.__type__ == "account" and key in ("get", "post") else val) for key, val in locals().items() if key not in ("self", "url", "_[1]")])
url = fixurl(url, unquote=True) #: Recheck in 0.4.10