Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- Added `RestrictedFilestore` to limit the file access of the `NativeFilestore` to a specific
directory.
- `Filestore` creates a directory if it does not exist when creating a new file.

## Fixed

Expand Down
2 changes: 2 additions & 0 deletions src/cfdppy/filestore.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ def create_file(self, file: Path) -> FilestoreResponseStatusCode:
_LOGGER.warning("File already exists")
return FilestoreResponseStatusCode.CREATE_NOT_ALLOWED
try:
# Creates subfolders if they do not exist
file.parent.mkdir(exist_ok=True, parents=True)
with open(file, "x"):
pass
return FilestoreResponseStatusCode.CREATE_SUCCESS
Expand Down
21 changes: 21 additions & 0 deletions tests/test_restricted_filestore.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,27 @@ def test_handle_files(self):
self.assertEqual(result, FilestoreResponseStatusCode.DELETE_SUCCESS)
self.assertFalse(Path(tempdir).joinpath("renamed_file.txt").exists())

def test_create_folder_with_file(self):
with tempfile.TemporaryDirectory() as tempdir:
filestore = RestrictedFilestore(restricted_path=Path(tempdir))
new_dir = Path(tempdir).joinpath("new_dir")
self.assertFalse(new_dir.exists())
result = filestore.create_file(new_dir.joinpath("a_file.txt"))
self.assertEqual(FilestoreResponseStatusCode.CREATE_SUCCESS, result)
self.assertTrue(new_dir.exists())
self.assertTrue(new_dir.joinpath("a_file.txt").exists())

# Create more than one folder
first_folder = Path(tempdir).joinpath("first_folder")
second_folder = first_folder.joinpath("second_folder")
self.assertFalse(first_folder.exists())
self.assertFalse(second_folder.exists())
result = filestore.create_file(second_folder.joinpath("a_file.txt"))
self.assertEqual(FilestoreResponseStatusCode.CREATE_SUCCESS, result)
self.assertTrue(first_folder.exists())
self.assertTrue(second_folder.exists())
self.assertTrue(second_folder.joinpath("a_file.txt").exists())

def test_handle_directories(self):
with tempfile.TemporaryDirectory() as tempdir:
filestore = RestrictedFilestore(restricted_path=Path(tempdir))
Expand Down