Compare commits

...
59 Commits
Author SHA1 Message Date
lukaszraczyloandGitHub 4b3c89860b Update go.mod and go.sum (#45) 2026-08-03 07:00:09 +01:00
lukaszraczyloandGitHub 693e72b21a Update go.mod and go.sum (#44) 2026-07-24 06:37:57 +01:00
lukaszraczyloandGitHub f05feed5dd Update go.mod and go.sum (#43) 2026-07-17 06:29:48 +01:00
lukaszraczyloandGitHub 7ed6ebbd03 Update go.mod and go.sum (#42) 2026-07-09 05:17:35 +01:00
lukaszraczyloandGitHub 276437fc58 Update go.mod and go.sum (#41) 2026-07-07 05:18:55 +01:00
lukaszraczyloandGitHub 538d6daf57 Update go.mod and go.sum (#40) 2026-06-09 05:22:29 +01:00
lukaszraczyloandGitHub 1e697c527f Update go.mod and go.sum (#39) 2026-05-31 05:27:40 +01:00
lukaszraczyloandGitHub 765150d70f Update go.mod and go.sum (#38) 2026-05-30 05:19:36 +01:00
lukaszraczyloandGitHub 190a30f46f Update go.mod and go.sum (#37) 2026-05-23 05:14:26 +01:00
lukaszraczyloandGitHub 7df420f77a Update go.mod and go.sum (#36) 2026-05-22 05:25:00 +01:00
lukaszraczyloandGitHub af378eee42 Update go.mod and go.sum (#35) 2026-05-21 05:27:34 +01:00
lukaszraczylo e8f30bae2c docs: add Telemetry section linking to oss-telemetry opt-out docs
Discloses the single anonymous adoption ping sent on startup and points
users to the upstream README section for full opt-out instructions
instead of duplicating the table here.
2026-05-21 04:06:34 +01:00
lukaszraczylo a2970a58df feat: anonymous usage telemetry via oss-telemetry
Send a single fire-and-forget ping at startup to help track adoption
and version spread. No persistent identifiers are collected.

Opt out via any of:
  DO_NOT_TRACK=1
  OSS_TELEMETRY_DISABLED=1
  LOLCATHOST_DISABLE_TELEMETRY=1
2026-05-21 03:05:06 +01:00
lukaszraczyloandGitHub a791fe688d Update go.mod and go.sum (#34) 2026-05-09 05:06:48 +01:00
lukaszraczyloandGitHub 918db31fb2 Update go.mod and go.sum (#33) 2026-05-05 05:01:35 +01:00
lukaszraczyloandGitHub dfbc6d9fb3 Update go.mod and go.sum (#32) 2026-04-30 05:12:31 +01:00
lukaszraczyloandGitHub 4a592b31df Update go.mod and go.sum (#31) 2026-04-27 05:10:21 +01:00
lukaszraczyloandGitHub dae4d893e5 Update go.mod and go.sum (#30) 2026-04-14 04:59:52 +01:00
lukaszraczyloandGitHub df82bddac5 Update go.mod and go.sum (#29) 2026-04-10 04:59:04 +01:00
lukaszraczyloandGitHub 04f51fb2a9 Update go.mod and go.sum (#28) 2026-04-09 04:54:52 +01:00
lukaszraczyloandGitHub e005c0457c Update go.mod and go.sum (#27) 2026-04-03 04:53:34 +01:00
lukaszraczyloandGitHub 8f56df9a8d Update go.mod and go.sum (#26) 2026-03-29 04:57:32 +01:00
lukaszraczyloandGitHub 6a2394a598 Update go.mod and go.sum (#25) 2026-03-12 03:45:07 +00:00
lukaszraczyloandGitHub 3c18f25a82 Update go.mod and go.sum (#24) 2026-03-10 03:43:17 +00:00
lukaszraczyloandGitHub 0c97ee1a58 Update go.mod and go.sum (#23) 2026-03-09 03:45:32 +00:00
lukaszraczyloandGitHub f1d232a9a6 Update go.mod and go.sum (#22) 2026-03-08 03:44:15 +00:00
lukaszraczyloandGitHub aa414bc2b3 Update go.mod and go.sum (#21) 2026-02-23 03:48:51 +00:00
lukaszraczyloandGitHub 62c844b22c Update go.mod and go.sum (#20) 2026-02-18 03:48:14 +00:00
lukaszraczyloandGitHub c6e1207901 Update go.mod and go.sum (#19) 2026-02-17 03:46:48 +00:00
lukaszraczyloandGitHub 9551b89082 Update go.mod and go.sum (#18) 2026-02-13 03:49:15 +00:00
lukaszraczyloandGitHub 4b808599ac Update go.mod and go.sum (#17) 2026-02-11 03:55:02 +00:00
lukaszraczyloandGitHub a2ec16d3ef Update go.mod and go.sum (#16) 2026-02-10 03:56:34 +00:00
lukaszraczyloandGitHub dc3a22c7bc Update go.mod and go.sum (#15) 2026-02-09 03:51:38 +00:00
lukaszraczyloandGitHub 3643ec6a09 Update go.mod and go.sum (#14) 2026-02-05 03:45:17 +00:00
lukaszraczyloandGitHub 2f1b5c166a Update go.mod and go.sum (#13) 2026-02-04 03:44:57 +00:00
lukaszraczyloandGitHub 7ce331182e Update go.mod and go.sum (#12) 2026-02-02 03:49:39 +00:00
lukaszraczyloandGitHub 56518210b1 Update go.mod and go.sum (#11) 2026-01-26 03:35:33 +00:00
lukaszraczyloandGitHub bcf7c0a8a8 Update go.mod and go.sum (#10) 2026-01-25 03:33:28 +00:00
lukaszraczyloandGitHub 2cdd684842 Update go.mod and go.sum (#9) 2026-01-19 03:30:59 +00:00
lukaszraczyloandGitHub 189137ede8 Update go.mod and go.sum (#8) 2026-01-16 03:29:19 +00:00
lukaszraczyloandGitHub d4cff2028e Update go.mod and go.sum (#7) 2026-01-12 03:31:07 +00:00
lukaszraczyloandGitHub 42098eb1c9 Update go.mod and go.sum (#6) 2026-01-10 03:28:19 +00:00
lukaszraczyloandGitHub ad24598036 Update go.mod and go.sum (#5) 2026-01-09 03:29:40 +00:00
lukaszraczyloandGitHub 977e766ff9 Update go.mod and go.sum (#4) 2025-12-15 03:29:37 +00:00
lukaszraczylo 0a47ea7e2a fixup! Cleanup, signing and update of internals. 2025-12-15 00:35:54 +00:00
lukaszraczylo 100251b896 Cleanup, signing and update of internals. 2025-12-15 00:32:53 +00:00
lukaszraczyloandGitHub 2d9c28657b Update go.mod and go.sum (#3) 2025-12-12 03:28:24 +00:00
lukaszraczyloandGitHub a8acb2d480 Update go.mod and go.sum (#2) 2025-12-09 03:25:21 +00:00
lukaszraczyloandGitHub 29263dc8a2 gosec govulncheck runs (#1)
* gosec govulncheck runs

* Fix flaky TestRateLimiter_Matrix test

The test was failing due to two issues:
1. Test name generation used invalid character conversion (string(rune('0'+limit)))
   which produced non-printable characters for limits >= 10
2. Using 10ms windows with 100 requests caused race conditions - early requests
   would expire before all 100 were made, allowing the 101st request

Changed to use struct-based test cases with proper fmt.Sprintf naming and
a consistent 1-second window that won't expire during rapid test execution.
2025-12-09 01:07:16 +00:00
lukaszraczylo 27d5011ab1 fix: remove unnecessary verified parameter from homebrew cask
The verified parameter is only needed when the URL domain differs
from the homepage domain. Since both point to github.com, Homebrew
audit flags this as unnecessary.
2025-12-08 02:08:00 +00:00
lukaszraczylo 51119b3694 Use shared PR workflow 2025-12-08 01:31:55 +00:00
lukaszraczylo 1b66f4c6f9 Trigger autoupdater 2025-12-08 01:11:32 +00:00
lukaszraczylo 8c022fa0d2 fixup! fixup! Move to casks. 2025-12-07 15:53:46 +00:00
lukaszraczylo 5d8c72d75f fixup! Move to casks. 2025-12-07 14:58:25 +00:00
lukaszraczylo 2a6f0ee244 Move to casks. 2025-12-07 14:49:14 +00:00
lukaszraczylo 99f215cb7c Move build and release to shared workflow 2025-12-07 13:33:46 +00:00
lukaszraczylo 6eb634bfd0 Move to shared workflows. 2025-12-07 13:25:56 +00:00
lukaszraczylo 4bf0dd2cdf Update the autoupdate workflow 2025-12-07 12:36:24 +00:00
lukaszraczylo 70ac227613 Update autoupdate workflow. LOL. 2025-12-03 00:47:35 +00:00
28 changed files with 547 additions and 626 deletions
+8 -50
View File
@@ -1,61 +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: permissions:
contents: write contents: write
actions: 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: Configure git safe directory
run: git config --global --add safe.directory /__w/lolcathost/lolcathost
- name: Commit changes
id: auto-commit
uses: stefanzweifel/git-auto-commit-action@v5
with:
commit_message: "Update go.mod and go.sum"
file_pattern: "go.mod go.sum"
- name: Trigger release workflow
if: steps.auto-commit.outputs.changes_detected == 'true'
run: gh workflow run release.yml
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+22
View File
@@ -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"
+7 -75
View File
@@ -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 }}
+2
View File
@@ -1,2 +1,4 @@
CLAUDE.md CLAUDE.md
build build
coverage.out
coverage.html
+22 -6
View File
@@ -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: homebrew-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
+32 -2
View File
@@ -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/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:
@@ -319,6 +337,18 @@ internal/
version/ - Update checker version/ - Update checker
``` ```
## Telemetry
On startup this binary sends a single anonymous adoption ping — project name,
version, timestamp; no identifiers, no command output, no payload contents.
Fire-and-forget with a 2-second timeout; cannot block startup or panic.
See **[oss-telemetry — Disabling telemetry](https://github.com/lukaszraczylo/oss-telemetry#disabling-telemetry)**
for the exact wire format, source, and full opt-out documentation.
Quick opt-out: set any of `DO_NOT_TRACK=1`, `OSS_TELEMETRY_DISABLED=1`,
or `LOLCATHOST_DISABLE_TELEMETRY=1`.
## License ## License
MIT License - see [LICENSE](LICENSE). MIT License - see [LICENSE](LICENSE).
+4 -1
View File
@@ -16,6 +16,7 @@ import (
"github.com/lukaszraczylo/lolcathost/internal/protocol" "github.com/lukaszraczylo/lolcathost/internal/protocol"
"github.com/lukaszraczylo/lolcathost/internal/tui" "github.com/lukaszraczylo/lolcathost/internal/tui"
"github.com/lukaszraczylo/lolcathost/internal/version" "github.com/lukaszraczylo/lolcathost/internal/version"
telemetry "github.com/lukaszraczylo/oss-telemetry"
) )
// version is set at compile time via ldflags // version is set at compile time via ldflags
@@ -27,6 +28,8 @@ const (
) )
func main() { func main() {
telemetry.Send("lolcathost", appVersion)
// Flags // Flags
daemonMode := flag.Bool("daemon", false, "Run as daemon (called by LaunchDaemon/systemd)") daemonMode := flag.Bool("daemon", false, "Run as daemon (called by LaunchDaemon/systemd)")
installFlag := flag.Bool("install", false, "Install the daemon service (requires sudo)") installFlag := flag.Bool("install", false, "Install the daemon service (requires sudo)")
@@ -204,7 +207,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
View File
@@ -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/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">
+14 -14
View File
@@ -1,38 +1,38 @@
module github.com/lukaszraczylo/lolcathost module github.com/lukaszraczylo/lolcathost
go 1.24.2 go 1.25.0
require ( require (
github.com/charmbracelet/bubbles v0.21.0 github.com/charmbracelet/bubbles v1.0.0
github.com/charmbracelet/bubbletea v1.3.10 github.com/charmbracelet/bubbletea v1.3.10
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.10.1
github.com/lukaszraczylo/oss-telemetry v0.2.3
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.47.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.3 // indirect
github.com/charmbracelet/x/ansi v0.11.2 // indirect github.com/charmbracelet/x/ansi v0.11.7 // indirect
github.com/charmbracelet/x/cellbuf v0.0.14 // indirect github.com/charmbracelet/x/cellbuf v0.0.15 // 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.1 // indirect github.com/clipperhouse/displaywidth v0.11.0 // indirect
github.com/clipperhouse/stringish v0.1.1 // indirect github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
github.com/clipperhouse/uax29/v2 v2.3.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.4.1 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-isatty v0.0.24 // indirect
github.com/mattn/go-localereader v0.0.1 // indirect github.com/mattn/go-localereader v0.0.1 // indirect
github.com/mattn/go-runewidth v0.0.19 // indirect github.com/mattn/go-runewidth v0.0.27 // indirect
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/termenv v0.16.0 // indirect github.com/muesli/termenv v0.16.0 // indirect
github.com/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.40.0 // indirect
) )
+28 -29
View File
@@ -2,44 +2,44 @@ github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k= github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8= github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWpi6yML8= github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY=
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA= github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
github.com/charmbracelet/bubbles v0.21.0 h1:9TdC97SdRVg/1aaXNVWfFH3nnLAwOXr8Fn6u6mfQdFs= github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
github.com/charmbracelet/bubbles v0.21.0/go.mod h1:HF+v6QUR4HkEpz62dx7ym2xc71/KBHg+zKwJtMw+qtg= github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
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.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
github.com/charmbracelet/colorprofile v0.3.3/go.mod h1:nB1FugsAbzq284eJcjfah2nhdSLppN2NqvfotkfRYP4= github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
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.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg= github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
github.com/charmbracelet/x/cellbuf v0.0.14 h1:iUEMryGyFTelKW3THW4+FfPgi4fkmKnnaLOXuc+/Kj4= github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
github.com/charmbracelet/x/cellbuf v0.0.14/go.mod h1:P447lJl49ywBbil/KjCk2HexGh4tEY9LH0/1QrZZ9rA= github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
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.1 h1:/zMlAezfDzT2xy6acHBzwIfyu2ic0hgkT83UX5EY2gY= github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
github.com/clipperhouse/displaywidth v0.6.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o= github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs= github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA= github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
github.com/clipperhouse/uax29/v2 v2.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4=
github.com/clipperhouse/uax29/v2 v2.3.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=
github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM= github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= github.com/fsnotify/fsnotify v1.10.1 h1:b0/UzAf9yR5rhf3RPm9gf3ehBPpf0oZKIjtpKrx59Ho=
github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/fsnotify/fsnotify v1.10.1/go.mod h1:TLheqan6HD6GBK6PrDWyDPBaEV8LspOxvPSjC+bVfgo=
github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag= github.com/lucasb-eyer/go-colorful v1.4.1 h1:1EO+WB73+EH8EVbzlrG3KLAfEypQWVHIBqlTf+2hNss=
github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= github.com/lucasb-eyer/go-colorful v1.4.1/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/lukaszraczylo/oss-telemetry v0.2.3 h1:xoDtBqeZGmXj7IteiE1M5WMuzeoqag58qEleI0Cf2Ms=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/lukaszraczylo/oss-telemetry v0.2.3/go.mod h1:+Cn78qZo8rc3T9eZt0v3oICYRdd75wORtSidc8lNjDQ=
github.com/mattn/go-isatty v0.0.24 h1:tGZZoVgT/KiqK1c8ocVLeDS8BSWMRd47J3Lbz7vsReI=
github.com/mattn/go-isatty v0.0.24/go.mod h1:nMCL3Zebbrt45jsMDgnfIwz6ydEQApk5oEI3HqDio6A=
github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4= github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88= github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw= github.com/mattn/go-runewidth v0.0.27 h1:Feg/Oou5zI/wnpgDF6omIU0OokC9GxLC/WRknhVlIR0=
github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mattn/go-runewidth v0.0.27/go.mod h1:3qAiGCV4Koz/yuveO58qUefmUTRm8r0IGEXZ9jeHp/8=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo= github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA= github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -57,11 +57,10 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJu
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
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.47.0 h1:o7XGOvZQCADBQQ4Y7VNq2dRWQR7JmOUW8Kxx4ZsNgWs=
golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= golang.org/x/sys v0.47.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/text v0.40.0 h1:Ub2Z6/xjgF1WrYQz2nuITOEegKFtiIy+rieRJ5lHZKs=
golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM= golang.org/x/text v0.40.0/go.mod h1:hpnzDAfGV753zIKo+wk3u1bVKCGPbrnF7+7LBF/UHVY=
golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
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=
+2 -21
View File
@@ -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
}
-26
View File
@@ -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
View File
@@ -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)
} }
-71
View File
@@ -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{}}
+1 -6
View File
@@ -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()
+1 -1
View File
@@ -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
View File
@@ -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)
} }
+68 -21
View File
@@ -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 {
+7 -1
View File
@@ -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
View File
@@ -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
}
+18 -12
View File
@@ -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
View File
@@ -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
}
+2 -2
View File
@@ -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{}),
@@ -754,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),
} }
+25 -20
View File
@@ -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)
} }
+3 -8
View File
@@ -354,7 +354,7 @@ 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 { } else {
// Always update the list, even if entries is nil/empty // Always update the list, even if entries is nil/empty
m.list.SetItems(msg.entries) m.list.SetItems(msg.entries)
@@ -603,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
@@ -678,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),
@@ -1136,11 +1136,6 @@ func (m *Model) confirmDeleteView() string {
return dialogStyle.Render(sb.String()) return dialogStyle.Render(sb.String())
} }
// Run starts the TUI application.
func Run(socketPath string) error {
return RunWithVersion(socketPath, "dev", "", "")
}
// RunWithVersion starts the TUI application with version info for update checking. // RunWithVersion starts the TUI application with version info for update checking.
func RunWithVersion(socketPath, version, githubOwner, githubRepo string) error { func RunWithVersion(socketPath, version, githubOwner, githubRepo string) error {
m := NewModel(socketPath) m := NewModel(socketPath)
-34
View File
@@ -37,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
@@ -118,34 +112,6 @@ var (
Padding(0, 1) Padding(0, 1)
) )
// Indicator returns the appropriate status indicator string.
func Indicator(enabled bool, pending bool, hasError bool) string {
if hasError {
return errorIndicatorStyle.Render("✗")
}
if pending {
return pendingStyle.Render("◐")
}
if enabled {
return enabledStyle.Render("●")
}
return disabledStyle.Render("○")
}
// StatusText returns the status text with appropriate styling
func StatusText(enabled bool, pending bool, hasError bool) string {
if hasError {
return errorIndicatorStyle.Render("✗ Error")
}
if pending {
return pendingStyle.Render("◐ Pending")
}
if enabled {
return enabledStyle.Render("● Active")
}
return disabledStyle.Render("○ Disabled")
}
// WrapHelpText wraps help text to fit within maxWidth, splitting on bullet separators. // WrapHelpText wraps help text to fit within maxWidth, splitting on bullet separators.
// If maxWidth is 0 or negative, returns the original text. // If maxWidth is 0 or negative, returns the original text.
func WrapHelpText(text string, maxWidth int) string { func WrapHelpText(text string, maxWidth int) string {
+2 -7
View File
@@ -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)
}
-13
View File
@@ -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")