- {#if rows.length > 0}
-
+ {#if logs && logs.length > 0}
+
{row.Started}
@@ -49,6 +41,8 @@
{:else}
No Logs yet!
- TODO: Link to docs on how to point your router at this server
+
+ TODO: Link to docs on how to point your router at this server
+
{/if}
diff --git a/client/src/components/RulesViewer.svelte b/client/src/components/RulesViewer.svelte
index ba105eb..be84a07 100644
--- a/client/src/components/RulesViewer.svelte
+++ b/client/src/components/RulesViewer.svelte
@@ -1,8 +1,8 @@
@@ -55,17 +46,16 @@
Search
-
+
-
-
+
+
diff --git a/client/src/components/TimeChart.svelte b/client/src/components/TimeChart.svelte
index bcce490..81480f6 100644
--- a/client/src/components/TimeChart.svelte
+++ b/client/src/components/TimeChart.svelte
@@ -1,45 +1,22 @@
-
-
+
diff --git a/client/src/main.ts b/client/src/main.ts
index 83bc6ab..958384c 100644
--- a/client/src/main.ts
+++ b/client/src/main.ts
@@ -4,4 +4,5 @@ const app = new App({
target: document.body,
});
+
export default app;
diff --git a/client/src/routes/Home.svelte b/client/src/routes/Home.svelte
index 9893f93..fea4be6 100644
--- a/client/src/routes/Home.svelte
+++ b/client/src/routes/Home.svelte
@@ -1,19 +1,128 @@
-
-
-
+
+
+ {#if chartDataLoading}
+ Loading chart
+ {:else if chartErrorMsg}
+ {chartErrorMsg}
+ {:else}
+
+ {/if}
-
+ {#if logDataLoading}
+ Loading logs
+ {:else if logErrorMsg}
+ {logErrorMsg}
+ {:else}
+
+ {/if}
diff --git a/client/src/routes/PageContainer.svelte b/client/src/routes/PageContainer.svelte
index 711be70..6eb6c02 100644
--- a/client/src/routes/PageContainer.svelte
+++ b/client/src/routes/PageContainer.svelte
@@ -1,7 +1,12 @@
diff --git a/client/src/routes/Recursors.svelte b/client/src/routes/Recursors.svelte
index 9bdb5f4..c91874b 100644
--- a/client/src/routes/Recursors.svelte
+++ b/client/src/routes/Recursors.svelte
@@ -3,8 +3,8 @@
import { onMount } from "svelte";
import { Column, Row, Table } from "sveltestrap";
- import { getRecursors } from "../api/recursors";
- import type { Recursor } from "../api/recursors";
+ import { getRecursors } from "../api";
+ import type { Recursor } from "../api";
let rows: Recursor[] = [];
onMount(async () => {
diff --git a/client/tsconfig.json b/client/tsconfig.json
index b082e96..2bfc0ea 100644
--- a/client/tsconfig.json
+++ b/client/tsconfig.json
@@ -1,6 +1,6 @@
{
"extends": "@tsconfig/svelte/tsconfig.json",
-
+ "types": ["node"],
"include": ["src/**/*"],
"exclude": ["node_modules/*", "__sapper__/*", "public/*"]
-}
\ No newline at end of file
+}
diff --git a/go.mod b/go.mod
index b3769ee..9c22c8b 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/adamveld12/gopherhole
-go 1.15
+go 1.16
require (
github.com/go-chi/chi v1.5.4
diff --git a/gopherhole b/gopherhole
deleted file mode 100755
index 33d74d1..0000000
Binary files a/gopherhole and /dev/null differ
diff --git a/internal/http.go b/internal/http.go
index 58a2d10..54d2f7c 100644
--- a/internal/http.go
+++ b/internal/http.go
@@ -1,8 +1,10 @@
package internal
import (
+ "io/fs"
"log"
"net/http"
+ "os"
"runtime"
"time"
@@ -26,7 +28,7 @@ type adminHandler struct {
h http.Handler
}
-func NewAdminHandler(c Cache, s Storage, re *RuleEngine) http.Handler {
+func NewAdminHandler(c Cache, s Storage, re *RuleEngine, content fs.FS) http.Handler {
handler := chi.NewRouter()
a := &adminHandler{
@@ -39,20 +41,34 @@ func NewAdminHandler(c Cache, s Storage, re *RuleEngine) http.Handler {
handler.Use(middleware.RequestID)
handler.Use(middleware.RealIP)
handler.Use(middleware.Logger)
- handler.Use(middleware.AllowContentType("application/json; utf-8", "application/json"))
+ handler.Use(middleware.Recoverer)
handler.Use(middleware.Timeout(time.Second * 5))
+ // TODO: smarter way https://github.com/go-chi/chi/issues/403
- handler.Use(cors.Handler(cors.Options{
- AllowedOrigins: []string{"http://*", "https://*"},
- AllowedMethods: []string{"GET", "PUT", "DELETE", "POST", "OPTIONS"},
- AllowedHeaders: []string{"Content-Type", "Accept"},
- AllowCredentials: false,
- MaxAge: 300,
- }))
+ // handler.Handle("/build/", http.StripPrefix("/build/", http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+ // file, err := content.Open(fmt.Sprintf("client/public/build/%s", r.URL.Path))
+ // if err != nil {
+ // rw.WriteHeader(http.StatusNotFound)
+ // return
+ // }
+ // defer file.Close()
- handler.Use(middleware.Recoverer)
+ // if _, err := io.Copy(rw, file); err != nil {
+ // rw.WriteHeader(http.StatusInternalServerError)
+ // return
+ // }
+
+ // })))
handler.Route("/api/v1", func(r chi.Router) {
+ r.Use(middleware.AllowContentType("application/json; utf-8", "application/json"))
+ r.Use(cors.Handler(cors.Options{
+ AllowedOrigins: []string{"http://*", "https://*"},
+ AllowedMethods: []string{"GET", "PUT", "DELETE", "POST", "OPTIONS"},
+ AllowedHeaders: []string{"Content-Type", "Accept"},
+ AllowCredentials: false,
+ MaxAge: 300,
+ }))
r.Get("/metrics/log", RestHandler(a.getLog).ToHF())
r.Get("/metrics/stats", RestHandler(a.getStats).ToHF())
@@ -79,6 +95,23 @@ func NewAdminHandler(c Cache, s Storage, re *RuleEngine) http.Handler {
r.HandleFunc("/signal", a.signal)
})
+ fs := http.FS(content)
+ httpFileServer := http.FileServer(fs)
+ handler.Handle("/*", http.StripPrefix("/", http.HandlerFunc(func(rw http.ResponseWriter, r *http.Request) {
+ f, err := content.Open(r.URL.Path)
+ if os.IsNotExist(err) {
+ r.URL.Path = "/"
+ }
+
+ if err == nil {
+ f.Close()
+ }
+
+ log.Printf("%s - err: %v", r.URL.Path, err)
+
+ httpFileServer.ServeHTTP(rw, r)
+ })))
+
return a
}
diff --git a/internal/sqlite.go b/internal/sqlite.go
index e6128fa..c862fa3 100644
--- a/internal/sqlite.go
+++ b/internal/sqlite.go
@@ -51,7 +51,7 @@ func (ss *Sqlite) GetRecursors() ([]RecursorRow, error) {
defer rows.Close()
- var results []RecursorRow
+ results := []RecursorRow{}
for rows.Next() {
var row RecursorRow
diff --git a/main.go b/main.go
index 5d83cda..7c4c7e4 100644
--- a/main.go
+++ b/main.go
@@ -10,6 +10,7 @@ import (
"strings"
"time"
+ "github.com/adamveld12/gopherhole/client/public"
"github.com/adamveld12/gopherhole/internal"
"github.com/miekg/dns"
)
@@ -19,6 +20,7 @@ var (
// dbPath = flag.String("db-path", ".", "Directory to write database files to")
// httpAddr = flag.String("http-address", ":8080", "Bind address for http server")
// dnsAddr = flag.String("dns-address", ":53", "Bind address for dns server")
+
)
func main() {
@@ -69,7 +71,7 @@ func main() {
}
}()
- httpApi := internal.NewAdminHandler(cache, store, re)
+ httpApi := internal.NewAdminHandler(cache, store, re, public.Assets)
if err := http.ListenAndServe(conf.HTTPAddr, httpApi); err != nil {
log.Fatal(err)
}
diff --git a/makefile b/makefile
index fa7bd6a..3a69e4c 100644
--- a/makefile
+++ b/makefile
@@ -1,17 +1,16 @@
+build: clobber .bin/client/public .bin/gopherhole
+
dev: clean .bin/gopherhole .bin/config.json
cd .bin && ./gopherhole -config config.json
-client-dev: client/node_modules
- cd ./client && npm run dev
-
-client/node_modules:
- cd ./client && npm install
-
clean:
- @rm -rf .bin/gopherhole .bin/config.json
+ @rm -rf .bin/gopherhole .bin/config.json .bin/client
-clobber:
- @rm -rf .bin ./client/node_modules
+clobber: clean
+ @rm -rf .bin ./client/node_modules ./client/public/build
+
+vdhsn/gopherhole:
+ docker build -t vdhsn/gopherhole:latest .
test:
dig -p 5353 twitter.com @localhost
@@ -19,14 +18,28 @@ test:
dig -p 5353 loki.veldhousen.ninja @localhost
dig -p 5353 www.liveauctioneers.com @localhost
-.PHONY: clean clobber dev
+
+.PHONY: build clean clobber client-dev dev test vdhsn/gopherhole
.bin:
mkdir -p .bin
.bin/gopherhole: .bin
-# @go build --tags "sqlite_foreign_keys fts5" -v -o .bin/gopherhole .
+ # @go build --tags "sqlite_foreign_keys fts5" -v -o .bin/gopherhole .
@go build --tags "fts5" -v -o .bin/gopherhole .
.bin/config.json:
@cp ./config.example.json .bin/config.json
+
+client-dev: client/node_modules
+ cd ./client && npm run dev
+
+.bin/client/public: .bin client/public/build
+ mkdir -p .bin/client/public
+ cp -R ./client/public/ .bin/client/
+
+client/public/build: client/node_modules
+ cd ./client && npm run build
+
+client/node_modules:
+ cd ./client && npm install
diff --git a/test.sh b/test.sh
new file mode 100755
index 0000000..3660446
--- /dev/null
+++ b/test.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+while :
+do
+ dig -p 5353 twitter.com @localhost
+ dig -p 5353 google.com @localhost
+ dig -p 5353 loki.veldhousen.ninja @localhost
+ dig -p 5353 www.liveauctioneers.com @localhost
+ sleep 1;
+done