forked from mirrors/gotosocial
[chore]: Bump github.com/yuin/goldmark from 1.5.4 to 1.5.5 (#2023)
This commit is contained in:
parent
c9f3539b5a
commit
b05f6c8f56
7 changed files with 35 additions and 20 deletions
2
go.mod
2
go.mod
|
@ -52,7 +52,7 @@ require (
|
||||||
github.com/uptrace/bun/dialect/sqlitedialect v1.1.14
|
github.com/uptrace/bun/dialect/sqlitedialect v1.1.14
|
||||||
github.com/uptrace/bun/extra/bunotel v1.1.14
|
github.com/uptrace/bun/extra/bunotel v1.1.14
|
||||||
github.com/wagslane/go-password-validator v0.3.0
|
github.com/wagslane/go-password-validator v0.3.0
|
||||||
github.com/yuin/goldmark v1.5.4
|
github.com/yuin/goldmark v1.5.5
|
||||||
go.opentelemetry.io/otel v1.16.0
|
go.opentelemetry.io/otel v1.16.0
|
||||||
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
|
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
|
||||||
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
|
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -635,8 +635,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
|
||||||
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
|
||||||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
github.com/yuin/goldmark v1.5.4 h1:2uY/xC0roWy8IBEGLgB1ywIoEJFGmRrX21YQcvGZzjU=
|
github.com/yuin/goldmark v1.5.5 h1:IJznPe8wOzfIKETmMkd06F8nXkmlhaHqFRM9l1hAGsU=
|
||||||
github.com/yuin/goldmark v1.5.4/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
github.com/yuin/goldmark v1.5.5/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
|
||||||
github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
|
github.com/zeebo/assert v1.1.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
|
||||||
github.com/zeebo/blake3 v0.2.1/go.mod h1:TSQ0KjMH+pht+bRyvVooJ1rBpvvngSGaPISafq9MxJk=
|
github.com/zeebo/blake3 v0.2.1/go.mod h1:TSQ0KjMH+pht+bRyvVooJ1rBpvvngSGaPISafq9MxJk=
|
||||||
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
|
github.com/zeebo/pcg v1.0.1/go.mod h1:09F0S9iiKrwn9rlI5yjLkmrug154/YRW6KnnXVDM/l4=
|
||||||
|
|
4
vendor/github.com/yuin/goldmark/README.md
generated
vendored
4
vendor/github.com/yuin/goldmark/README.md
generated
vendored
|
@ -440,6 +440,9 @@ Extensions
|
||||||
- [goldmark-pdf](https://github.com/stephenafamo/goldmark-pdf): A PDF renderer that can be passed to `goldmark.WithRenderer()`.
|
- [goldmark-pdf](https://github.com/stephenafamo/goldmark-pdf): A PDF renderer that can be passed to `goldmark.WithRenderer()`.
|
||||||
- [goldmark-hashtag](https://github.com/abhinav/goldmark-hashtag): Adds support for `#hashtag`-based tagging to goldmark.
|
- [goldmark-hashtag](https://github.com/abhinav/goldmark-hashtag): Adds support for `#hashtag`-based tagging to goldmark.
|
||||||
- [goldmark-wikilink](https://github.com/abhinav/goldmark-wikilink): Adds support for `[[wiki]]`-style links to goldmark.
|
- [goldmark-wikilink](https://github.com/abhinav/goldmark-wikilink): Adds support for `[[wiki]]`-style links to goldmark.
|
||||||
|
- [goldmark-anchor](https://github.com/abhinav/goldmark-anchor): Adds anchors (permalinks) next to all headers in a document.
|
||||||
|
- [goldmark-figure](https://github.com/mangoumbrella/goldmark-figure): Adds support for rendering paragraphs starting with an image to `<figure>` elements.
|
||||||
|
- [goldmark-frontmatter](https://github.com/abhinav/goldmark-frontmatter): Adds support for YAML, TOML, and custom front matter to documents.
|
||||||
- [goldmark-toc](https://github.com/abhinav/goldmark-toc): Adds support for generating tables-of-contents for goldmark documents.
|
- [goldmark-toc](https://github.com/abhinav/goldmark-toc): Adds support for generating tables-of-contents for goldmark documents.
|
||||||
- [goldmark-mermaid](https://github.com/abhinav/goldmark-mermaid): Adds support for rendering [Mermaid](https://mermaid-js.github.io/mermaid/) diagrams in goldmark documents.
|
- [goldmark-mermaid](https://github.com/abhinav/goldmark-mermaid): Adds support for rendering [Mermaid](https://mermaid-js.github.io/mermaid/) diagrams in goldmark documents.
|
||||||
- [goldmark-pikchr](https://github.com/jchenry/goldmark-pikchr): Adds support for rendering [Pikchr](https://pikchr.org/home/doc/trunk/homepage.md) diagrams in goldmark documents.
|
- [goldmark-pikchr](https://github.com/jchenry/goldmark-pikchr): Adds support for rendering [Pikchr](https://pikchr.org/home/doc/trunk/homepage.md) diagrams in goldmark documents.
|
||||||
|
@ -448,6 +451,7 @@ Extensions
|
||||||
- [goldmark-fences](https://github.com/stefanfritsch/goldmark-fences): Support for pandoc-style [fenced divs](https://pandoc.org/MANUAL.html#divs-and-spans) in goldmark.
|
- [goldmark-fences](https://github.com/stefanfritsch/goldmark-fences): Support for pandoc-style [fenced divs](https://pandoc.org/MANUAL.html#divs-and-spans) in goldmark.
|
||||||
- [goldmark-d2](https://github.com/FurqanSoftware/goldmark-d2): Adds support for [D2](https://d2lang.com/) diagrams.
|
- [goldmark-d2](https://github.com/FurqanSoftware/goldmark-d2): Adds support for [D2](https://d2lang.com/) diagrams.
|
||||||
- [goldmark-katex](https://github.com/FurqanSoftware/goldmark-katex): Adds support for [KaTeX](https://katex.org/) math and equations.
|
- [goldmark-katex](https://github.com/FurqanSoftware/goldmark-katex): Adds support for [KaTeX](https://katex.org/) math and equations.
|
||||||
|
- [goldmark-img64](https://github.com/tenkoh/goldmark-img64): Adds support for embedding images into the document as DataURL (base64 encoded).
|
||||||
|
|
||||||
|
|
||||||
goldmark internal(for extension developers)
|
goldmark internal(for extension developers)
|
||||||
|
|
6
vendor/github.com/yuin/goldmark/parser/raw_html.go
generated
vendored
6
vendor/github.com/yuin/goldmark/parser/raw_html.go
generated
vendored
|
@ -48,10 +48,10 @@ func (s *rawHTMLParser) Parse(parent ast.Node, block text.Reader, pc Context) as
|
||||||
}
|
}
|
||||||
|
|
||||||
var tagnamePattern = `([A-Za-z][A-Za-z0-9-]*)`
|
var tagnamePattern = `([A-Za-z][A-Za-z0-9-]*)`
|
||||||
|
var spaceOrOneNewline = `(?:[ \t]|(?:\r\n|\n){0,1})`
|
||||||
var attributePattern = `(?:[\r\n \t]+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:[\r\n \t]*=[\r\n \t]*(?:[^\"'=<>` + "`" + `\x00-\x20]+|'[^']*'|"[^"]*"))?)`
|
var attributePattern = `(?:[\r\n \t]+[a-zA-Z_:][a-zA-Z0-9:._-]*(?:[\r\n \t]*=[\r\n \t]*(?:[^\"'=<>` + "`" + `\x00-\x20]+|'[^']*'|"[^"]*"))?)`
|
||||||
var openTagRegexp = regexp.MustCompile("^<" + tagnamePattern + attributePattern + `*[ \t]*/?>`)
|
var openTagRegexp = regexp.MustCompile("^<" + tagnamePattern + attributePattern + `*` + spaceOrOneNewline + `*/?>`)
|
||||||
var closeTagRegexp = regexp.MustCompile("^</" + tagnamePattern + `\s*>`)
|
var closeTagRegexp = regexp.MustCompile("^</" + tagnamePattern + spaceOrOneNewline + `*>`)
|
||||||
|
|
||||||
var openProcessingInstruction = []byte("<?")
|
var openProcessingInstruction = []byte("<?")
|
||||||
var closeProcessingInstruction = []byte("?>")
|
var closeProcessingInstruction = []byte("?>")
|
||||||
|
|
16
vendor/github.com/yuin/goldmark/renderer/html/html.go
generated
vendored
16
vendor/github.com/yuin/goldmark/renderer/html/html.go
generated
vendored
|
@ -901,20 +901,24 @@ var bVb = []byte("vbscript:")
|
||||||
var bFile = []byte("file:")
|
var bFile = []byte("file:")
|
||||||
var bData = []byte("data:")
|
var bData = []byte("data:")
|
||||||
|
|
||||||
|
func hasPrefix(s, prefix []byte) bool {
|
||||||
|
return len(s) >= len(prefix) && bytes.Equal(bytes.ToLower(s[0:len(prefix)]), bytes.ToLower(prefix))
|
||||||
|
}
|
||||||
|
|
||||||
// IsDangerousURL returns true if the given url seems a potentially dangerous url,
|
// IsDangerousURL returns true if the given url seems a potentially dangerous url,
|
||||||
// otherwise false.
|
// otherwise false.
|
||||||
func IsDangerousURL(url []byte) bool {
|
func IsDangerousURL(url []byte) bool {
|
||||||
if bytes.HasPrefix(url, bDataImage) && len(url) >= 11 {
|
if hasPrefix(url, bDataImage) && len(url) >= 11 {
|
||||||
v := url[11:]
|
v := url[11:]
|
||||||
if bytes.HasPrefix(v, bPng) || bytes.HasPrefix(v, bGif) ||
|
if hasPrefix(v, bPng) || hasPrefix(v, bGif) ||
|
||||||
bytes.HasPrefix(v, bJpeg) || bytes.HasPrefix(v, bWebp) ||
|
hasPrefix(v, bJpeg) || hasPrefix(v, bWebp) ||
|
||||||
bytes.HasPrefix(v, bSvg) {
|
hasPrefix(v, bSvg) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
return bytes.HasPrefix(url, bJs) || bytes.HasPrefix(url, bVb) ||
|
return hasPrefix(url, bJs) || hasPrefix(url, bVb) ||
|
||||||
bytes.HasPrefix(url, bFile) || bytes.HasPrefix(url, bData)
|
hasPrefix(url, bFile) || hasPrefix(url, bData)
|
||||||
}
|
}
|
||||||
|
|
||||||
func nodeToHTMLText(n ast.Node, source []byte) []byte {
|
func nodeToHTMLText(n ast.Node, source []byte) []byte {
|
||||||
|
|
21
vendor/github.com/yuin/goldmark/text/reader.go
generated
vendored
21
vendor/github.com/yuin/goldmark/text/reader.go
generated
vendored
|
@ -1,6 +1,7 @@
|
||||||
package text
|
package text
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"io"
|
"io"
|
||||||
"regexp"
|
"regexp"
|
||||||
"unicode/utf8"
|
"unicode/utf8"
|
||||||
|
@ -537,24 +538,30 @@ func matchReader(r Reader, reg *regexp.Regexp) bool {
|
||||||
}
|
}
|
||||||
|
|
||||||
func findSubMatchReader(r Reader, reg *regexp.Regexp) [][]byte {
|
func findSubMatchReader(r Reader, reg *regexp.Regexp) [][]byte {
|
||||||
oldline, oldseg := r.Position()
|
oldLine, oldSeg := r.Position()
|
||||||
match := reg.FindReaderSubmatchIndex(r)
|
match := reg.FindReaderSubmatchIndex(r)
|
||||||
r.SetPosition(oldline, oldseg)
|
r.SetPosition(oldLine, oldSeg)
|
||||||
if match == nil {
|
if match == nil {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
runes := make([]rune, 0, match[1]-match[0])
|
var bb bytes.Buffer
|
||||||
|
bb.Grow(match[1] - match[0])
|
||||||
for i := 0; i < match[1]; {
|
for i := 0; i < match[1]; {
|
||||||
r, size, _ := readRuneReader(r)
|
r, size, _ := readRuneReader(r)
|
||||||
i += size
|
i += size
|
||||||
runes = append(runes, r)
|
bb.WriteRune(r)
|
||||||
}
|
}
|
||||||
result := [][]byte{}
|
bs := bb.Bytes()
|
||||||
|
var result [][]byte
|
||||||
for i := 0; i < len(match); i += 2 {
|
for i := 0; i < len(match); i += 2 {
|
||||||
result = append(result, []byte(string(runes[match[i]:match[i+1]])))
|
if match[i] < 0 {
|
||||||
|
result = append(result, []byte{})
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
result = append(result, bs[match[i]:match[i+1]])
|
||||||
}
|
}
|
||||||
|
|
||||||
r.SetPosition(oldline, oldseg)
|
r.SetPosition(oldLine, oldSeg)
|
||||||
r.Advance(match[1] - match[0])
|
r.Advance(match[1] - match[0])
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
2
vendor/modules.txt
vendored
2
vendor/modules.txt
vendored
|
@ -756,7 +756,7 @@ github.com/vmihailenco/tagparser/v2/internal/parser
|
||||||
# github.com/wagslane/go-password-validator v0.3.0
|
# github.com/wagslane/go-password-validator v0.3.0
|
||||||
## explicit; go 1.16
|
## explicit; go 1.16
|
||||||
github.com/wagslane/go-password-validator
|
github.com/wagslane/go-password-validator
|
||||||
# github.com/yuin/goldmark v1.5.4
|
# github.com/yuin/goldmark v1.5.5
|
||||||
## explicit; go 1.18
|
## explicit; go 1.18
|
||||||
github.com/yuin/goldmark
|
github.com/yuin/goldmark
|
||||||
github.com/yuin/goldmark/ast
|
github.com/yuin/goldmark/ast
|
||||||
|
|
Loading…
Reference in a new issue