x/iphistory
1
0
Fork 0
mirror of https://github.com/skidoodle/iphistory.git synced 2026-04-27 23:37:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fixed some stuff

Browse Source
This commit is contained in:
albert
2026-01-10 21:00:32 +01:00
parent 43c6e90649
commit 9c8f6c42a9
7 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/go.yml
+5 -1
View File
@@ -16,6 +16,10 @@ jobs:
uses: actions/setup-go@v4
with:
go-version: "1.25.4"
cache: true
- name: Generate
run: go generate ./...
- name: Build
run: go build -v ./...
run: go build -v .
Dockerfile
+10 -7
View File
@@ -1,13 +1,16 @@
FROM golang:alpine as builder
WORKDIR /build
RUN go install github.com/a-h/templ/cmd/templ@latest
COPY . .
RUN templ generate
RUN go build -o iphistory .
FROM ghcr.io/a-h/templ:latest AS generate-stage
COPY . /app
WORKDIR /app
RUN ["templ", "generate"]
FROM golang:alpine AS build-stage
WORKDIR /app
COPY --from=generate-stage /app /app
RUN CGO_ENABLED=0 go build -o iphistory .
FROM alpine:latest
RUN apk --no-cache add ca-certificates
WORKDIR /app/
COPY --from=builder /build/iphistory .
COPY --from=build-stage /app/iphistory .
EXPOSE 8080
CMD ["./iphistory"]
assets/htmx.min.js
Vendored
+1
View File
File diff suppressed because one or more lines are too long
go.mod
+13
View File
@@ -9,14 +9,27 @@ require (
)
require (
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e // indirect
github.com/andybalholm/brotli v1.1.0 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cli/browser v1.3.0 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/natefinch/atomic v1.0.1 // indirect
github.com/ncruces/go-strftime v0.1.9 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/net v0.43.0 // indirect
golang.org/x/sys v0.36.0 // indirect
golang.org/x/tools v0.36.0 // indirect
modernc.org/libc v1.66.10 // indirect
modernc.org/mathutil v1.7.1 // indirect
modernc.org/memory v1.11.0 // indirect
)
tool github.com/a-h/templ/cmd/templ
go.sum
+20
View File
@@ -1,15 +1,32 @@
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e h1:HjVbSQHy+dnlS6C3XajZ69NYAb5jbGNfHanvm1+iYlo=
github.com/a-h/parse v0.0.0-20250122154542-74294addb73e/go.mod h1:3mnrkvGpurZ4ZrTDbYU84xhwXW2TjTKShSwjRi2ihfQ=
github.com/a-h/templ v0.3.977 h1:kiKAPXTZE2Iaf8JbtM21r54A8bCNsncrfnokZZSrSDg=
github.com/a-h/templ v0.3.977/go.mod h1:oCZcnKRf5jjsGpf2yELzQfodLphd2mwecwG4Crk5HBo=
github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/cli/browser v1.3.0 h1:LejqCrpWr+1pRqmEPDGnTZOjsMe7sehifLynZJuqJpo=
github.com/cli/browser v1.3.0/go.mod h1:HH8s+fOAxjhQoBUAsKuPCbqUuxZDhQ2/aD+SzsEfBTk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e h1:ijClszYn+mADRFY17kjQEVQ1XRhq2/JR1M3sGqeJoxs=
github.com/google/pprof v0.0.0-20250317173921-a4b03ec1a45e/go.mod h1:boTsfXsheKC2y+lKOCMpSfarhxDeIzfZG1jqGcPl3cA=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/natefinch/atomic v1.0.1 h1:ZPYKxkqQOx3KZ+RsbnP/YsgvxWQPGxjC0oBt2AhwV0A=
github.com/natefinch/atomic v1.0.1/go.mod h1:N/D/ELrljoqDyT3rZrsUmtsuzvHkeB/wWjHV22AZRbM=
github.com/ncruces/go-strftime v0.1.9 h1:bY0MQC28UADQmHmaF5dgpLmImcShSi2kHU9XLdhx/f4=
github.com/ncruces/go-strftime v0.1.9/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE=
@@ -18,8 +35,11 @@ golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b h1:M2rDM6z3Fhozi9O7NWsxAkg/y
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b/go.mod h1:3//PLf8L/X+8b4vuAfHzxeRUl04Adcb341+IGKfnqS8=
golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
golang.org/x/net v0.43.0 h1:lat02VYK2j4aLzMzecihNvTlJNQUq316m2Mr9rnM6YE=
golang.org/x/net v0.43.0/go.mod h1:vhO1fvI4dGsIjh73sWfUVjj3N7CA9WkKJNQm2svM6Jg=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k=
golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
main.go
+12 -6
View File
@@ -2,6 +2,7 @@ package main
import (
"context"
"embed"
"errors"
"log/slog"
"net"
@@ -16,7 +17,10 @@ import (
"golang.org/x/sync/errgroup"
)
//go:generate templ generate
//go:generate go tool templ generate
//go:embed assets/*
var assetsFS embed.FS
func main() {
logger := slog.New(slog.NewTextHandler(os.Stdout, nil))
@@ -43,18 +47,20 @@ func main() {
}
providers := []provider{
{server: "8.8.8.8:53", host: "o-o.myaddr.l.google.com", isTXT: true},
{server: "208.67.222.222:53", host: "myip.opendns.com", isTXT: false},
{server: "216.239.32.10:53", host: "o-o.myaddr.l.google.com", isTXT: true}, // ns1.google.com
{server: "193.108.88.1:53", host: "whoami.akamai.net", isTXT: false}, // ns1-1.akamaitech.net
{server: "208.67.222.222:53", host: "myip.opendns.com", isTXT: false}, // resolver1.opendns.com
}
for {
var detectedIP string
for _, p := range providers {
resolver := &net.Resolver{
PreferGo: true,
Dial: func(ctx context.Context, network, address string) (net.Conn, error) {
d := net.Dialer{Timeout: 5 * time.Second}
return d.DialContext(ctx, "udp", p.server)
return d.DialContext(ctx, "udp4", p.server)
},
}
@@ -71,7 +77,7 @@ func main() {
}
}
if ip := net.ParseIP(raw); ip != nil {
if ip := net.ParseIP(raw); ip != nil && ip.To4() != nil {
detectedIP = ip.String()
break
}
@@ -97,6 +103,7 @@ func main() {
})
mux := http.NewServeMux()
mux.Handle("GET /assets/", http.FileServer(http.FS(assetsFS)))
mux.HandleFunc("GET /{$}", handleList(store, logger))
mux.HandleFunc("GET /p/{page}", handleList(store, logger))
@@ -137,7 +144,6 @@ func handleList(store *Store, logger *slog.Logger) http.HandlerFunc {
records, hasMore, err := store.FetchPage(query, page, 50)
if err != nil {
slog.Error("DB Error", "err", err)
http.Error(w, "Internal Error", 500)
return
}
ui.templ
+3 -3
View File
@@ -20,13 +20,13 @@ templ MainContent(records []Record, query string, page int, hasMore bool) {
<div style="font-size: 0.75rem; color: var(--text-muted); margin-bottom: 0.5rem;">Current Public IP</div>
<div class="ip-display">{ records[0].IP }</div>
<div style="font-size: 0.75rem; color: var(--text-muted); margin-top: 0.5rem;">
Last observed: { records[0].Timestamp.Format("Jan 02, 15:04:05 MST") }
{ records[0].Timestamp.Format("Jan 02, 15:04:05 MST") }
</div>
</section>
}
<table class="history-table">
<thead>
<tr><th>Timestamp</th><th>Observed IP</th></tr>
<tr><th>Timestamp</th><th>IP Address</th></tr>
</thead>
<tbody>
for _, r := range records {
@@ -73,7 +73,7 @@ templ Page(records []Record, query string, page int, hasMore bool) {
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<title>IP History</title>
<link rel="icon" href="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"/>
<script src="https://unpkg.com/htmx.org@1.9.10"></script>
<script src="/assets/htmx.min.js"></script>
<style>
:root { --bg: #0a0a0c; --card: #16161a; --border: #2d2d33; --text: #ececed; --text-muted: #94949e; --primary: #3b82f6; }
html { scrollbar-gutter: stable; overflow-y: auto; }