Skip to content

Commit 5d10ea2

Browse files
myvestamyvesta
authored
Merge pull request hestiacp#4 from serghey-rodin/master
updates from master branch
2 parents 3d9137c + 599a07f commit 5d10ea2

File tree

24 files changed

+98
-82
lines changed

24 files changed

+98
-82
lines changed

‎bin/v-add-mail-domain‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ is_object_valid 'user' 'USER' "$user"
4545
is_object_unsuspended 'user' 'USER' "$user"
4646
is_domain_new 'mail' "$domain"
4747
is_package_full 'MAIL_DOMAINS'
48+
is_dir_symlink $HOMEDIR/$user/mail
4849

4950

5051
#----------------------------------------------------------#

‎bin/v-add-web-domain‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ is_object_valid 'user' 'USER' "$user"
4747
is_object_unsuspended 'user' 'USER' "$user"
4848
is_package_full 'WEB_DOMAINS' 'WEB_ALIASES'
4949
is_domain_new 'web' "$domain,$aliases"
50+
is_dir_symlink $HOMEDIR/$user/web
5051
if [ ! -z "$ip" ]; then
5152
is_ip_valid "$ip" "$user"
5253
else

‎bin/v-check-user-hash‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,15 @@ else
7575
method='des'
7676
fi
7777

78+
# Checking salt
7879
if [ -z "$salt" ]; then
7980
echo "Error: password missmatch"
8081
echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
8182
exit 9
8283
fi
8384

84-
# Checking hash
85-
result=$(grep "^$user:$hash:" /etc/shadow 2>/dev/null)
86-
if [[ -z "$result" ]]; then
85+
# Comparing hashes
86+
if [[ "$shadow" != "$hash" ]]; then
8787
echo "Error: password missmatch"
8888
echo "$date $time $user $ip failed to login" >> $VESTA/log/auth.log
8989
exit 9

