Changeset 544

Timestamp:

05/19/08 14:23:19 (7 months ago)

Author:

free

Message:

* Added cryptpw script
* Encrypt passwords when changing the manager account

Location:

cdd-utils/trunk

Files:

• bin/cryptpw (moved) (moved from cdd-utils/trunk/bin/md5pw) (2 diffs)
• debian/changelog (modified) (1 diff)
• lib/common.sh (modified) (1 diff)
• lib/server.sh (modified) (2 diffs)
• lib/suites.sh (modified) (2 diffs)

cdd-utils/trunk/bin/cryptpw

@@ -2 +2 @@
 
 use strict;
+        
+use Crypt::PasswdMD5 qw(unix_md5_crypt);
+use Crypt::SmbHash qw(lmhash nthash);
 
-use Crypt::PasswdMD5 qw(unix_md5_crypt);
 my @salt = ( '.', '/', 0 .. 9, 'A' .. 'Z', 'a' .. 'z' );
 
-# this takes password as argument: good for simple example, bad for
-# security (perldoc -q password)
-my $password = shift || die "usage: $0 password";
+my $type     = shift || die "usage: $0 type password";
+my $password = shift || die "usage: $0 type password";
 
-my %encrypted;
+my $encrypted;
 
-# generate traditional (weak!) DES password, and more modern md5
-$encrypted{md5} = unix_md5_crypt( $password, gensalt(8) );
+if ( $type eq "md5" ) {
+    $encrypted = unix_md5_crypt( $password, gensalt(8) );
+}
+if ( $type eq "lm" ) {
+    $encrypted = lmhash($password);
+}
+if ( $type eq "nt" ) {
+    $encrypted = nthash($password);
+}
 
-print "$encrypted{md5}\n";
+print "$encrypted\n";
 
 # uses global @salt to construct salt string of requested length
@@ -27 +35 @@
 
 return $salt;
+
 }
-

cdd-utils/trunk/debian/changelog

@@ -17 +17 @@
   * Remove cdrom APT sources
   * Use squirrelmail via SSL
-  * Added md5pw script
-  * Encrypt webmin password on the fly
+  * Added cryptpw script
+  * Encrypt passwords when changing the manager account
 
  -- Free Ekanayaka <free@64studio.com>  Thu, 08 May 2008 21:55:32 +0200

cdd-utils/trunk/lib/common.sh

@@ -49 +49 @@
     sed -i -e "\|^$key| d" $cfg
 }
+ldap_set () {
+    dn="$1"
+    key="$2"
+    val="$3"
+    echo -e "dn: $dn\nchangetype: modify\nreplace: $key\n$key: $val"| ldapmodify -x -D cn=admin,dc=nodomain -w admin > /dev/null
+}
 is_ubuntu () {
 

cdd-utils/trunk/lib/server.sh

@@ -199 +199 @@
 }
 
-# Webmin
-webmin () {
-
-    password=$1
-    if nullstr $password; then warning "No password given"; return; fi
-
-    # Do not run with SSL
-    cfg=/etc/webmin/miniserv.conf
-    if ! exists $cfg; then warning $cfg not found; return; fi
-    sed -i -e's/^ssl=1/ssl=0/g' $cfg
+# Set the password for the manager account modifying Unix and Samba LDAP entry and
+# the webmin one
+manager () {
+
+    password="$1"
+    if nullstr "$password"; then warning "No password given"; return; fi
+
+    md5=$(cryptpw md5 "$password")
+    nt=$(cryptpw nt "$password")
+    lm=$(cryptpw lm "$password")
 
     # Add manager as webmin user
@@ -214 +214 @@
     key='manager'
     sep=':'
-    val=$(md5pw $password)
+    val=$md5
     if ! exists $cfg; then warning $cfg not found; return; fi
     add_key $key $sep $cfg
     set_key $key $sep $val $cfg
+
+    # Modify LDAP entry
+    dn="uid=manager,ou=People,dc=nodomain"
+    ldap_set "$dn" "userPassword"    "$password"
+    ldap_set "$dn" "sambaLMPassword" "$lm"
+    ldap_set "$dn" "sambaNTPassword" "$nt"
+
+}
+
+# Webmin
+webmin () {
+
+    # Do not run with SSL
+    cfg=/etc/webmin/miniserv.conf
+    if ! exists $cfg; then warning $cfg not found; return; fi
+    sed -i -e's/^ssl=1/ssl=0/g' $cfg
 
     # Set manager privileges

cdd-utils/trunk/lib/suites.sh

@@ -18 +18 @@
     cdd-config squirrelmail ares
     cdd-config samba
-    cdd-config webmin manager
+    cdd-config webmin
     cdd-config nfs server
     cdd-config squid
@@ -25 +25 @@
     cdd-config dnsmasq
     cdd-config monit
+    cdd-config manager manager
 }