Skip to content

Z
Zope
Commit e080dab9 authored by Hanno Schlichting's avatar Hanno Schlichting
Browse files
Options

flake8 Zope2/utilities.

parent 4903e67c
Hide whitespace changes
Inline Side-by-side
Showing with 307 additions and 198 deletions
src/Zope2/Startup/run.py
View file @ e080dab9
......@@ -12,6 +12,7 @@
#
##############################################################################
def run():
""" Start a Zope instance """
import Zope2.Startup
......@@ -25,6 +26,7 @@ def run():
raise
starter.run()
def configure(configfile):
""" Provide an API which allows scripts like zopectl to configure
Zope before attempting to do 'app = Zope2.app(). Should be used as
......@@ -38,6 +40,7 @@ def configure(configfile):
starter.dropPrivileges()
return starter
def _setconfig(configfile=None):
""" Configure a Zope instance based on ZopeOptions. Optionally
accept a configfile argument (string path) in order to specify
......@@ -56,6 +59,7 @@ def _setconfig(configfile=None):
App.config.setConfiguration(opts.configroot)
return opts
def make_wsgi_app(global_config, zope_conf):
from App.config import setConfiguration
from Zope2.Startup import get_starter
......@@ -72,6 +76,6 @@ def make_wsgi_app(global_config, zope_conf):
starter.prepare()
return publish_module
if __name__ == '__main__':
run()
src/Zope2/utilities/adduser.py
View file @ e080dab9
......@@ -28,18 +28,18 @@ def main(argv=sys.argv):
try:
user, pwd = argv[1], argv[2]
except IndexError:
print "%s <username> <password>" % argv[0]
print("%s <username> <password>" % argv[0])
sys.exit(255)
finder = ZopeFinder(argv)
finder.filter_warnings()
app = finder.get_app()
result = adduser(app, user, pwd)
if result:
print "User %s created." % user
print("User %s created." % user)
else:
print "Got no result back. User creation may have failed."
print "Maybe the user already exists and nothing is done then."
print "Or the implementation does not give info when it succeeds."
print("Got no result back. User creation may have failed.")
print("Maybe the user already exists and nothing is done then.")
print("Or the implementation does not give info when it succeeds.")
if __name__ == '__main__':
main()
src/Zope2/utilities/copyzopeskel.py
View file @ e080dab9
......@@ -65,18 +65,21 @@ import shutil
import sys
import getopt
CVS_DIRS = [os.path.normcase("CVS"), os.path.normcase(".svn")]
def main():
try:
opts, args = getopt.getopt(sys.argv[1:],
opts, args = getopt.getopt(
sys.argv[1:],
"hs:t:u:g:r:",
["help", "sourcedir=", "targetdir=", "uid=", "gid=",
"replace="]
)
except getopt.GetoptError, msg:
)
except getopt.GetoptError as msg:
usage(sys.stderr, msg)
sys.exit(2)
script = os.path.abspath(sys.argv[0])
sourcedir = None
targetdir = None
uid = None
......@@ -120,7 +123,7 @@ def main():
sys.exit(2)
except (ImportError, AttributeError):
usage(sys.stderr,
"Your system does not support the gid or uid options")
"Your system does not support the gid or uid options")
sys.exit(2)
if opt in ("-g", "--gid"):
if not arg:
......@@ -143,7 +146,7 @@ def main():
sys.exit(2)
except (ImportError, AttributeError):
usage(sys.stderr,
"Your system does not support the gid or uid options")
"Your system does not support the gid or uid options")
sys.exit(2)
if opt in ("-r", "--replace"):
......@@ -162,6 +165,7 @@ def main():
copyskel(sourcedir, targetdir, uid, gid, **replacements)
def copyskel(sourcedir, targetdir, uid, gid, **replacements):
""" This is an independent function because we'd like to
import and call it from mkzopeinstance """
......@@ -180,7 +184,7 @@ def copyskel(sourcedir, targetdir, uid, gid, **replacements):
(targetdir, replacements, uid, gid))
finally:
os.chdir(pwd)
except (IOError, OSError), msg:
except (IOError, OSError) as msg:
print >>sys.stderr, msg
sys.exit(1)
......@@ -191,9 +195,8 @@ def copyskel(sourcedir, targetdir, uid, gid, **replacements):
os.chmod(fullname, 0700)
CVS_DIRS = [os.path.normcase("CVS"), os.path.normcase(".svn")]
def copydir((targetdir, replacements, uid, gid), sourcedir, names):
def copydir(args, sourcedir, names):
targetdir, replacements, uid, gid = args
# Don't recurse into CVS directories:
for name in names[:]:
if os.path.normcase(name) in CVS_DIRS:
......@@ -227,6 +230,7 @@ def copydir((targetdir, replacements, uid, gid), sourcedir, names):
if uid is not None:
os.chown(dn, uid, gid)
def copyin(src, dst, replacements, uid, gid):
ifp = open(src)
text = ifp.read()
......@@ -240,12 +244,13 @@ def copyin(src, dst, replacements, uid, gid):
if uid is not None:
os.chown(dst, uid, gid)
def usage(stream, msg=None):
if msg:
print >>stream, msg
print >>stream
stream.write(msg)
stream.write('\n')
program = os.path.basename(sys.argv[0])
print >>stream, __doc__ % {"program": program}
stream.write(__doc__ % {"program": program})
if __name__ == '__main__':
main()
src/Zope2/utilities/finder.py
View file @ e080dab9
......@@ -14,7 +14,7 @@
import os
class ZopeFinder:
class ZopeFinder(object):
def __init__(self, argv):
self.cmd = argv[0]
......
src/Zope2/utilities/mkzopeinstance.py
View file @ e080dab9
......@@ -31,13 +31,18 @@ import os
import sys
import copyzopeskel
if sys.version_info > (3, 0):
raw_input = input
def main():
try:
opts, args = getopt.getopt(sys.argv[1:],
opts, args = getopt.getopt(
sys.argv[1:],
"hu:d:s:p:",
["help", "user=", "dir=", "skelsrc=", "python="]
)
except getopt.GetoptError, msg:
)
except getopt.GetoptError as msg:
usage(sys.stderr, msg)
sys.exit(2)
......@@ -74,7 +79,7 @@ def main():
if not arg:
usage(sys.stderr, "user must not be empty")
sys.exit(2)
if not ":" in arg:
if ":" not in arg:
usage(sys.stderr, "user must be specified as name:password")
sys.exit(2)
user, password = arg.split(":", 1)
......@@ -85,10 +90,9 @@ def main():
# to skeltarget.
skeltarget = instancehome = os.path.abspath(
os.path.expanduser(get_skeltarget())
)
)
instancehome = skeltarget
configfile = os.path.join(instancehome, 'etc', 'zope.conf')
if skelsrc is None:
# default to using stock Zope skeleton source
skelsrc = os.path.join(os.path.dirname(__file__), "skel")
......@@ -105,14 +109,14 @@ def main():
# need be used.
if python is None:
python = sys.executable
psplit = os.path.split(python)
exedir = os.path.join(*psplit[:-1])
pythonexe = os.path.join(exedir, 'python.exe')
pythonwexe = os.path.join(exedir, 'pythonw.exe')
if ( os.path.isfile(pythonwexe) and os.path.isfile(pythonexe) and
(python in [pythonwexe, pythonexe]) ):
if (os.path.isfile(pythonwexe) and os.path.isfile(pythonexe) and
(python in [pythonwexe, pythonexe])):
# we're using a Windows build with both python.exe and pythonw.exe
# in the same directory
PYTHON = pythonexe
......@@ -124,17 +128,18 @@ def main():
zope2path = get_zope2path(PYTHON)
kw = {
"PYTHON":PYTHON,
"PYTHONW":PYTHONW,
"PYTHON": PYTHON,
"PYTHONW": PYTHONW,
"INSTANCE_HOME": instancehome,
"ZOPE_SCRIPTS": script_path,
"ZOPE2PATH": zope2path,
}
}
copyzopeskel.copyskel(skelsrc, skeltarget, None, None, **kw)
if user and password:
write_inituser(inituser, user, password)
def usage(stream, msg=None):
if msg:
print >>stream, msg
......@@ -142,25 +147,27 @@ def usage(stream, msg=None):
program = os.path.basename(sys.argv[0])
print >>stream, __doc__ % {"program": program}
def get_skeltarget():
print 'Please choose a directory in which you\'d like to install'
print 'Zope "instance home" files such as database files, configuration'
print 'files, etc.'
print('Please choose a directory in which you\'d like to install')
print('Zope "instance home" files such as database files, configuration')
print('files, etc.')
print
while 1:
skeltarget = raw_input("Directory: ").strip()
if skeltarget == '':
print 'You must specify a directory'
print('You must specify a directory')
continue
else:
break
return skeltarget
def get_inituser():
import getpass
print 'Please choose a username and password for the initial user.'
print 'These will be the credentials you use to initially manage'
print 'your new Zope instance.'
print('Please choose a username and password for the initial user.')
print('These will be the credentials you use to initially manage')
print('your new Zope instance.')
print
user = raw_input("Username: ").strip()
if user == '':
......@@ -172,9 +179,10 @@ def get_inituser():
break
else:
passwd = verify = ''
print "Password mismatch, please try again..."
print("Password mismatch, please try again...")
return user, passwd
def write_inituser(fn, user, password):
import binascii
try:
......@@ -185,7 +193,8 @@ def write_inituser(fn, user, password):
pw = binascii.b2a_base64(sha(password).digest())[:-1]
fp.write('%s:{SHA}%s\n' % (user, pw))
fp.close()
os.chmod(fn, 0644)
os.chmod(fn, 0o644)
def check_buildout(script_path):
""" Are we running from within a buildout which supplies 'zopepy'?
......@@ -197,6 +206,7 @@ def check_buildout(script_path):
parser.read(buildout_cfg)
return 'zopepy' in parser.sections()
def get_zope2path(python):
""" Get Zope2 path from selected Python interpreter.
"""
......
src/Zope2/utilities/requestprofiler.py
View file @ e080dab9
......@@ -13,14 +13,23 @@
"""Request log profiler script
"""
import sys, time, getopt, math, cPickle
import cPickle
import getopt
import math
import sys
import time
from types import StringType
try: import gzip
except: pass
try:
import gzip
except ImportError:
pass
class ProfileException(Exception): pass
class Request:
class ProfileException(Exception):
pass
class Request(object):
def __init__(self):
self.url = None
self.start = None
......@@ -98,10 +107,14 @@ class Request:
def total(self):
stage = self.endstage()
if stage == "B": return 0
if stage == "I": return self.t_recdinput - self.start
if stage == "A": return self.t_recdoutput - self.start
if stage == "E": return self.elapsed
if stage == "B":
return 0
if stage == "I":
return self.t_recdinput - self.start
if stage == "A":
return self.t_recdoutput - self.start
if stage == "E":
return self.elapsed
def prettyisize(self):
if self.isize is not None:
......@@ -126,7 +139,7 @@ class Request:
self.prettystart(), self.win(), self.wout(), self.wend(),
self.total(), self.endstage(), self.prettyosize(),
self.prettyhttpcode(), self.active, self.url
)
)
return self.fmt % body
fmt = "%19s %4s %4s %4s %3s %1s %7s %4s %4s %s"
......@@ -136,14 +149,18 @@ class Request:
'Code', 'Act', 'URL')
return self.fmt % body
class StartupRequest(Request):
def endstage(self):
return "U"
def total(self):
return 0
class Cumulative:
def __init__(self, url):
self.url = url
self.times = []
......@@ -152,11 +169,12 @@ class Cumulative:
def put(self, request):
elapsed = request.elapsed
if elapsed == "I": self.hangs = self.hangs + 1
if elapsed == "I":
self.hangs = self.hangs + 1
self.times.append(elapsed)
def all(self):
if self.allelapsed == None:
if self.allelapsed is None:
self.allelapsed = []
for elapsed in self.times:
self.allelapsed.append(elapsed)
......@@ -167,7 +185,7 @@ class Cumulative:
body = (
self.hangs, self.hits(), self.total(), self.max(), self.min(),
self.median(), self.mean(), self.url
)
)
return self.fmt % body
def getheader(self):
......@@ -191,8 +209,9 @@ class Cumulative:
return "I"
else:
t = self.total()
if t == "I": return "I"
return t/l
if t == "I":
return "I"
return t / l
def median(self):
all = self.all()
......@@ -203,25 +222,28 @@ class Cumulative:
if l == 1:
return all[0]
elif l % 2 != 0:
i = l/2 + 1
i = l / 2 + 1
return all[i]
else:
i = l/2 - 1
i = l / 2 - 1
i2 = i + 1
v1 = all[i]
v2 = all[i2]
if isinstance(v1, StringType) or isinstance(v2, StringType):
return "I"
else: return (v1 + v2) / 2
else:
return (v1 + v2) / 2
def total(self):
t = 0
all = self.all()
for elapsed in all:
if elapsed == "I": continue
if elapsed == "I":
continue
t = t + elapsed
return t
def parsebigmlogline(line):
tup = line.split(None, 3)
if len(tup) == 3:
......@@ -232,6 +254,7 @@ def parsebigmlogline(line):
else:
return None
def get_earliest_file_data(files):
temp = {}
earliest_fromepoch = 0
......@@ -245,7 +268,7 @@ def get_earliest_file_data(files):
line = line.strip()
tup = parsebigmlogline(line)
if tup is None:
print "Could not interpret line: %s" % line
print("Could not interpret line: %s" % line)
continue
code, id, timestr, desc = tup
timestr = timestr.strip()
......@@ -262,6 +285,7 @@ def get_earliest_file_data(files):
return retn
def get_requests(files, start=None, end=None, statsfname=None,
writestats=None, readstats=None):
finished = []
......@@ -279,8 +303,10 @@ def get_requests(files, start=None, end=None, statsfname=None,
if tup is None:
break
code, id, fromepoch, desc = tup
if start is not None and fromepoch < start: continue
if end is not None and fromepoch > end: break
if start is not None and fromepoch < start:
continue
if end is not None and fromepoch > end:
break
if code == 'U':
finished.extend(unfinished.values())
unfinished.clear()
......@@ -291,7 +317,8 @@ def get_requests(files, start=None, end=None, statsfname=None,
continue
request = unfinished.get(id)
if request is None:
if code != "B": continue # garbage at beginning of file
if code != "B":
continue # garbage at beginning of file
request = Request()
for pending_req in unfinished.values():
pending_req.active = pending_req.active + 1
......@@ -300,7 +327,7 @@ def get_requests(files, start=None, end=None, statsfname=None,
try:
request.put(code, t, desc)
except:
print "Unable to handle entry: %s %s %s"%(code, t, desc)
print("Unable to handle entry: %s %s %s" % (code, t, desc))
if request.isfinished():
del unfinished[id]
finished.append(request)
......@@ -318,6 +345,7 @@ def get_requests(files, start=None, end=None, statsfname=None,
return requests
def analyze(requests, top, sortf, start=None, end=None, mode='cumulative',
resolution=60, urlfocusurl=None, urlfocustime=60):
......@@ -334,17 +362,17 @@ def analyze(requests, top, sortf, start=None, end=None, mode='cumulative',
requests.sort(sortf)
write(requests, top)
elif mode=='timed':
elif mode == 'timed':
computed_start = requests[0].start
computed_end = requests[-1].t_end
if start and end:
timewrite(requests,start,end,resolution)
timewrite(requests, start, end, resolution)
if start and not end:
timewrite(requests,start,computed_end,resolution)
timewrite(requests, start, computed_end, resolution)
if end and not start:
timewrite(requests,computed_start,end,resolution)
timewrite(requests, computed_start, end, resolution)
if not end and not start:
timewrite(requests,computed_start,computed_end,resolution)
timewrite(requests, computed_start, computed_end, resolution)
elif mode == 'urlfocus':
requests.sort(sortf)
......@@ -354,11 +382,13 @@ def analyze(requests, top, sortf, start=None, end=None, mode='cumulative',
requests.sort(sortf)
write(requests, top)
def urlfocuswrite(requests, url, t):
l = []
i = 0
for request in requests:
if request.url == url: l.append(i)
if request.url == url:
l.append(i)
i = i + 1
before = {}
after = {}
......@@ -369,18 +399,20 @@ def urlfocuswrite(requests, url, t):
start = r.start
earliest = start - t
latest = start + t
print 'URLs invoked %s seconds before and after %s (#%s, %s)' % \
(t, url, x, r.shortprettystart())
print '---'
print('URLs invoked %s seconds before and after %s (#%s, %s)' %
(t, url, x, r.shortprettystart()))
print('---')
i = -1
for request in requests:
i = i + 1
if request.start < earliest: continue
if request.start > latest: break
if n == i: # current request
print '%3d' % (request.start - start),
print '%s' % (request.shortprettystart()),
print request.url
if request.start < earliest:
continue
if request.start > latest:
break
if n == i: # current request
print('%3d\n' % (request.start - start))
print('%s\n' % (request.shortprettystart()))
print(request.url)
continue
if request.start <= start:
if before.get(i):
......@@ -392,48 +424,55 @@ def urlfocuswrite(requests, url, t):
after[i] = after[i] + 1
else:
after[i] = 1
print '%3d' % (request.start - start),
print '%s' % (request.shortprettystart()),
print request.url
print('%3d\n' % (request.start - start))
print('%s\n' % (request.shortprettystart()))
print(request.url)
print
print ('Summary of URLs invoked before (and at the same time as) %s '
'(times, url)' % url)
print('Summary of URLs invoked before (and at the same time as) %s '
'(times, url)' % url)
before = before.items()
before.sort()
for k,v in before:
print v, requests[k].url
for k, v in before:
print(v)
print(requests[k].url)
print
print 'Summary of URLs invoked after %s (times, url)' % url
print('Summary of URLs invoked after %s (times, url)' % url)
after = after.items()
after.sort()
for k,v in after:
print v, requests[k].url
for k, v in after:
print(v)
print(requests[k].url)
def write(requests, top=0):
if len(requests) == 0:
print "No data.\n"
print("No data.\n")
return
i = 0
header = requests[0].getheader()
print header
print(header)
for stat in requests:
i = i + 1
if verbose:
print str(stat)
print(str(stat))
else:
print str(stat)[:78]
print(str(stat)[:78])
if i == top:
break
def getdate(val):
try:
val = val.strip()
year, month, day = int(val[:4]), int(val[5:7]), int(val[8:10])
hour,minute,second=int(val[11:13]),int(val[14:16]),int(val[17:19])
year, month, day = (
int(val[:4]), int(val[5:7]), int(val[8:10]))
hour, minute, second = (
int(val[11:13]), int(val[14:16]), int(val[17:19]))
t = time.mktime((year, month, day, hour, minute, second, 0, 0, -1))
return t
except:
raise ProfileException, "bad date %s" % val
except Exception:
raise ProfileException("bad date %s" % val)
def getTimeslice(period, utime):
low = int(math.floor(utime)) - period + 1
......@@ -442,22 +481,25 @@ def getTimeslice(period, utime):
if x % period == 0:
return x
def timewrite(requests, start, end, resolution):
print "Start: %s End: %s Resolution: %d secs" % \
(tick2str(start), tick2str(end), resolution)
print "-" * 78
print("Start: %s End: %s Resolution: %d secs" %
(tick2str(start), tick2str(end), resolution))
print("-" * 78)
print
print "Date/Time #requests requests/second"
print("Date/Time #requests requests/second")
d = {}
max = 0
min = None
for r in requests:
t = r.start
slice = getTimeslice(resolution,t)
if slice > max: max = slice
if (min is None) or (slice < min): min = slice
if d.has_key(slice):
slice = getTimeslice(resolution, t)
if slice > max:
max = slice
if (min is None) or (slice < min):
min = slice
if slice in d:
d[slice] = d[slice] + 1
else:
d[slice] = 1
......@@ -468,7 +510,8 @@ def timewrite(requests, start, end, resolution):
max_requests = 0
for slice in range(min, max, resolution):
num = d.get(slice, 0)
if num>max_requests: max_requests = num
if num > max_requests:
max_requests = num
hits = hits + num
if avg_requests is None:
......@@ -477,19 +520,21 @@ def timewrite(requests, start, end, resolution):
avg_requests = (avg_requests + num) / 2
s = tick2str(slice)
s = s + " %6d %4.2lf" % (num,num*1.0/resolution)
print s
s = s + " %6d %4.2lf" % (num, num * 1.0 / resolution)
print(s)
print('=' * 78)
print(" Peak: %6d %4.2lf" %
(max_requests, max_requests * 1.0 / resolution))
print(" Avg: %6d %4.2lf" %
(avg_requests, avg_requests * 1.0 / resolution))
print("Total: %6d n/a " % (hits))
print '='*78
print " Peak: %6d %4.2lf" % \
(max_requests,max_requests*1.0/resolution)
print " Avg: %6d %4.2lf" % \
(avg_requests,avg_requests*1.0/resolution)
print "Total: %6d n/a " % (hits)
def tick2str(t):
return time.strftime('%Y-%m-%dT%H:%M:%S', time.localtime(t))
def codesort(v1, v2):
v1 = v1.endstage()
v2 = v2.endstage()
......@@ -497,17 +542,22 @@ def codesort(v1, v2):
return 0
if v1 == "B":
return -1 # v1 is smaller than v2
return -1 # v1 is smaller than v2
if v1 == "I":
if v2 == "B": return 1 # v1 is larger than v2
else: return -1
if v2 == "B":
return 1 # v1 is larger than v2
else:
return -1
if v1 == "A":
if v2 in ['B', 'I']: return 1
else: return -1
if v2 in ['B', 'I']:
return 1
else:
return -1
if v1 == "E":
return 1
class Sort:
class Sort(object):
def __init__(self, fname, ascending=0):
self.fname = fname
self.ascending = ascending
......@@ -515,16 +565,23 @@ class Sort:
def __call__(self, i1, i2):
f1 = getattr(i1, self.fname)
f2 = getattr(i2, self.fname)
if callable(f1): f1 = f1()
if callable(f2): f2 = f2()
if callable(f1):
f1 = f1()
if callable(f2):
f2 = f2()
if f1 < f2:
if self.ascending: return -1
else: return 1
if self.ascending:
return -1
else:
return 1
elif f1 == f2:
return 0
else:
if self.ascending: return 1
else: return -1
if self.ascending:
return 1
else:
return -1
def detailedusage():
details = usage(0)
......@@ -596,7 +653,8 @@ If the 'verbose' argument is specified, do not trim url to fit into 80 cols.
If the 'today' argument is specified, limit results to hits received today.
If the 'daysago' argument is specified, limit results to hits received n days ago.
If the 'daysago' argument is specified, limit results to hits received n days
ago.
The 'resolution' argument is used only for timed reports and specifies the
number of seconds between consecutive lines in the report
......@@ -639,7 +697,8 @@ Examples:
%(pname)s debug.log --cumulative --sort=mean --daysago=3 --verbose
Show cumulative report statistics sorted by mean for entries in the log
which happened three days ago, and do not trim the URL in the resulting report.
which happened three days ago, and do not trim the URL in the resulting
report.
%(pname)s debug.log --urlfocus='/manage_main' --urlfocustime=60
......@@ -673,9 +732,10 @@ Examples:
%(pname)s --readstats='requests.stat' --detailed
Read from 'requests.stat' stats file (instead of actual -M log files)
and show detailed report against this data.""" % {'pname':pname}
and show detailed report against this data.""" % {'pname': pname}
return details
def usage(basic=1):
usage = (
"""
......@@ -691,8 +751,8 @@ Usage: %s filename1 [filename2 ...]
[--help]
Provides a profile of one or more Zope "-M" request log files.
""" % sys.argv[0]
)
""" % sys.argv[0])
if basic == 1:
usage = usage + """
If the --help argument is given, detailed usage docs are provided."""
......@@ -703,7 +763,9 @@ def main():
if len(sys.argv) == 1:
print usage()
sys.exit(0)
if sys.argv[1] == '--help': print detailedusage(); sys.exit(0)
if sys.argv[1] == '--help':
print(detailedusage())
sys.exit(0)
mode = 'cumulative'
sortby = None
trim = 0
......@@ -711,9 +773,9 @@ def main():
verbose = 0
start = None
end = None
resolution=60
urlfocustime=10
urlfocusurl=None
resolution = 60
urlfocustime = 10
urlfocusurl = None
statsfname = None
readstats = 0
writestats = 0
......@@ -722,8 +784,8 @@ def main():
i = 1
for arg in sys.argv[1:]:
if arg[:2] != '--':
if arg[-3:] == '.gz' and globals().has_key('gzip'):
files.append(gzip.GzipFile(arg,'r'))
if arg[-3:] == '.gz' and 'gzip' in globals():
files.append(gzip.GzipFile(arg, 'r'))
else:
files.append(open(arg))
sys.argv.remove(arg)
......@@ -731,60 +793,69 @@ def main():
try:
opts, extra = getopt.getopt(
sys.argv[1:], '', ['sort=', 'top=', 'help', 'verbose', 'today',
'cumulative', 'detailed', 'timed','start=',
'end=','resolution=', 'writestats=','daysago=',
'readstats=','urlfocus=','urlfocustime=']
)
sys.argv[1:], '', [
'sort=', 'top=', 'help', 'verbose', 'today',
'cumulative', 'detailed', 'timed', 'start=',
'end=', 'resolution=', 'writestats=', 'daysago=',
'readstats=', 'urlfocus=', 'urlfocustime=']
)
for opt, val in opts:
if opt=='--readstats':
if opt == '--readstats':
statsfname = val
readstats = 1
elif opt=='--writestats':
elif opt == '--writestats':
statsfname = val
writestats = 1
if opt=='--sort': sortby = val
if opt=='--top': top=int(val)
if opt=='--help': print detailedusage(); sys.exit(0)
if opt=='--verbose':
if opt == '--sort':
sortby = val
if opt == '--top':
top = int(val)
if opt == '--help':
print(detailedusage())
sys.exit(0)
if opt == '--verbose':
verbose = 1
if opt=='--resolution':
resolution=int(val)
if opt=='--today':
if opt == '--resolution':
resolution = int(val)
if opt == '--today':
now = time.localtime(time.time())
# for testing - now = (2001, 04, 19, 0, 0, 0, 0, 0, -1)
start = list(now)
start[3] = start[4] = start[5] = 0
start = time.mktime(start)
end = list(now)
end[3] = 23; end[4] = 59; end[5] = 59
end[3] = 23
end[4] = 59
end[5] = 59
end = time.mktime(end)
if opt=='--daysago':
now = time.localtime(time.time() - int(val)*3600*24 )
if opt == '--daysago':
now = time.localtime(time.time() - int(val) * 3600 * 24)
# for testing - now = (2001, 04, 19, 0, 0, 0, 0, 0, -1)
start = list(now)
start[3] = start[4] = start[5] = 0
start = time.mktime(start)
end = list(now)
end[3] = 23; end[4] = 59; end[5] = 59
end[3] = 23
end[4] = 59
end[5] = 59
end = time.mktime(end)
if opt=='--start':
if opt == '--start':
start = getdate(val)
if opt=='--end':
if opt == '--end':
end = getdate(val)
if opt=='--detailed':
mode='detailed'
if opt == '--detailed':
mode = 'detailed'
d_sortby = sortby
if opt=='--cumulative':
mode='cumulative'
if opt=='--timed':
mode='timed'
if opt=='--urlfocus':
mode='urlfocus'
if opt == '--cumulative':
mode = 'cumulative'
if opt == '--timed':
mode = 'timed'
if opt == '--urlfocus':
mode = 'urlfocus'
urlfocusurl = val
if opt=='--urlfocustime':
urlfocustime=int(val)
if opt == '--urlfocustime':
urlfocustime = int(val)
validcumsorts = ['url', 'hits', 'hangs', 'max', 'min', 'median',
'mean', 'total']
......@@ -793,14 +864,16 @@ def main():
'active', 'url']
if mode == 'cumulative':
if sortby is None: sortby = 'total'
if sortby is None:
sortby = 'total'
assert sortby in validcumsorts, (sortby, mode, validcumsorts)
if sortby in ['url']:
sortf = Sort(sortby, ascending=1)
else:
sortf = Sort(sortby)
elif mode == 'detailed':
if sortby is None: sortby = 'start'
if sortby is None:
sortby = 'start'
assert sortby in validdetsorts, (sortby, mode, validdetsorts)
if sortby in ['start', 'url', 'httpcode']:
sortf = Sort(sortby, ascending=1)
......@@ -808,14 +881,15 @@ def main():
sortf = codesort
else:
sortf = Sort(sortby)
elif mode=='timed':
elif mode == 'timed':
sortf = None
elif mode=='urlfocus':
elif mode == 'urlfocus':
sortf = Sort('start', ascending=1)
else:
raise ValueError('Invalid mode')
req=get_requests(files, start, end, statsfname, writestats, readstats)
req = get_requests(
files, start, end, statsfname, writestats, readstats)
analyze(req, top, sortf, start, end, mode, resolution, urlfocusurl,
urlfocustime)
......
src/Zope2/utilities/zpasswd.py
View file @ e080dab9
......@@ -37,13 +37,22 @@ for all necessary information. The available options are:
Filename is required and should be the name of the file to store the
information in (usually "inituser" or "access").
"""
import sys, sha, binascii, random, getopt, getpass, os
import binascii
import getopt
import getpass
import os
import random
import sha
import sys
try:
from crypt import crypt
except ImportError:
crypt = None
if sys.version_info > (3, 0):
raw_input = input
PROGRAM = sys.argv[0]
COMMASPACE = ', '
......@@ -53,10 +62,11 @@ def generate_salt():
salt_choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789./")
return random.choice(salt_choices)+random.choice(salt_choices)
return random.choice(salt_choices) + random.choice(salt_choices)
def generate_passwd(password, encoding):
encoding=encoding.upper()
encoding = encoding.upper()
if encoding == 'SHA':
pw = '{SHA}' + binascii.b2a_base64(sha.new(password).digest())[:-1]
elif encoding == 'CRYPT':
......@@ -68,26 +78,28 @@ def generate_passwd(password, encoding):
return pw
def write_generated_password(home, ac_path, username):
pw_choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789!")
acfile=open(ac_path, 'w')
acfile = open(ac_path, 'w')
pw = ''
for i in range(8):
pw = pw + random.choice(pw_choices)
acfile.write('%s:%s\n' % (username, generate_passwd(pw, 'SHA')))
acfile.close()
os.chmod(ac_path, 0644)
os.chmod(ac_path, 0o644)
return pw
def write_access(home, user='', group=''):
ac_path=os.path.join(home, 'access')
ac_path = os.path.join(home, 'access')
if not os.path.exists(ac_path):
print '-'*78
print 'creating default access file'
print('-' * 78)
print('creating default access file')
pw = write_generated_password(home, ac_path, 'emergency')
print """Note:
print("""Note:
The emergency user name and password are 'emergency'
and '%s'.
......@@ -95,9 +107,11 @@ def write_access(home, user='', group=''):
zpasswd script. To find out more, type:
%s zpasswd.py
""" % (pw, sys.executable)
""" % (pw, sys.executable))
import do
do.ch(ac_path, user, group)
import do; do.ch(ac_path, user, group)
def get_password():
while 1:
......@@ -107,29 +121,31 @@ def get_password():
return password
else:
password = verify = ''
print "Password mismatch, please try again..."
print("Password mismatch, please try again...")
def write_inituser(home, user='', group=''):
ac_path=os.path.join(home, 'inituser')
ac_path = os.path.join(home, 'inituser')
if not os.path.exists(ac_path):
print '-'*78
print 'creating default inituser file'
print('-' * 78)
print('creating default inituser file')
pw = write_generated_password(home, ac_path, 'admin')
print """Note:
print("""Note:
The initial user name and password are 'admin'
and '%s'.
You can change the name and password through the web
interface or using the 'zpasswd.py' script.
""" % pw
""" % pw)
import do; do.ch(ac_path, user, group)
import do
do.ch(ac_path, user, group)
def usage(code, msg=''):
print >> sys.stderr, __doc__ % globals()
sys.stderr.write(__doc__ % globals())
if msg:
print >> sys.stderr, msg
sys.stderr.write(msg)
sys.exit(code)
......@@ -143,7 +159,7 @@ def main():
try:
opts, args = getopt.getopt(sys.argv[1:], shortopts, longopts)
except getopt.error, msg:
except getopt.error as msg:
usage(1, msg)
# Defaults
......@@ -183,15 +199,15 @@ def main():
break
password = get_password()
while 1:
print """
print("""
Please choose a format from:
SHA - SHA-1 hashed password (default)
CRYPT - UNIX-style crypt password
CLEARTEXT - no protection
"""
""")
encoding = raw_input("Encoding: ")
if encoding == '':
encoding = 'SHA'
......@@ -210,5 +226,5 @@ CLEARTEXT - no protection
# If called from the command line
if __name__=='__main__':
if __name__ == '__main__':
main()
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7