Skip to content

Commit 2ea4280

Browse files
jaapmarcusjaapmarcus
authored
Fix/4734 Webmail / PHPmydmin not working after update (hestiacp#4735)
* Fix hestiacp#4734 Webmail / phpmyadmin unavailble * Update versions in installers / changelog readme
1 parent 1708dd9 commit 2ea4280

File tree

8 files changed

+74
-35
lines changed

8 files changed

+74
-35
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.9.1] - Service release
6+
7+
- Fixed an issue with webmail / phpmydmin unavailble
8+
59
## [1.9.0] - Feature / Major release
610

711
### Notes

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<h2 align="center">Lightweight and powerful control panel for the modern web</h2>
66

7-
<p align="center"><strong>Latest stable release:</strong> Version 1.8.12 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
7+
<p align="center"><strong>Latest stable release:</strong> Version 1.9.1 | <a href="https://github.com/hestiacp/hestiacp/blob/release/CHANGELOG.md">View Changelog</a></p>
88

99
<p align="center">
1010
<a href="https://www.hestiacp.com/">HestiaCP.com</a> |

‎func/main.sh‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -791,51 +791,51 @@ is_alias_format_valid() {
791791

792792
# IP format validator
793793
is_ip_format_valid() {
794-
object_name=${2-ip}
795-
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? 0 : 1);' $1);
796-
if [ "$valid" -ne 0 ]; then
797-
check_result "$E_INVALID" "invalid $object_name :: $1"
798-
fi
794+
object_name=${2-ip}
795+
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) ? 0 : 1);' $1)
796+
if [ "$valid" -ne 0 ]; then
797+
check_result "$E_INVALID" "invalid $object_name :: $1"
798+
fi
799799
}
800800

801801
# IPv6 format validator
802802
is_ipv6_format_valid() {
803-
object_name=${2-ipv6}
804-
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 0 : 1);' $1);
805-
if [ "$valid" -ne 0 ]; then
806-
check_result "$E_INVALID" "invalid $object_name :: $1"
807-
fi
803+
object_name=${2-ipv6}
804+
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) ? 0 : 1);' $1)
805+
if [ "$valid" -ne 0 ]; then
806+
check_result "$E_INVALID" "invalid $object_name :: $1"
807+
fi
808808
}
809809

810810
is_ip46_format_valid() {
811-
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6) ? 0 : 1);' $1);
812-
if [ "$valid" -ne 0 ]; then
813-
check_result "$E_INVALID" "invalid IP format :: $1"
814-
fi
811+
valid=$($HESTIA_PHP -r '$ip="$argv[1]"; echo (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6) ? 0 : 1);' $1)
812+
if [ "$valid" -ne 0 ]; then
813+
check_result "$E_INVALID" "invalid IP format :: $1"
814+
fi
815815
}
816816

817817
is_ipv4_cidr_format_valid() {
818-
object_name=${2-ip}
819-
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 32]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) && $netmask <= 32) ? 0 : 1);' $1);
820-
if [ "$valid" -ne 0 ]; then
821-
check_result "$E_INVALID" "invalid $object_name :: $1"
822-
fi
818+
object_name=${2-ip}
819+
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 32]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) && $netmask <= 32) ? 0 : 1);' $1)
820+
if [ "$valid" -ne 0 ]; then
821+
check_result "$E_INVALID" "invalid $object_name :: $1"
822+
fi
823823
}
824824

825825
is_ipv6_cidr_format_valid() {
826-
object_name=${2-ipv6}
827-
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 128]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && $netmask <= 128) ? 0 : 1);' $1);
828-
if [ "$valid" -ne 0 ]; then
829-
check_result "$E_INVALID" "invalid $object_name :: $1"
830-
fi
826+
object_name=${2-ipv6}
827+
valid=$($HESTIA_PHP -r '$cidr="$argv[1]"; list($ip, $netmask) = [...explode("/", $cidr), 128]; echo ((filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) && $netmask <= 128) ? 0 : 1);' $1)
828+
if [ "$valid" -ne 0 ]; then
829+
check_result "$E_INVALID" "invalid $object_name :: $1"
830+
fi
831831
}
832832

