unitysvc-data 0.1.4__tar.gz → 0.1.5__tar.gz

{unitysvc_data-0.1.4/src/unitysvc_data.egg-info → unitysvc_data-0.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-data
-Version: 0.1.4
+Version: 0.1.5
 Summary: Standard examples and presets for UnitySVC data packages
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_data-0.1.4 → unitysvc_data-0.1.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unitysvc-data"
-version = "0.1.4"
+version = "0.1.5"
 description = "Standard examples and presets for UnitySVC data packages"
 readme = "README.md"
 authors = [{ name = "Bo Peng", email = "bo.peng@unitysvc.com" }]

{unitysvc_data-0.1.4 → unitysvc_data-0.1.5}/src/unitysvc_data/_manifest.json

@@ -5,7 +5,7 @@
     "s3_code_example": "s3_code_example_v1",
     "s3_connectivity": "s3_connectivity_v1",
     "s3_description": "s3_description_v1",
-    "smtp_connectivity": "smtp_connectivity_v1"
+    "smtp_connectivity": "smtp_connectivity_v2"
   },
   "presets": {
     "api_connectivity_v1": {
@@ -93,6 +93,20 @@
       "preset_name": "smtp_connectivity",
       "source_readme": "smtp/connectivity/README.md",
       "version": 1
+    },
+    "smtp_connectivity_v2": {
+      "category": "connectivity_test",
+      "description": "Verify SMTP server returns a 220 greeting on connect",
+      "example_file": "smtp/connectivity/connectivity-v2.sh.j2",
+      "is_active": true,
+      "is_public": false,
+      "meta": {
+        "output_contains": "connectivity ok"
+      },
+      "mime_type": "bash",
+      "preset_name": "smtp_connectivity",
+      "source_readme": "smtp/connectivity/README.md",
+      "version": 2
     }
   },
   "version": "1"

{unitysvc_data-0.1.4 → unitysvc_data-0.1.5}/src/unitysvc_data/examples/smtp/connectivity/README.md

@@ -45,6 +45,18 @@ The script picks the mode by looking at which env var is set — no
 
 ## Versions
 
+### v2 — TLS support
+
+- Reads `$TLS` env var (local mode) and detects `smtps://` scheme (online
+  mode) to select the transport.
+- When TLS is required, uses `openssl s_client -connect` instead of `nc`
+  so that implicit-TLS (SMTPS) upstreams complete the handshake before
+  the server sends the `220` banner.
+- When TLS is not required, behaviour is identical to v1.
+- Use v2 for any upstream with `tls: true` in `upstream_access_config`
+  or a `smtps://` gateway URL.
+
 ### v1 — initial release
 
 - Uses `nc -w 5`; sends `QUIT`; accepts any `220 ...` banner.
+- Plain SMTP only — does not handle implicit TLS (SMTPS).

unitysvc_data-0.1.5/src/unitysvc_data/examples/smtp/connectivity/connectivity-v2.sh.j2

@@ -0,0 +1,45 @@
+#!/bin/bash
+# Connectivity test for SMTP services. A healthy mail server sends a
+# "220 ... ESMTP ..." greeting on connect; anything else (no response,
+# timeout, or other greeting code) is treated as failure.
+#
+# Env var layout the harness provides:
+#   local mode   — $HOST, $PORT, $TLS  (from upstream_access_config)
+#   online mode  — $SERVICE_BASE_URL   (smtp://host:port or smtps://host:port)
+# We branch on whichever is present so the same script works in both.
+set -o pipefail
+
+USE_TLS=false
+
+if [ -n "${HOST:-}" ]; then
+    PORT="${PORT:-587}"
+    [ "${TLS:-False}" = "True" ] && USE_TLS=true
+else
+    URL="${SERVICE_BASE_URL:?need HOST or SERVICE_BASE_URL}"
+    if [[ "$URL" == smtps://* ]]; then
+        USE_TLS=true
+        stripped="${URL#smtps://}"
+    else
+        stripped="${URL#smtp://}"
+    fi
+    HOST="${stripped%%:*}"
+    PORT="${stripped#*:}"
+    PORT="${PORT%%/*}"
+    PORT="${PORT:-587}"
+fi
+
+# Send QUIT so the server closes cleanly instead of timing out on us.
+# Use openssl s_client for implicit TLS (SMTPS); nc for plain SMTP.
+if [ "$USE_TLS" = "true" ]; then
+    greeting=$( (echo "QUIT"; sleep 1) | openssl s_client -connect "$HOST:$PORT" -quiet 2>/dev/null | head -1 )
+else
+    greeting=$( (echo "QUIT"; sleep 1) | nc -w 5 "$HOST" "$PORT" 2>/dev/null | head -1 )
+fi
+
+if [[ "$greeting" == "220 "* ]]; then
+    echo "connectivity ok ($greeting)"
+    exit 0
+fi
+
+echo "connectivity failed: expected '220 ...' greeting from ${HOST}:${PORT}, got: ${greeting:-<no response>}" >&2
+exit 1

{unitysvc_data-0.1.4 → unitysvc_data-0.1.5/src/unitysvc_data.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unitysvc-data
-Version: 0.1.4
+Version: 0.1.5
 Summary: Standard examples and presets for UnitySVC data packages
 Author-email: Bo Peng <bo.peng@unitysvc.com>
 Maintainer-email: Bo Peng <bo.peng@unitysvc.com>

{unitysvc_data-0.1.4 → unitysvc_data-0.1.5}/src/unitysvc_data.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ src/unitysvc_data/examples/s3/description/README.md
 src/unitysvc_data/examples/s3/description/description-v1.md
 src/unitysvc_data/examples/smtp/connectivity/README.md
 src/unitysvc_data/examples/smtp/connectivity/connectivity-v1.sh.j2
+src/unitysvc_data/examples/smtp/connectivity/connectivity-v2.sh.j2
 tests/test_build.py
 tests/test_cli.py
 tests/test_presets.py