Added CA include script.

10 files changed, 106 insertions, 59 deletions

diff --git a/scripts/ca-configure.sh b/scripts/ca-configure.sh
index bbdf33c..8b67093 100755
--- a/scripts/ca-configure.sh
+++ b/scripts/ca-configure.sh
@@ -1,31 +1,28 @@
 #!/bin/sh -x
 
-PKI_DEV_SRC=`cd .. ; pwd`
+. ./ca-include.sh
 
-INSTANCE_NAME=pki-ca
-PASSWORD=Secret123
-PIN=`grep preop.pin= /var/lib/$INSTANCE_NAME/conf/CS.cfg | awk -F= '{ print $2; }'`
+PIN=`grep preop.pin= $INSTANCE_ROOT/$CA_INSTANCE_NAME/conf/CS.cfg | awk -F= '{ print $2; }'`
 
-REALM=EXAMPLE-COM
-CERTS=$PKI_DEV_SRC/certs/ca
+CERTS=$SRC_DIR/pki-dev/certs/ca
 rm -rf $CERTS
 mkdir -p $CERTS
 
 pkisilent ConfigureCA \
         -cs_hostname $HOSTNAME \
-        -cs_port 9443 \
+        -cs_port $CA_SECURE_PORT \
         -preop_pin $PIN \
         -client_certdb_dir "$CERTS" \
         -client_certdb_pwd "$PASSWORD" \
         -token_name "internal" \
         -domain_name "$REALM" \
-        -subsystem_name "Certificate Authority" \
-        -ldap_host "localhost" \
-        -ldap_port "389" \
-        -base_dn "ou=ca,dc=example,dc=com" \
-        -db_name "example.com-$INSTANCE_NAME" \
-        -bind_dn "cn=Directory Manager" \
-        -bind_password "$PASSWORD" \
+        -subsystem_name "$CA_SUBSYSTEM_NAME" \
+        -ldap_host "$CA_LDAP_HOST" \
+        -ldap_port "$CA_LDAP_PORT" \
+        -base_dn "$CA_LDAP_BASE_DN" \
+        -db_name "$CA_LDAP_DATABASE" \
+        -bind_dn "$CA_LDAP_BIND_DN" \
+        -bind_password "$CA_LDAP_PASSWORD" \
         -remove_data true \
         -key_type rsa \
         -key_size 2048 \
@@ -34,20 +31,20 @@ pkisilent ConfigureCA \
         -save_p12 true \
         -backup_fname "$CERTS/ca-server-certs.p12" \
         -backup_pwd "$PASSWORD" \
-        -ca_sign_cert_subject_name "CN=Certificate Authority,O=$REALM" \
-        -ca_ocsp_cert_subject_name "CN=OCSP Signing Certificate,O=$REALM" \
-        -ca_server_cert_subject_name "CN=$HOSTNAME,O=$REALM" \
-        -ca_subsystem_cert_subject_name "CN=CA Subsystem Certificate,O=$REALM" \
-        -ca_audit_signing_cert_subject_name "CN=CA Audit Signing Certificate,O=$REALM" \
-        -admin_user "caadmin" \
-        -agent_name "caadmin" \
-        -admin_email "caadmin@example.com" \
-        -admin_password "$PASSWORD" \
+        -ca_sign_cert_subject_name "$CA_SIGN_CERT_SUBJECT_NAME" \
+        -ca_ocsp_cert_subject_name "$CA_OCSP_CERT_SUBJECT_NAME" \
+        -ca_server_cert_subject_name "$CA_SERVER_CERT_SUBJECT_NAME" \
+        -ca_subsystem_cert_subject_name "$CA_SUBSYSTEM_CERT_SUBJECT_NAME" \
+        -ca_audit_signing_cert_subject_name "$CA_AUDIT_SIGNING_CERT_SUBJECT_NAME" \
+        -admin_user "$CA_ADMIN_USER" \
+        -agent_name "$CA_ADMIN_NAME" \
+        -admin_email "$CA_ADMIN_EMAIL" \
+        -admin_password "$CA_ADMIN_PASSWORD" \
         -agent_key_size 2048 \
         -agent_key_type rsa \
-        -agent_cert_subject "CN=caadmin,UID=caadmin,E=caadmin@example.com,O=$REALM"
+        -agent_cert_subject "$CA_ADMIN_CERT_SUBJECT"
 
 echo $PASSWORD > "$CERTS/password.txt"
 PKCS12Export -d "$CERTS" -o "$CERTS/ca-client-certs.p12" -p "$CERTS/password.txt" -w "$CERTS/password.txt"
 
-systemctl restart pki-cad@$INSTANCE_NAME.service
+systemctl restart pki-cad@$CA_INSTANCE_NAME.service
diff --git a/scripts/ca-create.sh b/scripts/ca-create.sh
index 87fd66b..0afe23f 100755
--- a/scripts/ca-create.sh
+++ b/scripts/ca-create.sh
@@ -1,28 +1,25 @@
 #!/bin/sh -x
 
-SRC_DIR=`cd ../.. ; pwd`
+. ./ca-include.sh
 
