From 97e0e0644d2affb3cd363a2745cf8da007e2e441 Mon Sep 17 00:00:00 2001 From: Robin Dirksen Date: Mon, 14 May 2018 17:06:35 +0200 Subject: [PATCH 1/3] Update nl.php Added apps translation --- web/inc/i18n/nl.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/inc/i18n/nl.php b/web/inc/i18n/nl.php index 40274f5f..fc86a88b 100644 --- a/web/inc/i18n/nl.php +++ b/web/inc/i18n/nl.php @@ -16,6 +16,7 @@ $LANG['nl'] = array( 'Services' => 'Processen', 'Firewall' => 'Firewall', 'Updates' => 'Updates', + 'Apps' => 'Applicaties', 'Log in' => 'Inloggen', 'Log out' => 'Uitloggen', From c80c4c472e61bc3f5ded1c47df1fecb5f48ffd01 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Wed, 16 May 2018 17:23:04 +0300 Subject: [PATCH 2/3] Additional rXSS fix / closes #1558 --- web/view/file/index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/view/file/index.php b/web/view/file/index.php index aed9523d..e3e77249 100644 --- a/web/view/file/index.php +++ b/web/view/file/index.php @@ -13,10 +13,10 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) { } if (!empty($_REQUEST['path'])) { - $path = $_REQUEST['path']; + $path = htmlspecialchars($_REQUEST['path'], ENT_QUOTES, 'UTF-8'); if (!empty($_REQUEST['raw'])) { header('content-type: image/jpeg'); - passthru (VESTA_CMD . "v-open-fs-file " . $user . " " . escapeshellarg(htmlspecialchars($_REQUEST['path'], ENT_QUOTES, 'UTF-8'))); + passthru (VESTA_CMD . "v-open-fs-file " . $user . " " . escapeshellarg($path)); exit; } } From 3aadf37a82ffd0f883abd541af20c8601fa57e23 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Thu, 17 May 2018 18:27:28 +0300 Subject: [PATCH 3/3] Temporary fix for CentOS Vault issue --- install/vst-install-rhel.sh | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/install/vst-install-rhel.sh b/install/vst-install-rhel.sh index 1ba55cdf..436517b1 100755 --- a/install/vst-install-rhel.sh +++ b/install/vst-install-rhel.sh @@ -636,14 +636,17 @@ fi #----------------------------------------------------------# # Installing rpm packages -if [ "$remi" = 'yes' ]; then - yum -y --disablerepo=* \ - --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \ - install $software -else - yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \ - install $software -fi +#if [ "$remi" = 'yes' ]; then +# yum -y --disablerepo=* \ +# --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \ +# install $software +#else +# yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \ +# install $software +#fi + +# Temporary fix for centos vault issue +yum install $software check_result $? "yum install failed"