djgentelella 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

djgentelella/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.5.4'
+__version__ = '0.5.6'
 
 if __name__ == '__main__':
     print(__version__)

djgentelella/fields/secure.py

@@ -0,0 +1,109 @@
+import base64
+import io
+import json
+import os
+from base64 import b64encode, b64decode
+
+from Crypto.Cipher import AES
+from django.conf import settings
+from django.db import models
+
+
+def create_key(size=32):
+    key = os.urandom(size)
+    base64_encoded = base64.b64encode(key)
+    return base64_encoded.decode("utf-8")
+
+
+def get_salt_session(size=16):
+    key = settings.SECRET_KEY.encode()
+    if len(key) > size:
+        return key[:size]
+    return key
+
+
+def salt_encrypt(message, session_key=None):
+    if type(message) == str:
+        message = message.encode()
+    session_key = get_salt_session()
+    file_out = io.BytesIO()
+    cipher_aes = AES.new(session_key, AES.MODE_EAX)
+    ciphertext, tag = cipher_aes.encrypt_and_digest(message)
+    [file_out.write(x) for x in (cipher_aes.nonce, tag, ciphertext)]
+    file_out.seek(0)
+    return b64encode(file_out.read())
+
+
+def salt_decrypt(message):
+    if message is None:
+        return None
+    raw_cipher_data = b64decode(message)
+    file_in = io.BytesIO(raw_cipher_data)
+    file_in.seek(0)
+
+    nonce, tag, ciphertext = [file_in.read(x) for x in (16, 16, -1)]
+    session_key = get_salt_session()
+    cipher_aes = AES.new(session_key, AES.MODE_EAX, nonce)
+    decrypted = cipher_aes.decrypt_and_verify(ciphertext, tag)
+    return decrypted
+
+
+class GTEncryptedText(models.TextField):
+    """
+    Encrypt data using AES and secure django key use in models like:
+    in models.py
+
+        class MyModel(models.Model):
+            my_secret = GTEncryptedText(null=True, blank=True)
+
+    """
+
+    def from_db_value(self, value, expression, connection):
+        if value is None:
+            return value
+        if isinstance(value, str):
+            value = value.encode()
+        return salt_decrypt(value)
+
+    def pre_save(self, model_instance, add):
+        field = getattr(model_instance, self.attname)
+        if field is None:
+            return None
+        dev = salt_encrypt(field)
+        if type(dev) == bytes:
+            dev = dev.decode()
+        return dev
+
+    def value_from_object(self, obj):
+        dev = super(GTEncryptedText, self).value_from_object(obj)
+        return dev.decode() if dev is not None else None
+
+
+class GTEncryptedJSONField(models.JSONField):
+    """
+    Encrypt data using AES and secure django key use in models can store JSON objects:
+    in models.py
+
+        class MyModel(models.Model):
+            my_secret = GTEncryptedJSONField(null=True, blank=True)
+
+    """
+
+    def get_prep_value(self, value):
+        # encrypt the JSON before save to the database
+        if value is not None:
+            value = json.dumps(value)
+            encrypted_value = salt_encrypt(
+                super().get_prep_value(value).encode("utf-8")
+            )
+            return encrypted_value.decode("utf-8")  # Store as text in DB
+        return value
+
+    def from_db_value(self, value, expression, connection):
+        # decrypt when loading from the database
+        if value is not None:
+            decrypted_value = salt_decrypt(value.encode("utf-8"))
+            return super().from_db_value(
+                decrypted_value.decode("utf-8"), expression, connection
+            )
+        return value

djgentelella/locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2025-03-29 22:37+0000\n"
+"POT-Creation-Date: 2025-12-18 21:41+0000\n"
 "PO-Revision-Date: 2025-03-29 16:43-0600\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -18,6 +18,14 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.2.2\n"
 
+#, fuzzy
+#| msgid "Actions"
+msgid "Action"
+msgstr "Acciones"
+
+msgid "History"
+msgstr "Historial"
+
 msgid "created"
 msgstr "creado"
 
@@ -92,10 +100,6 @@ msgstr ""
 "Se espera una lista de elementos, ej: [{name: 'nombre del archivo', "
 "value:'representación en cadena base64'}]"
 
