fixed ssl functions

func/cron.func

@@ -1,149 +0,0 @@
-get_next_cron_string() {
-    # Parsing config
-    curr_str=$(grep "JOB=" $V_USERS/$user/cron.conf|cut -f 2 -d \'|\
-             sort -n|tail -n1)
-
-    # Print result
-    echo "$((curr_str +1))"
-}
-
-is_cron_job_free() {
-    # Checking record id
-    check_job=$(grep "JOB='$job'" $V_USERS/$user/cron.conf)
-
-    if [ ! -z "$check_job" ]; then
-        echo "Error: job id exist"
-        log_event 'debug' "$E_EXISTS $V_EVENT"
-        exit $E_EXISTS
-    fi
-}
-
-sort_cron_jobs() {
-    # Defining conf
-    conf="$V_USERS/$user/cron.conf"
-    cat $conf |sort -n -k 2 -t \' >$conf.tmp
-    mv -f $conf.tmp $conf
-}
-
-sync_cron_jobs() {
-    conf="/var/spool/cron/$user"
-
-    # Deleting old data
-    rm -f $conf
-
-    # Checking reporting system
-    rep=$(grep 'REPORTS=' $V_USERS/$user/user.conf | cut -f 2 -d \')
-    if [ "$rep" = 'yes' ]; then
-        email=$(grep 'CONTACT=' $V_USERS/$user/user.conf | cut -f 2 -d \')
-        echo "MAILTO=$email" >$conf
-    fi
-
-    # Reading user cron.conf
-    while read line ; do
-        # Defining new delimeter
-        IFS=$'\n'
-
-        # Parsing key=value
-        for key in $(echo $line|sed -e "s/' /'\n/g"); do
-            eval ${key%%=*}="${key#*=}"
-        done
-
-        if [ "$SUSPENDED" = 'no' ] ; then
-            # Adding line to system cron
-            echo "$MIN $HOUR $DAY $MONTH $WDAY $CMD" |\
-            sed -e "s/%quote%/'/g" -e "s/%dots%/:/g" >> $conf
-        fi
-    done <$V_USERS/$user/cron.conf
-}
-
-
-is_job_valid() {
-    result=$(grep "JOB='$job'" $V_USERS/$user/cron.conf)
-
-    if [ -z "$result" ]; then
-        echo "Error: job id not exists"
-        log_event 'debug' "$E_NOTEXIST $V_EVENT"
-        exit $E_NOTEXIST
-    fi
-}
-
-del_cron_job() {
-    str=$(grep -n "JOB='$job'" $V_USERS/$user/cron.conf|cut -f 1 -d :)
-    sed -i "$str d" $V_USERS/$user/cron.conf
-}
-
-
-is_job_suspended() {
-    # Parsing jobs
-    str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPENDED='yes'" )
-
-    # Checkng key
-    if [ ! -z "$str" ]; then
-        echo "Error: job suspended"
-        log_event 'debug' "$E_SUSPENDED $V_EVENT"
-        exit $E_SUSPENDED
-    fi
-}
-
-is_job_unsuspended() {
-    # Parsing jobs
-    str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPENDED='no'" )
-
-    # Checkng key
-    if [ ! -z "$str" ]; then
-        echo "Error: job unsuspended"
-        log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
-        exit $E_UNSUSPENDED
-    fi
-}
-
-update_cron_job_value() {
-    key="$1"
-    value="$2"
-
-    # Defining conf
-    conf="$V_USERS/$user/cron.conf"
-
-    # Parsing conf
-    job_str=$(grep -n "JOB='$job'" $conf)
-    str_number=$(echo $job_str | cut -f 1 -d ':')
-    str=$(echo $job_str | cut -f 2 -d ':')
-
-    # Parsing key=value
-    IFS=$'\n'
-    for keys in $(echo $str|sed -e "s/' /'\n/g"); do
-        eval ${keys%%=*}=${keys#*=}
-    done
-
-    # Defining clean key
-    c_key=$(echo "${key//$/}")
-
-    eval old="${key}"
-
-    # Escaping slashes
-    old=$(echo "$old" | sed -e 's/\\/\\\\/g' -e 's/&/\\&/g' -e 's/\//\\\//g')
-    new=$(echo "$value" | sed -e 's/\\/\\\\/g' -e 's/&/\\&/g' -e 's/\//\\\//g')
-
-    # Updating conf
-    sed -i "$str_number s/$c_key='${old//\*/\\*}'/$c_key='${new//\*/\\*}'/g" \
-            $conf
-}
-
-cron_clear_search() {
-    # Defining delimeter
-    IFS=$'\n'
-
-    # Reading file line by line
-    for line in $(grep $search_string $conf); do
-
-        # Defining new delimeter
-        IFS=$'\n'
-        # Parsing key=value
-        for key in $(echo $line|sed -e "s/' /'\n/g"); do
-            eval ${key%%=*}=${key#*=}
-        done
-
-        # Print result line
-        eval echo "$field"
-    done
-}

func/domain.sh

@@ -160,6 +160,7 @@ add_web_config() {
             -e "s/%ssl_key%/${ssl_key////\/}/g" \
             -e "s/%ssl_pem%/${ssl_pem////\/}/g" \
             -e "s/%ssl_ca_str%/${ssl_ca_str////\/}/g" \
+            -e "s/%ssl_ca%/${ssl_ca////\/}/g" \
             -e "s/%nginx_extentions%/${NGINX_EXT//,/|}/g" \
             -e "s/%elog%/$elog/g" \
             -e "s/%cgi%/$cgi/g" \
@@ -238,7 +239,12 @@ is_web_domain_cert_valid() {
         exit $E_NOTEXIST
     fi
 
-    crt=$(openssl verify $ssl_dir/$domain.crt 2>/dev/null |grep '/C=')
+    if [ ! -e "$ssl_dir/$domain.ca" ]; then
+        crt=$(openssl verify $ssl_dir/$domain.crt 2>/dev/null |grep 'OK')
+    else
+        crt=$(openssl verify -untrusted $ssl_dir/$domain.ca \
+	    $ssl_dir/$domain.crt 2>/dev/null |grep 'OK')
+    fi
     if [ -z "$crt" ]; then
         echo "Error: certificate is not valid"
         log_event "$E_INVALID" "$EVENT"
@@ -253,7 +259,7 @@ is_web_domain_cert_valid() {
     fi
 
     if [ -e "$ssl_dir/$domain.ca" ]; then
-        ca=$(openssl verify $ssl_dir/$domain.ca 2>/dev/null |grep '/C=')
+        ca=$(openssl verify $ssl_dir/$domain.ca 2>/dev/null |grep 'OK')
         if [ -z "$ca" ]; then
             echo "Error: ssl certificate authority is not valid"
             log_event "$E_INVALID" "$EVENT"