Fix deletion of User when system link are used in him user folder

[tanganellilore]

Signed-off-by: Lorenzo Tanganelli [email protected]

• Resolves: #

Summary

In a localstorage with localstorage.allowsymlinks enabled, if we add a symlink in a folder under <user_id> data and then we try to delete this <user_id>, we receive a delete error and user is not deleted completly because these folder are recognized as a dir and not symlink.

This beacase in the lib/private/Files/Storage/Local.php at line 140 it's used the function isDir() that , as per php documentation, ->isDir() return TRUE for symlinks of directories. Better use getType() method instead, which returns 'link' for symlinks.`

To easy fix it, without rewrite function with getType(), we can simply invert elseif in that function, checking dir after the check of isFile or isLink.

In that way we check if is file or link before and unlink it.

TODO

N/A

Checklist

• Code is properly formatted
• Sign-off message is added to all commits
• Tests (unit, integration, api and/or acceptance) are included
• Screenshots before/after for front-end changes
• Documentation (manuals or wiki) has been updated or is not required
• Backports requested where applicable (ex: critical bugfixes)

[solracsf]

Makes sense 👍

[solracsf]

/backport to stable27

[solracsf]

/backport to stable26

[solracsf]

/backport to stable25

[nfebe]

Looks good , thanks! Is there an issue for this? If so, please link it!

[tanganellilore]

I haven't open it, just put a PR. Lett me know if issue is required.

[backportbot-nextcloud]

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin/stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

[backportbot-nextcloud]

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

[backportbot-nextcloud]

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport