Mike Swanson
1c7df5018e
Two session logs: - session-logs/2026-04-16-session.md: cross-cutting (multi-user, audit, infrastructure) - guru-rmm session log appended: MSI installer, Len's Auto Brokerage, Uranus, migration drift Gap fixes: GrepAI initialized + MCP server added, Ollama models pulling, settings.json created (bypassPermissions), MCP_SERVERS.md written. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
38 lines
1.3 KiB
Bash
38 lines
1.3 KiB
Bash
#!/usr/bin/env bash
|
|
# Resolve an M365 domain (or UPN) to a tenant GUID via OpenID discovery.
|
|
# Usage: resolve-tenant.sh <domain-or-upn-or-tenantid>
|
|
# Output (stdout): tenant GUID. Exit 0 on success, 1 on failure.
|
|
set -euo pipefail
|
|
|
|
INPUT="${1:?usage: resolve-tenant.sh <domain|upn|tenant-id>}"
|
|
|
|
# If it looks like a GUID already, pass through.
|
|
if [[ "$INPUT" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$ ]]; then
|
|
echo "$INPUT"
|
|
exit 0
|
|
fi
|
|
|
|
# If it's a UPN, strip to domain.
|
|
DOMAIN="${INPUT#*@}"
|
|
|
|
# Lightweight cache keyed by domain.
|
|
CACHE_DIR="/tmp/remediation-tool/_tenant-cache"
|
|
mkdir -p "$CACHE_DIR"
|
|
CACHE_FILE="$CACHE_DIR/${DOMAIN}.txt"
|
|
if [[ -f "$CACHE_FILE" ]] && [[ $(find "$CACHE_FILE" -mmin -1440 2>/dev/null) ]]; then
|
|
cat "$CACHE_FILE"
|
|
exit 0
|
|
fi
|
|
|
|
# OpenID discovery — parse issuer URL for tenant GUID.
|
|
RESP=$(curl -s --max-time 10 "https://login.microsoftonline.com/${DOMAIN}/v2.0/.well-known/openid-configuration")
|
|
TENANT_ID=$(echo "$RESP" | jq -r '.issuer // empty' | sed -E 's|^https://login\.microsoftonline\.com/||;s|/v2\.0/?$||' || true)
|
|
|
|
if [[ -z "$TENANT_ID" ]] || [[ ! "$TENANT_ID" =~ ^[0-9a-fA-F]{8}- ]]; then
|
|
echo "ERROR: could not resolve tenant for domain: $DOMAIN" >&2
|
|
echo "Response: $RESP" >&2
|
|
exit 1
|
|
fi
|
|
|
|
echo "$TENANT_ID" | tee "$CACHE_FILE"
|