From ee1a53f3d79659cf5726892d37ed70f15d25bbfb Mon Sep 17 00:00:00 2001 From: Amolith Date: Wed, 21 Jan 2026 22:38:53 -0700 Subject: [PATCH] chore: fix deps, fmt, lint, etc. --- go.mod | 6 +++--- pkg/web/webui.go | 6 +++--- pkg/web/webui_about.go | 2 +- pkg/web/webui_blob.go | 2 +- pkg/web/webui_branches.go | 2 +- pkg/web/webui_commit.go | 2 +- pkg/web/webui_commits.go | 2 +- pkg/web/webui_helpers.go | 6 +++--- pkg/web/webui_home.go | 2 +- pkg/web/webui_overview.go | 2 +- pkg/web/webui_tag.go | 2 +- pkg/web/webui_tags.go | 2 +- pkg/web/webui_tree.go | 2 +- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/go.mod b/go.mod index 7132be569280ee89b0000590efd981d3e98d1bf9..e38309a2fc49c2420a8af34c816e984cba802549 100644 --- a/go.mod +++ b/go.mod @@ -32,6 +32,7 @@ require ( github.com/lib/pq v1.10.9 github.com/lrstanley/bubblezone/v2 v2.0.0-alpha.3 github.com/matryer/is v1.4.1 + github.com/microcosm-cc/bluemonday v1.0.27 github.com/muesli/mango-cobra v1.3.0 github.com/muesli/reflow v0.3.0 github.com/muesli/roff v0.1.0 @@ -40,8 +41,10 @@ require ( github.com/rogpeppe/go-internal v1.14.1 github.com/sergi/go-diff v1.4.0 github.com/spf13/cobra v1.10.2 + github.com/yuin/goldmark v1.7.8 go.uber.org/automaxprocs v1.6.0 golang.org/x/crypto v0.47.0 + golang.org/x/net v0.48.0 golang.org/x/sync v0.19.0 gopkg.in/yaml.v3 v3.0.1 modernc.org/sqlite v1.44.2 @@ -75,7 +78,6 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.19 // indirect github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2 // indirect - github.com/microcosm-cc/bluemonday v1.0.27 // indirect github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/mango v0.2.0 // indirect github.com/muesli/mango-pflag v0.1.0 // indirect @@ -89,11 +91,9 @@ require ( github.com/sahilm/fuzzy v0.1.1 // indirect github.com/spf13/pflag v1.0.9 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - github.com/yuin/goldmark v1.7.8 // indirect github.com/yuin/goldmark-emoji v1.0.5 // indirect go.yaml.in/yaml/v2 v2.4.2 // indirect golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect - golang.org/x/net v0.48.0 // indirect golang.org/x/sys v0.40.0 // indirect golang.org/x/text v0.33.0 // indirect golang.org/x/tools v0.40.0 // indirect diff --git a/pkg/web/webui.go b/pkg/web/webui.go index acb9624719c31fecd3bcb1d3d89dd12b7a5a76a8..536180c3cac2c3381048712a047c744a215d17c1 100644 --- a/pkg/web/webui.go +++ b/pkg/web/webui.go @@ -14,7 +14,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/proto" "github.com/dustin/go-humanize" @@ -240,13 +240,13 @@ func renderHTML(w http.ResponseWriter, templateName string, data interface{}) { } w.Header().Set("Content-Type", "text/html; charset=utf-8") - + // Security headers // Note: style-src 'unsafe-inline' is required for inline styles in templates (tree.html, overview.html) w.Header().Set("Content-Security-Policy", "default-src 'self'; img-src 'self' https: data:; style-src 'self' 'unsafe-inline'; script-src 'self'; object-src 'none'; frame-ancestors 'self'; base-uri 'none'") w.Header().Set("Referrer-Policy", "no-referrer") w.Header().Set("X-Content-Type-Options", "nosniff") - + if err := tmpl.ExecuteTemplate(w, "layout", data); err != nil { log.Debug("template execution failed", "template", templateName, "err", err) // Already started writing response, so we can't render an error page diff --git a/pkg/web/webui_about.go b/pkg/web/webui_about.go index b0165eb1d17817fac5e05e3debd7e6cef2150bea..a4cf1617089d2603c2ff763f2e6a9e34111e8cc7 100644 --- a/pkg/web/webui_about.go +++ b/pkg/web/webui_about.go @@ -4,7 +4,7 @@ import ( "html/template" "net/http" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_blob.go b/pkg/web/webui_blob.go index 3af2373e4271ffa131b3e7d72378f0f07b105796..905c0e1de9fcdbe47acac653c9512f87eb024669 100644 --- a/pkg/web/webui_blob.go +++ b/pkg/web/webui_blob.go @@ -8,11 +8,11 @@ import ( "path/filepath" "strings" + "charm.land/log/v2" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/formatters/html" "github.com/alecthomas/chroma/v2/lexers" "github.com/alecthomas/chroma/v2/styles" - "github.com/charmbracelet/log/v2" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" "github.com/gorilla/mux" diff --git a/pkg/web/webui_branches.go b/pkg/web/webui_branches.go index 26bf33a6a98fbdf018cab838b3e5be3c82489c9f..846eb8da85438f09446d46488c6c4041fb702aaa 100644 --- a/pkg/web/webui_branches.go +++ b/pkg/web/webui_branches.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_commit.go b/pkg/web/webui_commit.go index cafe19797493b4f6706018667ac55e5459dd3bbf..d7118927fd5bb06b9aee2f3a875aa21f1415593e 100644 --- a/pkg/web/webui_commit.go +++ b/pkg/web/webui_commit.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_commits.go b/pkg/web/webui_commits.go index b339afa8688616da14495f801745da69d44eeb00..eb7bff927e951bce1911bbd4a83f2b6dd1901d23 100644 --- a/pkg/web/webui_commits.go +++ b/pkg/web/webui_commits.go @@ -5,7 +5,7 @@ import ( "net/http" "strconv" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_helpers.go b/pkg/web/webui_helpers.go index e42deb27336fb83a093ec5a9688014e1bfaee6f6..04cb35996ee68ee14d52c4d05053b2adb1f4b3a6 100644 --- a/pkg/web/webui_helpers.go +++ b/pkg/web/webui_helpers.go @@ -65,7 +65,7 @@ func getSanitizerPolicy() *bluemonday.Policy { // If ctx is provided, relative URLs will be rewritten to point to repository files. func renderMarkdown(content []byte, ctx *ReadmeContext) (template.HTML, error) { var buf bytes.Buffer - + mdOpts := []goldmark.Option{ goldmark.WithExtensions(extension.GFM), goldmark.WithParserOptions( @@ -75,7 +75,7 @@ func renderMarkdown(content []byte, ctx *ReadmeContext) (template.HTML, error) { goldmarkhtml.WithUnsafe(), ), } - + // Add URL rewriter if context is provided if ctx != nil { rewriter := newURLRewriter(*ctx) @@ -83,7 +83,7 @@ func renderMarkdown(content []byte, ctx *ReadmeContext) (template.HTML, error) { parser.WithASTTransformers(util.Prioritized(rewriter, 500)), )) } - + md := goldmark.New(mdOpts...) if err := md.Convert(content, &buf); err != nil { diff --git a/pkg/web/webui_home.go b/pkg/web/webui_home.go index e7846abd3a512b827e9b3c3d4522a9a1ffa1347a..c3622f524ebc235b969292e6901bf6e90914752e 100644 --- a/pkg/web/webui_home.go +++ b/pkg/web/webui_home.go @@ -9,7 +9,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/pkg/access" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" diff --git a/pkg/web/webui_overview.go b/pkg/web/webui_overview.go index be0a0d77f80a843550c8cc9e12f1bb1288d5547f..b6c5b54c44c28518cbc888a5da740147b9b3c78a 100644 --- a/pkg/web/webui_overview.go +++ b/pkg/web/webui_overview.go @@ -5,7 +5,7 @@ import ( "html/template" "net/http" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/pkg/backend" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_tag.go b/pkg/web/webui_tag.go index 64baad5389b3726dfe7c8dba903ca9aa39aad97e..aae6565a5e6dabc8500adec89d0e10fd5f255c42 100644 --- a/pkg/web/webui_tag.go +++ b/pkg/web/webui_tag.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_tags.go b/pkg/web/webui_tags.go index 416b9534bb76c25274853bd535f1a2d0ada06dc9..3f985ab9b2c0e9c69249858e37125c497c870200 100644 --- a/pkg/web/webui_tags.go +++ b/pkg/web/webui_tags.go @@ -6,7 +6,7 @@ import ( "strconv" "time" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto" diff --git a/pkg/web/webui_tree.go b/pkg/web/webui_tree.go index 70d18bcd09e5362c5e37444517f18a86bd0eb08b..91afec6b1a49bc18c1a6f5d3a90218c176a7831e 100644 --- a/pkg/web/webui_tree.go +++ b/pkg/web/webui_tree.go @@ -3,7 +3,7 @@ package web import ( "net/http" - "github.com/charmbracelet/log/v2" + "charm.land/log/v2" "github.com/charmbracelet/soft-serve/git" "github.com/charmbracelet/soft-serve/pkg/config" "github.com/charmbracelet/soft-serve/pkg/proto"