almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Remove all server-side timeouts from doc to pixels

Browse source 
Now we're using client-side timeouts so the server side-ones are not
needed. Implemented following the suggestion from @apyrgio [1].

[1]: https://github.com/freedomofpress/dangerzone/pull/622#discussion_r1413906514
This commit is contained in:
deeplow 2023-12-05 07:18:40 +00:00
parent 576cbd3382
commit b75417bbec
No known key found for this signature in database
GPG key ID: 577982871529A52A
2 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dangerzone/conversion/common.py
View file

@ -84,8 +84,8 @@ class DangerzoneConverter:
args: List[str], args: List[str],
*, *,
error_message: str, error_message: str,
timeout_message: str, timeout_message: Optional[str] = None,
timeout: Optional[float], timeout: Optional[float] = None,
stdout_callback: Optional[Callable] = None, stdout_callback: Optional[Callable] = None,
stderr_callback: Optional[Callable] = None, stderr_callback: Optional[Callable] = None,
) -> Tuple[bytes, bytes]: ) -> Tuple[bytes, bytes]:

15
dangerzone/conversion/doc_to_pixels.py
View file

@ -171,14 +171,6 @@ class DocumentToPixels(DangerzoneConverter):
if file_type == hwpx_file_type: if file_type == hwpx_file_type:
mime_type = "application/x-hwp+zip" mime_type = "application/x-hwp+zip"
# Get file size (in MiB)
size = os.path.getsize("/tmp/input_file") / 1024**2
# Calculate timeout for the first few file operations. The difference with the
# subsequent ones is that we don't know the number of pages, before we have a
# PDF at hand, so we rely on size heuristics.
timeout = self.calculate_timeout(size)
# Convert input document to PDF # Convert input document to PDF
conversion = conversions[mime_type] conversion = conversions[mime_type]
if conversion["type"] is None: if conversion["type"] is None:
@ -207,11 +199,6 @@ class DocumentToPixels(DangerzoneConverter):
await self.run_command( await self.run_command(
args, args,
error_message="Conversion to PDF with LibreOffice failed", error_message="Conversion to PDF with LibreOffice failed",
timeout_message=(
"Error converting document to PDF, LibreOffice timed out after"
f" {timeout} seconds"
),
timeout=timeout,
) )
pdf_filename = "/tmp/input_file.pdf" pdf_filename = "/tmp/input_file.pdf"
# XXX: Sometimes, LibreOffice can fail with status code 0. So, we need to # XXX: Sometimes, LibreOffice can fail with status code 0. So, we need to
@ -278,8 +265,6 @@ class DocumentToPixels(DangerzoneConverter):
await self.run_command( await self.run_command(
unzip_args, unzip_args,
error_message="LibreOffice extension installation failed (unzipping)", error_message="LibreOffice extension installation failed (unzipping)",
timeout_message="unzipping LibreOffice extension timed out 5 seconds",
timeout=5,
) )
def detect_mime_type(self, path: str) -> str: def detect_mime_type(self, path: str) -> str: