mirror of
https://github.com/OpenXE-org/OpenXE.git
synced 2024-11-14 12:07:15 +01:00
.htaccess security check feature with automatic repair upon login - amended - removed writing to .htaccess
This commit is contained in:
parent
e3b7634581
commit
7a530e1274
@ -16,3 +16,4 @@ Order deny,allow
|
||||
Order Allow,Deny
|
||||
Allow from all
|
||||
</Files>
|
||||
# end
|
||||
|
@ -571,6 +571,9 @@ class Acl
|
||||
public function Login()
|
||||
{
|
||||
|
||||
include dirname(__DIR__).'/../version.php';
|
||||
$this->app->Tpl->Set('XENTRALVERSION',"V.".$version_revision);
|
||||
|
||||
$result = $this->CheckHtaccess();
|
||||
if ($result !== true) {
|
||||
$this->app->Tpl->Set('LOGINWARNING_TEXT', "Achtung: Zugriffskonfiguration (htaccess) fehlerhaft. Bitte wenden Sie sich an Ihren an Ihren Administrator. <br>($result)");
|
||||
@ -1219,7 +1222,8 @@ class Acl
|
||||
// true if ok, else error text
|
||||
protected function CheckHtaccess() : mixed {
|
||||
|
||||
$nominal = array('# Generated file from class.acl.php
|
||||
$nominal = array('
|
||||
# Generated file from class.acl.php
|
||||
# For detection of htaccess functionality
|
||||
SetEnv OPENXE_HTACCESS on
|
||||
# Disable directory browsing
|
||||
@ -1236,22 +1240,27 @@ Order deny,allow
|
||||
<Files "index.php">
|
||||
Order Allow,Deny
|
||||
Allow from all
|
||||
</Files>',
|
||||
'# Generated file from class.acl.php
|
||||
</Files>
|
||||
# end
|
||||
',
|
||||
'
|
||||
# Generated file from class.acl.php
|
||||
# Disable directory browsing
|
||||
Options -Indexes
|
||||
# Deny access to all *.php
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
<Files *.php>
|
||||
<FilesMatch "\.(css|jpg|jpeg|gif|png|svg|js)$">
|
||||
Order Allow,Deny
|
||||
Deny from all
|
||||
</Files>
|
||||
Allow from all
|
||||
</FilesMatch>
|
||||
# Allow access to index.php
|
||||
<Files index.php>
|
||||
Order Allow,Deny
|
||||
Allow from all
|
||||
</Files>');
|
||||
</Files>
|
||||
# end
|
||||
');
|
||||
|
||||
$script_file_name = $_SERVER['SCRIPT_FILENAME'];
|
||||
$htaccess_path = array(
|
||||
@ -1259,20 +1268,16 @@ Allow from all
|
||||
dirname($script_file_name)."/.htaccess"); // www
|
||||
|
||||
for ($count = 0;$count < 2;$count++) {
|
||||
$htaccess = trim(file_get_contents($htaccess_path[$count]));
|
||||
$htaccess_nominal = trim($nominal[$count]);
|
||||
|
||||
$htaccess = file_get_contents($htaccess_path[$count]);
|
||||
$result = strcmp($htaccess,$htaccess_nominal);
|
||||
|
||||
$result = strcmp(trim($htaccess[$count]),trim($nominal[$count]));
|
||||
|
||||
if (($result !== 0) || ($htaccess === false)) {
|
||||
$result = file_put_contents($htaccess_path[$count],trim($nominal[$count]));
|
||||
if ($result === false) {
|
||||
|
||||
if ($htaccess === false) {
|
||||
return("FATAL: ".$htaccess_path[$count]." nicht vorhanden und kann nicht korrigiert werden.");
|
||||
}
|
||||
return("FATAL: ".$htaccess_path[$count]." fehlerhaft und kann nicht korrigiert werden.");
|
||||
}
|
||||
if ($result !== 0) {
|
||||
return("FATAL: ".$htaccess_path[$count]." fehlerhaft.");
|
||||
}
|
||||
if ($htaccess === false) {
|
||||
return("FATAL: ".$htaccess_path[$count]." nicht vorhanden.");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -4,12 +4,13 @@ Options -Indexes
|
||||
# Deny access to all *.php
|
||||
Order deny,allow
|
||||
Allow from all
|
||||
<Files *.php>
|
||||
<FilesMatch "\.(css|jpg|jpeg|gif|png|svg|js)$">
|
||||
Order Allow,Deny
|
||||
Deny from all
|
||||
</Files>
|
||||
Allow from all
|
||||
</FilesMatch>
|
||||
# Allow access to index.php
|
||||
<Files index.php>
|
||||
Order Allow,Deny
|
||||
Allow from all
|
||||
</Files>
|
||||
# end
|
||||
|
@ -37,12 +37,9 @@
|
||||
[PAGE]
|
||||
<div id="login-footer">
|
||||
<div class="copyright">
|
||||
© [YEAR] by OpenXE-org & Xentral ERP Software GmbH.
|
||||
<br>
|
||||
[WAWIVERSION]
|
||||
</br>
|
||||
OpenXE is free open source software under AGPL-3.0 license, based on <a href="https://xentral.com" target="_blank">Xentral®</a>.
|
||||
<!-- dead link [LIZENZHINWEIS] -->
|
||||
© [YEAR] by OpenXE-org & Xentral ERP Software GmbH.<br>
|
||||
OpenXE is free open source software under AGPL-3.0 license, based on <a href="https://xentral.com" target="_blank">Xentral®</a>.<br>
|
||||
[XENTRALVERSION]
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user