Replace zap with slog

Reviewed-on: #5

.gitignore

@@ -1,3 +1,5 @@
 **/node_modules
 **/dist
-honeypot/Geoacumen-Country.mmdb
+honeypot/Geoacumen-Country.mmdb
+result
+frontend/.parcel-cache

Dockerfile

@@ -1,12 +1,16 @@
-FROM node:latest as frontend-builder
+FROM node:alpine as frontend-builder
-RUN mkdir -p /app/frontend
+WORKDIR /app
-COPY web/frontend/yarn.lock /app/frontend/yarn.lock
+COPY frontend/package.json /app
-COPY web/frontend/package.json /app/frontend/package.json
+COPY frontend/package-lock.json /app
-WORKDIR /app/frontend
+RUN npm install
-RUN yarn install
+COPY frontend .
-COPY web/frontend /app/frontend
+RUN npm run build
-WORKDIR /app/frontend
+
-RUN GENERATE_SOURCEMAP=false yarn build
+FROM alpine:latest as geoip-fetcher
+RUN apk add --no-cache git
+WORKDIR /app
+RUN git clone https://github.com/geoacumen/geoacumen-country.git
+RUN find .
 
 FROM golang:latest as builder
 WORKDIR /app
@@ -14,16 +18,15 @@ COPY go.mod /app/go.mod
 COPY go.sum /app/go.sum
 RUN go mod download
 COPY . /app
-RUN rm -rf /app/server/frontend
+COPY --from=geoip-fetcher /app/geoacumen-country/Geoacumen-Country.mmdb honeypot/ssh
-COPY --from=frontend-builder /app/frontend/dist /app/web/frontend/dist
+COPY --from=frontend-builder /app/dist /app/web/frontend/dist
-RUN CGO_ENABLED=0 INSTALL_PREFIX=/app make install
+RUN CGO_ENABLED=0 go build -tags embed cmd/apiary/apiary.go
 
 FROM alpine:latest
 RUN apk add --no-cache curl
 WORKDIR /app
-COPY --from=builder /app/etc/apiary/apiary.toml /app/apiary.toml
+COPY --from=builder /app/apiary.toml /app/apiary.toml
-COPY --from=builder /app/bin/apiary /app/apiary
+COPY --from=builder /app/apiary /app/apiary
 EXPOSE 8080
 EXPOSE 2222
-HEALTHCHECK --interval=1m --timeout=10s --start-period=5s --retries=3 CMD curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:8080/api/health || exit 1
 CMD ["/app/apiary", "serve"]

Makefile

@@ -1,62 +0,0 @@
-NAME = apiary
-
-.DEFAULT_GOAL := all
-.PHONY: all clean
-
-INSTALL_PREFIX ?= /usr/local
-
-VERSION = $(shell cat version.go |grep "Version"| head -n 1 |cut -d "=" -f2| tr -d "\" ")
-ARCH = $(shell go env | grep GOHOSTARCH | cut -d"=" -f2 | tr -d "\"")
-OS = $(shell go env | grep GOHOSTOS | cut -d"=" -f2 | tr -d "\"")
-GIT_COMMIT := $(shell git rev-parse --short HEAD)
-
-BUILD_DIR = build/binary/current
-BUILD_OUTPUT = $(BUILD_DIR)/$(NAME)-$(VERSION)-$(OS)-$(ARCH)
-BUILD_FLAGS = -tags embed -ldflags "-X git.t-juice.club/torjus/apiary.Build=$(GIT_COMMIT)" -o $(BUILD_OUTPUT)
-
-GEODB_URL = https://raw.githubusercontent.com/geoacumen/geoacumen-country/master/Geoacumen-Country.mmdb
-GEODB_PATH = honeypot/Geoacumen-Country.mmdb
-
-FRONTEND_BUILD_DIR = web/frontend/dist
-
-ifeq ($(INSTALL_PREFIX), /)
-	INSTALL_BIN_DIR=/usr/bin
-	INSTALL_ETC_DIR=/etc/$(NAME)
-else
-	INSTALL_BIN_DIR=$(INSTALL_PREFIX)/bin
-	INSTALL_ETC_DIR=$(INSTALL_PREFIX)/etc/$(NAME)
-endif
-
-$(GEODB_PATH):
-	curl $(GEODB_URL) -o $(GEODB_PATH)
-
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
-
-$(FRONTEND_BUILD_DIR):
-	cd web/frontend && yarn install && yarn build
-
-$(BUILD_OUTPUT): $(BUILD_DIR) $(GEODB_PATH) $(FRONTEND_BUILD_DIR)
-	CGO_ENABLED=0 go build $(BUILD_FLAGS) cmd/apiary.go
-
-frontend:
-	cd web/frontend && yarn install && yarn build
-
-clean:
-	rm -rv $(BUILD_DIR)
-	rm -rv $(FRONTEND_BUILD_DIR)
-
-geodb: $(GEODB_PATH)
-
-build: $(BUILD_OUTPUT)
-
-install: build
-	mkdir -p $(INSTALL_BIN_DIR)
-	mkdir -p $(INSTALL_ETC_DIR)
-	install -m 755 $(BUILD_OUTPUT) $(INSTALL_BIN_DIR)/$(NAME)
-	install -m 755 apiary.toml $(INSTALL_ETC_DIR)/apiary.toml
-
-uninstall:
-	rm -v $(INSTALL_ETC_DIR)/apiary.toml
-	rmdir -v $(INSTALL_ETC_DIR)
-	rm -v $(INSTALL_BIN_DIR)/$(NAME)

README.md

@@ -2,45 +2,32 @@
 
 SSH honeypot with web-frontend.
 
-## TODO
+## Build using nix
 
-* Fix janky ass Makefile
+```console
+$ nix build .#
 
-## Requirements
+$ ./result/bin/apiary --version
-
+apiary version v0.2.1-d86bc2be079c6b18a9f941752ebad45d925366d1 (go1.23.6)
-* `go >= 1.16`
-
-Requires a postgres database if you want data to persist through server restart.
-
-## Build
-
-```text
-# make frontend
-# make build
 ```
 
+## Build without nix
+
+See [Dockerfile](./Dockerfile) for how to build frontend and backend. Or use Dockerfile
+and copy binary from image.
+
 ## Install
 
-```text
+```console
-# Build and install
+Build or download binary
-INSTALL_PREFIX=/ sudo make install
+$ cp ./apiary /usr/local/bin/apiary
 
-# Edit config file
+Edit config file, should use postgres if you want persistent storage.
-vim /etc/apiary/apiary.toml
+See example config for the different options.
+$ vim /etc/apiary/apiary.toml
 
-# Run
+$ /usr/bin/apiary serve
-/usr/bin/apiary serve
+2021-04-10T11:27:42.783+0200    INFO   APP     Starting SSH server
-# 2021-04-10T11:27:42.783+0200    INFO   APP     Starting SSH server
+2021-04-10T11:27:42.783+0200    INFO   APP     Starting web server
-# 2021-04-10T11:27:42.783+0200    INFO   APP     Starting web server
 ```
 
-## Development
-
-Run postgres-tests by running a postgres container:
-
-```text
-podman run -d -q -e POSTGRES_PASSWORD=apiary -e POSTGRES_USER=apiary -e POSTGRES_DB=apiary --rm --name apiary-test-db -p5432:5432 postgres:latest
-export APIARY_TEST_POSTGRES_DSN="postgresql://apiary:apiary@localhost/apiary"
-
-go test ./...
-```

apiary.toml

@@ -38,7 +38,7 @@ LogLevel = "INFO"
 # Enable access logging
 # Default: true
 AccessLogEnable = true
-# Disable logging of successful requests to metrics endpoint
+# Disable logging of requests to metrics endpoint
 # Default: false
 AccessLogIgnoreMetrics = false
 # Address and port to listen to
@@ -63,32 +63,3 @@ CacheDir = "/var/apiary/certs"
 # Default: true
 RedirectHTTP = true
 
-[Ports]
-# Enable the port listener.
-# Default: false
-Enable = false
-
-# Which address to listen on.
-# Default: "" (listen to all addresses)
-Addr = ""
-
-# Which TCP ports to listen to.
-# Default: []
-TCPPorts = ["25"]
-
-# Which UDP ports to listen to.
-# Default: []
-UDPPorts = ["25"]
-
-[SMTP]
-# Enable the port listener.
-# Default: false
-Enable = true
-
-# Which address and port to listen on.
-# Default: ":25"
-Addr = ":25"
-
-# Enable collecting prometheus metrics
-# Default: false
-EnableMetrics = true

cmd/apiary/apiary.go

@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"os"
 	"os/signal"
@@ -17,8 +18,6 @@ import (
 	"github.com/coreos/go-systemd/daemon"
 	sshlib "github.com/gliderlabs/ssh"
 	"github.com/urfave/cli/v2"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 	"golang.org/x/crypto/acme/autocert"
 )
 
