[Zope-Checkins] CVS: Zope/lib/python/Controller - zpasswd.py:1.1.2.1 Main.py:1.1.2.8 ZctlLib.py:1.1.2.6
Chris McDonough
chrism@zope.com
Sat, 12 Oct 2002 16:28:36 -0400
Update of /cvs-repository/Zope/lib/python/Controller
In directory cvs.zope.org:/tmp/cvs-serv22640/lib/python/Controller
Modified Files:
Tag: chrism-install-branch
Main.py ZctlLib.py
Added Files:
Tag: chrism-install-branch
zpasswd.py
Log Message:
RPM install now creates an instance_home (in /var/opt/zope).
Changes to initial user stuff based on requirements for RPM install.
=== Added File Zope/lib/python/Controller/zpasswd.py ===
#!/usr/bin/env python
##############################################################################
#
# Copyright (c) 2001 Zope Corporation and Contributors. All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
#
##############################################################################
"""Zope user bootstrap system"""
__version__='$Revision$ '[11:-2]
import sys, sha, binascii, random, getopt, getpass, os
try:
from crypt import crypt
except ImportError:
crypt = None
def generate_salt():
"""Generate a salt value for the crypt function."""
salt_choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789./")
return random.choice(salt_choices)+random.choice(salt_choices)
def generate_passwd(password, encoding):
encoding=encoding.upper()
if encoding == 'SHA':
pw = '{SHA}' + binascii.b2a_base64(sha.new(password).digest())[:-1]
elif encoding == 'CRYPT':
pw = '{CRYPT}' + crypt(password, generate_salt())
elif encoding == 'CLEARTEXT':
pw = password
return pw
def write_generated_password(home, ac_path, username):
pw_choices = ("ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789!")
acfile=open(ac_path, 'w')
pw = ''
for i in range(8):
pw = pw + random.choice(pw_choices)
acfile.write('%s:%s' % (username, generate_passwd(pw, 'SHA')))
acfile.close()
os.system('chmod 644 %s' % ac_path)
return pw
def write_access(home, user='', group=''):
ac_path=os.path.join(home, 'access')
if not os.path.exists(ac_path):
print '-'*78
print 'creating default access file'
pw = write_generated_password(home, ac_path, 'emergency')
print """Note:
The emergency user name and password are 'emergency'
and '%s'.
You can change the emergency name and password with the
zpasswd script. To find out more, type:
%s zpasswd.py
""" % (pw, sys.executable)
import do; do.ch(ac_path, user, group)
def write_inituser(home, user='', group=''):
ac_path=os.path.join(home, 'inituser')
if not os.path.exists(ac_path):
print '-'*78
print 'creating default inituser file'
pw = write_generated_password(home, ac_path, 'admin')
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
import do; do.ch(ac_path, user, group)
def main(argv):
short_options = ':u:p:e:d:'
long_options = ['username=',
'password=',
'encoding=',
'domains=']
usage = """Usage: %s [options] filename
If this program is called without command-line options, it will prompt
for all necessary information. The available options are:
-u / --username=
Set the username to be used for the initial user or the emergency user
-p / --password=
Set the password
-e / --encoding=
Set the encryption/encoding rules. Defaults to SHA-1. OPTIONAL
-d / --domains=
Set the domain names that the user user can log in from. Defaults to
any. OPTIONAL.
Filename is required and should be the name of the file to store the
information in (usually "inituser" or "access").
Copyright (C) 1999, 2000 Digital Creations, Inc.
""" % argv[0]
try:
if len(argv) < 2:
raise "CommandLineError"
optlist, args = getopt.getopt(sys.argv[1:], short_options, long_options)
if len(args) != 1:
raise "CommandLineError"
access_file = open(args[0], 'w')
if len(optlist) > 0:
# Set the sane defaults
username = ''
encoding = 'SHA'
domains = ''
for opt in optlist:
if (opt[0] == '-u') or (opt[0] == '--username'):
username = opt[1]
elif (opt[0] == '-p') or (opt[0] == '--password'):
password = opt[1]
elif (opt[0] == '-e') or (opt[0] == '--encoding'):
encoding = opt[1]
elif (opt[0] == '-d') or (opt[0] == '--domains'):
domains = ":" + opt[1]
# Verify that we got what we need
if not username or not password:
raise "CommandLineError"
access_file.write(username + ':' +
generate_passwd(password, encoding) +
domains)
else:
# Run through the prompts
while 1:
username = raw_input("Username: ")
if username != '':
break
while 1:
password = getpass.getpass("Password: ")
verify = getpass.getpass("Verify password: ")
if verify == password:
break
else:
password = verify = ''
print "Password mismatch, please try again..."
while 1:
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'
break
if encoding.upper() in ['SHA', 'CRYPT', 'CLEARTEXT']:
break
domains = raw_input("Domain restrictions: ")
if domains: domains = ":" + domains
access_file.write(username + ":" +
generate_passwd(password, encoding) +
domains)
except "CommandLineError":
sys.stderr.write(usage)
sys.exit(1)
# If called from the command line
if __name__=='__main__': main(sys.argv)
=== Zope/lib/python/Controller/Main.py 1.1.2.7 => 1.1.2.8 ===
--- Zope/lib/python/Controller/Main.py:1.1.2.7 Sun Oct 6 02:05:58 2002
+++ Zope/lib/python/Controller/Main.py Sat Oct 12 16:28:35 2002
@@ -19,6 +19,7 @@
_marker = []
def start_zope(config_location):
+ check_python_version()
# config *must* include zope_home, software_home and instance_home
config = Directives.DirectiveRegistry
config.reconfigure(config_location)
@@ -536,4 +537,20 @@
return out
-
+def check_python_version():
+ # check for Python version
+ # too chicken to preclude 2.1 yet
+ python_version = sys.version.split()[0]
+ if python_version < '2.1':
+ raise 'Invalid python version', python_version
+ if python_version[:3] == '2.1':
+ err('You are running Python version %s. This may work, but it'
+ 'may not. Consider upgrading to Python 2.2.2')
+ warnings.warn(err)
+ if python_version[:3] == '2.2':
+ if python_version[4:5] < '2':
+ err = ('You are running Python version %s. This Python version '
+ 'has known bugs that may cause Zope to run improperly. '
+ 'Consider upgrading to a Python in the 2.2 series '
+ 'with at least version number 2.2.2.' % python_version)
+ warnings.warn(err)
=== Zope/lib/python/Controller/ZctlLib.py 1.1.2.5 => 1.1.2.6 ===
--- Zope/lib/python/Controller/ZctlLib.py:1.1.2.5 Wed Oct 9 01:03:24 2002
+++ Zope/lib/python/Controller/ZctlLib.py Sat Oct 12 16:28:35 2002
@@ -72,6 +72,7 @@
show [<info>*]
run <script_filename>
debug
+ write_inituser username password
If no commands supplied, runs as an interactive read-eval-print
interpreter.
@@ -377,6 +378,32 @@
except KeyboardInterrupt:
pass
+ def write_inituser( self, args ):
+ """
+ Write a file named 'inituser' to the current directory with
+ the username and password specified as arguments. Writing this
+ file to a new instance home directory will bootstrap the instance
+ home for login with an initial username/password combination.
+
+ Syntax: write_inituser username password
+ """
+ fname = 'inituser'
+ import zpasswd
+ if type( args ) is type( '' ):
+ args = args.split( ' ' )
+ if len(args) != 2:
+ self._report('Syntax: write_inituser username password')
+ return
+ username, password = args
+ password = zpasswd.generate_passwd(password, 'SHA')
+ try:
+ inituser = open(fname, 'w')
+ except IOError:
+ self._report('Could not open %s file (permissions?)' % fname)
+ return
+ inituser.write('%s:%s' % (username, password))
+ self._report('Wrote %s' % os.path.abspath(fname))
+
#
# Helper functions
#
@@ -682,7 +709,7 @@
do_debug = _MAKEDO( 'debug' )
do_quit = _MAKEDO( 'quit' )
do_shell = _MAKEDO( 'shell' )
-
+ do_write_inituser = _MAKEDO( 'write_inituser')
#
# Command-line processing
#