Merge pull request 'Fix stage source guard: fetch origin/dev before ancestry check' (#102) from dev into stage

Merge PR #98 from dev into stage

.gitea/workflows/deploy.yaml

@@ -53,9 +53,8 @@ jobs:
           CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null || git diff --name-only HEAD 2>/dev/null || echo "unknown")
           echo "Changed files:"
           echo "$CHANGED"
-          # Asset-only: files that don't require rebuilding the El binary.
-          # migrations/, scripts/, tests/ are data/infra/test changes — no binary rebuild needed.
-          NON_ASSET=$(echo "$CHANGED" | grep -v '^src/assets/' | grep -v '^src/shares/' | grep -v '^src/index\.html' | grep -v '^src/about\.html' | grep -v '^src/terms\.html' | grep -v '^src/enterprise-terms\.html' | grep -v '^src/llms\.txt' | grep -v '^migrations/' | grep -v '^scripts/' | grep -v '^tests/' | grep -v '^\.gitea/' | grep -v '^$' || true)
+          # Asset-only: only src/assets/, src/shares/, src/index.html, src/about.html, src/terms.html, src/enterprise-terms.html, src/llms.txt
+          NON_ASSET=$(echo "$CHANGED" | grep -v '^src/assets/' | grep -v '^src/shares/' | grep -v '^src/index\.html' | grep -v '^src/about\.html' | grep -v '^src/terms\.html' | grep -v '^src/enterprise-terms\.html' | grep -v '^src/llms\.txt' | grep -v '^$' || true)
           if [ -z "$NON_ASSET" ] && [ "$CHANGED" != "unknown" ]; then
             echo "asset_only=true" >> "$GITHUB_OUTPUT"
             echo "=> Asset-only change detected, will use fast path"

.gitea/workflows/stage.yaml

@@ -81,7 +81,7 @@ jobs:
           CHANGED=$(git diff --name-only HEAD~1 HEAD 2>/dev/null || git diff --name-only HEAD 2>/dev/null || echo "unknown")
           echo "Changed files:"
           echo "$CHANGED"
-          NON_ASSET=$(echo "$CHANGED" | grep -v '^src/assets/' | grep -v '^src/shares/' | grep -v '^src/index\.html' | grep -v '^src/about\.html' | grep -v '^src/terms\.html' | grep -v '^src/enterprise-terms\.html' | grep -v '^src/llms\.txt' | grep -v '^migrations/' | grep -v '^scripts/' | grep -v '^tests/' | grep -v '^\.gitea/' | grep -v '^$' || true)
+          NON_ASSET=$(echo "$CHANGED" | grep -v '^src/assets/' | grep -v '^src/shares/' | grep -v '^src/index\.html' | grep -v '^src/about\.html' | grep -v '^src/terms\.html' | grep -v '^src/enterprise-terms\.html' | grep -v '^src/llms\.txt' | grep -v '^$' || true)
           if [ -z "$NON_ASSET" ] && [ "$CHANGED" != "unknown" ]; then
             echo "asset_only=true" >> "$GITHUB_OUTPUT"
             echo "=> Asset-only change detected, will use fast path"

dist/elhtml_impl.c

@@ -19,11 +19,11 @@ el_val_t el_li(el_val_t attrs, el_val_t children);
 el_val_t el_p(el_val_t attrs, el_val_t children);
 el_val_t el_span(el_val_t attrs, el_val_t children);
 el_val_t el_form(el_val_t attrs, el_val_t children);
-el_val_t el_h1(el_val_t attrs, el_val_t children);
-el_val_t el_h2(el_val_t attrs, el_val_t children);
-el_val_t el_h3(el_val_t attrs, el_val_t children);
-el_val_t el_h4(el_val_t attrs, el_val_t children);
-el_val_t el_button(el_val_t attrs, el_val_t children);
+el_val_t el_h1(el_val_t attrs, el_val_t text);
+el_val_t el_h2(el_val_t attrs, el_val_t text);
+el_val_t el_h3(el_val_t attrs, el_val_t text);
+el_val_t el_h4(el_val_t attrs, el_val_t text);
+el_val_t el_button(el_val_t attrs, el_val_t label);
 el_val_t el_a(el_val_t href, el_val_t attrs, el_val_t children);
 el_val_t el_input(el_val_t type_attr, el_val_t attrs);
 el_val_t el_textarea(el_val_t attrs, el_val_t value);
@@ -176,43 +176,43 @@ el_val_t el_form(el_val_t attrs, el_val_t children) {
   return 0;
 }
 