833833
is_netmask_format_valid() {
834-
object_name=${2-netmask}
835-
valid=$($HESTIA_PHP -r '$netmask="$argv[1]"; echo (preg_match("/^(128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)/", $netmask) ? 0 : 1);' $1);
836-
if [ "$valid" -ne 0 ]; then
837-
check_result "$E_INVALID" "invalid $object_name :: $1"
838-
fi
834+
object_name=${2-netmask}
835+
valid=$($HESTIA_PHP -r '$netmask="$argv[1]"; echo (preg_match("/^(128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)\.(0|128|192|224|240|248|252|254|255)/", $netmask) ? 0 : 1);' $1)
836+
if [ "$valid" -ne 0 ]; then
837+
check_result "$E_INVALID" "invalid $object_name :: $1"
838+
fi
839839
}
840840

841841
# Proxy extention format validator

‎install/hst-install-debian.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
3131
VERBOSE='no'
3232

3333
# Define software versions
34-
HESTIA_INSTALL_VER='1.9.0~beta1'
34+
HESTIA_INSTALL_VER='1.9.1'
3535
# Supported PHP versions
3636
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2" "8.3" "8.4")
3737
# One of the following PHP versions is required for Roundcube / phpmyadmin

‎install/hst-install-ubuntu.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ HESTIA_COMMON_DIR="$HESTIA/install/common"
3131
VERBOSE='no'
3232

3333
# Define software versions
34-
HESTIA_INSTALL_VER='1.9.0~beta1'
34+
HESTIA_INSTALL_VER='1.9.1'
3535
# Supported PHP versions
3636
multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0" "8.1" "8.2" "8.3" "8.4")
3737
# One of the following PHP versions is required for Roundcube / phpmyadmin

‎install/upgrade/versions/1.9.1.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash
2+
3+
# Hestia Control Panel upgrade script for target version 1.9.0
4+
5+
#######################################################################################
6+
####### Place additional commands below. #######
7+
#######################################################################################
8+
####### upgrade_config_set_value only accepts true or false. #######
9+
####### #######
10+
####### Pass through information to the end user in case of a issue or problem #######
11+
####### #######
12+
####### Use add_upgrade_message "My message here" to include a message #######
13+
####### in the upgrade notification email. Example: #######
14+
####### #######
15+
####### add_upgrade_message "My message here" #######
16+
####### #######
17+
####### You can use \n within the string to create new lines. #######
18+
#######################################################################################
19+
20+
upgrade_config_set_value 'UPGRADE_UPDATE_WEB_TEMPLATES' 'false'
21+
upgrade_config_set_value 'UPGRADE_UPDATE_DNS_TEMPLATES' 'false'
22+
upgrade_config_set_value 'UPGRADE_UPDATE_MAIL_TEMPLATES' 'false'
23+
upgrade_config_set_value 'UPGRADE_REBUILD_USERS' 'no'
24+
upgrade_config_set_value 'UPGRADE_UPDATE_FILEMANAGER_CONFIG' 'false'
25+
26+
# Update hestia-event.conf
27+
if [ -f "/etc/apache2/conf.d/hestia-event.conf" ]; then
28+
rm -f /etc/apache2/conf.d/hestia-event.conf
29+
cp $HESTIA/data/templates/web/apache2/hestia-event.conf /etc/apache2/conf.d/
30+
fi

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "hestia",
33
"private": true,
4-
"version": "1.9.0",
4+
"version": "1.9.1",
55
"description": "An open-source Linux web server control panel.",
66
"repository": "https://github.com/hestiacp/hestiacp",
77
"license": "GPL-3.0-or-later",

‎web/login/index.php‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,13 @@ function authenticate_user($user, $password, $twofa = "") {
116116
$ip = $_SERVER["REMOTE_ADDR"];
117117
$user_agent = $_SERVER["HTTP_USER_AGENT"];
118118

119-
if (!empty($_SERVER["HTTP_CF_CONNECTING_IP"]) &&
120-
filter_var($_SERVER["HTTP_CF_CONNECTING_IP"], FILTER_VALIDATE_IP, FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6)
119+
if (
120+
!empty($_SERVER["HTTP_CF_CONNECTING_IP"]) &&
121+
filter_var(
122+
$_SERVER["HTTP_CF_CONNECTING_IP"],
123+
FILTER_VALIDATE_IP,
124+
FILTER_FLAG_IPV4 | FILTER_FLAG_IPV6,
125+
)
121126
) {
122127
$ip = $_SERVER["HTTP_CF_CONNECTING_IP"];
123128
}

0 commit comments

Comments
 (0)