‎bin/v-list-user-log‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ json_list() {
2323
objects=$(echo "$logs" |wc -l)
2424
echo "{"
2525
for str in $logs; do
26-
eval $str
26+
ID=$(echo "$str" |cut -f 2 -d \')
27+
DATE=$(echo "$str" |cut -f 4 -d \')
28+
TIME=$(echo "$str" |cut -f 6 -d \')
29+
CMD=$(echo "$str" |cut -f 8 -d \')
2730
CMD=${CMD//\"/\\\"}
2831
echo -n ' "'$ID'": {
2932
"CMD": "'$CMD'",
@@ -46,13 +49,9 @@ shell_list() {
4649
echo "DATE~TIME~CMD"
4750
echo "----~----~---"
4851
for str in $logs; do
49-
eval $str
50-
if [ -z "$DATE" ]; then
51-
DATE='no'
52-
fi
53-
if [ -z "$TIME" ]; then
54-
TIME='no'
55-
fi
52+
DATE=$(echo "$str" |cut -f 4 -d \')
53+
TIME=$(echo "$str" |cut -f 6 -d \')
54+
CMD=$(echo "$str" |cut -f 8 -d \')
5655
echo "$DATE~$TIME~$CMD"
5756
done
5857
}
@@ -61,7 +60,9 @@ shell_list() {
6160
plain_list() {
6261
IFS=$'\n'
6362
for str in $logs; do
64-
eval $str
63+
DATE=$(echo "$str" |cut -f 4 -d \')
64+
TIME=$(echo "$str" |cut -f 6 -d \')
65+
CMD=$(echo "$str" |cut -f 8 -d \')
6566
echo -e "$ID\t$CMD\t$UNDO\t$TIME\t$DATE"
6667
done
6768
}
@@ -71,7 +72,9 @@ csv_list() {
7172
IFS=$'\n'
7273
echo "ID,CMD,UNDO,TIME,DATE"
7374
for str in $logs; do
74-
eval $str
75+
DATE=$(echo "$str" |cut -f 4 -d \')
76+
TIME=$(echo "$str" |cut -f 6 -d \')
77+
CMD=$(echo "$str" |cut -f 8 -d \')
7578
echo "$ID,\"$CMD\",\"$UNDO\",$TIME,$DATE"
7679
done
7780
}

‎bin/v-update-sys-rrd-mysql‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ period=${1-daily}
1414

1515
# Includes
1616
source $VESTA/func/main.sh
17+
source $VESTA/func/db.sh
1718
source $VESTA/conf/vesta.conf
1819

1920

@@ -66,23 +67,10 @@ for host in $hosts; do
6667
fi
6768

6869
if [ "$period" = 'daily' ]; then
69-
# Defining host credentials
70-
host_str=$(grep "HOST='$host'" $conf)
71-
for key in $host_str; do
72-
eval ${key%%=*}=${key#*=}
73-
done
74-
sql="mysql -h $HOST -u $USER -p$PASSWORD -e"
75-
76-
# Checking empty vars
77-
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ]; then
78-
echo "Error: config is broken"
79-
log_event "$E_PARSING" "$ARGUMENTS"
80-
exit $E_PARSING
81-
fi
82-
83-
# Parsing data
84-
status=$($sql "SHOW GLOBAL STATUS" 2>/dev/null); code="$?"
85-
if [ '0' -ne "$code" ]; then
70+
mysql_connect $host
71+
query='SHOW GLOBAL STATUS'
72+
status=$(mysql_query "$query" 2>/dev/null)
73+
if [ $? -ne 0 ]; then
8674
active=0
8775
slow=0
8876
else

‎func/db.sh‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,10 @@ mysql_connect() {
4747
}
4848

4949
mysql_query() {
50-
mysql --defaults-file=$mycnf -e "$1" 2>/dev/null
50+
sql_tmp=$(mktemp)
51+
echo "$1" > $sql_tmp
52+
mysql --defaults-file=$mycnf < "$sql_tmp" 2>/dev/null
53+
rm -f "$sql_tmp"
5154
}
5255

5356
mysql_dump() {
@@ -89,7 +92,10 @@ psql_connect() {
8992
}
9093

9194
psql_query() {
92-
psql -h $HOST -U $USER -c "$1" 2>/dev/null
95+
sql_tmp=$(mktemp)
96+
echo "$1" > $sql_tmp
97+
psql -h $HOST -U $USER -f "$sql_tmp" 2>/dev/null
98+
rm -f $sql_tmp
9399
}
94100

95101
psql_dump() {

‎func/main.sh‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,13 @@ is_hash_valid() {
287287
fi
288288
}
289289

290+
# Check if directory is a symlink
291+
is_dir_symlink() {
292+
if [[ -L "$1" ]]; then
293+
check_result $E_FORBIDEN "$1 directory is a symlink"
294+
fi
295+
}
296+
290297
# Get object value
291298
get_object_value() {
292299
object=$(grep "$2='$3'" $USER_DATA/$1.conf)

‎func/rebuild.sh‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@ rebuild_user_conf() {
7171
echo "$BIN/v-update-web-domains-disk $user" \
7272
>> $VESTA/data/queue/disk.pipe
7373

74+
if [[ -L "$HOMEDIR/$user/web" ]]; then
75+
rm $HOMEDIR/$user/web
76+
fi
7477
mkdir -p $HOMEDIR/$user/conf/web
7578
mkdir -p $HOMEDIR/$user/web
7679
mkdir -p $HOMEDIR/$user/tmp
@@ -105,6 +108,9 @@ rebuild_user_conf() {
105108
echo "$BIN/v-update-mail-domains-disk $user" \
106109
>> $VESTA/data/queue/disk.pipe
107110

111+
if [[ -L "$HOMEDIR/$user/mail" ]]; then
112+
rm $HOMEDIR/$user/mail
113+
fi
108114
mkdir -p $HOMEDIR/$user/conf/mail
109115
mkdir -p $HOMEDIR/$user/mail
110116
chmod 751 $HOMEDIR/$user/mail

‎src/deb/ioncube/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: vesta-ioncube
22
Package: vesta-ioncube
33
Priority: optional
4-
Version: 0.9.8-20
4+
Version: 0.9.8-21
55
Section: admin
66
Maintainer: Serghey Rodin <skid@vestacp.com>
77
Homepage: https://www.ioncube.com

‎src/deb/nginx/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Source: vesta-nginx
22
Package: vesta-nginx
33
Priority: optional
4-
Version: 0.9.8-20
4+
Version: 0.9.8-21
55
Section: admin
66
Maintainer: Serghey Rodin <skid@vestacp.com>
77
Homepage: http://vestacp.com

0 commit comments

Comments
 (0)