beenull/picodav
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix handling of auth

Browse source
This commit is contained in:
bohwaz 2022-11-22 16:11:28 +01:00
parent cff0f429b9
commit f93b8f78f6
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
index.php
View file

@ -1786,7 +1786,7 @@ namespace PicoDAV
public function route(?string $uri = null): bool public function route(?string $uri = null): bool
{ {
if (!ANONYMOUS_WRITE && !ANONYMOUS_READ) { if (!ANONYMOUS_WRITE && !ANONYMOUS_READ && !$this->storage->auth()) {
$this->requireAuth(); $this->requireAuth();
return true; return true;
} }
@ -1796,10 +1796,6 @@ namespace PicoDAV
protected function requireAuth(): void protected function requireAuth(): void
{ {
if ($this->storage->auth()) {
return;
}
http_response_code(401); http_response_code(401);
header('WWW-Authenticate: Basic realm="Please login"'); header('WWW-Authenticate: Basic realm="Please login"');
echo '<h2>Error 401</h2><h1>You need to login to access this.</h1>'; echo '<h2>Error 401</h2><h1>You need to login to access this.</h1>';
@ -1867,11 +1863,11 @@ RewriteRule ^.*$ /index.php [END]
$fp = fopen(__FILE__, 'r'); $fp = fopen(__FILE__, 'r');
if ($relative_uri == '.webdav/webdav.js') { if ($relative_uri == '.webdav/webdav.js') {
fseek($fp, 50046, SEEK_SET); fseek($fp, 50022, SEEK_SET);
echo fread($fp, 27769); echo fread($fp, 27769);
} }
else { else {
fseek($fp, 50046 + 27769, SEEK_SET); fseek($fp, 50022 + 27769, SEEK_SET);
echo fread($fp, 6988); echo fread($fp, 6988);
} }

6
server.php
View file

@ -510,7 +510,7 @@ namespace PicoDAV
public function route(?string $uri = null): bool public function route(?string $uri = null): bool
{ {
if (!ANONYMOUS_WRITE && !ANONYMOUS_READ) { if (!ANONYMOUS_WRITE && !ANONYMOUS_READ && !$this->storage->auth()) {
$this->requireAuth(); $this->requireAuth();
return true; return true;
} }
@ -520,10 +520,6 @@ namespace PicoDAV
protected function requireAuth(): void protected function requireAuth(): void
{ {
if ($this->storage->auth()) {
return;
}
http_response_code(401); http_response_code(401);
header('WWW-Authenticate: Basic realm="Please login"'); header('WWW-Authenticate: Basic realm="Please login"');
echo '<h2>Error 401</h2><h1>You need to login to access this.</h1>'; echo '<h2>Error 401</h2><h1>You need to login to access this.</h1>';