-INSTANCE_NAME=pki-ca
-
-pkicreate -pki_instance_root=/var/lib			\
-          -pki_instance_name=$INSTANCE_NAME		\
-          -subsystem_type=ca				\
-          -secure_port=9443				\
-          -unsecure_port=9180				\
-          -tomcat_server_port=9701			\
-          -user=pkiuser					\
-          -group=pkiuser				\
-          -redirect conf=/etc/$INSTANCE_NAME		\
-          -redirect logs=/var/log/$INSTANCE_NAME	\
+pkicreate -pki_instance_root=$INSTANCE_ROOT		\
+          -pki_instance_name=$CA_INSTANCE_NAME		\
+          -subsystem_type=$CA_SUBSYSTEM_TYPE		\
+          -secure_port=$CA_SECURE_PORT			\
+          -unsecure_port=$CA_UNSECURE_PORT			\
+          -tomcat_server_port=$CA_TOMCAT_SERVER_PORT	\
+          -user=$INSTANCE_USER				\
+          -group=$INSTANCE_GROUP			\
+          -redirect conf=/etc/$CA_INSTANCE_NAME		\
+          -redirect logs=/var/log/$CA_INSTANCE_NAME	\
           -verbose
 
-ln -s /usr/share/tomcat6/bin /var/lib/$INSTANCE_NAME/bin
-ln -s /usr/share/tomcat6/lib /var/lib/$INSTANCE_NAME/lib
-rm -f /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/lib/pki-*
-
-rm -rf /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
-cp -r $SRC_DIR/pki/build/classes /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF
-chown -R pkiuser.pkiuser /var/lib/$INSTANCE_NAME/webapps/ca/WEB-INF/classes
+ln -s /usr/share/tomcat6/bin $INSTANCE_ROOT/$CA_INSTANCE_NAME/bin
+ln -s /usr/share/tomcat6/lib $INSTANCE_ROOT/$CA_INSTANCE_NAME/lib
+rm -f $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF/lib/pki-*
 
-systemctl restart pki-cad@$INSTANCE_NAME.service
+rm -rf $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF/classes
+cp -r $SRC_DIR/pki/build/classes $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF
+chown -R $INSTANCE_USER.$INSTANCE_GROUP $INSTANCE_ROOT/$CA_INSTANCE_NAME/webapps/ca/WEB-INF/classes
 
+systemctl restart pki-cad@$CA_INSTANCE_NAME.service
diff --git a/scripts/ca-include.sh b/scripts/ca-include.sh
new file mode 100755
index 0000000..20e2c67
--- /dev/null
+++ b/scripts/ca-include.sh
@@ -0,0 +1,39 @@
+#!/bin/sh -x
+
+SRC_DIR="`cd ../.. ; pwd`"
+
+DOMAIN="example.com"
+REALM="EXAMPLE-COM"
+PASSWORD="Secret123"
+
+INSTANCE_ROOT="/var/lib"
+INSTANCE_USER="pkiuser"
+INSTANCE_GROUP="pkiuser"
+
+CA_INSTANCE_NAME="pki-ca"
+
+CA_SUBSYSTEM_TYPE="ca"
+CA_SUBSYSTEM_NAME="Certificate Authority"
+
+CA_SECURE_PORT="9443"
+CA_UNSECURE_PORT="9180"
+CA_TOMCAT_SERVER_PORT="9701"
+
+CA_LDAP_HOST="$HOSTNAME"
+CA_LDAP_PORT="389"
+CA_LDAP_DATABASE="$DOMAIN-$INSTANCE_NAME"
+CA_LDAP_BASE_DN="ou=ca,dc=example,dc=com"
+CA_LDAP_BIND_DN="cn=Directory Manager"
+CA_LDAP_PASSWORD="$PASSWORD"
+
+CA_SIGN_CERT_SUBJECT_NAME="CN=$CA_SUBSYSTEM_NAME,O=$REALM"
+CA_OCSP_CERT_SUBJECT_NAME="CN=OCSP Signing Certificate,O=$REALM"
+CA_SERVER_CERT_SUBJECT_NAME="CN=$HOSTNAME,O=$REALM"
+CA_SUBSYSTEM_CERT_SUBJECT_NAME="CN=CA Subsystem Certificate,O=$REALM"
+CA_AUDIT_SIGNING_CERT_SUBJECT_NAME="CN=CA Audit Signing Certificate,O=$REALM"
+
+CA_ADMIN_USER="caadmin"
+CA_ADMIN_NAME="$CA_ADMIN_USER"
+CA_ADMIN_EMAIL="$CA_ADMIN_USER@$DOMAIN"
+CA_ADMIN_PASSWORD="$PASSWORD"
+CA_ADMIN_CERT_SUBJECT="CN=$CA_ADMIN_NAME,UID=$CA_ADMIN_USER,E=$CA_ADMIN_EMAIL,O=$REALM"
diff --git a/scripts/ca-remove.sh b/scripts/ca-remove.sh
index 1884761..7a42c3d 100755
--- a/scripts/ca-remove.sh
+++ b/scripts/ca-remove.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -x
 
