Stop following symlinks 216 #224
Conversation
Add a check for symlinks when we check if a path is a directory and treat the symlink as a normal file. Gitless will NOT follow the symlinks, because it could pull in the .git/ directory, files outside of the repository or, in the worst case, the entire filesystem. This follows the behavior of git. Git will commit symlinks into the repository and recreate the links on filesystems that support it when the file is downloaded.
gitless/tests/utils.py
Outdated
| @@ -82,6 +82,16 @@ def onerror(func, path, unused_exc_info): # error handler for rmtree | |||
| logging.debug('Removed dir {0}'.format(path)) | |||
|
|
|||
|
|
|||
| def symlink(src, dst, target_is_directory=False, *, dir_fd=None): | |||
There was a problem hiding this comment.
is the * useful for something in this case? It doesn't seem like you are using it and it breaks the python 2 tests
|
Huge combination of OS and Python version support... I need a matrix. Here's the best explanation I have: https://docs.python.org/3.5/library/os.html#os.symlink Python 3 supports os.symlink() on all platforms, but might throw exceptions in the implementation. In python 2, there is no method os.symlink() in the os module for Windows (https://docs.python.org/2.7/library/os.html#os.symlink). Hopefully my error handling catches all the cases now. |
Catch AttributeError for os module missing symlink method in Python 2 implementations on Windows. All the flavors of error that could happen in a symlink call should be handled now.
Tests & CI are not running? Or I can't see any results. Anything I need to do specifically to kick those off? |
gitless/tests/utils.py
Outdated
| @@ -82,6 +82,22 @@ def onerror(func, path, unused_exc_info): # error handler for rmtree | |||
| logging.debug('Removed dir {0}'.format(path)) | |||
|
|
|||
|
|
|||
| def symlink(src, dst, target_is_directory=False, dir_fd=None): | |||
| try: | |||
| os.symlink(src, dst, target_is_directory, dir_fd=dir_fd) | |||
There was a problem hiding this comment.
In python 2 the symlink method has a different signature. It doesn't look like you are using target_is_directory and dir_fd. Perhaps we can remove those parameters? Then tests should pass on python 2 and 3
Not sure what's going on. Looks like Travis is getting confused, but I can trigger builds manually. I changed See the comment I made on the |
Make the os.symlink method call signature the same as python 2. The arguments and parameters for symlinking to directories and for the file descriptor of the directory were removed. Those were added in python 3 causing tests to fail in python 2.
|
Looks like tests are passing in both now. Next time I'll get them set up and running before I commit... |
|
Thank you for fixing this bug! |
|
Fixes #216 |
Add a check for symlinks when we check if a path is a directory and treat the symlink as a normal
file. Gitless will NOT follow the symlinks, because it could pull in the .git/ directory, files
outside of the repository or, in the worst case, the entire filesystem. This follows the behavior of
git. Git will commit symlinks into the repository and recreate the links on filesystems that support
it when the file is downloaded.