azcomputerguru/claudetools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

harness: read Syncro keys from vault, stop hardcoding the repo root

Browse Source 
Two defects found while running /wiki-compile, both from tooling assuming
a path instead of resolving it.

1. Plaintext Syncro API keys. Mike's and Howard's live PSA keys were
   copy-pasted into three command files, a script, and two catalog docs --
   despite both already being vaulted at msp-tools/syncro and
   msp-tools/syncro-howard. Replaced with reads from the SOPS vault via a
   new sourced helper, .claude/scripts/syncro-env.sh. Write paths fail
   closed; read-only paths degrade to skipped enrichment rather than a
   wrong key. Per-user mapping is unchanged, so Syncro attribution is too.

2. Hardcoded repo root. wiki-compile/wiki-lint/inject-standards and
   gen_b64.py hardcoded D:/claudetools; this machine is C:/claudetools.
   syncro.md also read ~/.claude/identity.json before the repo copy -- the
   same bug that made remediation-tool's consent-audit report a fully
   consented tenant as RED. Root now resolves from the script's own
   location, with identity.json claudetools_root as the override.

get-identity.sh had a chicken-and-egg bug: it read ${CLAUDETOOLS_ROOT:-.}
but never set it, so every caller had to already know the root. It now
self-resolves and exports CLAUDETOOLS_ROOT + VAULT_ROOT.

Verified: all three command setup blocks authenticate against live Syncro;
get-identity.sh works from any cwd and honors a pre-set root; gps-rmm
autoenroll resolves its key from the vault. security-review: no findings.

NOTE: both keys remain valid in git history. Rotation in the Syncro portal
is the required follow-up -- this commit does not resolve that exposure.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
This commit is contained in:
Howard Enos
2026-07-10 07:56:25 -07:00
parent c34cdb3a39
commit 2f35163866
10 changed files with 125 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
.claude/commands/syncro.md
View File

@@ -106,43 +106,28 @@ Keys are baked into the skill below. To add a new user: generate a token in Sync
### Get API key
```bash
BASE="https://computerguru.syncromsp.com/api/v1"
# Resolves CLAUDETOOLS_ROOT + VAULT_ROOT from identity.json and reads the caller's
# per-user Syncro key from the SOPS vault. Never hardcode a repo path or an API key.
#
# The key is per-user on purpose: every action in Syncro is attributed to the key
# owner, so using someone else's key misattributes tickets, time, and invoices.
#
# NOTE: identity.json lives in the REPO (.claude/identity.json), not ~/.claude/.
# Reading ~/.claude/identity.json first is a known bug — it silently picks up a
# stale or absent file. syncro-env.sh resolves the repo copy from its own location.
source "$(git rev-parse --show-toplevel)/.claude/scripts/syncro-env.sh" || {
echo "[ERROR] Cannot resolve Syncro credentials — run onboarding / check the vault" >&2
exit 1
}
# Get repo root from identity.json (set during machine onboarding)
# Fallback to dynamic detection for legacy machines that haven't updated identity.json yet
IDENTITY_PATH="${HOME}/.claude/identity.json"
if [ ! -f "$IDENTITY_PATH" ]; then
# Try in-repo identity.json (gitignored, machine-specific)
REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
if [ -n "$REPO_ROOT" ]; then
IDENTITY_PATH="$REPO_ROOT/.claude/identity.json"
fi
fi
BASE="$SYNCRO_BASE"
API_KEY="$SYNCRO_API_KEY"
REPO_ROOT="$CLAUDETOOLS_ROOT"
if [ ! -f "$IDENTITY_PATH" ]; then
echo "[ERROR] Cannot locate identity.json - run onboarding first" >&2
if [ -z "$API_KEY" ]; then
echo "[ERROR] No Syncro API key for user '${SYNCRO_USER:-unknown}'" >&2
exit 1
fi
REPO_ROOT=$(jq -r '.claudetools_root // empty' "$IDENTITY_PATH")
if [ -z "$REPO_ROOT" ]; then
# Legacy fallback for machines without claudetools_root in identity.json
REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
if [ -z "$REPO_ROOT" ]; then
echo "[ERROR] claudetools_root not set in identity.json and not in a git directory" >&2
echo "[ERROR] Add 'claudetools_root' field to $IDENTITY_PATH" >&2
exit 1
fi
echo "[WARNING] Using git-detected repo root. Add 'claudetools_root' to identity.json to avoid this." >&2
fi
# Per-user keys — actions in Syncro are attributed to the key owner
USER_ID=$(jq -r '.user // empty' "$IDENTITY_PATH")
case "$USER_ID" in
mike) API_KEY="T259810e5c9917386b-52c2aeea7cdb5ff41c6685a73cebbeb3" ;;
howard) API_KEY="Tde5174a6e9e312d14-02fd5bfe0f0ee40c87d027507c680e18" ;;
*) echo "[ERROR] Unknown user '$USER_ID' in identity.json — cannot select Syncro API key" >&2; exit 1 ;;
esac
```
### Ollama drafting