From 108cd360416fab309c0d91e26187c5d51dc1f8d7 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 26 Mar 2020 17:25:03 +0100 Subject: Rev: 4639 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../mayor-base/www/include/share/net/upload.php | 15 +++++++++++++ mayor-orig/mayor-felveteli/log/mayor-felveteli.rev | 2 +- mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev | 2 +- .../mayor-installer-orig/install.d/20mysql.sh | 6 +++++ .../mayor-installer-orig/log/mayor-installer.rev | 2 +- .../log/mayor-installer-sulix.rev | 2 +- mayor-orig/mayor-jatek/log/mayor-jatek.rev | 2 +- .../log/mayor-locales-de_DE.rev | 2 +- .../log/mayor-locales-en_US.rev | 2 +- .../log/mayor-locales-jp_JP.rev | 2 +- mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 17 files changed, 48 insertions(+), 27 deletions(-) diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php index d58708ed..4aea8b8a 100644 --- a/mayor-orig/mayor-base/www/include/share/net/upload.php +++ b/mayor-orig/mayor-base/www/include/share/net/upload.php @@ -49,12 +49,27 @@ try { // You should name it uniquely. // DO NOT USE $_FILES['upfile']['name'] WITHOUT ANY VALIDATION !! // On this example, obtain safe unique name from its binary data. + + // define('CLAMAV_ENABLED',true); + if (CLAMAV_ENABLED === true) { + $safePath = escapeshellarg($_FILES['upfile']['tmp_name']); + $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove --log='/var/mayor/log/clamdscan.log'"; // --remove + $out = ''; + $int = -1; + exec($command, $out, $int); + if ($int!==0) { + if (file_exists($safePath)) unlink($safePath); + throw new RuntimeException('Szerintünk ez vírusos!!!'); + } + } + if (!move_uploaded_file($_FILES['upfile']['tmp_name'],$ADAT['subdir'].'/'.$ADAT['filename'])) { throw new RuntimeException('Nem tudtuk átmozgatni. Van jogunk írni a célkönyvtárba?'); } } catch (RuntimeException $e) { $_SESSION['alert'][] = 'info::'.$e->getMessage(); + return false; } return true; diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh index 2979f728..3d0175c8 100755 --- a/mayor-orig/mayor-installer-orig/install.d/20mysql.sh +++ b/mayor-orig/mayor-installer-orig/install.d/20mysql.sh @@ -26,3 +26,9 @@ then echo -n " futtatom a mysql_Secure_installation scriptet: " mysql_secure_installation fi +if [ "x${RELEASE}" == "x10" ] +then + echo -e "\nMariaDB/MySQL beállítások" + echo -n " futtatom a mysql_Secure_installation scriptet: " + mysql_secure_installation +fi diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev +++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev +++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev +++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev +++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 6169ebe3..3406c508 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4638 -7c04d7dfb70a7dac5bf44b5a080aae0a mayor-fenntarto-rev4638.tgz -320681a070309e09f0f85b4484524588 mayor-installer-sulix-rev4638.tgz -8a8d27bb703c8fb4ae4349861cccde30 mayor-wiki-rev4638.tgz -442b160029578e84c4d2f6a858e5b9f3 mayor-installer-rev4638.tgz -99787799c8b0486039d403d262412995 mayor-portal-rev4638.tgz -561679bc58969c7c8446f41dee75e9e2 mayor-felveteli-rev4638.tgz -130347b3a3729665d7d39b2dc2a59573 mayor-jatek-rev4638.tgz -290202bba8a3e8f26aceda07fa7ad05d mayor-locales-jp_JP-rev4638.tgz -4fec8cd164478db181b9e1c5d2bcc984 mayor-locales-de_DE-rev4638.tgz -342f21279660750bd11e1be6495b1994 mayor-locales-en_US-rev4638.tgz -c7fc720e8165be32d97deecbb1784697 mayor-naplo-rev4638.tgz -d7b34ad65c6a757a86dc79883b2233a3 mayor-base-rev4638.tgz +Revision 4639 +2d41c52f4016d1be10f4dce40ed0b93f mayor-fenntarto-rev4639.tgz +c9478de2ea95c1be83ff1e0b62e2f551 mayor-installer-sulix-rev4639.tgz +942b1ae2d0c7b63e733f7a1adbbaa0fa mayor-wiki-rev4639.tgz +cc9376be722d81207bbfa23c89fabe89 mayor-installer-rev4639.tgz +26fd8ce3ecef39bf4ee8551cd7876fbb mayor-portal-rev4639.tgz +a1908da04c7df9f409d1b744a59bdf95 mayor-felveteli-rev4639.tgz +e5bc861e6b379dcbcfb091e92b7b47f8 mayor-jatek-rev4639.tgz +a880b62b6fce28e75dc04926cec94cb7 mayor-locales-jp_JP-rev4639.tgz +f0c9d72a8997e39688dafcde61a3bc64 mayor-locales-de_DE-rev4639.tgz +518c80ceee91124cdc30dcce46734cd9 mayor-locales-en_US-rev4639.tgz +3e36f7e5a3f044eaf359b5c93e7e4c53 mayor-naplo-rev4639.tgz +39a23ad8b33e5c5f9b9c036831f8171c mayor-base-rev4639.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 7ea43f6c..d464190f 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4638 +4639 diff --git a/rev.txt b/rev.txt index 7ea43f6c..d464190f 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4638 +4639 -- cgit v1.2.3