adam
/
gopherhole
1
0
Fork 0
Code Pull Requests Releases Activity

Compare commits

base: adam:abc930908cd35333c663550a5e26a5c35d62a5be
Branches Tags
adam:trunk
..
compare: adam:e3945527d99e950d521f26aa3e2240aa67eb4bdc
Branches Tags
adam:trunk

3 Commits
abc930908c ... e3945527d9

Author SHA1 Message Date
Adam Veldhousen e3945527d9
fix make file snafus 2021-06-23 09:36:55 -05:00
Adam Veldhousen 49a673b512
fix some SQL query bugs 2021-06-23 09:36:36 -05:00
Adam Veldhousen c61b335635
fix bug with start time 2021-06-23 09:36:04 -05:00
4 changed files with 23 additions and 25 deletions
Show Stats Expand all files Collapse all files

5
client/src/routes/Home.svelte
View File

@ -21,7 +21,8 @@
? aggKey[0].toUpperCase() + aggKey.substr(1) ? aggKey[0].toUpperCase() + aggKey.substr(1)
: "Domain"; : "Domain";
let start: Date = fromUnixTimeSafe(params.get("start")) || null; let start: Date =
fromUnixTimeSafe(params.get("start")) || sub(new Date(), { hours: 24 });
let end: Date = fromUnixTimeSafe(params.get("end")) || null; let end: Date = fromUnixTimeSafe(params.get("end")) || null;
let filter: string = params.get("filter") || ""; let filter: string = params.get("filter") || "";
@ -137,8 +138,6 @@
done = true; done = true;
}; };
// $: updateChart({ start, end, key: chartKey });
// $: updateLog({ start, end, page, pageSize });
$: updateData({ start, end, key: chartKey, filter, pageSize, page }); $: updateData({ start, end, key: chartKey, filter, pageSize, page });
</script> </script>

1
internal/http.go
View File

@ -42,7 +42,6 @@ func NewAdminHandler(c Cache, s Storage, re *RuleEngine, content fs.FS) http.Han
handler.Use(middleware.RealIP) handler.Use(middleware.RealIP)
handler.Use(middleware.Logger) handler.Use(middleware.Logger)
handler.Use(middleware.Recoverer) handler.Use(middleware.Recoverer)
// TODO: smarter way https://github.com/go-chi/chi/issues/403
handler.Route("/api/v1", func(r chi.Router) { handler.Route("/api/v1", func(r chi.Router) {
r.Use(cors.Handler(cors.Options{ r.Use(cors.Handler(cors.Options{

8
internal/sqlite.go
View File

@ -403,8 +403,7 @@ func (ss *Sqlite) GetLog(in GetLogInput) (GetLogResult, error) {
recurseUpstreamIp, recurseUpstreamIp,
status status
FROM log FROM log
WHERE strftime('%s', started) >= strftime('%s', ?) WHERE CAST(strftime('%s', started) AS INTEGER) BETWEEN ? AND ?
AND strftime('%s', started) <= strftime('%s', ?)
ORDER BY started DESC ORDER BY started DESC
) WHERE id <= ? ORDER BY id DESC LIMIT ?; ) WHERE id <= ? ORDER BY id DESC LIMIT ?;
` `
@ -458,12 +457,11 @@ func (ss *Sqlite) GetPagingInfo(in GetLogInput) (lpi LogPageInfo, err error) {
SELECT SELECT
COUNT(*) as totalLogsEntries, COUNT(*) as totalLogsEntries,
COUNT(*) / ? as pageCount, COUNT(*) / ? as pageCount,
MAX(id) - ? as firstItemId IFNULL(MAX(id) - ?, 0) as firstItemId
FROM FROM
log log
WHERE WHERE
strftime('%s', started) > strftime('%s', ?) CAST(strftime('%s', started) AS INTEGER) BETWEEN ? AND ?
AND strftime('%s', started) < strftime('%s', ?)
ORDER BY id DESC ORDER BY id DESC
` `

6
makefile
View File

@ -5,7 +5,9 @@ COMMIT_SHA := $(shell git rev-parse --short=11 HEAD)
build: clobber .bin/client/public .bin/gopherhole build: clobber .bin/client/public .bin/gopherhole
dev: clean .bin/gopherhole dev: clean .bin/gopherhole
cd .bin && ./gopherhole -dns-address=:5353 -http-address=:8000 GOPHERHOLE_UPSTREAM="1.1.1.1:53" \
GOPHERHOLE_MIN_TTL="60s" \
.bin/gopherhole -dns-address=:5353 -http-address=:8000
client-dev: client-dev:
docker run -it --rm --name='client-dev' \ docker run -it --rm --name='client-dev' \
@ -15,7 +17,7 @@ client-dev:
--user $${UID}:$${GID} \ --user $${UID}:$${GID} \
--memory=4g \ --memory=4g \
-p 5000:5000 \ -p 5000:5000 \
node:lts-alpine node:lts-alpine -c 'npm i && npm run dev'
clean: clean:
@rm -rf .bin/gopherhole .bin/client @rm -rf .bin/gopherhole .bin/client