-el_val_t el_h1(el_val_t attrs, el_val_t children) {
+el_val_t el_h1(el_val_t attrs, el_val_t text) {
   if (str_eq(attrs, EL_STR(""))) {
-    return el_str_concat(el_str_concat(EL_STR("<h1>"), children), EL_STR("</h1>"));
+    return el_str_concat(el_str_concat(EL_STR("<h1>"), el_escape(text)), EL_STR("</h1>"));
   }
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h1 "), attrs), EL_STR(">")), children), EL_STR("</h1>"));
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h1 "), attrs), EL_STR(">")), el_escape(text)), EL_STR("</h1>"));
   return 0;
 }
 
-el_val_t el_h2(el_val_t attrs, el_val_t children) {
+el_val_t el_h2(el_val_t attrs, el_val_t text) {
   if (str_eq(attrs, EL_STR(""))) {
-    return el_str_concat(el_str_concat(EL_STR("<h2>"), children), EL_STR("</h2>"));
+    return el_str_concat(el_str_concat(EL_STR("<h2>"), el_escape(text)), EL_STR("</h2>"));
   }
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h2 "), attrs), EL_STR(">")), children), EL_STR("</h2>"));
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h2 "), attrs), EL_STR(">")), el_escape(text)), EL_STR("</h2>"));
   return 0;
 }
 
-el_val_t el_h3(el_val_t attrs, el_val_t children) {
+el_val_t el_h3(el_val_t attrs, el_val_t text) {
   if (str_eq(attrs, EL_STR(""))) {
-    return el_str_concat(el_str_concat(EL_STR("<h3>"), children), EL_STR("</h3>"));
+    return el_str_concat(el_str_concat(EL_STR("<h3>"), el_escape(text)), EL_STR("</h3>"));
   }
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h3 "), attrs), EL_STR(">")), children), EL_STR("</h3>"));
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h3 "), attrs), EL_STR(">")), el_escape(text)), EL_STR("</h3>"));
   return 0;
 }
 
-el_val_t el_h4(el_val_t attrs, el_val_t children) {
+el_val_t el_h4(el_val_t attrs, el_val_t text) {
   if (str_eq(attrs, EL_STR(""))) {
-    return el_str_concat(el_str_concat(EL_STR("<h4>"), children), EL_STR("</h4>"));
+    return el_str_concat(el_str_concat(EL_STR("<h4>"), el_escape(text)), EL_STR("</h4>"));
   }
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h4 "), attrs), EL_STR(">")), children), EL_STR("</h4>"));
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<h4 "), attrs), EL_STR(">")), el_escape(text)), EL_STR("</h4>"));
   return 0;
 }
 
-el_val_t el_button(el_val_t attrs, el_val_t children) {
+el_val_t el_button(el_val_t attrs, el_val_t label) {
   if (str_eq(attrs, EL_STR(""))) {
-    return el_str_concat(el_str_concat(EL_STR("<button type=\"button\">"), children), EL_STR("</button>"));
+    return el_str_concat(el_str_concat(EL_STR("<button type=\"button\">"), el_escape(label)), EL_STR("</button>"));
   }
-  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<button type=\"button\" "), attrs), EL_STR(">")), children), EL_STR("</button>"));
+  return el_str_concat(el_str_concat(el_str_concat(el_str_concat(EL_STR("<button type=\"button\" "), attrs), EL_STR(">")), el_escape(label)), EL_STR("</button>"));
   return 0;
 }
 

src/hero.el

@@ -1,5 +1,4 @@
 // components/hero.el - Hero section.
-// Rebuilt: 2026-05-11.
 //
 // Full-bleed hero with headline, sub-copy, and two CTAs.
 // Glow orbs are pure CSS absolute-positioned divs.

tests/api/security.test.ts

@@ -51,13 +51,11 @@ test.describe('Security headers', () => {
 //   - anything else (e.g. evil.com): BLOCKED (403)
 
 test.describe('CORS enforcement — /api/supabase-config', () => {
-  test('Allows requests with no Origin header (same-origin browser fetches)', async () => {
-    // Same-origin browser fetches (e.g. checkout page fetching supabase-config on
-    // the same domain) do not send an Origin header. The server must pass these
-    // through — blocking them would break the checkout flow on production.
-    // Server-side exfiltration is prevented by the evil-origin 403 below.
+  test('Rejects requests with no Origin header', async () => {
+    // No Origin = not from a browser context — the server treats this as
+    // an unknown caller and returns 403 to prevent server-side exfiltration.
     const r = await get('/api/supabase-config');
-    expect(r.status).toBe(200);
+    expect(r.status).toBe(403);
   });
 
   test('Rejects evil origin', async () => {