@@ -55,17 +54,17 @@ func ActionServe(c *cli.Context) error {
 
 	// Setup logging
 	loggers := setupLoggers(cfg)
-	loggers.rootLogger.Infow("Starting apiary.", "version", apiary.FullVersion())
+	loggers.rootLogger.Info("Starting apiary.", "version", apiary.FullVersion())
 
 	// Setup store
 	var s store.LoginAttemptStore
 	switch cfg.Store.Type {
 	case "MEMORY", "memory":
-		loggers.rootLogger.Infow("Initialized store.", "store_type", "memory")
+		loggers.rootLogger.Info("Initialized store.", "store_type", "memory")
 		s = &store.MemoryStore{}
 	case "POSTGRES", "postgres":
 		pgStartTime := time.Now()
-		loggers.rootLogger.Debugw("Initializing store.", "store_type", "postgres")
+		loggers.rootLogger.Debug("Initializing store.", "store_type", "postgres")
 		pgStore, err := store.NewPostgresStore(cfg.Store.Postgres.DSN)
 		if err != nil {
 			return err
@@ -73,33 +72,33 @@ func ActionServe(c *cli.Context) error {
 		if err := pgStore.InitDB(); err != nil {
 			return err
 		}
-		loggers.rootLogger.Infow("Initialized store.", "store_type", "postgres", "init_time", time.Since(pgStartTime))
+		loggers.rootLogger.Info("Initialized store.", "store_type", "postgres", "init_time", time.Since(pgStartTime))
 		if cfg.Store.EnableCache {
-			loggers.rootLogger.Debugw("Initializing store.", "store_type", "cache-postgres")
+			loggers.rootLogger.Debug("Initializing store.", "store_type", "cache-postgres")
 			startTime := time.Now()
 			cachingStore := store.NewCachingStore(pgStore)
 			s = cachingStore
-			loggers.rootLogger.Infow("Initialized store.", "store_type", "cache-postgres", "init_time", time.Since(startTime))
+			loggers.rootLogger.Info("Initialized store.", "store_type", "cache-postgres", "init_time", time.Since(startTime))
 		} else {
 			s = pgStore
 		}
 	case "bolt", "BOLT":
 		boltStartTime := time.Now()
-		loggers.rootLogger.Debugw("Initializing store.", "store_type", "bolt")
+		loggers.rootLogger.Debug("Initializing store.", "store_type", "bolt")
 		boltStore, err := store.NewBBoltStore(cfg.Store.Bolt.DBPath)
 		if err != nil {
 			return err
 		}
 		defer boltStore.Close()
 
-		loggers.rootLogger.Infow("Initialized store.", "store_type", "bolt", "init_time", time.Since(boltStartTime))
+		loggers.rootLogger.Info("Initialized store.", "store_type", "bolt", "init_time", time.Since(boltStartTime))
 
 		if cfg.Store.EnableCache {
-			loggers.rootLogger.Debugw("Initializing store.", "store_type", "cache-bolt")
+			loggers.rootLogger.Debug("Initializing store.", "store_type", "cache-bolt")
 			startTime := time.Now()
 			cachingStore := store.NewCachingStore(boltStore)
 			s = cachingStore
-			loggers.rootLogger.Infow("Initialized store.", "store_type", "cache-bolt", "init_time", time.Since(startTime))
+			loggers.rootLogger.Info("Initialized store.", "store_type", "cache-bolt", "init_time", time.Since(startTime))
 		} else {
 			s = boltStore
 		}
@@ -153,18 +152,18 @@ func ActionServe(c *cli.Context) error {
 
 	// Start ssh server
 	go func() {
-		loggers.rootLogger.Info("Starting SSH server.")
+		loggers.rootLogger.Info("Starting SSH server.", "addr", cfg.Honeypot.ListenAddr)
 		if err := hs.ListenAndServe(); err != nil && err != sshlib.ErrServerClosed {
-			loggers.rootLogger.Warnw("SSH server returned error.", "error", err)
+			loggers.rootLogger.Warn("SSH server returned error.", "error", err)
 		}
-		loggers.rootLogger.Infow("SSH server stopped.")
+		loggers.rootLogger.Info("SSH server stopped.")
 	}()
 
 	// Start web server
 	go func() {
-		loggers.rootLogger.Info("Starting web server.")
+		loggers.rootLogger.Info("Starting web server.", "addr", cfg.Frontend.ListenAddr)
 		if err := web.StartServe(); err != nil && err != http.ErrServerClosed {
-			loggers.rootLogger.Warnw("Web server returned error.", "error", err)
+			loggers.rootLogger.Warn("Web server returned error.", "error", err)
 		}
 	}()
 
@@ -184,7 +183,7 @@ func ActionServe(c *cli.Context) error {
 			return
 		}
 		if err != nil {
-			loggers.rootLogger.Warnw("Unable to connect to NOTIFY_SOCKET.", "error", err)
+			loggers.rootLogger.Warn("Unable to connect to NOTIFY_SOCKET.", "error", err)
 			return
 		}
 		loggers.rootLogger.Debug("Sent READY=1 to NOTIFY_SOCKET.")
@@ -192,11 +191,11 @@ func ActionServe(c *cli.Context) error {
 		// Setup timer
 		timeout, err := daemon.SdWatchdogEnabled(false)
 		if err != nil {
-			loggers.rootLogger.Warnw("Unable to get watchdog timeout.", "error", err)
+			loggers.rootLogger.Warn("Unable to get watchdog timeout.", "error", err)
 			return
 		}
 		if timeout == 0 {
-			loggers.rootLogger.Infow("Systemd watchdog not enabled.")
+			loggers.rootLogger.Info("Systemd watchdog not enabled.")
 			return
 		}
 
@@ -209,14 +208,14 @@ func ActionServe(c *cli.Context) error {
 			case <-ticker.C:
 				if healthy == nil {
 					if _, err := daemon.SdNotify(false, daemon.SdNotifyWatchdog); err != nil {
-						loggers.rootLogger.Warnw("Error notifying watchdog.", "err", err)
+						loggers.rootLogger.Warn("Error notifying watchdog.", "err", err)
 					}
 					continue
 				}
 				// TODO: If unhealthy, should we retry healthcheck immediately, otherwise service will most likely get killed by watchdog.
-				loggers.rootLogger.Errorw("Store reported not healthy, might get killed by watchdog.", "err", healthy)
+				loggers.rootLogger.Error("Store reported not healthy, might get killed by watchdog.", "err", healthy)
 			case <-notifyCtx.Done():
-				loggers.rootLogger.Debugw("Notify context cancelled.")
+				loggers.rootLogger.Debug("Notify context cancelled.")
 				return
 			}
 		}
@@ -230,7 +229,7 @@ func ActionServe(c *cli.Context) error {
 		defer sshShutdownCancel()
 		loggers.rootLogger.Info("SSH server shutdown started.")
 		if err := hs.Shutdown(sshShutdownCtx); err != nil {
-			loggers.rootLogger.Infow("Error shutting down SSH server.", "error", err)
+			loggers.rootLogger.Info("Error shutting down SSH server.", "error", err)
 		}
 		loggers.rootLogger.Info("SSH server shutdown complete.")
 
@@ -240,7 +239,7 @@ func ActionServe(c *cli.Context) error {
 
 		loggers.rootLogger.Info("Web server shutdown started.")
 		if err := web.Shutdown(webShutdownCtx); err != nil {
-			loggers.rootLogger.Infow("Error shutting down web server.", "error", err)
+			loggers.rootLogger.Info("Error shutting down web server.", "error", err)
 		}
 		loggers.rootLogger.Info("Web server shutdown complete.")
 		rootCancel()
@@ -252,49 +251,36 @@ func ActionServe(c *cli.Context) error {
 }
 
 type loggerCollection struct {
-	rootLogger      *zap.SugaredLogger
+	rootLogger      *slog.Logger
-	honeypotLogger  *zap.SugaredLogger
+	honeypotLogger  *slog.Logger
-	webAccessLogger *zap.SugaredLogger
+	webAccessLogger *slog.Logger
-	webServerLogger *zap.SugaredLogger
+	webServerLogger *slog.Logger
 }
 
 func setupLoggers(cfg config.Config) *loggerCollection {
-	logEncoderCfg := zap.NewProductionEncoderConfig()
+	opts := &slog.HandlerOptions{}
-	logEncoderCfg.EncodeCaller = func(caller zapcore.EntryCaller, enc zapcore.PrimitiveArrayEncoder) {}
-
-	var level zap.AtomicLevel
 	switch strings.ToUpper(cfg.Honeypot.LogLevel) {
 	case "INFO":
-		level = zap.NewAtomicLevelAt(zap.InfoLevel)
+		opts.Level = slog.LevelInfo
 	case "DEBUG":
-		level = zap.NewAtomicLevelAt(zap.DebugLevel)
+		opts.Level = slog.LevelDebug
+		opts.AddSource = true
 	case "WARN", "WARNING":
-		level = zap.NewAtomicLevelAt(zap.WarnLevel)
+		opts.Level = slog.LevelWarn
 	case "ERR", "ERROR":
-		level = zap.NewAtomicLevelAt(zap.WarnLevel)
+		opts.Level = slog.LevelError
 	default:
-		level = zap.NewAtomicLevelAt(zap.InfoLevel)
+		opts.Level = slog.LevelInfo
-	}
-	logEncoderCfg.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	logEncoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
-	logEncoderCfg.EncodeDuration = zapcore.StringDurationEncoder
-	rootLoggerCfg := &zap.Config{
-		Level:            level,
-		OutputPaths:      []string{"stdout"},
-		ErrorOutputPaths: []string{"stderr"},
-		Encoding:         "console",
-		EncoderConfig:    logEncoderCfg,
-	}
-	rootLogger, err := rootLoggerCfg.Build()
-	if err != nil {
-		panic(err)
 	}
 
+	handler := slog.NewTextHandler(os.Stdout, opts)
+	rootLogger := slog.New(handler)
+
 	return &loggerCollection{
-		rootLogger:      rootLogger.Named("APP").Sugar(),
+		rootLogger:      rootLogger.With("module", "application"),
-		honeypotLogger:  rootLogger.Named("HON").Sugar(),
+		honeypotLogger:  rootLogger.With("module", "honeypot"),
-		webAccessLogger: rootLogger.Named("ACC").Sugar(),
+		webAccessLogger: rootLogger.With("module", "web-access-log"),
-		webServerLogger: rootLogger.Named("WEB").Sugar(),
+		webServerLogger: rootLogger.With("module", "web-server"),
 	}
 }
 

flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1741173522,
+        "narHash": "sha256-k7VSqvv0r1r53nUI/IfPHCppkUAddeXn843YlAC5DR0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d69ab0d71b22fa1ce3dbeff666e6deb4917db049",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,123 @@
+{
+  description = "SSH honeypot with frontend";
+
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+
+  outputs =
+    { self, nixpkgs }:
+    let
+      allSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      forAllSystems =
+        f:
+        nixpkgs.lib.genAttrs allSystems (
+          system:
+          f {
+            pkgs = import nixpkgs { inherit system; };
+          }
+        );
+    in
+    {
+      overlays.default = final: prev: {
+        apiary = self.packages.${prev.system}.default;
+      };
+
+      packages = forAllSystems (
+        { pkgs }:
+        {
+          default = self.packages.${pkgs.system}.apiary;
+          apiary =
+            let
+              src = pkgs.lib.sourceFilesBySuffices ./. [
+                "go.mod"
+                "go.sum"
+                ".go"
+              ];
+              version = pkgs.lib.strings.removePrefix "v" (
+                builtins.elemAt (pkgs.lib.strings.split "\"" (
+                  pkgs.lib.lists.findFirst (x: pkgs.lib.strings.hasInfix "Version" x) null (
+                    pkgs.lib.strings.splitString "\n" (builtins.readFile ./version.go)
+                  )
+                )) 2
+              );
+              rev = self.rev or "";
+              geoDb = pkgs.fetchFromGitHub {
+                owner = "geoacumen";
+                repo = "geoacumen-country";
+                rev = "5f770af620465f40427c3f421446a7b7845e2699";
+                sha256 = "sha256-t3ELkhAbJC40z6r6wJeQI4Kutfw26fRg6n7a6FmhvkA=";
+              };
+
+              frontend = pkgs.buildNpmPackage {
+                inherit version;
+                name = "apiary-frontend";
+
+                src = ./frontend;
+
+                npmDepsHash = "sha256-7gjPEiQAMOpteLwHT4AIY9QLpDozpXb7xy0bDiOpDf4=";
+
+                installPhase = ''
+                  mkdir -p $out
+                  cp -r dist/* $out
+                '';
+              };
+            in
+            pkgs.buildGoModule {
+              inherit version;
+              pname = "apiary";
+              src = src;
+              prePatch = ''
+                cp ${geoDb}/Geoacumen-Country.mmdb honeypot/ssh
+                mkdir -p web/frontend/dist
+                cp -r ${frontend}/* web/frontend/dist
+              '';
+              vendorHash = "sha256-fJnln143V5ajZgEEgVZN2y3dIz9/L9w6ZBLZk/eX61M=";
+              ldflags = [ "-X git.t-juice.club/torjus/apiary.Build=${rev}" ];
+              tags = [
+                "embed"
+              ];
+            };
+
+          tarball =
+            let
+              version = self.packages.${pkgs.system}.apiary.version;
+            in
+            pkgs.stdenv.mkDerivation {
+              name = "apiary-tarballs-${version}";
+              phases = [ "installPhase" ];
+              installPhase = ''
+                mkdir -p $out
+                mkdir apiary
+                cp ${self.packages.${pkgs.system}.apiary}/bin/apiary apiary/apiary-${pkgs.system}-${version}
+                tar cvzf $out/apiary-${pkgs.system}-${version}.tar.gz apiary
+                pushd apiary
+                sha256sum apiary-${pkgs.system}-${version} > apiary-${pkgs.system}-${version}.sha256sum
+                popd
+                cp apiary/apiary-${pkgs.system}-${version}.sha256sum $out
+              '';
+            };
+        }
+      );
+      devShells = forAllSystems (
+        { pkgs }:
+        {
+          default = pkgs.mkShell {
+            packages = with pkgs; [
+              go
+              golangci-lint
+            ];
+          };
+          frontend = pkgs.mkShell {
+            packages = with pkgs; [
+              nodejs
+              yarn
+            ];
+          };
+        }
+      );
+    };
+}

frontend/jest.config.js

@@ -0,0 +1,7 @@
+/** @type {import('ts-jest').JestConfigWithTsJest} **/
+module.exports = {
+  testEnvironment: "jsdom",
+  transform: {
+    "^.+\.tsx?$": ["ts-jest",{}],
+  },
+};

frontend/package.json

@@ -0,0 +1,37 @@
+{
+  "name": "apiary-frontend",
+  "scripts": {
+    "start": "parcel src/index.html",
+    "build": "parcel build src/index.html",
+    "test": "jest"
+  },
+  "devDependencies": {
+    "@ngneat/falso": "^7.3.0",
+    "@parcel/transformer-css": "^2.13.3",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/jest-dom": "^6.6.3",
+    "@testing-library/react": "^16.2.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/humanize-duration": "^3.27.4",
+    "@types/jest": "^29.5.14",
+    "@types/node": "^22.13.9",
+    "@types/react": "^19.0.10",
+    "@types/react-dom": "^19.0.4",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "parcel": "^2.13.3",
+    "process": "^0.11.10",
+    "svgo": "^3.3.2",
+    "ts-jest": "^29.2.6",
+    "ts-loader": "^9.5.2",
+    "typescript": "^5.8.2"
+  },
+  "dependencies": {
+    "chart.js": "^4.4.8",
+    "humanize-duration": "^3.32.1",
+    "react": "^19.0.0",
+    "react-chartjs-2": "^5.3.0",
+    "react-dom": "^19.0.0",
+    "react-router": "^7.2.0"
+  }
+}

frontend/src/assets/apiary.svg

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 511.573 511.573" xml:space="preserve">
+<g transform="translate(1 1)">
+	<polygon style="fill:#FFE100;" points="254.787,7.107 84.12,143.64 425.453,143.64 	"/>
+	<polygon style="fill:#FFFFFF;" points="84.12,143.64 254.787,7.107 41.453,143.64 	"/>
+	<polygon style="fill:#FFA800;" points="254.787,7.107 425.453,143.64 468.12,143.64 	"/>
+	<g>
+		<polygon style="fill:#FFE100;" points="41.453,502.04 92.653,502.04 92.653,450.84 41.453,450.84 		"/>
+		<polygon style="fill:#FFE100;" points="416.92,502.04 468.12,502.04 468.12,450.84 416.92,450.84 		"/>
+		<polygon style="fill:#FFE100;" points="41.453,450.84 468.12,450.84 468.12,143.64 41.453,143.64 		"/>
+	</g>
+	<polygon style="fill:#FFA800;" points="442.52,126.573 442.52,502.04 468.12,502.04 468.12,146.2 	"/>
+	<polygon style="fill:#FFFFFF;" points="41.453,143.64 41.453,502.04 67.053,502.04 67.053,126.573 	"/>
+	<path style="fill:#63D3FD;" d="M314.52,450.84H195.053V341.613c0-15.36,12.8-27.307,27.307-27.307h64
+		c15.36,0,27.307,12.8,27.307,27.307V450.84H314.52z"/>
+	<path style="fill:#3DB9F9;" d="M287.213,314.307h-25.6c15.36,0,27.307,12.8,27.307,27.307V450.84h25.6V341.613
+		C314.52,327.107,302.573,314.307,287.213,314.307"/>
+	<path d="M468.12,459.373H41.453c-5.12,0-8.533-3.413-8.533-8.533v-307.2c0-2.56,1.707-5.973,4.267-6.827L250.52,0.28
+		c2.56-1.707,5.973-1.707,9.387,0L473.24,136.813c2.56,1.707,4.267,4.267,4.267,6.827v307.2
+		C476.653,455.96,473.24,459.373,468.12,459.373z M49.987,442.307h409.6v-294.4l-204.8-130.56l-204.8,130.56V442.307z"/>
+	<path d="M92.653,510.573h-51.2c-5.12,0-8.533-3.413-8.533-8.533v-51.2c0-5.12,3.413-8.533,8.533-8.533h51.2
+		c5.12,0,8.533,3.413,8.533,8.533v51.2C101.187,507.16,97.773,510.573,92.653,510.573z M49.987,493.507H84.12v-34.133H49.987
+		V493.507z"/>
+	<path d="M468.12,510.573h-51.2c-5.12,0-8.533-3.413-8.533-8.533v-51.2c0-5.12,3.413-8.533,8.533-8.533h51.2
+		c5.12,0,8.533,3.413,8.533,8.533v51.2C476.653,507.16,473.24,510.573,468.12,510.573z M425.453,493.507h34.133v-34.133h-34.133
+		V493.507z"/>
+	<path d="M7.32,177.773c-2.56,0-5.12-0.853-6.827-3.413c-2.56-3.413-1.707-9.387,1.707-11.947l34.133-25.6
+		c3.413-2.56,9.387-1.707,11.947,1.707c2.56,3.413,1.707,9.387-1.707,11.947l-34.133,25.6C10.733,176.92,9.027,177.773,7.32,177.773
+		z"/>
+	<path d="M502.253,177.773c-1.707,0-3.413-0.853-5.12-1.707L463,150.467c-3.413-2.56-4.267-8.533-1.707-11.947
+		c2.56-3.413,8.533-4.267,11.947-1.707l34.133,25.6c3.413,2.56,4.267,8.533,1.707,11.947
+		C507.373,176.92,504.813,177.773,502.253,177.773z"/>
+	<path d="M468.12,254.573H41.453c-5.12,0-8.533-3.413-8.533-8.533v-102.4c0-5.12,3.413-8.533,8.533-8.533H468.12
+		c5.12,0,8.533,3.413,8.533,8.533v102.4C476.653,251.16,473.24,254.573,468.12,254.573z M49.987,237.507h409.6v-85.333h-409.6
+		V237.507z"/>
+	<path d="M314.52,459.373H195.053c-5.12,0-8.533-3.413-8.533-8.533V341.613c0-19.627,16.213-35.84,35.84-35.84h64
+		c19.627,0,35.84,16.213,35.84,35.84V450.84C323.053,455.96,319.64,459.373,314.52,459.373z M203.587,442.307h102.4V341.613
+		c0-10.24-8.533-18.773-18.773-18.773h-64c-11.093,0-19.627,8.533-19.627,18.773V442.307z"/>
+	<path d="M195.053,459.373h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-102.4c0-5.12,3.413-8.533,8.533-8.533h153.6
+		c5.12,0,8.533,3.413,8.533,8.533v102.4C203.587,455.96,200.173,459.373,195.053,459.373z M49.987,442.307H186.52v-85.333H49.987
+		V442.307z"/>
+	<path d="M468.12,459.373h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-102.4c0-5.12,3.413-8.533,8.533-8.533h153.6
+		c5.12,0,8.533,3.413,8.533,8.533v102.4C476.653,455.96,473.24,459.373,468.12,459.373z M323.053,442.307h136.533v-85.333H323.053
+		V442.307z"/>
+	<path d="M468.12,356.973h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-6.827c0-10.24-8.533-18.773-18.773-18.773h-64
+		c-11.093,0-19.627,8.533-19.627,18.773v6.827c0,5.12-3.413,8.533-8.533,8.533h-153.6c-5.12,0-8.533-3.413-8.533-8.533v-102.4
+		c0-5.12,3.413-8.533,8.533-8.533H468.12c5.12,0,8.533,3.413,8.533,8.533v102.4C476.653,353.56,473.24,356.973,468.12,356.973z
+		 M323.053,339.907h136.533v-85.333h-409.6v85.333H186.52c0.853-18.773,17.067-34.133,35.84-34.133h64
+		C305.987,305.773,322.2,321.133,323.053,339.907z"/>
+	<path d="M468.12,288.707h-59.733c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
+		c5.12,0,8.533,3.413,8.533,8.533S473.24,288.707,468.12,288.707z"/>
+	<path d="M468.12,322.84h-34.133c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
+		c5.12,0,8.533,3.413,8.533,8.533C476.653,319.427,473.24,322.84,468.12,322.84z"/>
+	<path d="M101.187,288.707H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
+		c5.12,0,8.533,3.413,8.533,8.533S106.307,288.707,101.187,288.707z"/>
+	<path d="M75.587,322.84H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
+		c5.12,0,8.533,3.413,8.533,8.533C84.12,319.427,80.707,322.84,75.587,322.84z"/>
+	<path d="M468.12,186.307h-59.733c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
+		c5.12,0,8.533,3.413,8.533,8.533C476.653,182.893,473.24,186.307,468.12,186.307z"/>
+	<path d="M468.12,220.44h-34.133c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
+		c5.12,0,8.533,3.413,8.533,8.533C476.653,217.027,473.24,220.44,468.12,220.44z"/>
+	<path d="M101.187,186.307H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
+		c5.12,0,8.533,3.413,8.533,8.533C109.72,182.893,106.307,186.307,101.187,186.307z"/>
+	<path d="M75.587,220.44H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h34.133
+		c5.12,0,8.533,3.413,8.533,8.533C84.12,217.027,80.707,220.44,75.587,220.44z"/>
+	<path d="M468.12,391.107h-59.733c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
+		c5.12,0,8.533,3.413,8.533,8.533C476.653,387.693,473.24,391.107,468.12,391.107z"/>
+	<path d="M468.12,425.24h-34.133c-5.12,0-8.533-3.413-8.533-8.533s3.413-8.533,8.533-8.533h34.133c5.12,0,8.533,3.413,8.533,8.533
+		S473.24,425.24,468.12,425.24z"/>
+	<path d="M101.187,391.107H41.453c-5.12,0-8.533-3.413-8.533-8.533c0-5.12,3.413-8.533,8.533-8.533h59.733
+		c5.12,0,8.533,3.413,8.533,8.533C109.72,387.693,106.307,391.107,101.187,391.107z"/>
+	<path d="M75.587,425.24H41.453c-5.12,0-8.533-3.413-8.533-8.533s3.413-8.533,8.533-8.533h34.133c5.12,0,8.533,3.413,8.533,8.533
+		S80.707,425.24,75.587,425.24z"/>
+</g>
+</svg>

frontend/src/css/fonts.css

@@ -0,0 +1,2 @@
+@import url("https://fonts.googleapis.com/css2?family=Prompt:wght@300;600&display=swap");
+@import url('https://fonts.googleapis.com/css2?family=Secular+One&display=swap');

frontend/src/css/style.module.css

@@ -0,0 +1,210 @@
+:root {
+    --main-color-bg: white;
+    --main-color: black;
+    /* Menu */
+    --menu-color-bg: #212529;
+    --menu-color-text: hsla(0,0%,100%,.5);
+    --menu-color-text-hover: white;
+    --menu-color-title-text: white;
+
+    /* Table */
+    --table-color-header-bg: var(--menu-color-bg);
+    --table-color-header-text: #dddddd;
+    --table-row-odd: #dddddd;
+    --table-row-even: #f3f3f3;
+}
+
+.dark_mode {
+    --main-color-bg: #15141a;
+    --main-color: white;
+    /* Menu */
+    --menu-color-bg: #35393d;
+    --menu-color-text: hsla(0,0%,100%,.5);
+    --menu-color-text-hover: white;
+    --menu-color-title-text: white;
+
+    /* Table */
+    --table-color-header-bg: var(--menu-color-bg);
+    --table-color-header-text: var(--menu-color-text);
+    --table-row-odd: #302f36;
+    --table-row-even: #232229;
+}
+
+#root {
+    padding: 0;
+    margin: 0;
+    height: 100%;
+    width: 100%;
+}
+body {
+    background-color: var(--main-color-bg);
+    color: var(--main-color);
+    margin: 0;
+    margin-top: 100px;
+}
+
+*,
+*::before,
+*::after {
+    padding: 0;
+    margin: 0;
+}
+
+a {
+    text-decoration: none;
+}
+
+canvas {
+    width: 100%;
+    display: block;
+    padding-left: 0;
+    padding-right: 0;
+    margin-left: auto;
+    margin-right: auto;
+}
+
+form {
+    width: 100%;
+}
+input[type=text] {
+    width: 100%;
+    height: 30px;
+    box-sizing: border-box;
+    border: 2px solid var(--menu-color-bg);
+    border-radius: 5px;
+    padding-left: 5px;
+}
+
+.navbar {
+    background-color: var(--menu-color-bg);
+    display: flex;
+    font-size: 1.2rem;
+    font-family: "Prompt", sans-serif;
+    height: 40px;
+    position: fixed;
+    top: 0;
+    width: 100%;
+}
+
+.navbar ul {
+    display: flex;
+    align-items: center;
+}
+
+.root .navbar {
+    justify-content: space-between;
+}
+
+.navbar ul li {
+    list-style-type: none;
+    color: var(--menu-color-text);
+    padding-left: 10px;
+    padding-right: 10px;
+    line-height: 40px;
+}
+
+.navbar h2 {
+    line-height: 40px;
+    align-items: center;
+    padding-right: 10px;
+}
+
+.navbar a {
+    height: 1;
+}
+
+.navbar a:hover {
+    color: var(--menu-color-text-hover);
+}
+
+.submenu nav {
+    display: flex;
+    justify-content: space-between;
+    line-height: 1;
+}
+
+.totals {
+    display: grid;
+    grid-template-columns: repeat(2, 1fr);
+    grid-template-rows: 1fr;
+    grid-column-gap: 0px;
+    grid-row-gap: 0px;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    font-family: "Secular One", sans-serif;
+    font-size: 20px;
+    font-weight: 200;
+}
+.totals_key { 
+    grid-area: 1 / 1 / 2 / 2; 
+    text-align: right;
+}
+.totals_value { 
+    grid-area: 1 / 2 / 2 / 3;
+    padding-left: 10px;
+    text-align: left;
+}
+#menu_title {
+    color: var(--menu-color-text-hover);
+    font-family: "Secular One", sans-serif;
+    font-size: 30px;
+    font-weight: 300;
+}
+#menu_logo {
+    padding: 5px;
+    content: url("../assets/apiary.svg");
+    width: 30px;
+    height: 30px;
+}
+.menu_link {
+    color: var(--menu-color-text);
+}
+.menu_link:hover {
+    color: var(--menu-color-text-hover);
+}
+.menu_link_active {
+    color: var(--menu-color-text-hover);
+}
+.stats_pie {
+    max-height: 70vh;
+    text-align: left;
+    color: white;
+}
+
+.live_table {
+    border-collapse: collapse;
+    margin: 25px 0;
+    font-size: 0.9em;
+    font-family: sans-serif;
+    min-width: 400px;
+    width: 100%;
+    box-shadow: 0 0 20px rgba(0, 0, 0, 0.15);
+}
+.live_table thead tr {
+    background-color: var(--table-color-header-bg);
+    color: var(--table-color-header-text);
+    text-align: left;
+}
+.live_table th,
+.live_table td {
+    padding: 12px 15px;
+}
+.live_table tbody tr {
+    border-bottom: 1px solid var(--table-row-odd);
+}
+.live_table tbody tr:nth-of-type(even) {
+    background-color: var(--table-row-even);
+}
+.live_table tbody tr:last-of-type {
+    border-bottom: 2px solid var(--table-color-bg);
+}
+.live_table tbody tr.active-row {
+    font-weight: bold;
+    color: var(--table-color-bg);
+}
+
+.content {
+    margin-left: 10vw;
+    width: 50vw;
+    text-align: center;
+}

frontend/src/index.html

@@ -0,0 +1,12 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title></title>
+    <link rel="stylesheet" href="./css/fonts.css" />
+    <script type="module" src="./js/app.tsx"></script>
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>

frontend/src/js/api.ts

@@ -0,0 +1,154 @@
+import { randUserName, randRecentDate, randIp, randPassword, randUuid, randNumber } from '@ngneat/falso';
+import { r } from 'react-router/dist/development/fog-of-war-Cm1iXIp7';
+
+export interface LoginAttempt {
+    readonly date: string;
+    readonly remoteIP: string;
+    readonly username: string;
+    readonly password: string;
+    readonly sshClientVersion: string;
+    readonly connectionUUID: string;
+    readonly country: string;
+}
+
+export interface TotalStats {
+    readonly password: number;
+    readonly username: number;
+    readonly ip: number;
+    readonly country: number;
+    readonly attempts: number;
+}
+
+export interface StatsResult {
+    name: string;
+    count: number;
+}
+
+export type StatsType = 'password' | 'username' | 'ip' | 'country' | 'attempts';
+
+export interface ApiaryAPI {
+    live(fn: (a: LoginAttempt) => void): void;
+    stats(statsType: StatsType, limit: number): Promise<StatsResult[]>;
+    query(queryType: string, query: string): Promise<LoginAttempt[]>;
+    totals(): Promise<TotalStats>;
+}
+
+function fakeLoginAttempt(): LoginAttempt {
+    return {
+        date: randRecentDate({ days: 2 }).toISOString(),
+        remoteIP: randIp().toString(),
+        username: randUserName().toString(),
+        password: randPassword().toString(),
+        sshClientVersion: '1.0',
+        connectionUUID: randUuid().toString(),
+        country: 'NO'
+    }
+}
+
+export class DummyApiaryAPIClient implements ApiaryAPI {
+    live(fn: (a: LoginAttempt) => void): () => void {
+        const interval = setInterval(() => {
+            let a = fakeLoginAttempt();
+            fn(a);
+        }, 1000);
+
+        return () => { clearInterval(interval) }
+    }
+    async stats(_type: StatsType, limit: number): Promise<StatsResult[]> {
+        const stats = Array.from({ length: limit }, () => {
+            switch (_type) {
+                case 'password':
+                    return { name: randPassword().toString(), count: randNumber().valueOf() }
+                case 'username':
+                    return { name: randUserName().toString(), count: randNumber().valueOf() }
+                case 'ip':
+                    return { name: randIp().toString(), count: randNumber().valueOf() }
+                case 'country':
+                    return { name: 'NO', count: randNumber().valueOf() }
+            }
+            return { name: randUserName().toString(), count: randNumber().valueOf() }
+        });
+
+        const sorted = stats.sort((a, b) => b.count - a.count)
+        return Promise.resolve(sorted);
+    }
+    async query(_type: string, _query: string): Promise<LoginAttempt[]> {
+        const attempts = Array.from({ length: 10 }, () => {
+            return fakeLoginAttempt();
+        })
+        return Promise.resolve(attempts);
+    }
+
+    async totals(): Promise<TotalStats> {
+        return Promise.resolve({ password: 1, username: 1, ip: 1, country: 1, attempts: 1 })
+    }
+}
+
+export class ApiaryAPIClient implements ApiaryAPI {
+    live(fn: (a: LoginAttempt) => void): () => void {
+        const es = new EventSource('/api/stream');
+        const updateFn = (ev: MessageEvent<string>) => {
+            const attempt: LoginAttempt = JSON.parse(ev.data);
+            fn(attempt);
+        };
+        es.addEventListener('message', updateFn)
+
+        return () => {
+            es.removeEventListener('message', updateFn);
+            es.close();
+        }
+    }
+    async stats(statsType: StatsType, limit: number): Promise<StatsResult[]> {
+        const resp = await fetch(`/api/stats?type=${statsType}&limit=${limit}`)
+        if (!resp.ok) {
+            throw new Error('Failed to fetch query')
+        }
+        const data: StatsResult[] | null = await resp.json()
+        if (!data) {
+            return []
+        }
+        return data.sort((a, b) => b.count - a.count)
+    }
+    async query(queryType: string, query: string): Promise<LoginAttempt[]> {
+        const resp = await fetch(`/api/query?type=${queryType}&query=${query}`)
+        if (!resp.ok) {
+            throw new Error('Failed to fetch query')
+        }
+        const data: LoginAttempt[] = await resp.json()
+
+        return data
+    }
+
+    async totals(): Promise<TotalStats> {
+        let password: number = -1
+        let username: number = -1
+        let ip: number = -1
+        let attempts: number = -1
+        let country: number = -1
+
+        const resp = await fetch('/api/stats?type=total')
+        const data: Array<StatsResult> = await resp.json()
+
+        for (const stat of data) {
+            switch (stat.name) {
+                case 'UniquePasswords':
+                    password = stat.count
+                    break
+                case 'UniqueUsernames':
+                    username = stat.count
+                    break
+                case 'UniqueIPs':
+                    ip = stat.count
+                    break
+                case 'TotalLoginAttempts':
+                    attempts = stat.count
+                    break
+                case 'UniqueCountries':
+                    country = stat.count
+                    break
+            }
+        }
+
+        return { password, username, ip, attempts, country }
+    }
+}

frontend/src/js/app.tsx

@@ -0,0 +1,467 @@
+import React from "react";
+import { createRoot } from "react-dom/client";
+import { useState, useEffect } from 'react';
+import { ApiaryAPI, LoginAttempt, DummyApiaryAPIClient, ApiaryAPIClient, TotalStats, StatsResult, StatsType } from "./api";
+import { BrowserRouter, NavLink, Routes, Route } from "react-router";
+import { Chart as ChartJS, Tooltip, ArcElement, Legend, ChartOptions } from "chart.js";
+import { Pie } from "react-chartjs-2";
+import humanizeDuration from "humanize-duration";
+import * as classes from "../css/style.module.css";
+
+ChartJS.register(Tooltip, ArcElement, Legend);
+console.log(classes);
+
+interface AppProps {
+    api: ApiaryAPI
+}
+
+let chartColors = [
+    "#1abc9c",
+    "#2ecc71",
+    "#3498db",
+    "#9b59b6",
+    "#34495e",
+    "#16a085",
+    "#27ae60",
+    "#2980b9",
+    "#8e44ad",
+    "#2c3e50",
+    "#f1c40f",
+    "#e67e22",
+    "#e74c3c",
+    "#ecf0f1",
+    "#95a5a6",
+    "#f39c12",
+    "#d35400",
+    "#c0392b",
+    "#bdc3c7",
+    "#7f8c8d",
+]
+
+export function App({ api }: AppProps) {
+    const [mode, setMode] = useState("light");
+    const headerProps: HeaderMenuProps = {
+        title: "apiary.home.2rjus.net",
+        items: [
+            {
+                name: "Totals",
+                path: "/",
+            },
+            {
+                name: "Passwords",
+                path: "/stats/password",
+            },
+            {
+                name: "Usernames",
+                path: "/stats/username",
+            },
+            {
+                name: "IPs",
+                path: "/stats/ip",
+            },
+            {
+                name: "Live",
+                path: "/live",
+            },
+            {
+                name: "Query",
+                path: "/query",
+            }
+        ]
+    }
+    const onSelectMode = (mode: string) => {
+        setMode(mode);
+
+        if (mode === "dark") {
+            document.body.classList.add(classes.dark_mode);
+        } else {
+            document.body.classList.remove(classes.dark_mode);
+        }
+    }
+
+    useEffect(() => {
+        window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (e) => onSelectMode(e.matches ? "dark" : "light"));
+        onSelectMode(window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
+        return () => {
+            window.matchMedia('(prefers-color-scheme: dark)').removeEventListener('change', (e) => onSelectMode(e.matches ? "dark" : "light"));
+        }
+    }, [])
+    return (
+        <>
+            <BrowserRouter>
+                <div id="app">
+                    <HeaderMenu title={headerProps.title} items={headerProps.items} />
+                    <div className={classes.content}>
+                        <Routes>
+                            <Route path="/" element={<Home api={api} />} />
+                            <Route path="/stats/password" element={<Stats api={api} type="password" />} />
+                            <Route path="/stats/username" element={<Stats api={api} type="username" />} />
+                            <Route path="/stats/ip" element={<Stats api={api} type="ip" />} />
+                            <Route path="/live" element={<Live api={api} />} />
+                            <Route path="/query" element={<Query api={api} />} />
+                        </Routes>
+                    </div>
+                </div>
+            </BrowserRouter >
+        </>
+    );
+}
+
+export interface StatsProps {
+    api: ApiaryAPI
+    type: StatsType
+}
+
+export function Stats({ api, type }: StatsProps) {
+    const [stats, setStats] = useState<StatsResult[] | null>(null)
+    const [currentType, setCurrentType] = useState(type)
+
+    useEffect(() => {
+        async function getStats() {
+            try {
+                let newStats = await api.stats(type, 10);
+                if (JSON.stringify(newStats) !== JSON.stringify(stats)) {
+                    setStats(newStats)
+                }
+            } catch (e) {
+                console.log("Error getting stats", e)
+            }
+        }
+
+        if (currentType !== type) {
+            setCurrentType(type)
+            getStats()
+        }
+
+        if (stats === null) {
+            getStats()
+        }
+
+        const interval = setInterval(() => {
+            getStats()
+        }, 60000)
+
+        return () => {
+            clearInterval(interval);
+        }
+    }, [stats, type])
+
+    return (
+        <>
+            {(stats != null && stats.length > 0) ? <StatsPie data={stats} /> : <p>Loading...</p>}
+        </>
+    );
+}
+
+export interface StatsPieProps {
+    data: StatsResult[]
+}
+
+export function StatsPie({ data }: StatsPieProps) {
+    const labels = data.map((d) => d.name);
+    const values = data.map((d) => d.count);
+    const piedata = {
+        labels,
+        datasets: [{
+            label: "# of attempts",
+            data: values,
+            backgroundColor: chartColors,
+            borderWidth: 1
+        }]
+    };
+    console.log(piedata)
+    const getTextColor = () => {
+        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'white' : 'black'
+    }
+    const options: ChartOptions<"pie"> = {
+        plugins: {
+            legend: {
+                display: true,
+                align: "start",
+                labels: {
+                    color: getTextColor(),
+                }
+            }
+        }
+    }
+    return (
+        <div className={classes.stats_pie}>
+            <Pie data={piedata} options={options} />
+        </div>
+    )
+}
+
+export function Home({ api }: AppProps) {
+    const [totals, setTotals] = useState<TotalStats | null>(null)
+    useEffect(() => {
+        async function getTotals() {
+            let totals = await api.totals();
+            setTotals(totals);
+        }
+
+        if (!totals) {
+            getTotals();
+        }
+
+        const interval = setInterval(() => {
+            getTotals();
+        }, 5000)
+
+        return () => {
+            clearInterval(interval);
+        }
+    })
+    return (
+        <>
+            {totals ? <Totals totals={totals} /> : <p>Loading...</p>}
+        </>
+    );
+}
+
+export interface TotalsProps {
+    totals: TotalStats
+}
+
+export function Totals({ totals }: TotalsProps) {
+    return (
+        <div className={classes.totals}>
+            <div className={classes.totals_key}>
+                <h2>Unique passwords</h2>
+                <h2>Unique username</h2>
+                <h2>Unique IPs</h2>
+                <h2>Total attempts</h2>
+            </div>
+            <div className={classes.totals_value}>
+                <h2>{totals.password}</h2>
+                <h2>{totals.username}</h2>
+                <h2>{totals.ip}</h2>
+                <h2>{totals.attempts}</h2>
+            </div>
+        </div>
+    )
+}
+
+export function Live({ api }: AppProps) {
+    let list: LoginAttempt[] = [];
+    let [liveList, setLiveList] = useState(list);
+
+    useEffect(() => {
+        const cleanup = api.live((a) => {
+            setLiveList((list) => {
+                return [a, ...list];
+            });
+        });
+
+        return cleanup
+
+    }, [liveList, api]);
+
+    return (
+        <>
+            <LiveList list={liveList} />
+        </>
+    );
+}
+
+export interface LiveListProps {
+    list: LoginAttempt[]
+};
+
+export interface DateTDProps {
+    date: Date
+    now: Date
+}
+
+export function DateTD({ date, now }: DateTDProps) {
+    const [displayDate, setDisplayDate] = useState(date.toLocaleString());
+
+    useEffect(() => {
+        if (now.getTime() - date.getTime() < 14400000) {
+            const newDate = humanizeDuration(now.getTime() - date.getTime(), { largest: 1, round: true }) + " ago";
+            if (newDate !== displayDate) {
+                setDisplayDate(newDate);
+            }
+        }
+    }, [displayDate, now])
+
+    return (
+        <td className={classes.live_table_date}>{displayDate}</td>
+    )
+}
+
+export function LiveList({ list }: LiveListProps) {
+    const [now, setNow] = useState(new Date())
+
+    let items = list.map((a) => {
+        const attemptDate = new Date(a.date);
+        const key = `${a.username}-${a.password}-${a.remoteIP}-${a.date}`;
+        return (
+            <tr key={a.date}>
+                <DateTD date={attemptDate} now={now} />
+                <td className={classes.live_table_username}>{a.username}</td>
+                <td className={classes.live_table_password}>{a.password}</td>
+                <td className={classes.live_table_ip}>{a.remoteIP}</td>
+                <td className={classes.live_table_country}>{a.country}</td>
+            </tr>
+        )
+    })
+
+    useEffect(() => {
+        const interval = setInterval(() => {
+            setNow(new Date())
+        }, 1000)
+
+        return () => {
+            clearInterval(interval)
+        }
+    }, [now])
+
+    return (
+        <>
+            <table className={classes.live_table}>
+                <thead>
+                    <tr>
+                        <th className={classes.live_table_date}>Date</th>
+                        <th className={classes.live_table_username}>Username</th>
+                        <th className={classes.live_table_password}>Password</th>
+                        <th className={classes.live_table_ip}>IP</th>
+                        <th className={classes.live_table_country}>Country</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {items}
+                </tbody>
+            </table>
+        </>
+    )
+};
+
+
+export function Query({ api }: AppProps) {
+    const [liveList, setLiveList] = useState<LoginAttempt[]>([]);
+    const [queryErr, setQueryErr] = useState<Error | null>(null);
+
+    async function handleSubmit(event: React.FormEvent<HTMLFormElement>) {
+        event.preventDefault();
+        const value = event.currentTarget.query.value;
+        if (value === "") {
+            setQueryErr(new Error("Query cannot be empty"));
+            return
+        }
+        try {
+            const results = await api.query("", value)
+            setQueryErr(null);
+            setLiveList(results);
+        } catch (e) {
+            if (e instanceof Error) {
+                setQueryErr(e);
+            }
+        }
+    }
+    return (
+        <>
+            <form onSubmit={handleSubmit}>
+                <input placeholder="Search..." name="query" type="text" />
+            </form>
+            {queryErr ? <ErrorBox message={queryErr.message} /> : null}
+            <LiveList list={liveList} />
+        </>
+    );
+}
+
+interface ErrorBoxProps {
+    message: string | null
+};
+
+export function ErrorBox({ message }: ErrorBoxProps) {
+    return (
+        <div className={classes.error_box}>
+            <p>Error: {message}</p>
+        </div>
+    )
+}
+
+export function Header() {
+    return (
+        <div className={classes.navbar}>
+            <h2 id="menu-title">apiary.home.2rjus.net</h2>
+            <nav className={classes.nav_flex}>
+                <ul>
+                    <li><NavLink to="/" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Home</NavLink></li>
+                    <li><NavLink to="/stats/password" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Stats</NavLink></li>
+                    <li><NavLink to="/live" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Live</NavLink></li>
+                    <li><NavLink to="/query" className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>Query</NavLink></li>
+                </ul>
+            </nav>
+        </div >
+    );
+}
+
+interface HeaderItem {
+    name: string
+    path: string
+}
+
+interface HeaderMenuProps {
+    title: string
+    items: Array<HeaderItem>
+}
+
+export function HeaderMenu({ title, items }: HeaderMenuProps) {
+    const menuItems = items.map((item) => {
+        return (
+            <li key={item.path}>
+                <NavLink to={item.path} className={({ isActive }) => isActive ? classes.menu_link_active : classes.menu_link}>{item.name}</NavLink>
+            </li>
+        )
+    })
+
+    return (
+        <div className={classes.navbar}>
+            <img id={classes.menu_logo}></img>
+            <h2 id={classes.menu_title}>{title}</h2>
+            <nav className={classes.nav_flex}>
+                <ul>
+                    {menuItems}
+                </ul>
+            </nav>
+        </div>
+    )
+}
+
+export interface SubMenuProps {
+    items: Array<{ name: string, active: () => boolean, onClick: () => void }>
+}
+
+export function SubMenu({ items }: SubMenuProps) {
+    return (
+        <nav className={classes.submenu}>
+            <ul>
+                {items.map((item) => {
+                    return <li>
+                        <a
+                            href="#"
+                            className={item.active() ? classes.sub_menu_active : classes.sub_menu_link}
+                            onClick={item.onClick}>{item.name}</a>
+                    </li>
+                })}
+            </ul>
+        </nav>
+    )
+}
+
+const rootElement = document.getElementById('root');
+if (rootElement) {
+    const root = createRoot(rootElement);
+    let api: ApiaryAPI;
+    if (process.env.NODE_ENV === "production") {
+        api = new ApiaryAPIClient();
+    } else {
+        api = new DummyApiaryAPIClient();
+    }
+
+
+    root.render(
+        <App api={api} />
+    );
+}

frontend/src/tests/api.test.ts

@@ -0,0 +1,17 @@
+import { DummyApiaryAPIClient, TotalStats } from "../js/api";
+
+describe("DummyApiaryAPIClient", () => {
+    const api = new DummyApiaryAPIClient()
+    test("totals returns expeced value", async () => {
+        let totals = await api.totals()
+        const expected: TotalStats = {
+            password: 1,
+            username: 1,
+            ip: 1,
+            attempts: 1,
+            country: 1,
+        }
+
+        expect(totals).toEqual(expected)
+    })
+});

frontend/tsconfig.json

@@ -0,0 +1,16 @@
+{
+  "compilerOptions": {
+    "esModuleInterop": true,
+    "jsx": "react",
+    "module": "esnext",
+    "moduleResolution": "node",
+    "lib": ["dom", "esnext"],
+    "strict": true,
+    "sourceMap": true,
+    "target": "esnext",
+    "types": ["node", "jest"]
+  },
+  "exclude": ["node_modules"],
+  "include": ["src/**/*.ts", "src/**/*.tsx"]
+}
+

go.mod

@@ -1,46 +1,46 @@
 module git.t-juice.club/torjus/apiary
 
-go 1.18
+go 1.23.0
+
+toolchain go1.24.1
 
 require (
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 	github.com/fujiwara/shapeio v1.0.0
-	github.com/gliderlabs/ssh v0.3.5
+	github.com/gliderlabs/ssh v0.3.8
-	github.com/go-chi/chi/v5 v5.0.10
+	github.com/go-chi/chi/v5 v5.2.1
-	github.com/google/uuid v1.3.1
+	github.com/google/uuid v1.6.0
-	github.com/jackc/pgx/v4 v4.18.1
+	github.com/jackc/pgx/v4 v4.18.3
-	github.com/oschwald/maxminddb-golang v1.12.0
+	github.com/oschwald/maxminddb-golang v1.13.1
 	github.com/pelletier/go-toml v1.9.5
-	github.com/prometheus/client_golang v1.17.0
+	github.com/prometheus/client_golang v1.21.1
-	github.com/urfave/cli/v2 v2.25.7
+	github.com/urfave/cli/v2 v2.27.6
-	go.etcd.io/bbolt v1.3.7
+	go.etcd.io/bbolt v1.4.0
-	go.uber.org/zap v1.26.0
+	golang.org/x/crypto v0.36.0
-	golang.org/x/crypto v0.14.0
 )
 
 require (
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.14.1 // indirect
+	github.com/jackc/pgconn v1.14.3 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.3.2 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.3 // indirect
-	github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
+	github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
-	github.com/jackc/pgtype v1.14.0 // indirect
+	github.com/jackc/pgtype v1.14.4 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
-	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/procfs v0.12.0 // indirect
+	github.com/prometheus/common v0.63.0 // indirect
+	github.com/prometheus/procfs v0.16.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/net v0.37.0 // indirect
-	golang.org/x/net v0.17.0 // indirect
+	golang.org/x/sys v0.31.0 // indirect
-	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
-	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
-	golang.org/x/time v0.3.0 // indirect
+	google.golang.org/protobuf v1.36.5 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 )

go.sum

@@ -5,16 +5,16 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cockroachdb/apd v1.1.0 h1:3LFP3629v+1aKXU5Q37mxmRxX/pIu1nijXydLShEq5I=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20190719114852-fd7a80b32e1f/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
 github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
-github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
+github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -23,24 +23,20 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
 github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
 github.com/fujiwara/shapeio v1.0.0 h1:xG5D9oNqCSUUbryZ/jQV3cqe1v2suEjwPIcEg1gKM8M=
 github.com/fujiwara/shapeio v1.0.0/go.mod h1:LmEmu6L/8jetyj1oewewFb7bZCNRwE7wLCUNzDLaLVA=
-github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
+github.com/gliderlabs/ssh v0.3.8 h1:a4YXD1V7xMF9g5nTkdfnja3Sxy1PVDCj1Zg4Wb8vY6c=
-github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
+github.com/gliderlabs/ssh v0.3.8/go.mod h1:xYoytBv1sV0aL3CavoDuJIQNURXkkfPA/wxQ1pL1fAU=
-github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
+github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
+github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
 github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
 github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/gofrs/uuid v4.0.0+incompatible h1:1SD/1F5pU8p29ybwgQSwpQk+mwdRrXCYuPhW6m+TnJw=
 github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
-github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo=
 github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
@@ -51,9 +47,8 @@ github.com/jackc/pgconn v0.0.0-20190831204454-2fabfa3c18b7/go.mod h1:ZJKsE/KZfsU
 github.com/jackc/pgconn v1.8.0/go.mod h1:1C2Pb36bGIP9QHGBYCjnyhqu7Rv3sGshaQUvmfGIB/o=
 github.com/jackc/pgconn v1.9.0/go.mod h1:YctiPyvzfU11JFxoXokUOOKQXQmDMoJL9vJzHH8/2JY=
 github.com/jackc/pgconn v1.9.1-0.20210724152538-d89c8390a530/go.mod h1:4z2w8XhRbP1hYxkpTuBjTS3ne3J48K83+u0zoyvg2pI=
-github.com/jackc/pgconn v1.14.0/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
+github.com/jackc/pgconn v1.14.3 h1:bVoTr12EGANZz66nZPkMInAV/KHD2TxH9npjXXgiB3w=
-github.com/jackc/pgconn v1.14.1 h1:smbxIaZA08n6YuxEX1sDyjV/qkbtUtkH20qLkR9MUR4=
+github.com/jackc/pgconn v1.14.3/go.mod h1:RZbme4uasqzybK2RK5c65VsHxoyaml09lx3tXOcO/VM=
-github.com/jackc/pgconn v1.14.1/go.mod h1:9mBNlny0UvkgJdCDvdVHYSjI+8tD2rnKK69Wz8ti++E=
 github.com/jackc/pgio v1.0.0 h1:g12B9UwVnzGhueNavwioyEEpAmqMe1E/BN9ES+8ovkE=
 github.com/jackc/pgio v1.0.0/go.mod h1:oP+2QK2wFfUWgr+gxjoBH9KGBb31Eio69xUb0w5bYf8=
 github.com/jackc/pgmock v0.0.0-20190831213851-13a1b77aafa2/go.mod h1:fGZlG77KXmcq05nJLRkk0+p82V8B8Dw8KN2/V9c/OAE=
@@ -69,34 +64,41 @@ github.com/jackc/pgproto3/v2 v2.0.0-rc3/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvW
 github.com/jackc/pgproto3/v2 v2.0.0-rc3.0.20190831210041-4c03ce451f29/go.mod h1:ryONWYqW6dqSg1Lw6vXNMXoBJhpzvWKnT95C46ckYeM=
 github.com/jackc/pgproto3/v2 v2.0.6/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
-github.com/jackc/pgproto3/v2 v2.3.2 h1:7eY55bdBeCz1F2fTzSz69QC+pG46jYq9/jtSPiJ5nn0=
+github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag=
-github.com/jackc/pgproto3/v2 v2.3.2/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
+github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA=
 github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E=
-github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a h1:bbPeKD0xmW/Y25WS6cokEszi5g+S0QxI/d45PkRi7Nk=
 github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
+github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
 github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg=
 github.com/jackc/pgtype v0.0.0-20190824184912-ab885b375b90/go.mod h1:KcahbBH1nCMSo2DXpzsoWOAfFkdEtEJpPbVLq8eE+mc=
 github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrUS8lot6TQqcg7mtthZ9T0EoIBFiJcmcyw=
 github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM=
-github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw=
 github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4=
+github.com/jackc/pgtype v1.14.4 h1:fKuNiCumbKTAIxQwXfB/nsrnkEI6bPJrrSiMKgbJ2j8=
+github.com/jackc/pgtype v1.14.4/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA=
 github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y=
 github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM=
 github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc=
 github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs=
-github.com/jackc/pgx/v4 v4.18.1 h1:YP7G1KABtKpB5IHrO9vYwSrCOhs7p3uqhvhhQBptya0=
+github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
-github.com/jackc/pgx/v4 v4.18.1/go.mod h1:FydWkUyadDmdNH/mHnGob881GawxeEm7TcMCzkb+qQE=
+github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA=
+github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw=
 github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
@@ -107,24 +109,24 @@ github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
-github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
+github.com/oschwald/maxminddb-golang v1.13.1 h1:G3wwjdN9JmIK2o/ermkHM+98oX5fS+k5MbwsmL4MRQE=
-github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
+github.com/oschwald/maxminddb-golang v1.13.1/go.mod h1:K4pgV9N/GcK694KSTmVSDTODk4IsCNThNdTmnaBZ/F8=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q=
+github.com/prometheus/client_golang v1.21.1 h1:DOvXXTqVzvkIewV/CDPFdejpMCGeMcbGCQ8YOmu+Ibk=
-github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY=
+github.com/prometheus/client_golang v1.21.1/go.mod h1:U9NM32ykUErtVBxdvD3zfi+EuFkkaBvMb09mIfe0Zgg=
-github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
-github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
-github.com/prometheus/common v0.44.0 h1:+5BrQJwiBB9xsMygAB3TNvpQKOwlkc25LbISbrdOOfY=
+github.com/prometheus/common v0.63.0 h1:YR/EIY1o3mEFP/kZCD7iDMnLPlGyuU2Gb3HIcXnA98k=
-github.com/prometheus/common v0.44.0/go.mod h1:ofAIvZbQ1e/nugmZGz4/qCb9Ap1VoSTIO7x0VV9VvuY=
+github.com/prometheus/common v0.63.0/go.mod h1:VVFF/fBIoToEnWRVkYoXEkq3R3paCoxG9PXP74SnV18=
-github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
+github.com/prometheus/procfs v0.16.0 h1:xh6oHhKwnOJKMYiYBDWmkHqQPyiY40sny36Cmx2bbsM=
-github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
+github.com/prometheus/procfs v0.16.0/go.mod h1:8veyXUu3nGP7oaCxhX6yeaM5u4stL2FeMXnCqhDthZg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
@@ -150,31 +152,27 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ=
+github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
+github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
-github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
-go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
+go.etcd.io/bbolt v1.4.0 h1:TU77id3TnN/zKr7CO/uk+fBCwF2jGcMuw2B/FMAzYIk=
-go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
+go.etcd.io/bbolt v1.4.0/go.mod h1:AsD+OCi/qPN1giOX1aiLAha3o1U8rAz65bvN4j0sRuk=
 go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
 go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
-go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4=
 go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
-go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
-go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
 go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM=
-go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190411191339-88737f569e3a/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -185,28 +183,31 @@ golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWP
 golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20220826181053-bd7e27e6170d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
+golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
-golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
+golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
 golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
+golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -218,21 +219,22 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220825204002-c680a09ffe64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
+golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
+golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -240,11 +242,13 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
-golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
@@ -255,16 +259,14 @@ golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtn
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
 golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=

honeypot/ssh/geolocate.go

@@ -13,7 +13,7 @@ var mmdb []byte
 func (s *HoneypotServer) LookupCountry(ip net.IP) string {
 	db, err := maxminddb.FromBytes(mmdb)
 	if err != nil {
-		s.Logger.Warnw("Error opening geoip database", "error", err)
+		s.Logger.Warn("Error opening geoip database", "error", err)
 		return "??"
 	}
 
@@ -25,7 +25,7 @@ func (s *HoneypotServer) LookupCountry(ip net.IP) string {
 
 	err = db.Lookup(ip, &record)
 	if err != nil {
-		s.Logger.Warnw("Error doing geoip lookup", "error", err)
+		s.Logger.Warn("Error doing geoip lookup", "error", err)
 		return "??"
 	}
 	if record.Country.ISOCode == "None" {

honeypot/ssh/server.go

@@ -3,6 +3,7 @@ package ssh
 import (
 	"context"
 	"io"
+	"log/slog"
 	"net"
 	"os"
 	"time"
@@ -16,11 +17,10 @@ import (
 	"git.t-juice.club/torjus/apiary/models"
 	sshlib "github.com/gliderlabs/ssh"
 	"github.com/google/uuid"
-	"go.uber.org/zap"
 )
 
 type HoneypotServer struct {
-	Logger *zap.SugaredLogger
+	Logger *slog.Logger
 
 	sshServer *sshlib.Server
 
@@ -33,7 +33,7 @@ type HoneypotServer struct {
 func NewHoneypotServer(cfg config.HoneypotConfig, store store.LoginAttemptStore) (*HoneypotServer, error) {
 	var hs HoneypotServer
 	hs.attemptStore = store
-	hs.Logger = zap.NewNop().Sugar()
+	hs.Logger = slog.New(slog.NewTextHandler(io.Discard, nil))
 
 	hs.sshServer = &sshlib.Server{
 		Addr:            cfg.ListenAddr,
@@ -94,19 +94,19 @@ func (hs *HoneypotServer) passwordHandler(ctx sshlib.Context, password string) b
 	}
 	country := hs.LookupCountry(la.RemoteIP)
 	if utf8.RuneCountInString(country) > 2 {
-		hs.Logger.Warnw("Too many characters in country", "country", country, "runecount", utf8.RuneCountInString(country))
+		hs.Logger.Warn("Too many characters in country", "country", country, "runecount", utf8.RuneCountInString(country))
 		country = "??"
 	}
 
 	la.Country = country
-	hs.Logger.Infow("Login attempt",
+	hs.Logger.Info("Login attempt",
 		"remote_ip", la.RemoteIP.String(),
 		"username", la.Username,
 		"password", la.Password,
 		"country", la.Country)
 
 	if err := hs.attemptStore.AddAttempt(&la); err != nil {
-		hs.Logger.Warnw("Error adding attempt to store", "error", err)
+		hs.Logger.Warn("Error adding attempt to store", "error", err)
 	}
 
 	for _, cFunc := range hs.attemptsCallbacks {
@@ -117,7 +117,7 @@ func (hs *HoneypotServer) passwordHandler(ctx sshlib.Context, password string) b
 }
 
 func (s *HoneypotServer) connCallback(ctx sshlib.Context, conn net.Conn) net.Conn {
-	s.Logger.Debugw("Connection received.", "remote_addr", conn.RemoteAddr())
+	s.Logger.Debug("Connection received.", "remote_addr", conn.RemoteAddr())
 
 	throttledConn := newThrottledConn(conn)
 	throttledConn.SetSpeed(s.throttleSpeed)

version.go

@@ -6,7 +6,7 @@ import (
 )
 
 var (
-	Version = "v0.1.32"
+	Version = "v0.2.2"
 	Build   string
 )
 

web/frontend/.browserslistrc

@@ -1,3 +0,0 @@
-> 1%
-last 2 versions
-not dead

web/frontend/.editorconfig

@@ -1,7 +0,0 @@
-[*.{js,jsx,ts,tsx,vue}]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-trim_trailing_whitespace = true
-insert_final_newline = true
-max_line_length = 100

web/frontend/.eslintrc.js

@@ -1,20 +0,0 @@
-module.exports = {
-  root: true,
-  env: {
-    node: true,
-  },
-  extends: [
-    'plugin:vue/essential',
-    '@vue/airbnb',
-    '@vue/typescript/recommended',
-    'prettier'
-  ],
-  parserOptions: {
-    ecmaVersion: 2020,
-  },
-  rules: {
-    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
-    'implicit-arrow-linebreak': 'warn',
-  },
-};

web/frontend/.gitignore

@@ -1,23 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

web/frontend/README.md

@@ -1,24 +0,0 @@
-# vue-frontend
-
-## Project setup
-```
-yarn install
-```
-
-### Compiles and hot-reloads for development
-```
-yarn serve
-```
-
-### Compiles and minifies for production
-```
-yarn build
-```
-
-### Lints and fixes files
-```
-yarn lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).

web/frontend/babel.config.js

@@ -1,5 +0,0 @@
-module.exports = {
-  presets: [
-    '@vue/cli-plugin-babel/preset',
-  ],
-};

web/frontend/package.json

@@ -1,50 +0,0 @@
-{
-  "name": "apiary-frontend",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@fontsource/rubik": "^4.2.2",
-    "@fontsource/secular-one": "^4.2.2",
-    "axios": "^0.21.1",
-    "bootstrap": "^4.6.0",
-    "bootstrap-vue": "^2.21.2",
-    "chart.js": "^3.0.2",
-    "core-js": "^3.6.5",
-    "d3": "^6.6.2",
-    "d3-svg-legend": "^2.25.6",
-    "faker": "^5.5.2",
-    "randomcolor": "^0.6.2",
-    "s-ago": "^2.2.0",
-    "vue": "^2.6.11",
-    "vue-class-component": "^7.2.3",
-    "vue-property-decorator": "^9.1.2",
-    "vue-router": "^3.5.1"
-  },
-  "devDependencies": {
-    "@types/chart.js": "^2.9.32",
-    "@types/d3": "^6.3.0",
-    "@types/faker": "^5.5.1",
-    "@types/randomcolor": "^0.5.5",
-    "@typescript-eslint/eslint-plugin": "^4.18.0",
-    "@typescript-eslint/parser": "^4.18.0",
-    "@vue/cli-plugin-babel": "~4.5.0",
-    "@vue/cli-plugin-eslint": "~4.5.0",
-    "@vue/cli-plugin-typescript": "~4.5.0",
-    "@vue/cli-service": "~4.5.0",
-    "@vue/eslint-config-airbnb": "^5.0.2",
-    "@vue/eslint-config-typescript": "^7.0.0",
-    "eslint": "^6.7.2",
-    "eslint-config-prettier": "^8.1.0",
-    "eslint-plugin-import": "^2.20.2",
-    "eslint-plugin-vue": "^6.2.2",
-    "sass": "^1.26.5",
-    "sass-loader": "^8.0.2",
-    "typescript": "~4.1.5",
-    "vue-template-compiler": "^2.6.11"
-  }
-}

web/frontend/public/index.html

@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="description" content="Stats about logins, usernames and passwords received by the SSH honeypot.">
-  <meta name="viewport" content="width=device-width,initial-scale=1.0">
-  <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <title>apiary.t-juice.club</title>
-</head>
-
-<body>
-  <noscript>
-    <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled.
-        Please enable it to continue.</strong>
-  </noscript>
-  <div id="app"></div>
-  <!-- built files will be auto injected -->
-</body>
-
-</html>

web/frontend/public/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

web/frontend/src/App.vue

@@ -1,75 +0,0 @@
-<template>
-  <div id="app">
-    <div id="apiary-navbar">
-      <b-navbar toggleable="md" type="dark" variant="dark">
-        <b-navbar-brand href="#">
-          <img
-            alt="logo"
-            src="logo192.png"
-            width="29"
-            height="29"
-            class="d-inline-block align-top"
-          />
-          apiary.t-juice.club
-        </b-navbar-brand>
-        <b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
-        <b-collapse id="nav-collapse" is-nav>
-          <b-navbar-nav class="mr-auto">
-            <b-nav-item :to="'/'">Home</b-nav-item>
-            <b-nav-item :to="'/stats'">Stats</b-nav-item>
-            <b-nav-item :to="'/attempts'">Attempts</b-nav-item>
-            <b-nav-item :to="'/search'">Search</b-nav-item>
-          </b-navbar-nav>
-        </b-collapse>
-      </b-navbar>
-    </div>
-    <b-container id="main-content-container" fluid="md">
-      <router-view></router-view>
-    </b-container>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from 'vue-property-decorator';
-import AttemptList from '@/components/AttemptList.vue';
-import Stats from '@/components/Stats.vue';
-import Home from '@/components/Home.vue';
-
-@Component({
-  components: {
-    AttemptList,
-    Stats,
-    Home,
-  },
-})
-export default class App extends Vue {}
-</script>
-
-<style lang="scss">
-$font-stack-header: 'Secular One', sans-serif;
-$font-stack-content: 'Rubik', sans-serif;
-#app {
-  font-family: $font-stack-content;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  text-align: center;
-  color: #2c3e50;
-  margin-top: 0;
-}
-.navbar-brand {
-  font-family: $font-stack-header;
-}
-.navbar-nav a {
-  font-family: $font-stack-content;
-}
-
-h1 h2 h3 {
-  font-family: $font-stack-header;
-}
-
-#main-content-container {
-  margin-top: 50px;
-  text-align: center;
-  display: inline-block;
-}
-</style>

web/frontend/src/apiary/DummyClient.ts

@@ -1,8 +0,0 @@
-import { ApiaryAPI, LoginAttempt } from "@/apiary/apiary";
-
-
-export class ApiaryDummyClient implements ApiaryAPI {
-    streamLoginAttempts(): any {
-        return 'a';
-    }
-}

web/frontend/src/apiary/apiary.ts

@@ -1,35 +0,0 @@
-import FakerStatic from 'faker';
-
-export interface LoginAttempt {
-  readonly date: string;
-  readonly remoteIP: string;
-  readonly username: string;
-  readonly password: string;
-  readonly sshClientVersion: string;
-  readonly connectionUUID: string;
-}
-
-export interface StatResult {
-  name: string;
-  count: number;
-}
-
-export interface ApiaryAPI {
-  streamLoginAttempts(): ReadableStream<LoginAttempt>;
-}
-
-export function fakeAttempt(): LoginAttempt {
-  return {
-    date: FakerStatic.date.recent().toLocaleDateString(),
-    remoteIP: FakerStatic.internet.ip(),
-    username: FakerStatic.internet.userName(),
-    password: FakerStatic.internet.password(),
-    sshClientVersion: FakerStatic.lorem.words(2),
-    connectionUUID: FakerStatic.datatype.uuid(),
-  };
-}
-
-export function fakeAttemptStream(): EventSource {
-  const es = new EventSource('/stream');
-  return es;
-}

web/frontend/src/components/AttemptList.vue

@@ -1,79 +0,0 @@
-<template>
-  <div class="attemptlist">
-    <h1>Live Attempts</h1>
-    <p>
-      <b-table
-        responsive="md"
-        striped
-        hover
-        :items="attempts"
-        :fields="fields"
-      />
-    </p>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator';
-import { BvTableFieldArray, BvTableFormatterCallback } from 'bootstrap-vue';
-import { LoginAttempt } from '@/apiary/apiary';
-
-@Component
-export default class AttemptList extends Vue {
-  @Prop() private items!: LoginAttempt[];
-
-  attempts: LoginAttempt[];
-
-  fields: BvTableFieldArray = [
-    {
-      key: 'date',
-      sortable: true,
-      formatter: (value: string): string => {
-        const d = new Date(value);
-        // This seems stupid...
-        return d.toTimeString().split(' ')[0];
-      },
-      sortByFormatted: false,
-    },
-    {
-      key: 'username',
-    },
-    {
-      key: 'password',
-    },
-    {
-      key: 'remoteIP',
-      sortable: true,
-    },
-    {
-      key: 'country',
-    },
-  ];
-
-  constructor() {
-    super();
-    this.attempts = [];
-  }
-
-  mounted(): void {
-    /**
-    console.log(this);
-    const at: LoginAttempt[] = [];
-
-    for (let i = 0; i < 5; i += 1) {
-      at.push(fakeAttempt());
-    }
-
-    setInterval(() => {
-      at.push(fakeAttempt());
-    }, 1000);
-    */
-
-    const attemptStream = new EventSource('/api/stream');
-    attemptStream.addEventListener('message', (ev: MessageEvent<string>) => {
-      const parsed: LoginAttempt = JSON.parse(ev.data);
-      this.attempts.unshift(parsed);
-    });
-  }
-}
-</script>

web/frontend/src/components/Home.vue

@@ -1,145 +0,0 @@
-<template>
-  <div class="home">
-    <b-container v-if="ready">
-      <b-row>
-        <b-col class="total-title">
-          <h2>Total login attempts</h2>
-        </b-col>
-        <b-col class="total-count">
-          <h2>{{ totalLoginAttempts }}</h2>
-        </b-col>
-      </b-row>
-      <b-row>
-        <b-col class="total-title">
-          <h2>Unique passwords</h2>
-        </b-col>
-        <b-col class="total-count">
-          <h2>{{ uniquePasswords }}</h2>
-        </b-col>
-      </b-row>
-      <b-row>
-        <b-col class="total-title">
-          <h2>Unique usernames</h2>
-        </b-col>
-        <b-col class="total-count">
-          <h2>{{ uniqueUsernames }}</h2>
-        </b-col>
-      </b-row>
-      <b-row>
-        <b-col class="total-title">
-          <h2>Unique IPs</h2>
-        </b-col>
-        <b-col class="total-count">
-          <h2>{{ uniqueIPs }}</h2>
-        </b-col>
-      </b-row>
-    </b-container>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue, Watch } from 'vue-property-decorator';
-import axios from 'axios';
-
-type TotalStatsHeaders =
-  | 'UniquePasswords'
-  | 'UniqueUsernames'
-  | 'UniqueIPs'
-  | 'UniqueCountries'
-  | 'TotalLoginAttempts';
-
-interface TotalStatsResult {
-  name: TotalStatsHeaders;
-  count: number;
-}
-
-@Component
-export default class Home extends Vue {
-  totalLoginAttempts: number;
-
-  uniquePasswords: number;
-
-  uniqueUsernames: number;
-
-  uniqueIPs: number;
-
-  uniqueCountries: number;
-
-  private updaterHandle?: number;
-
-  ready = false;
-
-  constructor() {
-    super();
-    this.totalLoginAttempts = 0;
-    this.uniquePasswords = 0;
-    this.uniqueUsernames = 0;
-    this.uniqueIPs = 0;
-    this.uniqueCountries = 0;
-  }
-
-  updateStats(): void {
-    const url = `/api/stats?type=total`;
-    axios
-      .get<TotalStatsResult[]>(url)
-      .then((resp) => {
-        const totals = resp.data.find((e) => e.name === 'TotalLoginAttempts')
-          ?.count;
-        if (totals) {
-          this.totalLoginAttempts = totals;
-        }
-
-        const passwords = resp.data.find((e) => e.name === 'UniquePasswords')
-          ?.count;
-        if (passwords) {
-          this.uniquePasswords = passwords;
-        }
-
-        const usernames = resp.data.find((e) => e.name === 'UniqueUsernames')
-          ?.count;
-        if (usernames) {
-          this.uniqueUsernames = usernames;
-        }
-
-        const ips = resp.data.find((e) => e.name === 'UniqueIPs')?.count;
-        if (ips) {
-          this.uniqueIPs = ips;
-        }
-
-        const countries = resp.data.find((e) => e.name === 'UniqueCountries')
-          ?.count;
-        if (countries) {
-          this.uniqueCountries = countries;
-        }
-
-        this.ready = true;
-      })
-      .catch((e) => {
-        console.log(e);
-      });
-  }
-
-  created(): void {
-    this.updateStats();
-
-    this.updaterHandle = setInterval(() => {
-      this.updateStats();
-    }, 5000);
-  }
-
-  beforeDestroy(): void {
-    clearInterval(this.updaterHandle);
-  }
-}
-</script>
-<style scoped lang="scss">
-.home {
-  text-align: left;
-}
-.total-title {
-  text-align: right;
-}
-.total-count {
-  text-align: left;
-}
-</style>

web/frontend/src/components/SearchResult.vue

@@ -1,81 +0,0 @@
-<template>
-  <div class="search-result-container">
-    <h1>Search</h1>
-    <b-form @submit="onSubmit">
-      <b-form-input v-model="searchString" placeholder="" />
-    </b-form>
-    <b-table
-      class="search-results-table"
-      responsive="md"
-      striped
-      hover
-      :items="attempts"
-      :fields="fields"
-    />
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from 'vue-property-decorator';
-import { LoginAttempt } from '@/apiary/apiary';
-import { BvTableFieldArray, BvTableFormatterCallback } from 'bootstrap-vue';
-import Axios from 'axios';
-
-@Component
-export default class SearchResult extends Vue {
-  attempts: LoginAttempt[];
-
-  searchString: string;
-
-  constructor() {
-    super();
-    this.attempts = [];
-    this.searchString = '';
-  }
-
-  fields: BvTableFieldArray = [
-    {
-      key: 'date',
-      sortable: true,
-      formatter: (value: string): string => {
-        const d = new Date(value);
-        // This seems stupid...
-        return d.toTimeString().split(' ')[0];
-      },
-      sortByFormatted: false,
-    },
-    {
-      key: 'username',
-    },
-    {
-      key: 'password',
-    },
-    {
-      key: 'remoteIP',
-      sortable: true,
-    },
-    {
-      key: 'country',
-    },
-  ];
-
-  onSubmit(event: Event) {
-    event.preventDefault();
-
-    console.log(this.searchString);
-    const resp = Axios.get<LoginAttempt[]>(
-      `/api/query?query=${this.searchString}`,
-    );
-
-    resp.then((r) => {
-      this.attempts = r.data;
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.search-results-table {
-  margin-top: 50px;
-}
-</style>

web/frontend/src/components/Stats.vue

@@ -1,52 +0,0 @@
-<template>
-  <div class="stats">
-    <h1>Login Stats</h1>
-    <b-card no-body>
-      <b-tabs card>
-        <b-tab title="Totals">
-          <b-card-body>
-            <home></home>
-          </b-card-body>
-        </b-tab>
-        <b-tab title="Usernames">
-          <b-card-body>
-            <stats-pie statType="username" />
-          </b-card-body>
-        </b-tab>
-        <b-tab title="Passwords">
-          <b-card-body>
-            <stats-pie statType="password"></stats-pie>
-          </b-card-body>
-        </b-tab>
-        <b-tab title="Countries">
-          <b-card-body>
-            <stats-pie statType="country"></stats-pie>
-          </b-card-body>
-        </b-tab>
-        <b-tab title="IPs">
-          <b-card-body>
-            <stats-pie statType="ip"></stats-pie>
-          </b-card-body>
-        </b-tab>
-      </b-tabs>
-    </b-card>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator';
-import StatsUsername from '@/components/StatsUsername.vue';
-import StatsPie from '@/components/StatsPie.vue';
-import Home from '@/components/Home.vue';
-
-@Component({
-  components: {
-    StatsUsername,
-    StatsPie,
-    Home,
-  },
-})
-export default class Stats extends Vue {}
-</script>
-<style lang="scss" scoped>
-</style>

web/frontend/src/components/StatsPie.vue

@@ -1,187 +0,0 @@
-<template>
-  <div class="stats-container" :class="containerClass">
-    <h2>
-      {{ title() }}
-      <b-icon :id="chartSettingsID()" icon="gear-fill"></b-icon>
-    </h2>
-    <div class="chart-container">
-      <canvas :id="chartID()" width="300" height="300"></canvas>
-    </div>
-    <b-popover
-      :target="chartSettingsID()"
-      triggers="click"
-      :show.sync="settingsShow"
-      placement="auto"
-      container="stats-container"
-      ref="popover"
-      @show="onShow"
-    >
-      <template #title>
-        <b-button @click="onClose" class="close" aria-label="Close">
-          <span class="d-inline-block" aria-hidden="true">&times;</span>
-        </b-button>
-        Settings
-      </template>
-
-      <div>
-        <b-form-group
-          label="Limit"
-          label-for="limitinput"
-          label-cols="3"
-          class="mb-1"
-          description="Limit number of items"
-          invalid-feedback="This field is required"
-        >
-          <b-form-input
-            ref="limitinput"
-            id="limitinput"
-            v-model="limitState"
-            type="number"
-            size="sm"
-          ></b-form-input>
-        </b-form-group>
-
-        <b-button @click="onClose" size="sm" variant="danger">Cancel</b-button>
-        <b-button @click="onOk" size="sm" variant="primary">Ok</b-button>
-      </div>
-    </b-popover>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue, Watch } from 'vue-property-decorator';
-import { StatResult } from '@/apiary/apiary';
-import axios from 'axios';
-import { Chart, ArcElement, Legend, DoughnutController, Title } from 'chart.js';
-import randomColor from 'randomcolor';
-
-export type StatType = 'username' | 'password' | 'ip' | 'country' | 'total';
-
-Chart.register(ArcElement, Legend, DoughnutController, Title);
-
-@Component
-export default class StatsPie extends Vue {
-  @Prop() private statType!: StatType;
-
-  limit: number;
-
-  limitState: number;
-
-  settingsShow = false;
-
-  stats: StatResult[];
-
-  chart?: Chart;
-
-  constructor() {
-    super();
-    this.stats = [];
-    this.limit = 10;
-    this.limitState = 10;
-  }
-
-  title(): string {
-    switch (this.statType) {
-      case 'password':
-        return `Top ${this.limit} Passwords`;
-      case 'username':
-        return `Top ${this.limit} Usernames`;
-      case 'ip':
-        return `Top ${this.limit} IPs`;
-      case 'country':
-        return `Top ${this.limit} Countries`;
-      case 'total':
-        return 'Totals';
-      // Why doesn't eslint know that this switch is exhaustive?
-      default:
-        return 'Top 10 Passwords';
-    }
-  }
-
-  containerClass(): string {
-    return `stats-container-${this.statType}`;
-  }
-
-  chartID(): string {
-    return `chart-${this.statType}`;
-  }
-
-  chartSettingsID(): string {
-    return `chartsettings-${this.statType}`;
-  }
-
-  settingsID(): string {
-    return `settings-${this.statType}`;
-  }
-
-  onClose(): void {
-    this.settingsShow = false;
-  }
-
-  onOk(): void {
-    if (this.limitState) {
-      this.limit = this.limitState;
-      this.settingsShow = false;
-    }
-  }
-
-  onShow(): void {
-    // This is called just before the popover is shown
-    // Reset our popover form variables
-    this.limitState = this.limit;
-  }
-
-  @Watch('limit')
-  limitChanged(value: number, oldValue: number): void {
-    this.fetchData();
-  }
-
-  fetchData(): void {
-    const url = `/api/stats?type=${this.statType}&limit=${this.limit}`;
-    axios.get<StatResult[]>(url).then((resp) => {
-      this.stats = resp.data;
-      this.renderPie();
-    });
-  }
-
-  mounted(): void {
-    this.fetchData();
-  }
-
-  renderPie(): void {
-    const elem = document.getElementById(this.chartID()) as HTMLCanvasElement;
-    const ctx = elem.getContext('2d') as CanvasRenderingContext2D;
-    const sortedStats = this.stats.sort();
-    const values = sortedStats.map((s) => s.count);
-    const headers = sortedStats.map((s) => s.name);
-    const colors = sortedStats.map(() => randomColor());
-
-    if (this.chart) {
-      this.chart.destroy();
-    }
-    this.chart = new Chart(ctx, {
-      type: 'doughnut',
-      data: {
-        labels: headers,
-        datasets: [
-          {
-            data: values,
-            backgroundColor: colors,
-          },
-        ],
-      },
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-canvas {
-  width: 70%;
-  height: auto;
-  max-height: 60vmin;
-}
-.stats-container {
-  align-content: center;
-}
-</style>

web/frontend/src/components/StatsUsername.vue

@@ -1,67 +0,0 @@
-<template>
-  <div class="stats-container">
-    <h2>Top 10 usernames</h2>
-    <div class="chart-container">
-      <canvas id="chart" widht="400" height="400"></canvas>
-    </div>
-  </div>
-</template>
-
-<script lang="ts">
-import { Component, Prop, Vue } from 'vue-property-decorator';
-import { StatResult } from '@/apiary/apiary';
-import axios from 'axios';
-import Chart from 'chart.js/auto';
-import randomColor from 'randomcolor';
-
-@Component
-export default class StatsUsername extends Vue {
-  @Prop() private msg!: string;
-
-  stats: StatResult[];
-
-  constructor() {
-    super();
-    this.stats = [];
-  }
-
-  mounted(): void {
-    axios
-      .get<StatResult[]>('/api/stats?type=username&limit=10')
-      .then((resp) => {
-        this.stats = resp.data;
-        this.renderPie();
-      });
-  }
-
-  renderPie(): void {
-    const elem = document.getElementById('chart') as HTMLCanvasElement;
-    const ctx = elem.getContext('2d') as CanvasRenderingContext2D;
-    const sortedStats = this.stats.sort();
-    const values = sortedStats.map((s) => s.count);
-    const headers = sortedStats.map((s) => s.name);
-    const colors = sortedStats.map(() => randomColor());
-
-    const chart = new Chart(ctx, {
-      type: 'doughnut',
-      data: {
-        labels: headers,
-        options: {},
-        datasets: [
-          {
-            data: values,
-            backgroundColor: colors,
-          },
-        ],
-      },
-    });
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.chart-container {
-  max-width: 500px;
-  max-height: 500px;
-}
-</style>

web/frontend/src/main.ts

@@ -1,58 +0,0 @@
-import Vue from 'vue';
-import { BootstrapVue, IconsPlugin } from 'bootstrap-vue';
-import VueRouter, { RouteConfig } from 'vue-router';
-import AttemptList from '@/components/AttemptList.vue';
-import Home from '@/components/Home.vue';
-import Stats from '@/components/Stats.vue';
-import SearchResult from '@/components/SearchResult.vue';
-import 'bootstrap/dist/css/bootstrap.css';
-import 'bootstrap-vue/dist/bootstrap-vue.css';
-import '@fontsource/rubik';
-import '@fontsource/secular-one';
-import App from './App.vue';
-
-Vue.config.productionTip = false;
-// Make BootstrapVue available throughout your project
-Vue.use(BootstrapVue);
-// Optionally install the BootstrapVue icon components plugin
-Vue.use(IconsPlugin);
-
-Vue.use(VueRouter);
-
-const routes: Array<RouteConfig> = [
-  {
-    path: '/',
-    name: 'Home',
-    component: Home,
-    alias: '/home',
-  },
-  {
-    path: '/attempts',
-    name: 'Attempt List',
-    component: AttemptList,
-    props: {
-      // items: testAttempts,
-    },
-  },
-  {
-    path: '/stats',
-    name: 'Stats',
-    component: Stats,
-  },
-  {
-    path: '/search',
-    name: 'Search',
-    component: SearchResult,
-  }
-];
-
-const router = new VueRouter({
-  mode: 'history',
-  base: process.env.BASE_URL,
-  routes,
-});
-
-new Vue({
-  router,
-  render: (h) => h(App),
-}).$mount('#app');

web/frontend/src/shims-tsx.d.ts

@@ -1,13 +0,0 @@
-import Vue, { VNode } from 'vue';
-
-declare global {
-  namespace JSX {
-    // tslint:disable no-empty-interface
-    interface Element extends VNode {}
-    // tslint:disable no-empty-interface
-    interface ElementClass extends Vue {}
-    interface IntrinsicElements {
-      [elem: string]: any
-    }
-  }
-}

web/frontend/src/shims-vue.d.ts

@@ -1,5 +0,0 @@
-declare module '*.vue' {
-  import Vue from 'vue';
-
-  export default Vue;
-}

web/frontend/tsconfig.json

@@ -1,40 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "esnext",
-    "module": "esnext",
-    "strict": true,
-    "jsx": "preserve",
-    "importHelpers": true,
-    "moduleResolution": "node",
-    "experimentalDecorators": true,
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "sourceMap": true,
-    "baseUrl": ".",
-    "types": [
-      "webpack-env"
-    ],
-    "paths": {
-      "@/*": [
-        "src/*"
-      ]
-    },
-    "lib": [
-      "esnext",
-      "dom",
-      "dom.iterable",
-      "scripthost"
-    ]
-  },
-  "include": [
-    "src/**/*.ts",
-    "src/**/*.tsx",
-    "src/**/*.vue",
-    "tests/**/*.ts",
-    "tests/**/*.tsx"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}

web/middleware.go

@@ -21,7 +21,7 @@ func (s *Server) LoggingMiddleware(next http.Handler) http.Handler {
 			if s.cfg.AccessLogIgnoreMetrics && r.URL.Path == "/metrics" && ww.Status() == http.StatusOK {
 				return
 			}
-			s.AccessLogger.Infow(r.Method,
+			s.AccessLogger.Info(r.Method,
 				"path", r.URL.Path,
 				"status", ww.Status(),
 				"written", ww.BytesWritten(),

web/server.go

@@ -6,6 +6,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"log/slog"
 	"net/http"
 	"strconv"
 	"sync"
@@ -20,7 +21,6 @@ import (
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/google/uuid"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"go.uber.org/zap"
 	"golang.org/x/crypto/acme/autocert"
 )
 
@@ -35,8 +35,8 @@ type Server struct {
 	honeypotServer *ssh.HoneypotServer
 	store          store.LoginAttemptStore
 
-	ServerLogger *zap.SugaredLogger
+	ServerLogger *slog.Logger
-	AccessLogger *zap.SugaredLogger
+	AccessLogger *slog.Logger
 
 	attemptListenersLock sync.RWMutex
 	attemptListeners     map[string]chan models.LoginAttempt
@@ -44,9 +44,10 @@ type Server struct {
 }
 
 func NewServer(cfg config.FrontendConfig, hs *ssh.HoneypotServer, store store.LoginAttemptStore) *Server {
+	discardLogger := slog.New(slog.NewTextHandler(io.Discard, nil))
 	s := &Server{
-		ServerLogger: zap.NewNop().Sugar(),
+		ServerLogger: discardLogger,
-		AccessLogger: zap.NewNop().Sugar(),
+		AccessLogger: discardLogger,
 		store:        store,
 		cfg:          cfg,
 	}
@@ -125,7 +126,7 @@ func (s *Server) StartServe() error {
 			s.ServerLogger.Debug("Starting HTTP redirect server")
 			go func() {
 				if err := s.httpRedirectServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
-					s.ServerLogger.Warnw("HTTP redirect server returned error", "error", err)
+					s.ServerLogger.Warn("HTTP redirect server returned error", "error", err)
 				}
 			}()
 		}
@@ -174,7 +175,7 @@ func (s *Server) HandlerAttemptStream(w http.ResponseWriter, r *http.Request) {
 			}
 			_, err = io.WriteString(w, fmt.Sprintf("data: %s\n\n", string(data)))
 			if err != nil {
-				s.ServerLogger.Warnw("Error writing event", "error", err)
+				s.ServerLogger.Warn("Error writing event", "error", err)
 			}
 			flusher.Flush()
 			ticker.Reset(streamKeepAliveDuration)
@@ -184,7 +185,7 @@ func (s *Server) HandlerAttemptStream(w http.ResponseWriter, r *http.Request) {
 			return
 		case <-ticker.C:
 			if _, err := io.WriteString(w, ": keep-alive\n\n"); err != nil {
-				s.ServerLogger.Warnw("Error writing event", "error", err)
+				s.ServerLogger.Warn("Error writing event", "error", err)
 			}
 			flusher.Flush()
 		}
@@ -207,14 +208,14 @@ func (s *Server) HandlerStats(w http.ResponseWriter, r *http.Request) {
 
 	stats, err := s.store.Stats(statType, limit)
 	if err != nil {
-		s.ServerLogger.Warnw("Error fetching stats", "error", err)
+		s.ServerLogger.Warn("Error fetching stats", "error", err)
 		s.WriteAPIError(w, r, http.StatusInternalServerError, "Error fetching stats")
 		return
 	}
 
 	encoder := json.NewEncoder(w)
 	if err := encoder.Encode(stats); err != nil {
-		s.ServerLogger.Debugf("Error encoding or writing response", "remote_ip", r.RemoteAddr, "error", err)
+		s.ServerLogger.Debug("Error encoding or writing response", "remote_ip", r.RemoteAddr, "error", err)
 	}
 }
 
@@ -241,13 +242,13 @@ func (s *Server) HandlerQuery(w http.ResponseWriter, r *http.Request) {
 		userResults, err := s.store.Query(uq)
 		if err != nil {
 			s.WriteAPIError(w, r, http.StatusInternalServerError, "Unable to perform query")
-			s.ServerLogger.Warnw("Error performing query", "error", err)
+			s.ServerLogger.Warn("Error performing query", "error", err)
 			return
 		}
 		passwordResults, err := s.store.Query(pq)
 		if err != nil {
 			s.WriteAPIError(w, r, http.StatusInternalServerError, "Unable to perform query")
-			s.ServerLogger.Warnw("Error performing query", "error", err)
+			s.ServerLogger.Warn("Error performing query", "error", err)
 			return
 		}
 
@@ -263,7 +264,7 @@ func (s *Server) HandlerQuery(w http.ResponseWriter, r *http.Request) {
 		queryResults, err := s.store.Query(aq)
 		if err != nil {
 			s.WriteAPIError(w, r, http.StatusInternalServerError, "Unable to perform query")
-			s.ServerLogger.Warnw("Error performing query", "error", err)
+			s.ServerLogger.Warn("Error performing query", "error", err)
 			return
 		}
 
@@ -272,7 +273,7 @@ func (s *Server) HandlerQuery(w http.ResponseWriter, r *http.Request) {
 
 	encoder := json.NewEncoder(w)
 	if err := encoder.Encode(&results); err != nil {
-		s.ServerLogger.Warnw("Error writing query results", "error", err)
+		s.ServerLogger.Warn("Error writing query results", "error", err)
 	}
 }
 
@@ -294,6 +295,6 @@ func (s *Server) WriteAPIError(w http.ResponseWriter, r *http.Request, status in
 	apiErr := APIErrorResponse{Error: message}
 	w.WriteHeader(status)
 	if err := encoder.Encode(&apiErr); err != nil {
-		s.ServerLogger.Debugf("Error encoding or writing error response", "remote_ip", r.RemoteAddr, "error", err)
+		s.ServerLogger.Debug("Error encoding or writing error response", "remote_ip", r.RemoteAddr, "error", err)
 	}
 }