From 2000084dd6b2bceb7ae25372b17893ba53c8f2cb Mon Sep 17 00:00:00 2001 From: Simon Skoczylas Date: Wed, 4 Feb 2026 17:12:04 +0100 Subject: [PATCH 01/21] Improve templating, add basic details page --- server/resources/detail.html | 7 + server/resources/flags.css | 8 + server/resources/index.html | 21 +-- .../{banned.html => partial_banned.html} | 0 server/resources/partial_head.html | 11 ++ .../{jailcard.html => partial_jailcard.html} | 0 server/server.go | 153 +++++++++++++++--- 7 files changed, 157 insertions(+), 43 deletions(-) create mode 100644 server/resources/detail.html create mode 100644 server/resources/flags.css rename server/resources/{banned.html => partial_banned.html} (100%) create mode 100644 server/resources/partial_head.html rename server/resources/{jailcard.html => partial_jailcard.html} (100%) diff --git a/server/resources/detail.html b/server/resources/detail.html new file mode 100644 index 0000000..1601e34 --- /dev/null +++ b/server/resources/detail.html @@ -0,0 +1,7 @@ + + +{{ template "head" . }} + +

Details

+ + \ No newline at end of file diff --git a/server/resources/flags.css b/server/resources/flags.css new file mode 100644 index 0000000..524c786 --- /dev/null +++ b/server/resources/flags.css @@ -0,0 +1,8 @@ +{{ range $key, $value := . }} +.flag-{{ $key }} { + width: 21px; + height: 15px; + background: url(data:image/png;base64,{{ $value }}) no-repeat; + display: inline-block; +} +{{ end }} \ No newline at end of file diff --git a/server/resources/index.html b/server/resources/index.html index a30dad0..d70af53 100644 --- a/server/resources/index.html +++ b/server/resources/index.html @@ -1,25 +1,6 @@ - - - - - - - - - fail2ban dashboard - {{ .Version }} - - +{{ template "head" . }}

fail2ban dashboard - {{ .Version }} fail2ban - {{ .Fail2BanVersion }}

