mirror of
https://github.com/lukaszraczylo/lolcathost.git
synced 2026-11-19 09:35:24 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bcf7c0a8a8 | ||
|
|
2cdd684842 | ||
|
|
189137ede8 | ||
|
|
d4cff2028e | ||
|
|
42098eb1c9 | ||
|
|
ad24598036 | ||
|
|
977e766ff9 | ||
|
|
0a47ea7e2a | ||
|
|
100251b896 | ||
|
|
2d9c28657b | ||
|
|
a8acb2d480 | ||
|
|
29263dc8a2 | ||
|
|
27d5011ab1 | ||
|
|
51119b3694 | ||
|
|
1b66f4c6f9 | ||
|
|
8c022fa0d2 | ||
|
|
5d8c72d75f | ||
|
|
2a6f0ee244 | ||
|
|
99f215cb7c | ||
|
|
6eb634bfd0 | ||
|
|
4bf0dd2cdf | ||
|
|
70ac227613 | ||
|
|
90e0375a83 | ||
|
|
8445e50dc8 | ||
|
|
e1b9c15a2a | ||
|
|
c442eade9e | ||
|
|
acc80882e2 | ||
|
|
5e24b13595 | ||
|
|
76e364ca3e | ||
|
|
9598444d56 | ||
|
|
1b832e2fcf |
@@ -1,47 +1,19 @@
|
|||||||
name: AutoUpdate
|
name: Autoupdate go.mod and go.sum
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
workflow_dispatch:
|
||||||
schedule:
|
schedule:
|
||||||
- cron: "0 3 * * *"
|
- cron: "0 3 * * *"
|
||||||
workflow_dispatch:
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
actions: write
|
||||||
|
pull-requests: write
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
prepare:
|
autoupdate:
|
||||||
runs-on: ubuntu-latest
|
uses: lukaszraczylo/shared-actions/.github/workflows/go-autoupdate.yaml@main
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
with:
|
||||||
go-version: "1.24"
|
go-version: ">=1.24"
|
||||||
cache: true
|
release-workflow: "release.yml"
|
||||||
|
secrets: inherit
|
||||||
- name: Install dependencies
|
|
||||||
run: go get ./...
|
|
||||||
|
|
||||||
test:
|
|
||||||
needs: prepare
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
container: golang:1
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Install dependencies
|
|
||||||
run: apt-get update && apt-get install -y ca-certificates make
|
|
||||||
|
|
||||||
- name: Tidy and update modules
|
|
||||||
run: |
|
|
||||||
go mod tidy
|
|
||||||
go get -u -v ./...
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: CI_RUN=${CI} go test -v ./...
|
|
||||||
|
|
||||||
- name: Commit changes
|
|
||||||
uses: stefanzweifel/git-auto-commit-action@v5
|
|
||||||
with:
|
|
||||||
commit_message: "Update go.mod and go.sum"
|
|
||||||
file_pattern: "go.mod go.sum"
|
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
name: Pull Request
|
||||||
|
|
||||||
|
on:
|
||||||
|
pull_request:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- "**"
|
||||||
|
- "!main"
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: write
|
||||||
|
actions: write
|
||||||
|
pull-requests: write
|
||||||
|
security-events: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
pr-checks:
|
||||||
|
uses: lukaszraczylo/shared-actions/.github/workflows/go-pr.yaml@main
|
||||||
|
with:
|
||||||
|
go-version: ">=1.24"
|
||||||
@@ -10,82 +10,14 @@ on:
|
|||||||
- "go.sum"
|
- "go.sum"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
|
||||||
test:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
|
|
||||||
- name: Setup Go
|
|
||||||
uses: actions/setup-go@v5
|
|
||||||
with:
|
|
||||||
go-version: "1.24"
|
|
||||||
|
|
||||||
- name: Run tests
|
|
||||||
run: go test -race -v ./...
|
|
||||||
|
|
||||||
version:
|
|
||||||
needs: test
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
outputs:
|
|
||||||
version: ${{ steps.version_formatted.outputs.version }}
|
|
||||||
version_tag: ${{ steps.version_formatted.outputs.version_tag }}
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Calculate version
|
|
||||||
id: semver
|
|
||||||
uses: lukaszraczylo/semver-generator@v1
|
|
||||||
with:
|
|
||||||
config_file: semver.yaml
|
|
||||||
repository_local: true
|
|
||||||
|
|
||||||
- name: Format version
|
|
||||||
id: version_formatted
|
|
||||||
run: |
|
|
||||||
VERSION="${{ steps.semver.outputs.semantic_version }}"
|
|
||||||
echo "version=${VERSION}" >> $GITHUB_OUTPUT
|
|
||||||
echo "version_tag=v${VERSION}" >> $GITHUB_OUTPUT
|
|
||||||
|
|
||||||
- name: Print version
|
|
||||||
run: |
|
|
||||||
echo "Version: ${{ steps.version_formatted.outputs.version }}"
|
|
||||||
echo "Version tag: ${{ steps.version_formatted.outputs.version_tag }}"
|
|
||||||
|
|
||||||
release:
|
|
||||||
needs: version
|
|
||||||
if: needs.version.outputs.version_tag != ''
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
permissions:
|
permissions:
|
||||||
|
id-token: write
|
||||||
contents: write
|
contents: write
|
||||||
steps:
|
packages: write
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Setup Go
|
jobs:
|
||||||
uses: actions/setup-go@v5
|
release:
|
||||||
|
uses: lukaszraczylo/shared-actions/.github/workflows/go-release.yaml@main
|
||||||
with:
|
with:
|
||||||
go-version: "1.24"
|
go-version: ">=1.24"
|
||||||
|
secrets: inherit
|
||||||
- name: Create and push tag
|
|
||||||
run: |
|
|
||||||
git config user.name "github-actions[bot]"
|
|
||||||
git config user.email "github-actions[bot]@users.noreply.github.com"
|
|
||||||
git tag -a ${{ needs.version.outputs.version_tag }} -m "Release ${{ needs.version.outputs.version }}"
|
|
||||||
git push origin ${{ needs.version.outputs.version_tag }}
|
|
||||||
|
|
||||||
- name: Run GoReleaser
|
|
||||||
uses: goreleaser/goreleaser-action@v6
|
|
||||||
with:
|
|
||||||
distribution: goreleaser
|
|
||||||
version: "~> v2"
|
|
||||||
args: release --clean
|
|
||||||
env:
|
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
|
||||||
HOMEBREW_TAP_TOKEN: ${{ secrets.HOMEBREW_TAP_TOKEN }}
|
|
||||||
|
|||||||
@@ -1,2 +1,4 @@
|
|||||||
CLAUDE.md
|
CLAUDE.md
|
||||||
build
|
build
|
||||||
|
coverage.out
|
||||||
|
coverage.html
|
||||||
|
|||||||
+23
-7
@@ -22,7 +22,7 @@ builds:
|
|||||||
|
|
||||||
archives:
|
archives:
|
||||||
- id: lolcathost
|
- id: lolcathost
|
||||||
format: tar.gz
|
formats: [tar.gz]
|
||||||
name_template: "lolcathost-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
|
name_template: "lolcathost-{{ .Version }}-{{ .Os }}-{{ .Arch }}"
|
||||||
files:
|
files:
|
||||||
- LICENSE
|
- LICENSE
|
||||||
@@ -49,14 +49,30 @@ release:
|
|||||||
draft: false
|
draft: false
|
||||||
prerelease: auto
|
prerelease: auto
|
||||||
|
|
||||||
brews:
|
homebrew_casks:
|
||||||
- repository:
|
- repository:
|
||||||
owner: lukaszraczylo
|
owner: lukaszraczylo
|
||||||
name: brew-taps
|
name: homebrew-taps
|
||||||
token: "{{ .Env.HOMEBREW_TAP_TOKEN }}"
|
token: "{{ .Env.HOMEBREW_TAP_TOKEN }}"
|
||||||
directory: Formula
|
directory: Casks
|
||||||
homepage: https://github.com/lukaszraczylo/lolcathost
|
homepage: https://github.com/lukaszraczylo/lolcathost
|
||||||
description: "Dynamic host management tool for macOS and Linux with TUI"
|
description: "Dynamic host management tool with TUI"
|
||||||
license: MIT
|
license: MIT
|
||||||
test: |
|
hooks:
|
||||||
system "#{bin}/lolcathost", "--version"
|
post:
|
||||||
|
install: |
|
||||||
|
if OS.mac?
|
||||||
|
system_command "/usr/bin/xattr",
|
||||||
|
args: ["-dr", "com.apple.quarantine", "#{staged_path}/lolcathost"]
|
||||||
|
end
|
||||||
|
|
||||||
|
signs:
|
||||||
|
- cmd: cosign
|
||||||
|
signature: "${artifact}.sigstore.json"
|
||||||
|
args:
|
||||||
|
- sign-blob
|
||||||
|
- "--bundle=${signature}"
|
||||||
|
- "${artifact}"
|
||||||
|
- "--yes"
|
||||||
|
artifacts: checksum
|
||||||
|
output: true
|
||||||
|
|||||||
@@ -50,12 +50,17 @@ lolcathost manages your `/etc/hosts` file with an interactive terminal interface
|
|||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
### Homebrew (macOS/Linux)
|
### Homebrew (macOS)
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
brew install lukaszraczylo/brew-taps/lolcathost
|
brew install --cask lukaszraczylo/taps/lolcathost
|
||||||
```
|
```
|
||||||
|
|
||||||
|
> **Note**: If you previously installed via `brew install lukaszraczylo/taps/lolcathost` (formula), uninstall first:
|
||||||
|
> ```bash
|
||||||
|
> brew uninstall lolcathost
|
||||||
|
> ```
|
||||||
|
|
||||||
After Homebrew installation, run:
|
After Homebrew installation, run:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
@@ -81,6 +86,19 @@ make build
|
|||||||
sudo ./build/lolcathost --install
|
sudo ./build/lolcathost --install
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Verifying Release Signatures
|
||||||
|
|
||||||
|
All release checksums are signed with [cosign](https://github.com/sigstore/cosign) using keyless signing. To verify:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Download the checksum file and its sigstore bundle from the release
|
||||||
|
cosign verify-blob \
|
||||||
|
--certificate-identity-regexp "https://github.com/lukaszraczylo/lolcathost/.*" \
|
||||||
|
--certificate-oidc-issuer "https://token.actions.githubusercontent.com" \
|
||||||
|
--bundle "lolcathost-<version>-checksums.txt.sigstore.json" \
|
||||||
|
lolcathost-<version>-checksums.txt
|
||||||
|
```
|
||||||
|
|
||||||
### Post-Installation
|
### Post-Installation
|
||||||
|
|
||||||
The installer will:
|
The installer will:
|
||||||
|
|||||||
@@ -204,7 +204,7 @@ func runList() {
|
|||||||
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", status, e.Domain, e.IP, e.Alias, e.Group)
|
fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", status, e.Domain, e.IP, e.Alias, e.Group)
|
||||||
}
|
}
|
||||||
|
|
||||||
w.Flush()
|
_ = w.Flush()
|
||||||
}
|
}
|
||||||
|
|
||||||
func runOn(alias string) {
|
func runOn(alias string) {
|
||||||
|
|||||||
+2
-2
@@ -276,9 +276,9 @@
|
|||||||
<div class="glass p-6 rounded-xl">
|
<div class="glass p-6 rounded-xl">
|
||||||
<h3 class="font-semibold text-gray-900 dark:text-gray-100 mb-3 flex items-center">
|
<h3 class="font-semibold text-gray-900 dark:text-gray-100 mb-3 flex items-center">
|
||||||
<i class="fas fa-beer mr-2 text-amber-500"></i>
|
<i class="fas fa-beer mr-2 text-amber-500"></i>
|
||||||
Homebrew (macOS/Linux)
|
Homebrew (macOS)
|
||||||
</h3>
|
</h3>
|
||||||
<pre class="bg-gray-900 text-gray-100 p-4 rounded-lg overflow-x-auto"><code>brew install lukaszraczylo/brew-taps/lolcathost
|
<pre class="bg-gray-900 text-gray-100 p-4 rounded-lg overflow-x-auto"><code>brew install --cask lukaszraczylo/taps/lolcathost
|
||||||
sudo lolcathost --install</code></pre>
|
sudo lolcathost --install</code></pre>
|
||||||
</div>
|
</div>
|
||||||
<div class="glass p-6 rounded-xl">
|
<div class="glass p-6 rounded-xl">
|
||||||
|
|||||||
@@ -8,20 +8,20 @@ require (
|
|||||||
github.com/charmbracelet/lipgloss v1.1.0
|
github.com/charmbracelet/lipgloss v1.1.0
|
||||||
github.com/fsnotify/fsnotify v1.9.0
|
github.com/fsnotify/fsnotify v1.9.0
|
||||||
github.com/stretchr/testify v1.11.1
|
github.com/stretchr/testify v1.11.1
|
||||||
golang.org/x/sys v0.38.0
|
golang.org/x/sys v0.40.0
|
||||||
gopkg.in/yaml.v3 v3.0.1
|
gopkg.in/yaml.v3 v3.0.1
|
||||||
)
|
)
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/atotto/clipboard v0.1.4 // indirect
|
github.com/atotto/clipboard v0.1.4 // indirect
|
||||||
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
|
||||||
github.com/charmbracelet/colorprofile v0.3.3 // indirect
|
github.com/charmbracelet/colorprofile v0.4.1 // indirect
|
||||||
github.com/charmbracelet/x/ansi v0.11.2 // indirect
|
github.com/charmbracelet/x/ansi v0.11.4 // indirect
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
|
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect
|
||||||
github.com/charmbracelet/x/term v0.2.2 // indirect
|
github.com/charmbracelet/x/term v0.2.2 // indirect
|
||||||
github.com/clipperhouse/displaywidth v0.6.0 // indirect
|
github.com/clipperhouse/displaywidth v0.7.0 // indirect
|
||||||
github.com/clipperhouse/stringish v0.1.1 // indirect
|
github.com/clipperhouse/stringish v0.1.1 // indirect
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0 // indirect
|
github.com/clipperhouse/uax29/v2 v2.4.0 // indirect
|
||||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
|
||||||
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
|
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
|
||||||
@@ -34,5 +34,5 @@ require (
|
|||||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||||
github.com/rivo/uniseg v0.4.7 // indirect
|
github.com/rivo/uniseg v0.4.7 // indirect
|
||||||
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
|
||||||
golang.org/x/text v0.31.0 // indirect
|
golang.org/x/text v0.33.0 // indirect
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -8,24 +8,24 @@ github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u
|
|||||||
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
|
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg=
|
||||||
github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
|
github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
|
||||||
github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
|
github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
|
||||||
github.com/charmbracelet/colorprofile v0.3.3 h1:DjJzJtLP6/NZ8p7Cgjno0CKGr7wwRJGxWUwh2IyhfAI=
|
github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
|
||||||
github.com/charmbracelet/colorprofile v0.3.3/go.mod h1:nB1FugsAbzq284eJcjfah2nhdSLppN2NqvfotkfRYP4=
|
github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
|
||||||
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
|
github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
|
||||||
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
|
||||||
github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=
|
github.com/charmbracelet/x/ansi v0.11.4 h1:6G65PLu6HjmE858CnTUQY1LXT3ZUWwfvqEROLF8vqHI=
|
||||||
github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=
|
github.com/charmbracelet/x/ansi v0.11.4/go.mod h1:/5AZ+UfWExW3int5H5ugnsG/PWjNcSQcwYsHBlPFQN4=
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4=
|
github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4=
|
||||||
github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA=
|
github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA=
|
||||||
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
|
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
|
||||||
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
|
github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
|
||||||
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
|
||||||
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
|
||||||
github.com/clipperhouse/displaywidth v0.6.0 h1:k32vueaksef9WIKCNcoqRNyKbyvkvkysNYnAWz2fN4s=
|
github.com/clipperhouse/displaywidth v0.7.0 h1:QNv1GYsnLX9QBrcWUtMlogpTXuM5FVnBwKWp1O5NwmE=
|
||||||
github.com/clipperhouse/displaywidth v0.6.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
github.com/clipperhouse/displaywidth v0.7.0/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
|
||||||
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
|
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
|
||||||
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
|
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
|
github.com/clipperhouse/uax29/v2 v2.4.0 h1:RXqE/l5EiAbA4u97giimKNlmpvkmz+GrBVTelsoXy9g=
|
||||||
github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
|
github.com/clipperhouse/uax29/v2 v2.4.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
|
||||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||||
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
|
||||||
@@ -58,10 +58,10 @@ golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM
|
|||||||
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
|
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
|
||||||
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.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
|
golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ=
|
||||||
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
||||||
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
|
golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE=
|
||||||
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
|
golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8=
|
||||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||||
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=
|
||||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||||
|
|||||||
@@ -29,14 +29,6 @@ func New(socketPath string) *Client {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewWithTimeout creates a new client with a custom timeout.
|
|
||||||
func NewWithTimeout(socketPath string, timeout time.Duration) *Client {
|
|
||||||
return &Client{
|
|
||||||
socketPath: socketPath,
|
|
||||||
timeout: timeout,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Connect establishes a connection to the daemon.
|
// Connect establishes a connection to the daemon.
|
||||||
func (c *Client) Connect() error {
|
func (c *Client) Connect() error {
|
||||||
c.mu.Lock()
|
c.mu.Lock()
|
||||||
@@ -44,7 +36,7 @@ func (c *Client) Connect() error {
|
|||||||
|
|
||||||
// Close existing connection if any
|
// Close existing connection if any
|
||||||
if c.conn != nil {
|
if c.conn != nil {
|
||||||
c.conn.Close()
|
_ = c.conn.Close()
|
||||||
c.conn = nil
|
c.conn = nil
|
||||||
c.reader = nil
|
c.reader = nil
|
||||||
}
|
}
|
||||||
@@ -83,7 +75,7 @@ func (c *Client) send(req *protocol.Request) (*protocol.Response, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Set deadline
|
// Set deadline
|
||||||
c.conn.SetDeadline(time.Now().Add(c.timeout))
|
_ = c.conn.SetDeadline(time.Now().Add(c.timeout))
|
||||||
|
|
||||||
// Send request
|
// Send request
|
||||||
data, err := json.Marshal(req)
|
data, err := json.Marshal(req)
|
||||||
@@ -435,14 +427,3 @@ func (c *Client) ListPresets() ([]protocol.PresetInfo, error) {
|
|||||||
}
|
}
|
||||||
return data.Presets, nil
|
return data.Presets, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// IsConnected checks if the daemon is reachable.
|
|
||||||
func IsConnected(socketPath string) bool {
|
|
||||||
client := New(socketPath)
|
|
||||||
if err := client.Connect(); err != nil {
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
defer client.Close()
|
|
||||||
|
|
||||||
return client.Ping() == nil
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ import (
|
|||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/stretchr/testify/assert"
|
"github.com/stretchr/testify/assert"
|
||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
@@ -398,31 +397,6 @@ func TestClient_NotConnected(t *testing.T) {
|
|||||||
assert.Contains(t, err.Error(), "not connected")
|
assert.Contains(t, err.Error(), "not connected")
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestClient_Timeout(t *testing.T) {
|
|
||||||
client := NewWithTimeout("/nonexistent.sock", 100*time.Millisecond)
|
|
||||||
assert.Equal(t, 100*time.Millisecond, client.timeout)
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestIsConnected(t *testing.T) {
|
|
||||||
t.Run("connected", func(t *testing.T) {
|
|
||||||
server := newMockServer(t)
|
|
||||||
defer server.close()
|
|
||||||
|
|
||||||
server.handler = func(req *protocol.Request) *protocol.Response {
|
|
||||||
resp, _ := protocol.NewOKResponse(nil)
|
|
||||||
return resp
|
|
||||||
}
|
|
||||||
|
|
||||||
connected := IsConnected(server.path)
|
|
||||||
assert.True(t, connected)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("not connected", func(t *testing.T) {
|
|
||||||
connected := IsConnected("/nonexistent/socket.sock")
|
|
||||||
assert.False(t, connected)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// Matrix test for request types
|
// Matrix test for request types
|
||||||
func TestClient_RequestTypes_Matrix(t *testing.T) {
|
func TestClient_RequestTypes_Matrix(t *testing.T) {
|
||||||
types := []struct {
|
types := []struct {
|
||||||
|
|||||||
+94
-38
@@ -124,6 +124,12 @@ func (m *Manager) Get() *Config {
|
|||||||
return m.config
|
return m.config
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Reload reloads the configuration from disk.
|
||||||
|
// This is useful for rolling back after a failed operation.
|
||||||
|
func (m *Manager) Reload() error {
|
||||||
|
return m.Load()
|
||||||
|
}
|
||||||
|
|
||||||
// Watch starts watching the config file for changes.
|
// Watch starts watching the config file for changes.
|
||||||
func (m *Manager) Watch(onChange func(*Config)) error {
|
func (m *Manager) Watch(onChange func(*Config)) error {
|
||||||
watcher, err := fsnotify.NewWatcher()
|
watcher, err := fsnotify.NewWatcher()
|
||||||
@@ -151,8 +157,15 @@ func (m *Manager) watchLoop() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if event.Has(fsnotify.Write) || event.Has(fsnotify.Create) {
|
if event.Has(fsnotify.Write) || event.Has(fsnotify.Create) {
|
||||||
if err := m.Load(); err == nil && m.onChange != nil {
|
// Load and notify under lock to prevent race conditions
|
||||||
m.onChange(m.Get())
|
m.mu.Lock()
|
||||||
|
err := m.loadLocked()
|
||||||
|
cfg := m.config
|
||||||
|
onChange := m.onChange
|
||||||
|
m.mu.Unlock()
|
||||||
|
|
||||||
|
if err == nil && onChange != nil {
|
||||||
|
onChange(cfg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case <-m.watcher.Errors:
|
case <-m.watcher.Errors:
|
||||||
@@ -163,11 +176,32 @@ func (m *Manager) watchLoop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// loadLocked reads and parses the configuration file.
|
||||||
|
// Caller must hold m.mu lock.
|
||||||
|
func (m *Manager) loadLocked() error {
|
||||||
|
data, err := os.ReadFile(m.path)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to read config file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var cfg Config
|
||||||
|
if err := yaml.Unmarshal(data, &cfg); err != nil {
|
||||||
|
return fmt.Errorf("failed to parse config file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := ValidateConfig(&cfg); err != nil {
|
||||||
|
return fmt.Errorf("invalid config: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
m.config = &cfg
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// Stop stops watching the config file.
|
// Stop stops watching the config file.
|
||||||
func (m *Manager) Stop() {
|
func (m *Manager) Stop() {
|
||||||
close(m.stopCh)
|
close(m.stopCh)
|
||||||
if m.watcher != nil {
|
if m.watcher != nil {
|
||||||
m.watcher.Close()
|
_ = m.watcher.Close()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -180,17 +214,27 @@ func (c *Config) GetAllHosts() []Host {
|
|||||||
return hosts
|
return hosts
|
||||||
}
|
}
|
||||||
|
|
||||||
// FindHostByAlias finds a host by its alias.
|
// findHostIndices finds the group and host indices for a given alias.
|
||||||
func (c *Config) FindHostByAlias(alias string) (*Host, *Group) {
|
// Returns -1, -1 if not found.
|
||||||
|
func (c *Config) findHostIndices(alias string) (groupIdx, hostIdx int) {
|
||||||
for i := range c.Groups {
|
for i := range c.Groups {
|
||||||
for j := range c.Groups[i].Hosts {
|
for j := range c.Groups[i].Hosts {
|
||||||
if c.Groups[i].Hosts[j].Alias == alias {
|
if c.Groups[i].Hosts[j].Alias == alias {
|
||||||
return &c.Groups[i].Hosts[j], &c.Groups[i]
|
return i, j
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return -1, -1
|
||||||
|
}
|
||||||
|
|
||||||
|
// FindHostByAlias finds a host by its alias.
|
||||||
|
func (c *Config) FindHostByAlias(alias string) (*Host, *Group) {
|
||||||
|
groupIdx, hostIdx := c.findHostIndices(alias)
|
||||||
|
if groupIdx < 0 {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
return &c.Groups[groupIdx].Hosts[hostIdx], &c.Groups[groupIdx]
|
||||||
|
}
|
||||||
|
|
||||||
// FindPreset finds a preset by name.
|
// FindPreset finds a preset by name.
|
||||||
func (c *Config) FindPreset(name string) *Preset {
|
func (c *Config) FindPreset(name string) *Preset {
|
||||||
@@ -204,16 +248,13 @@ func (c *Config) FindPreset(name string) *Preset {
|
|||||||
|
|
||||||
// SetHostEnabled sets the enabled state of a host by alias.
|
// SetHostEnabled sets the enabled state of a host by alias.
|
||||||
func (c *Config) SetHostEnabled(alias string, enabled bool) bool {
|
func (c *Config) SetHostEnabled(alias string, enabled bool) bool {
|
||||||
for i := range c.Groups {
|
groupIdx, hostIdx := c.findHostIndices(alias)
|
||||||
for j := range c.Groups[i].Hosts {
|
if groupIdx < 0 {
|
||||||
if c.Groups[i].Hosts[j].Alias == alias {
|
|
||||||
c.Groups[i].Hosts[j].Enabled = enabled
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
c.Groups[groupIdx].Hosts[hostIdx].Enabled = enabled
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
// GenerateAlias creates a unique alias from a domain name.
|
// GenerateAlias creates a unique alias from a domain name.
|
||||||
func (c *Config) GenerateAlias(domain string) string {
|
func (c *Config) GenerateAlias(domain string) string {
|
||||||
@@ -327,36 +368,19 @@ func (c *Config) GetGroups() []string {
|
|||||||
|
|
||||||
// DeleteHost removes a host by alias.
|
// DeleteHost removes a host by alias.
|
||||||
func (c *Config) DeleteHost(alias string) bool {
|
func (c *Config) DeleteHost(alias string) bool {
|
||||||
for i := range c.Groups {
|
groupIdx, hostIdx := c.findHostIndices(alias)
|
||||||
for j := range c.Groups[i].Hosts {
|
if groupIdx < 0 {
|
||||||
if c.Groups[i].Hosts[j].Alias == alias {
|
|
||||||
c.Groups[i].Hosts = append(c.Groups[i].Hosts[:j], c.Groups[i].Hosts[j+1:]...)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
c.Groups[groupIdx].Hosts = append(c.Groups[groupIdx].Hosts[:hostIdx], c.Groups[groupIdx].Hosts[hostIdx+1:]...)
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
// UpdateHost updates an existing host by alias.
|
// UpdateHost updates an existing host by alias.
|
||||||
func (c *Config) UpdateHost(oldAlias, domain, ip, newAlias, groupName string) error {
|
func (c *Config) UpdateHost(oldAlias, domain, ip, newAlias, groupName string) error {
|
||||||
// Find the host
|
// Find the host
|
||||||
var foundGroup int = -1
|
foundGroup, foundHost := c.findHostIndices(oldAlias)
|
||||||
var foundHost int = -1
|
if foundGroup < 0 {
|
||||||
for i := range c.Groups {
|
|
||||||
for j := range c.Groups[i].Hosts {
|
|
||||||
if c.Groups[i].Hosts[j].Alias == oldAlias {
|
|
||||||
foundGroup = i
|
|
||||||
foundHost = j
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if foundHost >= 0 {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if foundHost < 0 {
|
|
||||||
return fmt.Errorf("alias not found: %s", oldAlias)
|
return fmt.Errorf("alias not found: %s", oldAlias)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -457,6 +481,35 @@ func (c *Config) GetPresets() []Preset {
|
|||||||
return c.Presets
|
return c.Presets
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Clone creates a deep copy of the configuration.
|
||||||
|
func (c *Config) Clone() *Config {
|
||||||
|
clone := &Config{
|
||||||
|
Settings: c.Settings,
|
||||||
|
Groups: make([]Group, len(c.Groups)),
|
||||||
|
Presets: make([]Preset, len(c.Presets)),
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, g := range c.Groups {
|
||||||
|
clone.Groups[i] = Group{
|
||||||
|
Name: g.Name,
|
||||||
|
Hosts: make([]Host, len(g.Hosts)),
|
||||||
|
}
|
||||||
|
copy(clone.Groups[i].Hosts, g.Hosts)
|
||||||
|
}
|
||||||
|
|
||||||
|
for i, p := range c.Presets {
|
||||||
|
clone.Presets[i] = Preset{
|
||||||
|
Name: p.Name,
|
||||||
|
Enable: make([]string, len(p.Enable)),
|
||||||
|
Disable: make([]string, len(p.Disable)),
|
||||||
|
}
|
||||||
|
copy(clone.Presets[i].Enable, p.Enable)
|
||||||
|
copy(clone.Presets[i].Disable, p.Disable)
|
||||||
|
}
|
||||||
|
|
||||||
|
return clone
|
||||||
|
}
|
||||||
|
|
||||||
// EnsureDefaultGroup ensures at least one group exists, creating "default" if needed.
|
// EnsureDefaultGroup ensures at least one group exists, creating "default" if needed.
|
||||||
func (c *Config) EnsureDefaultGroup() {
|
func (c *Config) EnsureDefaultGroup() {
|
||||||
if len(c.Groups) == 0 {
|
if len(c.Groups) == 0 {
|
||||||
@@ -482,6 +535,7 @@ func (m *Manager) Save() error {
|
|||||||
return fmt.Errorf("failed to marshal config: %w", err)
|
return fmt.Errorf("failed to marshal config: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #nosec G306 - Config file permissions are intentionally 0644
|
||||||
if err := os.WriteFile(m.path, data, 0644); err != nil {
|
if err := os.WriteFile(m.path, data, 0644); err != nil {
|
||||||
return fmt.Errorf("failed to write config: %w", err)
|
return fmt.Errorf("failed to write config: %w", err)
|
||||||
}
|
}
|
||||||
@@ -492,6 +546,7 @@ func (m *Manager) Save() error {
|
|||||||
// CreateDefault creates a default configuration file.
|
// CreateDefault creates a default configuration file.
|
||||||
func CreateDefault(path string) error {
|
func CreateDefault(path string) error {
|
||||||
dir := filepath.Dir(path)
|
dir := filepath.Dir(path)
|
||||||
|
// #nosec G301 - Config directory permissions are intentionally 0755
|
||||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
||||||
return fmt.Errorf("failed to create config directory: %w", err)
|
return fmt.Errorf("failed to create config directory: %w", err)
|
||||||
}
|
}
|
||||||
@@ -533,6 +588,7 @@ func CreateDefault(path string) error {
|
|||||||
return fmt.Errorf("failed to marshal default config: %w", err)
|
return fmt.Errorf("failed to marshal default config: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #nosec G306 - Config file permissions are intentionally 0644
|
||||||
if err := os.WriteFile(path, data, 0644); err != nil {
|
if err := os.WriteFile(path, data, 0644); err != nil {
|
||||||
return fmt.Errorf("failed to write default config: %w", err)
|
return fmt.Errorf("failed to write default config: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -432,77 +432,6 @@ func TestConfig_DeleteHost(t *testing.T) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestConfig_UpdateHost(t *testing.T) {
|
|
||||||
t.Run("update in same group", func(t *testing.T) {
|
|
||||||
cfg := &Config{
|
|
||||||
Groups: []Group{
|
|
||||||
{Name: "dev", Hosts: []Host{{Domain: "old.com", IP: "127.0.0.1", Alias: "test"}}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
err := cfg.UpdateHost("test", "new.com", "192.168.1.1", "test", "dev")
|
|
||||||
require.NoError(t, err)
|
|
||||||
assert.Equal(t, "new.com", cfg.Groups[0].Hosts[0].Domain)
|
|
||||||
assert.Equal(t, "192.168.1.1", cfg.Groups[0].Hosts[0].IP)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("move to different group", func(t *testing.T) {
|
|
||||||
cfg := &Config{
|
|
||||||
Groups: []Group{
|
|
||||||
{Name: "source", Hosts: []Host{{Domain: "a.com", IP: "127.0.0.1", Alias: "test"}}},
|
|
||||||
{Name: "target", Hosts: []Host{}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
err := cfg.UpdateHost("test", "a.com", "127.0.0.1", "test", "target")
|
|
||||||
require.NoError(t, err)
|
|
||||||
assert.Len(t, cfg.Groups[0].Hosts, 0)
|
|
||||||
assert.Len(t, cfg.Groups[1].Hosts, 1)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("move to new group", func(t *testing.T) {
|
|
||||||
cfg := &Config{
|
|
||||||
Groups: []Group{
|
|
||||||
{Name: "source", Hosts: []Host{{Domain: "a.com", IP: "127.0.0.1", Alias: "test"}}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
err := cfg.UpdateHost("test", "a.com", "127.0.0.1", "test", "newgroup")
|
|
||||||
require.NoError(t, err)
|
|
||||||
assert.Len(t, cfg.Groups, 2)
|
|
||||||
assert.Equal(t, "newgroup", cfg.Groups[1].Name)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("change alias", func(t *testing.T) {
|
|
||||||
cfg := &Config{
|
|
||||||
Groups: []Group{
|
|
||||||
{Name: "dev", Hosts: []Host{{Domain: "a.com", IP: "127.0.0.1", Alias: "old"}}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
err := cfg.UpdateHost("old", "a.com", "127.0.0.1", "new", "dev")
|
|
||||||
require.NoError(t, err)
|
|
||||||
assert.Equal(t, "new", cfg.Groups[0].Hosts[0].Alias)
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("alias conflict error", func(t *testing.T) {
|
|
||||||
cfg := &Config{
|
|
||||||
Groups: []Group{
|
|
||||||
{Name: "dev", Hosts: []Host{
|
|
||||||
{Domain: "a.com", Alias: "a"},
|
|
||||||
{Domain: "b.com", Alias: "b"},
|
|
||||||
}},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
err := cfg.UpdateHost("a", "a.com", "127.0.0.1", "b", "dev")
|
|
||||||
assert.Error(t, err)
|
|
||||||
assert.Contains(t, err.Error(), "alias already exists")
|
|
||||||
})
|
|
||||||
|
|
||||||
t.Run("host not found error", func(t *testing.T) {
|
|
||||||
cfg := &Config{Groups: []Group{}}
|
|
||||||
err := cfg.UpdateHost("nonexistent", "a.com", "127.0.0.1", "new", "dev")
|
|
||||||
assert.Error(t, err)
|
|
||||||
assert.Contains(t, err.Error(), "alias not found")
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestConfig_AddPreset(t *testing.T) {
|
func TestConfig_AddPreset(t *testing.T) {
|
||||||
t.Run("add new preset", func(t *testing.T) {
|
t.Run("add new preset", func(t *testing.T) {
|
||||||
cfg := &Config{Presets: []Preset{}}
|
cfg := &Config{Presets: []Preset{}}
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ func New(configPath string) (*Daemon, error) {
|
|||||||
cfg.EnsureDefaultGroup()
|
cfg.EnsureDefaultGroup()
|
||||||
// Save if we added a default group
|
// Save if we added a default group
|
||||||
if len(cfg.Groups) == 1 && cfg.Groups[0].Name == "default" && len(cfg.Groups[0].Hosts) == 0 {
|
if len(cfg.Groups) == 1 && cfg.Groups[0].Name == "default" && len(cfg.Groups[0].Hosts) == 0 {
|
||||||
cfgManager.Save()
|
_ = cfgManager.Save()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -92,11 +92,6 @@ func (d *Daemon) Run() error {
|
|||||||
return d.shutdown()
|
return d.shutdown()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stop signals the daemon to stop.
|
|
||||||
func (d *Daemon) Stop() {
|
|
||||||
close(d.stopCh)
|
|
||||||
}
|
|
||||||
|
|
||||||
func (d *Daemon) shutdown() error {
|
func (d *Daemon) shutdown() error {
|
||||||
close(d.cleanupCh)
|
close(d.cleanupCh)
|
||||||
d.config.Stop()
|
d.config.Stop()
|
||||||
|
|||||||
@@ -137,6 +137,6 @@ func (f *DNSFlusher) flushLinux(method FlushMethod) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func runCommand(name string, args ...string) error {
|
func runCommand(name string, args ...string) error {
|
||||||
cmd := exec.Command(name, args...)
|
cmd := exec.Command(name, args...) // #nosec G204 - Commands are hardcoded DNS flush utilities, not user input
|
||||||
return cmd.Run()
|
return cmd.Run()
|
||||||
}
|
}
|
||||||
|
|||||||
+16
-63
@@ -2,7 +2,6 @@
|
|||||||
package daemon
|
package daemon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bufio"
|
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
@@ -25,6 +24,10 @@ const (
|
|||||||
markerEnd = "# ========== END LOLCATHOST =========="
|
markerEnd = "# ========== END LOLCATHOST =========="
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// entryRegex matches host entries in the managed section.
|
||||||
|
// Compiled once at package init for efficiency.
|
||||||
|
var entryRegex = regexp.MustCompile(`^(\S+)\s+(\S+)\s+#\s*lolcathost:(\S+)$`)
|
||||||
|
|
||||||
// HostEntry represents a single entry in the hosts file.
|
// HostEntry represents a single entry in the hosts file.
|
||||||
type HostEntry struct {
|
type HostEntry struct {
|
||||||
IP string
|
IP string
|
||||||
@@ -47,59 +50,6 @@ func NewHostsManager() *HostsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// NewHostsManagerWithPaths creates a hosts manager with custom paths (for testing).
|
|
||||||
func NewHostsManagerWithPaths(hostsPath, backupDir string) *HostsManager {
|
|
||||||
return &HostsManager{
|
|
||||||
hostsPath: hostsPath,
|
|
||||||
backupDir: backupDir,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// ReadManagedEntries reads the lolcathost-managed entries from the hosts file.
|
|
||||||
func (m *HostsManager) ReadManagedEntries() ([]HostEntry, error) {
|
|
||||||
file, err := os.Open(m.hostsPath)
|
|
||||||
if err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to open hosts file: %w", err)
|
|
||||||
}
|
|
||||||
defer file.Close()
|
|
||||||
|
|
||||||
var entries []HostEntry
|
|
||||||
inManagedSection := false
|
|
||||||
scanner := bufio.NewScanner(file)
|
|
||||||
entryRegex := regexp.MustCompile(`^(\S+)\s+(\S+)\s+#\s*lolcathost:(\S+)$`)
|
|
||||||
|
|
||||||
for scanner.Scan() {
|
|
||||||
line := strings.TrimSpace(scanner.Text())
|
|
||||||
|
|
||||||
if line == markerStart {
|
|
||||||
inManagedSection = true
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if line == markerEnd {
|
|
||||||
inManagedSection = false
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
|
|
||||||
if inManagedSection && !strings.HasPrefix(line, "#") && line != "" {
|
|
||||||
matches := entryRegex.FindStringSubmatch(line)
|
|
||||||
if len(matches) == 4 {
|
|
||||||
entries = append(entries, HostEntry{
|
|
||||||
IP: matches[1],
|
|
||||||
Domain: matches[2],
|
|
||||||
Alias: matches[3],
|
|
||||||
Enabled: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := scanner.Err(); err != nil {
|
|
||||||
return nil, fmt.Errorf("failed to read hosts file: %w", err)
|
|
||||||
}
|
|
||||||
|
|
||||||
return entries, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
// WriteManagedEntries writes the managed entries to the hosts file.
|
// WriteManagedEntries writes the managed entries to the hosts file.
|
||||||
func (m *HostsManager) WriteManagedEntries(entries []HostEntry) error {
|
func (m *HostsManager) WriteManagedEntries(entries []HostEntry) error {
|
||||||
// Create backup first
|
// Create backup first
|
||||||
@@ -178,13 +128,14 @@ func (m *HostsManager) buildManagedSection(entries []HostEntry) string {
|
|||||||
func (m *HostsManager) writeAtomic(content string) error {
|
func (m *HostsManager) writeAtomic(content string) error {
|
||||||
// Write to temp file first
|
// Write to temp file first
|
||||||
tmpFile := m.hostsPath + ".tmp"
|
tmpFile := m.hostsPath + ".tmp"
|
||||||
|
// #nosec G306 - Hosts file permissions are intentionally 0644
|
||||||
if err := os.WriteFile(tmpFile, []byte(content), 0644); err != nil {
|
if err := os.WriteFile(tmpFile, []byte(content), 0644); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rename atomically
|
// Rename atomically
|
||||||
if err := os.Rename(tmpFile, m.hostsPath); err != nil {
|
if err := os.Rename(tmpFile, m.hostsPath); err != nil {
|
||||||
os.Remove(tmpFile)
|
_ = os.Remove(tmpFile)
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -193,11 +144,12 @@ func (m *HostsManager) writeAtomic(content string) error {
|
|||||||
|
|
||||||
// CreateBackup creates a backup of the current hosts file.
|
// CreateBackup creates a backup of the current hosts file.
|
||||||
func (m *HostsManager) CreateBackup() error {
|
func (m *HostsManager) CreateBackup() error {
|
||||||
|
// #nosec G301 - Backup directory permissions are intentionally 0755
|
||||||
if err := os.MkdirAll(m.backupDir, 0755); err != nil {
|
if err := os.MkdirAll(m.backupDir, 0755); err != nil {
|
||||||
return fmt.Errorf("failed to create backup directory: %w", err)
|
return fmt.Errorf("failed to create backup directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
content, err := os.ReadFile(m.hostsPath)
|
content, err := os.ReadFile(m.hostsPath) // #nosec G304 - Path is controlled by daemon, not user input
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to read hosts file: %w", err)
|
return fmt.Errorf("failed to read hosts file: %w", err)
|
||||||
}
|
}
|
||||||
@@ -205,6 +157,7 @@ func (m *HostsManager) CreateBackup() error {
|
|||||||
timestamp := time.Now().Format("20060102-150405")
|
timestamp := time.Now().Format("20060102-150405")
|
||||||
backupPath := filepath.Join(m.backupDir, fmt.Sprintf("hosts.%s.bak", timestamp))
|
backupPath := filepath.Join(m.backupDir, fmt.Sprintf("hosts.%s.bak", timestamp))
|
||||||
|
|
||||||
|
// #nosec G306 - Backup file permissions are intentionally 0644
|
||||||
if err := os.WriteFile(backupPath, content, 0644); err != nil {
|
if err := os.WriteFile(backupPath, content, 0644); err != nil {
|
||||||
return fmt.Errorf("failed to write backup: %w", err)
|
return fmt.Errorf("failed to write backup: %w", err)
|
||||||
}
|
}
|
||||||
@@ -243,7 +196,7 @@ func (m *HostsManager) cleanupBackups() error {
|
|||||||
// Remove oldest backups
|
// Remove oldest backups
|
||||||
for i := MaxBackups; i < len(backups); i++ {
|
for i := MaxBackups; i < len(backups); i++ {
|
||||||
path := filepath.Join(m.backupDir, backups[i].Name())
|
path := filepath.Join(m.backupDir, backups[i].Name())
|
||||||
os.Remove(path)
|
_ = os.Remove(path)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -294,14 +247,14 @@ type BackupInfo struct {
|
|||||||
|
|
||||||
// GetBackupContent returns the content of a backup file.
|
// GetBackupContent returns the content of a backup file.
|
||||||
func (m *HostsManager) GetBackupContent(name string) (string, error) {
|
func (m *HostsManager) GetBackupContent(name string) (string, error) {
|
||||||
backupPath := filepath.Join(m.backupDir, name)
|
|
||||||
|
|
||||||
// Validate backup name to prevent path traversal
|
// Validate backup name to prevent path traversal
|
||||||
if filepath.Base(name) != name || !strings.HasPrefix(name, "hosts.") || !strings.HasSuffix(name, ".bak") {
|
if filepath.Base(name) != name || !strings.HasPrefix(name, "hosts.") || !strings.HasSuffix(name, ".bak") {
|
||||||
return "", fmt.Errorf("invalid backup name")
|
return "", fmt.Errorf("invalid backup name")
|
||||||
}
|
}
|
||||||
|
|
||||||
content, err := os.ReadFile(backupPath)
|
backupPath := filepath.Join(m.backupDir, name)
|
||||||
|
|
||||||
|
content, err := os.ReadFile(backupPath) // #nosec G304 - Path is validated above to prevent traversal
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return "", fmt.Errorf("failed to read backup: %w", err)
|
return "", fmt.Errorf("failed to read backup: %w", err)
|
||||||
}
|
}
|
||||||
@@ -311,14 +264,14 @@ func (m *HostsManager) GetBackupContent(name string) (string, error) {
|
|||||||
|
|
||||||
// RestoreBackup restores a backup by name.
|
// RestoreBackup restores a backup by name.
|
||||||
func (m *HostsManager) RestoreBackup(name string) error {
|
func (m *HostsManager) RestoreBackup(name string) error {
|
||||||
backupPath := filepath.Join(m.backupDir, name)
|
|
||||||
|
|
||||||
// Validate backup name to prevent path traversal
|
// Validate backup name to prevent path traversal
|
||||||
if filepath.Base(name) != name || !strings.HasPrefix(name, "hosts.") || !strings.HasSuffix(name, ".bak") {
|
if filepath.Base(name) != name || !strings.HasPrefix(name, "hosts.") || !strings.HasSuffix(name, ".bak") {
|
||||||
return fmt.Errorf("invalid backup name")
|
return fmt.Errorf("invalid backup name")
|
||||||
}
|
}
|
||||||
|
|
||||||
content, err := os.ReadFile(backupPath)
|
backupPath := filepath.Join(m.backupDir, name)
|
||||||
|
|
||||||
|
content, err := os.ReadFile(backupPath) // #nosec G304 - Path is validated above to prevent traversal
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to read backup: %w", err)
|
return fmt.Errorf("failed to read backup: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package daemon
|
package daemon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -10,7 +11,53 @@ import (
|
|||||||
"github.com/stretchr/testify/require"
|
"github.com/stretchr/testify/require"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestHostsManager_ReadManagedEntries(t *testing.T) {
|
// newHostsManagerWithPaths creates a hosts manager with custom paths (for testing).
|
||||||
|
func newHostsManagerWithPaths(hostsPath, backupDir string) *HostsManager {
|
||||||
|
return &HostsManager{
|
||||||
|
hostsPath: hostsPath,
|
||||||
|
backupDir: backupDir,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// readManagedEntries reads the lolcathost-managed entries from the hosts file (for testing).
|
||||||
|
func (m *HostsManager) readManagedEntries() ([]HostEntry, error) {
|
||||||
|
content, err := os.ReadFile(m.hostsPath)
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("failed to read hosts file: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var entries []HostEntry
|
||||||
|
inManagedSection := false
|
||||||
|
|
||||||
|
for _, line := range strings.Split(string(content), "\n") {
|
||||||
|
line = strings.TrimSpace(line)
|
||||||
|
|
||||||
|
if line == markerStart {
|
||||||
|
inManagedSection = true
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if line == markerEnd {
|
||||||
|
inManagedSection = false
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if inManagedSection && !strings.HasPrefix(line, "#") && line != "" {
|
||||||
|
matches := entryRegex.FindStringSubmatch(line)
|
||||||
|
if len(matches) == 4 {
|
||||||
|
entries = append(entries, HostEntry{
|
||||||
|
IP: matches[1],
|
||||||
|
Domain: matches[2],
|
||||||
|
Alias: matches[3],
|
||||||
|
Enabled: true,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return entries, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHostsManager_readManagedEntries(t *testing.T) {
|
||||||
tmpDir := t.TempDir()
|
tmpDir := t.TempDir()
|
||||||
hostsPath := filepath.Join(tmpDir, "hosts")
|
hostsPath := filepath.Join(tmpDir, "hosts")
|
||||||
|
|
||||||
@@ -26,8 +73,8 @@ func TestHostsManager_ReadManagedEntries(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(hostsContent), 0644)
|
err := os.WriteFile(hostsPath, []byte(hostsContent), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
manager := newHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
||||||
entries, err := manager.ReadManagedEntries()
|
entries, err := manager.readManagedEntries()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
assert.Len(t, entries, 2)
|
assert.Len(t, entries, 2)
|
||||||
@@ -39,7 +86,7 @@ func TestHostsManager_ReadManagedEntries(t *testing.T) {
|
|||||||
assert.Equal(t, "api-local", entries[1].Alias)
|
assert.Equal(t, "api-local", entries[1].Alias)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestHostsManager_ReadManagedEntries_NoSection(t *testing.T) {
|
func TestHostsManager_readManagedEntries_NoSection(t *testing.T) {
|
||||||
tmpDir := t.TempDir()
|
tmpDir := t.TempDir()
|
||||||
hostsPath := filepath.Join(tmpDir, "hosts")
|
hostsPath := filepath.Join(tmpDir, "hosts")
|
||||||
|
|
||||||
@@ -49,8 +96,8 @@ func TestHostsManager_ReadManagedEntries_NoSection(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(hostsContent), 0644)
|
err := os.WriteFile(hostsPath, []byte(hostsContent), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
manager := newHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
||||||
entries, err := manager.ReadManagedEntries()
|
entries, err := manager.readManagedEntries()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
assert.Empty(t, entries)
|
assert.Empty(t, entries)
|
||||||
@@ -68,7 +115,7 @@ func TestHostsManager_WriteManagedEntries(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(initialContent), 0644)
|
err := os.WriteFile(hostsPath, []byte(initialContent), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
entries := []HostEntry{
|
entries := []HostEntry{
|
||||||
{IP: "127.0.0.1", Domain: "myapp.com", Alias: "myapp-local", Enabled: true},
|
{IP: "127.0.0.1", Domain: "myapp.com", Alias: "myapp-local", Enabled: true},
|
||||||
@@ -107,7 +154,7 @@ func TestHostsManager_WriteManagedEntries_UpdatesExisting(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(initialContent), 0644)
|
err := os.WriteFile(hostsPath, []byte(initialContent), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
entries := []HostEntry{
|
entries := []HostEntry{
|
||||||
{IP: "127.0.0.1", Domain: "new.com", Alias: "new", Enabled: true},
|
{IP: "127.0.0.1", Domain: "new.com", Alias: "new", Enabled: true},
|
||||||
@@ -134,7 +181,7 @@ func TestHostsManager_CreateBackup(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(hostsContent), 0644)
|
err := os.WriteFile(hostsPath, []byte(hostsContent), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
err = manager.CreateBackup()
|
err = manager.CreateBackup()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@@ -175,7 +222,7 @@ func TestHostsManager_ListBackups(t *testing.T) {
|
|||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
backups, err := manager.ListBackups()
|
backups, err := manager.ListBackups()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@@ -187,7 +234,7 @@ func TestHostsManager_ListBackups_NoBackupDir(t *testing.T) {
|
|||||||
hostsPath := filepath.Join(tmpDir, "hosts")
|
hostsPath := filepath.Join(tmpDir, "hosts")
|
||||||
backupDir := filepath.Join(tmpDir, "nonexistent")
|
backupDir := filepath.Join(tmpDir, "nonexistent")
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
backups, err := manager.ListBackups()
|
backups, err := manager.ListBackups()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
@@ -204,7 +251,7 @@ func TestHostsManager_RestoreBackup(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(initialContent), 0644)
|
err := os.WriteFile(hostsPath, []byte(initialContent), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
// Create backup
|
// Create backup
|
||||||
err = manager.CreateBackup()
|
err = manager.CreateBackup()
|
||||||
@@ -231,7 +278,7 @@ func TestHostsManager_RestoreBackup(t *testing.T) {
|
|||||||
|
|
||||||
func TestHostsManager_RestoreBackup_InvalidName(t *testing.T) {
|
func TestHostsManager_RestoreBackup_InvalidName(t *testing.T) {
|
||||||
tmpDir := t.TempDir()
|
tmpDir := t.TempDir()
|
||||||
manager := NewHostsManagerWithPaths(
|
manager := newHostsManagerWithPaths(
|
||||||
filepath.Join(tmpDir, "hosts"),
|
filepath.Join(tmpDir, "hosts"),
|
||||||
filepath.Join(tmpDir, "backups"),
|
filepath.Join(tmpDir, "backups"),
|
||||||
)
|
)
|
||||||
@@ -259,7 +306,7 @@ func TestHostsManager_CleanupBackups(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte("localhost"), 0644)
|
err := os.WriteFile(hostsPath, []byte("localhost"), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
// Create more than MaxBackups
|
// Create more than MaxBackups
|
||||||
for i := 0; i < MaxBackups+5; i++ {
|
for i := 0; i < MaxBackups+5; i++ {
|
||||||
@@ -338,7 +385,7 @@ func TestHostsManager_BuildManagedSection(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Matrix tests for hosts file parsing
|
// Matrix tests for hosts file parsing
|
||||||
func TestHostsManager_ReadManagedEntries_Matrix(t *testing.T) {
|
func TestHostsManager_readManagedEntries_Matrix(t *testing.T) {
|
||||||
ips := []string{"127.0.0.1", "192.168.1.1", "::1"}
|
ips := []string{"127.0.0.1", "192.168.1.1", "::1"}
|
||||||
domains := []string{"example.com", "sub.example.com", "my-app.test"}
|
domains := []string{"example.com", "sub.example.com", "my-app.test"}
|
||||||
aliases := []string{"test", "my-alias", "app-1"}
|
aliases := []string{"test", "my-alias", "app-1"}
|
||||||
@@ -357,8 +404,8 @@ func TestHostsManager_ReadManagedEntries_Matrix(t *testing.T) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(content), 0644)
|
err := os.WriteFile(hostsPath, []byte(content), 0644)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
manager := newHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
||||||
entries, err := manager.ReadManagedEntries()
|
entries, err := manager.readManagedEntries()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Len(t, entries, 1)
|
require.Len(t, entries, 1)
|
||||||
|
|
||||||
@@ -371,7 +418,7 @@ func TestHostsManager_ReadManagedEntries_Matrix(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func BenchmarkHostsManager_ReadManagedEntries(b *testing.B) {
|
func BenchmarkHostsManager_readManagedEntries(b *testing.B) {
|
||||||
tmpDir := b.TempDir()
|
tmpDir := b.TempDir()
|
||||||
hostsPath := filepath.Join(tmpDir, "hosts")
|
hostsPath := filepath.Join(tmpDir, "hosts")
|
||||||
|
|
||||||
@@ -387,11 +434,11 @@ func BenchmarkHostsManager_ReadManagedEntries(b *testing.B) {
|
|||||||
err := os.WriteFile(hostsPath, []byte(content.String()), 0644)
|
err := os.WriteFile(hostsPath, []byte(content.String()), 0644)
|
||||||
require.NoError(b, err)
|
require.NoError(b, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
manager := newHostsManagerWithPaths(hostsPath, filepath.Join(tmpDir, "backups"))
|
||||||
|
|
||||||
b.ResetTimer()
|
b.ResetTimer()
|
||||||
for i := 0; i < b.N; i++ {
|
for i := 0; i < b.N; i++ {
|
||||||
_, _ = manager.ReadManagedEntries()
|
_, _ = manager.readManagedEntries()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -403,7 +450,7 @@ func BenchmarkHostsManager_WriteManagedEntries(b *testing.B) {
|
|||||||
err := os.WriteFile(hostsPath, []byte("127.0.0.1\tlocalhost\n"), 0644)
|
err := os.WriteFile(hostsPath, []byte("127.0.0.1\tlocalhost\n"), 0644)
|
||||||
require.NoError(b, err)
|
require.NoError(b, err)
|
||||||
|
|
||||||
manager := NewHostsManagerWithPaths(hostsPath, backupDir)
|
manager := newHostsManagerWithPaths(hostsPath, backupDir)
|
||||||
|
|
||||||
entries := make([]HostEntry, 50)
|
entries := make([]HostEntry, 50)
|
||||||
for i := range entries {
|
for i := range entries {
|
||||||
|
|||||||
@@ -24,15 +24,21 @@ func (s *Server) getPeerCredentials(conn net.Conn) *PeerCredentials {
|
|||||||
}
|
}
|
||||||
|
|
||||||
var creds *PeerCredentials
|
var creds *PeerCredentials
|
||||||
rawConn.Control(func(fd uintptr) {
|
_ = rawConn.Control(func(fd uintptr) {
|
||||||
xucred, err := unix.GetsockoptXucred(int(fd), unix.SOL_LOCAL, unix.LOCAL_PEERCRED)
|
xucred, err := unix.GetsockoptXucred(int(fd), unix.SOL_LOCAL, unix.LOCAL_PEERCRED)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Validate Groups array is not empty before accessing
|
||||||
|
if xucred.Ngroups == 0 {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Get PID separately using LOCAL_PEERPID
|
// Get PID separately using LOCAL_PEERPID
|
||||||
var pid int32
|
var pid int32
|
||||||
pidLen := uint32(unsafe.Sizeof(pid))
|
pidLen := uint32(unsafe.Sizeof(pid))
|
||||||
|
// #nosec G103 - unsafe.Pointer required for syscall to get peer PID
|
||||||
_, _, errno := syscall.Syscall6(
|
_, _, errno := syscall.Syscall6(
|
||||||
syscall.SYS_GETSOCKOPT,
|
syscall.SYS_GETSOCKOPT,
|
||||||
fd,
|
fd,
|
||||||
|
|||||||
+66
-28
@@ -6,6 +6,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"os/user"
|
"os/user"
|
||||||
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
@@ -19,10 +20,17 @@ const (
|
|||||||
RateLimitWindow = time.Minute
|
RateLimitWindow = time.Minute
|
||||||
)
|
)
|
||||||
|
|
||||||
// RateLimiter implements per-PID rate limiting.
|
// pidRateBucket holds rate limiting data for a single PID using a ring buffer.
|
||||||
|
type pidRateBucket struct {
|
||||||
|
timestamps []time.Time // Ring buffer of request timestamps
|
||||||
|
head int // Next write position
|
||||||
|
count int // Number of valid entries
|
||||||
|
}
|
||||||
|
|
||||||
|
// RateLimiter implements per-PID rate limiting with efficient memory usage.
|
||||||
type RateLimiter struct {
|
type RateLimiter struct {
|
||||||
mu sync.Mutex
|
mu sync.Mutex
|
||||||
requests map[int32][]time.Time
|
buckets map[int32]*pidRateBucket
|
||||||
limit int
|
limit int
|
||||||
window time.Duration
|
window time.Duration
|
||||||
}
|
}
|
||||||
@@ -30,7 +38,7 @@ type RateLimiter struct {
|
|||||||
// NewRateLimiter creates a new rate limiter.
|
// NewRateLimiter creates a new rate limiter.
|
||||||
func NewRateLimiter(limit int, window time.Duration) *RateLimiter {
|
func NewRateLimiter(limit int, window time.Duration) *RateLimiter {
|
||||||
return &RateLimiter{
|
return &RateLimiter{
|
||||||
requests: make(map[int32][]time.Time),
|
buckets: make(map[int32]*pidRateBucket),
|
||||||
limit: limit,
|
limit: limit,
|
||||||
window: window,
|
window: window,
|
||||||
}
|
}
|
||||||
@@ -44,31 +52,42 @@ func (r *RateLimiter) Allow(pid int32) bool {
|
|||||||
now := time.Now()
|
now := time.Now()
|
||||||
cutoff := now.Add(-r.window)
|
cutoff := now.Add(-r.window)
|
||||||
|
|
||||||
// Get existing requests for this PID
|
bucket, exists := r.buckets[pid]
|
||||||
reqs := r.requests[pid]
|
if !exists {
|
||||||
|
// Create new bucket with fixed capacity
|
||||||
|
bucket = &pidRateBucket{
|
||||||
|
timestamps: make([]time.Time, r.limit),
|
||||||
|
head: 0,
|
||||||
|
count: 0,
|
||||||
|
}
|
||||||
|
r.buckets[pid] = bucket
|
||||||
|
}
|
||||||
|
|
||||||
// Filter out old requests
|
// Count valid (non-expired) requests in the ring buffer
|
||||||
var validReqs []time.Time
|
validCount := 0
|
||||||
for _, t := range reqs {
|
for i := 0; i < bucket.count; i++ {
|
||||||
if t.After(cutoff) {
|
idx := (bucket.head - bucket.count + i + r.limit) % r.limit
|
||||||
validReqs = append(validReqs, t)
|
if bucket.timestamps[idx].After(cutoff) {
|
||||||
|
validCount++
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if under limit
|
// Check if under limit
|
||||||
if len(validReqs) >= r.limit {
|
if validCount >= r.limit {
|
||||||
r.requests[pid] = validReqs
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add new request
|
// Add new request to ring buffer (overwrites oldest if full)
|
||||||
validReqs = append(validReqs, now)
|
bucket.timestamps[bucket.head] = now
|
||||||
r.requests[pid] = validReqs
|
bucket.head = (bucket.head + 1) % r.limit
|
||||||
|
if bucket.count < r.limit {
|
||||||
|
bucket.count++
|
||||||
|
}
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
// Cleanup removes old entries from the rate limiter.
|
// Cleanup removes stale PID entries from the rate limiter.
|
||||||
func (r *RateLimiter) Cleanup() {
|
func (r *RateLimiter) Cleanup() {
|
||||||
r.mu.Lock()
|
r.mu.Lock()
|
||||||
defer r.mu.Unlock()
|
defer r.mu.Unlock()
|
||||||
@@ -76,17 +95,18 @@ func (r *RateLimiter) Cleanup() {
|
|||||||
now := time.Now()
|
now := time.Now()
|
||||||
cutoff := now.Add(-r.window)
|
cutoff := now.Add(-r.window)
|
||||||
|
|
||||||
for pid, reqs := range r.requests {
|
for pid, bucket := range r.buckets {
|
||||||
var validReqs []time.Time
|
// Check if all timestamps are expired
|
||||||
for _, t := range reqs {
|
hasValid := false
|
||||||
if t.After(cutoff) {
|
for i := 0; i < bucket.count; i++ {
|
||||||
validReqs = append(validReqs, t)
|
idx := (bucket.head - bucket.count + i + r.limit) % r.limit
|
||||||
|
if bucket.timestamps[idx].After(cutoff) {
|
||||||
|
hasValid = true
|
||||||
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if len(validReqs) == 0 {
|
if !hasValid {
|
||||||
delete(r.requests, pid)
|
delete(r.buckets, pid)
|
||||||
} else {
|
|
||||||
r.requests[pid] = validReqs
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -114,10 +134,12 @@ type AuditEntry struct {
|
|||||||
func NewAuditLogger(path string) (*AuditLogger, error) {
|
func NewAuditLogger(path string) (*AuditLogger, error) {
|
||||||
// Ensure directory exists
|
// Ensure directory exists
|
||||||
dir := path[:len(path)-len("/audit.log")]
|
dir := path[:len(path)-len("/audit.log")]
|
||||||
|
// #nosec G301 - Log directory permissions are intentionally 0755
|
||||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
||||||
return nil, fmt.Errorf("failed to create log directory: %w", err)
|
return nil, fmt.Errorf("failed to create log directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// #nosec G302,G304,G306 - Path is constant, permissions are intentional for audit log
|
||||||
file, err := os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
|
file, err := os.OpenFile(path, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0644)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("failed to open audit log: %w", err)
|
return nil, fmt.Errorf("failed to open audit log: %w", err)
|
||||||
@@ -185,12 +207,28 @@ func isUserInGroup(uid uint32, targetGID uint32) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Check if target GID is in the list
|
// Check if target GID is in the list
|
||||||
targetGIDStr := fmt.Sprintf("%d", targetGID)
|
for _, gidStr := range groupIDs {
|
||||||
for _, gid := range groupIDs {
|
gid, err := strconv.ParseUint(gidStr, 10, 32)
|
||||||
if gid == targetGIDStr {
|
if err != nil {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if uint32(gid) == targetGID {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// lookupGroupGID looks up a group by name and returns its GID.
|
||||||
|
func lookupGroupGID(name string) (int, error) {
|
||||||
|
group, err := user.LookupGroup(name)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("group not found: %s", name)
|
||||||
|
}
|
||||||
|
gid, err := strconv.Atoi(group.Gid)
|
||||||
|
if err != nil {
|
||||||
|
return 0, fmt.Errorf("invalid GID for group %s: %s", name, group.Gid)
|
||||||
|
}
|
||||||
|
return gid, nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package daemon
|
package daemon
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
@@ -67,7 +68,7 @@ func TestRateLimiter_Cleanup(t *testing.T) {
|
|||||||
rl.Allow(pid)
|
rl.Allow(pid)
|
||||||
}
|
}
|
||||||
|
|
||||||
assert.Len(t, rl.requests, 5)
|
assert.Len(t, rl.buckets, 5)
|
||||||
|
|
||||||
// Wait for expiration
|
// Wait for expiration
|
||||||
time.Sleep(15 * time.Millisecond)
|
time.Sleep(15 * time.Millisecond)
|
||||||
@@ -75,7 +76,7 @@ func TestRateLimiter_Cleanup(t *testing.T) {
|
|||||||
// Cleanup
|
// Cleanup
|
||||||
rl.Cleanup()
|
rl.Cleanup()
|
||||||
|
|
||||||
assert.Empty(t, rl.requests)
|
assert.Empty(t, rl.buckets)
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAuditLogger_Log(t *testing.T) {
|
func TestAuditLogger_Log(t *testing.T) {
|
||||||
@@ -145,28 +146,33 @@ func TestPeerCredentials(t *testing.T) {
|
|||||||
|
|
||||||
// Matrix test for rate limiting
|
// Matrix test for rate limiting
|
||||||
func TestRateLimiter_Matrix(t *testing.T) {
|
func TestRateLimiter_Matrix(t *testing.T) {
|
||||||
limits := []int{1, 5, 10, 100}
|
testCases := []struct {
|
||||||
windows := []time.Duration{10 * time.Millisecond, 100 * time.Millisecond, time.Second}
|
limit int
|
||||||
|
window time.Duration
|
||||||
|
}{
|
||||||
|
{1, time.Second},
|
||||||
|
{5, time.Second},
|
||||||
|
{10, time.Second},
|
||||||
|
{100, time.Second},
|
||||||
|
}
|
||||||
|
|
||||||
for _, limit := range limits {
|
for _, tc := range testCases {
|
||||||
for _, window := range windows {
|
|
||||||
t.Run(
|
t.Run(
|
||||||
"limit="+string(rune('0'+limit))+"_window="+window.String(),
|
fmt.Sprintf("limit=%d_window=%s", tc.limit, tc.window),
|
||||||
func(t *testing.T) {
|
func(t *testing.T) {
|
||||||
rl := NewRateLimiter(limit, window)
|
rl := NewRateLimiter(tc.limit, tc.window)
|
||||||
|
|
||||||
// Should allow exactly 'limit' requests
|
// Should allow exactly 'limit' requests
|
||||||
for i := 0; i < limit; i++ {
|
for i := 0; i < tc.limit; i++ {
|
||||||
assert.True(t, rl.Allow(1))
|
assert.True(t, rl.Allow(1), "request %d should be allowed", i)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Next should be blocked
|
// Next should be blocked
|
||||||
assert.False(t, rl.Allow(1))
|
assert.False(t, rl.Allow(1), "request after limit should be blocked")
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
func BenchmarkRateLimiter_Allow(b *testing.B) {
|
func BenchmarkRateLimiter_Allow(b *testing.B) {
|
||||||
rl := NewRateLimiter(RateLimit, RateLimitWindow)
|
rl := NewRateLimiter(RateLimit, RateLimitWindow)
|
||||||
|
|||||||
+85
-59
@@ -8,6 +8,7 @@ import (
|
|||||||
"net"
|
"net"
|
||||||
"os"
|
"os"
|
||||||
"sync"
|
"sync"
|
||||||
|
"syscall"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
"github.com/lukaszraczylo/lolcathost/internal/config"
|
"github.com/lukaszraczylo/lolcathost/internal/config"
|
||||||
@@ -48,22 +49,31 @@ func NewServer(socketPath string, cfgManager *config.Manager) *Server {
|
|||||||
// Start starts the server.
|
// Start starts the server.
|
||||||
func (s *Server) Start() error {
|
func (s *Server) Start() error {
|
||||||
// Remove existing socket
|
// Remove existing socket
|
||||||
os.Remove(s.socketPath)
|
_ = os.Remove(s.socketPath)
|
||||||
|
|
||||||
|
// Set umask to create socket with restricted permissions (0660)
|
||||||
|
// This prevents TOCTOU vulnerability between socket creation and chmod
|
||||||
|
oldUmask := syscall.Umask(0117) // 0777 & ~0117 = 0660
|
||||||
|
|
||||||
listener, err := net.Listen("unix", s.socketPath)
|
listener, err := net.Listen("unix", s.socketPath)
|
||||||
|
|
||||||
|
// Restore original umask immediately after socket creation
|
||||||
|
syscall.Umask(oldUmask)
|
||||||
|
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("failed to listen on socket: %w", err)
|
return fmt.Errorf("failed to listen on socket: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set socket permissions: 0660 root:lolcathost
|
// Look up the lolcathost group GID dynamically
|
||||||
if err := os.Chmod(s.socketPath, 0660); err != nil {
|
gid, err := lookupGroupGID("lolcathost")
|
||||||
listener.Close()
|
if err != nil {
|
||||||
return fmt.Errorf("failed to set socket permissions: %w", err)
|
// Fall back to default GID if group lookup fails
|
||||||
|
gid = LolcathostGID
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set socket group to lolcathost (GID 850)
|
// Set socket group to lolcathost
|
||||||
if err := os.Chown(s.socketPath, 0, 850); err != nil {
|
if err := os.Chown(s.socketPath, 0, gid); err != nil {
|
||||||
listener.Close()
|
_ = listener.Close()
|
||||||
return fmt.Errorf("failed to set socket ownership: %w", err)
|
return fmt.Errorf("failed to set socket ownership: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -94,13 +104,13 @@ func (s *Server) Stop() error {
|
|||||||
close(s.stopCh)
|
close(s.stopCh)
|
||||||
|
|
||||||
if s.listener != nil {
|
if s.listener != nil {
|
||||||
s.listener.Close()
|
_ = s.listener.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
os.Remove(s.socketPath)
|
_ = os.Remove(s.socketPath)
|
||||||
|
|
||||||
if s.auditLogger != nil {
|
if s.auditLogger != nil {
|
||||||
s.auditLogger.Close()
|
_ = s.auditLogger.Close()
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -125,6 +135,9 @@ func (s *Server) acceptLoop() {
|
|||||||
// LolcathostGID is the group ID for the lolcathost group.
|
// LolcathostGID is the group ID for the lolcathost group.
|
||||||
const LolcathostGID = 850
|
const LolcathostGID = 850
|
||||||
|
|
||||||
|
// connectionReadTimeout is the maximum time to wait for a client to send data.
|
||||||
|
const connectionReadTimeout = 30 * time.Second
|
||||||
|
|
||||||
func (s *Server) handleConnection(conn net.Conn) {
|
func (s *Server) handleConnection(conn net.Conn) {
|
||||||
defer conn.Close()
|
defer conn.Close()
|
||||||
|
|
||||||
@@ -133,7 +146,7 @@ func (s *Server) handleConnection(conn net.Conn) {
|
|||||||
|
|
||||||
// Authorization check: verify peer is authorized
|
// Authorization check: verify peer is authorized
|
||||||
if !s.isAuthorized(creds) {
|
if !s.isAuthorized(creds) {
|
||||||
s.writeResponse(conn, protocol.NewErrorResponse(protocol.ErrCodeUnauthorized, "unauthorized: user not in lolcathost group"))
|
_ = s.writeResponse(conn, protocol.NewErrorResponse(protocol.ErrCodeUnauthorized, "unauthorized: user not in lolcathost group"))
|
||||||
if s.auditLogger != nil {
|
if s.auditLogger != nil {
|
||||||
var uid uint32
|
var uid uint32
|
||||||
var pid int32
|
var pid int32
|
||||||
@@ -148,6 +161,11 @@ func (s *Server) handleConnection(conn net.Conn) {
|
|||||||
|
|
||||||
reader := bufio.NewReader(conn)
|
reader := bufio.NewReader(conn)
|
||||||
for {
|
for {
|
||||||
|
// Set read deadline to prevent clients from hanging indefinitely
|
||||||
|
if err := conn.SetReadDeadline(time.Now().Add(connectionReadTimeout)); err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
line, err := reader.ReadBytes('\n')
|
line, err := reader.ReadBytes('\n')
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return
|
return
|
||||||
@@ -155,13 +173,17 @@ func (s *Server) handleConnection(conn net.Conn) {
|
|||||||
|
|
||||||
var req protocol.Request
|
var req protocol.Request
|
||||||
if err := json.Unmarshal(line, &req); err != nil {
|
if err := json.Unmarshal(line, &req); err != nil {
|
||||||
s.writeResponse(conn, protocol.NewErrorResponse(protocol.ErrCodeInvalidRequest, "invalid JSON"))
|
if err := s.writeResponse(conn, protocol.NewErrorResponse(protocol.ErrCodeInvalidRequest, "invalid JSON")); err != nil {
|
||||||
|
return // Connection error, stop handling
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rate limiting
|
// Rate limiting
|
||||||
if creds != nil && !s.rateLimiter.Allow(creds.PID) {
|
if creds != nil && !s.rateLimiter.Allow(creds.PID) {
|
||||||
s.writeResponse(conn, protocol.NewErrorResponse(protocol.ErrCodeRateLimited, "rate limit exceeded"))
|
if err := s.writeResponse(conn, protocol.NewErrorResponse(protocol.ErrCodeRateLimited, "rate limit exceeded")); err != nil {
|
||||||
|
return // Connection error, stop handling
|
||||||
|
}
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +192,9 @@ func (s *Server) handleConnection(conn net.Conn) {
|
|||||||
s.mu.Unlock()
|
s.mu.Unlock()
|
||||||
|
|
||||||
resp := s.handleRequest(&req, creds)
|
resp := s.handleRequest(&req, creds)
|
||||||
s.writeResponse(conn, resp)
|
if err := s.writeResponse(conn, resp); err != nil {
|
||||||
|
return // Connection error, stop handling
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,10 +221,16 @@ func (s *Server) isAuthorized(creds *PeerCredentials) bool {
|
|||||||
return isUserInGroup(creds.UID, LolcathostGID)
|
return isUserInGroup(creds.UID, LolcathostGID)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) writeResponse(conn net.Conn, resp *protocol.Response) {
|
func (s *Server) writeResponse(conn net.Conn, resp *protocol.Response) error {
|
||||||
data, _ := json.Marshal(resp)
|
data, err := json.Marshal(resp)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("failed to marshal response: %w", err)
|
||||||
|
}
|
||||||
data = append(data, '\n')
|
data = append(data, '\n')
|
||||||
conn.Write(data)
|
if _, err := conn.Write(data); err != nil {
|
||||||
|
return fmt.Errorf("failed to write response: %w", err)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *Server) handleRequest(req *protocol.Request, creds *PeerCredentials) *protocol.Response {
|
func (s *Server) handleRequest(req *protocol.Request, creds *PeerCredentials) *protocol.Response {
|
||||||
@@ -426,14 +456,9 @@ func (s *Server) handleSet(req *protocol.Request) *protocol.Response {
|
|||||||
// Update config
|
// Update config
|
||||||
cfg.SetHostEnabled(payload.Alias, payload.Enabled)
|
cfg.SetHostEnabled(payload.Alias, payload.Enabled)
|
||||||
|
|
||||||
// Save config
|
// Save and sync with rollback on failure
|
||||||
if err := s.config.Save(); err != nil {
|
if err := s.saveAndSync(); err != nil {
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to save config: %v", err))
|
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, err.Error())
|
||||||
}
|
|
||||||
|
|
||||||
// Sync to hosts file
|
|
||||||
if err := s.syncHostsFile(); err != nil {
|
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to sync hosts: %v", err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, _ := protocol.NewOKResponse(protocol.SetData{
|
resp, _ := protocol.NewOKResponse(protocol.SetData{
|
||||||
@@ -467,14 +492,9 @@ func (s *Server) handlePreset(req *protocol.Request) *protocol.Response {
|
|||||||
return protocol.NewErrorResponse(protocol.ErrCodeNotFound, err.Error())
|
return protocol.NewErrorResponse(protocol.ErrCodeNotFound, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save config
|
// Save and sync with rollback on failure
|
||||||
if err := s.config.Save(); err != nil {
|
if err := s.saveAndSync(); err != nil {
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to save config: %v", err))
|
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, err.Error())
|
||||||
}
|
|
||||||
|
|
||||||
// Sync to hosts file
|
|
||||||
if err := s.syncHostsFile(); err != nil {
|
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to sync hosts: %v", err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, _ := protocol.NewOKResponse(map[string]string{"preset": payload.Name, "applied": "true"})
|
resp, _ := protocol.NewOKResponse(map[string]string{"preset": payload.Name, "applied": "true"})
|
||||||
@@ -492,7 +512,7 @@ func (s *Server) handleRollback(req *protocol.Request) *protocol.Response {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Flush DNS after restore
|
// Flush DNS after restore
|
||||||
s.flusher.Flush()
|
_ = s.flusher.Flush()
|
||||||
|
|
||||||
resp, _ := protocol.NewOKResponse(map[string]string{"restored": payload.BackupName})
|
resp, _ := protocol.NewOKResponse(map[string]string{"restored": payload.BackupName})
|
||||||
return resp
|
return resp
|
||||||
@@ -572,14 +592,9 @@ func (s *Server) handleAdd(req *protocol.Request) *protocol.Response {
|
|||||||
return protocol.NewErrorResponse(protocol.ErrCodeConflict, err.Error())
|
return protocol.NewErrorResponse(protocol.ErrCodeConflict, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save config
|
// Save and sync with rollback on failure
|
||||||
if err := s.config.Save(); err != nil {
|
if err := s.saveAndSync(); err != nil {
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to save config: %v", err))
|
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, err.Error())
|
||||||
}
|
|
||||||
|
|
||||||
// Sync to hosts file
|
|
||||||
if err := s.syncHostsFile(); err != nil {
|
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to sync hosts: %v", err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, _ := protocol.NewOKResponse(protocol.SetData{
|
resp, _ := protocol.NewOKResponse(protocol.SetData{
|
||||||
@@ -609,14 +624,9 @@ func (s *Server) handleDelete(req *protocol.Request) *protocol.Response {
|
|||||||
return protocol.NewErrorResponse(protocol.ErrCodeNotFound, fmt.Sprintf("alias not found: %s", payload.Alias))
|
return protocol.NewErrorResponse(protocol.ErrCodeNotFound, fmt.Sprintf("alias not found: %s", payload.Alias))
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save config
|
// Save and sync with rollback on failure
|
||||||
if err := s.config.Save(); err != nil {
|
if err := s.saveAndSync(); err != nil {
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to save config: %v", err))
|
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, err.Error())
|
||||||
}
|
|
||||||
|
|
||||||
// Sync to hosts file
|
|
||||||
if err := s.syncHostsFile(); err != nil {
|
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to sync hosts: %v", err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, _ := protocol.NewOKResponse(map[string]string{"deleted": payload.Alias})
|
resp, _ := protocol.NewOKResponse(map[string]string{"deleted": payload.Alias})
|
||||||
@@ -670,14 +680,9 @@ func (s *Server) handleDeleteGroup(req *protocol.Request) *protocol.Response {
|
|||||||
return protocol.NewErrorResponse(protocol.ErrCodeNotFound, err.Error())
|
return protocol.NewErrorResponse(protocol.ErrCodeNotFound, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Save config
|
// Save and sync with rollback on failure
|
||||||
if err := s.config.Save(); err != nil {
|
if err := s.saveAndSync(); err != nil {
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to save config: %v", err))
|
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, err.Error())
|
||||||
}
|
|
||||||
|
|
||||||
// Sync to hosts file
|
|
||||||
if err := s.syncHostsFile(); err != nil {
|
|
||||||
return protocol.NewErrorResponse(protocol.ErrCodeInternalError, fmt.Sprintf("failed to sync hosts: %v", err))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
resp, _ := protocol.NewOKResponse(map[string]string{"deleted": payload.Name})
|
resp, _ := protocol.NewOKResponse(map[string]string{"deleted": payload.Name})
|
||||||
@@ -823,3 +828,24 @@ func (s *Server) syncHostsFile() error {
|
|||||||
// Flush DNS cache
|
// Flush DNS cache
|
||||||
return s.flusher.Flush()
|
return s.flusher.Flush()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// saveAndSync saves the configuration and syncs to /etc/hosts atomically.
|
||||||
|
// If sync fails, it attempts to reload the previous config from disk.
|
||||||
|
func (s *Server) saveAndSync() error {
|
||||||
|
// Save config
|
||||||
|
if err := s.config.Save(); err != nil {
|
||||||
|
return fmt.Errorf("failed to save config: %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sync to hosts file
|
||||||
|
if err := s.syncHostsFile(); err != nil {
|
||||||
|
// Attempt to reload previous config on sync failure
|
||||||
|
if reloadErr := s.config.Reload(); reloadErr != nil {
|
||||||
|
// Log reload failure but return original sync error
|
||||||
|
fmt.Fprintf(os.Stderr, "warning: failed to reload config after sync failure: %v\n", reloadErr)
|
||||||
|
}
|
||||||
|
return fmt.Errorf("failed to sync hosts (config rolled back): %w", err)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ func setupTestServer(t *testing.T) (*Server, string, func()) {
|
|||||||
server := &Server{
|
server := &Server{
|
||||||
socketPath: socketPath,
|
socketPath: socketPath,
|
||||||
config: cfgManager,
|
config: cfgManager,
|
||||||
hosts: NewHostsManagerWithPaths(hostsPath, backupDir),
|
hosts: newHostsManagerWithPaths(hostsPath, backupDir),
|
||||||
flusher: NewDNSFlusher(FlushMethodAuto),
|
flusher: NewDNSFlusher(FlushMethodAuto),
|
||||||
rateLimiter: NewRateLimiter(100, time.Minute),
|
rateLimiter: NewRateLimiter(100, time.Minute),
|
||||||
stopCh: make(chan struct{}),
|
stopCh: make(chan struct{}),
|
||||||
@@ -219,6 +219,21 @@ func TestServer_HandleDelete(t *testing.T) {
|
|||||||
assert.Equal(t, "ok", resp.Status)
|
assert.Equal(t, "ok", resp.Status)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
t.Run("verify deleted entry not in list", func(t *testing.T) {
|
||||||
|
// After delete, list should not contain the deleted entry
|
||||||
|
resp := server.handleList()
|
||||||
|
assert.Equal(t, "ok", resp.Status)
|
||||||
|
|
||||||
|
var data protocol.ListData
|
||||||
|
err := resp.ParseData(&data)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// Check that the deleted entry is not in the list
|
||||||
|
for _, entry := range data.Entries {
|
||||||
|
assert.NotEqual(t, "todelete", entry.Alias, "deleted entry should not appear in list")
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
t.Run("delete nonexistent", func(t *testing.T) {
|
t.Run("delete nonexistent", func(t *testing.T) {
|
||||||
req, _ := protocol.NewRequest(protocol.RequestDelete, protocol.DeletePayload{
|
req, _ := protocol.NewRequest(protocol.RequestDelete, protocol.DeletePayload{
|
||||||
Alias: "nonexistent",
|
Alias: "nonexistent",
|
||||||
@@ -739,7 +754,7 @@ func BenchmarkServer_HandleSet(b *testing.B) {
|
|||||||
|
|
||||||
server := &Server{
|
server := &Server{
|
||||||
config: cfgManager,
|
config: cfgManager,
|
||||||
hosts: NewHostsManagerWithPaths(hostsPath, backupDir),
|
hosts: newHostsManagerWithPaths(hostsPath, backupDir),
|
||||||
flusher: NewDNSFlusher(FlushMethodAuto),
|
flusher: NewDNSFlusher(FlushMethodAuto),
|
||||||
rateLimiter: NewRateLimiter(100000, time.Minute),
|
rateLimiter: NewRateLimiter(100000, time.Minute),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ func (i *Installer) Uninstall() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Remove socket
|
// Remove socket
|
||||||
os.Remove(SocketPath)
|
_ = os.Remove(SocketPath)
|
||||||
|
|
||||||
// Note: We don't remove the group, logs, or backups
|
// Note: We don't remove the group, logs, or backups
|
||||||
// The user may want to keep these
|
// The user may want to keep these
|
||||||
@@ -210,14 +210,14 @@ func (i *Installer) createGroup() error {
|
|||||||
|
|
||||||
func (i *Installer) createGroupDarwin() error {
|
func (i *Installer) createGroupDarwin() error {
|
||||||
// Check if group exists
|
// Check if group exists
|
||||||
if _, err := exec.Command("dscl", ".", "-read", "/Groups/"+GroupName).Output(); err == nil {
|
if _, err := exec.Command("dscl", ".", "-read", "/Groups/"+GroupName).Output(); err == nil { // #nosec G204 - Commands use hardcoded safe values
|
||||||
i.log(" Group '%s' already exists", GroupName)
|
i.log(" Group '%s' already exists", GroupName)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
i.log(" Creating group '%s' (GID %d)...", GroupName, GroupGID)
|
i.log(" Creating group '%s' (GID %d)...", GroupName, GroupGID)
|
||||||
|
|
||||||
// Create group
|
// Create group - commands are hardcoded with constant GroupName
|
||||||
cmds := [][]string{
|
cmds := [][]string{
|
||||||
{"dscl", ".", "-create", "/Groups/" + GroupName},
|
{"dscl", ".", "-create", "/Groups/" + GroupName},
|
||||||
{"dscl", ".", "-create", "/Groups/" + GroupName, "PrimaryGroupID", strconv.Itoa(GroupGID)},
|
{"dscl", ".", "-create", "/Groups/" + GroupName, "PrimaryGroupID", strconv.Itoa(GroupGID)},
|
||||||
@@ -225,6 +225,7 @@ func (i *Installer) createGroupDarwin() error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for _, args := range cmds {
|
for _, args := range cmds {
|
||||||
|
// #nosec G204 - Commands use hardcoded safe values
|
||||||
if err := exec.Command(args[0], args[1:]...).Run(); err != nil {
|
if err := exec.Command(args[0], args[1:]...).Run(); err != nil {
|
||||||
return fmt.Errorf("command %v failed: %w", args, err)
|
return fmt.Errorf("command %v failed: %w", args, err)
|
||||||
}
|
}
|
||||||
@@ -235,14 +236,14 @@ func (i *Installer) createGroupDarwin() error {
|
|||||||
|
|
||||||
func (i *Installer) createGroupLinux() error {
|
func (i *Installer) createGroupLinux() error {
|
||||||
// Check if group exists
|
// Check if group exists
|
||||||
if _, err := exec.Command("getent", "group", GroupName).Output(); err == nil {
|
if _, err := exec.Command("getent", "group", GroupName).Output(); err == nil { // #nosec G204 - GroupName is a constant
|
||||||
i.log(" Group '%s' already exists", GroupName)
|
i.log(" Group '%s' already exists", GroupName)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
i.log(" Creating group '%s'...", GroupName)
|
i.log(" Creating group '%s'...", GroupName)
|
||||||
|
|
||||||
if err := exec.Command("groupadd", "-r", GroupName).Run(); err != nil {
|
if err := exec.Command("groupadd", "-r", GroupName).Run(); err != nil { // #nosec G204 - GroupName is a constant
|
||||||
return fmt.Errorf("groupadd failed: %w", err)
|
return fmt.Errorf("groupadd failed: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -278,7 +279,7 @@ func (i *Installer) addCurrentUserToGroup() error {
|
|||||||
|
|
||||||
func (i *Installer) addUserToGroupDarwin(username string) error {
|
func (i *Installer) addUserToGroupDarwin(username string) error {
|
||||||
// Check if user is already in group
|
// Check if user is already in group
|
||||||
output, err := exec.Command("dscl", ".", "-read", "/Groups/"+GroupName, "GroupMembership").Output()
|
output, err := exec.Command("dscl", ".", "-read", "/Groups/"+GroupName, "GroupMembership").Output() // #nosec G204 - GroupName is a constant
|
||||||
if err == nil && strings.Contains(string(output), username) {
|
if err == nil && strings.Contains(string(output), username) {
|
||||||
i.log(" User '%s' already in group '%s'", username, GroupName)
|
i.log(" User '%s' already in group '%s'", username, GroupName)
|
||||||
return nil
|
return nil
|
||||||
@@ -286,7 +287,7 @@ func (i *Installer) addUserToGroupDarwin(username string) error {
|
|||||||
|
|
||||||
i.log(" Adding user '%s' to group '%s'...", username, GroupName)
|
i.log(" Adding user '%s' to group '%s'...", username, GroupName)
|
||||||
|
|
||||||
if err := exec.Command("dscl", ".", "-append", "/Groups/"+GroupName, "GroupMembership", username).Run(); err != nil {
|
if err := exec.Command("dscl", ".", "-append", "/Groups/"+GroupName, "GroupMembership", username).Run(); err != nil { // #nosec G204 - GroupName is a constant, username from SUDO_USER env
|
||||||
return fmt.Errorf("failed to add user to group: %w", err)
|
return fmt.Errorf("failed to add user to group: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -295,7 +296,7 @@ func (i *Installer) addUserToGroupDarwin(username string) error {
|
|||||||
|
|
||||||
func (i *Installer) addUserToGroupLinux(username string) error {
|
func (i *Installer) addUserToGroupLinux(username string) error {
|
||||||
// Check if user is already in group
|
// Check if user is already in group
|
||||||
output, err := exec.Command("id", "-nG", username).Output()
|
output, err := exec.Command("id", "-nG", username).Output() // #nosec G204 - username from SUDO_USER env or current user
|
||||||
if err == nil && strings.Contains(string(output), GroupName) {
|
if err == nil && strings.Contains(string(output), GroupName) {
|
||||||
i.log(" User '%s' already in group '%s'", username, GroupName)
|
i.log(" User '%s' already in group '%s'", username, GroupName)
|
||||||
return nil
|
return nil
|
||||||
@@ -303,7 +304,7 @@ func (i *Installer) addUserToGroupLinux(username string) error {
|
|||||||
|
|
||||||
i.log(" Adding user '%s' to group '%s'...", username, GroupName)
|
i.log(" Adding user '%s' to group '%s'...", username, GroupName)
|
||||||
|
|
||||||
if err := exec.Command("usermod", "-aG", GroupName, username).Run(); err != nil {
|
if err := exec.Command("usermod", "-aG", GroupName, username).Run(); err != nil { // #nosec G204 - GroupName is a constant, username from SUDO_USER env
|
||||||
return fmt.Errorf("failed to add user to group: %w", err)
|
return fmt.Errorf("failed to add user to group: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -315,6 +316,7 @@ func (i *Installer) createDirectories() error {
|
|||||||
|
|
||||||
for _, dir := range dirs {
|
for _, dir := range dirs {
|
||||||
i.log(" Creating directory '%s'...", dir)
|
i.log(" Creating directory '%s'...", dir)
|
||||||
|
// #nosec G301 - System directories are intentionally 0755
|
||||||
if err := os.MkdirAll(dir, 0755); err != nil {
|
if err := os.MkdirAll(dir, 0755); err != nil {
|
||||||
return fmt.Errorf("failed to create %s: %w", dir, err)
|
return fmt.Errorf("failed to create %s: %w", dir, err)
|
||||||
}
|
}
|
||||||
@@ -340,28 +342,29 @@ func (i *Installer) installLaunchDaemon() error {
|
|||||||
|
|
||||||
// Unload if already loaded (do this before writing plist)
|
// Unload if already loaded (do this before writing plist)
|
||||||
i.log(" Stopping existing daemon if running...")
|
i.log(" Stopping existing daemon if running...")
|
||||||
exec.Command("launchctl", "bootout", "system/com.lolcathost.daemon").Run()
|
_ = exec.Command("launchctl", "bootout", "system/com.lolcathost.daemon").Run() // #nosec G204 - Hardcoded service name
|
||||||
|
|
||||||
// Give launchd time to fully unload the service
|
// Give launchd time to fully unload the service
|
||||||
time.Sleep(500 * time.Millisecond)
|
time.Sleep(500 * time.Millisecond)
|
||||||
|
|
||||||
// Remove old plist to ensure clean state
|
// Remove old plist to ensure clean state
|
||||||
os.Remove(plistPath)
|
_ = os.Remove(plistPath)
|
||||||
|
|
||||||
i.log(" Writing LaunchDaemon plist...")
|
i.log(" Writing LaunchDaemon plist...")
|
||||||
|
// #nosec G306 - Plist file permissions are intentionally 0644
|
||||||
if err := os.WriteFile(plistPath, []byte(plistContent), 0644); err != nil {
|
if err := os.WriteFile(plistPath, []byte(plistContent), 0644); err != nil {
|
||||||
return fmt.Errorf("failed to write plist: %w", err)
|
return fmt.Errorf("failed to write plist: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bootstrap the daemon
|
// Bootstrap the daemon
|
||||||
i.log(" Starting daemon...")
|
i.log(" Starting daemon...")
|
||||||
cmd := exec.Command("launchctl", "bootstrap", "system", plistPath)
|
cmd := exec.Command("launchctl", "bootstrap", "system", plistPath) // #nosec G204 - plistPath is constructed from constants
|
||||||
output, err := cmd.CombinedOutput()
|
output, err := cmd.CombinedOutput()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// Exit code 5 means "service already loaded" - try kickstart instead
|
// Exit code 5 means "service already loaded" - try kickstart instead
|
||||||
if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 5 {
|
if exitErr, ok := err.(*exec.ExitError); ok && exitErr.ExitCode() == 5 {
|
||||||
i.log(" Service already registered, restarting...")
|
i.log(" Service already registered, restarting...")
|
||||||
if err := exec.Command("launchctl", "kickstart", "-k", "system/com.lolcathost.daemon").Run(); err != nil {
|
if err := exec.Command("launchctl", "kickstart", "-k", "system/com.lolcathost.daemon").Run(); err != nil { // #nosec G204 - Hardcoded service name
|
||||||
return fmt.Errorf("failed to restart daemon: %w", err)
|
return fmt.Errorf("failed to restart daemon: %w", err)
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
@@ -376,10 +379,10 @@ func (i *Installer) uninstallLaunchDaemon() {
|
|||||||
plistPath := filepath.Join(LaunchDaemonDir, "com.lolcathost.daemon.plist")
|
plistPath := filepath.Join(LaunchDaemonDir, "com.lolcathost.daemon.plist")
|
||||||
|
|
||||||
i.log(" Stopping daemon...")
|
i.log(" Stopping daemon...")
|
||||||
exec.Command("launchctl", "bootout", "system/com.lolcathost.daemon").Run()
|
_ = exec.Command("launchctl", "bootout", "system/com.lolcathost.daemon").Run() // #nosec G204 - Hardcoded service name
|
||||||
|
|
||||||
i.log(" Removing LaunchDaemon plist...")
|
i.log(" Removing LaunchDaemon plist...")
|
||||||
os.Remove(plistPath)
|
_ = os.Remove(plistPath)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *Installer) installSystemdService() error {
|
func (i *Installer) installSystemdService() error {
|
||||||
@@ -387,19 +390,20 @@ func (i *Installer) installSystemdService() error {
|
|||||||
unitContent := fmt.Sprintf(SystemdUnit, i.binaryPath)
|
unitContent := fmt.Sprintf(SystemdUnit, i.binaryPath)
|
||||||
|
|
||||||
i.log(" Writing systemd unit...")
|
i.log(" Writing systemd unit...")
|
||||||
|
// #nosec G306 - Unit file permissions are intentionally 0644
|
||||||
if err := os.WriteFile(unitPath, []byte(unitContent), 0644); err != nil {
|
if err := os.WriteFile(unitPath, []byte(unitContent), 0644); err != nil {
|
||||||
return fmt.Errorf("failed to write unit file: %w", err)
|
return fmt.Errorf("failed to write unit file: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reload systemd
|
// Reload systemd
|
||||||
i.log(" Reloading systemd...")
|
i.log(" Reloading systemd...")
|
||||||
if err := exec.Command("systemctl", "daemon-reload").Run(); err != nil {
|
if err := exec.Command("systemctl", "daemon-reload").Run(); err != nil { // #nosec G204 - Hardcoded systemctl command
|
||||||
return fmt.Errorf("failed to reload systemd: %w", err)
|
return fmt.Errorf("failed to reload systemd: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enable and start the service
|
// Enable and start the service
|
||||||
i.log(" Enabling and starting service...")
|
i.log(" Enabling and starting service...")
|
||||||
if err := exec.Command("systemctl", "enable", "--now", "lolcathost.service").Run(); err != nil {
|
if err := exec.Command("systemctl", "enable", "--now", "lolcathost.service").Run(); err != nil { // #nosec G204 - Hardcoded service name
|
||||||
return fmt.Errorf("failed to enable service: %w", err)
|
return fmt.Errorf("failed to enable service: %w", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -408,12 +412,12 @@ func (i *Installer) installSystemdService() error {
|
|||||||
|
|
||||||
func (i *Installer) uninstallSystemdService() {
|
func (i *Installer) uninstallSystemdService() {
|
||||||
i.log(" Stopping and disabling service...")
|
i.log(" Stopping and disabling service...")
|
||||||
exec.Command("systemctl", "disable", "--now", "lolcathost.service").Run()
|
_ = exec.Command("systemctl", "disable", "--now", "lolcathost.service").Run() // #nosec G204 - Hardcoded service name
|
||||||
|
|
||||||
i.log(" Removing systemd unit...")
|
i.log(" Removing systemd unit...")
|
||||||
os.Remove(filepath.Join(SystemdDir, "lolcathost.service"))
|
_ = os.Remove(filepath.Join(SystemdDir, "lolcathost.service"))
|
||||||
|
|
||||||
exec.Command("systemctl", "daemon-reload").Run()
|
_ = exec.Command("systemctl", "daemon-reload").Run() // #nosec G204 - Hardcoded systemctl command
|
||||||
}
|
}
|
||||||
|
|
||||||
func (i *Installer) createDefaultConfig() error {
|
func (i *Installer) createDefaultConfig() error {
|
||||||
@@ -430,6 +434,7 @@ func (i *Installer) createDefaultConfig() error {
|
|||||||
|
|
||||||
// Create config directory
|
// Create config directory
|
||||||
configDir := filepath.Dir(configPath)
|
configDir := filepath.Dir(configPath)
|
||||||
|
// #nosec G301 - Config directory permissions are intentionally 0755
|
||||||
if err := os.MkdirAll(configDir, 0755); err != nil {
|
if err := os.MkdirAll(configDir, 0755); err != nil {
|
||||||
return fmt.Errorf("failed to create config directory: %w", err)
|
return fmt.Errorf("failed to create config directory: %w", err)
|
||||||
}
|
}
|
||||||
|
|||||||
+133
-24
@@ -9,6 +9,7 @@ import (
|
|||||||
|
|
||||||
"github.com/charmbracelet/bubbles/textinput"
|
"github.com/charmbracelet/bubbles/textinput"
|
||||||
tea "github.com/charmbracelet/bubbletea"
|
tea "github.com/charmbracelet/bubbletea"
|
||||||
|
"github.com/charmbracelet/lipgloss"
|
||||||
|
|
||||||
"github.com/lukaszraczylo/lolcathost/internal/client"
|
"github.com/lukaszraczylo/lolcathost/internal/client"
|
||||||
"github.com/lukaszraczylo/lolcathost/internal/config"
|
"github.com/lukaszraczylo/lolcathost/internal/config"
|
||||||
@@ -27,6 +28,7 @@ const (
|
|||||||
ViewBackups
|
ViewBackups
|
||||||
ViewHelp
|
ViewHelp
|
||||||
ViewSearch
|
ViewSearch
|
||||||
|
ViewConfirmDelete
|
||||||
)
|
)
|
||||||
|
|
||||||
// Model is the main Bubble Tea model.
|
// Model is the main Bubble Tea model.
|
||||||
@@ -52,6 +54,7 @@ type Model struct {
|
|||||||
messageTime time.Time
|
messageTime time.Time
|
||||||
searchTerm string
|
searchTerm string
|
||||||
allGroups []string // All groups including empty ones
|
allGroups []string // All groups including empty ones
|
||||||
|
pendingDeleteAlias string // Alias of host pending delete confirmation
|
||||||
|
|
||||||
// Update notification
|
// Update notification
|
||||||
updateAvailable bool
|
updateAvailable bool
|
||||||
@@ -351,8 +354,9 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
m.setError(fmt.Sprintf("Refresh failed: %v", msg.err))
|
m.setError(fmt.Sprintf("Refresh failed: %v", msg.err))
|
||||||
// Mark as disconnected to trigger reconnect
|
// Mark as disconnected to trigger reconnect
|
||||||
m.connected = false
|
m.connected = false
|
||||||
m.client.Close()
|
_ = m.client.Close()
|
||||||
} else if msg.entries != nil {
|
} else {
|
||||||
|
// Always update the list, even if entries is nil/empty
|
||||||
m.list.SetItems(msg.entries)
|
m.list.SetItems(msg.entries)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -385,7 +389,10 @@ func (m *Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
|
|||||||
m.mode = ViewList
|
m.mode = ViewList
|
||||||
|
|
||||||
case deleteMsg:
|
case deleteMsg:
|
||||||
|
// Clear pending state regardless of success/failure
|
||||||
|
m.list.SetPending(msg.alias, false)
|
||||||
if msg.err != nil {
|
if msg.err != nil {
|
||||||
|
m.list.SetError(msg.alias, true)
|
||||||
m.setError(fmt.Sprintf("Delete failed: %v", msg.err))
|
m.setError(fmt.Sprintf("Delete failed: %v", msg.err))
|
||||||
} else {
|
} else {
|
||||||
cmds = append(cmds, m.refresh())
|
cmds = append(cmds, m.refresh())
|
||||||
@@ -521,6 +528,8 @@ func (m *Model) handleKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
return m.handleHelpKey(msg)
|
return m.handleHelpKey(msg)
|
||||||
case ViewSearch:
|
case ViewSearch:
|
||||||
return m.handleSearchKey(msg)
|
return m.handleSearchKey(msg)
|
||||||
|
case ViewConfirmDelete:
|
||||||
|
return m.handleConfirmDeleteKey(msg)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
@@ -554,7 +563,8 @@ func (m *Model) handleListKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
}
|
}
|
||||||
case "d":
|
case "d":
|
||||||
if item := m.list.Selected(); item != nil {
|
if item := m.list.Selected(); item != nil {
|
||||||
return m.deleteHost(item.Entry.Alias)
|
m.pendingDeleteAlias = item.Entry.Alias
|
||||||
|
m.mode = ViewConfirmDelete
|
||||||
}
|
}
|
||||||
case "p":
|
case "p":
|
||||||
m.mode = ViewPresets
|
m.mode = ViewPresets
|
||||||
@@ -593,7 +603,7 @@ func (m *Model) handleFormKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
oldAlias := m.form.EditAlias()
|
oldAlias := m.form.EditAlias()
|
||||||
return tea.Sequence(
|
return tea.Sequence(
|
||||||
func() tea.Msg {
|
func() tea.Msg {
|
||||||
m.client.Delete(oldAlias)
|
_ = m.client.Delete(oldAlias)
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
m.addHost(domain, ip, "", group), // Empty alias = auto-generate
|
m.addHost(domain, ip, "", group), // Empty alias = auto-generate
|
||||||
@@ -668,7 +678,7 @@ func (m *Model) handlePresetFormKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
oldName := m.presetPicker.EditName()
|
oldName := m.presetPicker.EditName()
|
||||||
return tea.Sequence(
|
return tea.Sequence(
|
||||||
func() tea.Msg {
|
func() tea.Msg {
|
||||||
m.client.DeletePreset(oldName)
|
_ = m.client.DeletePreset(oldName)
|
||||||
return nil
|
return nil
|
||||||
},
|
},
|
||||||
m.addPreset(name, enable, disable),
|
m.addPreset(name, enable, disable),
|
||||||
@@ -850,6 +860,23 @@ func (m *Model) handleSearchKey(msg tea.KeyMsg) tea.Cmd {
|
|||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *Model) handleConfirmDeleteKey(msg tea.KeyMsg) tea.Cmd {
|
||||||
|
switch msg.String() {
|
||||||
|
case "y", "Y":
|
||||||
|
alias := m.pendingDeleteAlias
|
||||||
|
m.pendingDeleteAlias = ""
|
||||||
|
m.mode = ViewList
|
||||||
|
// Set pending state for visual feedback
|
||||||
|
m.list.SetPending(alias, true)
|
||||||
|
return m.deleteHost(alias)
|
||||||
|
case "n", "N", "esc":
|
||||||
|
m.pendingDeleteAlias = ""
|
||||||
|
m.mode = ViewList
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (m *Model) toggleSelected() tea.Cmd {
|
func (m *Model) toggleSelected() tea.Cmd {
|
||||||
item := m.list.Selected()
|
item := m.list.Selected()
|
||||||
if item == nil {
|
if item == nil {
|
||||||
@@ -904,6 +931,8 @@ func (m *Model) View() string {
|
|||||||
sb.WriteString(m.helpView())
|
sb.WriteString(m.helpView())
|
||||||
case ViewSearch:
|
case ViewSearch:
|
||||||
sb.WriteString(m.searchView())
|
sb.WriteString(m.searchView())
|
||||||
|
case ViewConfirmDelete:
|
||||||
|
sb.WriteString(m.confirmDeleteView())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Message
|
// Message
|
||||||
@@ -920,8 +949,15 @@ func (m *Model) View() string {
|
|||||||
currentContent := sb.String()
|
currentContent := sb.String()
|
||||||
currentLines := strings.Count(currentContent, "\n") + 1
|
currentLines := strings.Count(currentContent, "\n") + 1
|
||||||
|
|
||||||
// Fill space to push footer to bottom (reserve 3 lines for footer)
|
// Calculate footer height dynamically (help bar lines + status bar + spacing)
|
||||||
footerHeight := 3
|
footerHeight := 2 // status bar + newline before it
|
||||||
|
var helpBarContent string
|
||||||
|
if m.mode == ViewList {
|
||||||
|
helpBarContent = m.helpBar()
|
||||||
|
helpBarLines := strings.Count(helpBarContent, "\n") + 1
|
||||||
|
footerHeight += helpBarLines + 1 // +1 for newline before help bar
|
||||||
|
}
|
||||||
|
|
||||||
remainingLines := m.height - currentLines - footerHeight
|
remainingLines := m.height - currentLines - footerHeight
|
||||||
if remainingLines > 0 {
|
if remainingLines > 0 {
|
||||||
sb.WriteString(strings.Repeat("\n", remainingLines))
|
sb.WriteString(strings.Repeat("\n", remainingLines))
|
||||||
@@ -930,7 +966,7 @@ func (m *Model) View() string {
|
|||||||
// Footer (help bar + status bar)
|
// Footer (help bar + status bar)
|
||||||
if m.mode == ViewList {
|
if m.mode == ViewList {
|
||||||
sb.WriteString("\n")
|
sb.WriteString("\n")
|
||||||
sb.WriteString(m.helpBar())
|
sb.WriteString(helpBarContent)
|
||||||
}
|
}
|
||||||
sb.WriteString("\n")
|
sb.WriteString("\n")
|
||||||
sb.WriteString(m.statusBar())
|
sb.WriteString(m.statusBar())
|
||||||
@@ -939,19 +975,67 @@ func (m *Model) View() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (m *Model) helpBar() string {
|
func (m *Model) helpBar() string {
|
||||||
return helpBarStyle.Render(fmt.Sprintf("%s/%s: Navigate %s: Toggle %s: New %s: Edit %s: Delete %s: Presets %s: Groups %s: Backups %s: Search %s: Help %s: Quit",
|
// Define help items with their display widths (without ANSI codes)
|
||||||
helpKeyStyle.Render("↑↓"),
|
type helpItem struct {
|
||||||
helpKeyStyle.Render("jk"),
|
key string
|
||||||
helpKeyStyle.Render("Space"),
|
desc string
|
||||||
helpKeyStyle.Render("n"),
|
rawWidth int // width without ANSI escape codes
|
||||||
helpKeyStyle.Render("e"),
|
}
|
||||||
helpKeyStyle.Render("d"),
|
|
||||||
helpKeyStyle.Render("p"),
|
items := []helpItem{
|
||||||
helpKeyStyle.Render("g"),
|
{"↑↓/jk", "Navigate", 13},
|
||||||
helpKeyStyle.Render("b"),
|
{"Space", "Toggle", 13},
|
||||||
helpKeyStyle.Render("/"),
|
{"n", "New", 6},
|
||||||
helpKeyStyle.Render("?"),
|
{"e", "Edit", 7},
|
||||||
helpKeyStyle.Render("q")))
|
{"d", "Delete", 9},
|
||||||
|
{"p", "Presets", 10},
|
||||||
|
{"g", "Groups", 9},
|
||||||
|
{"b", "Backups", 10},
|
||||||
|
{"/", "Search", 9},
|
||||||
|
{"?", "Help", 7},
|
||||||
|
{"q", "Quit", 7},
|
||||||
|
}
|
||||||
|
|
||||||
|
separator := " "
|
||||||
|
sepWidth := 2
|
||||||
|
|
||||||
|
var lines []string
|
||||||
|
var currentLine string
|
||||||
|
var currentWidth int
|
||||||
|
|
||||||
|
for i, item := range items {
|
||||||
|
rendered := helpKeyStyle.Render(item.key) + ": " + item.desc
|
||||||
|
|
||||||
|
// Check if adding this item would exceed width
|
||||||
|
newWidth := currentWidth + item.rawWidth
|
||||||
|
if currentWidth > 0 {
|
||||||
|
newWidth += sepWidth
|
||||||
|
}
|
||||||
|
|
||||||
|
if m.width > 0 && newWidth > m.width && currentWidth > 0 {
|
||||||
|
// Start a new line
|
||||||
|
lines = append(lines, currentLine)
|
||||||
|
currentLine = rendered
|
||||||
|
currentWidth = item.rawWidth
|
||||||
|
} else {
|
||||||
|
// Add to current line
|
||||||
|
if currentWidth > 0 {
|
||||||
|
currentLine += separator
|
||||||
|
}
|
||||||
|
currentLine += rendered
|
||||||
|
currentWidth = newWidth
|
||||||
|
if i == 0 {
|
||||||
|
currentWidth = item.rawWidth
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add the last line
|
||||||
|
if currentLine != "" {
|
||||||
|
lines = append(lines, currentLine)
|
||||||
|
}
|
||||||
|
|
||||||
|
return helpBarStyle.Render(strings.Join(lines, "\n"))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Model) statusBar() string {
|
func (m *Model) statusBar() string {
|
||||||
@@ -1022,9 +1106,34 @@ func (m *Model) searchView() string {
|
|||||||
return dialogStyle.Render(sb.String())
|
return dialogStyle.Render(sb.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// Run starts the TUI application.
|
func (m *Model) confirmDeleteView() string {
|
||||||
func Run(socketPath string) error {
|
var sb strings.Builder
|
||||||
return RunWithVersion(socketPath, "dev", "", "")
|
|
||||||
|
sb.WriteString(titleStyle.Render("Confirm Delete"))
|
||||||
|
sb.WriteString("\n\n")
|
||||||
|
|
||||||
|
// Find the entry details for the pending delete
|
||||||
|
var domain, ip string
|
||||||
|
for _, item := range m.list.items {
|
||||||
|
if item.Entry.Alias == m.pendingDeleteAlias {
|
||||||
|
domain = item.Entry.Domain
|
||||||
|
ip = item.Entry.IP
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
warningStyle := lipgloss.NewStyle().Foreground(colorWarning).Bold(true)
|
||||||
|
sb.WriteString(warningStyle.Render("Are you sure you want to delete this host?"))
|
||||||
|
sb.WriteString("\n\n")
|
||||||
|
|
||||||
|
sb.WriteString(fmt.Sprintf(" Alias: %s\n", helpKeyStyle.Render(m.pendingDeleteAlias)))
|
||||||
|
sb.WriteString(fmt.Sprintf(" Domain: %s\n", helpDescStyle.Render(domain)))
|
||||||
|
sb.WriteString(fmt.Sprintf(" IP: %s\n", helpDescStyle.Render(ip)))
|
||||||
|
|
||||||
|
sb.WriteString("\n")
|
||||||
|
sb.WriteString(helpDescStyle.Render("y confirm • n/Esc cancel"))
|
||||||
|
|
||||||
|
return dialogStyle.Render(sb.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
// RunWithVersion starts the TUI application with version info for update checking.
|
// RunWithVersion starts the TUI application with version info for update checking.
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ func (b *BackupPicker) selectView() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
leftSb.WriteString("\n")
|
leftSb.WriteString("\n")
|
||||||
leftSb.WriteString(helpDescStyle.Render("↑↓ navigate • Enter restore • Esc cancel"))
|
leftSb.WriteString(WrapHelpText("↑↓ navigate • Enter restore • Esc cancel", 40))
|
||||||
|
|
||||||
// Build right panel (preview)
|
// Build right panel (preview)
|
||||||
var rightSb strings.Builder
|
var rightSb strings.Builder
|
||||||
@@ -219,7 +219,8 @@ func (b *BackupPicker) selectView() string {
|
|||||||
// Show scroll indicator
|
// Show scroll indicator
|
||||||
if len(lines) > previewHeight {
|
if len(lines) > previewHeight {
|
||||||
rightSb.WriteString("\n")
|
rightSb.WriteString("\n")
|
||||||
rightSb.WriteString(helpDescStyle.Render(fmt.Sprintf("Lines %d-%d of %d (Shift+↑↓ scroll)", b.previewScroll+1, endLine, len(lines))))
|
scrollText := fmt.Sprintf("%d-%d of %d (↑↓ scroll)", b.previewScroll+1, endLine, len(lines))
|
||||||
|
rightSb.WriteString(helpDescStyle.Render(scrollText))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -291,7 +291,7 @@ func (f *Form) View() string {
|
|||||||
sb.WriteString("\n\n")
|
sb.WriteString("\n\n")
|
||||||
|
|
||||||
sb.WriteString("\n")
|
sb.WriteString("\n")
|
||||||
sb.WriteString(helpDescStyle.Render("Tab/↓ next • Shift+Tab/↑ prev • ←→ select group • Enter save • Esc cancel"))
|
sb.WriteString(WrapHelpText("Tab/↓ next • Shift+Tab/↑ prev • ←→ select group • Enter save • Esc cancel", f.width-6))
|
||||||
|
|
||||||
return dialogStyle.Render(sb.String())
|
return dialogStyle.Render(sb.String())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ func (g *GroupPicker) selectView() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sb.WriteString("\n\n")
|
sb.WriteString("\n\n")
|
||||||
sb.WriteString(helpDescStyle.Render("↑↓ navigate • n new • r rename • d delete • Esc back"))
|
sb.WriteString(WrapHelpText("↑↓ navigate • n new • r rename • d delete • Esc back", g.width-6))
|
||||||
|
|
||||||
return dialogStyle.Render(sb.String())
|
return dialogStyle.Render(sb.String())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -295,11 +295,6 @@ func (l *ListView) ViewFiltered(searchTerm string) string {
|
|||||||
return sb.String()
|
return sb.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
// GroupCount returns the number of groups.
|
|
||||||
func (l *ListView) GroupCount() int {
|
|
||||||
return len(l.groupOrder)
|
|
||||||
}
|
|
||||||
|
|
||||||
// GetGroups returns all group names.
|
// GetGroups returns all group names.
|
||||||
func (l *ListView) GetGroups() []string {
|
func (l *ListView) GetGroups() []string {
|
||||||
return l.groupOrder
|
return l.groupOrder
|
||||||
|
|||||||
@@ -407,3 +407,72 @@ func BenchmarkListView_View(b *testing.B) {
|
|||||||
_ = lv.View()
|
_ = lv.View()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestListView_DeleteSimulation(t *testing.T) {
|
||||||
|
lv := NewListView()
|
||||||
|
|
||||||
|
// Initial entries
|
||||||
|
entries := []protocol.HostEntry{
|
||||||
|
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||||
|
{Domain: "b.com", IP: "127.0.0.1", Alias: "b", Enabled: false, Group: "dev"},
|
||||||
|
{Domain: "c.com", IP: "192.168.1.1", Alias: "c", Enabled: true, Group: "staging"},
|
||||||
|
}
|
||||||
|
lv.SetItems(entries)
|
||||||
|
require.Equal(t, 3, lv.Len())
|
||||||
|
|
||||||
|
// Select the second item
|
||||||
|
lv.MoveDown()
|
||||||
|
selected := lv.Selected()
|
||||||
|
require.NotNil(t, selected)
|
||||||
|
require.Equal(t, "b", selected.Entry.Alias)
|
||||||
|
|
||||||
|
// Simulate delete: set new items without the deleted entry
|
||||||
|
entriesAfterDelete := []protocol.HostEntry{
|
||||||
|
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||||
|
{Domain: "c.com", IP: "192.168.1.1", Alias: "c", Enabled: true, Group: "staging"},
|
||||||
|
}
|
||||||
|
lv.SetItems(entriesAfterDelete)
|
||||||
|
|
||||||
|
// Verify list has only 2 items now
|
||||||
|
assert.Equal(t, 2, lv.Len())
|
||||||
|
|
||||||
|
// Verify "b" is no longer in the list
|
||||||
|
for i := 0; i < lv.Len(); i++ {
|
||||||
|
assert.NotEqual(t, "b", lv.items[i].Entry.Alias, "deleted entry should not be in list")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cursor should be adjusted if needed
|
||||||
|
assert.LessOrEqual(t, lv.cursor, lv.Len()-1)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestListView_SetItemsWithNil(t *testing.T) {
|
||||||
|
lv := NewListView()
|
||||||
|
|
||||||
|
// Initial entries
|
||||||
|
entries := []protocol.HostEntry{
|
||||||
|
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||||
|
}
|
||||||
|
lv.SetItems(entries)
|
||||||
|
require.Equal(t, 1, lv.Len())
|
||||||
|
|
||||||
|
// Set nil entries (simulating empty list from server)
|
||||||
|
lv.SetItems(nil)
|
||||||
|
assert.Equal(t, 0, lv.Len())
|
||||||
|
assert.Equal(t, 0, lv.cursor)
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestListView_SetItemsWithEmptySlice(t *testing.T) {
|
||||||
|
lv := NewListView()
|
||||||
|
|
||||||
|
// Initial entries
|
||||||
|
entries := []protocol.HostEntry{
|
||||||
|
{Domain: "a.com", IP: "127.0.0.1", Alias: "a", Enabled: true, Group: "dev"},
|
||||||
|
}
|
||||||
|
lv.SetItems(entries)
|
||||||
|
require.Equal(t, 1, lv.Len())
|
||||||
|
|
||||||
|
// Set empty slice
|
||||||
|
lv.SetItems([]protocol.HostEntry{})
|
||||||
|
assert.Equal(t, 0, lv.Len())
|
||||||
|
assert.Equal(t, 0, lv.cursor)
|
||||||
|
}
|
||||||
|
|||||||
@@ -411,7 +411,7 @@ func (p *PresetPicker) selectView() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
sb.WriteString("\n")
|
sb.WriteString("\n")
|
||||||
sb.WriteString(helpDescStyle.Render("↑↓ navigate • Enter apply • n new • e edit • d delete • Esc cancel"))
|
sb.WriteString(WrapHelpText("↑↓ navigate • Enter apply • n new • e edit • d delete • Esc cancel", p.width-6))
|
||||||
|
|
||||||
return dialogStyle.Render(sb.String())
|
return dialogStyle.Render(sb.String())
|
||||||
}
|
}
|
||||||
@@ -483,7 +483,7 @@ func (p *PresetPicker) formView() string {
|
|||||||
}
|
}
|
||||||
sb.WriteString("\n\n")
|
sb.WriteString("\n\n")
|
||||||
|
|
||||||
sb.WriteString(helpDescStyle.Render("Tab/↓ next • Enter select/save • Esc cancel"))
|
sb.WriteString(WrapHelpText("Tab/↓ next • Enter select/save • Esc cancel", p.width-6))
|
||||||
|
|
||||||
return dialogStyle.Render(sb.String())
|
return dialogStyle.Render(sb.String())
|
||||||
}
|
}
|
||||||
@@ -536,7 +536,7 @@ func (p *PresetPicker) pickerView() string {
|
|||||||
|
|
||||||
sb.WriteString(titleStyle.Render(title))
|
sb.WriteString(titleStyle.Render(title))
|
||||||
sb.WriteString("\n")
|
sb.WriteString("\n")
|
||||||
sb.WriteString(helpDescStyle.Render("Space to toggle • Enter to confirm • Esc to cancel"))
|
sb.WriteString(WrapHelpText("Space to toggle • Enter to confirm • Esc to cancel", p.width-6))
|
||||||
sb.WriteString("\n\n")
|
sb.WriteString("\n\n")
|
||||||
|
|
||||||
filtered := p.getFilteredAliases()
|
filtered := p.getFilteredAliases()
|
||||||
|
|||||||
+64
-33
@@ -2,6 +2,8 @@
|
|||||||
package tui
|
package tui
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"strings"
|
||||||
|
|
||||||
"github.com/charmbracelet/lipgloss"
|
"github.com/charmbracelet/lipgloss"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -35,12 +37,6 @@ var (
|
|||||||
|
|
||||||
disabledStyle = lipgloss.NewStyle().
|
disabledStyle = lipgloss.NewStyle().
|
||||||
Foreground(colorMuted)
|
Foreground(colorMuted)
|
||||||
|
|
||||||
pendingStyle = lipgloss.NewStyle().
|
|
||||||
Foreground(colorWarning)
|
|
||||||
|
|
||||||
errorIndicatorStyle = lipgloss.NewStyle().
|
|
||||||
Foreground(colorError)
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Status bar and help
|
// Status bar and help
|
||||||
@@ -116,35 +112,70 @@ var (
|
|||||||
Padding(0, 1)
|
Padding(0, 1)
|
||||||
)
|
)
|
||||||
|
|
||||||
// Indicator returns the appropriate status indicator string.
|
// WrapHelpText wraps help text to fit within maxWidth, splitting on bullet separators.
|
||||||
func Indicator(enabled bool, pending bool, hasError bool) string {
|
// If maxWidth is 0 or negative, returns the original text.
|
||||||
if hasError {
|
func WrapHelpText(text string, maxWidth int) string {
|
||||||
return errorIndicatorStyle.Render("✗")
|
if maxWidth <= 0 {
|
||||||
}
|
return helpDescStyle.Render(text)
|
||||||
if pending {
|
|
||||||
return pendingStyle.Render("◐")
|
|
||||||
}
|
|
||||||
if enabled {
|
|
||||||
return enabledStyle.Render("●")
|
|
||||||
}
|
|
||||||
return disabledStyle.Render("○")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// StatusText returns the status text with appropriate styling
|
separator := " • "
|
||||||
func StatusText(enabled bool, pending bool, hasError bool) string {
|
parts := splitOnSeparator(text, separator)
|
||||||
if hasError {
|
|
||||||
return errorIndicatorStyle.Render("✗ Error")
|
var lines []string
|
||||||
}
|
var currentLine string
|
||||||
if pending {
|
var currentWidth int
|
||||||
return pendingStyle.Render("◐ Pending")
|
|
||||||
}
|
for i, part := range parts {
|
||||||
if enabled {
|
partWidth := len(part)
|
||||||
return enabledStyle.Render("● Active")
|
sepWidth := 3 // len(" • ")
|
||||||
}
|
|
||||||
return disabledStyle.Render("○ Disabled")
|
newWidth := currentWidth + partWidth
|
||||||
|
if currentWidth > 0 {
|
||||||
|
newWidth += sepWidth
|
||||||
}
|
}
|
||||||
|
|
||||||
// HelpItem formats a help item.
|
if newWidth > maxWidth && currentWidth > 0 {
|
||||||
func HelpItem(key, desc string) string {
|
lines = append(lines, currentLine)
|
||||||
return helpKeyStyle.Render(key) + " " + helpDescStyle.Render(desc)
|
currentLine = part
|
||||||
|
currentWidth = partWidth
|
||||||
|
} else {
|
||||||
|
if currentWidth > 0 {
|
||||||
|
currentLine += separator
|
||||||
|
}
|
||||||
|
currentLine += part
|
||||||
|
if i == 0 {
|
||||||
|
currentWidth = partWidth
|
||||||
|
} else {
|
||||||
|
currentWidth = newWidth
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if currentLine != "" {
|
||||||
|
lines = append(lines, currentLine)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Apply style to each line and join
|
||||||
|
var result []string
|
||||||
|
for _, line := range lines {
|
||||||
|
result = append(result, helpDescStyle.Render(line))
|
||||||
|
}
|
||||||
|
|
||||||
|
return strings.Join(result, "\n")
|
||||||
|
}
|
||||||
|
|
||||||
|
// splitOnSeparator splits a string on the given separator.
|
||||||
|
func splitOnSeparator(s, sep string) []string {
|
||||||
|
var parts []string
|
||||||
|
for {
|
||||||
|
idx := strings.Index(s, sep)
|
||||||
|
if idx == -1 {
|
||||||
|
parts = append(parts, s)
|
||||||
|
break
|
||||||
|
}
|
||||||
|
parts = append(parts, s[:idx])
|
||||||
|
s = s[idx+len(sep):]
|
||||||
|
}
|
||||||
|
return parts
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ func (c *Checker) CheckForUpdate(ctx context.Context) *UpdateInfo {
|
|||||||
|
|
||||||
// fetchLatestRelease fetches the latest release info from GitHub API
|
// fetchLatestRelease fetches the latest release info from GitHub API
|
||||||
func (c *Checker) fetchLatestRelease(ctx context.Context) (*ReleaseInfo, error) {
|
func (c *Checker) fetchLatestRelease(ctx context.Context) (*ReleaseInfo, error) {
|
||||||
|
// #nosec G107 -- URL is constructed from hardcoded constant and validated owner/repo
|
||||||
url := fmt.Sprintf(githubReleasesURL, c.owner, c.repo)
|
url := fmt.Sprintf(githubReleasesURL, c.owner, c.repo)
|
||||||
|
|
||||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
|
||||||
@@ -145,15 +146,9 @@ func parseVersion(v string) []int {
|
|||||||
|
|
||||||
for _, p := range parts {
|
for _, p := range parts {
|
||||||
var num int
|
var num int
|
||||||
fmt.Sscanf(p, "%d", &num)
|
_, _ = fmt.Sscanf(p, "%d", &num) // Error intentionally ignored - non-numeric parts become 0
|
||||||
result = append(result, num)
|
result = append(result, num)
|
||||||
}
|
}
|
||||||
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
// FormatUpdateMessage formats a user-friendly update notification
|
|
||||||
func (u *UpdateInfo) FormatUpdateMessage() string {
|
|
||||||
return fmt.Sprintf("New version available: %s (current: %s) - %s",
|
|
||||||
u.LatestVersion, u.CurrentVersion, u.ReleaseURL)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -76,19 +76,6 @@ func TestIsNewerVersion(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestUpdateInfo_FormatUpdateMessage(t *testing.T) {
|
|
||||||
info := &UpdateInfo{
|
|
||||||
CurrentVersion: "1.0.0",
|
|
||||||
LatestVersion: "1.1.0",
|
|
||||||
ReleaseURL: "https://github.com/lukaszraczylo/lolcathost/releases/tag/v1.1.0",
|
|
||||||
}
|
|
||||||
|
|
||||||
msg := info.FormatUpdateMessage()
|
|
||||||
assert.Contains(t, msg, "1.0.0")
|
|
||||||
assert.Contains(t, msg, "1.1.0")
|
|
||||||
assert.Contains(t, msg, "https://github.com")
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestNewChecker(t *testing.T) {
|
func TestNewChecker(t *testing.T) {
|
||||||
checker := NewChecker("lukaszraczylo", "lolcathost", "v1.0.0")
|
checker := NewChecker("lukaszraczylo", "lolcathost", "v1.0.0")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user