diff --git a/.gitfield/push_log.json b/.gitfield/push_log.json index d43f8a9..a688d4f 100644 --- a/.gitfield/push_log.json +++ b/.gitfield/push_log.json @@ -338,6 +338,12 @@ "branch": "master", "commit": "1b3cbddd28f16b6e3971bc60603c0ebcf3506b19", "message": "Generated index.json at 2025-06-13T03:33:02Z" + }, + { + "timestamp": "2025-06-13 00:33:24", + "branch": "master", + "commit": "025c2edbd4516465df2e3e56de876251028d0fdb", + "message": "Generated docs/integrity.sha256 at 2025-06-13T05:33:24Z" } ] } diff --git a/.gitfield/pushed.log b/.gitfield/pushed.log index dd06e7c..b9d8088 100644 --- a/.gitfield/pushed.log +++ b/.gitfield/pushed.log @@ -907,3 +907,7 @@ Diff Summary: .gitfield/github.sigil.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) +[2025-06-13T05:33:24Z] Local: , Branch=master, Commit=bb86593 + Diff Summary: + .gitfield/local.sigil.md | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/gitfield-netmon b/bin/gitfield-netmon new file mode 100755 index 0000000..b65d4b6 --- /dev/null +++ b/bin/gitfield-netmon @@ -0,0 +1,282 @@ +#!/bin/bash +set -euo pipefail +IFS=$'\n\t' + +# Configuration +GIT_REMOTE_NAME="gogs" +GOGS_DOMAIN="netmon.thefoldwithin.earth" +GOGS_SSH="git@$GOGS_DOMAIN" +GOGS_API="https://$GOGS_DOMAIN/api/v1" +GOGS_SSH_PORT="22" +USERNAME="mrhavens" +REPO_ROOT=$(git rev-parse --show-toplevel 2>/dev/null) || { echo "[ERROR] Not inside a git repository." >&2; exit 1; } +REPO_NAME=$(basename "$REPO_ROOT") || { echo "[ERROR] Failed to get repository name" >&2; exit 1; } +MARKDOWN_FILE="$REPO_ROOT/.gitfield/gogs.sigil.md" +DEFAULT_NAME="Mark Randall Havens" +DEFAULT_EMAIL="mark.r.havens@gmail.com" +TOKEN_FILE="$HOME/.gitfield_token_gogs" +SSH_KEY="$HOME/.ssh/id_ed25519" +SCRIPT_VERSION="1.2" + +# Logging functions +info() { echo -e "\e[1;34m[INFO]\e[0m $*"; } +warn() { echo -e "\e[1;33m[WARN]\e[0m $*"; } +error() { echo -e "\e[1;31m[ERROR]\e[0m $*" >&2; exit 1; } + +# Check for required tools +info "Checking for required tools..." +for cmd in git curl jq ssh; do + command -v "$cmd" >/dev/null || { + sudo apt update -qq || warn "Failed to update package lists, continuing..." + sudo apt install -y git curl jq openssh-client || error "Failed to install $cmd" + } +done + +# Handle authentication +RESET_AUTH=false +if [[ "${1:-}" == "--reset-auth" ]]; then + RESET_AUTH=true + rm -f "$TOKEN_FILE" 2>/dev/null || warn "Failed to remove token file" + info "Authentication reset requested." +fi + +# Token-based authentication +if [[ -f "$TOKEN_FILE" && "$RESET_AUTH" == false ]]; then + TOKEN=$(cat "$TOKEN_FILE" 2>/dev/null) || error "Failed to read token from $TOKEN_FILE" + info "Using cached token from $TOKEN_FILE" +else + info "GOGS token required." + echo "šŸ” Generate a token at https://$GOGS_DOMAIN/user/settings/applications (scopes: write:repository, write:ssh_key)" + echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" + read -rsp "Token: " TOKEN + echo + [[ -z "$TOKEN" ]] && error "Token cannot be empty" + echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" + chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" + info "Token saved at $TOKEN_FILE" +fi + +# Verify token +info "Verifying token..." +TOKEN_TEST=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/user" | jq -r .login 2>/dev/null || echo "") +if [[ "$TOKEN_TEST" != "$USERNAME" ]]; then + warn "Token verification failed. Please generate a new token at https://$GOGS_DOMAIN/user/settings/applications" + rm -f "$TOKEN_FILE" + echo "šŸ” Paste your GOGS Personal Access Token (will not be echoed):" + read -rsp "Token: " TOKEN + echo + [[ -z "$TOKEN" ]] && error "Token cannot be empty" + echo "$TOKEN" > "$TOKEN_FILE" || error "Failed to write token to $TOKEN_FILE" + chmod 600 "$TOKEN_FILE" || error "Failed to set permissions on $TOKEN_FILE" + info "Token saved at $TOKEN_FILE" +fi + +# Set git user info +git config --global user.name "$DEFAULT_NAME" || warn "Failed to set git user name" +git config --global user.email "$DEFAULT_EMAIL" || warn "Failed to set git user email" +info "Git identity set to: $DEFAULT_NAME <$DEFAULT_EMAIL>" + +# Ensure at least one commit exists +if ! git rev-parse HEAD &>/dev/null; then + error "No commits found. Please add and commit files first." +fi + +# SSH setup +if [[ ! -f "$SSH_KEY" ]]; then + info "Generating SSH key..." + ssh-keygen -t ed25519 -C "$DEFAULT_EMAIL" -f "$SSH_KEY" -N "" || error "Failed to generate SSH key" +fi + +eval "$(ssh-agent -s)" >/dev/null 2>&1 || error "Failed to start ssh-agent" +ssh-add "$SSH_KEY" >/dev/null 2>&1 || warn "SSH key already added or could not be added" + +# Configure SSH +SSH_CONFIG_FILE="$HOME/.ssh/config" +if ! grep -q "Host $GOGS_DOMAIN" "$SSH_CONFIG_FILE" 2>/dev/null; then + mkdir -p "$HOME/.ssh" && chmod 700 "$HOME/.ssh" + cat >> "$SSH_CONFIG_FILE" <&1) +if ! echo "$SSH_TEST_OUTPUT" | grep -q "success"; then + warn "SSH test failed, uploading SSH key..." + PUBKEY=$(cat "${SSH_KEY}.pub" 2>/dev/null) || error "Failed to read SSH public key" + TITLE="AutoKey-$(hostname)-$(date +%s)" + CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/keys" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"title\": \"$TITLE\", \"key\": \"$PUBKEY\"}" 2>&1) + if [[ $? -ne 0 ]]; then + warn "SSH key upload failed: $CURL_OUTPUT" + else + info "SSH key uploaded successfully." + sleep 2 + SSH_TEST_OUTPUT=$(ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1) + [[ ! "$SSH_TEST_OUTPUT" =~ "success" ]] && warn "SSH test still failing: $SSH_TEST_OUTPUT" + fi +else + info "SSH test passed: $SSH_TEST_OUTPUT" +fi + +# Fallback to HTTPS if SSH fails +USE_HTTPS=false +if ! ssh -T -p "$GOGS_SSH_PORT" "$GOGS_SSH" 2>&1 | grep -q "success"; then + warn "SSH authentication failed, falling back to HTTPS..." + USE_HTTPS=true + git config --global credential.helper store + echo "https://$USERNAME:$TOKEN@$GOGS_DOMAIN" > "$HOME/.git-credentials" || error "Failed to write git credentials" + chmod 600 "$HOME/.git-credentials" || error "Failed to set permissions on git credentials" +fi + +# Check and create GOGS repository +info "Checking if repository exists..." +EXISTS=$(curl -k -s -H "Authorization: token $TOKEN" "$GOGS_API/repos/$USERNAME/$REPO_NAME" | jq -r .name 2>/dev/null || echo "") +if [[ "$EXISTS" != "$REPO_NAME" ]]; then + info "Creating repository $REPO_NAME on GOGS..." + CURL_OUTPUT=$(curl -k -s --fail -X POST "$GOGS_API/user/repos" \ + -H "Authorization: token $TOKEN" \ + -H "Content-Type: application/json" \ + -d "{\"name\": \"$REPO_NAME\", \"description\": \"Created via gitfield-gogs\", \"private\": false, \"auto_init\": false}" 2>&1) || { + warn "Failed to create repository: $CURL_OUTPUT" + error "Repository creation failed. Check token permissions or network." + } + info "Repository created successfully." +fi + +# Set up git remote +if [[ "$USE_HTTPS" == true ]]; then + REMOTE_URL="https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" +else + REMOTE_URL="$GOGS_SSH:$USERNAME/$REPO_NAME.git" +fi +if ! git remote get-url "$GIT_REMOTE_NAME" &>/dev/null; then + info "Adding remote $GIT_REMOTE_NAME..." + git remote add "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to add remote $GIT_REMOTE_NAME" +else + info "Updating remote $GIT_REMOTE_NAME..." + git remote set-url "$GIT_REMOTE_NAME" "$REMOTE_URL" || error "Failed to set remote URL for $GIT_REMOTE_NAME" +fi + +# Generate metadata file +mkdir -p "$(dirname "$MARKDOWN_FILE")" || error "Failed to create directory for $MARKDOWN_FILE" +TIMESTAMP=$(date '+%Y-%m-%d %H:%M:%S') || error "Failed to get timestamp" +DEFAULT_BRANCH=$(git symbolic-ref --short HEAD) || error "Failed to get default branch" +REPO_PATH="$REPO_ROOT" +LATEST_SHA=$(git rev-parse HEAD) || error "Failed to get latest commit SHA" +LAST_COMMIT_MSG=$(git log -1 --pretty=format:"%s" 2>/dev/null || echo "Unknown") +LAST_COMMIT_DATE=$(git log -1 --pretty=format:"%ad" 2>/dev/null || echo "Unknown") +LAST_COMMIT_AUTHOR=$(git log -1 --pretty=format:"%an <%ae>" 2>/dev/null || echo "Unknown") +TOTAL_COMMITS=$(git rev-list --count HEAD 2>/dev/null || echo "Unknown") +TRACKED_FILES=$(git ls-files 2>/dev/null | wc -l 2>/dev/null || echo "Unknown") +UNCOMMITTED=$(if ! git diff --quiet 2>/dev/null || ! git diff --cached --quiet 2>/dev/null; then echo "Yes"; else echo "No"; fi) +LATEST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || echo "None") +HOSTNAME=$(hostname 2>/dev/null || echo "Unknown") +CURRENT_USER=$(whoami 2>/dev/null || echo "Unknown") +TIMEZONE=$(date +%Z 2>/dev/null || echo "Unknown") +OS_NAME=$(uname -s 2>/dev/null || echo "Unknown") +KERNEL_VERSION=$(uname -r 2>/dev/null || echo "Unknown") +ARCHITECTURE=$(uname -m 2>/dev/null || echo "Unknown") +OS_PRETTY_NAME=$(grep PRETTY_NAME /etc/os-release 2>/dev/null | cut -d= -f2 | tr -d '"' || echo "Unknown") +WEB_LINK="https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME" + +cat > "$MARKDOWN_FILE" </dev/null || echo "Unknown")\` +- **Local IP**: \$(hostname -I 2>/dev/null | awk '{print $1}' 2>/dev/null || echo "Unknown")\` +- **CPU Model**: \$(grep -m1 'model name' /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ //' 2>/dev/null || echo "Unknown")\` +- **Total RAM (GB)**: \$(awk '/MemTotal/ {printf "%.2f", $2/1024/1024}' /proc/meminfo 2>/dev/null || echo "Unknown")\` + +--- + +_Auto-generated by \`gitfield-gogs\` push script._ +EOF +[[ $? -eq 0 ]] || error "Failed to write metadata to $MARKDOWN_FILE" + +# Commit and push +set +e +info "Committing markdown file..." +git add "$MARKDOWN_FILE" || warn "Failed to add markdown file" +git commit -m "GOGS metadata link commit at $TIMESTAMP — $WEB_LINK/commit/$LATEST_SHA" || warn "No changes to commit" + +info "Pushing to GOGS..." +if ! git config --get branch."$DEFAULT_BRANCH".remote &>/dev/null; then + git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { + warn "Push to GOGS failed." + if [[ "$USE_HTTPS" == false ]]; then + warn "Retrying with HTTPS..." + git remote set-url "$GIT_REMOTE_NAME" "https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" + git push -u "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || error "Push failed with both SSH and HTTPS." + fi + } +else + git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || { + warn "Push to GOGS failed." + if [[ "$USE_HTTPS" == false ]]; then + warn "Retrying with HTTPS..." + git remote set-url "$GIT_REMOTE_NAME" "https://$GOGS_DOMAIN/$USERNAME/$REPO_NAME.git" + git push "$GIT_REMOTE_NAME" "$DEFAULT_BRANCH" || error "Push failed with both SSH and HTTPS." + fi + } +fi +set -e + +info "āœ… GOGS push complete." +echo -e "\nšŸ”— View in browser: $WEB_LINK\n"