paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Handle a special case where the none marker exists in a way which could create an absolute path (#8060)

Browse Source
This commit is contained in:
Trenton H 2024-10-27 18:51:07 -07:00 committed by GitHub
parent 0d96cd03d5
commit ad23cce2e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/documents/file_handling.py
View File

@ -111,6 +111,7 @@ def generate_filename(
rendered_filename = rendered_filename.replace("/-none-/", "/") rendered_filename = rendered_filename.replace("/-none-/", "/")
rendered_filename = rendered_filename.replace(" -none-", "") rendered_filename = rendered_filename.replace(" -none-", "")
rendered_filename = rendered_filename.replace("-none-", "") rendered_filename = rendered_filename.replace("-none-", "")
rendered_filename = rendered_filename.strip(os.sep)
rendered_filename = rendered_filename.replace( rendered_filename = rendered_filename.replace(
"-none-", "-none-",

16
src/documents/tests/test_file_handling.py
View File

@ -960,18 +960,28 @@ class TestFilenameGeneration(DirectoriesMixin, TestCase):
- the generated filename uses the defined storage path for the document - the generated filename uses the defined storage path for the document
- the generated filename does not include "none" in the place undefined field - the generated filename does not include "none" in the place undefined field
""" """
sp = StoragePath.objects.create(
path="TestFolder/{{asn}}/{{created}}",
)
doc = Document.objects.create( doc = Document.objects.create(
title="does not matter", title="does not matter",
created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)), created=timezone.make_aware(datetime.datetime(2020, 6, 25, 7, 36, 51, 153)),
mime_type="application/pdf", mime_type="application/pdf",
pk=2, pk=2,
checksum="2", checksum="2",
storage_path=StoragePath.objects.create( storage_path=sp,
path="TestFolder/{{asn}}/{{created}}",
),
) )
self.assertEqual(generate_filename(doc), "TestFolder/2020-06-25.pdf") self.assertEqual(generate_filename(doc), "TestFolder/2020-06-25.pdf")
# Special case, undefined variable, then defined at the start of the template
# This could lead to an absolute path after we remove the leading -none-, but leave the leading /
# -none-/2020/ -> /2020/
sp.path = (
"{{ owner_username }}/{{ created_year }}/{{ correspondent }}/{{ title }}"
)
sp.save()
self.assertEqual(generate_filename(doc), "2020/does not matter.pdf")
def test_multiple_doc_paths(self): def test_multiple_doc_paths(self):
""" """
GIVEN: GIVEN: