diff --git a/go.mod b/go.mod
index d76489ff..44d6f4ac 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
github.com/dromara/carbon/v2 v2.6.15
github.com/eclipse/paho.mqtt.golang v1.5.1
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df
- github.com/go-playground/validator/v10 v10.28.0
+ github.com/go-playground/validator/v10 v10.30.0
github.com/hashicorp/nomad/api v0.0.0-20250812204832-62b195aaa535 // v1.10.4
github.com/jedib0t/go-pretty/v6 v6.7.7
github.com/matcornic/hermes/v2 v2.1.0
@@ -76,7 +76,7 @@ require (
github.com/felixge/fgprof v0.9.5 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
- github.com/gabriel-vasile/mimetype v1.4.10 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.12 // indirect
github.com/go-logr/logr v1.4.3 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
diff --git a/go.sum b/go.sum
index 8d9189fc..be277f4c 100644
--- a/go.sum
+++ b/go.sum
@@ -111,8 +111,8 @@ github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2
github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
github.com/fxamacker/cbor/v2 v2.9.0 h1:NpKPmjDBgUfBms6tr6JZkTHtfFGcMKsw3eGcmD/sapM=
github.com/fxamacker/cbor/v2 v2.9.0/go.mod h1:vM4b+DJCtHn+zz7h3FFp/hDAI9WNWCsZj23V5ytsSxQ=
-github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0=
-github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
+github.com/gabriel-vasile/mimetype v1.4.12 h1:e9hWvmLYvtp846tLHam2o++qitpguFiYCKbn0w9jyqw=
+github.com/gabriel-vasile/mimetype v1.4.12/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s=
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df h1:Bao6dhmbTA1KFVxmJ6nBoMuOJit2yjEgLJpIMYpop0E=
github.com/go-gomail/gomail v0.0.0-20160411212932-81ebce5c23df/go.mod h1:GJr+FCSXshIwgHBtLglIg9M2l2kQSi6QjVAngtzI08Y=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -132,8 +132,8 @@ github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/o
github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
-github.com/go-playground/validator/v10 v10.28.0 h1:Q7ibns33JjyW48gHkuFT91qX48KG0ktULL6FgHdG688=
-github.com/go-playground/validator/v10 v10.28.0/go.mod h1:GoI6I1SjPBh9p7ykNE/yj3fFYbyDOpwMn5KXd+m2hUU=
+github.com/go-playground/validator/v10 v10.30.0 h1:5YBPNs273uzsZJD1I8uiB4Aqg9sN6sMDVX3s6LxmhWU=
+github.com/go-playground/validator/v10 v10.30.0/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM=
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
diff --git a/vendor/github.com/gabriel-vasile/mimetype/.git-blame-ignore-revs b/vendor/github.com/gabriel-vasile/mimetype/.git-blame-ignore-revs
new file mode 100644
index 00000000..3892826a
--- /dev/null
+++ b/vendor/github.com/gabriel-vasile/mimetype/.git-blame-ignore-revs
@@ -0,0 +1,9 @@
+# Github is obeying this ignore file by default.
+# Run this command on local to ignore formatting commits in `git blame`
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
+
+# Added a new column to supported_mimes.md
+# The supported_mimes.md file was a nice way to find when a file format was
+# introduced. However, when I changed to add a new column in the table, the
+# whole git blame got poisoned for the file.
+eb497f9bc5d31c6eab2929a112051218670137ba
diff --git a/vendor/github.com/gabriel-vasile/mimetype/.golangci.yml b/vendor/github.com/gabriel-vasile/mimetype/.golangci.yml
index f2058ccc..5b30cd61 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/.golangci.yml
+++ b/vendor/github.com/gabriel-vasile/mimetype/.golangci.yml
@@ -1,5 +1,41 @@
version: "2"
+
+run:
+ timeout: 5m
+
linters:
exclusions:
presets:
- std-error-handling
+ enable:
+ - gosec # Detects security problems.
+ # Keep all extras disabled for now to focus on the integer overflow problem.
+ # TODO: enable these and other good linters
+ - dogsled # Detects assignments with too many blank identifiers.
+ - errcheck
+ - errchkjson # Detects unsupported types passed to json encoding functions and reports if checks for the returned error can be omitted.
+ - exhaustive # Detects missing options in enum switch statements.
+ - gocyclo
+ - govet
+ - ineffassign
+ - makezero # Finds slice declarations with non-zero initial length.
+ - misspell # Detects commonly misspelled English words in comments.
+ - nakedret # Detects uses of naked returns.
+ - prealloc # Detects slice declarations that could potentially be pre-allocated.
+ - predeclared # Detects code that shadows one of Go's predeclared identifiers.
+ - reassign # Detects reassigning a top-level variable in another package.
+ - staticcheck
+ - thelper # Detects test helpers without t.Helper().
+ - tparallel # Detects inappropriate usage of t.Parallel().
+ - unconvert # Detects unnecessary type conversions.
+ - unused
+ - usestdlibvars # Detects the possibility to use variables/constants from the Go standard library.
+ - usetesting # Reports uses of functions with replacement inside the testing package.
+ settings:
+ govet:
+ disable:
+ - stdversion
+ gosec:
+ excludes:
+ - G404 # Weak random number generator used in tests.
+ - G304 # File inclusion
diff --git a/vendor/github.com/gabriel-vasile/mimetype/README.md b/vendor/github.com/gabriel-vasile/mimetype/README.md
index f28f56c9..9fe71ac9 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/README.md
+++ b/vendor/github.com/gabriel-vasile/mimetype/README.md
@@ -70,13 +70,13 @@ If increasing the limit does not help, please
## Tests
In addition to unit tests,
[mimetype_tests](https://github.com/gabriel-vasile/mimetype_tests) compares the
-library with the [Unix file utility](https://en.wikipedia.org/wiki/File_(command))
+library with [libmagic](https://en.wikipedia.org/wiki/File_(command))
for around 50 000 sample files. Check the latest comparison results
[here](https://github.com/gabriel-vasile/mimetype_tests/actions).
## Benchmarks
-Benchmarks for each file format are performed when a PR is open. The results can
-be seen on the [workflows page](https://github.com/gabriel-vasile/mimetype/actions/workflows/benchmark.yml).
+Benchmarks are performed when a PR is open. The results can be seen on the
+[workflows page](https://github.com/gabriel-vasile/mimetype/actions/workflows/benchmark.yml).
Performance improvements are welcome but correctness is prioritized.
## Structure
@@ -97,7 +97,9 @@ or from a [file](https://pkg.go.dev/github.com/gabriel-vasile/mimetype#DetectFil
## Contributing
-Contributions are unexpected but welcome. When submitting a PR for detection of
-a new file format, please make sure to add a record to the list of testcases
-from [mimetype_test.go](mimetype_test.go). For complex files a record can be added
-in the [testdata](testdata) directory.
+Contributions are never expected but very much welcome.
+[mimetype_tests](https://github.com/gabriel-vasile/mimetype_tests/actions/workflows/test.yml)
+shows which file formats are most often misidentified and can help prioritise.
+When submitting a PR for detection of a new file format, please make sure to
+add a record to the list of testcases in [mimetype_test.go](mimetype_test.go).
+For complex files a record can be added in the [testdata](testdata) directory.
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/charset/charset.go b/vendor/github.com/gabriel-vasile/mimetype/internal/charset/charset.go
index 8c5a05e4..3373274a 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/charset/charset.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/charset/charset.go
@@ -2,6 +2,7 @@ package charset
import (
"bytes"
+ "strings"
"unicode/utf8"
"github.com/gabriel-vasile/mimetype/internal/markup"
@@ -141,27 +142,25 @@ func FromXML(content []byte) string {
return FromPlain(content)
}
func fromXML(s scan.Bytes) string {
- xml := []byte(" 1 &&
+ raw[0] == 'x' && binary.BigEndian.Uint16(raw)%31 == 0
+ // Check that the file is not a regular text to avoid false positives.
+ return zlib && !Text(raw, 0)
+}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/audio.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/audio.go
index d17e3248..2b160711 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/audio.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/audio.go
@@ -5,26 +5,50 @@ import (
"encoding/binary"
)
-var (
- // Flac matches a Free Lossless Audio Codec file.
- Flac = prefix([]byte("\x66\x4C\x61\x43\x00\x00\x00\x22"))
- // Midi matches a Musical Instrument Digital Interface file.
- Midi = prefix([]byte("\x4D\x54\x68\x64"))
- // Ape matches a Monkey's Audio file.
- Ape = prefix([]byte("\x4D\x41\x43\x20\x96\x0F\x00\x00\x34\x00\x00\x00\x18\x00\x00\x00\x90\xE3"))
- // MusePack matches a Musepack file.
- MusePack = prefix([]byte("MPCK"))
- // Au matches a Sun Microsystems au file.
- Au = prefix([]byte("\x2E\x73\x6E\x64"))
- // Amr matches an Adaptive Multi-Rate file.
- Amr = prefix([]byte("\x23\x21\x41\x4D\x52"))
- // Voc matches a Creative Voice file.
- Voc = prefix([]byte("Creative Voice File"))
- // M3u matches a Playlist file.
- M3u = prefix([]byte("#EXTM3U"))
- // AAC matches an Advanced Audio Coding file.
- AAC = prefix([]byte{0xFF, 0xF1}, []byte{0xFF, 0xF9})
-)
+// Flac matches a Free Lossless Audio Codec file.
+func Flac(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x66\x4C\x61\x43\x00\x00\x00\x22"))
+}
+
+// Midi matches a Musical Instrument Digital Interface file.
+func Midi(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x4D\x54\x68\x64"))
+}
+
+// Ape matches a Monkey's Audio file.
+func Ape(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x4D\x41\x43\x20\x96\x0F\x00\x00\x34\x00\x00\x00\x18\x00\x00\x00\x90\xE3"))
+}
+
+// MusePack matches a Musepack file.
+func MusePack(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("MPCK"))
+}
+
+// Au matches a Sun Microsystems au file.
+func Au(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x2E\x73\x6E\x64"))
+}
+
+// Amr matches an Adaptive Multi-Rate file.
+func Amr(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x23\x21\x41\x4D\x52"))
+}
+
+// Voc matches a Creative Voice file.
+func Voc(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("Creative Voice File"))
+}
+
+// M3u matches a Playlist file.
+func M3u(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("#EXTM3U"))
+}
+
+// AAC matches an Advanced Audio Coding file.
+func AAC(raw []byte, _ uint32) bool {
+ return len(raw) > 1 && ((raw[0] == 0xFF && raw[1] == 0xF1) || (raw[0] == 0xFF && raw[1] == 0xF9))
+}
// Mp3 matches an mp3 file.
func Mp3(raw []byte, limit uint32) bool {
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/binary.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/binary.go
index 70599b34..37ad6a9f 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/binary.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/binary.go
@@ -6,26 +6,52 @@ import (
"encoding/binary"
)
-var (
- // Lnk matches Microsoft lnk binary format.
- Lnk = prefix([]byte{0x4C, 0x00, 0x00, 0x00, 0x01, 0x14, 0x02, 0x00})
- // Wasm matches a web assembly File Format file.
- Wasm = prefix([]byte{0x00, 0x61, 0x73, 0x6D})
- // Exe matches a Windows/DOS executable file.
- Exe = prefix([]byte{0x4D, 0x5A})
- // Elf matches an Executable and Linkable Format file.
- Elf = prefix([]byte{0x7F, 0x45, 0x4C, 0x46})
- // Nes matches a Nintendo Entertainment system ROM file.
- Nes = prefix([]byte{0x4E, 0x45, 0x53, 0x1A})
- // SWF matches an Adobe Flash swf file.
- SWF = prefix([]byte("CWS"), []byte("FWS"), []byte("ZWS"))
- // Torrent has bencoded text in the beginning.
- Torrent = prefix([]byte("d8:announce"))
- // PAR1 matches a parquet file.
- Par1 = prefix([]byte{0x50, 0x41, 0x52, 0x31})
- // CBOR matches a Concise Binary Object Representation https://cbor.io/
- CBOR = prefix([]byte{0xD9, 0xD9, 0xF7})
-)
+// Lnk matches Microsoft lnk binary format.
+func Lnk(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x4C, 0x00, 0x00, 0x00, 0x01, 0x14, 0x02, 0x00})
+}
+
+// Wasm matches a web assembly File Format file.
+func Wasm(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x00, 0x61, 0x73, 0x6D})
+}
+
+// Exe matches a Windows/DOS executable file.
+func Exe(raw []byte, _ uint32) bool {
+ return len(raw) > 1 && raw[0] == 0x4D && raw[1] == 0x5A
+}
+
+// Elf matches an Executable and Linkable Format file.
+func Elf(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x7F, 0x45, 0x4C, 0x46})
+}
+
+// Nes matches a Nintendo Entertainment system ROM file.
+func Nes(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x4E, 0x45, 0x53, 0x1A})
+}
+
+// SWF matches an Adobe Flash swf file.
+func SWF(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("CWS")) ||
+ bytes.HasPrefix(raw, []byte("FWS")) ||
+ bytes.HasPrefix(raw, []byte("ZWS"))
+}
+
+// Torrent has bencoded text in the beginning.
+func Torrent(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("d8:announce"))
+}
+
+// PAR1 matches a parquet file.
+func Par1(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x50, 0x41, 0x52, 0x31})
+}
+
+// CBOR matches a Concise Binary Object Representation https://cbor.io/
+func CBOR(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0xD9, 0xD9, 0xF7})
+}
// Java bytecode and Mach-O binaries share the same magic number.
// More info here https://github.com/threatstack/libmagic/blob/master/magic/Magdir/cafebabe
@@ -168,8 +194,10 @@ func Marc(raw []byte, limit uint32) bool {
//
// [glTF specification]: https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html
// [IANA glTF entry]: https://www.iana.org/assignments/media-types/model/gltf-binary
-var GLB = prefix([]byte("\x67\x6C\x54\x46\x02\x00\x00\x00"),
- []byte("\x67\x6C\x54\x46\x01\x00\x00\x00"))
+func GLB(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x67\x6C\x54\x46\x02\x00\x00\x00")) ||
+ bytes.HasPrefix(raw, []byte("\x67\x6C\x54\x46\x01\x00\x00\x00"))
+}
// TzIf matches a Time Zone Information Format (TZif) file.
// See more: https://tools.ietf.org/id/draft-murchison-tzdist-tzif-00.html#rfc.section.3
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/database.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/database.go
index cb1fed12..35c3f911 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/database.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/database.go
@@ -1,13 +1,21 @@
package magic
-var (
- // Sqlite matches an SQLite database file.
- Sqlite = prefix([]byte{
+import "bytes"
+
+// Sqlite matches an SQLite database file.
+func Sqlite(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{
0x53, 0x51, 0x4c, 0x69, 0x74, 0x65, 0x20, 0x66,
0x6f, 0x72, 0x6d, 0x61, 0x74, 0x20, 0x33, 0x00,
})
- // MsAccessAce matches Microsoft Access dababase file.
- MsAccessAce = offset([]byte("Standard ACE DB"), 4)
- // MsAccessMdb matches legacy Microsoft Access database file (JET, 2003 and earlier).
- MsAccessMdb = offset([]byte("Standard Jet DB"), 4)
-)
+}
+
+// MsAccessAce matches Microsoft Access dababase file.
+func MsAccessAce(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("Standard ACE DB"), 4)
+}
+
+// MsAccessMdb matches legacy Microsoft Access database file (JET, 2003 and earlier).
+func MsAccessMdb(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("Standard Jet DB"), 4)
+}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/document.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/document.go
index 7f9308db..72080395 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/document.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/document.go
@@ -5,14 +5,31 @@ import (
"encoding/binary"
)
-var (
- // Fdf matches a Forms Data Format file.
- Fdf = prefix([]byte("%FDF"))
- // Mobi matches a Mobi file.
- Mobi = offset([]byte("BOOKMOBI"), 60)
- // Lit matches a Microsoft Lit file.
- Lit = prefix([]byte("ITOLITLS"))
-)
+// Pdf matches a Portable Document Format file.
+// https://github.com/file/file/blob/11010cc805546a3e35597e67e1129a481aed40e8/magic/Magdir/pdf
+func Pdf(raw []byte, _ uint32) bool {
+ // usual pdf signature
+ return bytes.HasPrefix(raw, []byte("%PDF-")) ||
+ // new-line prefixed signature
+ bytes.HasPrefix(raw, []byte("\012%PDF-")) ||
+ // UTF-8 BOM prefixed signature
+ bytes.HasPrefix(raw, []byte("\xef\xbb\xbf%PDF-"))
+}
+
+// Fdf matches a Forms Data Format file.
+func Fdf(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("%FDF"))
+}
+
+// Mobi matches a Mobi file.
+func Mobi(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("BOOKMOBI"), 60)
+}
+
+// Lit matches a Microsoft Lit file.
+func Lit(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("ITOLITLS"))
+}
// PDF matches a Portable Document Format file.
// The %PDF- header should be the first thing inside the file but many
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/font.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/font.go
index 43af2821..857cfcc5 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/font.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/font.go
@@ -4,14 +4,20 @@ import (
"bytes"
)
-var (
- // Woff matches a Web Open Font Format file.
- Woff = prefix([]byte("wOFF"))
- // Woff2 matches a Web Open Font Format version 2 file.
- Woff2 = prefix([]byte("wOF2"))
- // Otf matches an OpenType font file.
- Otf = prefix([]byte{0x4F, 0x54, 0x54, 0x4F, 0x00})
-)
+// Woff matches a Web Open Font Format file.
+func Woff(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("wOFF"))
+}
+
+// Woff2 matches a Web Open Font Format version 2 file.
+func Woff2(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("wOF2"))
+}
+
+// Otf matches an OpenType font file.
+func Otf(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x4F, 0x54, 0x54, 0x4F, 0x00})
+}
// Ttf matches a TrueType font file.
func Ttf(raw []byte, limit uint32) bool {
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ftyp.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ftyp.go
index ac727139..fc642ef4 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ftyp.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ftyp.go
@@ -4,24 +4,33 @@ import (
"bytes"
)
-var (
- // AVIF matches an AV1 Image File Format still or animated.
- // Wikipedia page seems outdated listing image/avif-sequence for animations.
- // https://github.com/AOMediaCodec/av1-avif/issues/59
- AVIF = ftyp([]byte("avif"), []byte("avis"))
- // ThreeGP matches a 3GPP file.
- ThreeGP = ftyp(
+// AVIF matches an AV1 Image File Format still or animated.
+// Wikipedia page seems outdated listing image/avif-sequence for animations.
+// https://github.com/AOMediaCodec/av1-avif/issues/59
+func AVIF(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("avif"), []byte("avis"))
+}
+
+// ThreeGP matches a 3GPP file.
+func ThreeGP(raw []byte, _ uint32) bool {
+ return ftyp(raw,
[]byte("3gp1"), []byte("3gp2"), []byte("3gp3"), []byte("3gp4"),
[]byte("3gp5"), []byte("3gp6"), []byte("3gp7"), []byte("3gs7"),
[]byte("3ge6"), []byte("3ge7"), []byte("3gg6"),
)
- // ThreeG2 matches a 3GPP2 file.
- ThreeG2 = ftyp(
+}
+
+// ThreeG2 matches a 3GPP2 file.
+func ThreeG2(raw []byte, _ uint32) bool {
+ return ftyp(raw,
[]byte("3g24"), []byte("3g25"), []byte("3g26"), []byte("3g2a"),
[]byte("3g2b"), []byte("3g2c"), []byte("KDDI"),
)
- // AMp4 matches an audio MP4 file.
- AMp4 = ftyp(
+}
+
+// AMp4 matches an audio MP4 file.
+func AMp4(raw []byte, _ uint32) bool {
+ return ftyp(raw,
// audio for Adobe Flash Player 9+
[]byte("F4A "), []byte("F4B "),
// Apple iTunes AAC-LC (.M4A) Audio
@@ -31,33 +40,61 @@ var (
// Nero Digital AAC Audio
[]byte("NDAS"),
)
- // Mqv matches a Sony / Mobile QuickTime file.
- Mqv = ftyp([]byte("mqt "))
- // M4a matches an audio M4A file.
- M4a = ftyp([]byte("M4A "))
- // M4v matches an Appl4 M4V video file.
- M4v = ftyp([]byte("M4V "), []byte("M4VH"), []byte("M4VP"))
- // Heic matches a High Efficiency Image Coding (HEIC) file.
- Heic = ftyp([]byte("heic"), []byte("heix"))
- // HeicSequence matches a High Efficiency Image Coding (HEIC) file sequence.
- HeicSequence = ftyp([]byte("hevc"), []byte("hevx"))
- // Heif matches a High Efficiency Image File Format (HEIF) file.
- Heif = ftyp([]byte("mif1"), []byte("heim"), []byte("heis"), []byte("avic"))
- // HeifSequence matches a High Efficiency Image File Format (HEIF) file sequence.
- HeifSequence = ftyp([]byte("msf1"), []byte("hevm"), []byte("hevs"), []byte("avcs"))
- // Mj2 matches a Motion JPEG 2000 file: https://en.wikipedia.org/wiki/Motion_JPEG_2000.
- Mj2 = ftyp([]byte("mj2s"), []byte("mjp2"), []byte("MFSM"), []byte("MGSV"))
- // Dvb matches a Digital Video Broadcasting file: https://dvb.org.
- // https://cconcolato.github.io/mp4ra/filetype.html
- // https://github.com/file/file/blob/512840337ead1076519332d24fefcaa8fac36e06/magic/Magdir/animation#L135-L154
- Dvb = ftyp(
+}
+
+// Mqv matches a Sony / Mobile QuickTime file.
+func Mqv(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("mqt "))
+}
+
+// M4a matches an audio M4A file.
+func M4a(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("M4A "))
+}
+
+// M4v matches an Appl4 M4V video file.
+func M4v(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("M4V "), []byte("M4VH"), []byte("M4VP"))
+}
+
+// Heic matches a High Efficiency Image Coding (HEIC) file.
+func Heic(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("heic"), []byte("heix"))
+}
+
+// HeicSequence matches a High Efficiency Image Coding (HEIC) file sequence.
+func HeicSequence(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("hevc"), []byte("hevx"))
+}
+
+// Heif matches a High Efficiency Image File Format (HEIF) file.
+func Heif(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("mif1"), []byte("heim"), []byte("heis"), []byte("avic"))
+}
+
+// HeifSequence matches a High Efficiency Image File Format (HEIF) file sequence.
+func HeifSequence(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("msf1"), []byte("hevm"), []byte("hevs"), []byte("avcs"))
+}
+
+// Mj2 matches a Motion JPEG 2000 file: https://en.wikipedia.org/wiki/Motion_JPEG_2000.
+func Mj2(raw []byte, _ uint32) bool {
+ return ftyp(raw, []byte("mj2s"), []byte("mjp2"), []byte("MFSM"), []byte("MGSV"))
+}
+
+// Dvb matches a Digital Video Broadcasting file: https://dvb.org.
+// https://cconcolato.github.io/mp4ra/filetype.html
+// https://github.com/file/file/blob/512840337ead1076519332d24fefcaa8fac36e06/magic/Magdir/animation#L135-L154
+func Dvb(raw []byte, _ uint32) bool {
+ return ftyp(raw,
[]byte("dby1"), []byte("dsms"), []byte("dts1"), []byte("dts2"),
[]byte("dts3"), []byte("dxo "), []byte("dmb1"), []byte("dmpf"),
[]byte("drc1"), []byte("dv1a"), []byte("dv1b"), []byte("dv2a"),
[]byte("dv2b"), []byte("dv3a"), []byte("dv3b"), []byte("dvr1"),
[]byte("dvt1"), []byte("emsg"))
- // TODO: add support for remaining video formats at ftyps.com.
-)
+}
+
+// TODO: add support for remaining video formats at ftyps.com.
// QuickTime matches a QuickTime File Format file.
// https://www.loc.gov/preservation/digital/formats/fdd/fdd000052.shtml
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/image.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/image.go
index 0eb7e95f..788f5478 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/image.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/image.go
@@ -2,66 +2,127 @@ package magic
import "bytes"
-var (
- // Png matches a Portable Network Graphics file.
- // https://www.w3.org/TR/PNG/
- Png = prefix([]byte{0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A})
- // Apng matches an Animated Portable Network Graphics file.
- // https://wiki.mozilla.org/APNG_Specification
- Apng = offset([]byte("acTL"), 37)
- // Jpg matches a Joint Photographic Experts Group file.
- Jpg = prefix([]byte{0xFF, 0xD8, 0xFF})
- // Jp2 matches a JPEG 2000 Image file (ISO 15444-1).
- Jp2 = jpeg2k([]byte{0x6a, 0x70, 0x32, 0x20})
- // Jpx matches a JPEG 2000 Image file (ISO 15444-2).
- Jpx = jpeg2k([]byte{0x6a, 0x70, 0x78, 0x20})
- // Jpm matches a JPEG 2000 Image file (ISO 15444-6).
- Jpm = jpeg2k([]byte{0x6a, 0x70, 0x6D, 0x20})
- // Gif matches a Graphics Interchange Format file.
- Gif = prefix([]byte("GIF87a"), []byte("GIF89a"))
- // Bmp matches a bitmap image file.
- Bmp = prefix([]byte{0x42, 0x4D})
- // Ps matches a PostScript file.
- Ps = prefix([]byte("%!PS-Adobe-"))
- // Psd matches a Photoshop Document file.
- Psd = prefix([]byte("8BPS"))
- // Ico matches an ICO file.
- Ico = prefix([]byte{0x00, 0x00, 0x01, 0x00}, []byte{0x00, 0x00, 0x02, 0x00})
- // Icns matches an ICNS (Apple Icon Image format) file.
- Icns = prefix([]byte("icns"))
- // Tiff matches a Tagged Image File Format file.
- Tiff = prefix([]byte{0x49, 0x49, 0x2A, 0x00}, []byte{0x4D, 0x4D, 0x00, 0x2A})
- // Bpg matches a Better Portable Graphics file.
- Bpg = prefix([]byte{0x42, 0x50, 0x47, 0xFB})
- // Xcf matches GIMP image data.
- Xcf = prefix([]byte("gimp xcf"))
- // Pat matches GIMP pattern data.
- Pat = offset([]byte("GPAT"), 20)
- // Gbr matches GIMP brush data.
- Gbr = offset([]byte("GIMP"), 20)
- // Hdr matches Radiance HDR image.
- // https://web.archive.org/web/20060913152809/http://local.wasp.uwa.edu.au/~pbourke/dataformats/pic/
- Hdr = prefix([]byte("#?RADIANCE\n"))
- // Xpm matches X PixMap image data.
- Xpm = prefix([]byte{0x2F, 0x2A, 0x20, 0x58, 0x50, 0x4D, 0x20, 0x2A, 0x2F})
- // Jxs matches a JPEG XS coded image file (ISO/IEC 21122-3).
- Jxs = prefix([]byte{0x00, 0x00, 0x00, 0x0C, 0x4A, 0x58, 0x53, 0x20, 0x0D, 0x0A, 0x87, 0x0A})
- // Jxr matches Microsoft HD JXR photo file.
- Jxr = prefix([]byte{0x49, 0x49, 0xBC, 0x01})
-)
+// Png matches a Portable Network Graphics file.
+// https://www.w3.org/TR/PNG/
+func Png(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A})
+}
-func jpeg2k(sig []byte) Detector {
- return func(raw []byte, _ uint32) bool {
- if len(raw) < 24 {
- return false
- }
+// Apng matches an Animated Portable Network Graphics file.
+// https://wiki.mozilla.org/APNG_Specification
+func Apng(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("acTL"), 37)
+}
- if !bytes.Equal(raw[4:8], []byte{0x6A, 0x50, 0x20, 0x20}) &&
- !bytes.Equal(raw[4:8], []byte{0x6A, 0x50, 0x32, 0x20}) {
- return false
- }
- return bytes.Equal(raw[20:24], sig)
+// Jpg matches a Joint Photographic Experts Group file.
+func Jpg(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0xFF, 0xD8, 0xFF})
+}
+
+// Jp2 matches a JPEG 2000 Image file (ISO 15444-1).
+func Jp2(raw []byte, _ uint32) bool {
+ return jpeg2k(raw, []byte{0x6a, 0x70, 0x32, 0x20})
+}
+
+// Jpx matches a JPEG 2000 Image file (ISO 15444-2).
+func Jpx(raw []byte, _ uint32) bool {
+ return jpeg2k(raw, []byte{0x6a, 0x70, 0x78, 0x20})
+}
+
+// Jpm matches a JPEG 2000 Image file (ISO 15444-6).
+func Jpm(raw []byte, _ uint32) bool {
+ return jpeg2k(raw, []byte{0x6a, 0x70, 0x6D, 0x20})
+}
+
+// Gif matches a Graphics Interchange Format file.
+func Gif(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("GIF87a")) ||
+ bytes.HasPrefix(raw, []byte("GIF89a"))
+}
+
+// Bmp matches a bitmap image file.
+func Bmp(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x42, 0x4D})
+}
+
+// Ps matches a PostScript file.
+func Ps(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("%!PS-Adobe-"))
+}
+
+// Psd matches a Photoshop Document file.
+func Psd(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("8BPS"))
+}
+
+// Ico matches an ICO file.
+func Ico(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x00, 0x00, 0x01, 0x00}) ||
+ bytes.HasPrefix(raw, []byte{0x00, 0x00, 0x02, 0x00})
+}
+
+// Icns matches an ICNS (Apple Icon Image format) file.
+func Icns(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("icns"))
+}
+
+// Tiff matches a Tagged Image File Format file.
+func Tiff(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x49, 0x49, 0x2A, 0x00}) ||
+ bytes.HasPrefix(raw, []byte{0x4D, 0x4D, 0x00, 0x2A})
+}
+
+// Bpg matches a Better Portable Graphics file.
+func Bpg(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x42, 0x50, 0x47, 0xFB})
+}
+
+// Xcf matches GIMP image data.
+func Xcf(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("gimp xcf"))
+}
+
+// Pat matches GIMP pattern data.
+func Pat(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("GPAT"), 20)
+}
+
+// Gbr matches GIMP brush data.
+func Gbr(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("GIMP"), 20)
+}
+
+// Hdr matches Radiance HDR image.
+// https://web.archive.org/web/20060913152809/http://local.wasp.uwa.edu.au/~pbourke/dataformats/pic/
+func Hdr(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("#?RADIANCE\n"))
+}
+
+// Xpm matches X PixMap image data.
+func Xpm(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x2F, 0x2A, 0x20, 0x58, 0x50, 0x4D, 0x20, 0x2A, 0x2F})
+}
+
+// Jxs matches a JPEG XS coded image file (ISO/IEC 21122-3).
+func Jxs(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x00, 0x00, 0x00, 0x0C, 0x4A, 0x58, 0x53, 0x20, 0x0D, 0x0A, 0x87, 0x0A})
+}
+
+// Jxr matches Microsoft HD JXR photo file.
+func Jxr(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x49, 0x49, 0xBC, 0x01})
+}
+
+func jpeg2k(raw []byte, sig []byte) bool {
+ if len(raw) < 24 {
+ return false
}
+
+ if !bytes.Equal(raw[4:8], []byte{0x6A, 0x50, 0x20, 0x20}) &&
+ !bytes.Equal(raw[4:8], []byte{0x6A, 0x50, 0x32, 0x20}) {
+ return false
+ }
+ return bytes.Equal(raw[20:24], sig)
}
// Webp matches a WebP file.
@@ -108,3 +169,20 @@ func Jxl(raw []byte, _ uint32) bool {
return bytes.HasPrefix(raw, []byte{0xFF, 0x0A}) ||
bytes.HasPrefix(raw, []byte("\x00\x00\x00\x0cJXL\x20\x0d\x0a\x87\x0a"))
}
+
+// DXF matches Drawing Exchange Format AutoCAD file.
+// There does not seem to be a clear specification and the files in the wild
+// differ wildly.
+// https://images.autodesk.com/adsk/files/autocad_2012_pdf_dxf-reference_enu.pdf
+//
+// I collected these signatures by downloading a few dozen files from
+// http://cd.textfiles.com/amigaenv/DXF/OBJEKTE/ and
+// https://sembiance.com/fileFormatSamples/poly/dxf/ and then
+// xxd -l 16 {} | sort | uniq.
+// These signatures are only for the ASCII version of DXF. There is a binary version too.
+func DXF(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte(" 0\x0ASECTION\x0A")) ||
+ bytes.HasPrefix(raw, []byte(" 0\x0D\x0ASECTION\x0D\x0A")) ||
+ bytes.HasPrefix(raw, []byte("0\x0ASECTION\x0A")) ||
+ bytes.HasPrefix(raw, []byte("0\x0D\x0ASECTION\x0D\x0A"))
+}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/magic.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/magic.go
index 5fe435b9..6103c12d 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/magic.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/magic.go
@@ -3,7 +3,6 @@ package magic
import (
"bytes"
- "fmt"
"github.com/gabriel-vasile/mimetype/internal/scan"
)
@@ -22,37 +21,20 @@ type (
}
)
-// prefix creates a Detector which returns true if any of the provided signatures
-// is the prefix of the raw input.
-func prefix(sigs ...[]byte) Detector {
- return func(raw []byte, limit uint32) bool {
- for _, s := range sigs {
- if bytes.HasPrefix(raw, s) {
- return true
- }
- }
- return false
- }
-}
-
-// offset creates a Detector which returns true if the provided signature can be
+// offset returns true if the provided signature can be
// found at offset in the raw input.
-func offset(sig []byte, offset int) Detector {
- return func(raw []byte, limit uint32) bool {
- return len(raw) > offset && bytes.HasPrefix(raw[offset:], sig)
- }
+func offset(raw []byte, sig []byte, offset int) bool {
+ return len(raw) > offset && bytes.HasPrefix(raw[offset:], sig)
}
// ciPrefix is like prefix but the check is case insensitive.
-func ciPrefix(sigs ...[]byte) Detector {
- return func(raw []byte, limit uint32) bool {
- for _, s := range sigs {
- if ciCheck(s, raw) {
- return true
- }
+func ciPrefix(raw []byte, sigs ...[]byte) bool {
+ for _, s := range sigs {
+ if ciCheck(s, raw) {
+ return true
}
- return false
}
+ return false
}
func ciCheck(sig, raw []byte) bool {
if len(raw) < len(sig)+1 {
@@ -72,22 +54,18 @@ func ciCheck(sig, raw []byte) bool {
return true
}
-// xml creates a Detector which returns true if any of the provided XML signatures
-// matches the raw input.
-func xml(sigs ...xmlSig) Detector {
- return func(raw []byte, limit uint32) bool {
- b := scan.Bytes(raw)
- b.TrimLWS()
- if len(b) == 0 {
- return false
- }
- for _, s := range sigs {
- if xmlCheck(s, b) {
- return true
- }
- }
+// xml returns true if any of the provided XML signatures matches the raw input.
+func xml(b scan.Bytes, sigs ...xmlSig) bool {
+ b.TrimLWS()
+ if len(b) == 0 {
return false
}
+ for _, s := range sigs {
+ if xmlCheck(s, b) {
+ return true
+ }
+ }
+ return false
}
func xmlCheck(sig xmlSig, raw []byte) bool {
raw = raw[:min(len(raw), 512)]
@@ -103,28 +81,24 @@ func xmlCheck(sig xmlSig, raw []byte) bool {
return localNameIndex != -1 && localNameIndex < bytes.Index(raw, sig.xmlns)
}
-// markup creates a Detector which returns true is any of the HTML signatures
-// matches the raw input.
-func markup(sigs ...[]byte) Detector {
- return func(raw []byte, limit uint32) bool {
- b := scan.Bytes(raw)
- if bytes.HasPrefix(b, []byte{0xEF, 0xBB, 0xBF}) {
- // We skip the UTF-8 BOM if present to ensure we correctly
- // process any leading whitespace. The presence of the BOM
- // is taken into account during charset detection in charset.go.
- b.Advance(3)
- }
- b.TrimLWS()
- if len(b) == 0 {
- return false
- }
- for _, s := range sigs {
- if markupCheck(s, b) {
- return true
- }
- }
+// markup returns true is any of the HTML signatures matches the raw input.
+func markup(b scan.Bytes, sigs ...[]byte) bool {
+ if bytes.HasPrefix(b, []byte{0xEF, 0xBB, 0xBF}) {
+ // We skip the UTF-8 BOM if present to ensure we correctly
+ // process any leading whitespace. The presence of the BOM
+ // is taken into account during charset detection in charset.go.
+ b.Advance(3)
+ }
+ b.TrimLWS()
+ if len(b) == 0 {
return false
}
+ for _, s := range sigs {
+ if markupCheck(s, b) {
+ return true
+ }
+ }
+ return false
}
func markupCheck(sig, raw []byte) bool {
if len(raw) < len(sig)+1 {
@@ -149,29 +123,17 @@ func markupCheck(sig, raw []byte) bool {
return true
}
-// ftyp creates a Detector which returns true if any of the FTYP signatures
-// matches the raw input.
-func ftyp(sigs ...[]byte) Detector {
- return func(raw []byte, limit uint32) bool {
- if len(raw) < 12 {
- return false
- }
- for _, s := range sigs {
- if bytes.Equal(raw[8:12], s) {
- return true
- }
- }
+// ftyp returns true if any of the FTYP signatures matches the raw input.
+func ftyp(raw []byte, sigs ...[]byte) bool {
+ if len(raw) < 12 {
return false
}
-}
-
-func newXMLSig(localName, xmlns string) xmlSig {
- ret := xmlSig{xmlns: []byte(xmlns)}
- if localName != "" {
- ret.localName = []byte(fmt.Sprintf("<%s", localName))
+ for _, s := range sigs {
+ if bytes.Equal(raw[8:12], s) {
+ return true
+ }
}
-
- return ret
+ return false
}
// A valid shebang starts with the "#!" characters,
@@ -184,29 +146,17 @@ func newXMLSig(localName, xmlns string) xmlSig {
// #! /usr/bin/env php
//
// /usr/bin/env is the interpreter, php is the first and only argument.
-func shebang(sigs ...[]byte) Detector {
- return func(raw []byte, limit uint32) bool {
- b := scan.Bytes(raw)
- line := b.Line()
- for _, s := range sigs {
- if shebangCheck(s, line) {
- return true
- }
+func shebang(b scan.Bytes, matchFlags scan.Flags, sigs ...[]byte) bool {
+ line := b.Line()
+ if len(line) < 2 || line[0] != '#' || line[1] != '!' {
+ return false
+ }
+ line = line[2:]
+ line.TrimLWS()
+ for _, s := range sigs {
+ if line.Match(s, matchFlags) != -1 {
+ return true
}
- return false
}
-}
-
-func shebangCheck(sig []byte, raw scan.Bytes) bool {
- if len(raw) < len(sig)+2 {
- return false
- }
- if raw[0] != '#' || raw[1] != '!' {
- return false
- }
-
- raw.Advance(2) // skip #! we checked above
- raw.TrimLWS()
- raw.TrimRWS()
- return bytes.Equal(raw, sig)
+ return false
}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/meteo.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/meteo.go
new file mode 100644
index 00000000..da77d0b0
--- /dev/null
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/meteo.go
@@ -0,0 +1,12 @@
+package magic
+
+import "bytes"
+
+// GRIB matches a GRIdded Binary meteorological file.
+// https://www.nco.ncep.noaa.gov/pmb/docs/on388/
+// https://www.nco.ncep.noaa.gov/pmb/docs/grib2/grib2_doc/
+func GRIB(raw []byte, _ uint32) bool {
+ return len(raw) > 7 &&
+ bytes.HasPrefix(raw, []byte("GRIB")) &&
+ (raw[7] == 1 || raw[7] == 2)
+}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ms_office.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ms_office.go
index c912823e..e689e92a 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ms_office.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/ms_office.go
@@ -44,17 +44,6 @@ func Ole(raw []byte, limit uint32) bool {
return bytes.HasPrefix(raw, []byte{0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1})
}
-// Aaf matches an Advanced Authoring Format file.
-// See: https://pyaaf.readthedocs.io/en/latest/about.html
-// See: https://en.wikipedia.org/wiki/Advanced_Authoring_Format
-func Aaf(raw []byte, limit uint32) bool {
- if len(raw) < 31 {
- return false
- }
- return bytes.HasPrefix(raw[8:], []byte{0x41, 0x41, 0x46, 0x42, 0x0D, 0x00, 0x4F, 0x4D}) &&
- (raw[30] == 0x09 || raw[30] == 0x0C)
-}
-
// Doc matches a Microsoft Word 97-2003 file.
// See: https://github.com/decalage2/oletools/blob/412ee36ae45e70f42123e835871bac956d958461/oletools/common/clsid.py
func Doc(raw []byte, _ uint32) bool {
@@ -203,9 +192,21 @@ func matchOleClsid(in []byte, clsid []byte) bool {
// Expected offset of CLSID for root storage object.
clsidOffset := sectorLength*(1+firstSecID) + 80
- if len(in) <= clsidOffset+16 {
+ // #731 offset is outside in or wrapped around due to integer overflow.
+ if len(in) <= clsidOffset+16 || clsidOffset < 0 {
return false
}
return bytes.HasPrefix(in[clsidOffset:], clsid)
}
+
+// WPD matches a WordPerfect document.
+func WPD(raw []byte, _ uint32) bool {
+ if len(raw) < 10 {
+ return false
+ }
+ if !bytes.HasPrefix(raw, []byte("\xffWPC")) {
+ return false
+ }
+ return raw[8] == 1 && raw[9] == 10
+}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/text.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/text.go
index 1841ee87..82f6c670 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/text.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/text.go
@@ -10,9 +10,9 @@ import (
"github.com/gabriel-vasile/mimetype/internal/scan"
)
-var (
- // HTML matches a Hypertext Markup Language file.
- HTML = markup(
+// HTML matches a Hypertext Markup Language file.
+func HTML(raw []byte, _ uint32) bool {
+ return markup(raw,
[]byte(" 0 && firstNonWS == '[')
+ hasTargetTok = hasTargetTok || (t&json.TokObject > 0 && firstNonWS == '{')
+ }
+ if !hasTargetTok {
return false
}
lraw := len(raw)
- parsed, inspected, firstToken, querySatisfied := json.Parse(q, raw)
- if !querySatisfied || firstToken&wantTok == 0 {
+ parsed, inspected, _, querySatisfied := json.Parse(q, raw)
+ if !querySatisfied {
return false
}
@@ -244,7 +376,7 @@ func jsonHelper(raw []byte, limit uint32, q string, wantTok int) bool {
// If a section of the file was provided, check if all of it was inspected.
// In other words, check that if there was a problem parsing, that problem
- // occured at the last byte in the input.
+ // occurred at the last byte in the input.
return inspected == lraw && lraw > 0
}
@@ -294,11 +426,12 @@ func svgWithoutXMLDeclaration(s scan.Bytes) bool {
return false
}
- targetName, targetVal := "xmlns", "http://www.w3.org/2000/svg"
- aName, aVal, hasMore := "", "", true
+ targetName, targetVal := []byte("xmlns"), []byte("http://www.w3.org/2000/svg")
+ var aName, aVal []byte
+ hasMore := true
for hasMore {
aName, aVal, hasMore = mkup.GetAnAttribute(&s)
- if aName == targetName && aVal == targetVal {
+ if bytes.Equal(aName, targetName) && bytes.Equal(aVal, targetVal) {
return true
}
if !hasMore {
@@ -325,10 +458,11 @@ func svgWithXMLDeclaration(s scan.Bytes) bool {
// version is a required attribute for XML.
hasVersion := false
- aName, hasMore := "", true
+ var aName []byte
+ hasMore := true
for hasMore {
aName, _, hasMore = mkup.GetAnAttribute(&s)
- if aName == "version" {
+ if bytes.Equal(aName, []byte("version")) {
hasVersion = true
break
}
@@ -409,3 +543,57 @@ func Vtt(raw []byte, limit uint32) bool {
return bytes.Equal(raw, []byte{0xEF, 0xBB, 0xBF, 0x57, 0x45, 0x42, 0x56, 0x54, 0x54}) || // UTF-8 BOM and "WEBVTT"
bytes.Equal(raw, []byte{0x57, 0x45, 0x42, 0x56, 0x54, 0x54}) // "WEBVTT"
}
+
+type rfc822Hint struct {
+ h []byte
+ matchFlags scan.Flags
+}
+
+// The hints come from libmagic, but the implementation is bit different. libmagic
+// only checks if the file starts with the hint, while we additionally look for
+// a secondary hint in the first few lines of input.
+func RFC822(raw []byte, limit uint32) bool {
+ b := scan.Bytes(raw)
+
+ // Keep hints here to avoid instantiating them several times in lineHasRFC822Hint.
+ // The alternative is to make them a package level var, but then they'd go
+ // on the heap.
+ // Some of the hints are IgnoreCase, some not. I selected based on what libmagic
+ // does and based on personal observations from sample files.
+ hints := []rfc822Hint{
+ {[]byte("From: "), 0},
+ {[]byte("To: "), 0},
+ {[]byte("CC: "), scan.IgnoreCase},
+ {[]byte("Date: "), 0},
+ {[]byte("Subject: "), 0},
+ {[]byte("Received: "), 0},
+ {[]byte("Relay-Version: "), 0},
+ {[]byte("#! rnews"), 0},
+ {[]byte("N#! rnews"), 0},
+ {[]byte("Forward to"), 0},
+ {[]byte("Pipe to"), 0},
+ {[]byte("DELIVERED-TO: "), scan.IgnoreCase},
+ {[]byte("RETURN-PATH: "), scan.IgnoreCase},
+ {[]byte("Content-Type: "), 0},
+ {[]byte("Content-Transfer-Encoding: "), 0},
+ }
+ if !lineHasRFC822Hint(b.Line(), hints) {
+ return false
+ }
+ for i := 0; i < 20; i++ {
+ if lineHasRFC822Hint(b.Line(), hints) {
+ return true
+ }
+ }
+
+ return false
+}
+
+func lineHasRFC822Hint(b scan.Bytes, hints []rfc822Hint) bool {
+ for _, h := range hints {
+ if b.Match(h.h, h.matchFlags) > -1 {
+ return true
+ }
+ }
+ return false
+}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/video.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/video.go
index 9caf5553..23e30da2 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/video.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/video.go
@@ -4,17 +4,23 @@ import (
"bytes"
)
-var (
- // Flv matches a Flash video file.
- Flv = prefix([]byte("\x46\x4C\x56\x01"))
- // Asf matches an Advanced Systems Format file.
- Asf = prefix([]byte{
+// Flv matches a Flash video file.
+func Flv(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte("\x46\x4C\x56\x01"))
+}
+
+// Asf matches an Advanced Systems Format file.
+func Asf(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{
0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11,
0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C,
})
- // Rmvb matches a RealMedia Variable Bitrate file.
- Rmvb = prefix([]byte{0x2E, 0x52, 0x4D, 0x46})
-)
+}
+
+// Rmvb matches a RealMedia Variable Bitrate file.
+func Rmvb(raw []byte, _ uint32) bool {
+ return bytes.HasPrefix(raw, []byte{0x2E, 0x52, 0x4D, 0x46})
+}
// WebM matches a WebM file.
func WebM(raw []byte, limit uint32) bool {
@@ -63,9 +69,9 @@ func isFileTypeNamePresent(in []byte, flType string) bool {
// vintWidth parses the variable-integer width in matroska containers
func vintWidth(v int) int {
- mask, max, num := 128, 8, 1
- for num < max && v&mask == 0 {
- mask = mask >> 1
+ mask, nTimes, num := 128, 8, 1
+ for num < nTimes && v&mask == 0 {
+ mask >>= 1
num++
}
return num
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/zip.go b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/zip.go
index 17750e6e..f3bfa2ac 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/magic/zip.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/magic/zip.go
@@ -6,32 +6,65 @@ import (
"github.com/gabriel-vasile/mimetype/internal/scan"
)
-var (
- // Odt matches an OpenDocument Text file.
- Odt = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.text"), 30)
- // Ott matches an OpenDocument Text Template file.
- Ott = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.text-template"), 30)
- // Ods matches an OpenDocument Spreadsheet file.
- Ods = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.spreadsheet"), 30)
- // Ots matches an OpenDocument Spreadsheet Template file.
- Ots = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.spreadsheet-template"), 30)
- // Odp matches an OpenDocument Presentation file.
- Odp = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.presentation"), 30)
- // Otp matches an OpenDocument Presentation Template file.
- Otp = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.presentation-template"), 30)
- // Odg matches an OpenDocument Drawing file.
- Odg = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.graphics"), 30)
- // Otg matches an OpenDocument Drawing Template file.
- Otg = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.graphics-template"), 30)
- // Odf matches an OpenDocument Formula file.
- Odf = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.formula"), 30)
- // Odc matches an OpenDocument Chart file.
- Odc = offset([]byte("mimetypeapplication/vnd.oasis.opendocument.chart"), 30)
- // Epub matches an EPUB file.
- Epub = offset([]byte("mimetypeapplication/epub+zip"), 30)
- // Sxc matches an OpenOffice Spreadsheet file.
- Sxc = offset([]byte("mimetypeapplication/vnd.sun.xml.calc"), 30)
-)
+// Odt matches an OpenDocument Text file.
+func Odt(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.text"), 30)
+}
+
+// Ott matches an OpenDocument Text Template file.
+func Ott(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.text-template"), 30)
+}
+
+// Ods matches an OpenDocument Spreadsheet file.
+func Ods(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.spreadsheet"), 30)
+}
+
+// Ots matches an OpenDocument Spreadsheet Template file.
+func Ots(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.spreadsheet-template"), 30)
+}
+
+// Odp matches an OpenDocument Presentation file.
+func Odp(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.presentation"), 30)
+}
+
+// Otp matches an OpenDocument Presentation Template file.
+func Otp(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.presentation-template"), 30)
+}
+
+// Odg matches an OpenDocument Drawing file.
+func Odg(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.graphics"), 30)
+}
+
+// Otg matches an OpenDocument Drawing Template file.
+func Otg(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.graphics-template"), 30)
+}
+
+// Odf matches an OpenDocument Formula file.
+func Odf(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.formula"), 30)
+}
+
+// Odc matches an OpenDocument Chart file.
+func Odc(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.oasis.opendocument.chart"), 30)
+}
+
+// Epub matches an EPUB file.
+func Epub(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/epub+zip"), 30)
+}
+
+// Sxc matches an OpenOffice Spreadsheet file.
+func Sxc(raw []byte, _ uint32) bool {
+ return offset(raw, []byte("mimetypeapplication/vnd.sun.xml.calc"), 30)
+}
// Zip matches a zip archive.
func Zip(raw []byte, limit uint32) bool {
@@ -52,10 +85,14 @@ func Zip(raw []byte, limit uint32) bool {
// (instead of relying on offsets told by the file.)
func Jar(raw []byte, limit uint32) bool {
return executableJar(raw) ||
+ // First entry must be an empty META-INF directory or the manifest.
+ // There is no specification saying that, but the jar reader and writer
+ // implementations from Java do it that way.
+ // https://github.com/openjdk/jdk/blob/88c4678eed818cbe9380f35352e90883fed27d33/src/java.base/share/classes/java/util/jar/JarInputStream.java#L170-L173
zipHas(raw, zipEntries{{
- name: []byte("META-INF/MANIFEST.MF"),
- }, {
name: []byte("META-INF/"),
+ }, {
+ name: []byte("META-INF/MANIFEST.MF"),
}}, 1)
}
@@ -94,11 +131,14 @@ type zipEntries []struct {
func (z zipEntries) match(file []byte) bool {
for i := range z {
- if z[i].dir && bytes.HasPrefix(file, z[i].name) {
- return true
- }
- if bytes.Equal(file, z[i].name) {
- return true
+ if z[i].dir {
+ if bytes.HasPrefix(file, z[i].name) {
+ return true
+ }
+ } else {
+ if bytes.Equal(file, z[i].name) {
+ return true
+ }
}
}
return false
@@ -134,11 +174,11 @@ func msoxml(raw scan.Bytes, searchFor zipEntries, stopAfter int) bool {
// If the first is not one of the next usually expected entries,
// then abort this check.
if i == 0 {
- if !bytes.Equal(f, []byte("[Content_Types].xml")) &&
- !bytes.Equal(f, []byte("_rels/.rels")) &&
- !bytes.Equal(f, []byte("docProps")) &&
- !bytes.Equal(f, []byte("customXml")) &&
- !bytes.Equal(f, []byte("[trash]")) {
+ if !bytes.Equal(f, []byte("[Content_Types].xml")) && // this is a file
+ !bytes.HasPrefix(f, []byte("_rels/")) && // these are directories
+ !bytes.HasPrefix(f, []byte("docProps/")) &&
+ !bytes.HasPrefix(f, []byte("customXml/")) &&
+ !bytes.HasPrefix(f, []byte("[trash]/")) {
return false
}
}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/markup/markup.go b/vendor/github.com/gabriel-vasile/mimetype/internal/markup/markup.go
index 937fa1da..b9abc6da 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/markup/markup.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/markup/markup.go
@@ -8,46 +8,48 @@ import (
"github.com/gabriel-vasile/mimetype/internal/scan"
)
-func GetAnAttribute(s *scan.Bytes) (name, val string, hasMore bool) {
+// GetAnAttribute assumes we passed over an SGML tag and extracts first
+// attribute and its value.
+//
+// Initially, this code existed inside charset/charset.go, because it was part of
+// implementing the https://html.spec.whatwg.org/multipage/parsing.html#prescan-a-byte-stream-to-determine-its-encoding
+// algorithm. But because extracting an attribute from a tag is the same for
+// both HTML and XML, then the code was moved here.
+func GetAnAttribute(s *scan.Bytes) (name, val []byte, hasMore bool) {
for scan.ByteIsWS(s.Peek()) || s.Peek() == '/' {
s.Advance(1)
}
if s.Peek() == '>' {
- return "", "", false
+ return nil, nil, false
}
- // Allocate 10 to avoid resizes.
- // Attribute names and values are continuous slices of bytes in input,
- // so we could do without allocating and returning slices of input.
- nameB := make([]byte, 0, 10)
+ origS, end := *s, 0
// step 4 and 5
for {
// bap means byte at position in the specification.
bap := s.Pop()
if bap == 0 {
- return "", "", false
+ return nil, nil, false
}
- if bap == '=' && len(nameB) > 0 {
+ if bap == '=' && end > 0 {
val, hasMore := getAValue(s)
- return string(nameB), string(val), hasMore
+ return origS[:end], val, hasMore
} else if scan.ByteIsWS(bap) {
for scan.ByteIsWS(s.Peek()) {
s.Advance(1)
}
if s.Peek() != '=' {
- return string(nameB), "", true
+ return origS[:end], nil, true
}
s.Advance(1)
for scan.ByteIsWS(s.Peek()) {
s.Advance(1)
}
val, hasMore := getAValue(s)
- return string(nameB), string(val), hasMore
+ return origS[:end], val, hasMore
} else if bap == '/' || bap == '>' {
- return string(nameB), "", false
- } else if bap >= 'A' && bap <= 'Z' {
- nameB = append(nameB, bap+0x20)
- } else {
- nameB = append(nameB, bap)
+ return origS[:end], nil, false
+ } else { // for any ASCII, non-ASCII, just advance
+ end++
}
}
}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/internal/scan/bytes.go b/vendor/github.com/gabriel-vasile/mimetype/internal/scan/bytes.go
index 9f09f078..552b4ead 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/internal/scan/bytes.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/internal/scan/bytes.go
@@ -35,6 +35,19 @@ func (b *Bytes) TrimRWS() {
}
}
+// FirstNonWS returns the first non-whitespace character from b,
+// or 0x00 if no such character is found.
+func (b Bytes) FirstNonWS() byte {
+ for i := range b {
+ if ByteIsWS(b[i]) {
+ continue
+ }
+ return b[i]
+ }
+
+ return 0x00
+}
+
// Peek one byte from b or 0x00 if b is empty.
func (b *Bytes) Peek() byte {
if len(*b) > 0 {
@@ -63,8 +76,8 @@ func (b *Bytes) PopN(n int) []byte {
return nil
}
-// PopUntil will advance b until, but not including, the first occurence of stopAt
-// character. If no occurence is found, then it will advance until the end of b.
+// PopUntil will advance b until, but not including, the first occurrence of stopAt
+// character. If no occurrence is found, then it will advance until the end of b.
// The returned Bytes is a slice of all the bytes that we're advanced over.
func (b *Bytes) PopUntil(stopAt ...byte) Bytes {
if len(*b) == 0 {
@@ -77,7 +90,7 @@ func (b *Bytes) PopUntil(stopAt ...byte) Bytes {
prefix := (*b)[:i]
*b = (*b)[i:]
- return Bytes(prefix)
+ return prefix
}
// ReadSlice is the same as PopUntil, but the returned value includes stopAt as well.
@@ -94,7 +107,7 @@ func (b *Bytes) ReadSlice(stopAt byte) Bytes {
prefix := (*b)[:i]
*b = (*b)[i:]
- return Bytes(prefix)
+ return prefix
}
// Line returns the first line from b and advances b with the length of the
@@ -117,7 +130,7 @@ func (b *Bytes) Line() Bytes {
// If b length is less than readLimit, it means we received an incomplete file
// and proceed with dropping the last line.
func (b *Bytes) DropLastLine(readLimit uint32) {
- if readLimit == 0 || uint32(len(*b)) < readLimit {
+ if readLimit == 0 || uint64(len(*b)) < uint64(readLimit) {
return
}
@@ -138,46 +151,85 @@ func (b *Bytes) Uint16() (uint16, bool) {
return v, true
}
+type Flags int
+
const (
- CompactWS = 1 << iota
+ // CompactWS will make one whitespace from pattern to match one or more spaces from input.
+ CompactWS Flags = 1 << iota
+ // IgnoreCase will match lower case from pattern with lower case from input.
+ // IgnoreCase will match upper case from pattern with both lower and upper case from input.
+ // This flag is not really well named,
IgnoreCase
+ // FullWord ensures the input ends with a full word (it's followed by spaces.)
+ FullWord
)
-// Search for occurences of pattern p inside b at any index.
-func (b Bytes) Search(p []byte, flags int) int {
+// Search for occurrences of pattern p inside b at any index.
+// It returns the index where p was found in b and how many bytes were needed
+// for matching the pattern.
+func (b Bytes) Search(p []byte, flags Flags) (i int, l int) {
+ lb, lp := len(b), len(p)
+ if lp == 0 {
+ return 0, 0
+ }
+ if lb == 0 {
+ return -1, 0
+ }
if flags == 0 {
- return bytes.Index(b, p)
+ if i = bytes.Index(b, p); i == -1 {
+ return -1, 0
+ } else {
+ return i, lp
+ }
}
- lb, lp := len(b), len(p)
for i := range b {
if lb-i < lp {
- return -1
+ return -1, 0
}
- if b[i:].Match(p, flags) {
- return i
+ if l = b[i:].Match(p, flags); l != -1 {
+ return i, l
}
}
- return 0
+ return -1, 0
}
-// Match pattern p at index 0 of b.
-func (b Bytes) Match(p []byte, flags int) bool {
+// Match returns how many bytes were needed to match pattern p.
+// It returns -1 if p does not match b.
+func (b Bytes) Match(p []byte, flags Flags) int {
+ l := len(b)
+ if len(p) == 0 {
+ return 0
+ }
+ if l == 0 {
+ return -1
+ }
+ // If no flags, or scanning for full word at the end of pattern then
+ // do a fast HasPrefix check.
+ // For other flags it's not possible to use HasPrefix.
+ if flags == 0 || flags&FullWord > 0 {
+ if bytes.HasPrefix(b, p) {
+ b = b[len(p):]
+ p = p[len(p):]
+ goto out
+ }
+ return -1
+ }
for len(b) > 0 {
- // If we finished all we we're looking for from p.
+ // If we finished all we were looking for from p.
if len(p) == 0 {
- return true
+ goto out
}
if flags&IgnoreCase > 0 && isUpper(p[0]) {
if upper(b[0]) != p[0] {
- return false
+ return -1
}
b, p = b[1:], p[1:]
} else if flags&CompactWS > 0 && ByteIsWS(p[0]) {
p = p[1:]
if !ByteIsWS(b[0]) {
- return false
+ return -1
}
b = b[1:]
if !ByteIsWS(p[0]) {
@@ -185,12 +237,22 @@ func (b Bytes) Match(p []byte, flags int) bool {
}
} else {
if b[0] != p[0] {
- return false
+ return -1
}
b, p = b[1:], p[1:]
}
}
- return true
+out:
+ // If p still has leftover characters, it means it didn't fully match b.
+ if len(p) > 0 {
+ return -1
+ }
+ if flags&FullWord > 0 {
+ if len(b) > 0 && !ByteIsWS(b[0]) {
+ return -1
+ }
+ }
+ return l - len(b)
}
func isUpper(c byte) bool {
diff --git a/vendor/github.com/gabriel-vasile/mimetype/mime.go b/vendor/github.com/gabriel-vasile/mimetype/mime.go
index b82627a8..3dadf720 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/mime.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/mime.go
@@ -2,6 +2,8 @@ package mimetype
import (
"mime"
+ "slices"
+ "strings"
"github.com/gabriel-vasile/mimetype/internal/charset"
"github.com/gabriel-vasile/mimetype/internal/magic"
@@ -57,10 +59,8 @@ func (m *MIME) Is(expectedMIME string) bool {
return true
}
- for _, alias := range m.aliases {
- if alias == expectedMIME {
- return true
- }
+ if slices.Contains(m.aliases, expectedMIME) {
+ return true
}
return false
@@ -109,7 +109,7 @@ func (m *MIME) match(in []byte, readLimit uint32) *MIME {
// Limit the number of bytes searched for to 1024.
charset = f(in[:min(len(in), 1024)])
}
- if m == root {
+ if m == root || charset == "" {
return m
}
@@ -126,6 +126,27 @@ func (m *MIME) flatten() []*MIME {
return out
}
+// hierarchy returns an easy to read list of ancestors for m.
+// For example, application/json would return json>txt>root.
+func (m *MIME) hierarchy() string {
+ h := ""
+ for m := m; m != nil; m = m.Parent() {
+ e := strings.TrimPrefix(m.Extension(), ".")
+ if e == "" {
+ // There are some MIME without extensions. When generating the hierarchy,
+ // it would be confusing to use empty string as extension.
+ // Use the subtype instead; ex: application/x-executable -> x-executable.
+ e = strings.Split(m.String(), "/")[1]
+ if m.Is("application/octet-stream") {
+ // for octet-stream use root, because it's short and used in many places
+ e = "root"
+ }
+ }
+ h += ">" + e
+ }
+ return strings.TrimPrefix(h, ">")
+}
+
// clone creates a new MIME with the provided optional MIME parameters.
func (m *MIME) clone(charset string) *MIME {
clonedMIME := m.mime
@@ -155,10 +176,11 @@ func (m *MIME) cloneHierarchy(charset string) *MIME {
}
func (m *MIME) lookup(mime string) *MIME {
- for _, n := range append(m.aliases, m.mime) {
- if n == mime {
- return m
- }
+ if mime == m.mime {
+ return m
+ }
+ if slices.Contains(m.aliases, mime) {
+ return m
}
for _, c := range m.children {
diff --git a/vendor/github.com/gabriel-vasile/mimetype/mimetype.go b/vendor/github.com/gabriel-vasile/mimetype/mimetype.go
index d8d512b8..79274173 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/mimetype.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/mimetype.go
@@ -12,7 +12,7 @@ import (
"sync/atomic"
)
-var defaultLimit uint32 = 3072
+const defaultLimit uint32 = 3072
// readLimit is the maximum number of bytes from the input used when detecting.
var readLimit uint32 = defaultLimit
@@ -112,15 +112,18 @@ func SetLimit(limit uint32) {
}
// Extend adds detection for other file formats.
-// It is equivalent to calling Extend() on the root mime type "application/octet-stream".
+// It is equivalent to calling Extend() on the root MIME type "application/octet-stream".
func Extend(detector func(raw []byte, limit uint32) bool, mime, extension string, aliases ...string) {
root.Extend(detector, mime, extension, aliases...)
}
// Lookup finds a MIME object by its string representation.
-// The representation can be the main mime type, or any of its aliases.
-func Lookup(mime string) *MIME {
+// The representation can be the main MIME type, or any of its aliases.
+func Lookup(m string) *MIME {
+ // We store the MIME types without optional params, so
+ // perform parsing to extract the target MIME type without optional params.
+ m, _, _ = mime.ParseMediaType(m)
mu.RLock()
defer mu.RUnlock()
- return root.lookup(mime)
+ return root.lookup(m)
}
diff --git a/vendor/github.com/gabriel-vasile/mimetype/supported_mimes.md b/vendor/github.com/gabriel-vasile/mimetype/supported_mimes.md
index 3186a8bf..45de7b9e 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/supported_mimes.md
+++ b/vendor/github.com/gabriel-vasile/mimetype/supported_mimes.md
@@ -1,196 +1,200 @@
-## 191 Supported MIME types
+## 195 Supported MIME types
This file is automatically generated when running tests. Do not edit manually.
-Extension | MIME type | Aliases
---------- | --------- | -------
-**n/a** | application/octet-stream | -
-**.xpm** | image/x-xpixmap | -
-**.7z** | application/x-7z-compressed | -
-**.zip** | application/zip | application/x-zip, application/x-zip-compressed
-**.docx** | application/vnd.openxmlformats-officedocument.wordprocessingml.document | -
-**.pptx** | application/vnd.openxmlformats-officedocument.presentationml.presentation | -
-**.xlsx** | application/vnd.openxmlformats-officedocument.spreadsheetml.sheet | -
-**.epub** | application/epub+zip | -
-**.apk** | application/vnd.android.package-archive | -
-**.jar** | application/java-archive | application/jar, application/jar-archive, application/x-java-archive
-**.odt** | application/vnd.oasis.opendocument.text | application/x-vnd.oasis.opendocument.text
-**.ott** | application/vnd.oasis.opendocument.text-template | application/x-vnd.oasis.opendocument.text-template
-**.ods** | application/vnd.oasis.opendocument.spreadsheet | application/x-vnd.oasis.opendocument.spreadsheet
-**.ots** | application/vnd.oasis.opendocument.spreadsheet-template | application/x-vnd.oasis.opendocument.spreadsheet-template
-**.odp** | application/vnd.oasis.opendocument.presentation | application/x-vnd.oasis.opendocument.presentation
-**.otp** | application/vnd.oasis.opendocument.presentation-template | application/x-vnd.oasis.opendocument.presentation-template
-**.odg** | application/vnd.oasis.opendocument.graphics | application/x-vnd.oasis.opendocument.graphics
-**.otg** | application/vnd.oasis.opendocument.graphics-template | application/x-vnd.oasis.opendocument.graphics-template
-**.odf** | application/vnd.oasis.opendocument.formula | application/x-vnd.oasis.opendocument.formula
-**.odc** | application/vnd.oasis.opendocument.chart | application/x-vnd.oasis.opendocument.chart
-**.sxc** | application/vnd.sun.xml.calc | -
-**.kmz** | application/vnd.google-earth.kmz | -
-**.vsdx** | application/vnd.ms-visio.drawing.main+xml | -
-**.pdf** | application/pdf | application/x-pdf
-**.fdf** | application/vnd.fdf | -
-**n/a** | application/x-ole-storage | -
-**.msi** | application/x-ms-installer | application/x-windows-installer, application/x-msi
-**.aaf** | application/octet-stream | -
-**.msg** | application/vnd.ms-outlook | -
-**.xls** | application/vnd.ms-excel | application/msexcel
-**.pub** | application/vnd.ms-publisher | -
-**.ppt** | application/vnd.ms-powerpoint | application/mspowerpoint
-**.doc** | application/msword | application/vnd.ms-word
-**.ps** | application/postscript | -
-**.psd** | image/vnd.adobe.photoshop | image/x-psd, application/photoshop
-**.p7s** | application/pkcs7-signature | -
-**.ogg** | application/ogg | application/x-ogg
-**.oga** | audio/ogg | -
-**.ogv** | video/ogg | -
-**.png** | image/png | -
-**.png** | image/vnd.mozilla.apng | -
-**.jpg** | image/jpeg | -
-**.jxl** | image/jxl | -
-**.jp2** | image/jp2 | -
-**.jpf** | image/jpx | -
-**.jpm** | image/jpm | video/jpm
-**.jxs** | image/jxs | -
-**.gif** | image/gif | -
-**.webp** | image/webp | -
-**.exe** | application/vnd.microsoft.portable-executable | -
-**n/a** | application/x-elf | -
-**n/a** | application/x-object | -
-**n/a** | application/x-executable | -
-**.so** | application/x-sharedlib | -
-**n/a** | application/x-coredump | -
-**.a** | application/x-archive | application/x-unix-archive
-**.deb** | application/vnd.debian.binary-package | -
-**.tar** | application/x-tar | -
-**.xar** | application/x-xar | -
-**.bz2** | application/x-bzip2 | -
-**.fits** | application/fits | image/fits
-**.tiff** | image/tiff | -
-**.bmp** | image/bmp | image/x-bmp, image/x-ms-bmp
-**.123** | application/vnd.lotus-1-2-3 | -
-**.ico** | image/x-icon | -
-**.mp3** | audio/mpeg | audio/x-mpeg, audio/mp3
-**.flac** | audio/flac | -
-**.midi** | audio/midi | audio/mid, audio/sp-midi, audio/x-mid, audio/x-midi
-**.ape** | audio/ape | -
-**.mpc** | audio/musepack | -
-**.amr** | audio/amr | audio/amr-nb
-**.wav** | audio/wav | audio/x-wav, audio/vnd.wave, audio/wave
-**.aiff** | audio/aiff | audio/x-aiff
-**.au** | audio/basic | -
-**.mpeg** | video/mpeg | -
-**.mov** | video/quicktime | -
-**.mp4** | video/mp4 | -
-**.avif** | image/avif | -
-**.3gp** | video/3gpp | video/3gp, audio/3gpp
-**.3g2** | video/3gpp2 | video/3g2, audio/3gpp2
-**.mp4** | audio/mp4 | audio/x-mp4a
-**.mqv** | video/quicktime | -
-**.m4a** | audio/x-m4a | -
-**.m4v** | video/x-m4v | -
-**.heic** | image/heic | -
-**.heic** | image/heic-sequence | -
-**.heif** | image/heif | -
-**.heif** | image/heif-sequence | -
-**.mj2** | video/mj2 | -
-**.dvb** | video/vnd.dvb.file | -
-**.webm** | video/webm | audio/webm
-**.avi** | video/x-msvideo | video/avi, video/msvideo
-**.flv** | video/x-flv | -
-**.mkv** | video/x-matroska | -
-**.asf** | video/x-ms-asf | video/asf, video/x-ms-wmv
-**.aac** | audio/aac | -
-**.voc** | audio/x-unknown | -
-**.m3u** | application/vnd.apple.mpegurl | audio/mpegurl
-**.rmvb** | application/vnd.rn-realmedia-vbr | -
-**.gz** | application/gzip | application/x-gzip, application/x-gunzip, application/gzipped, application/gzip-compressed, application/x-gzip-compressed, gzip/document
-**.class** | application/x-java-applet | -
-**.swf** | application/x-shockwave-flash | -
-**.crx** | application/x-chrome-extension | -
-**.ttf** | font/ttf | font/sfnt, application/x-font-ttf, application/font-sfnt
-**.woff** | font/woff | -
-**.woff2** | font/woff2 | -
-**.otf** | font/otf | -
-**.ttc** | font/collection | -
-**.eot** | application/vnd.ms-fontobject | -
-**.wasm** | application/wasm | -
-**.shx** | application/vnd.shx | -
-**.shp** | application/vnd.shp | -
-**.dbf** | application/x-dbf | -
-**.dcm** | application/dicom | -
-**.rar** | application/x-rar-compressed | application/x-rar
-**.djvu** | image/vnd.djvu | -
-**.mobi** | application/x-mobipocket-ebook | -
-**.lit** | application/x-ms-reader | -
-**.bpg** | image/bpg | -
-**.cbor** | application/cbor | -
-**.sqlite** | application/vnd.sqlite3 | application/x-sqlite3
-**.dwg** | image/vnd.dwg | image/x-dwg, application/acad, application/x-acad, application/autocad_dwg, application/dwg, application/x-dwg, application/x-autocad, drawing/dwg
-**.nes** | application/vnd.nintendo.snes.rom | -
-**.lnk** | application/x-ms-shortcut | -
-**.macho** | application/x-mach-binary | -
-**.qcp** | audio/qcelp | -
-**.icns** | image/x-icns | -
-**.hdr** | image/vnd.radiance | -
-**.mrc** | application/marc | -
-**.mdb** | application/x-msaccess | -
-**.accdb** | application/x-msaccess | -
-**.zst** | application/zstd | -
-**.cab** | application/vnd.ms-cab-compressed | -
-**.rpm** | application/x-rpm | -
-**.xz** | application/x-xz | -
-**.lz** | application/lzip | application/x-lzip
-**.torrent** | application/x-bittorrent | -
-**.cpio** | application/x-cpio | -
-**n/a** | application/tzif | -
-**.xcf** | image/x-xcf | -
-**.pat** | image/x-gimp-pat | -
-**.gbr** | image/x-gimp-gbr | -
-**.glb** | model/gltf-binary | -
-**.cab** | application/x-installshield | -
-**.jxr** | image/jxr | image/vnd.ms-photo
-**.parquet** | application/vnd.apache.parquet | application/x-parquet
-**.one** | application/onenote | -
-**.chm** | application/vnd.ms-htmlhelp | -
-**.txt** | text/plain | -
-**.svg** | image/svg+xml | -
-**.html** | text/html | -
-**.xml** | text/xml | application/xml
-**.rss** | application/rss+xml | text/rss
-**.atom** | application/atom+xml | -
-**.x3d** | model/x3d+xml | -
-**.kml** | application/vnd.google-earth.kml+xml | -
-**.xlf** | application/x-xliff+xml | -
-**.dae** | model/vnd.collada+xml | -
-**.gml** | application/gml+xml | -
-**.gpx** | application/gpx+xml | -
-**.tcx** | application/vnd.garmin.tcx+xml | -
-**.amf** | application/x-amf | -
-**.3mf** | application/vnd.ms-package.3dmanufacturing-3dmodel+xml | -
-**.xfdf** | application/vnd.adobe.xfdf | -
-**.owl** | application/owl+xml | -
-**.html** | application/xhtml+xml | -
-**.php** | text/x-php | -
-**.js** | text/javascript | application/x-javascript, application/javascript
-**.lua** | text/x-lua | -
-**.pl** | text/x-perl | -
-**.py** | text/x-python | text/x-script.python, application/x-python
-**.rb** | text/x-ruby | application/x-ruby
-**.json** | application/json | -
-**.geojson** | application/geo+json | -
-**.har** | application/json | -
-**.gltf** | model/gltf+json | -
-**.ndjson** | application/x-ndjson | -
-**.rtf** | text/rtf | application/rtf
-**.srt** | application/x-subrip | application/x-srt, text/x-srt
-**.tcl** | text/x-tcl | application/x-tcl
-**.csv** | text/csv | -
-**.tsv** | text/tab-separated-values | -
-**.vcf** | text/vcard | -
-**.ics** | text/calendar | -
-**.warc** | application/warc | -
-**.vtt** | text/vtt | -
-**.sh** | text/x-shellscript | text/x-sh, application/x-shellscript, application/x-sh
-**.pbm** | image/x-portable-bitmap | -
-**.pgm** | image/x-portable-graymap | -
-**.ppm** | image/x-portable-pixmap | -
-**.pam** | image/x-portable-arbitrarymap | -
+Extension | MIME type
Aliases | Hierarchy
+--------- | ---------------------- | ---------
+**n/a** | **application/octet-stream** | root
+**.xpm** | **image/x-xpixmap** | xpm>root
+**.7z** | **application/x-7z-compressed** | 7z>root
+**.zip** | **application/zip**
application/x-zip, application/x-zip-compressed | zip>root
+**.docx** | **application/vnd.openxmlformats-officedocument.wordprocessingml.document** | docx>zip>root
+**.pptx** | **application/vnd.openxmlformats-officedocument.presentationml.presentation** | pptx>zip>root
+**.xlsx** | **application/vnd.openxmlformats-officedocument.spreadsheetml.sheet** | xlsx>zip>root
+**.epub** | **application/epub+zip** | epub>zip>root
+**.apk** | **application/vnd.android.package-archive** | apk>zip>root
+**.jar** | **application/java-archive**
application/jar, application/jar-archive, application/x-java-archive | jar>zip>root
+**.odt** | **application/vnd.oasis.opendocument.text**
application/x-vnd.oasis.opendocument.text | odt>zip>root
+**.ott** | **application/vnd.oasis.opendocument.text-template**
application/x-vnd.oasis.opendocument.text-template | ott>odt>zip>root
+**.ods** | **application/vnd.oasis.opendocument.spreadsheet**
application/x-vnd.oasis.opendocument.spreadsheet | ods>zip>root
+**.ots** | **application/vnd.oasis.opendocument.spreadsheet-template**
application/x-vnd.oasis.opendocument.spreadsheet-template | ots>ods>zip>root
+**.odp** | **application/vnd.oasis.opendocument.presentation**
application/x-vnd.oasis.opendocument.presentation | odp>zip>root
+**.otp** | **application/vnd.oasis.opendocument.presentation-template**
application/x-vnd.oasis.opendocument.presentation-template | otp>odp>zip>root
+**.odg** | **application/vnd.oasis.opendocument.graphics**
application/x-vnd.oasis.opendocument.graphics | odg>zip>root
+**.otg** | **application/vnd.oasis.opendocument.graphics-template**
application/x-vnd.oasis.opendocument.graphics-template | otg>odg>zip>root
+**.odf** | **application/vnd.oasis.opendocument.formula**
application/x-vnd.oasis.opendocument.formula | odf>zip>root
+**.odc** | **application/vnd.oasis.opendocument.chart**
application/x-vnd.oasis.opendocument.chart | odc>zip>root
+**.sxc** | **application/vnd.sun.xml.calc** | sxc>zip>root
+**.kmz** | **application/vnd.google-earth.kmz** | kmz>zip>root
+**.vsdx** | **application/vnd.ms-visio.drawing.main+xml** | vsdx>zip>root
+**.pdf** | **application/pdf**
application/x-pdf | pdf>root
+**.fdf** | **application/vnd.fdf** | fdf>root
+**n/a** | **application/x-ole-storage** | x-ole-storage>root
+**.msi** | **application/x-ms-installer**
application/x-windows-installer, application/x-msi | msi>x-ole-storage>root
+**.msg** | **application/vnd.ms-outlook** | msg>x-ole-storage>root
+**.xls** | **application/vnd.ms-excel**
application/msexcel | xls>x-ole-storage>root
+**.pub** | **application/vnd.ms-publisher** | pub>x-ole-storage>root
+**.ppt** | **application/vnd.ms-powerpoint**
application/mspowerpoint | ppt>x-ole-storage>root
+**.doc** | **application/msword**
application/vnd.ms-word | doc>x-ole-storage>root
+**.ps** | **application/postscript** | ps>root
+**.psd** | **image/vnd.adobe.photoshop**
image/x-psd, application/photoshop | psd>root
+**.p7s** | **application/pkcs7-signature** | p7s>root
+**.ogg** | **application/ogg**
application/x-ogg | ogg>root
+**.oga** | **audio/ogg** | oga>ogg>root
+**.ogv** | **video/ogg** | ogv>ogg>root
+**.png** | **image/png** | png>root
+**.png** | **image/vnd.mozilla.apng** | png>png>root
+**.jpg** | **image/jpeg** | jpg>root
+**.jxl** | **image/jxl** | jxl>root
+**.jp2** | **image/jp2** | jp2>root
+**.jpf** | **image/jpx** | jpf>root
+**.jpm** | **image/jpm**
video/jpm | jpm>root
+**.jxs** | **image/jxs** | jxs>root
+**.gif** | **image/gif** | gif>root
+**.webp** | **image/webp** | webp>root
+**.exe** | **application/vnd.microsoft.portable-executable** | exe>root
+**n/a** | **application/x-elf** | x-elf>root
+**n/a** | **application/x-object** | x-object>x-elf>root
+**n/a** | **application/x-executable** | x-executable>x-elf>root
+**.so** | **application/x-sharedlib** | so>x-elf>root
+**n/a** | **application/x-coredump** | x-coredump>x-elf>root
+**.a** | **application/x-archive**
application/x-unix-archive | a>root
+**.deb** | **application/vnd.debian.binary-package** | deb>a>root
+**.tar** | **application/x-tar** | tar>root
+**.xar** | **application/x-xar** | xar>root
+**.bz2** | **application/x-bzip2** | bz2>root
+**.fits** | **application/fits**
image/fits | fits>root
+**.tiff** | **image/tiff** | tiff>root
+**.bmp** | **image/bmp**
image/x-bmp, image/x-ms-bmp | bmp>root
+**.123** | **application/vnd.lotus-1-2-3** | 123>root
+**.ico** | **image/x-icon** | ico>root
+**.mp3** | **audio/mpeg**
audio/x-mpeg, audio/mp3 | mp3>root
+**.flac** | **audio/flac** | flac>root
+**.midi** | **audio/midi**
audio/mid, audio/sp-midi, audio/x-mid, audio/x-midi | midi>root
+**.ape** | **audio/ape** | ape>root
+**.mpc** | **audio/musepack** | mpc>root
+**.amr** | **audio/amr**
audio/amr-nb | amr>root
+**.wav** | **audio/wav**
audio/x-wav, audio/vnd.wave, audio/wave | wav>root
+**.aiff** | **audio/aiff**
audio/x-aiff | aiff>root
+**.au** | **audio/basic** | au>root
+**.mpeg** | **video/mpeg** | mpeg>root
+**.mov** | **video/quicktime** | mov>root
+**.mp4** | **video/mp4** | mp4>root
+**.avif** | **image/avif** | avif>mp4>root
+**.3gp** | **video/3gpp**
video/3gp, audio/3gpp | 3gp>mp4>root
+**.3g2** | **video/3gpp2**
video/3g2, audio/3gpp2 | 3g2>mp4>root
+**.mp4** | **audio/mp4**
audio/x-mp4a | mp4>mp4>root
+**.mqv** | **video/quicktime** | mqv>mp4>root
+**.m4a** | **audio/x-m4a** | m4a>mp4>root
+**.m4v** | **video/x-m4v** | m4v>mp4>root
+**.heic** | **image/heic** | heic>mp4>root
+**.heic** | **image/heic-sequence** | heic>mp4>root
+**.heif** | **image/heif** | heif>mp4>root
+**.heif** | **image/heif-sequence** | heif>mp4>root
+**.mj2** | **video/mj2** | mj2>mp4>root
+**.dvb** | **video/vnd.dvb.file** | dvb>mp4>root
+**.webm** | **video/webm**
audio/webm | webm>root
+**.avi** | **video/x-msvideo**
video/avi, video/msvideo | avi>root
+**.flv** | **video/x-flv** | flv>root
+**.mkv** | **video/x-matroska** | mkv>root
+**.asf** | **video/x-ms-asf**
video/asf, video/x-ms-wmv | asf>root
+**.aac** | **audio/aac** | aac>root
+**.voc** | **audio/x-unknown** | voc>root
+**.m3u** | **application/vnd.apple.mpegurl**
audio/mpegurl | m3u>root
+**.rmvb** | **application/vnd.rn-realmedia-vbr** | rmvb>root
+**.gz** | **application/gzip**
application/x-gzip, application/x-gunzip, application/gzipped, application/gzip-compressed, application/x-gzip-compressed, gzip/document | gz>root
+**.class** | **application/x-java-applet** | class>root
+**.swf** | **application/x-shockwave-flash** | swf>root
+**.crx** | **application/x-chrome-extension** | crx>root
+**.ttf** | **font/ttf**
font/sfnt, application/x-font-ttf, application/font-sfnt | ttf>root
+**.woff** | **font/woff** | woff>root
+**.woff2** | **font/woff2** | woff2>root
+**.otf** | **font/otf** | otf>root
+**.ttc** | **font/collection** | ttc>root
+**.eot** | **application/vnd.ms-fontobject** | eot>root
+**.wasm** | **application/wasm** | wasm>root
+**.shx** | **application/vnd.shx** | shx>root
+**.shp** | **application/vnd.shp** | shp>shx>root
+**.dbf** | **application/x-dbf** | dbf>root
+**.dcm** | **application/dicom** | dcm>root
+**.rar** | **application/x-rar-compressed**
application/x-rar | rar>root
+**.djvu** | **image/vnd.djvu** | djvu>root
+**.mobi** | **application/x-mobipocket-ebook** | mobi>root
+**.lit** | **application/x-ms-reader** | lit>root
+**.bpg** | **image/bpg** | bpg>root
+**.cbor** | **application/cbor** | cbor>root
+**.sqlite** | **application/vnd.sqlite3**
application/x-sqlite3 | sqlite>root
+**.dwg** | **image/vnd.dwg**
image/x-dwg, application/acad, application/x-acad, application/autocad_dwg, application/dwg, application/x-dwg, application/x-autocad, drawing/dwg | dwg>root
+**.nes** | **application/vnd.nintendo.snes.rom** | nes>root
+**.lnk** | **application/x-ms-shortcut** | lnk>root
+**.macho** | **application/x-mach-binary** | macho>root
+**.qcp** | **audio/qcelp** | qcp>root
+**.icns** | **image/x-icns** | icns>root
+**.hdr** | **image/vnd.radiance** | hdr>root
+**.mrc** | **application/marc** | mrc>root
+**.mdb** | **application/x-msaccess** | mdb>root
+**.accdb** | **application/x-msaccess** | accdb>root
+**.zst** | **application/zstd** | zst>root
+**.cab** | **application/vnd.ms-cab-compressed** | cab>root
+**.rpm** | **application/x-rpm** | rpm>root
+**.xz** | **application/x-xz** | xz>root
+**.lz** | **application/lzip**
application/x-lzip | lz>root
+**.torrent** | **application/x-bittorrent** | torrent>root
+**.cpio** | **application/x-cpio** | cpio>root
+**n/a** | **application/tzif** | tzif>root
+**.xcf** | **image/x-xcf** | xcf>root
+**.pat** | **image/x-gimp-pat** | pat>root
+**.gbr** | **image/x-gimp-gbr** | gbr>root
+**.glb** | **model/gltf-binary** | glb>root
+**.cab** | **application/x-installshield** | cab>root
+**.jxr** | **image/jxr**
image/vnd.ms-photo | jxr>root
+**.parquet** | **application/vnd.apache.parquet**
application/x-parquet | parquet>root
+**.one** | **application/onenote** | one>root
+**.chm** | **application/vnd.ms-htmlhelp** | chm>root
+**.wpd** | **application/vnd.wordperfect** | wpd>root
+**.dxf** | **image/vnd.dxf** | dxf>root
+**.grb** | **application/grib** | grb>root
+**n/a** | **application/zlib** | zlib>root
+**.txt** | **text/plain** | txt>root
+**.svg** | **image/svg+xml** | svg>txt>root
+**.html** | **text/html** | html>txt>root
+**.xml** | **text/xml**
application/xml | xml>txt>root
+**.rss** | **application/rss+xml**
text/rss | rss>xml>txt>root
+**.atom** | **application/atom+xml** | atom>xml>txt>root
+**.x3d** | **model/x3d+xml** | x3d>xml>txt>root
+**.kml** | **application/vnd.google-earth.kml+xml** | kml>xml>txt>root
+**.xlf** | **application/x-xliff+xml** | xlf>xml>txt>root
+**.dae** | **model/vnd.collada+xml** | dae>xml>txt>root
+**.gml** | **application/gml+xml** | gml>xml>txt>root
+**.gpx** | **application/gpx+xml** | gpx>xml>txt>root
+**.tcx** | **application/vnd.garmin.tcx+xml** | tcx>xml>txt>root
+**.amf** | **application/x-amf** | amf>xml>txt>root
+**.3mf** | **application/vnd.ms-package.3dmanufacturing-3dmodel+xml** | 3mf>xml>txt>root
+**.xfdf** | **application/vnd.adobe.xfdf** | xfdf>xml>txt>root
+**.owl** | **application/owl+xml** | owl>xml>txt>root
+**.html** | **application/xhtml+xml** | html>xml>txt>root
+**.php** | **text/x-php** | php>txt>root
+**.js** | **text/javascript**
application/x-javascript, application/javascript | js>txt>root
+**.lua** | **text/x-lua** | lua>txt>root
+**.pl** | **text/x-perl** | pl>txt>root
+**.py** | **text/x-python**
text/x-script.python, application/x-python | py>txt>root
+**.rb** | **text/x-ruby**
application/x-ruby | rb>txt>root
+**.json** | **application/json** | json>txt>root
+**.geojson** | **application/geo+json** | geojson>json>txt>root
+**.har** | **application/json** | har>json>txt>root
+**.gltf** | **model/gltf+json** | gltf>json>txt>root
+**.ndjson** | **application/x-ndjson** | ndjson>txt>root
+**.rtf** | **text/rtf**
application/rtf | rtf>txt>root
+**.srt** | **application/x-subrip**
application/x-srt, text/x-srt | srt>txt>root
+**.tcl** | **text/x-tcl**
application/x-tcl | tcl>txt>root
+**.csv** | **text/csv** | csv>txt>root
+**.tsv** | **text/tab-separated-values** | tsv>txt>root
+**.vcf** | **text/vcard** | vcf>txt>root
+**.ics** | **text/calendar** | ics>txt>root
+**.warc** | **application/warc** | warc>txt>root
+**.vtt** | **text/vtt** | vtt>txt>root
+**.sh** | **text/x-shellscript**
text/x-sh, application/x-shellscript, application/x-sh | sh>txt>root
+**.pbm** | **image/x-portable-bitmap** | pbm>txt>root
+**.pgm** | **image/x-portable-graymap** | pgm>txt>root
+**.ppm** | **image/x-portable-pixmap** | ppm>txt>root
+**.pam** | **image/x-portable-arbitrarymap** | pam>txt>root
+**.eml** | **message/rfc822** | eml>txt>root
diff --git a/vendor/github.com/gabriel-vasile/mimetype/tree.go b/vendor/github.com/gabriel-vasile/mimetype/tree.go
index edbde895..29ef820b 100644
--- a/vendor/github.com/gabriel-vasile/mimetype/tree.go
+++ b/vendor/github.com/gabriel-vasile/mimetype/tree.go
@@ -24,7 +24,7 @@ var root = newMIME("application/octet-stream", "",
woff2, otf, ttc, eot, wasm, shx, dbf, dcm, rar, djvu, mobi, lit, bpg, cbor,
sqlite3, dwg, nes, lnk, macho, qcp, icns, hdr, mrc, mdb, accdb, zstd, cab,
rpm, xz, lzip, torrent, cpio, tzif, xcf, pat, gbr, glb, cabIS, jxr, parquet,
- oneNote, chm,
+ oneNote, chm, wpd, dxf, grib, zlib,
// Keep text last because it is the slowest check.
text,
)
@@ -65,10 +65,9 @@ var (
jar = newMIME("application/java-archive", ".jar", magic.Jar).
alias("application/jar", "application/jar-archive", "application/x-java-archive")
apk = newMIME("application/vnd.android.package-archive", ".apk", magic.APK)
- ole = newMIME("application/x-ole-storage", "", magic.Ole, msi, aaf, msg, xls, pub, ppt, doc)
+ ole = newMIME("application/x-ole-storage", "", magic.Ole, msi, msg, xls, pub, ppt, doc)
msi = newMIME("application/x-ms-installer", ".msi", magic.Msi).
alias("application/x-windows-installer", "application/x-msi")
- aaf = newMIME("application/octet-stream", ".aaf", magic.Aaf)
doc = newMIME("application/msword", ".doc", magic.Doc).
alias("application/vnd.ms-word")
ppt = newMIME("application/vnd.ms-powerpoint", ".ppt", magic.Ppt).
@@ -83,7 +82,7 @@ var (
alias("application/x-ogg")
oggAudio = newMIME("audio/ogg", ".oga", magic.OggAudio)
oggVideo = newMIME("video/ogg", ".ogv", magic.OggVideo)
- text = newMIME("text/plain", ".txt", magic.Text, svg, html, xml, php, js, lua, perl, python, ruby, json, ndJSON, rtf, srt, tcl, csv, tsv, vCard, iCalendar, warc, vtt, shell, netpbm, netpgm, netppm, netpam)
+ text = newMIME("text/plain", ".txt", magic.Text, svg, html, xml, php, js, lua, perl, python, ruby, json, ndJSON, rtf, srt, tcl, csv, tsv, vCard, iCalendar, warc, vtt, shell, netpbm, netpgm, netppm, netpam, rfc822)
xml = newMIME("text/xml", ".xml", magic.XML, rss, atom, x3d, kml, xliff, collada, gml, gpx, tcx, amf, threemf, xfdf, owl2, xhtml).
alias("application/xml")
xhtml = newMIME("application/xhtml+xml", ".html", magic.XHTML)
@@ -286,4 +285,9 @@ var (
cbor = newMIME("application/cbor", ".cbor", magic.CBOR)
oneNote = newMIME("application/onenote", ".one", magic.One)
chm = newMIME("application/vnd.ms-htmlhelp", ".chm", magic.CHM)
+ wpd = newMIME("application/vnd.wordperfect", ".wpd", magic.WPD)
+ dxf = newMIME("image/vnd.dxf", ".dxf", magic.DXF)
+ rfc822 = newMIME("message/rfc822", ".eml", magic.RFC822)
+ grib = newMIME("application/grib", ".grb", magic.GRIB)
+ zlib = newMIME("application/zlib", "", magic.Zlib)
)
diff --git a/vendor/github.com/go-playground/validator/v10/.golangci.yaml b/vendor/github.com/go-playground/validator/v10/.golangci.yaml
index dd9c05cc..96337d6c 100644
--- a/vendor/github.com/go-playground/validator/v10/.golangci.yaml
+++ b/vendor/github.com/go-playground/validator/v10/.golangci.yaml
@@ -32,6 +32,7 @@ linters:
- maintidx
- misspell
- mnd
+ - modernize
- nakedret
- nestif
- nilnil
diff --git a/vendor/github.com/go-playground/validator/v10/README.md b/vendor/github.com/go-playground/validator/v10/README.md
index cb5d4194..16b16d8d 100644
--- a/vendor/github.com/go-playground/validator/v10/README.md
+++ b/vendor/github.com/go-playground/validator/v10/README.md
@@ -137,6 +137,7 @@ validate := validator.New(validator.WithRequiredStructEnabled())
| alpha | Alpha Only |
| alphaspace | Alpha Space |
| alphanum | Alphanumeric |
+| alphanumspace | Alphanumeric Space |
| alphanumunicode | Alphanumeric Unicode |
| alphaunicode | Alpha Unicode |
| ascii | ASCII |
@@ -164,7 +165,8 @@ validate := validator.New(validator.WithRequiredStructEnabled())
| base64 | Base64 String |
| base64url | Base64URL String |
| base64rawurl | Base64RawURL String |
-| bic | Business Identifier Code (ISO 9362) |
+| bic_iso_9362_2014 | Business Identifier Code (ISO 9362:2014) |
+| bic | Business Identifier Code (ISO 9362:2022) |
| bcp47_language_tag | Language tag (BCP 47) |
| btc_addr | Bitcoin Address |
| btc_addr_bech32 | Bitcoin Bech32 Address (segwit) |
diff --git a/vendor/github.com/go-playground/validator/v10/baked_in.go b/vendor/github.com/go-playground/validator/v10/baked_in.go
index 8fd55e77..e90c98e4 100644
--- a/vendor/github.com/go-playground/validator/v10/baked_in.go
+++ b/vendor/github.com/go-playground/validator/v10/baked_in.go
@@ -120,6 +120,7 @@ var (
"alpha": isAlpha,
"alphaspace": isAlphaSpace,
"alphanum": isAlphanum,
+ "alphanumspace": isAlphaNumericSpace,
"alphaunicode": isAlphaUnicode,
"alphanumunicode": isAlphanumUnicode,
"boolean": isBoolean,
@@ -237,7 +238,8 @@ var (
"bcp47_language_tag": isBCP47LanguageTag,
"postcode_iso3166_alpha2": isPostcodeByIso3166Alpha2,
"postcode_iso3166_alpha2_field": isPostcodeByIso3166Alpha2Field,
- "bic": isIsoBicFormat,
+ "bic_iso_9362_2014": isIsoBic2014Format,
+ "bic": isIsoBic2022Format,
"semver": isSemverFormat,
"dns_rfc1035_label": isDnsRFC1035LabelFormat,
"credit_card": isCreditCard,
@@ -533,12 +535,20 @@ func hasMultiByteCharacter(fl FieldLevel) bool {
// isPrintableASCII is the validation function for validating if the field's value is a valid printable ASCII character.
func isPrintableASCII(fl FieldLevel) bool {
- return printableASCIIRegex().MatchString(fl.Field().String())
+ field := fl.Field()
+ if field.Kind() == reflect.String {
+ return printableASCIIRegex().MatchString(field.String())
+ }
+ return false
}
// isASCII is the validation function for validating if the field's value is a valid ASCII character.
func isASCII(fl FieldLevel) bool {
- return aSCIIRegex().MatchString(fl.Field().String())
+ field := fl.Field()
+ if field.Kind() == reflect.String {
+ return aSCIIRegex().MatchString(field.String())
+ }
+ return false
}
// isUUID5 is the validation function for validating if the field's value is a valid v5 UUID.
@@ -1773,6 +1783,11 @@ func isAlphaSpace(fl FieldLevel) bool {
return alphaSpaceRegex().MatchString(fl.Field().String())
}
+// isAlphaNumericSpace is the validation function for validating if the current field's value is a valid alphanumeric value with spaces.
+func isAlphaNumericSpace(fl FieldLevel) bool {
+ return alphanNumericSpaceRegex().MatchString(fl.Field().String())
+}
+
// isAlphaUnicode is the validation function for validating if the current field's value is a valid alpha unicode value.
func isAlphaUnicode(fl FieldLevel) bool {
return alphaUnicodeRegex().MatchString(fl.Field().String())
@@ -1974,11 +1989,12 @@ func excludedUnless(fl FieldLevel) bool {
panic(fmt.Sprintf("Bad param number for excluded_unless %s", fl.FieldName()))
}
for i := 0; i < len(params); i += 2 {
- if !requireCheckFieldValue(fl, params[i], params[i+1], false) {
- return !hasValue(fl)
+ if requireCheckFieldValue(fl, params[i], params[i+1], false) {
+ return true
}
}
- return true
+
+ return !hasValue(fl)
}
// excludedWith is the validation function
@@ -2943,11 +2959,18 @@ func isBCP47LanguageTag(fl FieldLevel) bool {
panic(fmt.Sprintf("Bad field type %s", field.Type()))
}
-// isIsoBicFormat is the validation function for validating if the current field's value is a valid Business Identifier Code (SWIFT code), defined in ISO 9362
-func isIsoBicFormat(fl FieldLevel) bool {
+// isIsoBic2014Format is the validation function for validating if the current field's value is a valid Business Identifier Code (SWIFT code), defined in ISO 9362 2014
+func isIsoBic2014Format(fl FieldLevel) bool {
bicString := fl.Field().String()
- return bicRegex().MatchString(bicString)
+ return bic2014Regex().MatchString(bicString)
+}
+
+// isIsoBic2022Format is the validation function for validating if the current field's value is a valid Business Identifier Code (SWIFT code), defined in ISO 9362 2022
+func isIsoBic2022Format(fl FieldLevel) bool {
+ bicString := fl.Field().String()
+
+ return bic2022Regex().MatchString(bicString)
}
// isSemverFormat is the validation function for validating if the current field's value is a valid semver version, defined in Semantic Versioning 2.0.0
diff --git a/vendor/github.com/go-playground/validator/v10/cache.go b/vendor/github.com/go-playground/validator/v10/cache.go
index fb101b06..ab7ffd47 100644
--- a/vendor/github.com/go-playground/validator/v10/cache.go
+++ b/vendor/github.com/go-playground/validator/v10/cache.go
@@ -289,6 +289,24 @@ func (v *Validate) parseFieldTagsRecursive(tag string, fieldName string, alias s
if wrapper, ok := v.validations[current.tag]; ok {
current.fn = wrapper.fn
current.runValidationWhenNil = wrapper.runValidationOnNil
+ } else if aliasTag, isAlias := v.aliases[current.tag]; isAlias {
+ aliasFirst, aliasLast := v.parseFieldTagsRecursive(aliasTag, fieldName, current.tag, true)
+
+ current.tag = aliasFirst.tag
+ current.fn = aliasFirst.fn
+ current.runValidationWhenNil = aliasFirst.runValidationWhenNil
+ current.hasParam = aliasFirst.hasParam
+ current.param = aliasFirst.param
+ current.typeof = aliasFirst.typeof
+ current.hasAlias = true
+
+ if aliasFirst.next != nil {
+ nextInChain := current.next
+ current.next = aliasFirst.next
+ aliasLast.next = nextInChain
+ aliasLast.isBlockEnd = false
+ current = aliasLast
+ }
} else {
panic(strings.TrimSpace(fmt.Sprintf(undefinedValidation, current.tag, fieldName)))
}
diff --git a/vendor/github.com/go-playground/validator/v10/currency_codes.go b/vendor/github.com/go-playground/validator/v10/currency_codes.go
index d0317f89..83b67290 100644
--- a/vendor/github.com/go-playground/validator/v10/currency_codes.go
+++ b/vendor/github.com/go-playground/validator/v10/currency_codes.go
@@ -10,33 +10,33 @@ var iso4217 = map[string]struct{}{
"BIF": {}, "CVE": {}, "KHR": {}, "XAF": {}, "CAD": {},
"KYD": {}, "CLP": {}, "CLF": {}, "CNY": {}, "COP": {},
"COU": {}, "KMF": {}, "CDF": {}, "NZD": {}, "CRC": {},
- "HRK": {}, "CUP": {}, "CUC": {}, "ANG": {}, "CZK": {},
- "DKK": {}, "DJF": {}, "DOP": {}, "EGP": {}, "SVC": {},
- "ERN": {}, "SZL": {}, "ETB": {}, "FKP": {}, "FJD": {},
- "XPF": {}, "GMD": {}, "GEL": {}, "GHS": {}, "GIP": {},
- "GTQ": {}, "GBP": {}, "GNF": {}, "GYD": {}, "HTG": {},
- "HNL": {}, "HKD": {}, "HUF": {}, "ISK": {}, "IDR": {},
- "XDR": {}, "IRR": {}, "IQD": {}, "ILS": {}, "JMD": {},
- "JPY": {}, "JOD": {}, "KZT": {}, "KES": {}, "KPW": {},
- "KRW": {}, "KWD": {}, "KGS": {}, "LAK": {}, "LBP": {},
- "LSL": {}, "ZAR": {}, "LRD": {}, "LYD": {}, "CHF": {},
- "MOP": {}, "MKD": {}, "MGA": {}, "MWK": {}, "MYR": {},
- "MVR": {}, "MRU": {}, "MUR": {}, "XUA": {}, "MXN": {},
- "MXV": {}, "MDL": {}, "MNT": {}, "MAD": {}, "MZN": {},
- "MMK": {}, "NAD": {}, "NPR": {}, "NIO": {}, "NGN": {},
- "OMR": {}, "PKR": {}, "PAB": {}, "PGK": {}, "PYG": {},
- "PEN": {}, "PHP": {}, "PLN": {}, "QAR": {}, "RON": {},
- "RUB": {}, "RWF": {}, "SHP": {}, "WST": {}, "STN": {},
- "SAR": {}, "RSD": {}, "SCR": {}, "SLL": {}, "SGD": {},
- "XSU": {}, "SBD": {}, "SOS": {}, "SSP": {}, "LKR": {},
- "SDG": {}, "SRD": {}, "SEK": {}, "CHE": {}, "CHW": {},
- "SYP": {}, "TWD": {}, "TJS": {}, "TZS": {}, "THB": {},
- "TOP": {}, "TTD": {}, "TND": {}, "TRY": {}, "TMT": {},
- "UGX": {}, "UAH": {}, "AED": {}, "USN": {}, "UYU": {},
- "UYI": {}, "UYW": {}, "UZS": {}, "VUV": {}, "VES": {},
- "VND": {}, "YER": {}, "ZMW": {}, "ZWL": {}, "XBA": {},
- "XBB": {}, "XBC": {}, "XBD": {}, "XTS": {}, "XXX": {},
- "XAU": {}, "XPD": {}, "XPT": {}, "XAG": {},
+ "CUP": {}, "CZK": {}, "DKK": {}, "DJF": {}, "DOP": {},
+ "EGP": {}, "SVC": {}, "ERN": {}, "SZL": {}, "ETB": {},
+ "FKP": {}, "FJD": {}, "XPF": {}, "GMD": {}, "GEL": {},
+ "GHS": {}, "GIP": {}, "GTQ": {}, "GBP": {}, "GNF": {},
+ "GYD": {}, "HTG": {}, "HNL": {}, "HKD": {}, "HUF": {},
+ "ISK": {}, "IDR": {}, "XDR": {}, "IRR": {}, "IQD": {},
+ "ILS": {}, "JMD": {}, "JPY": {}, "JOD": {}, "KZT": {},
+ "KES": {}, "KPW": {}, "KRW": {}, "KWD": {}, "KGS": {},
+ "LAK": {}, "LBP": {}, "LSL": {}, "ZAR": {}, "LRD": {},
+ "LYD": {}, "CHF": {}, "MOP": {}, "MKD": {}, "MGA": {},
+ "MWK": {}, "MYR": {}, "MVR": {}, "MRU": {}, "MUR": {},
+ "XUA": {}, "MXN": {}, "MXV": {}, "MDL": {}, "MNT": {},
+ "MAD": {}, "MZN": {}, "MMK": {}, "NAD": {}, "NPR": {},
+ "NIO": {}, "NGN": {}, "OMR": {}, "PKR": {}, "PAB": {},
+ "PGK": {}, "PYG": {}, "PEN": {}, "PHP": {}, "PLN": {},
+ "QAR": {}, "RON": {}, "RUB": {}, "RWF": {}, "SHP": {},
+ "WST": {}, "STN": {}, "SAR": {}, "RSD": {}, "SCR": {},
+ "SLE": {}, "SGD": {}, "XSU": {}, "SBD": {}, "SOS": {},
+ "SSP": {}, "LKR": {}, "SDG": {}, "SRD": {}, "SEK": {},
+ "CHE": {}, "CHW": {}, "SYP": {}, "TWD": {}, "TJS": {},
+ "TZS": {}, "THB": {}, "TOP": {}, "TTD": {}, "TND": {},
+ "TRY": {}, "TMT": {}, "UGX": {}, "UAH": {}, "AED": {},
+ "USN": {}, "UYU": {}, "UYI": {}, "UYW": {}, "UZS": {},
+ "VUV": {}, "VES": {}, "VED": {}, "VND": {}, "YER": {},
+ "ZMW": {}, "ZWG": {}, "XBA": {}, "XBB": {}, "XBC": {},
+ "XBD": {}, "XCG": {}, "XTS": {}, "XXX": {}, "XAU": {},
+ "XPD": {}, "XPT": {}, "XAG": {},
}
var iso4217_numeric = map[int]struct{}{
@@ -45,35 +45,35 @@ var iso4217_numeric = map[int]struct{}{
64: {}, 68: {}, 72: {}, 84: {}, 90: {},
96: {}, 104: {}, 108: {}, 116: {}, 124: {},
132: {}, 136: {}, 144: {}, 152: {}, 156: {},
- 170: {}, 174: {}, 188: {}, 191: {}, 192: {},
- 203: {}, 208: {}, 214: {}, 222: {}, 230: {},
- 232: {}, 238: {}, 242: {}, 262: {}, 270: {},
- 292: {}, 320: {}, 324: {}, 328: {}, 332: {},
- 340: {}, 344: {}, 348: {}, 352: {}, 356: {},
- 360: {}, 364: {}, 368: {}, 376: {}, 388: {},
- 392: {}, 398: {}, 400: {}, 404: {}, 408: {},
- 410: {}, 414: {}, 417: {}, 418: {}, 422: {},
- 426: {}, 430: {}, 434: {}, 446: {}, 454: {},
- 458: {}, 462: {}, 480: {}, 484: {}, 496: {},
- 498: {}, 504: {}, 512: {}, 516: {}, 524: {},
- 532: {}, 533: {}, 548: {}, 554: {}, 558: {},
- 566: {}, 578: {}, 586: {}, 590: {}, 598: {},
- 600: {}, 604: {}, 608: {}, 634: {}, 643: {},
- 646: {}, 654: {}, 682: {}, 690: {}, 694: {},
- 702: {}, 704: {}, 706: {}, 710: {}, 728: {},
- 748: {}, 752: {}, 756: {}, 760: {}, 764: {},
- 776: {}, 780: {}, 784: {}, 788: {}, 800: {},
- 807: {}, 818: {}, 826: {}, 834: {}, 840: {},
- 858: {}, 860: {}, 882: {}, 886: {}, 901: {},
- 927: {}, 928: {}, 929: {}, 930: {}, 931: {},
- 932: {}, 933: {}, 934: {}, 936: {}, 938: {},
- 940: {}, 941: {}, 943: {}, 944: {}, 946: {},
- 947: {}, 948: {}, 949: {}, 950: {}, 951: {},
- 952: {}, 953: {}, 955: {}, 956: {}, 957: {},
- 958: {}, 959: {}, 960: {}, 961: {}, 962: {},
- 963: {}, 964: {}, 965: {}, 967: {}, 968: {},
- 969: {}, 970: {}, 971: {}, 972: {}, 973: {},
- 975: {}, 976: {}, 977: {}, 978: {}, 979: {},
- 980: {}, 981: {}, 984: {}, 985: {}, 986: {},
- 990: {}, 994: {}, 997: {}, 999: {},
+ 170: {}, 174: {}, 188: {}, 192: {}, 203: {},
+ 208: {}, 214: {}, 222: {}, 230: {}, 232: {},
+ 238: {}, 242: {}, 262: {}, 270: {}, 292: {},
+ 320: {}, 324: {}, 328: {}, 332: {}, 340: {},
+ 344: {}, 348: {}, 352: {}, 356: {}, 360: {},
+ 364: {}, 368: {}, 376: {}, 388: {}, 392: {},
+ 398: {}, 400: {}, 404: {}, 408: {}, 410: {},
+ 414: {}, 417: {}, 418: {}, 422: {}, 426: {},
+ 430: {}, 434: {}, 446: {}, 454: {}, 458: {},
+ 462: {}, 480: {}, 484: {}, 496: {}, 498: {},
+ 504: {}, 512: {}, 516: {}, 524: {}, 532: {},
+ 533: {}, 548: {}, 554: {}, 558: {}, 566: {},
+ 578: {}, 586: {}, 590: {}, 598: {}, 600: {},
+ 604: {}, 608: {}, 634: {}, 643: {}, 646: {},
+ 654: {}, 682: {}, 690: {}, 702: {}, 704: {},
+ 706: {}, 710: {}, 728: {}, 748: {}, 752: {},
+ 756: {}, 760: {}, 764: {}, 776: {}, 780: {},
+ 784: {}, 788: {}, 800: {}, 807: {}, 818: {},
+ 826: {}, 834: {}, 840: {}, 858: {}, 860: {},
+ 882: {}, 886: {}, 901: {}, 924: {}, 925: {},
+ 926: {}, 927: {}, 928: {}, 929: {}, 930: {},
+ 933: {}, 934: {}, 936: {}, 938: {}, 940: {},
+ 941: {}, 943: {}, 944: {}, 946: {}, 947: {},
+ 948: {}, 949: {}, 950: {}, 951: {}, 952: {},
+ 953: {}, 955: {}, 956: {}, 957: {}, 958: {},
+ 959: {}, 960: {}, 961: {}, 962: {}, 963: {},
+ 964: {}, 965: {}, 967: {}, 968: {}, 969: {},
+ 970: {}, 971: {}, 972: {}, 973: {}, 975: {},
+ 976: {}, 977: {}, 978: {}, 979: {}, 980: {},
+ 981: {}, 984: {}, 985: {}, 986: {}, 990: {},
+ 994: {}, 997: {}, 999: {},
}
diff --git a/vendor/github.com/go-playground/validator/v10/doc.go b/vendor/github.com/go-playground/validator/v10/doc.go
index 52918e40..e83156d2 100644
--- a/vendor/github.com/go-playground/validator/v10/doc.go
+++ b/vendor/github.com/go-playground/validator/v10/doc.go
@@ -201,6 +201,15 @@ only for the nil-values).
Usage: omitnil
+# Omit Zero
+
+Allows to skip the validation if the value is a zero value.
+For pointers, it checks if the pointer is nil or the underlying value is a zero value.
+For slices and maps, it checks if the value is nil or empty.
+Otherwise, behaves the same as omitempty.
+
+ Usage: omitzero
+
# Dive
This tells the validator to dive into a slice, array or map and validate that
@@ -789,6 +798,12 @@ This validates that a string value contains ASCII alphanumeric characters only
Usage: alphanum
+# Alphanumeric Space
+
+This validates that a string value contains ASCII alphanumeric characters and spaces only
+
+ Usage: alphanumspace
+
# Alpha Unicode
This validates that a string value contains unicode alpha characters only
@@ -1378,13 +1393,20 @@ More information on https://pkg.go.dev/golang.org/x/text/language
Usage: bcp47_language_tag
-BIC (SWIFT code)
+BIC (SWIFT code - 2022 standard)
-This validates that a string value is a valid Business Identifier Code (SWIFT code), defined in ISO 9362.
-More information on https://www.iso.org/standard/60390.html
+This validates that a string value is a valid Business Identifier Code (SWIFT code), defined in ISO 9362:2022.
+More information on https://www.iso.org/standard/84108.html
Usage: bic
+BIC (SWIFT code - 2014 standard)
+
+This validates that a string value is a valid Business Identifier Code (SWIFT code), defined in ISO 9362:2014.
+More information on https://www.iso.org/standard/60390.html
+
+ Usage: bic_iso_9362_2014
+
# RFC 1035 label
This validates that a string value is a valid dns RFC 1035 label, defined in RFC 1035.
@@ -1519,7 +1541,7 @@ This package panics when bad input is provided, this is by design, bad code like
that should not make it to production.
type Test struct {
- TestField string `validate:"nonexistantfunction=1"`
+ TestField string `validate:"nonexistentfunction=1"`
}
t := &Test{
diff --git a/vendor/github.com/go-playground/validator/v10/regexes.go b/vendor/github.com/go-playground/validator/v10/regexes.go
index 0b3615f5..6b564b6f 100644
--- a/vendor/github.com/go-playground/validator/v10/regexes.go
+++ b/vendor/github.com/go-playground/validator/v10/regexes.go
@@ -9,6 +9,7 @@ const (
alphaRegexString = "^[a-zA-Z]+$"
alphaSpaceRegexString = "^[a-zA-Z ]+$"
alphaNumericRegexString = "^[a-zA-Z0-9]+$"
+ alphaNumericSpaceRegexString = "^[a-zA-Z0-9 ]+$"
alphaUnicodeRegexString = "^[\\p{L}]+$"
alphaUnicodeNumericRegexString = "^[\\p{L}\\p{N}]+$"
numericRegexString = "^[-+]?[0-9]+(?:\\.[0-9]+)?$"
@@ -20,7 +21,7 @@ const (
hslRegexString = "^hsl\\(\\s*(?:0|[1-9]\\d?|[12]\\d\\d|3[0-5]\\d|360)\\s*,\\s*(?:(?:0|[1-9]\\d?|100)%)\\s*,\\s*(?:(?:0|[1-9]\\d?|100)%)\\s*\\)$"
hslaRegexString = "^hsla\\(\\s*(?:0|[1-9]\\d?|[12]\\d\\d|3[0-5]\\d|360)\\s*,\\s*(?:(?:0|[1-9]\\d?|100)%)\\s*,\\s*(?:(?:0|[1-9]\\d?|100)%)\\s*,\\s*(?:(?:0.[1-9]*)|[01])\\s*\\)$"
emailRegexString = "^(?:(?:(?:(?:[a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+(?:\\.([a-zA-Z]|\\d|[!#\\$%&'\\*\\+\\-\\/=\\?\\^_`{\\|}~]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])+)*)|(?:(?:\\x22)(?:(?:(?:(?:\\x20|\\x09)*(?:\\x0d\\x0a))?(?:\\x20|\\x09)+)?(?:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x7f]|\\x21|[\\x23-\\x5b]|[\\x5d-\\x7e]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(?:(?:[\\x01-\\x09\\x0b\\x0c\\x0d-\\x7f]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}]))))*(?:(?:(?:\\x20|\\x09)*(?:\\x0d\\x0a))?(\\x20|\\x09)+)?(?:\\x22))))@(?:(?:(?:[a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(?:(?:[a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])(?:[a-zA-Z]|\\d|-|\\.|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*(?:[a-zA-Z]|\\d|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.)+(?:(?:[a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])|(?:(?:[a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])(?:[a-zA-Z]|\\d|-|\\.|~|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])*(?:[a-zA-Z]|[\\x{00A0}-\\x{D7FF}\\x{F900}-\\x{FDCF}\\x{FDF0}-\\x{FFEF}])))\\.?$"
- e164RegexString = "^\\+[1-9]?[0-9]{7,14}$"
+ e164RegexString = "^\\+?[1-9]\\d{1,14}$"
base32RegexString = "^(?:[A-Z2-7]{8})*(?:[A-Z2-7]{2}={6}|[A-Z2-7]{4}={4}|[A-Z2-7]{5}={3}|[A-Z2-7]{7}=|[A-Z2-7]{8})$"
base64RegexString = "^(?:[A-Za-z0-9+\\/]{4})*(?:[A-Za-z0-9+\\/]{2}==|[A-Za-z0-9+\\/]{3}=|[A-Za-z0-9+\\/]{4})$"
base64URLRegexString = "^(?:[A-Za-z0-9-_]{4})*(?:[A-Za-z0-9-_]{2}==|[A-Za-z0-9-_]{3}=|[A-Za-z0-9-_]{4})$"
@@ -68,7 +69,8 @@ const (
hTMLRegexString = `<[/]?([a-zA-Z]+).*?>`
jWTRegexString = "^[A-Za-z0-9-_]+\\.[A-Za-z0-9-_]+\\.[A-Za-z0-9-_]*$"
splitParamsRegexString = `'[^']*'|\S+`
- bicRegexString = `^[A-Za-z]{6}[A-Za-z0-9]{2}([A-Za-z0-9]{3})?$`
+ bic2014RegexString = `^[A-Za-z]{6}[A-Za-z0-9]{2}([A-Za-z0-9]{3})?$`
+ bic2022RegexString = `^[A-Z0-9]{4}[A-Z]{2}[A-Z0-9]{2}(?:[A-Z0-9]{3})?$`
semverRegexString = `^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$` // numbered capture groups https://semver.org/
dnsRegexStringRFC1035Label = "^[a-z]([-a-z0-9]*[a-z0-9])?$"
cveRegexString = `^CVE-(1999|2\d{3})-(0[^0]\d{2}|0\d[^0]\d{1}|0\d{2}[^0]|[1-9]{1}\d{3,})$` // CVE Format Id https://cve.mitre.org/cve/identifiers/syntaxchange.html
@@ -95,6 +97,7 @@ func lazyRegexCompile(str string) func() *regexp.Regexp {
var (
alphaRegex = lazyRegexCompile(alphaRegexString)
alphaSpaceRegex = lazyRegexCompile(alphaSpaceRegexString)
+ alphanNumericSpaceRegex = lazyRegexCompile(alphaNumericSpaceRegexString)
alphaNumericRegex = lazyRegexCompile(alphaNumericRegexString)
alphaUnicodeRegex = lazyRegexCompile(alphaUnicodeRegexString)
alphaUnicodeNumericRegex = lazyRegexCompile(alphaUnicodeNumericRegexString)
@@ -153,7 +156,8 @@ var (
hTMLRegex = lazyRegexCompile(hTMLRegexString)
jWTRegex = lazyRegexCompile(jWTRegexString)
splitParamsRegex = lazyRegexCompile(splitParamsRegexString)
- bicRegex = lazyRegexCompile(bicRegexString)
+ bic2014Regex = lazyRegexCompile(bic2014RegexString)
+ bic2022Regex = lazyRegexCompile(bic2022RegexString)
semverRegex = lazyRegexCompile(semverRegexString)
dnsRegexRFC1035Label = lazyRegexCompile(dnsRegexStringRFC1035Label)
cveRegex = lazyRegexCompile(cveRegexString)
diff --git a/vendor/github.com/go-playground/validator/v10/util.go b/vendor/github.com/go-playground/validator/v10/util.go
index b1fd8cc1..b74961ef 100644
--- a/vendor/github.com/go-playground/validator/v10/util.go
+++ b/vendor/github.com/go-playground/validator/v10/util.go
@@ -214,7 +214,9 @@ BEGIN:
}
// if got here there was more namespace, cannot go any deeper
- panic("Invalid field namespace")
+ // return found=false instead of panicking to handle cases like ValidateMap
+ // where cross-field validators (required_if, etc.) can't navigate non-struct parents
+ return
}
// asInt returns the parameter as an int64
diff --git a/vendor/modules.txt b/vendor/modules.txt
index db878026..4d8fca7d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -161,7 +161,7 @@ github.com/felixge/httpsnoop
# github.com/fxamacker/cbor/v2 v2.9.0
## explicit; go 1.20
github.com/fxamacker/cbor/v2
-# github.com/gabriel-vasile/mimetype v1.4.10
+# github.com/gabriel-vasile/mimetype v1.4.12
## explicit; go 1.21
github.com/gabriel-vasile/mimetype
github.com/gabriel-vasile/mimetype/internal/charset
@@ -197,7 +197,7 @@ github.com/go-playground/locales/currency
# github.com/go-playground/universal-translator v0.18.1
## explicit; go 1.18
github.com/go-playground/universal-translator
-# github.com/go-playground/validator/v10 v10.28.0
+# github.com/go-playground/validator/v10 v10.30.0
## explicit; go 1.24.0
github.com/go-playground/validator/v10
# github.com/gogo/protobuf v1.3.2