README.texi | 10 +++------- cmd/sgblog-comment-add/main.go | 2 +- cmd/sgblog/gemini.go | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- internal/comments.go | 2 +- diff --git a/README.texi b/README.texi index 61b1b63440ccb831abe8f42b9530ab83b63e8565f3e874a4e30afc29699478cb..508bdb80d215815f9bb706e800c59c9c3bd157f29af5495dd7378e64110fb369 100644 --- a/README.texi +++ b/README.texi @@ -142,18 +142,14 @@ @end example Unfortunately by default it uses HTTPS and Go's third party servers (@code{sum.golang.org}, @code{proxy.golang.org}) that trust neither -@code{CACert.org}'s CA (used previously) nor @code{ca.cypherpunks.su} +@code{CACert.org}'s CA (used previously) nor @code{ca.stargrave.org} CAs. So either disable their usage and trust that certificate: @code{GOPRIVATE=go.stargrave.org/sgblog}, or clone its source code manually and build in place: @url{git://git.stargrave.org/sgblog.git}, @code{anongit@@master.git.stargrave.org:stargrave.org/sgblob.git}, @code{anongit@@slave.git.stargrave.org:stargrave.org/sgblob.git}, -@code{anongit@@master.git.cypherpunks.su:stargrave.org/sgblob.git}, -@code{anongit@@slave.git.cypherpunks.su:stargrave.org/sgblob.git}, -@url{git://git.cypherpunks.su/sgblob.git}, -@url{git://y.git.stargrave.org/sgblob.git}, -@url{git://y.git.cypherpunks.su/sgblob.git}. +@url{git://y.git.stargrave.org/sgblob.git}. For enabling blog availability you have to use HTTP server with CGI interface. Example part of @url{http://www.lighttpd.net/, lighttpd}'s @@ -207,7 +203,7 @@ # mv /var/service/.phlog-ipv6 /var/service/phlog-ipv6 @end example Gemlog uses Gemini protocol that requires TLS usage, that can be -achieved with @url{go.cypherpunks.su/ucspi} tools: +achieved with @url{go.stargrave.org/ucspi} tools: @example exec tcpserver -DRH -u $uid -g $gid -l 0 ::0 1965 \ diff --git a/cmd/sgblog-comment-add/main.go b/cmd/sgblog-comment-add/main.go index f26cb4d2751a6ac39965051d1871246fa31d1e37ea63ca55efc15388bb734093..f0eef28f9d6623c4fa095e3dcd11cb9e0e5dde0c5927f27416e6e5a338a36228 100644 --- a/cmd/sgblog-comment-add/main.go +++ b/cmd/sgblog-comment-add/main.go @@ -34,7 +34,7 @@ "strings" "syscall" "time" - "go.cypherpunks.su/recfile/v3" + "go.stargrave.org/recfile/v4" sgblog "go.stargrave.org/sgblog/internal" ) diff --git a/cmd/sgblog/gemini.go b/cmd/sgblog/gemini.go index 5987f17a9c1dd5cf12873a634210b32d8d0c2a0f8de4d0d05f1a55c2ac09584e..649ef4b8be7a8849571b78830bcbe0b984d7674981b100f7813e5267f0230892 100644 --- a/cmd/sgblog/gemini.go +++ b/cmd/sgblog/gemini.go @@ -195,8 +195,8 @@ }) if err != nil { log.Fatalln(err) } - } else if strings.HasPrefix(u.Path, "/img/") { - pth := strings.TrimPrefix(u.Path, "/img/") + } else if after, ok := strings.CutPrefix(u.Path, "/img/"); ok { + pth := after if strings.Contains(pth, "..") { log.Fatalln("unacceptable double dots") } diff --git a/go.mod b/go.mod index 3fdcf7c2529384a6745ff11745071fc51b22dca54aa695906f117aeaf613f6e1..117c1117be3c1aae0931113d154f681fb28c6962459c0a354f6eabbc63f1ffad 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ github.com/go-git/go-git/v5 v5.16.2 github.com/hjson/hjson-go/v4 v4.5.0 github.com/klauspost/compress v1.18.3 github.com/vorlif/spreak v0.6.0 - go.cypherpunks.su/recfile/v3 v3.1.0 + go.stargrave.org/recfile/v4 v4.0.0 golang.org/x/text v0.27.0 lukechampine.com/blake3 v1.4.1 ) diff --git a/go.sum b/go.sum index 98775f2117b02d3df3e87ef3253bc595818cc22f7272d9178d0790650b8ff2c8..4d679d9c66ef9902b7db31c3cf8d203a7b5b72a0a8823147fdb599264d0b11c4 100644 --- a/go.sum +++ b/go.sum @@ -75,8 +75,8 @@ github.com/vorlif/spreak v0.6.0 h1:+WrtSGKx9zcZy8d/Tp6t+OA3x9RgmA8TQYPzQ+U7Ddc= github.com/vorlif/spreak v0.6.0/go.mod h1:vcqv4dB1XgHpxIXhV5C+8EgqlzKfL37Atj2O/bOB1Bw= github.com/xanzy/ssh-agent v0.3.3 h1:+/15pJfg/RsTxqYcX6fHqOXZwwMP+2VyYWJeWM2qQFM= github.com/xanzy/ssh-agent v0.3.3/go.mod h1:6dzNDKs0J9rVPHPhaGCukekBHKqfl+L3KghI1Bc68Uw= -go.cypherpunks.su/recfile/v3 v3.1.0 h1:ZWO7Q6taGkaEl5X0oL+/5LOyoufzH0LRU2dee7RwZFg= -go.cypherpunks.su/recfile/v3 v3.1.0/go.mod h1:KK9cp7tYNWcHnTIaGso2H6PCJne8cVWk5VYB02b9ffI= +go.stargrave.org/recfile/v4 v4.0.0 h1:v9kZnW/e64oPfOqArGMNZacuT57lDibd24xhEiBDQ/c= +go.stargrave.org/recfile/v4 v4.0.0/go.mod h1:IGi8kMociIlDoR8iOssyUG/uix+wmsqvBuiDeQXsIuE= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM= golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY= diff --git a/internal/comments.go b/internal/comments.go index 257098365142737f3b110546bbb9dc58a89b7fb0914fe87bc0e8acbbbf6c83c7..03cb1dc97915d4f2b0dd9176acbaf26e4944c936dcbb46c2ddd296134c772774 100644 --- a/internal/comments.go +++ b/internal/comments.go @@ -19,7 +19,7 @@ import ( "bytes" "fmt" - "go.cypherpunks.su/recfile/v3" + "go.stargrave.org/recfile/v4" ) func ParseComments(data []byte) []string {