imio.smartweb.common 1.2.26__py3-none-any.whl → 1.2.27__py3-none-any.whl

imio/smartweb/common/adapters.py

@@ -1,7 +1,13 @@
 # -*- coding: utf-8 -*-
 
+from imio.smartweb.common.utils import get_image_format
 from plone.namedfile.interfaces import IAvailableSizes
+from plone.namedfile.interfaces import INamedImageField
+from plone.namedfile.field import InvalidImageFile
+from plone.namedfile.utils import get_contenttype
+from zope.component import adapter
 from zope.component import getUtility
+from zope.interface import Interface
 
 
 class BaseCroppingProvider(object):
@@ -17,3 +23,25 @@ class BaseCroppingProvider(object):
         scales = list(allowed_sizes.keys())
         scales.remove("banner")
         return scales
+
+
+@adapter(INamedImageField, Interface)
+class ImageContenttypeValidator:
+    def __init__(self, field, value):
+        self.field = field
+        self.value = value
+
+    def __call__(self):
+        if self.value is None:
+            return
+        mimetype = get_image_format(self.value)
+
+        valid_mimetypes = [
+            "image/gif",
+            "image/jpeg",
+            "image/png",
+            "image/svg+xml",
+            "image/webp",
+        ]
+        if mimetype not in valid_mimetypes:
+            raise InvalidImageFile(mimetype, self.field.__name__)

imio/smartweb/common/adapters.zcml

@@ -7,4 +7,10 @@
       factory=".adapters.BaseCroppingProvider"
       />
 
+  <adapter
+      factory=".adapters.ImageContenttypeValidator"
+      provides="plone.namedfile.field.IPluggableImageFieldValidation"
+      name="smartweb_image_contenttype"
+      />
+
 </configure>

imio/smartweb/common/browser/cropping.py

@@ -51,11 +51,10 @@ class SmartwebCroppingImageScalingFactory(CroppingImageScalingFactory):
     ):
         storage = Storage(self.context)
         self.box = storage.read(fieldname, scale)
-        if scale is not None:
-            if "portrait" in scale or "paysage" in scale or "carre" in scale:
-                orientation = scale.split("_")[0]
-                # take cropping box from "affiche" scale
-                self.box = storage.read(fieldname, f"{orientation}_affiche")
+        if scale and ("portrait" in scale or "paysage" in scale or "carre" in scale):
+            orientation = scale.split("_")[0]
+            # take cropping box from "affiche" scale
+            self.box = storage.read(fieldname, f"{orientation}_affiche")
         if self.box:
             mode = "contain"
         else:

imio/smartweb/common/configure.zcml

@@ -1,6 +1,7 @@
 <configure
     xmlns="http://namespaces.zope.org/zope">
 
+  <include package="z3c.unconfigure" file="meta.zcml" />
   <include package="collective.taxonomy" />
   <include package="eea.facetednavigation" />
   <include package="eea.facetednavigation" file="meta.zcml" />

imio/smartweb/common/utils.py

@@ -1,9 +1,11 @@
 # -*- coding: utf-8 -*-
 
 from Acquisition import aq_parent
+from io import BytesIO
 from imio.smartweb.common.config import TRANSLATED_VOCABULARIES
 from imio.smartweb.common.interfaces import ICropping
 from imio.smartweb.locales import SmartwebMessageFactory as _
+from PIL import Image
 from plone import api
 from plone.app.imagecropping.storage import Storage
 from plone.dexterity.utils import iterSchemata
@@ -203,3 +205,27 @@ def get_parent_of_type(context, content_type):
             return parent
         parent = aq_parent(parent)
     return None
+
+
+def _get_pil_mimetype(pil_image):
+    """Retourne le MIME type d'une image PIL."""
+    format_to_mime = {
+        "JPEG": "image/jpeg",
+        "PNG": "image/png",
+        "GIF": "image/gif",
+        "BMP": "image/bmp",
+        "TIFF": "image/tiff",
+        "WEBP": "image/webp",
+        "SVG": "image/svg+xml",
+    }
+    return format_to_mime.get(pil_image.format, "application/octet-stream")
+
+
+def get_image_format(named_blob_image):
+    """Détecte le format d'une image à partir de son contenu binaire."""
+    if named_blob_image and named_blob_image.data:
+        try:
+            with Image.open(BytesIO(named_blob_image.data)) as img:
+                return _get_pil_mimetype(img)
+        except Exception:
+            return None

