Author: lyz

Update of /cvs/fedora/accounts2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv495

Modified Files: PgToLDAP.py Log Message: Added ssha function to PgToLDAP

Index: PgToLDAP.py =================================================================== RCS file: /cvs/fedora/accounts2/PgToLDAP.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- PgToLDAP.py 30 Nov 2006 03:02:00 -0000 1.2 +++ PgToLDAP.py 1 Dec 2006 02:35:09 -0000 1.3 @@ -21,8 +21,26 @@ import sys, time import ldap, ldif, pgdb, ldap.modlist from optparse import OptionParser +import sha +import base64 +from random import randrange + + +version = "0.112" + +def encode_SSHA_password ( password ): + p_ssha = sha.new( password ) + salt = '' + + for n in range(7): + salt += chr(randrange(256)) + + + p_ssha.update( salt ) + p_ssha_base64 = base64.encodestring(p_ssha.digest() + salt + '' ) + return '%s%s' %( '{SSHA}', p_ssha_base64 ) +

-version = "0.111"

def parseArgs(): parser = OptionParser(version="%prog " + version) @@ -219,8 +237,8 @@ userLdif.append(["cn",[str(user[3])]]) userLdif.append(["givenName",[str(user[3])]]) userLdif.append(["userCertificate",[str(user[4])]]) - userLdif.append(["sshKey",[str(user[5])]]) - userLdif.append(["userPassword",[str(user[6])]]) + userLdif.append(["fedoraPersonSshKey",[str(user[5])]]) + userLdif.append(["userPassword",[encode_SSHA_password(str(user[6]))]]) userLdif.append(["postalAddress",[str(user[8])]]) userLdif.append(["telephoneNumber",[str(user[9])]]) userLdif.append(["fax",[str(user[10])]])