upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-10 09:13:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Fix scanner mistaking socket files for directories

Browse source 
Signed-off-by: Rid <rid@cylo.io>
This commit is contained in:
Rid 2021-06-17 11:44:44 +01:00
parent 39f0aa5abe
commit 0469acfb20
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/Files/Storage/Local.php
View file

@ -169,7 +169,7 @@ class Local extends \OC\Files\Storage\Common {
$permissions = Constants::PERMISSION_SHARE;
$statPermissions = $stat['mode'];
$isDir = ($statPermissions & 0x4000) === 0x4000;
$isDir = ($statPermissions & 0x4000) === 0x4000 && !($statPermissions & 0x8000);
if ($statPermissions & 0x0100) {
$permissions += Constants::PERMISSION_READ;
}
@ -492,7 +492,7 @@ class Local extends \OC\Files\Storage\Common {
}
private function calculateEtag(string $path, array $stat): string {
if ($stat['mode'] & 0x4000) { // is_dir
if ($stat['mode'] & 0x4000 && !($stat['mode'] & 0x8000)) { // is_dir & not socket
return parent::getETag($path);
} else {
if ($stat === false) {