{imio.smartweb.common-1.2.26.dist-info → imio.smartweb.common-1.2.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: imio.smartweb.common
-Version: 1.2.26
+Version: 1.2.27
 Summary: Common utilities, vocabularies, taxonomies for imio.smartweb & co products
 Home-page: https://github.com/imio/imio.smartweb.common
 Author: iMio
@@ -51,6 +51,18 @@ Requires-Dist: plone.app.robotframework[debug]; extra == "test"
 Requires-Dist: plone.restapi[test]; extra == "test"
 Requires-Dist: freezegun; extra == "test"
 Requires-Dist: mock; extra == "test"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: project-url
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 .. This README is meant for consumption by humans and pypi. Pypi can render rst files so please do not use Sphinx features.
    If you want to learn more about writing documentation, please check out: http://docs.plone.org/about/documentation_styleguide.html
@@ -162,6 +174,13 @@ Changelog
 =========
 
 
+1.2.27 (2025-03-19)
+-------------------
+
+- WEB-4122 : Create adapter/validator to filter valid image mimetype in our solutions
+  [boulch]
+
+
 1.2.26 (2025-03-12)
 -------------------
 
@@ -218,7 +237,8 @@ Changelog
 1.2.19 (2025-01-09)
 -------------------
 
-- Nothing changed yet.
+- WEB-4153 : Override @vocabularies endpoint to add a cache ruleset on it
+  [remdub]
 
 
 1.2.18 (2024-07-01)

{imio.smartweb.common-1.2.26.dist-info → imio.smartweb.common-1.2.27.dist-info}/RECORD

@@ -1,11 +1,11 @@
-imio.smartweb.common-1.2.26-py3.8-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
+imio.smartweb.common-1.2.27-py3.12-nspkg.pth,sha256=XZ3YhlzwpUCC8tXtelHRqxVxo3NWomIiMsUfUshrbeE,1011
 imio/smartweb/common/__init__.py,sha256=Na9XBfEQUMrm2c5jbqQgwWeg40ih0aXVG1vT8NeAjMQ,2709
-imio/smartweb/common/adapters.py,sha256=rLlObjqZm3hs2hgUT-LmJytwhT-E1rTvbpIi0mmKQqY,610
-imio/smartweb/common/adapters.zcml,sha256=ndYNj0J_BFfVpX_7JhY2asSwLzXG-WmjLdfwL9hX_No,254
+imio/smartweb/common/adapters.py,sha256=1v1OGFJq8sW8R6bQyxQQyrQroQCT0LNm-BbavZj6KGc,1463
+imio/smartweb/common/adapters.zcml,sha256=VO3luZDtRL9FIIEghxPrqpx8paZF3m6MGEy-8kF1sOQ,437
 imio/smartweb/common/caching.py,sha256=aN7gX9rT63fnmUuZnx82Mbu3ghjJUeOiLvLEp9OiFm4,895
 imio/smartweb/common/caching_overrides.zcml,sha256=ysa5DgVGzO1Fp22d9Wg-vNyLlqfRR77WBV-7L6j0Hpo,526
 imio/smartweb/common/config.py,sha256=imgOo0_BBIbXGFNvBnhPReLOSY4JqIOH_QCAl0j0XGI,435
-imio/smartweb/common/configure.zcml,sha256=IQMv1giqgunu55osPlnVAq2MwM3FjJOGPgrxuO1e_74,894
+imio/smartweb/common/configure.zcml,sha256=5TiJ-6jxqeuc8ab9TWDP7B37t6TWsxb8BMQLQKqIwO4,951
 imio/smartweb/common/contact_utils.py,sha256=Pr-Nhz9MRnfirZ7RbmF5JZw9fX4gWa0dWkvJlQBiDKY,11341
 imio/smartweb/common/indexers.py,sha256=TvvKglWI0JM5_jwetlpvqcjwkid_2PhaCZGKZV4sD34,1148
 imio/smartweb/common/indexers.zcml,sha256=End1fDod99sr0xw8PaakgeTAZYq-HLOGw3MNA8K_CTs,324
@@ -19,7 +19,7 @@ imio/smartweb/common/subscribers.py,sha256=pbPQJ1YrfPlYCfxLAJ5sOy_5OToAfs2egX68z
 imio/smartweb/common/subscribers.zcml,sha256=8v2lqNNVAHlrh2G3jtjVgr3Asrw8WJLS9jSX5U6juFg,971
 imio/smartweb/common/testing.py,sha256=GKlYMHJUSxZFVX0o_R_c_Au1VYlkd-GjykQqfONHv7I,1985
 imio/smartweb/common/testing.zcml,sha256=7N-ALtklyWeLSzZmlxN2Tp-aZe_3An--w_6BGl1991E,172
-imio/smartweb/common/utils.py,sha256=S4Kygk-ukllxNdNOLX6D0Zl5SDVoWaS2JqV7MbGuBkA,6952
+imio/smartweb/common/utils.py,sha256=sSq72k41ELmlW5jc7JkRgKLXKQbbd68-87JtEDHmTCQ,7738
 imio/smartweb/common/vocabularies.py,sha256=QRIOWLOALzZDM92o1iUTWgDBBcrdd9BYz7miNjpYCDA,3835
 imio/smartweb/common/vocabularies.zcml,sha256=iFJer5q3wabBp_EZivPPVUqI1_9w5P_Ft1RGJB5Yqxs,940
 imio/smartweb/common/behaviors/__init__.py,sha256=iwhKnzeBJLKxpRVjvzwiRE63_zNpIBfaKLITauVph-0,24
@@ -29,7 +29,7 @@ imio/smartweb/common/behaviors/topics.py,sha256=K9XkhTBxxp_nBBeQ-ovUpmOc6raXIiYq
 imio/smartweb/common/browser/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/browser/collective_taxonomy_controlpanel.py,sha256=PVeXOr0cDYpg7g695wtrhsuSc6MSO0d_JGvcQUaDWRM,1908
 imio/smartweb/common/browser/configure.zcml,sha256=agEY6fPCePV2UnzvVMUF-Wft0nU6HaHnMwv_lCk4_dQ,3534
-imio/smartweb/common/browser/cropping.py,sha256=7xkTvs_0qUo9tC2tAIj77ZQn2RClKOgAwE0L6WhGGxg,2720
+imio/smartweb/common/browser/cropping.py,sha256=MjnXr-sfzjbJnscuX6rfyyEiwTmH9Pmu0sh_WirNnUk,2686
 imio/smartweb/common/browser/description.pt,sha256=ZXKpsMQDJGC0dxVUg5v1W6LsG1_OWuYuWevZuF-Zn2Y,151
 imio/smartweb/common/browser/description.py,sha256=BRpHkVzwyeM-SUzkEbtHn2fm8pQREtcHIW7feoQlBPQ,517
 imio/smartweb/common/browser/edit_taxonomy_data.pt,sha256=PWM7SGaWAkrPZ7jxVRBry8ed5_1PD7fucCMgmMCx9tg,6937
@@ -137,10 +137,10 @@ imio/smartweb/common/viewlets/skip_to_content.pt,sha256=-tb3HkoGG8H_gBZL4eiJrPcW
 imio/smartweb/common/viewlets/skip_to_content.py,sha256=wm22NUf8Qh5uzz8p4vkLCdFNiDv9zUGAueRyXAIXQDo,496
 imio/smartweb/common/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 imio/smartweb/common/widgets/select.py,sha256=vfVdbecH7qDfJvWV6TfkpqocD6AA5G4yIq7XqSOuVNw,1142
-imio.smartweb.common-1.2.26.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
-imio.smartweb.common-1.2.26.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
-imio.smartweb.common-1.2.26.dist-info/METADATA,sha256=SHbP0lM5sL-Ir2Ulg7dO7MWyI2AQAHstbGnilpO8jfM,16550
-imio.smartweb.common-1.2.26.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-imio.smartweb.common-1.2.26.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
-imio.smartweb.common-1.2.26.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
-imio.smartweb.common-1.2.26.dist-info/RECORD,,
+imio.smartweb.common-1.2.27.dist-info/LICENSE.GPL,sha256=gXf5dRMhNSbfLPYYTY_5hsZ1r7UU1OaKQEAQUhuIBkM,18092
+imio.smartweb.common-1.2.27.dist-info/LICENSE.rst,sha256=5dd78Fdt0e-oM2ICBrMpjHnT8vEP-jhBDF7akXni6B4,655
+imio.smartweb.common-1.2.27.dist-info/METADATA,sha256=m6KkmZrY2eaI-5xgj43Atbgp2J6Hr1c4gwEhaQNnrAs,16995
+imio.smartweb.common-1.2.27.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+imio.smartweb.common-1.2.27.dist-info/namespace_packages.txt,sha256=Pg8AH8t9viMMW1hJbNZvTy_n2jXG2igIYUpon5RA4Js,19
+imio.smartweb.common-1.2.27.dist-info/top_level.txt,sha256=ZktC0EGzThvMTAin9_q_41rzvvfMT2FYbP8pbhSLMSA,5
+imio.smartweb.common-1.2.27.dist-info/RECORD,,

{imio.smartweb.common-1.2.26.dist-info → imio.smartweb.common-1.2.27.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.2)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any