diff --git a/server/resources/banned.html b/server/resources/partial_banned.html similarity index 100% rename from server/resources/banned.html rename to server/resources/partial_banned.html diff --git a/server/resources/partial_head.html b/server/resources/partial_head.html new file mode 100644 index 0000000..157134d --- /dev/null +++ b/server/resources/partial_head.html @@ -0,0 +1,11 @@ + + + + + + + + + fail2ban dashboard - {{ .Version }} + + \ No newline at end of file diff --git a/server/resources/jailcard.html b/server/resources/partial_jailcard.html similarity index 100% rename from server/resources/jailcard.html rename to server/resources/partial_jailcard.html diff --git a/server/server.go b/server/server.go index 287c3fc..6e0f1a7 100644 --- a/server/server.go +++ b/server/server.go @@ -4,12 +4,14 @@ import ( "crypto/rand" _ "embed" "encoding/binary" + "fmt" "html/template" "net" "path" "sort" "strconv" "strings" + textTemplate "text/template" "time" "github.com/gofiber/fiber/v2" @@ -35,12 +37,21 @@ var faviconICOFile []byte //go:embed resources/index.html var indexHtml []byte -//go:embed resources/jailcard.html +//go:embed resources/detail.html +var detailHtml []byte + +//go:embed resources/partial_jailcard.html var jailCardHtml []byte -//go:embed resources/banned.html +//go:embed resources/partial_banned.html var bannedHtml []byte +//go:embed resources/partial_head.html +var headHtml []byte + +//go:embed resources/flags.css +var flagsCss []byte + type Configuration struct { Address string AuthUser string @@ -56,10 +67,10 @@ type indexData struct { Version string Fail2BanVersion string BasePath string + CountryCodes template.URL Jails []store.Jail HasBanned bool Banned []client.BanEntry - CountryCodes map[string]string OrderAddress Sorted OrderJail Sorted OrderPenalty Sorted @@ -67,7 +78,15 @@ type indexData struct { OrderEnds Sorted } -func Serve(version string, fail2banVersion string, basePath string, trustProxyHeaders bool, store *store.DataStore, geoIP *geoip.GeoIP, configuration *Configuration) error { +type detailData struct { + Version string + Fail2BanVersion string + BasePath string + CountryCodes map[string]string + Jail store.Jail +} + +func Serve(version string, fail2banVersion string, basePath string, trustProxyHeaders bool, dataStore *store.DataStore, geoIP *geoip.GeoIP, configuration *Configuration) error { templateFunctions := template.FuncMap{ "safe": func(s string) template.URL { @@ -84,18 +103,40 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return indexTemplateError } - // value not needed in code as it is used in the index template + detailTemplate, detailTemplateError := template.New("detail").Funcs(templateFunctions).Parse(string(detailHtml)) + if detailTemplateError != nil { + return detailTemplateError + } + + flagsTemplate, flagsTemplateError := textTemplate.New("flags").Parse(string(flagsCss)) + if flagsTemplateError != nil { + return flagsTemplateError + } + + // value isn't needed in code as it is used in the index template _, jailCardTemplateError := indexTemplate.New("jailCard").Parse(string(jailCardHtml)) if jailCardTemplateError != nil { return jailCardTemplateError } - // value not needed in code as it is used in the index template + // value isn't needed in code as it is used in the index template _, bannedTemplateError := indexTemplate.New("banned").Parse(string(bannedHtml)) if bannedTemplateError != nil { return bannedTemplateError } + // value isn't needed in code as it is used in the index template + _, indexHeadTemplateError := indexTemplate.New("head").Parse(string(headHtml)) + if indexHeadTemplateError != nil { + return indexHeadTemplateError + } + + // value isn't needed in code as it is used in the index template + _, detailHeadTemplateError := detailTemplate.New("head").Parse(string(headHtml)) + if detailHeadTemplateError != nil { + return detailHeadTemplateError + } + app := fiber.New(fiber.Config{ DisableStartupMessage: true, }) @@ -136,38 +177,49 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return c.Send(daisyUiCSSFile) }) + dashboard.Get("css/flags.css", func(c *fiber.Ctx) error { + codeQuery := c.Query("c") + if codeQuery == "" { + return c.SendStatus(fiber.StatusNotFound) + } + countryCodeValues := strings.Split(codeQuery, ",") + + countryCodes := make(map[string]string) + + for _, countryCode := range countryCodeValues { + countryCodes[countryCode] = Flags[strings.ToUpper(countryCode)] + } + + var sb strings.Builder + err := flagsTemplate.Execute(&sb, countryCodes) + if err != nil { + return err + } + c.Set(fiber.HeaderContentType, "text/css") + return c.SendString(sb.String()) + }) + dashboard.Get("js/browser@4.js", func(c *fiber.Ctx) error { c.Set(fiber.HeaderContentType, fiber.MIMEApplicationJavaScript) return c.Send(tailwindJSFile) }) dashboard.Get("/", func(c *fiber.Ctx) error { - remoteIP := c.IP() - additionalInfo := "" - if trustProxyHeaders { - xff := c.Get("X-Forwarded-For") - xri := c.Get("X-Real-Ip") - remoteIP = firstNonEmpty(remoteIP, xff, xri) - if xff != "" || xri != "" { - additionalInfo += "forwarded" - } - log.Debugf("X-Forwarded-For: %s, X-Real-Ip: %s", xff, xri) - } - log.Infof("Access overview at %s%s for %s (%s)", c.BaseURL(), c.OriginalURL(), remoteIP, additionalInfo) - jails := store.GetJails() + accessLog(trustProxyHeaders, "overview", c) + jails := dataStore.GetJails() banned := make([]client.BanEntry, 0) for _, jail := range jails { banned = append(banned, jail.BannedEntries...) } - countryCodes := make(map[string]string) + countryCodes := make([]string, 0) for index, ban := range banned { countryCode, exists := geoIP.Lookup(ban.Address) if exists { ban.CountryCode = countryCode - countryCodes[countryCode] = Flags[countryCode] + countryCodes = append(countryCodes, countryCode) } else { ban.CountryCode = "unknown" } @@ -186,7 +238,7 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe Jails: jails, HasBanned: len(banned) > 0, Banned: banned, - CountryCodes: countryCodes, + CountryCodes: template.URL("flags.css?c=" + strings.Join(countryCodes, ",")), OrderAddress: toggleSortOrder("address", sorting, order), OrderJail: toggleSortOrder("jail", sorting, order), OrderPenalty: toggleSortOrder("penalty", sorting, order), @@ -203,7 +255,34 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return c.SendString(sb.String()) }) - store.Start() + dashboard.Get("/:jail", func(c *fiber.Ctx) error { + jailName := c.Params("jail") + name := fmt.Sprintf("%s details", jailName) + accessLog(trustProxyHeaders, name, c) + + jailByName, exists := dataStore.GetJailByName(jailName) + + if !exists { + return c.Status(404).SendString("Jail not found") + } + + detail := &detailData{ + Version: version, + Fail2BanVersion: fail2banVersion, + BasePath: cleanBasePathForTemplate(cleanedBasePath), + Jail: jailByName, + } + + var sb strings.Builder + err := detailTemplate.Execute(&sb, detail) + if err != nil { + return err + } + c.Set(fiber.HeaderContentType, fiber.MIMETextHTML) + return c.SendString(sb.String()) + }) + + dataStore.Start() log.Infof("Listening on address %s", configuration.Address) @@ -327,3 +406,31 @@ func cleanBasePath(basePath string) string { func cleanBasePathForTemplate(basePath string) string { return strings.TrimSuffix(basePath, "/") } + +func getCountryCodes(countries []string) map[string]string { + countryCodes := make(map[string]string) + + for _, countryCode := range countries { + countryCodes[countryCode] = Flags[countryCode] + } + + return countryCodes +} + +func accessLog(trustProxyHeaders bool, name string, c *fiber.Ctx) { + remoteIP := c.IP() + additionalInfo := "" + if trustProxyHeaders { + xff := c.Get("X-Forwarded-For") + xri := c.Get("X-Real-Ip") + remoteIP = firstNonEmpty(remoteIP, xff, xri) + if xff != "" || xri != "" { + additionalInfo += "forwarded" + } + log.Debugf("X-Forwarded-For: %s, X-Real-Ip: %s", xff, xri) + if len(additionalInfo) > 0 { + additionalInfo = fmt.Sprintf("(%s)", additionalInfo) + } + } + log.Infof("Access %s at %s%s for %s %s", name, c.BaseURL(), c.OriginalURL(), remoteIP, additionalInfo) +} From 5f6d34e62ba83c741d221ce4257c3a093e56faf5 Mon Sep 17 00:00:00 2001 From: Simon Skoczylas Date: Wed, 4 Feb 2026 17:33:42 +0100 Subject: [PATCH 02/21] Add data to the details page, improve layout --- server/resources/detail.html | 31 +++++++++++++++++-- server/resources/partial_jailcard.html | 2 +- server/server.go | 43 +++++++++++++++++++++----- 3 files changed, 64 insertions(+), 12 deletions(-) diff --git a/server/resources/detail.html b/server/resources/detail.html index 1601e34..1913b42 100644 --- a/server/resources/detail.html +++ b/server/resources/detail.html @@ -1,7 +1,32 @@ {{ template "head" . }} - -

Details

- + +
+

fail2ban dashboard - {{ .Version }} fail2ban - {{ .Fail2BanVersion }}

+
+ +
+
+
+ {{ if .HasBanned }} +
+

Currently banned

+
+
+ + + {{ range .Banned }} + {{ template "banned" . }} + {{ end }} + +
+
+
+
+ {{ end }} +
+ \ No newline at end of file diff --git a/server/resources/partial_jailcard.html b/server/resources/partial_jailcard.html index d674e60..ed425fc 100644 --- a/server/resources/partial_jailcard.html +++ b/server/resources/partial_jailcard.html @@ -1,5 +1,5 @@
-
{{ .Name }}
+
{{ .Name }}
{{ .BannedCount }}
failed {{ .CurrentlyFailed }} / {{ .TotalFailed }}
banned {{ .CurrentlyBanned }} / {{ .TotalBanned }}
diff --git a/server/server.go b/server/server.go index 6e0f1a7..6883f1c 100644 --- a/server/server.go +++ b/server/server.go @@ -68,9 +68,9 @@ type indexData struct { Fail2BanVersion string BasePath string CountryCodes template.URL - Jails []store.Jail HasBanned bool Banned []client.BanEntry + Jails []store.Jail OrderAddress Sorted OrderJail Sorted OrderPenalty Sorted @@ -82,7 +82,9 @@ type detailData struct { Version string Fail2BanVersion string BasePath string - CountryCodes map[string]string + CountryCodes template.URL + HasBanned bool + Banned []client.BanEntry Jail store.Jail } @@ -114,15 +116,15 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe } // value isn't needed in code as it is used in the index template - _, jailCardTemplateError := indexTemplate.New("jailCard").Parse(string(jailCardHtml)) - if jailCardTemplateError != nil { - return jailCardTemplateError + _, indexJailCardTemplateError := indexTemplate.New("jailCard").Parse(string(jailCardHtml)) + if indexJailCardTemplateError != nil { + return indexJailCardTemplateError } // value isn't needed in code as it is used in the index template - _, bannedTemplateError := indexTemplate.New("banned").Parse(string(bannedHtml)) - if bannedTemplateError != nil { - return bannedTemplateError + _, indexBannedTemplateError := indexTemplate.New("banned").Parse(string(bannedHtml)) + if indexBannedTemplateError != nil { + return indexBannedTemplateError } // value isn't needed in code as it is used in the index template @@ -137,6 +139,12 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return detailHeadTemplateError } + // value isn't needed in code as it is used in the index template + _, detailBannedTemplateError := detailTemplate.New("banned").Parse(string(bannedHtml)) + if detailBannedTemplateError != nil { + return detailBannedTemplateError + } + app := fiber.New(fiber.Config{ DisableStartupMessage: true, }) @@ -266,10 +274,29 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return c.Status(404).SendString("Jail not found") } + banned := make([]client.BanEntry, 0) + banned = append(banned, jailByName.BannedEntries...) + + countryCodes := make([]string, 0) + + for index, ban := range banned { + countryCode, exists := geoIP.Lookup(ban.Address) + if exists { + ban.CountryCode = countryCode + countryCodes = append(countryCodes, countryCode) + } else { + ban.CountryCode = "unknown" + } + banned[index] = ban + } + detail := &detailData{ Version: version, Fail2BanVersion: fail2banVersion, BasePath: cleanBasePathForTemplate(cleanedBasePath), + CountryCodes: template.URL("flags.css?c=" + strings.Join(countryCodes, ",")), + HasBanned: len(banned) > 0, + Banned: banned, Jail: jailByName, } From eaa5e5fe574a3d114e73929e69108a5a0029d6e3 Mon Sep 17 00:00:00 2001 From: Simon Skoczylas Date: Sat, 7 Feb 2026 16:53:40 +0100 Subject: [PATCH 03/21] Improve detail view --- server/resources/detail.html | 18 ++++++++++++++++++ server/server.go | 29 +++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/server/resources/detail.html b/server/resources/detail.html index 1913b42..4be399c 100644 --- a/server/resources/detail.html +++ b/server/resources/detail.html @@ -11,12 +11,30 @@

fail2ban dashboar

+
+

Details for {{ .Jail.Name }}

+
+
+ {{ template "jailCard" .Jail }} +
+
+
{{ if .HasBanned }}

Currently banned

+ + + + + + + + + {{ range .Banned }} {{ template "banned" . }} diff --git a/server/server.go b/server/server.go index 6883f1c..ba3e684 100644 --- a/server/server.go +++ b/server/server.go @@ -69,13 +69,13 @@ type indexData struct { BasePath string CountryCodes template.URL HasBanned bool - Banned []client.BanEntry - Jails []store.Jail OrderAddress Sorted OrderJail Sorted OrderPenalty Sorted OrderStarted Sorted OrderEnds Sorted + Banned []client.BanEntry + Jails []store.Jail } type detailData struct { @@ -84,6 +84,11 @@ type detailData struct { BasePath string CountryCodes template.URL HasBanned bool + OrderAddress Sorted + OrderJail Sorted + OrderPenalty Sorted + OrderStarted Sorted + OrderEnds Sorted Banned []client.BanEntry Jail store.Jail } @@ -139,6 +144,12 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return detailHeadTemplateError } + // value isn't needed in code as it is used in the index template + _, detailJailCardTemplateError := detailTemplate.New("jailCard").Parse(string(jailCardHtml)) + if detailJailCardTemplateError != nil { + return detailJailCardTemplateError + } + // value isn't needed in code as it is used in the index template _, detailBannedTemplateError := detailTemplate.New("banned").Parse(string(bannedHtml)) if detailBannedTemplateError != nil { @@ -243,15 +254,15 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe Version: version, Fail2BanVersion: fail2banVersion, BasePath: cleanBasePathForTemplate(cleanedBasePath), - Jails: jails, HasBanned: len(banned) > 0, - Banned: banned, CountryCodes: template.URL("flags.css?c=" + strings.Join(countryCodes, ",")), OrderAddress: toggleSortOrder("address", sorting, order), OrderJail: toggleSortOrder("jail", sorting, order), OrderPenalty: toggleSortOrder("penalty", sorting, order), OrderStarted: toggleSortOrder("started", sorting, order), OrderEnds: toggleSortOrder("ends", sorting, order), + Banned: banned, + Jails: jails, } var sb strings.Builder @@ -290,12 +301,22 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe banned[index] = ban } + sorting := c.Query("sorting", "ends") + order := c.Query("order", "asc") + + sort.Slice(banned, sortSlice(sorting, order, banned)) + detail := &detailData{ Version: version, Fail2BanVersion: fail2banVersion, BasePath: cleanBasePathForTemplate(cleanedBasePath), CountryCodes: template.URL("flags.css?c=" + strings.Join(countryCodes, ",")), HasBanned: len(banned) > 0, + OrderAddress: toggleSortOrder("address", sorting, order), + OrderJail: toggleSortOrder("jail", sorting, order), + OrderPenalty: toggleSortOrder("penalty", sorting, order), + OrderStarted: toggleSortOrder("started", sorting, order), + OrderEnds: toggleSortOrder("ends", sorting, order), Banned: banned, Jail: jailByName, } From 69378e65d2273e98c64b6fc45ca1797c88421d23 Mon Sep 17 00:00:00 2001 From: Simon Skoczylas Date: Sat, 7 Feb 2026 17:14:05 +0100 Subject: [PATCH 04/21] Improve UI --- server/resources/detail.html | 7 ++++- server/resources/index.html | 37 +++++------------------- server/resources/partial_head.html | 10 +++++++ server/resources/partial_jailcard.html | 28 ++++++++++++++---- server/resources/partial_jaildetail.html | 6 ++++ server/server.go | 9 ++++++ 6 files changed, 60 insertions(+), 37 deletions(-) create mode 100644 server/resources/partial_jaildetail.html diff --git a/server/resources/detail.html b/server/resources/detail.html index 4be399c..3f8e2cd 100644 --- a/server/resources/detail.html +++ b/server/resources/detail.html @@ -6,6 +6,11 @@

fail2ban dashboard - {{ .Version }} fail2ban - {{ .Fail2BanVersion }}

@@ -15,7 +20,7 @@

fail2ban dashboar

Details for {{ .Jail.Name }}

- {{ template "jailCard" .Jail }} + {{ template "jailDetail" .Jail }}
diff --git a/server/resources/index.html b/server/resources/index.html index d70af53..1f324ae 100644 --- a/server/resources/index.html +++ b/server/resources/index.html @@ -6,47 +6,24 @@

fail2ban dashboard - {{ .Version }} fail2ban - {{ .Fail2BanVersion }}

-

Current jails

-
-
+

Current jails

+
{{ range .Jails }} {{ template "jailCard" . }} {{ end }} -
- {{ if .HasBanned }} -
-

Currently banned

-
-
-

Address Jail Banned at Curren penalty Ban ends at  +
- - - - - - - - - - - {{ range .Banned }} - {{ template "banned" . }} - {{ end }} - -
Address Jail Banned at Curren penalty Ban ends at  -
-
-
-
- {{ end }}
\ No newline at end of file diff --git a/server/resources/partial_head.html b/server/resources/partial_head.html index 157134d..11d3ae0 100644 --- a/server/resources/partial_head.html +++ b/server/resources/partial_head.html @@ -8,4 +8,14 @@ fail2ban dashboard - {{ .Version }} + \ No newline at end of file diff --git a/server/resources/partial_jailcard.html b/server/resources/partial_jailcard.html index ed425fc..c18db47 100644 --- a/server/resources/partial_jailcard.html +++ b/server/resources/partial_jailcard.html @@ -1,6 +1,22 @@ -
-
{{ .Name }}
-
{{ .BannedCount }}
-
failed {{ .CurrentlyFailed }} / {{ .TotalFailed }}
-
banned {{ .CurrentlyBanned }} / {{ .TotalBanned }}
-
\ No newline at end of file + +
{{ .Name }}
+
+
+
Banned
+
{{ .CurrentlyBanned }}
+
+
+
Failed
+
{{ .CurrentlyFailed }}
+
+
+
Total Banned
+
{{ .TotalBanned }}
+
+
+
Total Failed
+
{{ .TotalFailed }}
+
+
+
→
+ \ No newline at end of file diff --git a/server/resources/partial_jaildetail.html b/server/resources/partial_jaildetail.html new file mode 100644 index 0000000..4c29b00 --- /dev/null +++ b/server/resources/partial_jaildetail.html @@ -0,0 +1,6 @@ +
+
{{ .Name }}
+
{{ .BannedCount }}
+
failed {{ .CurrentlyFailed }} / {{ .TotalFailed }}
+
banned {{ .CurrentlyBanned }} / {{ .TotalBanned }}
+
diff --git a/server/server.go b/server/server.go index ba3e684..a3350d5 100644 --- a/server/server.go +++ b/server/server.go @@ -43,6 +43,9 @@ var detailHtml []byte //go:embed resources/partial_jailcard.html var jailCardHtml []byte +//go:embed resources/partial_jaildetail.html +var jailDetailHtml []byte + //go:embed resources/partial_banned.html var bannedHtml []byte @@ -150,6 +153,12 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe return detailJailCardTemplateError } + // value isn't needed in code as it is used in the detail template + _, detailJailDetailTemplateError := detailTemplate.New("jailDetail").Parse(string(jailDetailHtml)) + if detailJailDetailTemplateError != nil { + return detailJailDetailTemplateError + } + // value isn't needed in code as it is used in the index template _, detailBannedTemplateError := detailTemplate.New("banned").Parse(string(bannedHtml)) if detailBannedTemplateError != nil { From cf3bc4f90cfa1c01edad11ab99c5c8452d3a5e7d Mon Sep 17 00:00:00 2001 From: Simon Skoczylas Date: Sat, 7 Feb 2026 17:22:28 +0100 Subject: [PATCH 05/21] Improve UI --- server/resources/detail.html | 8 ++++---- server/resources/index.html | 2 +- server/resources/partial_jailcard.html | 8 ++++---- server/resources/partial_jaildetail.html | 24 +++++++++++++++++++----- 4 files changed, 28 insertions(+), 14 deletions(-) diff --git a/server/resources/detail.html b/server/resources/detail.html index 3f8e2cd..2526dd6 100644 --- a/server/resources/detail.html +++ b/server/resources/detail.html @@ -16,10 +16,10 @@

fail2ban dashboar
-
-

Details for {{ .Jail.Name }}

-
-
+
+

Details for {{ .Jail.Name }}

+
+
{{ template "jailDetail" .Jail }}
diff --git a/server/resources/index.html b/server/resources/index.html index 1f324ae..ceb098a 100644 --- a/server/resources/index.html +++ b/server/resources/index.html @@ -18,7 +18,7 @@

fail2ban dashboar

Current jails

-
+
{{ range .Jails }} {{ template "jailCard" . }} {{ end }} diff --git a/server/resources/partial_jailcard.html b/server/resources/partial_jailcard.html index c18db47..5abac6f 100644 --- a/server/resources/partial_jailcard.html +++ b/server/resources/partial_jailcard.html @@ -1,6 +1,6 @@ - -
{{ .Name }}
-
+ +
{{ .Name }}
+
Banned
{{ .CurrentlyBanned }}
@@ -18,5 +18,5 @@
{{ .TotalFailed }}
-
→
+
→
 \ No newline at end of file diff --git a/server/resources/partial_jaildetail.html b/server/resources/partial_jaildetail.html index 4c29b00..ce4c1b6 100644 --- a/server/resources/partial_jaildetail.html +++ b/server/resources/partial_jaildetail.html @@ -1,6 +1,20 @@ -
-
{{ .Name }}
-
{{ .BannedCount }}
-
failed {{ .CurrentlyFailed }} / {{ .TotalFailed }}
-
banned {{ .CurrentlyBanned }} / {{ .TotalBanned }}
+
+
{{ .Name }}
+
{{ .BannedCount }}
+
Currently banned
+
+
+
Currently Failed
+
{{ .CurrentlyFailed }}
+
Active failures
+
+
+
Total Failed
+
{{ .TotalFailed }}
+
All time
+
+
+
Total Banned
+
{{ .TotalBanned }}
+
All time
From 67d5b509845b21f0374011093d44a7b9d24a803b Mon Sep 17 00:00:00 2001 From: Simon Skoczylas Date: Sat, 7 Feb 2026 17:36:54 +0100 Subject: [PATCH 06/21] Improve UI --- server/resources/detail.html | 1 - server/resources/index.html | 1 - server/resources/partial_head.html | 8 +-- server/server.go | 94 ++++++++++++++---------------- 4 files changed, 49 insertions(+), 55 deletions(-) diff --git a/server/resources/detail.html b/server/resources/detail.html index 2526dd6..2876639 100644 --- a/server/resources/detail.html +++ b/server/resources/detail.html @@ -17,7 +17,6 @@

fail2ban dashboar

-

Details for {{ .Jail.Name }}

{{ template "jailDetail" .Jail }} diff --git a/server/resources/index.html b/server/resources/index.html index ceb098a..e45e0d8 100644 --- a/server/resources/index.html +++ b/server/resources/index.html @@ -17,7 +17,6 @@

fail2ban dashboar

-

Current jails

{{ range .Jails }} {{ template "jailCard" . }} diff --git a/server/resources/partial_head.html b/server/resources/partial_head.html index 11d3ae0..88e66db 100644 --- a/server/resources/partial_head.html +++ b/server/resources/partial_head.html @@ -3,11 +3,11 @@ - - - + + + fail2ban dashboard - {{ .Version }} - + fail2ban dashboard - {{ .Version }} diff --git a/server/resources/partial_header.html b/server/resources/partial_header.html index 980b433..13fd28b 100644 --- a/server/resources/partial_header.html +++ b/server/resources/partial_header.html @@ -3,7 +3,7 @@

fail2ban dashboar

+ {{ $curBasePath := .BasePath }} {{ range .Jails }} + {{ template "jailCard" . }} + {{ end }}
diff --git a/server/resources/partial_jailcard.html b/server/resources/partial_jailcard.html index 73cfc18..eb2ada7 100644 --- a/server/resources/partial_jailcard.html +++ b/server/resources/partial_jailcard.html @@ -1,22 +1,20 @@ - -
{{ .Name }}
-
-
-
Banned
-
{{ .CurrentlyBanned }}
-
-
-
Failed
-
{{ .CurrentlyFailed }}
-
- - +
{{ .Name }}
+
+
+
Banned
+
{{ .CurrentlyBanned }}
-
→
- \ No newline at end of file +
+
Failed
+
{{ .CurrentlyFailed }}
+
+ + +
+
→
\ No newline at end of file diff --git a/server/server.go b/server/server.go index 3025dde..3f6e7b0 100644 --- a/server/server.go +++ b/server/server.go @@ -199,7 +199,7 @@ func Serve(version string, fail2banVersion string, basePath string, trustProxyHe })) } - cleanedBasePath := cleanBasePath(basePath) + cleanedBasePath := path.Clean(basePath) dashboard := app.Group(cleanedBasePath) dashboard.Get("images/favicon.ico", func(c *fiber.Ctx) error { @@ -470,10 +470,6 @@ func firstNonEmpty(def string, vals ...string) string { return def } -func cleanBasePath(basePath string) string { - return path.Clean(basePath) -} - func cleanBasePathForTemplate(basePath string) string { if !strings.HasSuffix(basePath, "/") { basePath += "/"