Update of /cvsroot/hcoop/domtool2/scripts
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26722
Modified Files:
domtool-addacl domtool-addcert domtool-addcert-daemon
domtool-rmuser
Log Message:
* Safer handling of $1 in all scripts
* Replaced `echo ~$USER` trick with our standard $PATHBITS implementation
Index: domtool-addcert-daemon
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-addcert-daemon,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domtool-addcert-daemon 16 Jun 2007 20:32:36 -0000 1.1
--- domtool-addcert-daemon 15 Feb 2008 02:03:30 -0000 1.2
***************
*** 1,7 ****
#!/bin/sh -e
! KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$1
KEYFILE=$KEYDIR/key.pem
! CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$1.pem
NEWREQ=~/.newreq.pem
NEW=~/.new.pem
--- 1,13 ----
#!/bin/sh -e
! USER="$1"
! if test -z "$USER"; then
! echo Usage: domtool-addcert USERNAME
! exit 1
! fi
!
! KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$USER
KEYFILE=$KEYDIR/key.pem
! CERTFILE=/afs/hcoop.net/common/etc/domtool/certs/$USER.pem
NEWREQ=~/.newreq.pem
NEW=~/.new.pem
***************
*** 16,21 ****
echo "." >>$KEYIN
echo "." >>$KEYIN
! echo "$1" >>$KEYIN
! echo "[EMAIL PROTECTED]" >>$KEYIN
echo "" >>$KEYIN
echo "" >>$KEYIN
--- 22,27 ----
echo "." >>$KEYIN
echo "." >>$KEYIN
! echo "$USER" >>$KEYIN
! echo "[EMAIL PROTECTED]" >>$KEYIN
echo "" >>$KEYIN
echo "" >>$KEYIN
Index: domtool-addacl
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-addacl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** domtool-addacl 8 May 2007 20:30:00 -0000 1.4
--- domtool-addacl 15 Feb 2008 02:03:30 -0000 1.5
***************
*** 1,7 ****
#!/bin/sh -e
! domtool-admin grant $1 user $1
! domtool-admin grant $1 path `sh -c "echo ~$1"`
# disabled since we want to discourage the use of unix groups
! #domtool-admin grant $1 group $1
\ No newline at end of file
--- 1,16 ----
#!/bin/sh -e
! USER="$1"
! if test -z "$USER"; then
! echo Usage: domtool-addacl USERNAME
! exit 1
! fi
!
! PATHBITS=`echo $USER | head -c 1`/`echo $USER | head -c 2`/$USER
! HOMEPATH=/afs/hcoop.net/user/$PATHBITS
!
! domtool-admin grant $USER user $USER
! domtool-admin grant $USER path $HOMEPATH
# disabled since we want to discourage the use of unix groups
! #domtool-admin grant $USER group $USER
Index: domtool-rmuser
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-rmuser,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domtool-rmuser 16 Dec 2006 19:58:52 -0000 1.1
--- domtool-rmuser 15 Feb 2008 02:03:31 -0000 1.2
***************
*** 1,5 ****
#!/bin/sh -e
! rm -rf /afs/hcoop.net/common/etc/domtool/keys/$1
! rm /afs/hcoop.net/common/etc/domtool/certs/$1.pem
! domtool-admin rmuser $1
--- 1,12 ----
#!/bin/sh -e
! USER="$1"
!
! if test -z "$USER"; then
! echo Usage: domtool-rmuser USERNAME
! exit 1
! fi
!
! rm -rf /afs/hcoop.net/common/etc/domtool/keys/$USER
! rm /afs/hcoop.net/common/etc/domtool/certs/$USER.pem
! domtool-admin rmuser $USER
Index: domtool-addcert
===================================================================
RCS file: /cvsroot/hcoop/domtool2/scripts/domtool-addcert,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** domtool-addcert 17 Nov 2007 01:17:12 -0000 1.2
--- domtool-addcert 15 Feb 2008 02:03:30 -0000 1.3
***************
*** 1,4 ****
--- 1,10 ----
#!/bin/sh -e
+ USER="$1"
+ if test -z "$USER"; then
+ echo Usage: domtool-addcert USERNAME
+ exit 1
+ fi
+
KEYDIR=/afs/hcoop.net/common/etc/domtool/keys/$1
KEYFILE=$KEYDIR/key.pem
***************
*** 11,15 ****
openssl genrsa -out $KEYFILE
chown -R domtool.domtool $KEYDIR
! fs sa $KEYDIR $1 read
echo "." >$KEYIN
echo "." >>$KEYIN
--- 17,21 ----
openssl genrsa -out $KEYFILE
chown -R domtool.domtool $KEYDIR
! fs sa $KEYDIR $USER read
echo "." >$KEYIN
echo "." >>$KEYIN
***************
*** 17,22 ****
echo "." >>$KEYIN
echo "." >>$KEYIN
! echo "$1" >>$KEYIN
! echo "[EMAIL PROTECTED]" >>$KEYIN
echo "" >>$KEYIN
echo "" >>$KEYIN
--- 23,28 ----
echo "." >>$KEYIN
echo "." >>$KEYIN
! echo "$USER" >>$KEYIN
! echo "[EMAIL PROTECTED]" >>$KEYIN
echo "" >>$KEYIN
echo "" >>$KEYIN
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
hcoop-cvs mailing list
hcoop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/hcoop-cvs
