Ajout de la gestion de l'encodage du contenu dans le modèle PasteDataAware et mise à jour des routes pour utiliser le contenu en texte brut. Suppression de la fonction de hachage inutilisée.

Author: socraticDevBlog

backend/app/models.py

@@ -1,8 +1,8 @@
+import base64
 import time
 from typing import Optional
 
 from pydantic import BaseModel, Field
-from app.utils import hash_value
 
 
 class PasteInputModel(BaseModel):
@@ -38,15 +38,59 @@ class PasteDataAware:
     content: str
     client_id: str
     created_at: int
+    content_encoding: str = Field(
+        default="utf-8",
+        description="Encoding used for the content. Default is 'utf-8'.",
+    )
 
     def __init__(
         self,
         content: str,
         client_id: str,
         created_at: Optional[int] = None,
         paste_id: str = None,
+        content_encoding: str = "utf-8",
     ):
-        self.paste_id = hash_value(value=content) if paste_id is None else paste_id
-        self.content = content
+        self.paste_id = paste_id
+        self._content = (
+            content
+            if self._is_base64(content)
+            else base64.b64encode(content.encode(content_encoding)).decode(
+                content_encoding
+            )
+        )
         self.client_id = client_id
         self.created_at = int(time.time()) if created_at is None else created_at
+        self.content_encoding = content_encoding
+
+    def _is_base64(self, s: str) -> bool:
+        """
+        Check if a string is valid Base64.
+
+        Args:
+            s (str): The string to check.
+
+        Returns:
+            bool: True if the string is valid Base64, False otherwise.
+        """
+        try:
+            # Decode and re-encode to verify Base64 validity
+            return base64.b64encode(base64.b64decode(s)).decode("utf-8") == s
+        except Exception:
+            return False
+
+    def plain_content(self):
+        """
+        Returns the content of the paste in plain text format.
+
+        """
+        return base64.b64decode(self._content.encode(self.content_encoding)).decode(
+            self.content_encoding
+        )
+
+    def base64_content(self):
+        """
+        Returns the content of the paste in base64 format.
+
+        """
+        return self._content

backend/app/routes.py

@@ -37,7 +37,7 @@ async def get_paste(id: str, request: Request, db_client=Depends(get_db_client))
     is_web_browser = "Mozilla" in user_agent or "AppleWebKit" in user_agent
 
     paste_model = PasteModel(
-        content=paste.content,
+        content=paste.plain_content(),
         paste_id=paste.paste_id,
         workspace=paste.client_id,
     )

backend/app/services/db_client.py

@@ -97,7 +97,7 @@ async def insert_paste(self, paste: PasteDataAware) -> str:
             RETURNING id, paste_id;
             """
             result = await conn.fetchrow(
-                insert_query, paste.content, paste.client_id, paste.created_at
+                insert_query, paste.base64_content(), paste.client_id, paste.created_at
             )
 
             return result["paste_id"]