github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 13:24:25 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

bugfix for domalias ownership check

Browse source
This commit is contained in:
Serghey Rodin 2013-01-04 00:08:27 +02:00
commit 26b96e11cd
1 changed files with 102 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

114
func/domain.sh
View file

@ -48,29 +48,119 @@ is_dns_template_valid() {
is_domain_new() { is_domain_new() {
type="$1" type="$1"
dom=${2-$domain} dom=${2-$domain}
web="$(grep -w $dom $VESTA/data/users/*/web.conf)"
dns="$(grep DOMAIN='$dom' $VESTA/data/users/*/dns.conf)"
mail="$(grep DOMAIN='$dom' $VESTA/data/users/*/mail.conf)"
if [ -n "$web" ] || [ -n "$dns" ] || [ -n "$mail" ]; then web=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/web.conf)
if [ ! -z "$(grep -w $dom $USER_DATA/*.conf)" ]; then dns=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/dns.conf)
c1=$(grep "'$dom'" $USER_DATA/$type.conf) mail=$(grep "DOMAIN='$dom'" $VESTA/data/users/*/mail.conf)
c2=$(grep "'$dom," $USER_DATA/$type.conf)
c3=$(grep ",$dom," $USER_DATA/$type.conf)
c4=$(grep ",$dom'" $USER_DATA/$type.conf)
if [ -n "$c1" ] || [ -n "$c2" ] || [ -n "$c3" ] || [ -n "$c4" ] # Check web domain
then if [ ! -z "$web" ] && [ "$type" == 'web' ]; then
echo "Error: domain $dom exist" echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT" log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS exit $E_EXISTS
fi fi
else if [ ! -z "$web" ]; then
web_user=$(echo "$web" |cut -f 7 -d /)
if [ "$web_user" != "$user" ]; then
echo "Error: domain $dom exist" echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT" log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS exit $E_EXISTS
fi fi
fi fi
# Check dns domain
if [ ! -z "$dns" ] && [ "$type" == 'dns' ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
if [ ! -z "$dns" ]; then
dns_user=$(echo "$dns" |cut -f 7 -d /)
if [ "$dns_user" != "$user" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
fi
# Check mail domain
if [ ! -z "$mail" ] && [ "$type" == 'mail' ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
if [ ! -z "$mail" ]; then
mail_user=$(echo "$mail" |cut -f 7 -d /)
if [ "$mail_user" != "$user" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
fi
# Check web aliases
web_alias=$(grep -w $dom $VESTA/data/users/*/web.conf)
if [ ! -z "$web_alias" ]; then
c1=$(grep "'$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c2=$(grep "'$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c3=$(grep ",$dom," $VESTA/data/users/*/web.conf | cut -f 7 -d /)
c4=$(grep ",$dom'" $VESTA/data/users/*/web.conf | cut -f 7 -d /)
if [ ! -z "$c1" ] && [ "$type" != "web" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
if [ ! -z "$c1" ]; then
c1_user=$(echo "$c1" |cut -f 7 -d /)
if [ "$c1_user" != "$user" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
fi
if [ ! -z "$c2" ] && [ "$type" != "web" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
if [ ! -z "$c2" ]; then
c2_user=$(echo "$c2" |cut -f 7 -d /)
if [ "$c2_user" != "$user" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
fi
if [ ! -z "$c3" ] && [ "$type" != "web" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
if [ ! -z "$c3" ]; then
c3_user=$(echo "$c3" |cut -f 7 -d /)
if [ "$c3_user" != "$user" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
fi
if [ ! -z "$c4" ] && [ "$type" != "web" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
if [ ! -z "$c4" ]; then
c1_user=$(echo "$c4" |cut -f 7 -d /)
if [ "$c4_user" != "$user" ]; then
echo "Error: domain $dom exist"
log_event "$E_EXISTS" "$EVENT"
exit $E_EXISTS
fi
fi
fi
} }
# Checking mail account existance # Checking mail account existance