maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- fix htpasswd stuff in lighty, fixes #281

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-06-17 05:56:36 +00:00
parent 6986ffefbe
commit 530b6da6e8
1 changed files with 17 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -193,23 +193,6 @@ class lighttpd
if(!in_array($row_htpasswds['path'], $needed_htpasswds)) if(!in_array($row_htpasswds['path'], $needed_htpasswds))
{ {
if(empty($needed_htpasswds))
{
$auth_backend_loaded[$domain['ipandport']] = 'yes';
if(!$this->auth_backend_loaded)
{
$htaccess_text.= ' auth.backend = "htpasswd"' . "\n";
}
$htaccess_text.= ' auth.backend.htpasswd.userfile = "' . makeCorrectFile($this->settings['system']['apacheconf_htpasswddir'] . '/' . $filename) . '"' . "\n";
$htaccess_text.= ' auth.require = ( ' . "\n";
}
else
{
$htaccess_text.= ' ,' . "\n";
}
if(!isset($this->needed_htpasswds[$filename])) { if(!isset($this->needed_htpasswds[$filename])) {
$this->needed_htpasswds[$filename] = ''; $this->needed_htpasswds[$filename] = '';
} }
@@ -219,20 +202,24 @@ class lighttpd
$this->needed_htpasswds[$filename].= $row_htpasswds['username'] . ':' . $row_htpasswds['password'] . "\n"; $this->needed_htpasswds[$filename].= $row_htpasswds['username'] . ':' . $row_htpasswds['password'] . "\n";
} }
$needed_htpasswds[] = $row_htpasswds['path'];
$htaccess_path = substr($row_htpasswds['path'], strlen($domain['documentroot']) - 1); $htaccess_path = substr($row_htpasswds['path'], strlen($domain['documentroot']) - 1);
$htaccess_text.= ' "' . makeCorrectDir($htaccess_path) . '" =>' . "\n"; $htaccess_path = makeCorrectDir($htaccess_path);
$htaccess_text.= ' (' . "\n";
$htaccess_text.= ' "method" => "basic",' . "\n";
$htaccess_text.= ' "realm" => "Restricted Area",' . "\n";
$htaccess_text.= ' "require" => "user=' . $row_htpasswds['username'] . '"' . "\n";
$htaccess_text.= ' )' . "\n";
}
}
if(strlen(trim($htaccess_text)) > 0) $htaccess_text.= ' $HTTP["url"] =~ "^'.$htaccess_path.'" {' . "\n";
{ $htaccess_text.= ' auth.backend = "htpasswd"' . "\n";
$htaccess_text.= ' )' . "\n"; $htaccess_text.= ' auth.backend.htpasswd.userfile = "' . makeCorrectFile($this->settings['system']['apacheconf_htpasswddir'] . '/' . $filename) . '"' . "\n";
$htaccess_text.= ' auth.require = ( ' . "\n";
$htaccess_text.= ' "' . $htaccess_path . '" =>' . "\n";
$htaccess_text.= ' (' . "\n";
$htaccess_text.= ' "method" => "basic",' . "\n";
$htaccess_text.= ' "realm" => "Restricted Area",' . "\n";
$htaccess_text.= ' "require" => "valid-user"' . "\n";
$htaccess_text.= ' )' . "\n";
$htaccess_text.= ' )' . "\n";
$htaccess_text.= ' }' . "\n";
$needed_htpasswds[] = $row_htpasswds['path'];
}
} }
return $htaccess_text; return $htaccess_text;
@@ -578,7 +565,7 @@ class lighttpd
$diroption_text.= '(' . "\n"; $diroption_text.= '(' . "\n";
$diroption_text.= ' "method" => "basic",' . "\n"; $diroption_text.= ' "method" => "basic",' . "\n";
$diroption_text.= ' "realm" => "Restricted Area",' . "\n"; $diroption_text.= ' "realm" => "Restricted Area",' . "\n";
$diroption_text.= ' "require" => "user=' . $row_htpasswds['username'] . '"' . "\n"; $diroption_text.= ' "require" => "valid-user"' . "\n";
$diroption_text.= ')' . "\n"; $diroption_text.= ')' . "\n";
if($this->auth_backend_loaded[$domain['ssl_ipandport']] == 'yes') if($this->auth_backend_loaded[$domain['ssl_ipandport']] == 'yes')