-pkiremove -pki_instance_root=/var/lib\
-	-pki_instance_name=pki-ca\
+. ./ca-include.sh
+
+pkiremove -pki_instance_root=$INSTANCE_ROOT	\
+	-pki_instance_name=$CA_INSTANCE_NAME	\
 	-force
diff --git a/scripts/certs-import.sh b/scripts/certs-import.sh
index 86ab35d..7b98b29 100755
--- a/scripts/certs-import.sh
+++ b/scripts/certs-import.sh
@@ -1,11 +1,12 @@
 #!/bin/sh -x
 
-PKI_DEV_SRC=`cd .. ; pwd`
+. ./ca-include.sh
+
 FIREFOX_DIR=~/.mozilla/firefox
 PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 
-pk12util -i $PKI_DEV_SRC/certs/ca/ca-client-certs.p12 -d $FIREFOX_DIR/$PROFILE -W Secret123
-certutil -M -n caadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
+pk12util -i $SRC_DIR/pki-dev/certs/ca/ca-client-certs.p12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+certutil -M -n $CA_ADMIN_NAME -t u,u,u -d $FIREFOX_DIR/$PROFILE
 
-pk12util -i $PKI_DEV_SRC/certs/kra/kra-client-certs.p12 -d $FIREFOX_DIR/$PROFILE -W Secret123
+pk12util -i $SRC_DIR/pki-dev/certs/kra/kra-client-certs.p12 -d $FIREFOX_DIR/$PROFILE -W Secret123
 certutil -M -n kraadmin -t u,u,u -d $FIREFOX_DIR/$PROFILE
diff --git a/scripts/certs-remove.sh b/scripts/certs-remove.sh
index 90d847d..97439e1 100755
--- a/scripts/certs-remove.sh
+++ b/scripts/certs-remove.sh
@@ -1,13 +1,15 @@
 #!/bin/sh -x
 
+. ./ca-include.sh
+
 FIREFOX_DIR=~/.mozilla/firefox
 PROFILE=`grep Path= $FIREFOX_DIR/profiles.ini | awk -F= '{print $2}'`
 
 cd $FIREFOX_DIR/$PROFILE
 
-certutil -D -n "caadmin" -d .
+certutil -D -n "$CA_ADMIN_NAME" -d .
 certutil -D -n "kraadmin" -d .
-certutil -D -n "Certificate Authority - EXAMPLE-COM" -d .
+certutil -D -n "$CA_SUBSYSTEM_NAME - $REALM" -d .
 certutil -D -n "$HOSTNAME" -d .
 certutil -D -n "$HOSTNAME #2" -d .
 certutil -D -n "$HOSTNAME #3" -d .
diff --git a/scripts/drm-java-test.sh b/scripts/drm-java-test.sh
index 7b24a43..5782084 100755
--- a/scripts/drm-java-test.sh
+++ b/scripts/drm-java-test.sh
@@ -8,7 +8,7 @@ CLASSPATH=$CLASSPATH:/usr/share/java/apache-commons-logging.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/commons-codec.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/jakarta-commons-httpclient.jar
 CLASSPATH=$CLASSPATH:/usr/lib64/java/jss4.jar
-CLASSPATH=$CLASSPATH:/usr/share/java/resteasy/httpclient-4.1.2.jar
+CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpclient.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/resteasy/jaxrs-api.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/resteasy/resteasy-jaxrs.jar
 CLASSPATH=$CLASSPATH:/usr/share/java/resteasy/resteasy-jaxb-provider.jar
diff --git a/scripts/kra-remove.sh b/scripts/kra-remove.sh
index 71d7b85..3ddfa9d 100755
--- a/scripts/kra-remove.sh
+++ b/scripts/kra-remove.sh
@@ -1,5 +1,7 @@
 #!/bin/sh -x
 
+INSTANCE_NAME=pki-kra
+
 pkiremove -pki_instance_root=/var/lib\
-	-pki_instance_name=pki-kra\
+	-pki_instance_name=$INSTANCE_NAME\
 	-force
diff --git a/scripts/tet.sh b/scripts/tet.sh
index b9e1a6b..f780f5a 100755
--- a/scripts/tet.sh
+++ b/scripts/tet.sh
@@ -1,8 +1,9 @@
 #!/bin/sh -x
 
 SRC_DIR=`cd ../.. ; pwd`
-mkdir -p $SRC_DIR/logs
-
 TET_DIR=$SRC_DIR/tet
+
 cd $TET_DIR
-testframework/utils/tet_shared/launch.sh testframework | tee logs/tet.log
+mkdir logs
+
+testframework/utils/tet_shared/launch.sh $TET_DIR/testframework | tee logs/tet.log
diff --git a/scripts/whitespace-remove.sh b/scripts/whitespace-remove.sh
new file mode 100755
index 0000000..08857d5
--- /dev/null
+++ b/scripts/whitespace-remove.sh
@@ -0,0 +1,6 @@
+#!/bin/sh -x
+
+SRC_DIR=`cd ../.. ; pwd`
+
+find $SRC_DIR/pki -not -path '.git' -name '*.java' \
+    -exec sed -i 's/[[:blank:]]\+$//' {} \;