Compare commits

..

3 Commits

Author SHA1 Message Date
Acid 9b59c36974 added db to docker-compose 2026-06-05 17:47:53 -04:00
Acid 031d3006d8 added db connections and ip login 2026-06-05 17:36:41 -04:00
Acid affe71d6dd modified: seed.sql 2026-06-04 23:57:32 -04:00
8 changed files with 107 additions and 31 deletions
+3
View File
@@ -11,3 +11,6 @@ scrap/
*.sqlite3
*.db
init.sql
.prettierignore
.vscode/
query.sql
+8 -1
View File
@@ -1,10 +1,17 @@
FROM golang:alpine AS builder
# go-sqlite3 is a cgo package, so it needs a C toolchain
RUN apk add --no-cache gcc musl-dev
WORKDIR /app
COPY go.mod go.sum ./
COPY *.go ./
RUN go mod download
COPY *.go ./
COPY seed.sql ./
ENV CGO_ENABLED=1
RUN go build -o server .
FROM alpine:latest
+47
View File
@@ -0,0 +1,47 @@
package main
import (
"database/sql"
_ "embed"
"time"
_ "github.com/mattn/go-sqlite3"
)
//go:embed seed.sql
var seedSQL string
// logs level=('debug', 'info', 'warning', 'error')
type logs struct {
level string
ip string
traceback string
date time.Time
}
type dbStruct struct {
db *sql.DB
}
// Seed runs the schema in seed.sql. Idempotent via CREATE TABLE IF NOT EXISTS,
// so it's safe to call on every startup.
func (app *dbStruct) Seed() error {
_, err := app.db.Exec(seedSQL)
return err
}
// InsertLog() : database method, only inserts level + traceback
func (app *dbStruct) InsertLog(lg logs) error {
query := `INSERT INTO logs (level, traceback) VALUES (?, ?)`
_, err := app.db.Exec(query, lg.level, lg.traceback)
return err
}
// LogIp() : database method, logs level + Ip
func (app *dbStruct) LogIp(lg logs) error {
query := `INSERT INTO logs (level, ip) VALUES (?, ?)`
_, err := app.db.Exec(query, lg.level, lg.ip)
return err
}
+4
View File
@@ -1,6 +1,8 @@
services:
website:
env_file: .env
environment:
DB_PATH: /app/data/zum.db
build:
context: .
dockerfile: Dockerfile
@@ -8,4 +10,6 @@ services:
container_name: acidarchon.com
ports:
- 8088:8080
volumes:
- /dockers/acidarchon:/app/data
restart: unless-stopped
+4 -1
View File
@@ -2,4 +2,7 @@ module acidburnmonkey/acidarchon
go 1.26.2
require github.com/joho/godotenv v1.5.1 // indirect
require (
github.com/joho/godotenv v1.5.1
github.com/mattn/go-sqlite3 v1.14.44
)
+2
View File
@@ -1,2 +1,4 @@
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
github.com/mattn/go-sqlite3 v1.14.44 h1:3VSe+xafpbzsLbdr2AWlAZk9yRHiBhTBakioXaCKTF8=
github.com/mattn/go-sqlite3 v1.14.44/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=
+33 -4
View File
@@ -1,6 +1,7 @@
package main
import (
"database/sql"
"encoding/json"
"fmt"
"io"
@@ -11,6 +12,7 @@ import (
"text/template"
"github.com/joho/godotenv"
_ "github.com/mattn/go-sqlite3"
)
type ipResponse struct {
@@ -47,14 +49,32 @@ type TemolateData struct {
}
func main() {
godotenv.Load()
mux := http.NewServeMux()
godotenv.Load()
dbPath := os.Getenv("DB_PATH")
if dbPath == "" {
dbPath = "zum.db"
}
db, err := sql.Open("sqlite3", dbPath)
if err != nil {
slog.Error("err opening db")
return
}
defer db.Close()
database := &dbStruct{db: db}
if err := database.Seed(); err != nil {
slog.Error("seeding db", "err", err)
return
}
// routes
mux.HandleFunc("/", handleRoot)
mux.HandleFunc("/", database.handleRoot)
mux.HandleFunc("/robots.txt", serveRobots)
mux.HandleFunc("/*", handleRoot)
mux.HandleFunc("/*", database.handleRoot)
mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
@@ -63,10 +83,15 @@ func main() {
}
// Routes
func handleRoot(w http.ResponseWriter, r *http.Request) {
// handleRoot() : part of dbStruct
func (app *dbStruct) handleRoot(w http.ResponseWriter, r *http.Request) {
templ, err := template.ParseFiles("templates/home.html")
if err != nil {
http.Error(w, "template not found", http.StatusInternalServerError)
if logErr := app.InsertLog(logs{level: "error", traceback: "template not found"}); logErr != nil {
slog.Error("failed to write log", "err", logErr)
}
return
}
@@ -84,6 +109,10 @@ func handleRoot(w http.ResponseWriter, r *http.Request) {
dox := callApi(host)
dox2 := secondApi(host)
if logErr := app.LogIp(logs{level: "info", ip: dox.IP}); logErr != nil {
slog.Error("failed to write log", "err", logErr)
}
templ.Execute(w, TemolateData{Ip: dox, IP2: *dox2})
}
+6 -25
View File
@@ -1,26 +1,7 @@
--@BLOCK
-- Levels table (lookup/reference table)
CREATE TABLE levels (
id SERIAL PRIMARY KEY,
name VARCHAR(255) NOT NULL
);
-- Insert the 4 level types
INSERT INTO levels (name) VALUES
('debug'),
('info'),
('warning'),
('error');
-- Create table
CREATE TABLE logs(
id SERIAL PRIMARY KEY,
level_id VARCHAR(255) NOT NULL,
ip VARCHAR(255),
date timestamp,
repeating INT,
FOREIGN KEY (level_id) REFERENCES levels(id)
CREATE TABLE IF NOT EXISTS logs (
id INTEGER PRIMARY KEY AUTOINCREMENT,
level TEXT NOT NULL CHECK(level IN ('debug', 'info', 'warning', 'error')),
ip TEXT,
traceback TEXT,
date DATETIME DEFAULT (datetime('now', 'localtime'))
);