Fix Documents, Pictures, Music etc are symlinks in #220
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
added 2 commits
February 9, 2021 09:03
When a user has one or several `XDG_SPECIAL_DIRS` folders symlinked in their real home folder to elsewhere in their real home folder `common/desktop-exports` will attempt to mv those folders to themselves. * guard `mv` calls with test for `is_subpath` to ensure that we're only moving symlinks we created. Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
If readlink fails, it will output on stderr. * Throw away stderr Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
|
This looks sensible. Can you also propose these changes to the snapcraft extensions? |
|
willdo |
lucyllewy
pushed a commit
to diddlesnaps/app-builder
that referenced
this pull request
Feb 9, 2021
When a user has one or several `XDG_SPECIAL_DIRS` folders symlinked in their real home folder to elsewhere in their real home folder `desktop-common.sh` will attempt to mv those folders to themselves. Because we are executing this script with `bash -e`, this prevents any Snap with the `home` interface built with these scripts from launching when the user has moved any of their Documents, Pictures, Music, etc. and replaced with a symlink. * guard `mv` calls with test for `is_subpath` to ensure that we're only moving symlinks we created. See related PRs on Snapcraft-desktop-helpers and Snapcraft: * ubuntu/snapcraft-desktop-helpers#220 * canonical/snapcraft#3435 Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
develar
pushed a commit
to develar/app-builder
that referenced
this pull request
Mar 1, 2021
When a user has one or several `XDG_SPECIAL_DIRS` folders symlinked in their real home folder to elsewhere in their real home folder `desktop-common.sh` will attempt to mv those folders to themselves. Because we are executing this script with `bash -e`, this prevents any Snap with the `home` interface built with these scripts from launching when the user has moved any of their Documents, Pictures, Music, etc. and replaced with a symlink. * guard `mv` calls with test for `is_subpath` to ensure that we're only moving symlinks we created. See related PRs on Snapcraft-desktop-helpers and Snapcraft: * ubuntu/snapcraft-desktop-helpers#220 * canonical/snapcraft#3435 Signed-off-by: Daniel Llewellyn <diddledan@ubuntu.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a user has one or several
XDG_SPECIAL_DIRSfolders symlinked in their real home folder to elsewhere in their real home foldercommon/desktop-exportswill attempt to mv those folders to themselves.mvcalls with test foris_subpathto ensure that we're only moving symlinks we created.While this is not a fatal error here, the electron-builder copies are using
bash -eso they fail hard. I will forward these changes to electron-builder once reviewed here... (currently symlinks for Documents etc, combined with the electron-builder default of plugginghome, cause electron-builder-built snaps to refuse to launch because themvcalls break the execution due tobash -e.)Signed-off-by: Daniel Llewellyn diddledan@ubuntu.com