-#, python-brace-format
-msgid "Too many elements, max_file = {self.max_files}"
-msgstr "Demasiados elementos, max_file = {self.max_files}"
-
 msgid ""
 "Invalid structure you need to provide {name: 'name of file', value:'base64 "
 "string representation'}"
@@ -116,6 +120,54 @@ msgid "Invalid value not encoded as b64 o json parser error"
 msgstr ""
 "Valor inválido, debe ser un documento base64 o un error al parsear el json"
 
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "Date format"
+msgstr "Formato de fecha"
+
+msgid "Signature message"
+msgstr "Mensaje de firma"
+
+msgid "Font alignment"
+msgstr "Alineación de fuente"
+
+msgid "Font color"
+msgstr "Color de fuente"
+
+msgid "Font size"
+msgstr "Tamaño de fuente"
+
+msgid "Place"
+msgstr "Lugar"
+
+msgid "Reason"
+msgstr "Razón"
+
+msgid "Visible signature"
+msgstr "Firma visible"
+
+msgid "Signature image"
+msgstr "Imagen de firma"
+
+msgid "Image preview"
+msgstr "Vista previa de imagen"
+
+msgid "None"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
 msgid "An unexpected error occurred during the signing process."
 msgstr ""
 "Un error inesperado ha ocurrido durante el proceso de firmado de documentos."
@@ -133,6 +185,61 @@ msgstr "El tiempo de espera del servicio de firma ha expirado."
 msgid "An exception ocurred el request to the signing service."
 msgstr "Un error ha ocurrido enviando la petición a los servicios de firmado."
 
+msgid "Updated signature settings successfully."
+msgstr "Configuración de firma actualizada correctamente."
+
+#, fuzzy
+#| msgid "Create"
+msgid "Created"
+msgstr "Crear"
+
+#, fuzzy
+#| msgid "Update"
+msgid "Updated"
+msgstr "Actualizar"
+
+#, fuzzy
+#| msgid "Delete"
+msgid "Deleted"
+msgstr "Eliminar"
+
+#, fuzzy
+#| msgid "Not found"
+msgid "No user found"
+msgstr "No se encontró"
+
+msgid "Hard deleted"
+msgstr "Eliminación permanente"
+
+msgid "Restored"
+msgstr "Restaurado"
+
+#, fuzzy
+#| msgid "Update"
+msgid "updated"
+msgstr "Actualizar"
+
+msgid "deleted"
+msgstr "eliminado"
+
+msgid "hard deleted"
+msgstr "eliminado permanentemente"
+
+msgid "restored"
+msgstr "restaurado"
+
+#, python-format
+msgid "An object of model %(model)s has been %(action)s"
+msgstr "Un objeto del modelo %(model)s ha sido %(action)s"
+
+#, python-format
+msgid "%(msg)s. Fields: %(fields)s"
+msgstr "%(msg)s. Campos: %(fields)s"
+
+#, python-format
+msgid "The record %(obj)s of model %(model)s has been %(action)s"
+msgstr "El registro %(obj)s del modelo %(model)s ha sido %(action)s"
+
 #, python-brace-format
 msgid "Do you want to delete {obj}?"
 msgstr "¿Desea eliminar {obj}?"
@@ -191,6 +298,30 @@ msgstr "Nombre de la url"
 msgid "Permission"
 msgstr "Permiso"
 
+msgid "Content type"
+msgstr ""
+
+msgid "Object ID"
+msgstr ""
+
+msgid "Object repr"
+msgstr ""
+
+msgid "Value of str(instance) at deletion time"
+msgstr ""
+
+#, fuzzy
+#| msgid "Delete"
+msgid "Deleted by"
+msgstr "Eliminar"
+
+msgid "Trash"
+msgstr ""
+
+#, python-format
+msgid "%(obj)s in trash"
+msgstr "%(obj)s en papelera"
+
 msgid "This is a html email, please use a visor with HTML support"
 msgstr "Este es un correo HTML, por favor use un cliente con soporte HTML"
 
@@ -320,6 +451,9 @@ msgstr "Siguiente"
 msgid "Create"
 msgstr "Crear"
 
+msgid "Signature settings"
+msgstr "Configuración de firma"
+
 msgid "Show all notifications"
 msgstr "Ver todas las notificaciones"
 
