django-forms-workflows 0.35.1__tar.gz → 0.35.2__tar.gz

{django_forms_workflows-0.35.1 → django_forms_workflows-0.35.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-forms-workflows
-Version: 0.35.1
+Version: 0.35.2
 Summary: Enterprise-grade, database-driven form builder with approval workflows and external data integration
 License: LGPL-3.0-only
 License-File: LICENSE

{django_forms_workflows-0.35.1 → django_forms_workflows-0.35.2}/django_forms_workflows/data_sources/ldap_source.py

@@ -105,9 +105,9 @@ class LDAPDataSource(DataSource):
         Query LDAP directly for a user attribute.
 
         This is used for SSO users who don't have a cached ldap_user object.
+        TLS configuration is applied via configure_ldap_connection(), which
+        respects FORMS_WORKFLOWS_LDAP_ALLOW_SELF_SIGNED and LDAP_TLS_REQUIRE_CERT.
         """
-        import os
-
         try:
             import ldap
             from ldap.filter import escape_filter_chars
@@ -140,14 +140,12 @@ class LDAPDataSource(DataSource):
             return None
 
         try:
+            from django_forms_workflows.ldap_backend import configure_ldap_connection
+
             conn = ldap.initialize(ldap_server)
-            conn.set_option(ldap.OPT_REFERRALS, 0)
             conn.set_option(ldap.OPT_PROTOCOL_VERSION, ldap.VERSION3)
-
-            # Configure TLS
-            tls_require_cert = os.getenv("LDAP_TLS_REQUIRE_CERT", "demand").lower()
-            if tls_require_cert == "never":
-                conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
+            # Apply TLS + referral settings centrally (honours FORMS_WORKFLOWS_LDAP_ALLOW_SELF_SIGNED)
+            configure_ldap_connection(conn)
 
             if bind_dn and bind_password:
                 conn.simple_bind_s(bind_dn, bind_password)

{django_forms_workflows-0.35.1 → django_forms_workflows-0.35.2}/django_forms_workflows/ldap_backend.py

@@ -21,37 +21,53 @@ logger = logging.getLogger(__name__)
 
 def configure_ldap_connection(conn):
     """
-    Configure LDAP connection with TLS settings from environment variables.
+    Configure LDAP connection with TLS settings.
 
-    This function applies TLS certificate verification settings based on the
-    LDAP_TLS_REQUIRE_CERT environment variable.
+    Checks the ``FORMS_WORKFLOWS_LDAP_ALLOW_SELF_SIGNED`` Django setting first.
+    When ``True``, self-signed certificates are accepted (``OPT_X_TLS_ALLOW``).
+
+    Falls back to the ``LDAP_TLS_REQUIRE_CERT`` environment variable for
+    fine-grained control:
+        - ``'never'``  – never require/verify certificates
+        - ``'allow'``  – allow self-signed / unverifiable certificates
+        - ``'try'``    – try to verify; proceed even if verification fails
+        - ``'demand'`` – require a valid certificate (default)
+
+    Django Settings:
+        FORMS_WORKFLOWS_LDAP_ALLOW_SELF_SIGNED (bool):
+            Set to ``True`` to accept self-signed LDAP/AD certificates.
+            Takes precedence over the ``LDAP_TLS_REQUIRE_CERT`` env var.
+            Default: ``False``.
 
     Args:
         conn: LDAP connection object
-
-    Environment Variables:
-        LDAP_TLS_REQUIRE_CERT: TLS certificate verification level
-            - 'never': Don't require or verify certificates (ldap.OPT_X_TLS_NEVER)
-            - 'allow': Allow connection without cert verification (ldap.OPT_X_TLS_ALLOW)
-            - 'try': Try to verify but proceed if verification fails (ldap.OPT_X_TLS_TRY)
-            - 'demand' or 'hard': Require valid certificate (ldap.OPT_X_TLS_DEMAND)
-            - Default: 'demand'
     """
-    # Configure TLS settings based on environment variable
-    tls_require_cert = os.getenv("LDAP_TLS_REQUIRE_CERT", "demand").lower()
+    # Check Django setting first — simple on/off for self-signed cert acceptance
+    allow_self_signed = getattr(
+        settings, "FORMS_WORKFLOWS_LDAP_ALLOW_SELF_SIGNED", False
+    )
 
-    if tls_require_cert == "never":
-        conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
-        logger.debug("LDAP TLS certificate verification: NEVER")
-    elif tls_require_cert == "allow":
+    if allow_self_signed:
         conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW)
-        logger.debug("LDAP TLS certificate verification: ALLOW")
-    elif tls_require_cert == "try":
-        conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_TRY)
-        logger.debug("LDAP TLS certificate verification: TRY")
-    else:  # 'demand' or 'hard' or any other value
-        conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND)
-        logger.debug("LDAP TLS certificate verification: DEMAND")
+        logger.debug(
+            "LDAP TLS certificate verification: ALLOW (FORMS_WORKFLOWS_LDAP_ALLOW_SELF_SIGNED=True)"
+        )
+    else:
+        # Fall back to env-var-based configuration for fine-grained control
+        tls_require_cert = os.getenv("LDAP_TLS_REQUIRE_CERT", "demand").lower()
+
+        if tls_require_cert == "never":
+            conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_NEVER)
+            logger.debug("LDAP TLS certificate verification: NEVER")
+        elif tls_require_cert == "allow":
+            conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_ALLOW)
+            logger.debug("LDAP TLS certificate verification: ALLOW")
+        elif tls_require_cert == "try":
+            conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_TRY)
+            logger.debug("LDAP TLS certificate verification: TRY")
+        else:  # 'demand' or 'hard' or any other value
+            conn.set_option(ldap.OPT_X_TLS_REQUIRE_CERT, ldap.OPT_X_TLS_DEMAND)
+            logger.debug("LDAP TLS certificate verification: DEMAND")
 
     # Set other standard options
     conn.set_option(ldap.OPT_REFERRALS, 0)

django_forms_workflows-0.35.2/django_forms_workflows/migrations/0059_add_multiselect_list_field_type.py

@@ -0,0 +1,57 @@
+"""
+Add multiselect_list field type.
+
+Adds "Multiple Select (List)" as an alternative to the existing
+"Multiple Select (Checkboxes)" (multiselect) field type.  The new type
+renders using Django's SelectMultiple widget (<select multiple>) rather
+than CheckboxSelectMultiple.
+
+The label of the existing 'multiselect' choice is also updated from
+"Multiple Select" to "Multiple Select (Checkboxes)" to make the
+distinction clear in the admin UI.
+"""
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("django_forms_workflows", "0058_rename_assignee_email_field_add_lookup_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="formfield",
+            name="field_type",
+            field=models.CharField(
+                max_length=20,
+                choices=[
+                    ("text", "Single Line Text"),
+                    ("phone", "Phone Number"),
+                    ("textarea", "Multi-line Text"),
+                    ("number", "Whole Number"),
+                    ("decimal", "Decimal Number"),
+                    ("currency", "Currency ($)"),
+                    ("date", "Date"),
+                    ("datetime", "Date and Time"),
+                    ("time", "Time"),
+                    ("email", "Email Address"),
+                    ("url", "Website URL"),
+                    ("select", "Dropdown Select"),
+                    ("multiselect", "Multiple Select (Checkboxes)"),
+                    ("multiselect_list", "Multiple Select (List)"),
+                    ("radio", "Radio Buttons"),
+                    ("checkbox", "Single Checkbox"),
+                    ("checkboxes", "Multiple Checkboxes"),
+                    ("file", "File Upload"),
+                    ("multifile", "Multi-File Upload"),
+                    ("hidden", "Hidden Field"),
+                    ("section", "Section Header (not a field)"),
+                    ("calculated", "Calculated / Formula"),
+                    ("spreadsheet", "Spreadsheet Upload (CSV / Excel)"),
+                ],
+            ),
+        ),
+    ]
+

{django_forms_workflows-0.35.1 → django_forms_workflows-0.35.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-forms-workflows"
-version = "0.35.1"
+version = "0.35.2"
 description = "Enterprise-grade, database-driven form builder with approval workflows and external data integration"
 license = "LGPL-3.0-only"
 readme = "README.md"