[IMP] fs_attachment: No crash on missing file

When trying to get access to files stored into an external filesystem, don't crash if the files cannot be accessed. This is necessary to avoid blocking Odoo's operation if an external system is not accessible.
OCA · Apr 22, 2024 · fa68412 · fa68412
1 parent 98881a0
commit fa68412
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 8 deletions.
diff --git a/fs_attachment/README.rst b/fs_attachment/README.rst
@@ -7,7 +7,7 @@ Base Attachment Object Store
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:9ab4b6c2184a7bb445c236b1eccfbe9b7b7b12e3deb1b123cfb6c0231adea82c
+   !! source digest: sha256:ff0b13a4ee83c99cf06515715560662929eed6a28cbcec582ff2add0d7070859
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/fs_attachment/models/ir_attachment.py b/fs_attachment/models/ir_attachment.py
@@ -369,8 +369,14 @@ def _set_attachment_data(self, asbytes) -> None:  # pylint: disable=missing-retu
     def _storage_file_read(self, fname: str) -> bytes | None:
         """Read the file from the filesystem storage"""
         fs, _storage, fname = self._fs_parse_store_fname(fname)
-        with fs.open(fname, "rb") as f:
-            return f.read()
+        try:
+            with fs.open(fname, "rb") as f:
+                return f.read()
+        except IOError:
+            _logger.info(
+                "Error reading %s on storage %s", fname, _storage, exc_info=True
+            )
+        return b""
 
     @api.model
     def _storage_file_write(self, bin_data: bytes) -> str:

diff --git a/fs_attachment/readme/newsfragments/361.bugfix b/fs_attachment/readme/newsfragments/361.bugfix
@@ -0,0 +1,7 @@
+No crash o missign file.
+
+Prior to this change, Odoo was crashing as soon as access to a file stored into
+an external filesytem was not possible. This can lead to a complete system block.
+This change prevents this kind of blockage by ignoring access error to files
+stored into external system on read operations. These kind of errors are logged
+into the log files to traceability.
diff --git a/fs_attachment/static/description/index.html b/fs_attachment/static/description/index.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -8,10 +9,11 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
+:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
+Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -274,7 +276,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: grey; } /* line numbers */
+pre.code .ln { color: gray; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -300,7 +302,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic {
+span.problematic, pre.problematic {
   color: red }
 
 span.section-subtitle {
@@ -366,7 +368,7 @@ <h1 class="title">Base Attachment Object Store</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:9ab4b6c2184a7bb445c236b1eccfbe9b7b7b12e3deb1b123cfb6c0231adea82c
+!! source digest: sha256:ff0b13a4ee83c99cf06515715560662929eed6a28cbcec582ff2add0d7070859
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/storage/tree/16.0/fs_attachment"><img alt="OCA/storage" src="https://img.shields.io/badge/github-OCA%2Fstorage-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/storage-16-0/storage-16-0-fs_attachment"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/storage&amp;target_branch=16.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>In some cases, you need to store attachment in another system that the Odoo’s
@@ -753,7 +755,9 @@ <h2><a class="toc-backref" href="#toc-entry-16">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-17">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
+<a class="reference external image-reference" href="https://odoo-community.org">
+<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
+</a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>