paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-29 11:09:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Also validate the ASN value is within a range the Whoosh schema can support

Browse Source
This commit is contained in:
Trenton H 2023-01-24 09:19:38 -08:00
parent 299a69a2de
commit 4e05aba0a5
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/documents/consumer.py
View File

@ -40,6 +40,7 @@ class ConsumerError(Exception):
MESSAGE_DOCUMENT_ALREADY_EXISTS = "document_already_exists" MESSAGE_DOCUMENT_ALREADY_EXISTS = "document_already_exists"
MESSAGE_ASN_ALREADY_EXISTS = "asn_already_exists" MESSAGE_ASN_ALREADY_EXISTS = "asn_already_exists"
MESSAGE_ASN_RANGE = "asn_value_out_of_range"
MESSAGE_FILE_NOT_FOUND = "file_not_found" MESSAGE_FILE_NOT_FOUND = "file_not_found"
MESSAGE_PRE_CONSUME_SCRIPT_NOT_FOUND = "pre_consume_script_not_found" MESSAGE_PRE_CONSUME_SCRIPT_NOT_FOUND = "pre_consume_script_not_found"
MESSAGE_PRE_CONSUME_SCRIPT_ERROR = "pre_consume_script_error" MESSAGE_PRE_CONSUME_SCRIPT_ERROR = "pre_consume_script_error"
@ -132,17 +133,25 @@ class Consumer(LoggingMixin):
os.makedirs(settings.ORIGINALS_DIR, exist_ok=True) os.makedirs(settings.ORIGINALS_DIR, exist_ok=True)
os.makedirs(settings.ARCHIVE_DIR, exist_ok=True) os.makedirs(settings.ARCHIVE_DIR, exist_ok=True)
def pre_check_asn_unique(self): def pre_check_asn_value(self):
""" """
Check that if override_asn is given, it is unique Check that if override_asn is given, it is unique and within a valid range
""" """
if not self.override_asn: if not self.override_asn:
# check not necessary in case no ASN gets set # check not necessary in case no ASN gets set
return return
# Validate the range is above zero and less than int32 max
# otherwise, Whoosh can't handle it in the index
if self.override_asn < 0 or self.override_asn > 2_147_483_647:
self._fail(
MESSAGE_ASN_RANGE,
f"Not consuming {self.filename}: "
"Given ASN is out of range [0, 2147483647]",
)
if Document.objects.filter(archive_serial_number=self.override_asn).exists(): if Document.objects.filter(archive_serial_number=self.override_asn).exists():
self._fail( self._fail(
MESSAGE_ASN_ALREADY_EXISTS, MESSAGE_ASN_ALREADY_EXISTS,
f"Not consuming {self.filename}: Given ASN already" f"exists!", f"Not consuming {self.filename}: Given ASN already exists!",
) )
def run_pre_consume_script(self): def run_pre_consume_script(self):
@ -298,7 +307,7 @@ class Consumer(LoggingMixin):
self.pre_check_file_exists() self.pre_check_file_exists()
self.pre_check_directories() self.pre_check_directories()
self.pre_check_duplicate() self.pre_check_duplicate()
self.pre_check_asn_unique() self.pre_check_asn_value()
self.log("info", f"Consuming {self.filename}") self.log("info", f"Consuming {self.filename}")