@@ -508,6 +642,9 @@ msgid "You are now registered. Activation email sent."
 msgstr ""
 "Usted fue registrado adecuadamente. Un correo de activación ha sido enviado."
 
+msgid "You updated correctly your password please login again."
+msgstr ""
+
 msgid "Select an User"
 msgstr "Seleccione a un Usuario"
 
@@ -598,6 +735,9 @@ msgstr "Ejecutar Firmador Libre"
 msgid "Run app"
 msgstr "Ejecutar aplicación"
 
+msgid "Expand"
+msgstr "Expandir"
+
 msgid ""
 "Please go to the last page, in the signature space, try to place your "
 "signature vertically centered."
@@ -614,57 +754,6 @@ msgstr "Por favor, espere mientras se firma el documento."
 msgid "Start"
 msgstr "Iniciar"
 
-msgid "Unknown"
-msgstr "Desconocido"
-
-msgid "LEFT"
-msgstr "IZQUIERDA"
-
-msgid "CENTER"
-msgstr "CENTRO"
-
-msgid "RIGHT"
-msgstr "DERECHA"
-
-msgid "Signature settings"
-msgstr "Configuración de firma"
-
-msgid "Updated signature settings successfully."
-msgstr "Configuración de firma actualizada correctamente."
-
-msgid "Background color"
-msgstr "Color de fondo"
-
-msgid "Contact"
-msgstr "Contacto"
-
-msgid "Date format"
-msgstr "Formato de fecha"
-
-msgid "Signature message"
-msgstr "Mensaje de firma"
-
-msgid "Font"
-msgstr "Fuente"
-
-msgid "Font alignment"
-msgstr "Alineación de fuente"
-
-msgid "Font color"
-msgstr "Color de fuente"
-
-msgid "Font size"
-msgstr "Tamaño de fuente"
-
-msgid "Place"
-msgstr "Lugar"
-
-msgid "Reason"
-msgstr "Razón"
-
-msgid "Visible signature"
-msgstr "Firma visible"
-
 msgid "This registry of trash does not exist."
 msgstr "Este registro de papelera no existe."
 
@@ -674,50 +763,10 @@ msgstr "El registro fue restaurado con éxito."
 msgid "The registry could not be restored."
 msgstr "No se pudo restaurar el registro."
 
-msgid "Signature image"
-msgstr "Imagen de firma"
-
-msgid "Image preview"
-msgstr "Vista previa de imagen"
-
-msgid "Image signature"
-msgstr "Imagen de firma"
-msgid "Expand"
-msgstr "Expandir"
-
-# history
-msgid "Restoration"
-msgstr "Restaurado"
-
-msgid "deleted"
-msgstr "eliminado"
-
-msgid "Hard deleted"
-msgstr "Eliminación permanente"
-
-msgid "History"
-msgstr "Historial"
-
-msgid "General"
-msgstr "General"
-
-msgid "restored"
-msgstr "restaurado"
-
-msgid "Restored"
-msgstr "Restaurado"
-
-msgid "hard deleted"
-msgstr "eliminado permanentemente"
-
-msgid "%(msg)s. Fields: %(fields)s"
-msgstr "%(msg)s. Campos: %(fields)s"
-
-msgid "The record %(obj)s of model %(model)s has been %(action)s"
-msgstr "El registro %(obj)s del modelo %(model)s ha sido %(action)s"
-
-msgid "An object of model %(model)s has been %(action)s"
-msgstr "Un objeto del modelo %(model)s ha sido %(action)s"
+#, fuzzy
+#| msgid "Delete"
+msgid "Deleted object"
+msgstr "Eliminar"
 
-msgid "%(obj)s in trash"
-msgstr "%(obj)s en papelera"
+msgid "Unknown"
+msgstr "Desconocido"

djgentelella/models_utils.py

