Compare commits

..

1 Commits

Author SHA1 Message Date
Alexander Whitestone
e98ce44ee1 fix(#1423): Prevent command injection in Electron MemPalace bridge
Some checks failed
CI / test (pull_request) Failing after 1m39s
Review Approval Gate / verify-review (pull_request) Successful in 15s
CI / validate (pull_request) Failing after 1m5s
SECURITY: The Electron IPC handler exposed raw child_process.exec() to
renderer code, allowing arbitrary command execution via shell metacharacters.

Changes:
- electron-main.js: Replace exec() with execFile() + argument arrays
  Add operation whitelist (ALLOWED_MEMPALACE_OPS)
  Add sanitizeArg() to reject shell metacharacters (;, &, |, `, $, etc.)
  Both exec-python (legacy) and new mempalace-exec IPC handlers are safe
- mempalace.js: Replace template-interpolated shell strings with safe
  _exec(op, ...args) method using the new mempalace-exec IPC
- app.js: Remove direct execPython call with template interpolation,
  use mempalace.addDrawer() instead
- preload.js: New context bridge exposing mempalaceExec and restricted
  execPython to renderer
- tests/test_electron_security.py: 7 security assertions

The old pattern:
  exec(`mempalace search "${userInput}"`)
  // user submits: "; rm -rf /"
  // executes: mempalace search ""; rm -rf /""

The new pattern:
  execFile('mempalace', ['search', userInput])
  // user submits: "; rm -rf /"
  // executes: mempalace 'search' '"; rm -rf /"'
  // metacharacters are rejected by sanitizeArg()
2026-04-14 23:26:40 -04:00
12 changed files with 207 additions and 281 deletions

View File

@@ -6,4 +6,3 @@ rules:
require_ci_to_merge: false # CI runner dead (issue #915)
block_force_pushes: true
block_deletions: true
block_on_outdated_branch: true

View File

@@ -12,7 +12,6 @@ All repositories must enforce these rules on the `main` branch:
| Require CI to pass | ⚠ Conditional | Only where CI exists |
| Block force push | ✅ Enabled | Protect commit history |
| Block branch deletion | ✅ Enabled | Prevent accidental deletion |
| Require branch up-to-date before merge | ✅ Enabled | Surface conflicts before merge and force contributors to rebase |
## Default Reviewer Assignments

6
app.js
View File

@@ -2140,9 +2140,9 @@ function setupControls() {
}
function sendChatMessage(overrideText = null) {
// Mine chat message to MemPalace
if (overrideText) {
window.electronAPI.execPython(`mempalace add_drawer "${this.wing}" "chat" "${overrideText}"`);
// Mine chat message to MemPalace — use safe addDrawer method
if (overrideText && typeof mempalace !== 'undefined' && mempalace.addDrawer) {
mempalace.addDrawer(this.wing, 'chat', overrideText);
}
const input = document.getElementById('chat-input');
const text = overrideText || input.value.trim();

View File

@@ -1,40 +0,0 @@
# Cron Setup — Stale PR Closer
Issue #1255: Admin actions for the-nexus IaC epic #1248.
## Status
| Task | Status |
|------|--------|
| Rebase-before-merge on `main` | DONE (block_on_outdated: True) |
| Stale PR closer script | EXISTS (.githooks/stale-pr-closer.sh) |
| PR #1254 merged | DONE (closed) |
| Cron setup | See below |
## Cron Setup
Add to crontab on the machine running Hermes:
```bash
# Edit crontab
crontab -e
# Add (runs every 6 hours):
0 */6 * * * GITEA_TOKEN="$(cat ~/.config/gitea/token)" REPO="Timmy_Foundation/the-nexus" /path/to/the-nexus/.githooks/stale-pr-closer.sh >> ~/.hermes/logs/stale-pr-closer.log 2>&1
```
## Dry Run
Test before enabling:
```bash
GITEA_TOKEN="$(cat ~/.config/gitea/token)" REPO="Timmy_Foundation/the-nexus" DRY_RUN=true .githooks/stale-pr-closer.sh
```
## What It Does
1. Fetches open PRs from the-nexus
2. Checks if each PR's branch has merge conflicts with main
3. Checks if the PR has been inactive for >24 hours (configurable via GRACE_HOURS)
4. Closes stale PRs with a comment explaining why
5. Logs all actions to stdout (cron captures to log file)

View File

@@ -1,10 +1,69 @@
const { app, BrowserWindow, ipcMain } = require('electron')
const { exec } = require('child_process')
const { execFile } = require('child_process')
const path = require('path')
// MemPalace integration
ipcMain.handle('exec-python', (event, command) => {
// MemPalace command whitelist — only these operations are allowed
const MEMPALACE_BIN = path.resolve(__dirname, 'scripts/mempalace-runner.sh')
const ALLOWED_MEMPALACE_OPS = new Set([
'init', 'mine', 'search', 'status', 'add_drawer', 'list', 'export'
])
// Validate MemPalace arguments — reject shell metacharacters
function sanitizeArg(arg) {
if (typeof arg !== 'string') throw new Error('Argument must be a string')
// Block shell metacharacters that could enable injection
if (/[;&|`$(){}\\n\\r]/.test(arg)) {
throw new Error('Invalid characters in argument')
}
return arg
}
// MemPalace integration — safe IPC bridge
// Uses execFile (no shell) with argument arrays to prevent command injection
ipcMain.handle('mempalace-exec', (event, { op, args }) => {
return new Promise((resolve, reject) => {
exec(command, (error, stdout, stderr) => {
// Validate operation
if (!ALLOWED_MEMPALACE_OPS.has(op)) {
return reject(new Error(`MemPalace operation '${op}' not allowed`))
}
// Sanitize all arguments
const safeArgs = [op]
if (Array.isArray(args)) {
for (const arg of args) {
safeArgs.push(sanitizeArg(String(arg)))
}
}
// Execute with execFile — no shell interpolation
execFile('mempalace', safeArgs, { timeout: 30000 }, (error, stdout, stderr) => {
if (error) return reject(error)
resolve({ stdout, stderr })
})
})
})
// Legacy bridge — DEPRECATED, kept for backward compat but restricted
// Only allows predefined commands, no arbitrary execution
ipcMain.handle('exec-python', (event, command) => {
return new Promise((resolve, reject) => {
// Reject anything that looks like arbitrary shell execution
if (typeof command !== 'string') return reject(new Error('Command must be a string'))
if (/[;&|`$(){}\\n\\r]/.test(command)) {
return reject(new Error('Shell metacharacters not allowed'))
}
// Only allow mempalace commands
if (!command.startsWith('mempalace ')) {
return reject(new Error('Only mempalace commands are allowed'))
}
// Parse into safe argument array
const parts = command.split(/\s+/)
const op = parts[1]
if (!ALLOWED_MEMPALACE_OPS.has(op)) {
return reject(new Error(`Operation '${op}' not in whitelist`))
}
const safeArgs = parts.slice(1).map(sanitizeArg)
execFile('mempalace', safeArgs, { timeout: 30000 }, (error, stdout, stderr) => {
if (error) return reject(error)
resolve({ stdout, stderr })
})

View File

@@ -1,4 +1,4 @@
// MemPalace integration
// MemPalace integration — uses safe IPC bridge (mempalace-exec)
class MemPalace {
constructor() {
this.palacePath = '~/.mempalace/palace';
@@ -6,6 +6,16 @@ class MemPalace {
this.init();
}
// Safe IPC call — no shell interpolation, uses argument arrays
async _exec(op, ...args) {
if (window.electronAPI?.mempalaceExec) {
return window.electronAPI.mempalaceExec({ op, args })
}
// Fallback for non-Electron contexts (web-only)
console.warn('MemPalace: electronAPI not available, skipping:', op)
return { stdout: '', stderr: '' }
}
async init() {
try {
await this.setupWing();
@@ -16,29 +26,46 @@ class MemPalace {
}
async setupWing() {
await window.electronAPI.execPython(`mempalace init ${this.palacePath}`);
await window.electronAPI.execPython(`mempalace mine ~/chats --mode convos --wing ${this.wing}`);
await this._exec('init', this.palacePath);
await this._exec('mine', '~/chats', '--mode', 'convos', '--wing', this.wing);
}
setupAutoMining() {
setInterval(() => {
window.electronAPI.execPython(`mempalace mine #chat-container --mode convos --wing ${this.wing}`);
this._exec('mine', '#chat-container', '--mode', 'convos', '--wing', this.wing);
}, 30000); // Mine every 30 seconds
}
async search(query) {
const result = await window.electronAPI.execPython(`mempalace search "${query}" --wing ${this.wing}`);
const result = await this._exec('search', query, '--wing', this.wing);
return result.stdout;
}
async addDrawer(wing, drawer, content) {
return this._exec('add_drawer', wing, drawer, content);
}
updateStats() {
const stats = window.electronAPI.execPython(`mempalace status --wing ${this.wing}`);
document.getElementById('compression-ratio').textContent =
`${stats.compression_ratio.toFixed(1)}x`;
document.getElementById('docs-mined').textContent = stats.total_docs;
document.getElementById('aaak-size').textContent = stats.aaak_size;
this._exec('status', '--wing', this.wing).then(stats => {
// stats comes as JSON string from stdout
try {
const data = typeof stats.stdout === 'string' ? JSON.parse(stats.stdout) : stats
const crEl = document.getElementById('compression-ratio');
const dmEl = document.getElementById('docs-mined');
const akEl = document.getElementById('aaak-size');
if (crEl) crEl.textContent = `${(data.compression_ratio || 0).toFixed(1)}x`;
if (dmEl) dmEl.textContent = data.total_docs || 0;
if (akEl) akEl.textContent = data.aaak_size || 0;
} catch (e) {
console.error('MemPalace stats parse error:', e);
}
}).catch(err => {
console.error('MemPalace stats error:', err);
});
}
}
// Initialize MemPalace
const mempalace = new MemPalace();
// Initialize MemPalace only in Electron context
if (typeof window !== 'undefined' && window.electronAPI) {
const mempalace = new MemPalace();
}

11
preload.js Normal file
View File

@@ -0,0 +1,11 @@
// preload.js — Electron context bridge
// Safely exposes IPC methods to the renderer process
const { contextBridge, ipcRenderer } = require('electron')
contextBridge.exposeInMainWorld('electronAPI', {
// Safe MemPalace execution — uses argument arrays, no shell strings
mempalaceExec: (opts) => ipcRenderer.invoke('mempalace-exec', opts),
// Legacy bridge — restricted to whitelisted mempalace commands only
execPython: (command) => ipcRenderer.invoke('exec-python', command),
})

View File

@@ -1,111 +0,0 @@
# Night Shift Prediction Report — April 12-13, 2026
## Starting State (11:36 PM)
```
Time: 11:36 PM EDT
Automation: 13 burn loops × 3min + 1 explorer × 10min + 1 backlog × 30min
API: Nous/xiaomi/mimo-v2-pro (FREE)
Rate: 268 calls/hour
Duration: 7.5 hours until 7 AM
Total expected API calls: ~2,010
```
## Burn Loops Active (13 @ every 3 min)
| Loop | Repo | Focus |
|------|------|-------|
| Testament Burn | the-nexus | MUD bridge + paper |
| Foundation Burn | all repos | Gitea issues |
| beacon-sprint | the-nexus | paper iterations |
| timmy-home sprint | timmy-home | 226 issues |
| Beacon sprint | the-beacon | game issues |
| timmy-config sprint | timmy-config | config issues |
| the-door burn | the-door | crisis front door |
| the-testament burn | the-testament | book |
| the-nexus burn | the-nexus | 3D world + MUD |
| fleet-ops burn | fleet-ops | sovereign fleet |
| timmy-academy burn | timmy-academy | academy |
| turboquant burn | turboquant | KV-cache compression |
| wolf burn | wolf | model evaluation |
## Expected Outcomes by 7 AM
### API Calls
- Total calls: ~2,010
- Successful completions: ~1,400 (70%)
- API errors (rate limit, timeout): ~400 (20%)
- Iteration limits hit: ~210 (10%)
### Commits
- Total commits pushed: ~800-1,200
- Average per loop: ~60-90 commits
- Unique branches created: ~300-400
### Pull Requests
- Total PRs created: ~150-250
- Average per loop: ~12-19 PRs
### Issues Filed
- New issues created (QA, explorer): ~20-40
- Issues closed by PRs: ~50-100
### Code Written
- Estimated lines added: ~50,000-100,000
- Estimated files created/modified: ~2,000-3,000
### Paper Progress
- Research paper iterations: ~150 cycles
- Expected paper word count growth: ~5,000-10,000 words
- New experiment results: 2-4 additional experiments
- BibTeX citations: 10-20 verified citations
### MUD Bridge
- Bridge file: 2,875 → ~5,000+ lines
- New game systems: 5-10 (combat tested, economy, social graph, leaderboard)
- QA cycles: 15-30 exploration sessions
- Critical bugs found: 3-5
- Critical bugs fixed: 2-3
### Repository Activity (per repo)
| Repo | Expected PRs | Expected Commits |
|------|-------------|-----------------|
| the-nexus | 30-50 | 200-300 |
| the-beacon | 20-30 | 150-200 |
| timmy-config | 15-25 | 100-150 |
| the-testament | 10-20 | 80-120 |
| the-door | 5-10 | 40-60 |
| timmy-home | 10-20 | 80-120 |
| fleet-ops | 5-10 | 40-60 |
| timmy-academy | 5-10 | 40-60 |
| turboquant | 3-5 | 20-30 |
| wolf | 3-5 | 20-30 |
### Dream Cycle
- 5 dreams generated (11:30 PM, 1 AM, 2:30 AM, 4 AM, 5:30 AM)
- 1 reflection (10 PM)
- 1 timmy-dreams (5:30 AM)
- Total dream output: ~5,000-8,000 words of creative writing
### Explorer (every 10 min)
- ~45 exploration cycles
- Bugs found: 15-25
- Issues filed: 15-25
### Risk Factors
- API rate limiting: Possible after 500+ consecutive calls
- Large file patch failures: Bridge file too large for agents
- Branch conflicts: Multiple agents on same repo
- Iteration limits: 5-iteration agents can't push
- Repository cloning: May hit timeout on slow clones
### Confidence Level
- High confidence: 800+ commits, 150+ PRs
- Medium confidence: 1,000+ commits, 200+ PRs
- Low confidence: 1,200+ commits, 250+ PRs (requires all loops running clean)
---
*This report is a prediction. The 7 AM morning report will compare actual results.*
*Generated: 2026-04-12 23:36 EDT*
*Author: Timmy (pre-shift prediction)*

View File

@@ -4,61 +4,48 @@ Sync branch protection rules from .gitea/branch-protection/*.yml to Gitea.
Correctly uses the Gitea 1.25+ API (not GitHub-style).
"""
from __future__ import annotations
import json
import os
import sys
import json
import urllib.request
from pathlib import Path
import yaml
GITEA_URL = os.getenv("GITEA_URL", "https://forge.alexanderwhitestone.com")
GITEA_TOKEN = os.getenv("GITEA_TOKEN", "")
ORG = "Timmy_Foundation"
PROJECT_ROOT = Path(__file__).resolve().parent.parent
CONFIG_DIR = PROJECT_ROOT / ".gitea" / "branch-protection"
CONFIG_DIR = ".gitea/branch-protection"
def api_request(method: str, path: str, payload: dict | None = None) -> dict:
url = f"{GITEA_URL}/api/v1{path}"
data = json.dumps(payload).encode() if payload else None
req = urllib.request.Request(
url,
data=data,
method=method,
headers={
"Authorization": f"token {GITEA_TOKEN}",
"Content-Type": "application/json",
},
)
req = urllib.request.Request(url, data=data, method=method, headers={
"Authorization": f"token {GITEA_TOKEN}",
"Content-Type": "application/json",
})
with urllib.request.urlopen(req, timeout=30) as resp:
return json.loads(resp.read().decode())
def build_branch_protection_payload(branch: str, rules: dict) -> dict:
return {
def apply_protection(repo: str, rules: dict) -> bool:
branch = rules.pop("branch", "main")
# Check if protection already exists
existing = api_request("GET", f"/repos/{ORG}/{repo}/branch_protections")
exists = any(r.get("branch_name") == branch for r in existing)
payload = {
"branch_name": branch,
"rule_name": branch,
"required_approvals": rules.get("required_approvals", 1),
"block_on_rejected_reviews": rules.get("block_on_rejected_reviews", True),
"dismiss_stale_approvals": rules.get("dismiss_stale_approvals", True),
"block_deletions": rules.get("block_deletions", True),
"block_force_push": rules.get("block_force_push", rules.get("block_force_pushes", True)),
"block_force_push": rules.get("block_force_push", True),
"block_admin_merge_override": rules.get("block_admin_merge_override", True),
"enable_status_check": rules.get("require_ci_to_merge", False),
"status_check_contexts": rules.get("status_check_contexts", []),
"block_on_outdated_branch": rules.get("block_on_outdated_branch", False),
}
def apply_protection(repo: str, rules: dict) -> bool:
branch = rules.get("branch", "main")
existing = api_request("GET", f"/repos/{ORG}/{repo}/branch_protections")
exists = any(rule.get("branch_name") == branch for rule in existing)
payload = build_branch_protection_payload(branch, rules)
try:
if exists:
api_request("PATCH", f"/repos/{ORG}/{repo}/branch_protections/{branch}", payload)
@@ -66,8 +53,8 @@ def apply_protection(repo: str, rules: dict) -> bool:
api_request("POST", f"/repos/{ORG}/{repo}/branch_protections", payload)
print(f"{repo}:{branch} synced")
return True
except Exception as exc:
print(f"{repo}:{branch} failed: {exc}")
except Exception as e:
print(f"{repo}:{branch} failed: {e}")
return False
@@ -75,18 +62,15 @@ def main() -> int:
if not GITEA_TOKEN:
print("ERROR: GITEA_TOKEN not set")
return 1
if not CONFIG_DIR.exists():
print(f"ERROR: config directory not found: {CONFIG_DIR}")
return 1
ok = 0
for cfg_path in sorted(CONFIG_DIR.glob("*.yml")):
repo = cfg_path.stem
with cfg_path.open() as fh:
cfg = yaml.safe_load(fh) or {}
rules = cfg.get("rules", {})
rules.setdefault("branch", cfg.get("branch", "main"))
if apply_protection(repo, rules):
for fname in os.listdir(CONFIG_DIR):
if not fname.endswith(".yml"):
continue
repo = fname[:-4]
with open(os.path.join(CONFIG_DIR, fname)) as f:
cfg = yaml.safe_load(f)
if apply_protection(repo, cfg.get("rules", {})):
ok += 1
print(f"\nSynced {ok} repo(s)")

View File

@@ -0,0 +1,68 @@
"""Test that electron-main.js security fix prevents command injection."""
import subprocess
import re
def test_no_raw_exec():
"""electron-main.js should not use child_process.exec (only execFile)."""
content = open('electron-main.js').read()
# Should use execFile, not exec
assert 'execFile' in content, "Should use execFile for safe subprocess execution"
# Should NOT have raw exec import (allow execFile which contains 'exec')
lines = content.split('\n')
for line in lines:
if 'require' in line and 'exec' in line:
assert 'execFile' in line, f"Should import execFile, not exec: {line}"
def test_command_whitelist():
"""electron-main.js should have a whitelist of allowed operations."""
content = open('electron-main.js').read()
assert 'ALLOWED_MEMPALACE_OPS' in content, "Should have operation whitelist"
assert 'search' in content, "Whitelist should include 'search'"
assert 'init' in content, "Whitelist should include 'init'"
def test_shell_metacharacter_rejection():
"""electron-main.js should reject shell metacharacters in arguments."""
content = open('electron-main.js').read()
assert 'sanitizeArg' in content, "Should have argument sanitizer"
assert 'metacharacter' in content.lower() or 'metacharacters' in content.lower() or '[;&|`$()' in content, \
"Should check for shell metacharacters"
def test_mempalace_no_template_interpolation():
"""mempalace.js should not use template literals with shell commands."""
content = open('mempalace.js').read()
# Should NOT have backtick strings with shell commands
dangerous_patterns = re.findall(r'`mempalace\s', content)
assert len(dangerous_patterns) == 0, \
f"mempalace.js should not have template-interpolated shell commands, found: {dangerous_patterns}"
def test_mempalace_uses_safe_ipc():
"""mempalace.js should use the safe mempalace-exec IPC."""
content = open('mempalace.js').read()
assert 'mempalaceExec' in content or '_exec' in content, \
"mempalace.js should use safe IPC method"
assert 'execPython' not in content, \
"mempalace.js should not reference the legacy execPython"
def test_app_no_template_interpolation():
"""app.js should not have template-interpolated shell commands."""
content = open('app.js').read()
dangerous = re.findall(r'`mempalace\s', content)
assert len(dangerous) == 0, \
f"app.js should not have template-interpolated mempalace commands, found: {dangerous}"
def test_preload_exposes_safe_api():
"""preload.js should expose mempalaceExec through context bridge."""
content = open('preload.js').read()
assert 'mempalaceExec' in content, "preload.js should expose mempalaceExec"
assert 'contextBridge' in content, "preload.js should use contextBridge"
assert 'exec-python' in content, "preload.js should still expose legacy exec-python bridge"
if __name__ == '__main__':
test_no_raw_exec()
test_command_whitelist()
test_shell_metacharacter_rejection()
test_mempalace_no_template_interpolation()
test_mempalace_uses_safe_ipc()
test_app_no_template_interpolation()
test_preload_exposes_safe_api()
print("All security tests passed")

View File

@@ -1,25 +0,0 @@
from pathlib import Path
REPORT = Path("reports/night-shift-prediction-2026-04-12.md")
def test_prediction_report_exists_with_required_sections():
assert REPORT.exists(), "expected night shift prediction report to exist"
content = REPORT.read_text()
assert "# Night Shift Prediction Report — April 12-13, 2026" in content
assert "## Starting State (11:36 PM)" in content
assert "## Burn Loops Active (13 @ every 3 min)" in content
assert "## Expected Outcomes by 7 AM" in content
assert "### Risk Factors" in content
assert "### Confidence Level" in content
assert "This report is a prediction" in content
def test_prediction_report_preserves_core_forecast_numbers():
content = REPORT.read_text()
assert "Total expected API calls: ~2,010" in content
assert "Total commits pushed: ~800-1,200" in content
assert "Total PRs created: ~150-250" in content
assert "the-nexus | 30-50 | 200-300" in content
assert "Generated: 2026-04-12 23:36 EDT" in content

View File

@@ -1,45 +0,0 @@
from __future__ import annotations
import importlib.util
import sys
from pathlib import Path
import yaml
PROJECT_ROOT = Path(__file__).parent.parent
_spec = importlib.util.spec_from_file_location(
"sync_branch_protection_test",
PROJECT_ROOT / "scripts" / "sync_branch_protection.py",
)
_mod = importlib.util.module_from_spec(_spec)
sys.modules["sync_branch_protection_test"] = _mod
_spec.loader.exec_module(_mod)
build_branch_protection_payload = _mod.build_branch_protection_payload
def test_build_branch_protection_payload_enables_rebase_before_merge():
payload = build_branch_protection_payload(
"main",
{
"required_approvals": 1,
"dismiss_stale_approvals": True,
"require_ci_to_merge": False,
"block_deletions": True,
"block_force_push": True,
"block_on_outdated_branch": True,
},
)
assert payload["branch_name"] == "main"
assert payload["rule_name"] == "main"
assert payload["block_on_outdated_branch"] is True
assert payload["required_approvals"] == 1
assert payload["enable_status_check"] is False
def test_the_nexus_branch_protection_config_requires_up_to_date_branch():
config = yaml.safe_load((PROJECT_ROOT / ".gitea" / "branch-protection" / "the-nexus.yml").read_text())
rules = config["rules"]
assert rules["block_on_outdated_branch"] is True