dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

masking passwords in toolbar, thanks Bruno

Browse Source
This commit is contained in:
mdipierro
2012-09-13 06:55:58 -05:00
parent 54e67932a0
commit 0d2414d7ec
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.0.8 (2012-09-12 22:53:52) stable Version 2.0.8 (2012-09-13 06:55:52) stable
gluon/globals.py
+8 -5
View File
@@ -51,6 +51,7 @@ except ImportError:
have_minify = False have_minify = False
regex_session_id = re.compile('^([\w\-]+/)?[\w\-\.]+$') regex_session_id = re.compile('^([\w\-]+/)?[\w\-\.]+$')
regex_nopasswd = re.compile('(?<=\:)([^:@/]+)(?=@.+)')
__all__ = ['Request', 'Response', 'Session'] __all__ = ['Request', 'Response', 'Session']
@@ -410,11 +411,13 @@ class Response(Storage):
dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \ dbstats = [TABLE(*[TR(PRE(row[0]),'%.2fms' % (row[1]*1000)) \
for row in i.db._timings]) \ for row in i.db._timings]) \
for i in thread.instances] for i in thread.instances]
dbtables = dict([(i.uri, {'defined': sorted(list(set(i.db.tables) - dbtables = dict([(regex_nopasswd.sub('******',i.uri),
set(i.db._LAZY_TABLES.keys()))) or {'defined':
'[no defined tables]', sorted(list(set(i.db.tables) -
'lazy': sorted(i.db._LAZY_TABLES.keys()) or set(i.db._LAZY_TABLES.keys()))) or
'[no lazy tables]'}) '[no defined tables]',
'lazy': sorted(i.db._LAZY_TABLES.keys()) or
'[no lazy tables]'})
for i in thread.instances]) for i in thread.instances])
else: else:
dbstats = [] # if no db or on GAE dbstats = [] # if no db or on GAE