@@ -0,0 +1,87 @@
+import datetime
+import logging
+import os
+from pathlib import Path
+
+from django.utils.text import slugify
+
+logger = logging.getLogger("djgentelella")
+
+
+def get_file_name(instance, name):
+    model_name = str(type(instance).__name__).lower()
+
+    return "%s-%s" % (
+        model_name,
+        name
+    )
+
+
+def upload_files_by_model_and_dates(instance, filename):
+    """
+    Create a directory structure of the type model/date/file. Usage:
+
+        myfile = models.FileField(upload_to=upload_files_by_model_and_dates)
+    """
+    date = int(datetime.datetime.now().strftime("%Y%m%d%H%M%S"))
+    path = Path(filename)
+    extension = path.suffix
+
+    if extension == ".zip":
+        name = path.stem
+    else:
+        name = get_file_name(instance, slugify(path.stem))
+
+    model_name = str(type(instance).__name__).lower()
+    return f"{model_name}/{date}/{name}{extension}"
+
+
+def upload_files_by_model_and_month(instance, filename):
+    """
+    Create a directory structure of the type model/yearmonth/file. Usage:
+
+        myfile = models.FileField(upload_to=upload_files_by_model_and_dates)
+    """
+    dates = datetime.datetime.now().strftime("%Y%m")
+    path = Path(filename)
+    extension = path.suffix
+
+    if extension == ".zip":
+        name = path.stem
+    else:
+        name = get_file_name(instance, slugify(path.stem))
+
+    model_name = str(type(instance).__name__).lower()
+    return f"{model_name}/{dates}/{name}{extension}"
+
+
+def delete_file_and_folder(file_field):
+    """
+        Delete the file associated with file_field and, if the containing folder is empty,
+        delete it.
+    """
+    if not file_field:
+        return
+
+    # Obtener la ruta absoluta del archivo
+    file_path = file_field.path
+    if os.path.exists(file_path):
+        try:
+            os.remove(file_path)
+            logger.info(f"Deleted file: {file_path}")
+        except Exception as e:
+            logger.error(f"Error deleting file: {file_path}", exc_info=e)
+
+    # Obtener la carpeta contenedora del archivo
+    directory = os.path.dirname(file_path)
+
+    # Intentar eliminar la carpeta, si está vacía.
+    if os.path.exists(directory):
+        # Listar el contenido de la carpeta
+        files = os.listdir(directory)
+        if not files:
+            try:
+                os.rmdir(directory)
+                logger.info(f"Folder created: {directory}")
+            except Exception as e:
+                logger.error(f"Error deleting folder: {directory}", exc_info=e)

djgentelella/permission_management/__init__.py

@@ -43,11 +43,36 @@ class AnyPermission(BasePermission):
 
 class AllPermissionByAction(BasePermission):
     def has_permission(self, request, view):
-        perms = view.perms[view.action]
+        action = getattr(view, "action", None)
+        perms_map = getattr(view, "perms", {}) or {}
+
+        if action is None:
+            return False  # Generate error >= 403 instead of 500
+
+        perms = perms_map.get(action)
+        if perms is None:
+            return False  # unmapped action => 403
+
         return all_permission(request.user, perms)
 
 
 class AnyPermissionByAction(BasePermission):
     def has_permission(self, request, view):
-        perms = view.perms[view.action]
+        action = getattr(view, "action", None)
+        perms_map = getattr(view, "perms", {}) or {}
+
+        if action is None:
+            return False
+
+        perms = perms_map.get(action)
+        if perms is None:
+            return False
+
         return any_permission(request.user, perms)
+
+
+def get_actions_by_perms(user, actions_list):
+    actions = {}
+    for action, perms in actions_list.items():
+        actions[action] = all_permission(user, perms)
+    return actions

djgentelella/serializers/__init__.py

@@ -31,3 +31,17 @@ class GTDateTimeField(DateTimeField):
         if not value and self.allow_empty_str:
             return None
         return super().to_internal_value(value)
+
+
+class DateFieldWithEmptyString(DateField):
+    def to_internal_value(self, value):
+        if not value:
+            return None
+        return super(DateFieldWithEmptyString, self).to_internal_value(value)
+
+
+class DateTimeFieldFieldWithEmptyString(DateTimeField):
+    def to_internal_value(self, value):
+        if not value:
+            return None
+        return super(DateTimeFieldFieldWithEmptyString, self).to_internal_value(value)

djgentelella/serializers/secure.py

@@ -0,0 +1,8 @@
+from rest_framework import serializers
+
+
+class GTEncryptedTextField(serializers.CharField):
+    def to_representation(self, value):
+        if not value:
+            return ""
+        return str(value.decode())