Compare commits
No commits in common. "main" and "v0.6.0" have entirely different histories.
12 changed files with 154 additions and 876 deletions
|
|
@ -1,214 +0,0 @@
|
||||||
name: Release
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
tags:
|
|
||||||
- 'v[0-9]*'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
release:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container:
|
|
||||||
image: golang:1.27
|
|
||||||
volumes:
|
|
||||||
- /opt/runner/keys:/keys:ro
|
|
||||||
|
|
||||||
steps:
|
|
||||||
- name: Install packaging tools
|
|
||||||
run: |
|
|
||||||
apt-get update
|
|
||||||
apt-get install -y dpkg-dev git curl openssh-client
|
|
||||||
|
|
||||||
- name: Setup SSH
|
|
||||||
run: |
|
|
||||||
test -r /keys/forgejo_runner || { echo "Deploy key /keys/forgejo_runner chybi"; exit 1; }
|
|
||||||
install -m 600 /keys/forgejo_runner /tmp/forgejo_runner
|
|
||||||
echo "GIT_SSH_COMMAND=ssh -p 554 -i /tmp/forgejo_runner -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
- name: Checkout source
|
|
||||||
run: |
|
|
||||||
git clone ssh://git@git-ssh.janvete.com:554/seth/Caddyview.git src
|
|
||||||
cd src
|
|
||||||
git checkout "${{ github.ref_name }}"
|
|
||||||
|
|
||||||
- name: Build binaries, archives and .deb
|
|
||||||
working-directory: src
|
|
||||||
run: |
|
|
||||||
VERSION=${{ github.ref_name }}
|
|
||||||
VER=${VERSION#v}
|
|
||||||
mkdir -p dist
|
|
||||||
|
|
||||||
for PAIR in darwin/arm64 darwin/amd64 linux/amd64; do
|
|
||||||
OS=${PAIR%/*}
|
|
||||||
ARCH=${PAIR#*/}
|
|
||||||
GOOS=$OS GOARCH=$ARCH go build -ldflags="-s -w" -o dist/caddyview-${OS}-${ARCH} .
|
|
||||||
STAGING=$(mktemp -d)
|
|
||||||
cp dist/caddyview-${OS}-${ARCH} ${STAGING}/caddyview
|
|
||||||
tar -czf dist/caddyview-${VERSION}-${OS}-${ARCH}.tar.gz -C ${STAGING} caddyview
|
|
||||||
rm -rf ${STAGING}
|
|
||||||
done
|
|
||||||
|
|
||||||
# Build .deb for linux/amd64
|
|
||||||
DEB_DIR="caddyview_${VER}_amd64"
|
|
||||||
mkdir -p "${DEB_DIR}/DEBIAN"
|
|
||||||
mkdir -p "${DEB_DIR}/usr/local/bin"
|
|
||||||
cp dist/caddyview-linux-amd64 "${DEB_DIR}/usr/local/bin/caddyview"
|
|
||||||
chmod 755 "${DEB_DIR}/usr/local/bin/caddyview"
|
|
||||||
|
|
||||||
cat > "${DEB_DIR}/DEBIAN/control" << CONTROL
|
|
||||||
Package: caddyview
|
|
||||||
Version: ${VER}
|
|
||||||
Section: utils
|
|
||||||
Priority: optional
|
|
||||||
Architecture: amd64
|
|
||||||
Maintainer: seth <seth@janvete.com>
|
|
||||||
Description: TUI SSH monitor for Caddy web server logs
|
|
||||||
CONTROL
|
|
||||||
|
|
||||||
dpkg-deb --build "${DEB_DIR}" "dist/caddyview_${VER}_amd64.deb"
|
|
||||||
mv "${DEB_DIR}" "dist/"
|
|
||||||
|
|
||||||
echo "=== SHA256 checksums ==="
|
|
||||||
sha256sum dist/*.tar.gz dist/*.deb
|
|
||||||
|
|
||||||
- name: Create Forgejo Release
|
|
||||||
working-directory: src
|
|
||||||
env:
|
|
||||||
FORGEJO_TOKEN: ${{ secrets.FORGEJO_TOKEN }}
|
|
||||||
FORGEJO_URL: https://git.janvete.com
|
|
||||||
run: |
|
|
||||||
VERSION=${{ github.ref_name }}
|
|
||||||
API="${FORGEJO_URL}/api/v1/repos/seth/Caddyview"
|
|
||||||
|
|
||||||
# Try to create release; if it already exists, fetch the existing one.
|
|
||||||
RELEASE_JSON=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
|
|
||||||
-H "Content-Type: application/json" \
|
|
||||||
-X POST \
|
|
||||||
-d "{\"tag_name\":\"${VERSION}\",\"name\":\"${VERSION}\",\"draft\":false,\"prerelease\":false}" \
|
|
||||||
"${API}/releases")
|
|
||||||
|
|
||||||
echo "Create release response: ${RELEASE_JSON}"
|
|
||||||
RELEASE_ID=$(echo "${RELEASE_JSON}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
|
||||||
|
|
||||||
if [ -z "${RELEASE_ID}" ]; then
|
|
||||||
echo "Release may already exist, fetching existing release..."
|
|
||||||
EXISTING=$(curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
|
|
||||||
"${API}/releases/tags/${VERSION}")
|
|
||||||
echo "Existing release response: ${EXISTING}"
|
|
||||||
RELEASE_ID=$(echo "${EXISTING}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "${RELEASE_ID}" ]; then
|
|
||||||
echo "Failed to create or fetch release"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "release_id=${RELEASE_ID}" >> "$GITHUB_ENV"
|
|
||||||
|
|
||||||
for ARCHIVE in dist/*.tar.gz dist/*.deb; do
|
|
||||||
[ -e "${ARCHIVE}" ] || continue
|
|
||||||
NAME=$(basename "${ARCHIVE}")
|
|
||||||
CONTENT_TYPE="application/gzip"
|
|
||||||
case "${NAME}" in *.deb) CONTENT_TYPE="application/vnd.debian.binary-package" ;; esac
|
|
||||||
curl -sS -H "Authorization: token ${FORGEJO_TOKEN}" \
|
|
||||||
-H "Content-Type: ${CONTENT_TYPE}" \
|
|
||||||
--data-binary "@${ARCHIVE}" \
|
|
||||||
"${API}/releases/${RELEASE_ID}/assets?name=${NAME}"
|
|
||||||
echo "Uploaded ${NAME}"
|
|
||||||
done
|
|
||||||
|
|
||||||
- name: Update Homebrew tap
|
|
||||||
working-directory: src
|
|
||||||
run: |
|
|
||||||
VERSION=${{ github.ref_name }}
|
|
||||||
VER=${VERSION#v}
|
|
||||||
SHA_ARM64=$(sha256sum dist/caddyview-${VERSION}-darwin-arm64.tar.gz | awk '{print $1}')
|
|
||||||
SHA_AMD64=$(sha256sum dist/caddyview-${VERSION}-darwin-amd64.tar.gz | awk '{print $1}')
|
|
||||||
SHA_LINUX=$(sha256sum dist/caddyview-${VERSION}-linux-amd64.tar.gz | awk '{print $1}')
|
|
||||||
|
|
||||||
git clone ssh://git@git-ssh.janvete.com:554/seth/homebrew-tools.git tap
|
|
||||||
|
|
||||||
cat > tap/Formula/caddyview.rb << FORMULA
|
|
||||||
class Caddyview < Formula
|
|
||||||
desc "TUI SSH monitor for Caddy web server logs"
|
|
||||||
homepage "https://git.janvete.com/seth/Caddyview"
|
|
||||||
version "${VER}"
|
|
||||||
license "MIT"
|
|
||||||
|
|
||||||
on_macos do
|
|
||||||
if Hardware::CPU.arm?
|
|
||||||
url "https://git.janvete.com/seth/Caddyview/releases/download/${VERSION}/caddyview-${VERSION}-darwin-arm64.tar.gz"
|
|
||||||
sha256 "${SHA_ARM64}"
|
|
||||||
else
|
|
||||||
url "https://git.janvete.com/seth/Caddyview/releases/download/${VERSION}/caddyview-${VERSION}-darwin-amd64.tar.gz"
|
|
||||||
sha256 "${SHA_AMD64}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
on_linux do
|
|
||||||
if Hardware::CPU.intel?
|
|
||||||
url "https://git.janvete.com/seth/Caddyview/releases/download/${VERSION}/caddyview-${VERSION}-linux-amd64.tar.gz"
|
|
||||||
sha256 "${SHA_LINUX}"
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def install
|
|
||||||
bin.install "caddyview"
|
|
||||||
end
|
|
||||||
|
|
||||||
test do
|
|
||||||
assert_match "TUI monitor", shell_output("#{bin}/caddyview --help")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
FORMULA
|
|
||||||
|
|
||||||
cd tap
|
|
||||||
git config user.email "forgejo-actions[bot]@janvete.com"
|
|
||||||
git config user.name "forgejo-actions[bot]"
|
|
||||||
git add Formula/caddyview.rb
|
|
||||||
git commit -m "chore: bump caddyview to ${VERSION}"
|
|
||||||
git push
|
|
||||||
|
|
||||||
- name: Update APT repository
|
|
||||||
working-directory: src
|
|
||||||
run: |
|
|
||||||
VERSION=${{ github.ref_name }}
|
|
||||||
VER=${VERSION#v}
|
|
||||||
|
|
||||||
git clone ssh://git@git-ssh.janvete.com:554/seth/apt.git apt-repo
|
|
||||||
cp "dist/caddyview_${VER}_amd64.deb" apt-repo/
|
|
||||||
|
|
||||||
cd apt-repo
|
|
||||||
# repo muze byt uplne prazdny (bez commitu a bez branche)
|
|
||||||
if ! git rev-parse --verify HEAD >/dev/null 2>&1; then
|
|
||||||
git checkout -b main
|
|
||||||
fi
|
|
||||||
dpkg-scanpackages . > Packages
|
|
||||||
gzip -k -f Packages
|
|
||||||
|
|
||||||
cat > Release << RELEASE
|
|
||||||
Origin: janvete
|
|
||||||
Label: janvete
|
|
||||||
Suite: stable
|
|
||||||
Codename: stable
|
|
||||||
Version: 1.0
|
|
||||||
Architectures: amd64
|
|
||||||
Components: main
|
|
||||||
Description: janvete tools APT repository
|
|
||||||
Date: $(date -Ru)
|
|
||||||
RELEASE
|
|
||||||
|
|
||||||
# Append hashes to Release
|
|
||||||
{
|
|
||||||
echo "SHA256:"
|
|
||||||
for f in Packages Packages.gz *.deb; do
|
|
||||||
[ -e "$f" ] || continue
|
|
||||||
printf " %s %16d %s\n" "$(sha256sum "$f" | cut -d' ' -f1)" "$(stat -c%s "$f")" "$f"
|
|
||||||
done
|
|
||||||
} >> Release
|
|
||||||
|
|
||||||
git config user.email "forgejo-actions[bot]@janvete.com"
|
|
||||||
git config user.name "forgejo-actions[bot]"
|
|
||||||
git add -A
|
|
||||||
git commit -m "chore: add caddyview ${VERSION}"
|
|
||||||
git push -u origin HEAD
|
|
||||||
100
.github/workflows/release.yml
vendored
Normal file
100
.github/workflows/release.yml
vendored
Normal file
|
|
@ -0,0 +1,100 @@
|
||||||
|
name: Release
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v[0-9]*'
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
release:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: actions/setup-go@v5
|
||||||
|
with:
|
||||||
|
go-version-file: go.mod
|
||||||
|
|
||||||
|
- name: Build binaries and archives
|
||||||
|
run: |
|
||||||
|
VERSION=${{ github.ref_name }}
|
||||||
|
mkdir -p dist
|
||||||
|
|
||||||
|
for PAIR in darwin/arm64 darwin/amd64 linux/amd64; do
|
||||||
|
OS=${PAIR%/*}
|
||||||
|
ARCH=${PAIR#*/}
|
||||||
|
GOOS=$OS GOARCH=$ARCH go build -ldflags="-s -w" -o dist/caddyview-${OS}-${ARCH} .
|
||||||
|
STAGING=$(mktemp -d)
|
||||||
|
cp dist/caddyview-${OS}-${ARCH} ${STAGING}/caddyview
|
||||||
|
tar -czf dist/caddyview-${VERSION}-${OS}-${ARCH}.tar.gz -C ${STAGING} caddyview
|
||||||
|
rm -rf ${STAGING}
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "=== SHA256 checksums ==="
|
||||||
|
sha256sum dist/*.tar.gz
|
||||||
|
|
||||||
|
- name: Create GitHub Release
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
run: |
|
||||||
|
VERSION=${{ github.ref_name }}
|
||||||
|
gh release create "$VERSION" dist/*.tar.gz \
|
||||||
|
--title "$VERSION" \
|
||||||
|
--generate-notes
|
||||||
|
|
||||||
|
- name: Update Homebrew formula
|
||||||
|
env:
|
||||||
|
TAP_TOKEN: ${{ secrets.TAP_TOKEN }}
|
||||||
|
run: |
|
||||||
|
VERSION=${{ github.ref_name }}
|
||||||
|
VER=${VERSION#v}
|
||||||
|
SHA_ARM64=$(sha256sum dist/caddyview-${VERSION}-darwin-arm64.tar.gz | awk '{print $1}')
|
||||||
|
SHA_AMD64=$(sha256sum dist/caddyview-${VERSION}-darwin-amd64.tar.gz | awk '{print $1}')
|
||||||
|
SHA_LINUX=$(sha256sum dist/caddyview-${VERSION}-linux-amd64.tar.gz | awk '{print $1}')
|
||||||
|
|
||||||
|
git clone "https://x-access-token:${TAP_TOKEN}@github.com/janvete/homebrew-caddyview.git" tap
|
||||||
|
|
||||||
|
cat > tap/Formula/caddyview.rb << FORMULA
|
||||||
|
class Caddyview < Formula
|
||||||
|
desc "TUI SSH monitor for Caddy web server logs"
|
||||||
|
homepage "https://github.com/janvete/caddyview"
|
||||||
|
version "${VER}"
|
||||||
|
license "MIT"
|
||||||
|
|
||||||
|
on_macos do
|
||||||
|
if Hardware::CPU.arm?
|
||||||
|
url "https://github.com/janvete/caddyview/releases/download/${VERSION}/caddyview-${VERSION}-darwin-arm64.tar.gz"
|
||||||
|
sha256 "${SHA_ARM64}"
|
||||||
|
else
|
||||||
|
url "https://github.com/janvete/caddyview/releases/download/${VERSION}/caddyview-${VERSION}-darwin-amd64.tar.gz"
|
||||||
|
sha256 "${SHA_AMD64}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
on_linux do
|
||||||
|
if Hardware::CPU.intel?
|
||||||
|
url "https://github.com/janvete/caddyview/releases/download/${VERSION}/caddyview-${VERSION}-linux-amd64.tar.gz"
|
||||||
|
sha256 "${SHA_LINUX}"
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def install
|
||||||
|
bin.install "caddyview"
|
||||||
|
end
|
||||||
|
|
||||||
|
test do
|
||||||
|
assert_match "TUI monitor", shell_output("#{bin}/caddyview --help")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
FORMULA
|
||||||
|
|
||||||
|
cd tap
|
||||||
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git add Formula/caddyview.rb
|
||||||
|
git commit -m "chore: bump caddyview to ${VERSION}"
|
||||||
|
git push
|
||||||
92
README.md
92
README.md
|
|
@ -1,92 +0,0 @@
|
||||||
# Caddyview
|
|
||||||
|
|
||||||
Remote Caddy log viewer over SSH.
|
|
||||||
|
|
||||||
## Installation
|
|
||||||
|
|
||||||
### macOS (Homebrew)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
brew tap janvete/tools https://git.janvete.com/seth/homebrew-tools.git
|
|
||||||
brew install caddyview
|
|
||||||
```
|
|
||||||
|
|
||||||
### Linux (APT)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
echo "deb [trusted=yes] https://git.janvete.com/seth/apt/raw/branch/main ./" | sudo tee /etc/apt/sources.list.d/janvete.list
|
|
||||||
sudo apt update
|
|
||||||
sudo apt install caddyview
|
|
||||||
```
|
|
||||||
|
|
||||||
### Linux (tarball)
|
|
||||||
|
|
||||||
Download the latest release from the [releases page](https://git.janvete.com/seth/Caddyview/releases) and extract it:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
VERSION=v0.7.0
|
|
||||||
curl -L "https://git.janvete.com/seth/Caddyview/releases/download/${VERSION}/caddyview-${VERSION}-linux-amd64.tar.gz" | tar xz
|
|
||||||
sudo mv caddyview /usr/local/bin/
|
|
||||||
```
|
|
||||||
|
|
||||||
## Usage
|
|
||||||
|
|
||||||
```bash
|
|
||||||
caddyview ssh root@192.168.x.x
|
|
||||||
caddyview ssh -p 2222 admin@server.com
|
|
||||||
```
|
|
||||||
|
|
||||||
Press `[1]` for live traffic, `[2]` for last 24 hours, `[3]` for last 7 days, and `[4]` to view recent 4xx/5xx errors with URL and origin.
|
|
||||||
|
|
||||||
## Required Caddyfile Changes
|
|
||||||
|
|
||||||
### 1. Add a log block to your Caddyfile
|
|
||||||
|
|
||||||
Add the logging configuration to a [snippet](https://caddyserver.com/docs/caddyfile/concepts#snippets) or to each individual site block:
|
|
||||||
|
|
||||||
```caddyfile
|
|
||||||
(hsts) {
|
|
||||||
log {
|
|
||||||
output file /var/log/caddy/access.log {
|
|
||||||
roll_size 100mb
|
|
||||||
roll_keep 10
|
|
||||||
}
|
|
||||||
format json
|
|
||||||
}
|
|
||||||
header {
|
|
||||||
Strict-Transport-Security "max-age=31536000; includeSubDomains; preload"
|
|
||||||
X-Content-Type-Options "nosniff"
|
|
||||||
Referrer-Policy "strict-origin-when-cross-origin"
|
|
||||||
Permissions-Policy "geolocation=(), microphone=(), camera=()"
|
|
||||||
-Server
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
some.dns.com {
|
|
||||||
import hsts
|
|
||||||
reverse_proxy 192.168.71.6:1378
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Create the log file with correct permissions (BEFORE reloading!)
|
|
||||||
|
|
||||||
```bash
|
|
||||||
mkdir -p /var/log/caddy
|
|
||||||
touch /var/log/caddy/access.log
|
|
||||||
chown caddy:caddy /var/log/caddy/access.log
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Reload Caddy
|
|
||||||
|
|
||||||
```bash
|
|
||||||
systemctl reload caddy
|
|
||||||
```
|
|
||||||
|
|
||||||
## Development
|
|
||||||
|
|
||||||
The source repository is hosted at `https://git.janvete.com/seth/Caddyview`.
|
|
||||||
To clone via SSH use the dedicated SSH endpoint:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
git clone ssh://git@git-ssh.janvete.com:554/seth/Caddyview.git
|
|
||||||
```
|
|
||||||
|
|
@ -4,8 +4,8 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
|
|
||||||
"git.janvete.com/seth/caddyview/internal/sshclient"
|
"github.com/janvete/caddyview/internal/sshclient"
|
||||||
"git.janvete.com/seth/caddyview/internal/tui"
|
"github.com/janvete/caddyview/internal/tui"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
16
go.mod
16
go.mod
|
|
@ -1,18 +1,12 @@
|
||||||
module git.janvete.com/seth/caddyview
|
module github.com/janvete/caddyview
|
||||||
|
|
||||||
go 1.26.4
|
go 1.26.4
|
||||||
|
|
||||||
require (
|
|
||||||
github.com/charmbracelet/bubbletea v1.3.10
|
|
||||||
github.com/charmbracelet/lipgloss v1.1.0
|
|
||||||
github.com/spf13/cobra v1.10.2
|
|
||||||
golang.org/x/crypto v0.53.0
|
|
||||||
golang.org/x/term v0.47.0
|
|
||||||
)
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
|
github.com/charmbracelet/bubbletea v1.3.10 // indirect
|
||||||
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
|
github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect
|
||||||
|
github.com/charmbracelet/lipgloss v1.1.0 // indirect
|
||||||
github.com/charmbracelet/x/ansi v0.10.1 // indirect
|
github.com/charmbracelet/x/ansi v0.10.1 // indirect
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
|
github.com/charmbracelet/x/cellbuf v0.0.13-0.20250311204145-2c3ea96c31dd // indirect
|
||||||
github.com/charmbracelet/x/term v0.2.1 // indirect
|
github.com/charmbracelet/x/term v0.2.1 // indirect
|
||||||
|
|
@ -26,8 +20,10 @@ require (
|
||||||
github.com/muesli/cancelreader v0.2.2 // indirect
|
github.com/muesli/cancelreader v0.2.2 // indirect
|
||||||
github.com/muesli/termenv v0.16.0 // indirect
|
github.com/muesli/termenv v0.16.0 // indirect
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
|
github.com/spf13/cobra v1.10.2 // indirect
|
||||||
github.com/spf13/pflag v1.0.9 // indirect
|
github.com/spf13/pflag v1.0.9 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/sys v0.49.0 // indirect
|
golang.org/x/crypto v0.53.0 // indirect
|
||||||
|
golang.org/x/sys v0.46.0 // indirect
|
||||||
golang.org/x/text v0.38.0 // indirect
|
golang.org/x/text v0.38.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
|
||||||
12
go.sum
12
go.sum
|
|
@ -44,14 +44,14 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJu
|
||||||
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
|
||||||
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
|
golang.org/x/crypto v0.53.0 h1:QZ4Muo8THX6CizN2vPPd5fBGHyogrdK9fG4wLPFUsto=
|
||||||
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
|
golang.org/x/crypto v0.53.0/go.mod h1:DNLU434OwVakk9PzuwV8w62mAJpRJL3vsgcfp4Qnsio=
|
||||||
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 h1:MDc5xs78ZrZr3HMQugiXOAkSZtfTpbJLDr/lwfgO53E=
|
|
||||||
golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
|
|
||||||
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||||
golang.org/x/sys v0.49.0 h1:XbzkgYJHdqh/8m2Uu0W/dQv8nktxx4BFHp1M0gROTXA=
|
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
|
||||||
golang.org/x/sys v0.49.0/go.mod h1:hNLxWAXmnKAxqDtdwIYC4bM9oQPEecfsnNMuSxOs3og=
|
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/term v0.47.0 h1:cpyOwQkr2Nzxe2p6KnrTG7Ei2wtzjsuSjhpXXepZ/BM=
|
golang.org/x/sys v0.46.0 h1:noSf2Fq6F8DBgS+LysIkx7rIExoNHJsxOAtPp4rthXw=
|
||||||
golang.org/x/term v0.47.0/go.mod h1:efAfAuG6RKABvg1ArGebRkvX6LXul14SM67o2e4mUCY=
|
golang.org/x/sys v0.46.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
|
||||||
|
golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
|
||||||
|
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
|
||||||
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
|
golang.org/x/text v0.38.0 h1:sXmwo9DwP3OK9EZ7PqAdaooSGozfl/3a6/xJcbzPRhE=
|
||||||
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
|
golang.org/x/text v0.38.0/go.mod h1:YXZt3QhHUKYT53r2lLKFIVi6Ao1jdzrTR/KQ09qyxF4=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||||
|
|
|
||||||
|
|
@ -98,18 +98,6 @@ type Bucket struct {
|
||||||
Bytes int64
|
Bytes int64
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- ErrorEntry (4xx/5xx detail) ----------------------------------------------
|
|
||||||
|
|
||||||
// ErrorEntry holds one failed request for the errors panel.
|
|
||||||
type ErrorEntry struct {
|
|
||||||
Time time.Time
|
|
||||||
Status int
|
|
||||||
Method string
|
|
||||||
URI string
|
|
||||||
Host string
|
|
||||||
RemoteIP string
|
|
||||||
}
|
|
||||||
|
|
||||||
// -- AggregatedHistory (server-side aggregation result) -----------------------
|
// -- AggregatedHistory (server-side aggregation result) -----------------------
|
||||||
|
|
||||||
// AggregatedBucket is one time bucket returned by server-side awk aggregation.
|
// AggregatedBucket is one time bucket returned by server-side awk aggregation.
|
||||||
|
|
@ -127,13 +115,12 @@ type AggregatedHistory struct {
|
||||||
TotalReqs int64
|
TotalReqs int64
|
||||||
TotalBytes int64
|
TotalBytes int64
|
||||||
DurSumSecs float64
|
DurSumSecs float64
|
||||||
Errors []ErrorEntry
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// FilterSince drops buckets and errors older than the window and recomputes
|
// FilterSince drops buckets older than the window and recomputes totals from
|
||||||
// totals from the remaining buckets, so the chart and totals always agree.
|
// the remaining buckets, so the chart and the totals always agree. TopHosts and
|
||||||
// TopHosts and TopIPs come from whole rotated files and may slightly overcount
|
// TopIPs come from whole rotated files and may slightly overcount at the oldest
|
||||||
// at the oldest edge of the window — acceptable for a monitoring view.
|
// edge of the window — acceptable for a monitoring view.
|
||||||
func (h *AggregatedHistory) FilterSince(since int64) {
|
func (h *AggregatedHistory) FilterSince(since int64) {
|
||||||
avgDur := 0.0
|
avgDur := 0.0
|
||||||
if h.TotalReqs > 0 {
|
if h.TotalReqs > 0 {
|
||||||
|
|
@ -152,14 +139,6 @@ func (h *AggregatedHistory) FilterSince(since int64) {
|
||||||
h.TotalReqs = reqs
|
h.TotalReqs = reqs
|
||||||
h.TotalBytes = bytes
|
h.TotalBytes = bytes
|
||||||
h.DurSumSecs = avgDur * float64(reqs)
|
h.DurSumSecs = avgDur * float64(reqs)
|
||||||
|
|
||||||
keptErrs := h.Errors[:0]
|
|
||||||
for _, e := range h.Errors {
|
|
||||||
if e.Time.Unix() >= since {
|
|
||||||
keptErrs = append(keptErrs, e)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
h.Errors = keptErrs
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ToStats converts aggregated history to a Stats object for use in the TUI panels.
|
// ToStats converts aggregated history to a Stats object for use in the TUI panels.
|
||||||
|
|
@ -207,22 +186,6 @@ func (h *AggregatedHistory) ToBuckets(size time.Duration) []Bucket {
|
||||||
return out
|
return out
|
||||||
}
|
}
|
||||||
|
|
||||||
// RecentErrors returns the last n errors sorted by time (newest first).
|
|
||||||
func (h *AggregatedHistory) RecentErrors(n int) []ErrorEntry {
|
|
||||||
if n <= 0 {
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
sorted := make([]ErrorEntry, len(h.Errors))
|
|
||||||
copy(sorted, h.Errors)
|
|
||||||
sort.Slice(sorted, func(i, j int) bool {
|
|
||||||
return sorted[i].Time.After(sorted[j].Time)
|
|
||||||
})
|
|
||||||
if len(sorted) > n {
|
|
||||||
return sorted[:n]
|
|
||||||
}
|
|
||||||
return sorted
|
|
||||||
}
|
|
||||||
|
|
||||||
// ParseAggregatedOutput parses the concatenated output of per-file server-side
|
// ParseAggregatedOutput parses the concatenated output of per-file server-side
|
||||||
// awk aggregations. Sections may repeat (one set per log file) and are merged:
|
// awk aggregations. Sections may repeat (one set per log file) and are merged:
|
||||||
// bucket counts sum by timestamp, host/IP counts sum by key, totals sum.
|
// bucket counts sum by timestamp, host/IP counts sum by key, totals sum.
|
||||||
|
|
@ -235,8 +198,6 @@ func (h *AggregatedHistory) RecentErrors(n int) []ErrorEntry {
|
||||||
// <count> <host>
|
// <count> <host>
|
||||||
// IPS
|
// IPS
|
||||||
// <count> <ip>
|
// <count> <ip>
|
||||||
// ERRORS
|
|
||||||
// <unix_ts>\t<status>\t<method>\t<uri>\t<host>\t<remote_ip>
|
|
||||||
// TOTALS
|
// TOTALS
|
||||||
// <total_reqs> <total_bytes> <duration_sum_secs>
|
// <total_reqs> <total_bytes> <duration_sum_secs>
|
||||||
func ParseAggregatedOutput(raw string) (*AggregatedHistory, error) {
|
func ParseAggregatedOutput(raw string) (*AggregatedHistory, error) {
|
||||||
|
|
@ -254,7 +215,7 @@ func ParseAggregatedOutput(raw string) (*AggregatedHistory, error) {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
switch line {
|
switch line {
|
||||||
case "BUCKETS", "HOSTS", "IPS", "ERRORS", "TOTALS":
|
case "BUCKETS", "HOSTS", "IPS", "TOTALS":
|
||||||
section = line
|
section = line
|
||||||
sawSection = true
|
sawSection = true
|
||||||
continue
|
continue
|
||||||
|
|
@ -298,27 +259,6 @@ func ParseAggregatedOutput(raw string) (*AggregatedHistory, error) {
|
||||||
count, _ := strconv.ParseInt(fields[0], 10, 64)
|
count, _ := strconv.ParseInt(fields[0], 10, 64)
|
||||||
h.TopIPs[fields[1]] += count
|
h.TopIPs[fields[1]] += count
|
||||||
|
|
||||||
case "ERRORS":
|
|
||||||
// Tab-separated: ts status method uri host remote_ip
|
|
||||||
parts := strings.Split(line, "\t")
|
|
||||||
if len(parts) < 6 {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
// Caddy logs ts as a float (unix seconds with fractional part).
|
|
||||||
tsFloat, err := strconv.ParseFloat(parts[0], 64)
|
|
||||||
if err != nil {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
status, _ := strconv.Atoi(parts[1])
|
|
||||||
h.Errors = append(h.Errors, ErrorEntry{
|
|
||||||
Time: time.Unix(int64(tsFloat), 0),
|
|
||||||
Status: status,
|
|
||||||
Method: parts[2],
|
|
||||||
URI: parts[3],
|
|
||||||
Host: parts[4],
|
|
||||||
RemoteIP: parts[5],
|
|
||||||
})
|
|
||||||
|
|
||||||
case "TOTALS":
|
case "TOTALS":
|
||||||
if len(fields) < 2 {
|
if len(fields) < 2 {
|
||||||
continue
|
continue
|
||||||
|
|
|
||||||
|
|
@ -1,95 +0,0 @@
|
||||||
// Copyright 2014 The Go Authors. All rights reserved.
|
|
||||||
// Use of this source code is governed by a BSD-style
|
|
||||||
// license that can be found at https://go.dev/LICENSE.
|
|
||||||
//
|
|
||||||
// Adapted from golang.org/x/crypto/ssh/internal/bcrypt_pbkdf, which is not
|
|
||||||
// importable (internal package). Implements bcrypt_pbkdf(3) from OpenBSD.
|
|
||||||
//
|
|
||||||
// See https://flak.tedunangst.com/post/bcrypt-pbkdf and
|
|
||||||
// https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/lib/libutil/bcrypt_pbkdf.c.
|
|
||||||
package sshclient
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/sha512"
|
|
||||||
"errors"
|
|
||||||
|
|
||||||
"golang.org/x/crypto/blowfish"
|
|
||||||
)
|
|
||||||
|
|
||||||
const bcryptBlockSize = 32
|
|
||||||
|
|
||||||
// bcryptPBKDF derives a key from the password, salt and rounds count,
|
|
||||||
// returning a []byte of length keyLen that can be used as cryptographic key.
|
|
||||||
func bcryptPBKDF(password, salt []byte, rounds, keyLen int) ([]byte, error) {
|
|
||||||
if rounds < 1 {
|
|
||||||
return nil, errors.New("bcrypt_pbkdf: number of rounds is too small")
|
|
||||||
}
|
|
||||||
if len(password) == 0 {
|
|
||||||
return nil, errors.New("bcrypt_pbkdf: empty password")
|
|
||||||
}
|
|
||||||
if len(salt) == 0 || len(salt) > 1<<20 {
|
|
||||||
return nil, errors.New("bcrypt_pbkdf: bad salt length")
|
|
||||||
}
|
|
||||||
if keyLen > 1024 {
|
|
||||||
return nil, errors.New("bcrypt_pbkdf: keyLen is too large")
|
|
||||||
}
|
|
||||||
|
|
||||||
numBlocks := (keyLen + bcryptBlockSize - 1) / bcryptBlockSize
|
|
||||||
key := make([]byte, numBlocks*bcryptBlockSize)
|
|
||||||
|
|
||||||
h := sha512.New()
|
|
||||||
h.Write(password)
|
|
||||||
shapass := h.Sum(nil)
|
|
||||||
|
|
||||||
shasalt := make([]byte, 0, sha512.Size)
|
|
||||||
cnt, tmp := make([]byte, 4), make([]byte, bcryptBlockSize)
|
|
||||||
for block := 1; block <= numBlocks; block++ {
|
|
||||||
h.Reset()
|
|
||||||
h.Write(salt)
|
|
||||||
cnt[0] = byte(block >> 24)
|
|
||||||
cnt[1] = byte(block >> 16)
|
|
||||||
cnt[2] = byte(block >> 8)
|
|
||||||
cnt[3] = byte(block)
|
|
||||||
h.Write(cnt)
|
|
||||||
bcryptHash(tmp, shapass, h.Sum(shasalt))
|
|
||||||
|
|
||||||
out := make([]byte, bcryptBlockSize)
|
|
||||||
copy(out, tmp)
|
|
||||||
for i := 2; i <= rounds; i++ {
|
|
||||||
h.Reset()
|
|
||||||
h.Write(tmp)
|
|
||||||
bcryptHash(tmp, shapass, h.Sum(shasalt))
|
|
||||||
for j := 0; j < len(out); j++ {
|
|
||||||
out[j] ^= tmp[j]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for i, v := range out {
|
|
||||||
key[i*numBlocks+(block-1)] = v
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return key[:keyLen], nil
|
|
||||||
}
|
|
||||||
|
|
||||||
var bcryptMagic = []byte("OxychromaticBlowfishSwatDynamite")
|
|
||||||
|
|
||||||
func bcryptHash(out, shapass, shasalt []byte) {
|
|
||||||
c, err := blowfish.NewSaltedCipher(shapass, shasalt)
|
|
||||||
if err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
for i := 0; i < 64; i++ {
|
|
||||||
blowfish.ExpandKey(shasalt, c)
|
|
||||||
blowfish.ExpandKey(shapass, c)
|
|
||||||
}
|
|
||||||
copy(out, bcryptMagic)
|
|
||||||
for i := 0; i < 32; i += 8 {
|
|
||||||
for j := 0; j < 64; j++ {
|
|
||||||
c.Encrypt(out[i:i+8], out[i:i+8])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Swap bytes due to different endianness.
|
|
||||||
for i := 0; i < 32; i += 4 {
|
|
||||||
out[i+3], out[i+2], out[i+1], out[i] = out[i], out[i+1], out[i+2], out[i+3]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -2,17 +2,15 @@ package sshclient
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
"bufio"
|
||||||
"errors"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"git.janvete.com/seth/caddyview/internal/parser"
|
"github.com/janvete/caddyview/internal/parser"
|
||||||
"golang.org/x/crypto/ssh"
|
"golang.org/x/crypto/ssh"
|
||||||
"golang.org/x/crypto/ssh/agent"
|
"golang.org/x/crypto/ssh/agent"
|
||||||
"golang.org/x/term"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
type Client struct {
|
type Client struct {
|
||||||
|
|
@ -75,6 +73,7 @@ func (c *Client) StreamLines(path string, lines chan<- string, done <-chan struc
|
||||||
|
|
||||||
stdout, err := session.StdoutPipe()
|
stdout, err := session.StdoutPipe()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
session.Close()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -151,7 +150,6 @@ func buildAuthMethods(keyPath string) ([]ssh.AuthMethod, error) {
|
||||||
candidates = append(candidates, filepath.Join(home, ".ssh", name))
|
candidates = append(candidates, filepath.Join(home, ".ssh", name))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
var problems []string
|
|
||||||
for _, p := range candidates {
|
for _, p := range candidates {
|
||||||
data, err := os.ReadFile(p)
|
data, err := os.ReadFile(p)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
@ -159,58 +157,17 @@ func buildAuthMethods(keyPath string) ([]ssh.AuthMethod, error) {
|
||||||
}
|
}
|
||||||
signer, err := ssh.ParsePrivateKey(data)
|
signer, err := ssh.ParsePrivateKey(data)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
var passErr *ssh.PassphraseMissingError
|
|
||||||
if errors.As(err, &passErr) {
|
|
||||||
signer, err = unlockWithPassphrase(p, data)
|
|
||||||
}
|
|
||||||
if err != nil {
|
|
||||||
problems = append(problems, fmt.Sprintf("%s (%v)", p, err))
|
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
}
|
|
||||||
methods = append(methods, ssh.PublicKeys(signer))
|
methods = append(methods, ssh.PublicKeys(signer))
|
||||||
}
|
}
|
||||||
|
|
||||||
if len(methods) == 0 {
|
if len(methods) == 0 {
|
||||||
if len(problems) > 0 {
|
|
||||||
return nil, fmt.Errorf("key files found but could not be loaded: %s", strings.Join(problems, "; "))
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("no SSH auth method available — no agent (SSH_AUTH_SOCK) and no key files found in %v", candidates)
|
return nil, fmt.Errorf("no SSH auth method available — no agent (SSH_AUTH_SOCK) and no key files found in %v", candidates)
|
||||||
}
|
}
|
||||||
return methods, nil
|
return methods, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// unlockWithPassphrase prompts for the passphrase of an encrypted private key.
|
|
||||||
// It runs before the TUI starts, so stdin is still a normal terminal.
|
|
||||||
func unlockWithPassphrase(path string, data []byte) (ssh.Signer, error) {
|
|
||||||
if !term.IsTerminal(int(os.Stdin.Fd())) {
|
|
||||||
return nil, fmt.Errorf("key is passphrase-protected and stdin is not a terminal")
|
|
||||||
}
|
|
||||||
for attempt := 0; attempt < 3; attempt++ {
|
|
||||||
fmt.Fprintf(os.Stderr, "Enter passphrase for %s: ", path)
|
|
||||||
pass, err := term.ReadPassword(int(os.Stdin.Fd()))
|
|
||||||
fmt.Fprintln(os.Stderr)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
signer, err := parsePrivateKeyWithPassphrase(data, pass)
|
|
||||||
if err == nil {
|
|
||||||
return signer, nil
|
|
||||||
}
|
|
||||||
fmt.Fprintf(os.Stderr, "caddyview: cannot decrypt key: %v\n", err)
|
|
||||||
}
|
|
||||||
return nil, fmt.Errorf("could not decrypt key in 3 attempts")
|
|
||||||
}
|
|
||||||
|
|
||||||
// parsePrivateKeyWithPassphrase handles ciphers beyond what x/crypto/ssh
|
|
||||||
// supports (aes256-gcm@openssh.com, e.g. 1Password key exports).
|
|
||||||
func parsePrivateKeyWithPassphrase(data, pass []byte) (ssh.Signer, error) {
|
|
||||||
if isGCMEncryptedKey(data) {
|
|
||||||
return parseGCMKey(data, pass)
|
|
||||||
}
|
|
||||||
return ssh.ParsePrivateKeyWithPassphrase(data, pass)
|
|
||||||
}
|
|
||||||
|
|
||||||
// agentAuth returns an auth method backed by the SSH agent if SSH_AUTH_SOCK is set.
|
// agentAuth returns an auth method backed by the SSH agent if SSH_AUTH_SOCK is set.
|
||||||
func agentAuth() ssh.AuthMethod {
|
func agentAuth() ssh.AuthMethod {
|
||||||
sock := os.Getenv("SSH_AUTH_SOCK")
|
sock := os.Getenv("SSH_AUTH_SOCK")
|
||||||
|
|
@ -274,11 +231,10 @@ func parseCPUStat(raw string) float64 {
|
||||||
return (totalDiff - idleDiff) / totalDiff * 100
|
return (totalDiff - idleDiff) / totalDiff * 100
|
||||||
}
|
}
|
||||||
|
|
||||||
// historyAwkProg aggregates Caddy JSON log lines into hourly summary buckets
|
// historyAwkProg aggregates Caddy JSON log lines into hourly summary buckets.
|
||||||
// and collects the last 100 4xx/5xx errors per file. It runs entirely on the
|
// It runs entirely on the server and uses only POSIX awk constructs (works
|
||||||
// server and uses only POSIX awk constructs (works with gawk, mawk and busybox
|
// with gawk, mawk and busybox awk). IPs are capped to the top 50 per file so
|
||||||
// awk). IPs are capped to the top 50 per file so the output stays small even on
|
// the output stays small even on servers with millions of unique clients.
|
||||||
// servers with millions of unique clients.
|
|
||||||
const historyAwkProg = `
|
const historyAwkProg = `
|
||||||
BEGIN { OFS=" " }
|
BEGIN { OFS=" " }
|
||||||
{
|
{
|
||||||
|
|
@ -288,7 +244,6 @@ BEGIN { OFS=" " }
|
||||||
ts = substr($0,p+5,20)+0
|
ts = substr($0,p+5,20)+0
|
||||||
if (ts < cutoff) next
|
if (ts < cutoff) next
|
||||||
b = int(ts/bucket)*bucket
|
b = int(ts/bucket)*bucket
|
||||||
|
|
||||||
p = index($0,"\"status\":")
|
p = index($0,"\"status\":")
|
||||||
st = (p>0) ? substr($0,p+9,5)+0 : 0
|
st = (p>0) ? substr($0,p+9,5)+0 : 0
|
||||||
p = index($0,"\"size\":")
|
p = index($0,"\"size\":")
|
||||||
|
|
@ -299,11 +254,6 @@ BEGIN { OFS=" " }
|
||||||
if (p>0) { rest=substr($0,p+8); q=index(rest,"\""); ho=(q>0)?substr(rest,1,q-1):"?" } else ho="?"
|
if (p>0) { rest=substr($0,p+8); q=index(rest,"\""); ho=(q>0)?substr(rest,1,q-1):"?" } else ho="?"
|
||||||
p = index($0,"\"remote_ip\":\"")
|
p = index($0,"\"remote_ip\":\"")
|
||||||
if (p>0) { rest=substr($0,p+13); q=index(rest,"\""); ip=(q>0)?substr(rest,1,q-1):"?" } else ip="?"
|
if (p>0) { rest=substr($0,p+13); q=index(rest,"\""); ip=(q>0)?substr(rest,1,q-1):"?" } else ip="?"
|
||||||
p = index($0,"\"uri\":\"")
|
|
||||||
if (p>0) { rest=substr($0,p+7); q=index(rest,"\""); uri=(q>0)?substr(rest,1,q-1):"?" } else uri="?"
|
|
||||||
p = index($0,"\"method\":\"")
|
|
||||||
if (p>0) { rest=substr($0,p+10); q=index(rest,"\""); meth=(q>0)?substr(rest,1,q-1):"?" } else meth="?"
|
|
||||||
|
|
||||||
bc[b]++; bb[b]+=sz
|
bc[b]++; bb[b]+=sz
|
||||||
if (st>=500) bs5[b]++
|
if (st>=500) bs5[b]++
|
||||||
else if (st>=400) bs4[b]++
|
else if (st>=400) bs4[b]++
|
||||||
|
|
@ -311,14 +261,6 @@ BEGIN { OFS=" " }
|
||||||
else if (st>=200) bs2[b]++
|
else if (st>=200) bs2[b]++
|
||||||
hc[ho]++; ic[ip]++
|
hc[ho]++; ic[ip]++
|
||||||
tot++; totb+=sz; totd+=du
|
tot++; totb+=sz; totd+=du
|
||||||
|
|
||||||
if (st >= 400) {
|
|
||||||
err[++errN] = ts "\t" st "\t" meth "\t" uri "\t" ho "\t" ip
|
|
||||||
if (errN > 100) {
|
|
||||||
for (i=2; i<=errN; i++) err[i-1] = err[i]
|
|
||||||
errN--
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
END {
|
END {
|
||||||
print "BUCKETS"
|
print "BUCKETS"
|
||||||
|
|
@ -335,8 +277,6 @@ END {
|
||||||
delete ic[mi]
|
delete ic[mi]
|
||||||
k--; n--
|
k--; n--
|
||||||
}
|
}
|
||||||
print "ERRORS"
|
|
||||||
for (i=1; i<=errN; i++) print err[i]
|
|
||||||
print "TOTALS"
|
print "TOTALS"
|
||||||
print tot+0, totb+0, totd+0
|
print tot+0, totb+0, totd+0
|
||||||
}`
|
}`
|
||||||
|
|
@ -347,13 +287,11 @@ END {
|
||||||
//
|
//
|
||||||
// Rotated log files are immutable, so each one is aggregated exactly once and
|
// Rotated log files are immutable, so each one is aggregated exactly once and
|
||||||
// the result is cached on the server (/tmp/caddyview_*.cache); after a
|
// the result is cached on the server (/tmp/caddyview_*.cache); after a
|
||||||
// rotation only the single new file is scanned. The current log file is cached
|
// rotation only the single new file is scanned. The current log file is always
|
||||||
// incrementally: only newly appended lines are processed on refresh, so even a
|
// scanned fresh, so the view never goes stale. Buckets are always hourly; the
|
||||||
// 100 MB active log refreshes in seconds. Buckets are always hourly; the caller
|
// caller re-buckets client-side, which lets all tabs share the same caches.
|
||||||
// re-buckets client-side, which lets all tabs share the same caches.
|
|
||||||
//
|
//
|
||||||
// since: unix cutoff used client-side after aggregation (ignored server-side so
|
// since: unix cutoff for the current (still growing) log file
|
||||||
// the cache can be reused across different windows).
|
|
||||||
// maxAgeDays: only look at files modified within this many days
|
// maxAgeDays: only look at files modified within this many days
|
||||||
func (c *Client) LoadAggregatedHistory(logPath string, since int64, maxAgeDays int) (*parser.AggregatedHistory, error) {
|
func (c *Client) LoadAggregatedHistory(logPath string, since int64, maxAgeDays int) (*parser.AggregatedHistory, error) {
|
||||||
lastSlash := strings.LastIndex(logPath, "/")
|
lastSlash := strings.LastIndex(logPath, "/")
|
||||||
|
|
@ -377,65 +315,25 @@ func (c *Client) LoadAggregatedHistory(logPath string, since int64, maxAgeDays i
|
||||||
base, base, stem, ext, stem, ext,
|
base, base, stem, ext, stem, ext,
|
||||||
)
|
)
|
||||||
|
|
||||||
cacheKey := func(path string) string {
|
cmd := fmt.Sprintf(
|
||||||
return strings.Map(func(r rune) rune {
|
`find /tmp -maxdepth 1 -name 'caddyview_*' -mtime +8 -delete 2>/dev/null; `+
|
||||||
if (r >= 'A' && r <= 'Z') || (r >= 'a' && r <= 'z') || (r >= '0' && r <= '9') {
|
`find %s %s -type f -mtime -%d 2>/dev/null | sort | while read -r f; do `+
|
||||||
return r
|
`if [ "$f" = "%s" ]; then `+
|
||||||
}
|
`awk -v cutoff=%d -v bucket=3600 '%s' < "$f"; `+
|
||||||
return '_'
|
`else `+
|
||||||
}, path)
|
`key=$(printf '%%s' "$f" | tr -c 'A-Za-z0-9' '_'); c="/tmp/caddyview_${key}.cache"; `+
|
||||||
}
|
`if [ -s "$c" ] && [ "$c" -nt "$f" ]; then cat "$c"; else `+
|
||||||
key := cacheKey(logPath)
|
`t=$(mktemp /tmp/caddyview.XXXXXX 2>/dev/null) || t="/tmp/caddyview_tmp.$$"; `+
|
||||||
|
`case "$f" in *.gz) zcat "$f" ;; *) cat "$f" ;; esac 2>/dev/null `+
|
||||||
// Shell script that aggregates each file. The current log is handled
|
`| awk -v cutoff=0 -v bucket=3600 '%s' > "$t" && mv "$t" "$c" && cat "$c" || cat "$t" 2>/dev/null; `+
|
||||||
// incrementally via a line-count/inode marker; rotated files use immutable caches.
|
`fi; fi; done`,
|
||||||
script := fmt.Sprintf(
|
|
||||||
`set -e
|
|
||||||
find /tmp -maxdepth 1 -name 'caddyview_*' -mtime +8 -delete 2>/dev/null || true
|
|
||||||
find %s %s -type f -mtime -%d 2>/dev/null | sort | while read -r f; do
|
|
||||||
if [ "$f" = "%s" ]; then
|
|
||||||
c="/tmp/caddyview_%s.cache"
|
|
||||||
m="/tmp/caddyview_%s.marker"
|
|
||||||
read inode < <(stat -c '%%i' "$f" 2>/dev/null || echo "0")
|
|
||||||
read lines < <(wc -l < "$f" 2>/dev/null || echo "0")
|
|
||||||
use_old=false
|
|
||||||
if [ -s "$c" ] && [ -s "$m" ]; then
|
|
||||||
read old_inode old_lines < "$m"
|
|
||||||
if [ "$inode" = "$old_inode" ] && [ "$lines" -ge "$old_lines" ]; then
|
|
||||||
use_old=true
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ "$use_old" = true ]; then
|
|
||||||
cat "$c"
|
|
||||||
if [ "$lines" -gt "$old_lines" ]; then
|
|
||||||
tail -n +$((old_lines + 1)) "$f" 2>/dev/null | awk -v cutoff=0 -v bucket=3600 '%s'
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
awk -v cutoff=0 -v bucket=3600 '%s' < "$f" > "$c"
|
|
||||||
fi
|
|
||||||
echo "$inode $lines" > "$m"
|
|
||||||
if [ "$use_old" != "true" ]; then cat "$c"; fi
|
|
||||||
else
|
|
||||||
key=$(printf '%%s' "$f" | tr -c 'A-Za-z0-9' '_')
|
|
||||||
c="/tmp/caddyview_${key}.cache"
|
|
||||||
if [ -s "$c" ] && [ "$c" -nt "$f" ]; then
|
|
||||||
cat "$c"
|
|
||||||
else
|
|
||||||
t=$(mktemp /tmp/caddyview.XXXXXX 2>/dev/null) || t="/tmp/caddyview_tmp.$$"
|
|
||||||
case "$f" in *.gz) zcat "$f" ;; *) cat "$f" ;; esac 2>/dev/null \
|
|
||||||
| awk -v cutoff=0 -v bucket=3600 '%s' > "$t" && mv "$t" "$c" && cat "$c" || cat "$t" 2>/dev/null
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done`,
|
|
||||||
dir, namePattern, maxAgeDays+1,
|
dir, namePattern, maxAgeDays+1,
|
||||||
logPath,
|
logPath,
|
||||||
key, key,
|
since, historyAwkProg,
|
||||||
historyAwkProg,
|
|
||||||
historyAwkProg,
|
|
||||||
historyAwkProg,
|
historyAwkProg,
|
||||||
)
|
)
|
||||||
|
|
||||||
out, err := c.RunCommand(script)
|
out, err := c.RunCommand(cmd)
|
||||||
if err != nil && strings.TrimSpace(out) == "" {
|
if err != nil && strings.TrimSpace(out) == "" {
|
||||||
return nil, fmt.Errorf("aggregation failed: %w", err)
|
return nil, fmt.Errorf("aggregation failed: %w", err)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,122 +0,0 @@
|
||||||
package sshclient
|
|
||||||
|
|
||||||
import (
|
|
||||||
"crypto/aes"
|
|
||||||
"crypto/cipher"
|
|
||||||
"encoding/pem"
|
|
||||||
"errors"
|
|
||||||
"fmt"
|
|
||||||
|
|
||||||
"golang.org/x/crypto/ssh"
|
|
||||||
)
|
|
||||||
|
|
||||||
// aes256-gcm@openssh.com is a cipher OpenSSH (and 1Password key exports) may
|
|
||||||
// use for private key files. golang.org/x/crypto/ssh only supports aes256-ctr
|
|
||||||
// and aes256-cbc, so these keys are decrypted here and re-marshalled as
|
|
||||||
// unencrypted openssh-key-v1 blobs that ssh.ParsePrivateKey accepts.
|
|
||||||
const (
|
|
||||||
opensshKeyMagic = "openssh-key-v1\x00"
|
|
||||||
opensshGCMCipher = "aes256-gcm@openssh.com"
|
|
||||||
gcmTagSize = 16
|
|
||||||
)
|
|
||||||
|
|
||||||
type opensshPrivateKeyHeader struct {
|
|
||||||
CipherName string
|
|
||||||
KdfName string
|
|
||||||
KdfOpts string
|
|
||||||
NumKeys uint32
|
|
||||||
PubKey []byte
|
|
||||||
PrivKeyBlock []byte
|
|
||||||
// For AEAD ciphers (aes256-gcm@openssh.com) OpenSSH stores the 16-byte
|
|
||||||
// auth tag as raw bytes after the encrypted block, not inside it.
|
|
||||||
Rest []byte `ssh:"rest"`
|
|
||||||
}
|
|
||||||
|
|
||||||
// isGCMEncryptedKey reports whether data is an OpenSSH private key encrypted
|
|
||||||
// with aes256-gcm@openssh.com.
|
|
||||||
func isGCMEncryptedKey(data []byte) bool {
|
|
||||||
block, _ := pem.Decode(data)
|
|
||||||
if block == nil || block.Type != "OPENSSH PRIVATE KEY" {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
if len(block.Bytes) < len(opensshKeyMagic) || string(block.Bytes[:len(opensshKeyMagic)]) != opensshKeyMagic {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
var header struct {
|
|
||||||
CipherName string
|
|
||||||
Rest []byte `ssh:"rest"`
|
|
||||||
}
|
|
||||||
if err := ssh.Unmarshal(block.Bytes[len(opensshKeyMagic):], &header); err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
return header.CipherName == opensshGCMCipher
|
|
||||||
}
|
|
||||||
|
|
||||||
// parseGCMKey decrypts an aes256-gcm@openssh.com encrypted OpenSSH private
|
|
||||||
// key with passphrase and returns the signer.
|
|
||||||
func parseGCMKey(data, passphrase []byte) (ssh.Signer, error) {
|
|
||||||
block, _ := pem.Decode(data)
|
|
||||||
if block == nil || len(block.Bytes) < len(opensshKeyMagic) {
|
|
||||||
return nil, errors.New("invalid OpenSSH private key PEM")
|
|
||||||
}
|
|
||||||
var w opensshPrivateKeyHeader
|
|
||||||
if err := ssh.Unmarshal(block.Bytes[len(opensshKeyMagic):], &w); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
if w.NumKeys != 1 {
|
|
||||||
return nil, errors.New("multi-key files are not supported")
|
|
||||||
}
|
|
||||||
if w.KdfName != "bcrypt" {
|
|
||||||
return nil, fmt.Errorf("unknown KDF %q, only supports %q", w.KdfName, "bcrypt")
|
|
||||||
}
|
|
||||||
var kdfOpts struct {
|
|
||||||
Salt string
|
|
||||||
Rounds uint32
|
|
||||||
}
|
|
||||||
if err := ssh.Unmarshal([]byte(w.KdfOpts), &kdfOpts); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
// Same cap as x/crypto/ssh so a hostile file cannot tie up the caller.
|
|
||||||
const maxRounds = 1 << 11
|
|
||||||
if kdfOpts.Rounds > maxRounds {
|
|
||||||
return nil, fmt.Errorf("bcrypt KDF rounds %d exceed maximum %d", kdfOpts.Rounds, maxRounds)
|
|
||||||
}
|
|
||||||
|
|
||||||
// AES-256-GCM: 32-byte key + 12-byte nonce derived by bcrypt_pbkdf.
|
|
||||||
// The 16-byte auth tag follows the encrypted block as raw bytes;
|
|
||||||
// gcm.Open expects it appended to the ciphertext.
|
|
||||||
if len(w.Rest) != gcmTagSize {
|
|
||||||
return nil, fmt.Errorf("unexpected GCM tag length %d", len(w.Rest))
|
|
||||||
}
|
|
||||||
k, err := bcryptPBKDF(passphrase, []byte(kdfOpts.Salt), int(kdfOpts.Rounds), 32+12)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
aesCipher, err := aes.NewCipher(k[:32])
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
gcm, err := cipher.NewGCM(aesCipher)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
sealed := make([]byte, 0, len(w.PrivKeyBlock)+gcmTagSize)
|
|
||||||
sealed = append(sealed, w.PrivKeyBlock...)
|
|
||||||
sealed = append(sealed, w.Rest...)
|
|
||||||
plain, err := gcm.Open(nil, k[32:], sealed, nil)
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
// Re-marshal as an unencrypted key (tag dropped). The plaintext keeps
|
|
||||||
// its original OpenSSH padding, which ssh.ParsePrivateKey validates.
|
|
||||||
w.CipherName = "none"
|
|
||||||
w.KdfName = "none"
|
|
||||||
w.KdfOpts = ""
|
|
||||||
w.PrivKeyBlock = plain
|
|
||||||
w.Rest = nil
|
|
||||||
raw := make([]byte, 0, len(opensshKeyMagic)+len(plain)+128)
|
|
||||||
raw = append(raw, opensshKeyMagic...)
|
|
||||||
raw = append(raw, ssh.Marshal(&w)...)
|
|
||||||
return ssh.ParsePrivateKey(pem.EncodeToMemory(&pem.Block{Type: "OPENSSH PRIVATE KEY", Bytes: raw}))
|
|
||||||
}
|
|
||||||
|
|
@ -9,8 +9,8 @@ import (
|
||||||
|
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
"github.com/charmbracelet/lipgloss"
|
"github.com/charmbracelet/lipgloss"
|
||||||
"git.janvete.com/seth/caddyview/internal/parser"
|
"github.com/janvete/caddyview/internal/parser"
|
||||||
"git.janvete.com/seth/caddyview/internal/sshclient"
|
"github.com/janvete/caddyview/internal/sshclient"
|
||||||
)
|
)
|
||||||
|
|
||||||
// -- tabs ---------------------------------------------------------------------
|
// -- tabs ---------------------------------------------------------------------
|
||||||
|
|
@ -21,10 +21,9 @@ const (
|
||||||
tabLive viewTab = 0
|
tabLive viewTab = 0
|
||||||
tabDay viewTab = 1
|
tabDay viewTab = 1
|
||||||
tabWeek viewTab = 2
|
tabWeek viewTab = 2
|
||||||
tabErrors viewTab = 3
|
|
||||||
)
|
)
|
||||||
|
|
||||||
var tabLabels = []string{"[1] LIVE", "[2] 1 DAY", "[3] 1 WEEK", "[4] ERRORS"}
|
var tabLabels = []string{"[1] LIVE", "[2] 1 DAY", "[3] 1 WEEK"}
|
||||||
|
|
||||||
// tabWindow returns how far back each history tab reaches.
|
// tabWindow returns how far back each history tab reaches.
|
||||||
func tabWindow(t viewTab) time.Duration {
|
func tabWindow(t viewTab) time.Duration {
|
||||||
|
|
@ -87,7 +86,6 @@ const historyRefreshInterval = 5 * time.Minute
|
||||||
type historyState struct {
|
type historyState struct {
|
||||||
stats *parser.Stats
|
stats *parser.Stats
|
||||||
buckets []parser.Bucket
|
buckets []parser.Bucket
|
||||||
errors []parser.ErrorEntry
|
|
||||||
loaded bool
|
loaded bool
|
||||||
loading bool
|
loading bool
|
||||||
loadedAt time.Time
|
loadedAt time.Time
|
||||||
|
|
@ -132,8 +130,6 @@ type model struct {
|
||||||
width int
|
width int
|
||||||
height int
|
height int
|
||||||
err error
|
err error
|
||||||
|
|
||||||
errorsScrollOffset int
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func initialModel(client *sshclient.Client, logPath string) model {
|
func initialModel(client *sshclient.Client, logPath string) model {
|
||||||
|
|
@ -235,18 +231,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
m.width = msg.Width
|
m.width = msg.Width
|
||||||
m.height = msg.Height
|
m.height = msg.Height
|
||||||
|
|
||||||
case tea.MouseMsg:
|
|
||||||
if m.activeTab == tabErrors {
|
|
||||||
switch msg.Button {
|
|
||||||
case tea.MouseButtonWheelUp:
|
|
||||||
if m.errorsScrollOffset > 0 {
|
|
||||||
m.errorsScrollOffset--
|
|
||||||
}
|
|
||||||
case tea.MouseButtonWheelDown:
|
|
||||||
m.errorsScrollOffset++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
case tea.KeyMsg:
|
case tea.KeyMsg:
|
||||||
switch msg.String() {
|
switch msg.String() {
|
||||||
case "q", "ctrl+c":
|
case "q", "ctrl+c":
|
||||||
|
|
@ -254,19 +238,12 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
return m, tea.Quit
|
return m, tea.Quit
|
||||||
case "1":
|
case "1":
|
||||||
m.activeTab = tabLive
|
m.activeTab = tabLive
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
case "2":
|
case "2":
|
||||||
m.activeTab = tabDay
|
m.activeTab = tabDay
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
return m, m.ensureHistory(tabDay)
|
return m, m.ensureHistory(tabDay)
|
||||||
case "3":
|
case "3":
|
||||||
m.activeTab = tabWeek
|
m.activeTab = tabWeek
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
return m, m.ensureHistory(tabWeek)
|
return m, m.ensureHistory(tabWeek)
|
||||||
case "4":
|
|
||||||
m.activeTab = tabErrors
|
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
return m, m.ensureHistory(tabDay)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
case tickMsg:
|
case tickMsg:
|
||||||
|
|
@ -275,11 +252,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
if m.ticks%sysStatsEvery == 0 {
|
if m.ticks%sysStatsEvery == 0 {
|
||||||
cmds = append(cmds, fetchSysStats(m.client))
|
cmds = append(cmds, fetchSysStats(m.client))
|
||||||
}
|
}
|
||||||
if m.activeTab == tabErrors {
|
if m.activeTab != tabLive {
|
||||||
if cmd := m.maybeRefreshHistory(tabDay); cmd != nil {
|
|
||||||
cmds = append(cmds, cmd)
|
|
||||||
}
|
|
||||||
} else if m.activeTab != tabLive {
|
|
||||||
if cmd := m.maybeRefreshHistory(m.activeTab); cmd != nil {
|
if cmd := m.maybeRefreshHistory(m.activeTab); cmd != nil {
|
||||||
cmds = append(cmds, cmd)
|
cmds = append(cmds, cmd)
|
||||||
}
|
}
|
||||||
|
|
@ -307,8 +280,6 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
||||||
if msg.err == nil && msg.agg != nil {
|
if msg.err == nil && msg.agg != nil {
|
||||||
h.stats = msg.agg.ToStats()
|
h.stats = msg.agg.ToStats()
|
||||||
h.buckets = msg.agg.ToBuckets(tabBucketSize(msg.tab))
|
h.buckets = msg.agg.ToBuckets(tabBucketSize(msg.tab))
|
||||||
h.errors = msg.agg.RecentErrors(100)
|
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
case errMsg:
|
case errMsg:
|
||||||
|
|
@ -364,10 +335,8 @@ func (m model) View() string {
|
||||||
parts = append(parts, m.renderHistory(0, "LAST 24 HOURS"))
|
parts = append(parts, m.renderHistory(0, "LAST 24 HOURS"))
|
||||||
case tabWeek:
|
case tabWeek:
|
||||||
parts = append(parts, m.renderHistory(1, "LAST 7 DAYS"))
|
parts = append(parts, m.renderHistory(1, "LAST 7 DAYS"))
|
||||||
case tabErrors:
|
|
||||||
parts = append(parts, m.renderErrors())
|
|
||||||
}
|
}
|
||||||
parts = append(parts, styleDim.Render(" [1] LIVE [2] 1 DAY [3] 1 WEEK [4] ERRORS [Q] QUIT"))
|
parts = append(parts, styleDim.Render(" [1] LIVE [2] 1 DAY [3] 1 WEEK [Q] QUIT"))
|
||||||
return lipgloss.JoinVertical(lipgloss.Left, parts...)
|
return lipgloss.JoinVertical(lipgloss.Left, parts...)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -482,98 +451,6 @@ func (m model) renderHistory(idx int, label string) string {
|
||||||
return lipgloss.JoinVertical(lipgloss.Left, chart, bottom)
|
return lipgloss.JoinVertical(lipgloss.Left, chart, bottom)
|
||||||
}
|
}
|
||||||
|
|
||||||
// -- errors view --------------------------------------------------------------
|
|
||||||
|
|
||||||
func (m model) renderErrors() string {
|
|
||||||
h := m.history[0] // errors are loaded together with the 1 DAY history
|
|
||||||
if h.loading {
|
|
||||||
return lipgloss.NewStyle().Padding(2, 4).
|
|
||||||
Render(styleWarn.Render("▒▒ LOADING ERRORS ▒▒"))
|
|
||||||
}
|
|
||||||
if !h.loaded {
|
|
||||||
return lipgloss.NewStyle().Padding(2, 4).Render(styleDim.Render("No data loaded."))
|
|
||||||
}
|
|
||||||
if h.err != nil {
|
|
||||||
return lipgloss.NewStyle().Padding(2, 4).
|
|
||||||
Render(styleBad.Render(fmt.Sprintf("ERROR: %v", h.err)))
|
|
||||||
}
|
|
||||||
errs := h.errors
|
|
||||||
if len(errs) == 0 {
|
|
||||||
return lipgloss.NewStyle().Padding(2, 4).
|
|
||||||
Render(styleDim.Render("No 4xx/5xx requests found in the last 24 hours."))
|
|
||||||
}
|
|
||||||
|
|
||||||
age := time.Since(h.loadedAt).Round(time.Second)
|
|
||||||
title := fmt.Sprintf("RECENT 4xx/5xx ERRORS — %d entries — updated %s ago", len(errs), age)
|
|
||||||
|
|
||||||
// Column widths (responsive, but fixed for simplicity)
|
|
||||||
timeW := 19
|
|
||||||
statusW := 7
|
|
||||||
methodW := 7
|
|
||||||
hostW := 28
|
|
||||||
ipW := 16
|
|
||||||
uriW := m.width - timeW - statusW - methodW - hostW - ipW - 14
|
|
||||||
if uriW < 20 {
|
|
||||||
uriW = 20
|
|
||||||
}
|
|
||||||
|
|
||||||
header := fmt.Sprintf("%-*s %-*s %-*s %-*s %-*s %s",
|
|
||||||
timeW, "TIME",
|
|
||||||
statusW, "STATUS",
|
|
||||||
methodW, "METHOD",
|
|
||||||
hostW, "HOST",
|
|
||||||
ipW, "REMOTE IP",
|
|
||||||
"URI",
|
|
||||||
)
|
|
||||||
|
|
||||||
// Fixed-height overhead: header + tab bar + title/header rows + footer/borders.
|
|
||||||
const overhead = 10
|
|
||||||
maxRows := m.height - overhead
|
|
||||||
if maxRows < 3 {
|
|
||||||
maxRows = 3
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clamp scroll offset.
|
|
||||||
if m.errorsScrollOffset > len(errs)-maxRows {
|
|
||||||
if len(errs) > maxRows {
|
|
||||||
m.errorsScrollOffset = len(errs) - maxRows
|
|
||||||
} else {
|
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if m.errorsScrollOffset < 0 {
|
|
||||||
m.errorsScrollOffset = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
end := m.errorsScrollOffset + maxRows
|
|
||||||
if end > len(errs) {
|
|
||||||
end = len(errs)
|
|
||||||
}
|
|
||||||
visible := errs[m.errorsScrollOffset:end]
|
|
||||||
|
|
||||||
rows := []string{styleHeader.Render(title), "", styleHeader.Render(header)}
|
|
||||||
for _, e := range visible {
|
|
||||||
statusStr := fmt.Sprintf("%d", e.Status)
|
|
||||||
var statusStyled string
|
|
||||||
if e.Status >= 500 {
|
|
||||||
statusStyled = styleBad.Render(statusStr)
|
|
||||||
} else {
|
|
||||||
statusStyled = styleWarn.Render(statusStr)
|
|
||||||
}
|
|
||||||
host := truncate(e.Host, hostW-1)
|
|
||||||
uri := truncate(e.URI, uriW-1)
|
|
||||||
rows = append(rows, fmt.Sprintf("%-*s %-*s %-*s %-*s %-*s %s",
|
|
||||||
timeW, e.Time.Format("2006-01-02 15:04:05"),
|
|
||||||
statusW, statusStyled,
|
|
||||||
methodW, e.Method,
|
|
||||||
hostW, host,
|
|
||||||
ipW, e.RemoteIP,
|
|
||||||
uri,
|
|
||||||
))
|
|
||||||
}
|
|
||||||
return styleBorder.Width(m.width - 4).Render(strings.Join(rows, "\n"))
|
|
||||||
}
|
|
||||||
|
|
||||||
// -- bar chart ----------------------------------------------------------------
|
// -- bar chart ----------------------------------------------------------------
|
||||||
|
|
||||||
func (m model) renderBarChart(buckets []parser.Bucket, bucketSize time.Duration, label string, stats *parser.Stats) string {
|
func (m model) renderBarChart(buckets []parser.Bucket, bucketSize time.Duration, label string, stats *parser.Stats) string {
|
||||||
|
|
@ -753,16 +630,6 @@ func topN(m map[string]int64, n int) []kv {
|
||||||
return pairs
|
return pairs
|
||||||
}
|
}
|
||||||
|
|
||||||
func truncate(s string, max int) string {
|
|
||||||
if max <= 0 {
|
|
||||||
return ""
|
|
||||||
}
|
|
||||||
if len(s) <= max {
|
|
||||||
return s
|
|
||||||
}
|
|
||||||
return s[:max-1] + "…"
|
|
||||||
}
|
|
||||||
|
|
||||||
func bucketSizeLabel(d time.Duration) string {
|
func bucketSizeLabel(d time.Duration) string {
|
||||||
switch {
|
switch {
|
||||||
case d >= 24*time.Hour:
|
case d >= 24*time.Hour:
|
||||||
|
|
@ -777,7 +644,7 @@ func bucketSizeLabel(d time.Duration) string {
|
||||||
// -- entry point --------------------------------------------------------------
|
// -- entry point --------------------------------------------------------------
|
||||||
|
|
||||||
func Run(client *sshclient.Client, logPath string) error {
|
func Run(client *sshclient.Client, logPath string) error {
|
||||||
p := tea.NewProgram(initialModel(client, logPath), tea.WithAltScreen(), tea.WithMouseCellMotion())
|
p := tea.NewProgram(initialModel(client, logPath), tea.WithAltScreen())
|
||||||
_, err := p.Run()
|
_, err := p.Run()
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
2
main.go
2
main.go
|
|
@ -1,6 +1,6 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import "git.janvete.com/seth/caddyview/cmd"
|
import "github.com/janvete/caddyview/cmd"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
cmd.Execute()
|
cmd.Execute()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue