Nulo/gitea
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

Update bluemonday to v1.0.15 (#16379) (#16380)

Browse source 
* Update bluemonday to v1.0.15 (#16379)

* Fix TESTS
This commit is contained in:
6543 2021-07-09 02:47:27 +02:00 committed by GitHub
parent ac0f452b30
commit d98694e6ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
174 changed files with 14579 additions and 11967 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
go.mod
View file

@ -86,7 +86,7 @@ require (
github.com/mgechev/revive v1.0.3 github.com/mgechev/revive v1.0.3
github.com/mholt/acmez v0.1.3 // indirect github.com/mholt/acmez v0.1.3 // indirect
github.com/mholt/archiver/v3 v3.5.0 github.com/mholt/archiver/v3 v3.5.0
github.com/microcosm-cc/bluemonday v1.0.7 github.com/microcosm-cc/bluemonday v1.0.15
github.com/miekg/dns v1.1.40 // indirect github.com/miekg/dns v1.1.40 // indirect
github.com/minio/md5-simd v1.1.2 // indirect github.com/minio/md5-simd v1.1.2 // indirect
github.com/minio/minio-go/v7 v7.0.10 github.com/minio/minio-go/v7 v7.0.10
@ -136,10 +136,10 @@ require (
go.uber.org/multierr v1.6.0 // indirect go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.16.0 // indirect go.uber.org/zap v1.16.0 // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 golang.org/x/net v0.0.0-20210614182718-04defd469f4e
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 golang.org/x/sys v0.0.0-20210423082822-04245dca01da
golang.org/x/text v0.3.5 golang.org/x/text v0.3.6
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
golang.org/x/tools v0.1.0 golang.org/x/tools v0.1.0
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect

19
go.sum
View file

@ -127,8 +127,9 @@ github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:l
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg= github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef h1:46PFijGLmAjMPwCCCo7Jf0W6f9slllCkkv7vyc1yOSg=
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw= github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU=
github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48= github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
@ -830,8 +831,8 @@ github.com/mholt/acmez v0.1.3 h1:J7MmNIk4Qf9b8mAGqAh4XkNeowv3f1zW816yf4zt7Qk=
github.com/mholt/acmez v0.1.3/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM= github.com/mholt/acmez v0.1.3/go.mod h1:8qnn8QA/Ewx8E3ZSsmscqsIjhhpxuy9vqdgbX2ceceM=
github.com/mholt/archiver/v3 v3.5.0 h1:nE8gZIrw66cu4osS/U7UW7YDuGMHssxKutU8IfWxwWE= github.com/mholt/archiver/v3 v3.5.0 h1:nE8gZIrw66cu4osS/U7UW7YDuGMHssxKutU8IfWxwWE=
github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc= github.com/mholt/archiver/v3 v3.5.0/go.mod h1:qqTTPUK/HZPFgFQ/TJ3BzvTpF/dPtFVJXdQbCmeMxwc=
github.com/microcosm-cc/bluemonday v1.0.7 h1:6yAQfk4XT+PI/dk1ZeBp1gr3Q2Hd1DR0O3aEyPUJVTE= github.com/microcosm-cc/bluemonday v1.0.15 h1:J4uN+qPng9rvkBZBoBb8YGR+ijuklIMpSOZZLjYpbeY=
github.com/microcosm-cc/bluemonday v1.0.7/go.mod h1:HOT/6NaBlR0f9XlxD3zolN6Z3N8Lp4pvhp+jLS5ihnI= github.com/microcosm-cc/bluemonday v1.0.15/go.mod h1:ZLvAzeakRwrGnzQEvstVzVt3ZpqOF2+sdFr0Om+ce30=
github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
github.com/miekg/dns v1.1.30/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM= github.com/miekg/dns v1.1.30/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA= github.com/miekg/dns v1.1.40 h1:pyyPFfGMnciYUk/mXpKkVmeMQjfXqt3FAJ2hy7tPiLA=
@ -1321,9 +1322,8 @@ golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwY
golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 h1:4nGaVu0QrbjT/AK2PRLuQfQuh6DJve+pELhqTdAj3x0= golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181106182150-f42d05182288/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@ -1419,8 +1419,8 @@ golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44 h1:Bli41pIlzTzf3KEY06n+xnzK/BESIg2ze4Pgfh/aI8c= golang.org/x/sys v0.0.0-20210423082822-04245dca01da h1:b3NXsE2LusjYGGjL5bxEVZZORm/YEFFrWFjR8eFrw/c=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
@ -1430,8 +1430,9 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

6
modules/markup/html_test.go
View file

@ -124,13 +124,13 @@ func TestRender_links(t *testing.T) {
`<p><a href="http://www.example.com/wpstyle/?p=364" rel="nofollow">http://www.example.com/wpstyle/?p=364</a></p>`) `<p><a href="http://www.example.com/wpstyle/?p=364" rel="nofollow">http://www.example.com/wpstyle/?p=364</a></p>`)
test( test(
"https://www.example.com/foo/?bar=baz&inga=42&quux", "https://www.example.com/foo/?bar=baz&inga=42&quux",
`<p><a href="https://www.example.com/foo/?bar=baz&inga=42&quux" rel="nofollow">https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux</a></p>`) `<p><a href="https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux" rel="nofollow">https://www.example.com/foo/?bar=baz&amp;inga=42&amp;quux</a></p>`)
test( test(
"http://142.42.1.1/", "http://142.42.1.1/",
`<p><a href="http://142.42.1.1/" rel="nofollow">http://142.42.1.1/</a></p>`) `<p><a href="http://142.42.1.1/" rel="nofollow">http://142.42.1.1/</a></p>`)
test( test(
"https://github.com/go-gitea/gitea/?p=aaa/bbb.html#ccc-ddd", "https://github.com/go-gitea/gitea/?p=aaa/bbb.html#ccc-ddd",
`<p><a href="https://github.com/go-gitea/gitea/?p=aaa%2Fbbb.html#ccc-ddd" rel="nofollow">https://github.com/go-gitea/gitea/?p=aaa/bbb.html#ccc-ddd</a></p>`) `<p><a href="https://github.com/go-gitea/gitea/?p=aaa/bbb.html#ccc-ddd" rel="nofollow">https://github.com/go-gitea/gitea/?p=aaa/bbb.html#ccc-ddd</a></p>`)
test( test(
"https://en.wikipedia.org/wiki/URL_(disambiguation)", "https://en.wikipedia.org/wiki/URL_(disambiguation)",
`<p><a href="https://en.wikipedia.org/wiki/URL_(disambiguation)" rel="nofollow">https://en.wikipedia.org/wiki/URL_(disambiguation)</a></p>`) `<p><a href="https://en.wikipedia.org/wiki/URL_(disambiguation)" rel="nofollow">https://en.wikipedia.org/wiki/URL_(disambiguation)</a></p>`)
@ -148,7 +148,7 @@ func TestRender_links(t *testing.T) {
`<p><a href="ftp://gitea.com/file.txt" rel="nofollow">ftp://gitea.com/file.txt</a></p>`) `<p><a href="ftp://gitea.com/file.txt" rel="nofollow">ftp://gitea.com/file.txt</a></p>`)
test( test(
"magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcadabcde&dn=download", "magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcadabcde&dn=download",
`<p><a href="magnet:?xt=urn%3Abtih%3A5dee65101db281ac9c46344cd6b175cdcadabcde&dn=download" rel="nofollow">magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcadabcde&amp;dn=download</a></p>`) `<p><a href="magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcadabcde&amp;dn=download" rel="nofollow">magnet:?xt=urn:btih:5dee65101db281ac9c46344cd6b175cdcadabcde&amp;dn=download</a></p>`)
// Test that should *not* be turned into URL // Test that should *not* be turned into URL
test( test(

3
vendor/github.com/asaskevich/govalidator/README.md generated vendored
View file

@ -177,6 +177,7 @@ func IsPrintableASCII(str string) bool
func IsRFC3339(str string) bool func IsRFC3339(str string) bool
func IsRFC3339WithoutZone(str string) bool func IsRFC3339WithoutZone(str string) bool
func IsRGBcolor(str string) bool func IsRGBcolor(str string) bool
func IsRegex(str string) bool
func IsRequestURI(rawurl string) bool func IsRequestURI(rawurl string) bool
func IsRequestURL(rawurl string) bool func IsRequestURL(rawurl string) bool
func IsRipeMD128(str string) bool func IsRipeMD128(str string) bool
@ -203,6 +204,7 @@ func IsUUID(str string) bool
func IsUUIDv3(str string) bool func IsUUIDv3(str string) bool
func IsUUIDv4(str string) bool func IsUUIDv4(str string) bool
func IsUUIDv5(str string) bool func IsUUIDv5(str string) bool
func IsULID(str string) bool
func IsUnixTime(str string) bool func IsUnixTime(str string) bool
func IsUpperCase(str string) bool func IsUpperCase(str string) bool
func IsVariableWidth(str string) bool func IsVariableWidth(str string) bool
@ -382,6 +384,7 @@ Here is a list of available validators for struct fields (validator - used funct
"rfc3339WithoutZone": IsRFC3339WithoutZone, "rfc3339WithoutZone": IsRFC3339WithoutZone,
"ISO3166Alpha2": IsISO3166Alpha2, "ISO3166Alpha2": IsISO3166Alpha2,
"ISO3166Alpha3": IsISO3166Alpha3, "ISO3166Alpha3": IsISO3166Alpha3,
"ulid": IsULID,
``` ```
Validators with parameters Validators with parameters

6
vendor/github.com/asaskevich/govalidator/patterns.go generated vendored
View file

@ -42,6 +42,8 @@ const (
SSN string = `^\d{3}[- ]?\d{2}[- ]?\d{4}$` SSN string = `^\d{3}[- ]?\d{2}[- ]?\d{4}$`
WinPath string = `^[a-zA-Z]:\\(?:[^\\/:*?"<>|\r\n]+\\)*[^\\/:*?"<>|\r\n]*$` WinPath string = `^[a-zA-Z]:\\(?:[^\\/:*?"<>|\r\n]+\\)*[^\\/:*?"<>|\r\n]*$`
UnixPath string = `^(/[^/\x00]*)+/?$` UnixPath string = `^(/[^/\x00]*)+/?$`
WinARPath string = `^(?:(?:[a-zA-Z]:|\\\\[a-z0-9_.$●-]+\\[a-z0-9_.$●-]+)\\|\\?[^\\/:*?"<>|\r\n]+\\?)(?:[^\\/:*?"<>|\r\n]+\\)*[^\\/:*?"<>|\r\n]*$`
UnixARPath string = `^((\.{0,2}/)?([^/\x00]*))+/?$`
Semver string = "^v?(?: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-]+)*)?$" Semver string = "^v?(?: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-]+)*)?$"
tagName string = "valid" tagName string = "valid"
hasLowerCase string = ".*[[:lower:]]" hasLowerCase string = ".*[[:lower:]]"
@ -50,6 +52,7 @@ const (
hasWhitespaceOnly string = "^[[:space:]]+$" hasWhitespaceOnly string = "^[[:space:]]+$"
IMEI string = "^[0-9a-f]{14}$|^\\d{15}$|^\\d{18}$" IMEI string = "^[0-9a-f]{14}$|^\\d{15}$|^\\d{18}$"
IMSI string = "^\\d{14,15}$" IMSI string = "^\\d{14,15}$"
E164 string = `^\+?[1-9]\d{1,14}$`
) )
// Used by IsFilePath func // Used by IsFilePath func
@ -97,6 +100,8 @@ var (
rxSSN = regexp.MustCompile(SSN) rxSSN = regexp.MustCompile(SSN)
rxWinPath = regexp.MustCompile(WinPath) rxWinPath = regexp.MustCompile(WinPath)
rxUnixPath = regexp.MustCompile(UnixPath) rxUnixPath = regexp.MustCompile(UnixPath)
rxARWinPath = regexp.MustCompile(WinARPath)
rxARUnixPath = regexp.MustCompile(UnixARPath)
rxSemver = regexp.MustCompile(Semver) rxSemver = regexp.MustCompile(Semver)
rxHasLowerCase = regexp.MustCompile(hasLowerCase) rxHasLowerCase = regexp.MustCompile(hasLowerCase)
rxHasUpperCase = regexp.MustCompile(hasUpperCase) rxHasUpperCase = regexp.MustCompile(hasUpperCase)
@ -104,4 +109,5 @@ var (
rxHasWhitespaceOnly = regexp.MustCompile(hasWhitespaceOnly) rxHasWhitespaceOnly = regexp.MustCompile(hasWhitespaceOnly)
rxIMEI = regexp.MustCompile(IMEI) rxIMEI = regexp.MustCompile(IMEI)
rxIMSI = regexp.MustCompile(IMSI) rxIMSI = regexp.MustCompile(IMSI)
rxE164 = regexp.MustCompile(E164)
) )

1
vendor/github.com/asaskevich/govalidator/types.go generated vendored
View file

@ -165,6 +165,7 @@ var TagMap = map[string]Validator{
"ISO3166Alpha3": IsISO3166Alpha3, "ISO3166Alpha3": IsISO3166Alpha3,
"ISO4217": IsISO4217, "ISO4217": IsISO4217,
"IMEI": IsIMEI, "IMEI": IsIMEI,
"ulid": IsULID,
} }
// ISO3166Entry stores country codes // ISO3166Entry stores country codes

150
vendor/github.com/asaskevich/govalidator/validator.go generated vendored
View file

@ -361,9 +361,96 @@ func IsUUID(str string) bool {
return rxUUID.MatchString(str) return rxUUID.MatchString(str)
} }
// Byte to index table for O(1) lookups when unmarshaling.
// We use 0xFF as sentinel value for invalid indexes.
var ulidDec = [...]byte{
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x01,
0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E,
0x0F, 0x10, 0x11, 0xFF, 0x12, 0x13, 0xFF, 0x14, 0x15, 0xFF,
0x16, 0x17, 0x18, 0x19, 0x1A, 0xFF, 0x1B, 0x1C, 0x1D, 0x1E,
0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0x0A, 0x0B, 0x0C,
0x0D, 0x0E, 0x0F, 0x10, 0x11, 0xFF, 0x12, 0x13, 0xFF, 0x14,
0x15, 0xFF, 0x16, 0x17, 0x18, 0x19, 0x1A, 0xFF, 0x1B, 0x1C,
0x1D, 0x1E, 0x1F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
}
// EncodedSize is the length of a text encoded ULID.
const ulidEncodedSize = 26
// IsULID checks if the string is a ULID.
//
// Implementation got from:
// https://github.com/oklog/ulid (Apache-2.0 License)
//
func IsULID(str string) bool {
// Check if a base32 encoded ULID is the right length.
if len(str) != ulidEncodedSize {
return false
}
// Check if all the characters in a base32 encoded ULID are part of the
// expected base32 character set.
if ulidDec[str[0]] == 0xFF ||
ulidDec[str[1]] == 0xFF ||
ulidDec[str[2]] == 0xFF ||
ulidDec[str[3]] == 0xFF ||
ulidDec[str[4]] == 0xFF ||
ulidDec[str[5]] == 0xFF ||
ulidDec[str[6]] == 0xFF ||
ulidDec[str[7]] == 0xFF ||
ulidDec[str[8]] == 0xFF ||
ulidDec[str[9]] == 0xFF ||
ulidDec[str[10]] == 0xFF ||
ulidDec[str[11]] == 0xFF ||
ulidDec[str[12]] == 0xFF ||
ulidDec[str[13]] == 0xFF ||
ulidDec[str[14]] == 0xFF ||
ulidDec[str[15]] == 0xFF ||
ulidDec[str[16]] == 0xFF ||
ulidDec[str[17]] == 0xFF ||
ulidDec[str[18]] == 0xFF ||
ulidDec[str[19]] == 0xFF ||
ulidDec[str[20]] == 0xFF ||
ulidDec[str[21]] == 0xFF ||
ulidDec[str[22]] == 0xFF ||
ulidDec[str[23]] == 0xFF ||
ulidDec[str[24]] == 0xFF ||
ulidDec[str[25]] == 0xFF {
return false
}
// Check if the first character in a base32 encoded ULID will overflow. This
// happens because the base32 representation encodes 130 bits, while the
// ULID is only 128 bits.
//
// See https://github.com/oklog/ulid/issues/9 for details.
if str[0] > '7' {
return false
}
return true
}
// IsCreditCard checks if the string is a credit card. // IsCreditCard checks if the string is a credit card.
func IsCreditCard(str string) bool { func IsCreditCard(str string) bool {
sanitized := notNumberRegexp.ReplaceAllString(str, "") sanitized := whiteSpacesAndMinus.ReplaceAllString(str, "")
if !rxCreditCard.MatchString(sanitized) { if !rxCreditCard.MatchString(sanitized) {
return false return false
} }
@ -509,6 +596,27 @@ func IsFilePath(str string) (bool, int) {
return false, Unknown return false, Unknown
} }
//IsWinFilePath checks both relative & absolute paths in Windows
func IsWinFilePath(str string) bool {
if rxARWinPath.MatchString(str) {
//check windows path limit see:
// http://msdn.microsoft.com/en-us/library/aa365247(VS.85).aspx#maxpath
if len(str[3:]) > 32767 {
return false
}
return true
}
return false
}
//IsUnixFilePath checks both relative & absolute paths in Unix
func IsUnixFilePath(str string) bool {
if rxARUnixPath.MatchString(str) {
return true
}
return false
}
// IsDataURI checks if a string is base64 encoded data URI such as an image // IsDataURI checks if a string is base64 encoded data URI such as an image
func IsDataURI(str string) bool { func IsDataURI(str string) bool {
dataURI := strings.Split(str, ",") dataURI := strings.Split(str, ",")
@ -586,11 +694,13 @@ func IsHash(str string, algorithm string) bool {
len = "40" len = "40"
} else if algo == "tiger192" { } else if algo == "tiger192" {
len = "48" len = "48"
} else if algo == "sha256" { } else if algo == "sha3-224" {
len = "56"
} else if algo == "sha256" || algo == "sha3-256" {
len = "64" len = "64"
} else if algo == "sha384" { } else if algo == "sha384" || algo == "sha3-384" {
len = "96" len = "96"
} else if algo == "sha512" { } else if algo == "sha512" || algo == "sha3-512" {
len = "128" len = "128"
} else { } else {
return false return false
@ -599,6 +709,26 @@ func IsHash(str string, algorithm string) bool {
return Matches(str, "^[a-f0-9]{"+len+"}$") return Matches(str, "^[a-f0-9]{"+len+"}$")
} }
// IsSHA3224 checks is a string is a SHA3-224 hash. Alias for `IsHash(str, "sha3-224")`
func IsSHA3224(str string) bool {
return IsHash(str, "sha3-224")
}
// IsSHA3256 checks is a string is a SHA3-256 hash. Alias for `IsHash(str, "sha3-256")`
func IsSHA3256(str string) bool {
return IsHash(str, "sha3-256")
}
// IsSHA3384 checks is a string is a SHA3-384 hash. Alias for `IsHash(str, "sha3-384")`
func IsSHA3384(str string) bool {
return IsHash(str, "sha3-384")
}
// IsSHA3512 checks is a string is a SHA3-512 hash. Alias for `IsHash(str, "sha3-512")`
func IsSHA3512(str string) bool {
return IsHash(str, "sha3-512")
}
// IsSHA512 checks is a string is a SHA512 hash. Alias for `IsHash(str, "sha512")` // IsSHA512 checks is a string is a SHA512 hash. Alias for `IsHash(str, "sha512")`
func IsSHA512(str string) bool { func IsSHA512(str string) bool {
return IsHash(str, "sha512") return IsHash(str, "sha512")
@ -819,6 +949,14 @@ func IsRsaPublicKey(str string, keylen int) bool {
return bitlen == int(keylen) return bitlen == int(keylen)
} }
// IsRegex checks if a give string is a valid regex with RE2 syntax or not
func IsRegex(str string) bool {
if _, err := regexp.Compile(str); err == nil {
return true
}
return false
}
func toJSONName(tag string) string { func toJSONName(tag string) string {
if tag == "" { if tag == "" {
return "" return ""
@ -1625,3 +1763,7 @@ func (sv stringValues) Len() int { return len(sv) }
func (sv stringValues) Swap(i, j int) { sv[i], sv[j] = sv[j], sv[i] } func (sv stringValues) Swap(i, j int) { sv[i], sv[j] = sv[j], sv[i] }
func (sv stringValues) Less(i, j int) bool { return sv.get(i) < sv.get(j) } func (sv stringValues) Less(i, j int) bool { return sv.get(i) < sv.get(j) }
func (sv stringValues) get(i int) string { return sv[i].String() } func (sv stringValues) get(i int) string { return sv[i].String() }
func IsE164(str string) bool {
return rxE164.MatchString(str)
}

4
vendor/github.com/microcosm-cc/bluemonday/.travis.yml generated vendored
View file

@ -11,6 +11,10 @@ go:
- 1.10.x - 1.10.x
- 1.11.x - 1.11.x
- 1.12.x - 1.12.x
- 1.13.x
- 1.14.x
- 1.15.x
- 1.16.x
- tip - tip
matrix: matrix:
allow_failures: allow_failures:

1
vendor/github.com/microcosm-cc/bluemonday/CONTRIBUTING.md generated vendored
View file

@ -9,6 +9,7 @@ Third-party patches are essential for keeping bluemonday secure and offering the
## Guidelines ## Guidelines
1. Do not vendor dependencies. As a security package, were we to vendor dependencies the projects that then vendor bluemonday may not receive the latest security updates to the dependencies. By not vendoring dependencies the project that implements bluemonday will vendor the latest version of any dependent packages. Vendoring is a project problem, not a package problem. bluemonday will be tested against the latest version of dependencies periodically and during any PR/merge. 1. Do not vendor dependencies. As a security package, were we to vendor dependencies the projects that then vendor bluemonday may not receive the latest security updates to the dependencies. By not vendoring dependencies the project that implements bluemonday will vendor the latest version of any dependent packages. Vendoring is a project problem, not a package problem. bluemonday will be tested against the latest version of dependencies periodically and during any PR/merge.
2. I do not care about spelling mistakes or whitespace and I do not believe that you should either. PRs therefore must be functional in their nature or be substantial and impactful if documentation or examples.
## Submitting an Issue ## Submitting an Issue

2
vendor/github.com/microcosm-cc/bluemonday/Makefile generated vendored
View file

@ -25,7 +25,7 @@ build:
@go build @go build
vet: vet:
@go vet *.go @go vet
lint: lint:
@golint *.go @golint *.go

29
vendor/github.com/microcosm-cc/bluemonday/README.md generated vendored
View file

@ -2,7 +2,7 @@
bluemonday is a HTML sanitizer implemented in Go. It is fast and highly configurable. bluemonday is a HTML sanitizer implemented in Go. It is fast and highly configurable.
bluemonday takes untrusted user generated content as an input, and will return HTML that has been sanitised against a whitelist of approved HTML elements and attributes so that you can safely include the content in your web page. bluemonday takes untrusted user generated content as an input, and will return HTML that has been sanitised against an allowlist of approved HTML elements and attributes so that you can safely include the content in your web page.
If you accept user generated content, and your server uses Go, you **need** bluemonday. If you accept user generated content, and your server uses Go, you **need** bluemonday.
@ -50,15 +50,15 @@ bluemonday is heavily inspired by both the [OWASP Java HTML Sanitizer](https://c
## Technical Summary ## Technical Summary
Whitelist based, you need to either build a policy describing the HTML elements and attributes to permit (and the `regexp` patterns of attributes), or use one of the supplied policies representing good defaults. Allowlist based, you need to either build a policy describing the HTML elements and attributes to permit (and the `regexp` patterns of attributes), or use one of the supplied policies representing good defaults.
The policy containing the whitelist is applied using a fast non-validating, forward only, token-based parser implemented in the [Go net/html library](https://godoc.org/golang.org/x/net/html) by the core Go team. The policy containing the allowlist is applied using a fast non-validating, forward only, token-based parser implemented in the [Go net/html library](https://godoc.org/golang.org/x/net/html) by the core Go team.
We expect to be supplied with well-formatted HTML (closing elements for every applicable open element, nested correctly) and so we do not focus on repairing badly nested or incomplete HTML. We focus on simply ensuring that whatever elements do exist are described in the policy whitelist and that attributes and links are safe for use on your web page. [GIGO](http://en.wikipedia.org/wiki/Garbage_in,_garbage_out) does apply and if you feed it bad HTML bluemonday is not tasked with figuring out how to make it good again. We expect to be supplied with well-formatted HTML (closing elements for every applicable open element, nested correctly) and so we do not focus on repairing badly nested or incomplete HTML. We focus on simply ensuring that whatever elements do exist are described in the policy allowlist and that attributes and links are safe for use on your web page. [GIGO](http://en.wikipedia.org/wiki/Garbage_in,_garbage_out) does apply and if you feed it bad HTML bluemonday is not tasked with figuring out how to make it good again.
### Supported Go Versions ### Supported Go Versions
bluemonday is tested against Go 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 1.10, 1.11, 1.12, and tip. bluemonday is tested on all versions since Go 1.2 including tip.
We do not support Go 1.0 as we depend on `golang.org/x/net/html` which includes a reference to `io.ErrNoProgress` which did not exist in Go 1.0. We do not support Go 1.0 as we depend on `golang.org/x/net/html` which includes a reference to `io.ErrNoProgress` which did not exist in Go 1.0.
@ -146,8 +146,8 @@ func main() {
We ship two default policies: We ship two default policies:
1. `bluemonday.StrictPolicy()` which can be thought of as equivalent to stripping all HTML elements and their attributes as it has nothing on its whitelist. An example usage scenario would be blog post titles where HTML tags are not expected at all and if they are then the elements *and* the content of the elements should be stripped. This is a *very* strict policy. 1. `bluemonday.StrictPolicy()` which can be thought of as equivalent to stripping all HTML elements and their attributes as it has nothing on its allowlist. An example usage scenario would be blog post titles where HTML tags are not expected at all and if they are then the elements *and* the content of the elements should be stripped. This is a *very* strict policy.
2. `bluemonday.UGCPolicy()` which allows a broad selection of HTML elements and attributes that are safe for user generated content. Note that this policy does *not* whitelist iframes, object, embed, styles, script, etc. An example usage scenario would be blog post bodies where a variety of formatting is expected along with the potential for TABLEs and IMGs. 2. `bluemonday.UGCPolicy()` which allows a broad selection of HTML elements and attributes that are safe for user generated content. Note that this policy does *not* allow iframes, object, embed, styles, script, etc. An example usage scenario would be blog post bodies where a variety of formatting is expected along with the potential for TABLEs and IMGs.
## Policy Building ## Policy Building
@ -220,7 +220,7 @@ p.AllowElements("fieldset", "select", "option")
### Inline CSS ### Inline CSS
Although it's possible to handle inline CSS using `AllowAttrs` with a `Matching` rule, writing a single monolithic regular expression to safely process all inline CSS which you wish to allow is not a trivial task. Instead of attempting to do so, you can whitelist the `style` attribute on whichever element(s) you desire and use style policies to control and sanitize inline styles. Although it's possible to handle inline CSS using `AllowAttrs` with a `Matching` rule, writing a single monolithic regular expression to safely process all inline CSS which you wish to allow is not a trivial task. Instead of attempting to do so, you can allow the `style` attribute on whichever element(s) you desire and use style policies to control and sanitize inline styles.
It is suggested that you use `Matching` (with a suitable regular expression) It is suggested that you use `Matching` (with a suitable regular expression)
`MatchingEnum`, or `MatchingHandler` to ensure each style matches your needs, `MatchingEnum`, or `MatchingHandler` to ensure each style matches your needs,
@ -241,7 +241,7 @@ p.AllowAttrs("style").OnElements("span", "p")
p.AllowStyles("text-decoration").MatchingEnum("underline", "line-through", "none").OnElements("span") p.AllowStyles("text-decoration").MatchingEnum("underline", "line-through", "none").OnElements("span")
``` ```
Or you can specify elements based on a regex patterm match: Or you can specify elements based on a regex pattern match:
```go ```go
p.AllowAttrs("style").OnElementsMatching(regex.MustCompile(`^my-element-`)) p.AllowAttrs("style").OnElementsMatching(regex.MustCompile(`^my-element-`))
// Allow the 'text-decoration' property to be set to 'underline', 'line-through' or 'none' // Allow the 'text-decoration' property to be set to 'underline', 'line-through' or 'none'
@ -254,6 +254,7 @@ validate the values for a given property. The string parameter has been
converted to lowercase and unicode code points have been converted. converted to lowercase and unicode code points have been converted.
```go ```go
myHandler := func(value string) bool{ myHandler := func(value string) bool{
// Validate your input here
return true return true
} }
p.AllowAttrs("style").OnElements("span", "p") p.AllowAttrs("style").OnElements("span", "p")
@ -279,12 +280,12 @@ We provide some additional global options for safely working with links.
p.RequireParseableURLs(true) p.RequireParseableURLs(true)
``` ```
If you have enabled parseable URLs then the following option will `AllowRelativeURLs`. By default this is disabled (bluemonday is a whitelist tool... you need to explicitly tell us to permit things) and when disabled it will prevent all local and scheme relative URLs (i.e. `href="localpage.html"`, `href="../home.html"` and even `href="//www.google.com"` are relative): If you have enabled parseable URLs then the following option will `AllowRelativeURLs`. By default this is disabled (bluemonday is an allowlist tool... you need to explicitly tell us to permit things) and when disabled it will prevent all local and scheme relative URLs (i.e. `href="localpage.html"`, `href="../home.html"` and even `href="//www.google.com"` are relative):
```go ```go
p.AllowRelativeURLs(true) p.AllowRelativeURLs(true)
``` ```
If you have enabled parseable URLs then you can whitelist the schemes (commonly called protocol when thinking of `http` and `https`) that are permitted. Bear in mind that allowing relative URLs in the above option will allow for a blank scheme: If you have enabled parseable URLs then you can allow the schemes (commonly called protocol when thinking of `http` and `https`) that are permitted. Bear in mind that allowing relative URLs in the above option will allow for a blank scheme:
```go ```go
p.AllowURLSchemes("mailto", "http", "https") p.AllowURLSchemes("mailto", "http", "https")
``` ```
@ -302,7 +303,7 @@ p.RequireNoReferrerOnLinks(true)
``` ```
We provide a convenience method that applies all of the above, but you will still need to whitelist the linkable elements for the URL rules to be applied to: We provide a convenience method that applies all of the above, but you will still need to allow the linkable elements for the URL rules to be applied to:
```go ```go
p.AllowStandardURLs() p.AllowStandardURLs()
p.AllowAttrs("cite").OnElements("blockquote", "q") p.AllowAttrs("cite").OnElements("blockquote", "q")
@ -372,11 +373,11 @@ p.AllowAttrs(
) )
``` ```
Both examples exhibit the same issue, they declare attributes but do not then specify whether they are whitelisted globally or only on specific elements (and which elements). Attributes belong to one or more elements, and the policy needs to declare this. Both examples exhibit the same issue, they declare attributes but do not then specify whether they are allowed globally or only on specific elements (and which elements). Attributes belong to one or more elements, and the policy needs to declare this.
## Limitations ## Limitations
We are not yet including any tools to help whitelist and sanitize CSS. Which means that unless you wish to do the heavy lifting in a single regular expression (inadvisable), **you should not allow the "style" attribute anywhere**. We are not yet including any tools to help allow and sanitize CSS. Which means that unless you wish to do the heavy lifting in a single regular expression (inadvisable), **you should not allow the "style" attribute anywhere**.
It is not the job of bluemonday to fix your bad HTML, it is merely the job of bluemonday to prevent malicious HTML getting through. If you have mismatched HTML elements, or non-conforming nesting of elements, those will remain. But if you have well-structured HTML bluemonday will not break it. It is not the job of bluemonday to fix your bad HTML, it is merely the job of bluemonday to prevent malicious HTML getting through. If you have mismatched HTML elements, or non-conforming nesting of elements, those will remain. But if you have well-structured HTML bluemonday will not break it.

4
vendor/github.com/microcosm-cc/bluemonday/handlers.go → vendor/github.com/microcosm-cc/bluemonday/css/handlers.go generated vendored
View file

@ -27,7 +27,7 @@
// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
package bluemonday package css
import ( import (
"regexp" "regexp"
@ -329,7 +329,7 @@ func splitValues(value string) []string {
return values return values
} }
func getDefaultHandler(attr string) func(string) bool { func GetDefaultHandler(attr string) func(string) bool {
if defaultStyleHandlers[attr] != nil { if defaultStyleHandlers[attr] != nil {
return defaultStyleHandlers[attr] return defaultStyleHandlers[attr]

14
vendor/github.com/microcosm-cc/bluemonday/doc.go generated vendored
View file

@ -28,10 +28,10 @@
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/* /*
Package bluemonday provides a way of describing a whitelist of HTML elements Package bluemonday provides a way of describing an allowlist of HTML elements
and attributes as a policy, and for that policy to be applied to untrusted and attributes as a policy, and for that policy to be applied to untrusted
strings from users that may contain markup. All elements and attributes not on strings from users that may contain markup. All elements and attributes not on
the whitelist will be stripped. the allowlist will be stripped.
The default bluemonday.UGCPolicy().Sanitize() turns this: The default bluemonday.UGCPolicy().Sanitize() turns this:
@ -84,21 +84,21 @@ bluemonday is heavily inspired by both the OWASP Java HTML Sanitizer
We ship two default policies, one is bluemonday.StrictPolicy() and can be We ship two default policies, one is bluemonday.StrictPolicy() and can be
thought of as equivalent to stripping all HTML elements and their attributes as thought of as equivalent to stripping all HTML elements and their attributes as
it has nothing on its whitelist. it has nothing on its allowlist.
The other is bluemonday.UGCPolicy() and allows a broad selection of HTML The other is bluemonday.UGCPolicy() and allows a broad selection of HTML
elements and attributes that are safe for user generated content. Note that elements and attributes that are safe for user generated content. Note that
this policy does not whitelist iframes, object, embed, styles, script, etc. this policy does not allow iframes, object, embed, styles, script, etc.
The essence of building a policy is to determine which HTML elements and The essence of building a policy is to determine which HTML elements and
attributes are considered safe for your scenario. OWASP provide an XSS attributes are considered safe for your scenario. OWASP provide an XSS
prevention cheat sheet ( https://www.google.com/search?q=xss+prevention+cheat+sheet ) prevention cheat sheet ( https://www.google.com/search?q=xss+prevention+cheat+sheet )
to help explain the risks, but essentially: to help explain the risks, but essentially:
1. Avoid whitelisting anything other than plain HTML elements 1. Avoid allowing anything other than plain HTML elements
2. Avoid whitelisting `script`, `style`, `iframe`, `object`, `embed`, `base` 2. Avoid allowing `script`, `style`, `iframe`, `object`, `embed`, `base`
elements elements
3. Avoid whitelisting anything other than plain HTML elements with simple 3. Avoid allowing anything other than plain HTML elements with simple
values that you can match to a regexp values that you can match to a regexp
*/ */
package bluemonday package bluemonday

3
vendor/github.com/microcosm-cc/bluemonday/go.mod generated vendored
View file

@ -3,7 +3,8 @@ module github.com/microcosm-cc/bluemonday
go 1.16 go 1.16
require ( require (
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/aymerick/douceur v0.2.0 github.com/aymerick/douceur v0.2.0
github.com/gorilla/css v1.0.0 // indirect github.com/gorilla/css v1.0.0 // indirect
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c golang.org/x/net v0.0.0-20210614182718-04defd469f4e
) )

15
vendor/github.com/microcosm-cc/bluemonday/go.sum generated vendored
View file

@ -1,11 +1,18 @@
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY=
github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c=
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c h1:KHUzaHIpjWVlVVNh65G3hhuj3KB1HnjY6Cq5cTvRQT8= golang.org/x/net v0.0.0-20210421230115-4e50805a0758 h1:aEpZnXcAmXkd6AvLb2OPt+EN1Zu/8Ne3pCqPjja5PXY=
golang.org/x/net v0.0.0-20210331212208-0fccb6fa2b5c/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b h1:k+E048sYJHyVnsr1GDrRZWQ32D2C7lWs9JRc0bel53A=
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210614182718-04defd469f4e h1:XpT3nA5TvE525Ne3hInMh6+GETgn27Zfm9dxsThnX2Q=
golang.org/x/net v0.0.0-20210614182718-04defd469f4e/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

2
vendor/github.com/microcosm-cc/bluemonday/helpers.go generated vendored
View file

@ -141,7 +141,7 @@ func (p *Policy) AllowStandardURLs() {
} }
// AllowStandardAttributes will enable "id", "title" and the language specific // AllowStandardAttributes will enable "id", "title" and the language specific
// attributes "dir" and "lang" on all elements that are whitelisted // attributes "dir" and "lang" on all elements that are allowed
func (p *Policy) AllowStandardAttributes() { func (p *Policy) AllowStandardAttributes() {
// "dir" "lang" are permitted as both language attributes affect charsets // "dir" "lang" are permitted as both language attributes affect charsets
// and direction of text. // and direction of text.

133
vendor/github.com/microcosm-cc/bluemonday/policy.go generated vendored
View file

@ -35,9 +35,11 @@ import (
"net/url" "net/url"
"regexp" "regexp"
"strings" "strings"
"github.com/microcosm-cc/bluemonday/css"
) )
// Policy encapsulates the whitelist of HTML elements and attributes that will // Policy encapsulates the allowlist of HTML elements and attributes that will
// be applied to the sanitised HTML. // be applied to the sanitised HTML.
// //
// You should use bluemonday.NewPolicy() to create a blank policy as the // You should use bluemonday.NewPolicy() to create a blank policy as the
@ -86,28 +88,31 @@ type Policy struct {
// When true, allow data attributes. // When true, allow data attributes.
allowDataAttributes bool allowDataAttributes bool
// map[htmlElementName]map[htmlAttributeName]attrPolicy // When true, allow comments.
elsAndAttrs map[string]map[string]attrPolicy allowComments bool
// map[htmlElementName]map[htmlAttributeName][]attrPolicy
elsAndAttrs map[string]map[string][]attrPolicy
// elsMatchingAndAttrs stores regex based element matches along with attributes // elsMatchingAndAttrs stores regex based element matches along with attributes
elsMatchingAndAttrs map[*regexp.Regexp]map[string]attrPolicy elsMatchingAndAttrs map[*regexp.Regexp]map[string][]attrPolicy
// map[htmlAttributeName]attrPolicy // map[htmlAttributeName][]attrPolicy
globalAttrs map[string]attrPolicy globalAttrs map[string][]attrPolicy
// map[htmlElementName]map[cssPropertyName]stylePolicy // map[htmlElementName]map[cssPropertyName][]stylePolicy
elsAndStyles map[string]map[string]stylePolicy elsAndStyles map[string]map[string][]stylePolicy
// map[regex]map[cssPropertyName]stylePolicy // map[regex]map[cssPropertyName][]stylePolicy
elsMatchingAndStyles map[*regexp.Regexp]map[string]stylePolicy elsMatchingAndStyles map[*regexp.Regexp]map[string][]stylePolicy
// map[cssPropertyName]stylePolicy // map[cssPropertyName][]stylePolicy
globalStyles map[string]stylePolicy globalStyles map[string][]stylePolicy
// If urlPolicy is nil, all URLs with matching schema are allowed. // If urlPolicy is nil, all URLs with matching schema are allowed.
// Otherwise, only the URLs with matching schema and urlPolicy(url) // Otherwise, only the URLs with matching schema and urlPolicy(url)
// returning true are allowed. // returning true are allowed.
allowURLSchemes map[string]urlPolicy allowURLSchemes map[string][]urlPolicy
// If an element has had all attributes removed as a result of a policy // If an element has had all attributes removed as a result of a policy
// being applied, then the element would be removed from the output. // being applied, then the element would be removed from the output.
@ -174,22 +179,22 @@ type urlPolicy func(url *url.URL) (allowUrl bool)
// init initializes the maps if this has not been done already // init initializes the maps if this has not been done already
func (p *Policy) init() { func (p *Policy) init() {
if !p.initialized { if !p.initialized {
p.elsAndAttrs = make(map[string]map[string]attrPolicy) p.elsAndAttrs = make(map[string]map[string][]attrPolicy)
p.elsMatchingAndAttrs = make(map[*regexp.Regexp]map[string]attrPolicy) p.elsMatchingAndAttrs = make(map[*regexp.Regexp]map[string][]attrPolicy)
p.globalAttrs = make(map[string]attrPolicy) p.globalAttrs = make(map[string][]attrPolicy)
p.elsAndStyles = make(map[string]map[string]stylePolicy) p.elsAndStyles = make(map[string]map[string][]stylePolicy)
p.elsMatchingAndStyles = make(map[*regexp.Regexp]map[string]stylePolicy) p.elsMatchingAndStyles = make(map[*regexp.Regexp]map[string][]stylePolicy)
p.globalStyles = make(map[string]stylePolicy) p.globalStyles = make(map[string][]stylePolicy)
p.allowURLSchemes = make(map[string]urlPolicy) p.allowURLSchemes = make(map[string][]urlPolicy)
p.setOfElementsAllowedWithoutAttrs = make(map[string]struct{}) p.setOfElementsAllowedWithoutAttrs = make(map[string]struct{})
p.setOfElementsToSkipContent = make(map[string]struct{}) p.setOfElementsToSkipContent = make(map[string]struct{})
p.initialized = true p.initialized = true
} }
} }
// NewPolicy returns a blank policy with nothing whitelisted or permitted. This // NewPolicy returns a blank policy with nothing allowed or permitted. This
// is the recommended way to start building a policy and you should now use // is the recommended way to start building a policy and you should now use
// AllowAttrs() and/or AllowElements() to construct the whitelist of HTML // AllowAttrs() and/or AllowElements() to construct the allowlist of HTML
// elements and attributes. // elements and attributes.
func NewPolicy() *Policy { func NewPolicy() *Policy {
@ -203,7 +208,7 @@ func NewPolicy() *Policy {
// AllowAttrs takes a range of HTML attribute names and returns an // AllowAttrs takes a range of HTML attribute names and returns an
// attribute policy builder that allows you to specify the pattern and scope of // attribute policy builder that allows you to specify the pattern and scope of
// the whitelisted attribute. // the allowed attribute.
// //
// The attribute policy is only added to the core policy when either Globally() // The attribute policy is only added to the core policy when either Globally()
// or OnElements(...) are called. // or OnElements(...) are called.
@ -223,7 +228,7 @@ func (p *Policy) AllowAttrs(attrNames ...string) *attrPolicyBuilder {
return &abp return &abp
} }
// AllowDataAttributes whitelists all data attributes. We can't specify the name // AllowDataAttributes permits all data attributes. We can't specify the name
// of each attribute exactly as they are customized. // of each attribute exactly as they are customized.
// //
// NOTE: These values are not sanitized and applications that evaluate or process // NOTE: These values are not sanitized and applications that evaluate or process
@ -238,6 +243,22 @@ func (p *Policy) AllowDataAttributes() {
p.allowDataAttributes = true p.allowDataAttributes = true
} }
// AllowComments allows comments.
//
// Please note that only one type of comment will be allowed by this, this is the
// the standard HTML comment <!-- --> which includes the use of that to permit
// conditionals as per https://docs.microsoft.com/en-us/previous-versions/windows/internet-explorer/ie-developer/compatibility/ms537512(v=vs.85)?redirectedfrom=MSDN
//
// What is not permitted are CDATA XML comments, as the x/net/html package we depend
// on does not handle this fully and we are not choosing to take on that work:
// https://pkg.go.dev/golang.org/x/net/html#Tokenizer.AllowCDATA . If the x/net/html
// package changes this then these will be considered, otherwise if you AllowComments
// but provide a CDATA comment, then as per the documentation in x/net/html this will
// be treated as a plain HTML comment.
func (p *Policy) AllowComments() {
p.allowComments = true
}
// AllowNoAttrs says that attributes on element are optional. // AllowNoAttrs says that attributes on element are optional.
// //
// The attribute policy is only added to the core policy when OnElements(...) // The attribute policy is only added to the core policy when OnElements(...)
@ -265,8 +286,7 @@ func (abp *attrPolicyBuilder) AllowNoAttrs() *attrPolicyBuilder {
} }
// Matching allows a regular expression to be applied to a nascent attribute // Matching allows a regular expression to be applied to a nascent attribute
// policy, and returns the attribute policy. Calling this more than once will // policy, and returns the attribute policy.
// replace the existing regexp.
func (abp *attrPolicyBuilder) Matching(regex *regexp.Regexp) *attrPolicyBuilder { func (abp *attrPolicyBuilder) Matching(regex *regexp.Regexp) *attrPolicyBuilder {
abp.regexp = regex abp.regexp = regex
@ -284,7 +304,7 @@ func (abp *attrPolicyBuilder) OnElements(elements ...string) *Policy {
for _, attr := range abp.attrNames { for _, attr := range abp.attrNames {
if _, ok := abp.p.elsAndAttrs[element]; !ok { if _, ok := abp.p.elsAndAttrs[element]; !ok {
abp.p.elsAndAttrs[element] = make(map[string]attrPolicy) abp.p.elsAndAttrs[element] = make(map[string][]attrPolicy)
} }
ap := attrPolicy{} ap := attrPolicy{}
@ -292,14 +312,14 @@ func (abp *attrPolicyBuilder) OnElements(elements ...string) *Policy {
ap.regexp = abp.regexp ap.regexp = abp.regexp
} }
abp.p.elsAndAttrs[element][attr] = ap abp.p.elsAndAttrs[element][attr] = append(abp.p.elsAndAttrs[element][attr], ap)
} }
if abp.allowEmpty { if abp.allowEmpty {
abp.p.setOfElementsAllowedWithoutAttrs[element] = struct{}{} abp.p.setOfElementsAllowedWithoutAttrs[element] = struct{}{}
if _, ok := abp.p.elsAndAttrs[element]; !ok { if _, ok := abp.p.elsAndAttrs[element]; !ok {
abp.p.elsAndAttrs[element] = make(map[string]attrPolicy) abp.p.elsAndAttrs[element] = make(map[string][]attrPolicy)
} }
} }
} }
@ -312,19 +332,19 @@ func (abp *attrPolicyBuilder) OnElements(elements ...string) *Policy {
func (abp *attrPolicyBuilder) OnElementsMatching(regex *regexp.Regexp) *Policy { func (abp *attrPolicyBuilder) OnElementsMatching(regex *regexp.Regexp) *Policy {
for _, attr := range abp.attrNames { for _, attr := range abp.attrNames {
if _, ok := abp.p.elsMatchingAndAttrs[regex]; !ok { if _, ok := abp.p.elsMatchingAndAttrs[regex]; !ok {
abp.p.elsMatchingAndAttrs[regex] = make(map[string]attrPolicy) abp.p.elsMatchingAndAttrs[regex] = make(map[string][]attrPolicy)
} }
ap := attrPolicy{} ap := attrPolicy{}
if abp.regexp != nil { if abp.regexp != nil {
ap.regexp = abp.regexp ap.regexp = abp.regexp
} }
abp.p.elsMatchingAndAttrs[regex][attr] = ap abp.p.elsMatchingAndAttrs[regex][attr] = append(abp.p.elsMatchingAndAttrs[regex][attr], ap)
} }
if abp.allowEmpty { if abp.allowEmpty {
abp.p.setOfElementsMatchingAllowedWithoutAttrs = append(abp.p.setOfElementsMatchingAllowedWithoutAttrs, regex) abp.p.setOfElementsMatchingAllowedWithoutAttrs = append(abp.p.setOfElementsMatchingAllowedWithoutAttrs, regex)
if _, ok := abp.p.elsMatchingAndAttrs[regex]; !ok { if _, ok := abp.p.elsMatchingAndAttrs[regex]; !ok {
abp.p.elsMatchingAndAttrs[regex] = make(map[string]attrPolicy) abp.p.elsMatchingAndAttrs[regex] = make(map[string][]attrPolicy)
} }
} }
@ -337,7 +357,7 @@ func (abp *attrPolicyBuilder) Globally() *Policy {
for _, attr := range abp.attrNames { for _, attr := range abp.attrNames {
if _, ok := abp.p.globalAttrs[attr]; !ok { if _, ok := abp.p.globalAttrs[attr]; !ok {
abp.p.globalAttrs[attr] = attrPolicy{} abp.p.globalAttrs[attr] = []attrPolicy{}
} }
ap := attrPolicy{} ap := attrPolicy{}
@ -345,7 +365,7 @@ func (abp *attrPolicyBuilder) Globally() *Policy {
ap.regexp = abp.regexp ap.regexp = abp.regexp
} }
abp.p.globalAttrs[attr] = ap abp.p.globalAttrs[attr] = append(abp.p.globalAttrs[attr], ap)
} }
return abp.p return abp.p
@ -353,7 +373,7 @@ func (abp *attrPolicyBuilder) Globally() *Policy {
// AllowStyles takes a range of CSS property names and returns a // AllowStyles takes a range of CSS property names and returns a
// style policy builder that allows you to specify the pattern and scope of // style policy builder that allows you to specify the pattern and scope of
// the whitelisted property. // the allowed property.
// //
// The style policy is only added to the core policy when either Globally() // The style policy is only added to the core policy when either Globally()
// or OnElements(...) are called. // or OnElements(...) are called.
@ -373,8 +393,7 @@ func (p *Policy) AllowStyles(propertyNames ...string) *stylePolicyBuilder {
} }
// Matching allows a regular expression to be applied to a nascent style // Matching allows a regular expression to be applied to a nascent style
// policy, and returns the style policy. Calling this more than once will // policy, and returns the style policy.
// replace the existing regexp.
func (spb *stylePolicyBuilder) Matching(regex *regexp.Regexp) *stylePolicyBuilder { func (spb *stylePolicyBuilder) Matching(regex *regexp.Regexp) *stylePolicyBuilder {
spb.regexp = regex spb.regexp = regex
@ -383,8 +402,7 @@ func (spb *stylePolicyBuilder) Matching(regex *regexp.Regexp) *stylePolicyBuilde
} }
// MatchingEnum allows a list of allowed values to be applied to a nascent style // MatchingEnum allows a list of allowed values to be applied to a nascent style
// policy, and returns the style policy. Calling this more than once will // policy, and returns the style policy.
// replace the existing list of allowed values.
func (spb *stylePolicyBuilder) MatchingEnum(enum ...string) *stylePolicyBuilder { func (spb *stylePolicyBuilder) MatchingEnum(enum ...string) *stylePolicyBuilder {
spb.enum = enum spb.enum = enum
@ -393,8 +411,7 @@ func (spb *stylePolicyBuilder) MatchingEnum(enum ...string) *stylePolicyBuilder
} }
// MatchingHandler allows a handler to be applied to a nascent style // MatchingHandler allows a handler to be applied to a nascent style
// policy, and returns the style policy. Calling this more than once will // policy, and returns the style policy.
// replace the existing handler.
func (spb *stylePolicyBuilder) MatchingHandler(handler func(string) bool) *stylePolicyBuilder { func (spb *stylePolicyBuilder) MatchingHandler(handler func(string) bool) *stylePolicyBuilder {
spb.handler = handler spb.handler = handler
@ -412,7 +429,7 @@ func (spb *stylePolicyBuilder) OnElements(elements ...string) *Policy {
for _, attr := range spb.propertyNames { for _, attr := range spb.propertyNames {
if _, ok := spb.p.elsAndStyles[element]; !ok { if _, ok := spb.p.elsAndStyles[element]; !ok {
spb.p.elsAndStyles[element] = make(map[string]stylePolicy) spb.p.elsAndStyles[element] = make(map[string][]stylePolicy)
} }
sp := stylePolicy{} sp := stylePolicy{}
@ -423,9 +440,9 @@ func (spb *stylePolicyBuilder) OnElements(elements ...string) *Policy {
} else if spb.regexp != nil { } else if spb.regexp != nil {
sp.regexp = spb.regexp sp.regexp = spb.regexp
} else { } else {
sp.handler = getDefaultHandler(attr) sp.handler = css.GetDefaultHandler(attr)
} }
spb.p.elsAndStyles[element][attr] = sp spb.p.elsAndStyles[element][attr] = append(spb.p.elsAndStyles[element][attr], sp)
} }
} }
@ -439,7 +456,7 @@ func (spb *stylePolicyBuilder) OnElementsMatching(regex *regexp.Regexp) *Policy
for _, attr := range spb.propertyNames { for _, attr := range spb.propertyNames {
if _, ok := spb.p.elsMatchingAndStyles[regex]; !ok { if _, ok := spb.p.elsMatchingAndStyles[regex]; !ok {
spb.p.elsMatchingAndStyles[regex] = make(map[string]stylePolicy) spb.p.elsMatchingAndStyles[regex] = make(map[string][]stylePolicy)
} }
sp := stylePolicy{} sp := stylePolicy{}
@ -450,9 +467,9 @@ func (spb *stylePolicyBuilder) OnElementsMatching(regex *regexp.Regexp) *Policy
} else if spb.regexp != nil { } else if spb.regexp != nil {
sp.regexp = spb.regexp sp.regexp = spb.regexp
} else { } else {
sp.handler = getDefaultHandler(attr) sp.handler = css.GetDefaultHandler(attr)
} }
spb.p.elsMatchingAndStyles[regex][attr] = sp spb.p.elsMatchingAndStyles[regex][attr] = append(spb.p.elsMatchingAndStyles[regex][attr], sp)
} }
return spb.p return spb.p
@ -464,7 +481,7 @@ func (spb *stylePolicyBuilder) Globally() *Policy {
for _, attr := range spb.propertyNames { for _, attr := range spb.propertyNames {
if _, ok := spb.p.globalStyles[attr]; !ok { if _, ok := spb.p.globalStyles[attr]; !ok {
spb.p.globalStyles[attr] = stylePolicy{} spb.p.globalStyles[attr] = []stylePolicy{}
} }
// Use only one strategy for validating styles, fallback to default // Use only one strategy for validating styles, fallback to default
@ -476,15 +493,15 @@ func (spb *stylePolicyBuilder) Globally() *Policy {
} else if spb.regexp != nil { } else if spb.regexp != nil {
sp.regexp = spb.regexp sp.regexp = spb.regexp
} else { } else {
sp.handler = getDefaultHandler(attr) sp.handler = css.GetDefaultHandler(attr)
} }
spb.p.globalStyles[attr] = sp spb.p.globalStyles[attr] = append(spb.p.globalStyles[attr], sp)
} }
return spb.p return spb.p
} }
// AllowElements will append HTML elements to the whitelist without applying an // AllowElements will append HTML elements to the allowlist without applying an
// attribute policy to those elements (the elements are permitted // attribute policy to those elements (the elements are permitted
// sans-attributes) // sans-attributes)
func (p *Policy) AllowElements(names ...string) *Policy { func (p *Policy) AllowElements(names ...string) *Policy {
@ -494,17 +511,19 @@ func (p *Policy) AllowElements(names ...string) *Policy {
element = strings.ToLower(element) element = strings.ToLower(element)
if _, ok := p.elsAndAttrs[element]; !ok { if _, ok := p.elsAndAttrs[element]; !ok {
p.elsAndAttrs[element] = make(map[string]attrPolicy) p.elsAndAttrs[element] = make(map[string][]attrPolicy)
} }
} }
return p return p
} }
// AllowElementsMatching will append HTML elements to the allowlist if they
// match a regexp.
func (p *Policy) AllowElementsMatching(regex *regexp.Regexp) *Policy { func (p *Policy) AllowElementsMatching(regex *regexp.Regexp) *Policy {
p.init() p.init()
if _, ok := p.elsMatchingAndAttrs[regex]; !ok { if _, ok := p.elsMatchingAndAttrs[regex]; !ok {
p.elsMatchingAndAttrs[regex] = make(map[string]attrPolicy) p.elsMatchingAndAttrs[regex] = make(map[string][]attrPolicy)
} }
return p return p
} }
@ -611,7 +630,7 @@ func (p *Policy) AllowRelativeURLs(require bool) *Policy {
return p return p
} }
// AllowURLSchemes will append URL schemes to the whitelist // AllowURLSchemes will append URL schemes to the allowlist
// Example: p.AllowURLSchemes("mailto", "http", "https") // Example: p.AllowURLSchemes("mailto", "http", "https")
func (p *Policy) AllowURLSchemes(schemes ...string) *Policy { func (p *Policy) AllowURLSchemes(schemes ...string) *Policy {
p.init() p.init()
@ -629,7 +648,7 @@ func (p *Policy) AllowURLSchemes(schemes ...string) *Policy {
} }
// AllowURLSchemeWithCustomPolicy will append URL schemes with // AllowURLSchemeWithCustomPolicy will append URL schemes with
// a custom URL policy to the whitelist. // a custom URL policy to the allowlist.
// Only the URLs with matching schema and urlPolicy(url) // Only the URLs with matching schema and urlPolicy(url)
// returning true will be allowed. // returning true will be allowed.
func (p *Policy) AllowURLSchemeWithCustomPolicy( func (p *Policy) AllowURLSchemeWithCustomPolicy(
@ -643,13 +662,13 @@ func (p *Policy) AllowURLSchemeWithCustomPolicy(
scheme = strings.ToLower(scheme) scheme = strings.ToLower(scheme)
p.allowURLSchemes[scheme] = urlPolicy p.allowURLSchemes[scheme] = append(p.allowURLSchemes[scheme], urlPolicy)
return p return p
} }
// AddSpaceWhenStrippingTag states whether to add a single space " " when // AddSpaceWhenStrippingTag states whether to add a single space " " when
// removing tags that are not whitelisted by the policy. // removing tags that are not allowed by the policy.
// //
// This is useful if you expect to strip tags in dense markup and may lose the // This is useful if you expect to strip tags in dense markup and may lose the
// value of whitespace. // value of whitespace.

296
vendor/github.com/microcosm-cc/bluemonday/sanitize.go generated vendored
View file

@ -31,6 +31,7 @@ package bluemonday
import ( import (
"bytes" "bytes"
"fmt"
"io" "io"
"net/url" "net/url"
"regexp" "regexp"
@ -47,10 +48,11 @@ var (
dataAttributeXMLPrefix = regexp.MustCompile("^xml.+") dataAttributeXMLPrefix = regexp.MustCompile("^xml.+")
dataAttributeInvalidChars = regexp.MustCompile("[A-Z;]+") dataAttributeInvalidChars = regexp.MustCompile("[A-Z;]+")
cssUnicodeChar = regexp.MustCompile(`\\[0-9a-f]{1,6} ?`) cssUnicodeChar = regexp.MustCompile(`\\[0-9a-f]{1,6} ?`)
dataURIbase64Prefix = regexp.MustCompile(`^data:[^,]*;base64,`)
) )
// Sanitize takes a string that contains a HTML fragment or document and applies // Sanitize takes a string that contains a HTML fragment or document and applies
// the given policy whitelist. // the given policy allowlist.
// //
// It returns a HTML string that has been sanitized by the policy or an empty // It returns a HTML string that has been sanitized by the policy or an empty
// string if an error has occurred (most likely as a consequence of extremely // string if an error has occurred (most likely as a consequence of extremely
@ -60,11 +62,11 @@ func (p *Policy) Sanitize(s string) string {
return s return s
} }
return p.sanitize(strings.NewReader(s)).String() return p.sanitizeWithBuff(strings.NewReader(s)).String()
} }
// SanitizeBytes takes a []byte that contains a HTML fragment or document and applies // SanitizeBytes takes a []byte that contains a HTML fragment or document and applies
// the given policy whitelist. // the given policy allowlist.
// //
// It returns a []byte containing the HTML that has been sanitized by the policy // It returns a []byte containing the HTML that has been sanitized by the policy
// or an empty []byte if an error has occurred (most likely as a consequence of // or an empty []byte if an error has occurred (most likely as a consequence of
@ -74,26 +76,32 @@ func (p *Policy) SanitizeBytes(b []byte) []byte {
return b return b
} }
return p.sanitize(bytes.NewReader(b)).Bytes() return p.sanitizeWithBuff(bytes.NewReader(b)).Bytes()
} }
// SanitizeReader takes an io.Reader that contains a HTML fragment or document // SanitizeReader takes an io.Reader that contains a HTML fragment or document
// and applies the given policy whitelist. // and applies the given policy allowlist.
// //
// It returns a bytes.Buffer containing the HTML that has been sanitized by the // It returns a bytes.Buffer containing the HTML that has been sanitized by the
// policy. Errors during sanitization will merely return an empty result. // policy. Errors during sanitization will merely return an empty result.
func (p *Policy) SanitizeReader(r io.Reader) *bytes.Buffer { func (p *Policy) SanitizeReader(r io.Reader) *bytes.Buffer {
return p.sanitize(r) return p.sanitizeWithBuff(r)
}
// SanitizeReaderToWriter takes an io.Reader that contains a HTML fragment or document
// and applies the given policy allowlist and writes to the provided writer returning
// an error if there is one.
func (p *Policy) SanitizeReaderToWriter(r io.Reader, w io.Writer) error {
return p.sanitize(r, w)
} }
const escapedURLChars = "'<>\"\r" const escapedURLChars = "'<>\"\r"
func escapeUrlComponent(val string) string { func escapeUrlComponent(w stringWriterWriter, val string) error {
w := bytes.NewBufferString("")
i := strings.IndexAny(val, escapedURLChars) i := strings.IndexAny(val, escapedURLChars)
for i != -1 { for i != -1 {
if _, err := w.WriteString(val[:i]); err != nil { if _, err := w.WriteString(val[:i]); err != nil {
return w.String() return err
} }
var esc string var esc string
switch val[i] { switch val[i] {
@ -114,15 +122,15 @@ func escapeUrlComponent(val string) string {
} }
val = val[i+1:] val = val[i+1:]
if _, err := w.WriteString(esc); err != nil { if _, err := w.WriteString(esc); err != nil {
return w.String() return err
} }
i = strings.IndexAny(val, escapedURLChars) i = strings.IndexAny(val, escapedURLChars)
} }
w.WriteString(val) _, err := w.WriteString(val)
return w.String() return err
} }
// Query represents a query // Query represents a single part of the query string, a query param
type Query struct { type Query struct {
Key string Key string
Value string Value string
@ -130,6 +138,10 @@ type Query struct {
} }
func parseQuery(query string) (values []Query, err error) { func parseQuery(query string) (values []Query, err error) {
// This is essentially a copy of parseQuery from
// https://golang.org/src/net/url/url.go but adjusted to build our values
// based on our type, which we need to preserve the ordering of the query
// string
for query != "" { for query != "" {
key := query key := query
if i := strings.IndexAny(key, "&;"); i >= 0 { if i := strings.IndexAny(key, "&;"); i >= 0 {
@ -170,18 +182,18 @@ func parseQuery(query string) (values []Query, err error) {
} }
func encodeQueries(queries []Query) string { func encodeQueries(queries []Query) string {
var b strings.Builder var buff bytes.Buffer
for i, query := range queries { for i, query := range queries {
b.WriteString(url.QueryEscape(query.Key)) buff.WriteString(url.QueryEscape(query.Key))
if query.HasValue { if query.HasValue {
b.WriteString("=") buff.WriteString("=")
b.WriteString(url.QueryEscape(query.Value)) buff.WriteString(url.QueryEscape(query.Value))
} }
if i < len(queries)-1 { if i < len(queries)-1 {
b.WriteString("&") buff.WriteString("&")
} }
} }
return b.String() return buff.String()
} }
func sanitizedURL(val string) (string, error) { func sanitizedURL(val string) (string, error) {
@ -205,45 +217,24 @@ func sanitizedURL(val string) (string, error) {
return u.String(), nil return u.String(), nil
} }
func (p *Policy) writeLinkableBuf(buff *bytes.Buffer, token *html.Token) { // Performs the actual sanitization process.
// do not escape multiple query parameters func (p *Policy) sanitizeWithBuff(r io.Reader) *bytes.Buffer {
tokenBuff := bytes.NewBufferString("") var buff bytes.Buffer
tokenBuff.WriteString("<") if err := p.sanitize(r, &buff); err != nil {
tokenBuff.WriteString(token.Data) return &bytes.Buffer{}
for _, attr := range token.Attr {
tokenBuff.WriteByte(' ')
tokenBuff.WriteString(attr.Key)
tokenBuff.WriteString(`="`)
switch attr.Key {
case "href", "src":
u, ok := p.validURL(attr.Val)
if !ok {
tokenBuff.WriteString(html.EscapeString(attr.Val))
continue
} }
u, err := sanitizedURL(u) return &buff
if err == nil {
tokenBuff.WriteString(u)
} else {
// fallthrough
tokenBuff.WriteString(html.EscapeString(attr.Val))
}
default:
// re-apply
tokenBuff.WriteString(html.EscapeString(attr.Val))
}
tokenBuff.WriteByte('"')
}
if token.Type == html.SelfClosingTagToken {
tokenBuff.WriteString("/")
}
tokenBuff.WriteString(">")
buff.WriteString(tokenBuff.String())
} }
// Performs the actual sanitization process. type asStringWriter struct {
func (p *Policy) sanitize(r io.Reader) *bytes.Buffer { io.Writer
}
func (a *asStringWriter) WriteString(s string) (int, error) {
return a.Write([]byte(s))
}
func (p *Policy) sanitize(r io.Reader, w io.Writer) error {
// It is possible that the developer has created the policy via: // It is possible that the developer has created the policy via:
// p := bluemonday.Policy{} // p := bluemonday.Policy{}
// rather than: // rather than:
@ -252,8 +243,12 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
// would initiliaze the maps, then we need to do that. // would initiliaze the maps, then we need to do that.
p.init() p.init()
buff, ok := w.(stringWriterWriter)
if !ok {
buff = &asStringWriter{w}
}
var ( var (
buff bytes.Buffer
skipElementContent bool skipElementContent bool
skippingElementsCount int64 skippingElementsCount int64
skipClosingTag bool skipClosingTag bool
@ -267,11 +262,11 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
err := tokenizer.Err() err := tokenizer.Err()
if err == io.EOF { if err == io.EOF {
// End of input means end of processing // End of input means end of processing
return &buff return nil
} }
// Raw tokenizer error // Raw tokenizer error
return &bytes.Buffer{} return err
} }
token := tokenizer.Token() token := tokenizer.Token()
@ -289,6 +284,10 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
case html.CommentToken: case html.CommentToken:
// Comments are ignored by default // Comments are ignored by default
if p.allowComments {
// But if allowed then write the comment out as-is
buff.WriteString(token.String())
}
case html.StartTagToken: case html.StartTagToken:
@ -303,14 +302,18 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
skippingElementsCount++ skippingElementsCount++
} }
if p.addSpaces { if p.addSpaces {
buff.WriteString(" ") if _, err := buff.WriteString(" "); err != nil {
return err
}
} }
break break
} }
aps = aa aps = aa
} }
if len(token.Attr) != 0 { if len(token.Attr) != 0 {
token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) token.Attr = escapeAttributes(
p.sanitizeAttrs(token.Data, token.Attr, aps),
)
} }
if len(token.Attr) == 0 { if len(token.Attr) == 0 {
@ -318,18 +321,17 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
skipClosingTag = true skipClosingTag = true
closingTagToSkipStack = append(closingTagToSkipStack, token.Data) closingTagToSkipStack = append(closingTagToSkipStack, token.Data)
if p.addSpaces { if p.addSpaces {
buff.WriteString(" ") if _, err := buff.WriteString(" "); err != nil {
return err
}
} }
break break
} }
} }
if !skipElementContent { if !skipElementContent {
// do not escape multiple query parameters if _, err := buff.WriteString(token.String()); err != nil {
if linkable(token.Data) { return err
p.writeLinkableBuf(&buff, &token)
} else {
buff.WriteString(token.String())
} }
} }
@ -345,7 +347,9 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
skipClosingTag = false skipClosingTag = false
} }
if p.addSpaces { if p.addSpaces {
buff.WriteString(" ") if _, err := buff.WriteString(" "); err != nil {
return err
}
} }
break break
} }
@ -366,14 +370,18 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
} }
if !match { if !match {
if p.addSpaces { if p.addSpaces {
buff.WriteString(" ") if _, err := buff.WriteString(" "); err != nil {
return err
}
} }
break break
} }
} }
if !skipElementContent { if !skipElementContent {
buff.WriteString(token.String()) if _, err := buff.WriteString(token.String()); err != nil {
return err
}
} }
case html.SelfClosingTagToken: case html.SelfClosingTagToken:
@ -383,7 +391,9 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
aa, matched := p.matchRegex(token.Data) aa, matched := p.matchRegex(token.Data)
if !matched { if !matched {
if p.addSpaces && !matched { if p.addSpaces && !matched {
buff.WriteString(" ") if _, err := buff.WriteString(" "); err != nil {
return err
}
} }
break break
} }
@ -391,21 +401,20 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
} }
if len(token.Attr) != 0 { if len(token.Attr) != 0 {
token.Attr = p.sanitizeAttrs(token.Data, token.Attr, aps) token.Attr = escapeAttributes(p.sanitizeAttrs(token.Data, token.Attr, aps))
} }
if len(token.Attr) == 0 && !p.allowNoAttrs(token.Data) { if len(token.Attr) == 0 && !p.allowNoAttrs(token.Data) {
if p.addSpaces { if p.addSpaces {
buff.WriteString(" ") if _, err := buff.WriteString(" "); err != nil {
return err
}
break break
} }
} }
if !skipElementContent { if !skipElementContent {
// do not escape multiple query parameters if _, err := buff.WriteString(token.String()); err != nil {
if linkable(token.Data) { return err
p.writeLinkableBuf(&buff, &token)
} else {
buff.WriteString(token.String())
} }
} }
@ -416,20 +425,26 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
case `script`: case `script`:
// not encouraged, but if a policy allows JavaScript we // not encouraged, but if a policy allows JavaScript we
// should not HTML escape it as that would break the output // should not HTML escape it as that would break the output
buff.WriteString(token.Data) if _, err := buff.WriteString(token.Data); err != nil {
case `style`: return err
}
case "style":
// not encouraged, but if a policy allows CSS styles we // not encouraged, but if a policy allows CSS styles we
// should not HTML escape it as that would break the output // should not HTML escape it as that would break the output
buff.WriteString(token.Data) if _, err := buff.WriteString(token.Data); err != nil {
return err
}
default: default:
// HTML escape the text // HTML escape the text
buff.WriteString(token.String()) if _, err := buff.WriteString(token.String()); err != nil {
return err
}
} }
} }
default: default:
// A token that didn't exist in the html package when we wrote this // A token that didn't exist in the html package when we wrote this
return &bytes.Buffer{} return fmt.Errorf("unknown token: %v", token)
} }
} }
} }
@ -440,7 +455,7 @@ func (p *Policy) sanitize(r io.Reader) *bytes.Buffer {
func (p *Policy) sanitizeAttrs( func (p *Policy) sanitizeAttrs(
elementName string, elementName string,
attrs []html.Attribute, attrs []html.Attribute,
aps map[string]attrPolicy, aps map[string][]attrPolicy,
) []html.Attribute { ) []html.Attribute {
if len(attrs) == 0 { if len(attrs) == 0 {
@ -465,8 +480,9 @@ func (p *Policy) sanitizeAttrs(
} }
// Builds a new attribute slice based on the whether the attribute has been // Builds a new attribute slice based on the whether the attribute has been
// whitelisted explicitly or globally. // allowed explicitly or globally.
cleanAttrs := []html.Attribute{} cleanAttrs := []html.Attribute{}
attrsLoop:
for _, htmlAttr := range attrs { for _, htmlAttr := range attrs {
if p.allowDataAttributes { if p.allowDataAttributes {
// If we see a data attribute, let it through. // If we see a data attribute, let it through.
@ -489,30 +505,35 @@ func (p *Policy) sanitizeAttrs(
} }
// Is there an element specific attribute policy that applies? // Is there an element specific attribute policy that applies?
if ap, ok := aps[htmlAttr.Key]; ok { if apl, ok := aps[htmlAttr.Key]; ok {
for _, ap := range apl {
if ap.regexp != nil { if ap.regexp != nil {
if ap.regexp.MatchString(htmlAttr.Val) { if ap.regexp.MatchString(htmlAttr.Val) {
cleanAttrs = append(cleanAttrs, htmlAttr) cleanAttrs = append(cleanAttrs, htmlAttr)
continue continue attrsLoop
} }
} else { } else {
cleanAttrs = append(cleanAttrs, htmlAttr) cleanAttrs = append(cleanAttrs, htmlAttr)
continue continue attrsLoop
}
} }
} }
// Is there a global attribute policy that applies? // Is there a global attribute policy that applies?
if ap, ok := p.globalAttrs[htmlAttr.Key]; ok { if apl, ok := p.globalAttrs[htmlAttr.Key]; ok {
for _, ap := range apl {
if ap.regexp != nil { if ap.regexp != nil {
if ap.regexp.MatchString(htmlAttr.Val) { if ap.regexp.MatchString(htmlAttr.Val) {
htmlAttr.Val = escapeAttribute(htmlAttr.Val)
cleanAttrs = append(cleanAttrs, htmlAttr) cleanAttrs = append(cleanAttrs, htmlAttr)
} }
} else { } else {
htmlAttr.Val = escapeAttribute(htmlAttr.Val)
cleanAttrs = append(cleanAttrs, htmlAttr) cleanAttrs = append(cleanAttrs, htmlAttr)
} }
} }
} }
}
if len(cleanAttrs) == 0 { if len(cleanAttrs) == 0 {
// If nothing was allowed, let's get out of here // If nothing was allowed, let's get out of here
@ -533,7 +554,7 @@ func (p *Policy) sanitizeAttrs(
tmpAttrs := []html.Attribute{} tmpAttrs := []html.Attribute{}
for _, htmlAttr := range cleanAttrs { for _, htmlAttr := range cleanAttrs {
switch elementName { switch elementName {
case "a", "area", "link": case "a", "area", "base", "link":
if htmlAttr.Key == "href" { if htmlAttr.Key == "href" {
if u, ok := p.validURL(htmlAttr.Val); ok { if u, ok := p.validURL(htmlAttr.Val); ok {
htmlAttr.Val = u htmlAttr.Val = u
@ -542,7 +563,7 @@ func (p *Policy) sanitizeAttrs(
break break
} }
tmpAttrs = append(tmpAttrs, htmlAttr) tmpAttrs = append(tmpAttrs, htmlAttr)
case "blockquote", "q": case "blockquote", "del", "ins", "q":
if htmlAttr.Key == "cite" { if htmlAttr.Key == "cite" {
if u, ok := p.validURL(htmlAttr.Val); ok { if u, ok := p.validURL(htmlAttr.Val); ok {
htmlAttr.Val = u htmlAttr.Val = u
@ -551,7 +572,7 @@ func (p *Policy) sanitizeAttrs(
break break
} }
tmpAttrs = append(tmpAttrs, htmlAttr) tmpAttrs = append(tmpAttrs, htmlAttr)
case "img", "script": case "audio", "embed", "iframe", "img", "script", "source", "track", "video":
if htmlAttr.Key == "src" { if htmlAttr.Key == "src" {
if u, ok := p.validURL(htmlAttr.Val); ok { if u, ok := p.validURL(htmlAttr.Val); ok {
htmlAttr.Val = u htmlAttr.Val = u
@ -576,7 +597,7 @@ func (p *Policy) sanitizeAttrs(
// Add rel="nofollow" if a "href" exists // Add rel="nofollow" if a "href" exists
switch elementName { switch elementName {
case "a", "area", "link": case "a", "area", "base", "link":
var hrefFound bool var hrefFound bool
var externalLink bool var externalLink bool
for _, htmlAttr := range cleanAttrs { for _, htmlAttr := range cleanAttrs {
@ -753,14 +774,14 @@ func (p *Policy) sanitizeAttrs(
func (p *Policy) sanitizeStyles(attr html.Attribute, elementName string) html.Attribute { func (p *Policy) sanitizeStyles(attr html.Attribute, elementName string) html.Attribute {
sps := p.elsAndStyles[elementName] sps := p.elsAndStyles[elementName]
if len(sps) == 0 { if len(sps) == 0 {
sps = map[string]stylePolicy{} sps = map[string][]stylePolicy{}
// check for any matching elements, if we don't already have a policy found // check for any matching elements, if we don't already have a policy found
// if multiple matches are found they will be overwritten, it's best // if multiple matches are found they will be overwritten, it's best
// to not have overlapping matchers // to not have overlapping matchers
for regex, policies := range p.elsMatchingAndStyles { for regex, policies := range p.elsMatchingAndStyles {
if regex.MatchString(elementName) { if regex.MatchString(elementName) {
for k, v := range policies { for k, v := range policies {
sps[k] = v sps[k] = append(sps[k], v...)
} }
} }
} }
@ -778,46 +799,51 @@ func (p *Policy) sanitizeStyles(attr html.Attribute, elementName string) html.At
clean := []string{} clean := []string{}
prefixes := []string{"-webkit-", "-moz-", "-ms-", "-o-", "mso-", "-xv-", "-atsc-", "-wap-", "-khtml-", "prince-", "-ah-", "-hp-", "-ro-", "-rim-", "-tc-"} prefixes := []string{"-webkit-", "-moz-", "-ms-", "-o-", "mso-", "-xv-", "-atsc-", "-wap-", "-khtml-", "prince-", "-ah-", "-hp-", "-ro-", "-rim-", "-tc-"}
decLoop:
for _, dec := range decs { for _, dec := range decs {
addedProperty := false
tempProperty := strings.ToLower(dec.Property) tempProperty := strings.ToLower(dec.Property)
tempValue := removeUnicode(strings.ToLower(dec.Value)) tempValue := removeUnicode(strings.ToLower(dec.Value))
for _, i := range prefixes { for _, i := range prefixes {
tempProperty = strings.TrimPrefix(tempProperty, i) tempProperty = strings.TrimPrefix(tempProperty, i)
} }
if sp, ok := sps[tempProperty]; ok { if spl, ok := sps[tempProperty]; ok {
for _, sp := range spl {
if sp.handler != nil { if sp.handler != nil {
if sp.handler(tempValue) { if sp.handler(tempValue) {
clean = append(clean, dec.Property+": "+dec.Value) clean = append(clean, dec.Property+": "+dec.Value)
addedProperty = true continue decLoop
} }
} else if len(sp.enum) > 0 { } else if len(sp.enum) > 0 {
if stringInSlice(tempValue, sp.enum) { if stringInSlice(tempValue, sp.enum) {
clean = append(clean, dec.Property+": "+dec.Value) clean = append(clean, dec.Property+": "+dec.Value)
addedProperty = true continue decLoop
} }
} else if sp.regexp != nil { } else if sp.regexp != nil {
if sp.regexp.MatchString(tempValue) { if sp.regexp.MatchString(tempValue) {
clean = append(clean, dec.Property+": "+dec.Value) clean = append(clean, dec.Property+": "+dec.Value)
addedProperty = true continue decLoop
}
continue
} }
} }
if sp, ok := p.globalStyles[tempProperty]; ok && !addedProperty { }
}
if spl, ok := p.globalStyles[tempProperty]; ok {
for _, sp := range spl {
if sp.handler != nil { if sp.handler != nil {
if sp.handler(tempValue) { if sp.handler(tempValue) {
clean = append(clean, dec.Property+": "+dec.Value) clean = append(clean, dec.Property+": "+dec.Value)
continue decLoop
} }
} else if len(sp.enum) > 0 { } else if len(sp.enum) > 0 {
if stringInSlice(tempValue, sp.enum) { if stringInSlice(tempValue, sp.enum) {
clean = append(clean, dec.Property+": "+dec.Value) clean = append(clean, dec.Property+": "+dec.Value)
continue decLoop
} }
} else if sp.regexp != nil { } else if sp.regexp != nil {
if sp.regexp.MatchString(tempValue) { if sp.regexp.MatchString(tempValue) {
clean = append(clean, dec.Property+": "+dec.Value) clean = append(clean, dec.Property+": "+dec.Value)
continue decLoop
}
} }
continue
} }
} }
} }
@ -848,13 +874,30 @@ func (p *Policy) validURL(rawurl string) (string, bool) {
rawurl = strings.TrimSpace(rawurl) rawurl = strings.TrimSpace(rawurl)
// URLs cannot contain whitespace, unless it is a data-uri // URLs cannot contain whitespace, unless it is a data-uri
if (strings.Contains(rawurl, " ") || if strings.Contains(rawurl, " ") ||
strings.Contains(rawurl, "\t") || strings.Contains(rawurl, "\t") ||
strings.Contains(rawurl, "\n")) && strings.Contains(rawurl, "\n") {
!strings.HasPrefix(rawurl, `data:`) { if !strings.HasPrefix(rawurl, `data:`) {
return "", false return "", false
} }
// Remove \r and \n from base64 encoded data to pass url.Parse.
matched := dataURIbase64Prefix.FindString(rawurl)
if matched != "" {
rawurl = matched + strings.Replace(
strings.Replace(
rawurl[len(matched):],
"\r",
"",
-1,
),
"\n",
"",
-1,
)
}
}
// URLs are valid if they parse // URLs are valid if they parse
u, err := url.Parse(rawurl) u, err := url.Parse(rawurl)
if err != nil { if err != nil {
@ -863,16 +906,21 @@ func (p *Policy) validURL(rawurl string) (string, bool) {
if u.Scheme != "" { if u.Scheme != "" {
urlPolicy, ok := p.allowURLSchemes[u.Scheme] urlPolicies, ok := p.allowURLSchemes[u.Scheme]
if !ok { if !ok {
return "", false return "", false
} }
if urlPolicy == nil || urlPolicy(u) == true { if len(urlPolicies) == 0 {
return u.String(), true return u.String(), true
} }
for _, urlPolicy := range urlPolicies {
if urlPolicy(u) == true {
return u.String(), true
}
}
return "", false return "", false
} }
@ -890,7 +938,14 @@ func (p *Policy) validURL(rawurl string) (string, bool) {
func linkable(elementName string) bool { func linkable(elementName string) bool {
switch elementName { switch elementName {
case "a", "area", "blockquote", "img", "link", "script": case "a", "area", "base", "link":
// elements that allow .href
return true
case "blockquote", "del", "ins", "q":
// elements that allow .cite
return true
case "audio", "embed", "iframe", "img", "input", "script", "track", "video":
// elements that allow .src
return true return true
default: default:
return false return false
@ -957,14 +1012,14 @@ func removeUnicode(value string) string {
return substitutedValue return substitutedValue
} }
func (p *Policy) matchRegex(elementName string) (map[string]attrPolicy, bool) { func (p *Policy) matchRegex(elementName string) (map[string][]attrPolicy, bool) {
aps := make(map[string]attrPolicy, 0) aps := make(map[string][]attrPolicy, 0)
matched := false matched := false
for regex, attrs := range p.elsMatchingAndAttrs { for regex, attrs := range p.elsMatchingAndAttrs {
if regex.MatchString(elementName) { if regex.MatchString(elementName) {
matched = true matched = true
for k, v := range attrs { for k, v := range attrs {
aps[k] = v aps[k] = append(aps[k], v...)
} }
} }
} }
@ -989,3 +1044,18 @@ func normaliseElementName(str string) string {
`"`, `"`,
) )
} }
func escapeAttributes(attrs []html.Attribute) []html.Attribute {
escapedAttrs := []html.Attribute{}
for _, attr := range attrs {
attr.Val = escapeAttribute(attr.Val)
escapedAttrs = append(escapedAttrs, attr)
}
return escapedAttrs
}
func escapeAttribute(val string) string {
val = strings.Replace(val, string([]rune{'\u00A0'}), `&nbsp;`, -1)
val = strings.Replace(val, `"`, `&quot;`, -1)
return val
}

10
vendor/github.com/microcosm-cc/bluemonday/stringwriterwriter_go1.12.go generated vendored Normal file
View file

@ -0,0 +1,10 @@
// +build go1.12
package bluemonday
import "io"
type stringWriterWriter interface {
io.Writer
io.StringWriter
}

14
vendor/github.com/microcosm-cc/bluemonday/stringwriterwriter_ltgo1.12.go generated vendored Normal file
View file

@ -0,0 +1,14 @@
// +build go1.1,!go1.12
package bluemonday
import "io"
type stringWriterWriter interface {
io.Writer
StringWriter
}
type StringWriter interface {
WriteString(s string) (n int, err error)
}

24
vendor/golang.org/x/net/html/parse.go generated vendored
View file

@ -663,6 +663,24 @@ func inHeadIM(p *parser) bool {
// Ignore the token. // Ignore the token.
return true return true
case a.Template: case a.Template:
// TODO: remove this divergence from the HTML5 spec.
//
// We don't handle all of the corner cases when mixing foreign
// content (i.e. <math> or <svg>) with <template>. Without this
// early return, we can get into an infinite loop, possibly because
// of the "TODO... further divergence" a little below.
//
// As a workaround, if we are mixing foreign content and templates,
// just ignore the rest of the HTML. Foreign content is rare and a
// relatively old HTML feature. Templates are also rare and a
// relatively new HTML feature. Their combination is very rare.
for _, e := range p.oe {
if e.Namespace != "" {
p.im = ignoreTheRemainingTokens
return true
}
}
p.addElement() p.addElement()
p.afe = append(p.afe, &scopeMarker) p.afe = append(p.afe, &scopeMarker)
p.framesetOK = false p.framesetOK = false
@ -683,7 +701,7 @@ func inHeadIM(p *parser) bool {
if !p.oe.contains(a.Template) { if !p.oe.contains(a.Template) {
return true return true
} }
// TODO: remove this divergence from the HTML5 spec. // TODO: remove this further divergence from the HTML5 spec.
// //
// See https://bugs.chromium.org/p/chromium/issues/detail?id=829668 // See https://bugs.chromium.org/p/chromium/issues/detail?id=829668
p.generateImpliedEndTags() p.generateImpliedEndTags()
@ -2127,6 +2145,10 @@ func afterAfterFramesetIM(p *parser) bool {
return true return true
} }
func ignoreTheRemainingTokens(p *parser) bool {
return true
}
const whitespaceOrNUL = whitespace + "\x00" const whitespaceOrNUL = whitespace + "\x00"
// Section 12.2.6.5 // Section 12.2.6.5

10
vendor/golang.org/x/net/http/httpguts/httplex.go generated vendored
View file

@ -137,11 +137,13 @@ func trimOWS(x string) string {
// contains token amongst its comma-separated tokens, ASCII // contains token amongst its comma-separated tokens, ASCII
// case-insensitively. // case-insensitively.
func headerValueContainsToken(v string, token string) bool { func headerValueContainsToken(v string, token string) bool {
v = trimOWS(v) for comma := strings.IndexByte(v, ','); comma != -1; comma = strings.IndexByte(v, ',') {
if comma := strings.IndexByte(v, ','); comma != -1 { if tokenEqual(trimOWS(v[:comma]), token) {
return tokenEqual(trimOWS(v[:comma]), token) || headerValueContainsToken(v[comma+1:], token) return true
} }
return tokenEqual(v, token) v = v[comma+1:]
}
return tokenEqual(trimOWS(v), token)
} }
// lowerASCII returns the ASCII lowercase version of b. // lowerASCII returns the ASCII lowercase version of b.

81
vendor/golang.org/x/net/idna/idna10.0.0.go generated vendored
View file

@ -67,15 +67,14 @@ func Transitional(transitional bool) Option {
// VerifyDNSLength sets whether a Profile should fail if any of the IDN parts // VerifyDNSLength sets whether a Profile should fail if any of the IDN parts
// are longer than allowed by the RFC. // are longer than allowed by the RFC.
//
// This option corresponds to the VerifyDnsLength flag in UTS #46.
func VerifyDNSLength(verify bool) Option { func VerifyDNSLength(verify bool) Option {
return func(o *options) { o.verifyDNSLength = verify } return func(o *options) { o.verifyDNSLength = verify }
} }
// RemoveLeadingDots removes leading label separators. Leading runes that map to // RemoveLeadingDots removes leading label separators. Leading runes that map to
// dots, such as U+3002 IDEOGRAPHIC FULL STOP, are removed as well. // dots, such as U+3002 IDEOGRAPHIC FULL STOP, are removed as well.
//
// This is the behavior suggested by the UTS #46 and is adopted by some
// browsers.
func RemoveLeadingDots(remove bool) Option { func RemoveLeadingDots(remove bool) Option {
return func(o *options) { o.removeLeadingDots = remove } return func(o *options) { o.removeLeadingDots = remove }
} }
@ -83,6 +82,8 @@ func RemoveLeadingDots(remove bool) Option {
// ValidateLabels sets whether to check the mandatory label validation criteria // ValidateLabels sets whether to check the mandatory label validation criteria
// as defined in Section 5.4 of RFC 5891. This includes testing for correct use // as defined in Section 5.4 of RFC 5891. This includes testing for correct use
// of hyphens ('-'), normalization, validity of runes, and the context rules. // of hyphens ('-'), normalization, validity of runes, and the context rules.
// In particular, ValidateLabels also sets the CheckHyphens and CheckJoiners flags
// in UTS #46.
func ValidateLabels(enable bool) Option { func ValidateLabels(enable bool) Option {
return func(o *options) { return func(o *options) {
// Don't override existing mappings, but set one that at least checks // Don't override existing mappings, but set one that at least checks
@ -91,25 +92,48 @@ func ValidateLabels(enable bool) Option {
o.mapping = normalize o.mapping = normalize
} }
o.trie = trie o.trie = trie
o.validateLabels = enable o.checkJoiners = enable
o.checkHyphens = enable
if enable {
o.fromPuny = validateFromPunycode o.fromPuny = validateFromPunycode
} else {
o.fromPuny = nil
}
}
}
// CheckHyphens sets whether to check for correct use of hyphens ('-') in
// labels. Most web browsers do not have this option set, since labels such as
// "r3---sn-apo3qvuoxuxbt-j5pe" are in common use.
//
// This option corresponds to the CheckHyphens flag in UTS #46.
func CheckHyphens(enable bool) Option {
return func(o *options) { o.checkHyphens = enable }
}
// CheckJoiners sets whether to check the ContextJ rules as defined in Appendix
// A of RFC 5892, concerning the use of joiner runes.
//
// This option corresponds to the CheckJoiners flag in UTS #46.
func CheckJoiners(enable bool) Option {
return func(o *options) {
o.trie = trie
o.checkJoiners = enable
} }
} }
// StrictDomainName limits the set of permissible ASCII characters to those // StrictDomainName limits the set of permissible ASCII characters to those
// allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the // allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the
// hyphen). This is set by default for MapForLookup and ValidateForRegistration. // hyphen). This is set by default for MapForLookup and ValidateForRegistration,
// but is only useful if ValidateLabels is set.
// //
// This option is useful, for instance, for browsers that allow characters // This option is useful, for instance, for browsers that allow characters
// outside this range, for example a '_' (U+005F LOW LINE). See // outside this range, for example a '_' (U+005F LOW LINE). See
// http://www.rfc-editor.org/std/std3.txt for more details This option // http://www.rfc-editor.org/std/std3.txt for more details.
// corresponds to the UseSTD3ASCIIRules option in UTS #46. //
// This option corresponds to the UseSTD3ASCIIRules flag in UTS #46.
func StrictDomainName(use bool) Option { func StrictDomainName(use bool) Option {
return func(o *options) { return func(o *options) { o.useSTD3Rules = use }
o.trie = trie
o.useSTD3Rules = use
o.fromPuny = validateFromPunycode
}
} }
// NOTE: the following options pull in tables. The tables should not be linked // NOTE: the following options pull in tables. The tables should not be linked
@ -117,6 +141,8 @@ func StrictDomainName(use bool) Option {
// BidiRule enables the Bidi rule as defined in RFC 5893. Any application // BidiRule enables the Bidi rule as defined in RFC 5893. Any application
// that relies on proper validation of labels should include this rule. // that relies on proper validation of labels should include this rule.
//
// This option corresponds to the CheckBidi flag in UTS #46.
func BidiRule() Option { func BidiRule() Option {
return func(o *options) { o.bidirule = bidirule.ValidString } return func(o *options) { o.bidirule = bidirule.ValidString }
} }
@ -152,7 +178,8 @@ func MapForLookup() Option {
type options struct { type options struct {
transitional bool transitional bool
useSTD3Rules bool useSTD3Rules bool
validateLabels bool checkHyphens bool
checkJoiners bool
verifyDNSLength bool verifyDNSLength bool
removeLeadingDots bool removeLeadingDots bool
@ -225,8 +252,11 @@ func (p *Profile) String() string {
if p.useSTD3Rules { if p.useSTD3Rules {
s += ":UseSTD3Rules" s += ":UseSTD3Rules"
} }
if p.validateLabels { if p.checkHyphens {
s += ":ValidateLabels" s += ":CheckHyphens"
}
if p.checkJoiners {
s += ":CheckJoiners"
} }
if p.verifyDNSLength { if p.verifyDNSLength {
s += ":VerifyDNSLength" s += ":VerifyDNSLength"
@ -256,7 +286,8 @@ var (
lookup = &Profile{options{ lookup = &Profile{options{
transitional: true, transitional: true,
useSTD3Rules: true, useSTD3Rules: true,
validateLabels: true, checkHyphens: true,
checkJoiners: true,
trie: trie, trie: trie,
fromPuny: validateFromPunycode, fromPuny: validateFromPunycode,
mapping: validateAndMap, mapping: validateAndMap,
@ -264,7 +295,8 @@ var (
}} }}
display = &Profile{options{ display = &Profile{options{
useSTD3Rules: true, useSTD3Rules: true,
validateLabels: true, checkHyphens: true,
checkJoiners: true,
trie: trie, trie: trie,
fromPuny: validateFromPunycode, fromPuny: validateFromPunycode,
mapping: validateAndMap, mapping: validateAndMap,
@ -272,8 +304,9 @@ var (
}} }}
registration = &Profile{options{ registration = &Profile{options{
useSTD3Rules: true, useSTD3Rules: true,
validateLabels: true,
verifyDNSLength: true, verifyDNSLength: true,
checkHyphens: true,
checkJoiners: true,
trie: trie, trie: trie,
fromPuny: validateFromPunycode, fromPuny: validateFromPunycode,
mapping: validateRegistration, mapping: validateRegistration,
@ -340,7 +373,7 @@ func (p *Profile) process(s string, toASCII bool) (string, error) {
} }
isBidi = isBidi || bidirule.DirectionString(u) != bidi.LeftToRight isBidi = isBidi || bidirule.DirectionString(u) != bidi.LeftToRight
labels.set(u) labels.set(u)
if err == nil && p.validateLabels { if err == nil && p.fromPuny != nil {
err = p.fromPuny(p, u) err = p.fromPuny(p, u)
} }
if err == nil { if err == nil {
@ -681,16 +714,18 @@ func (p *Profile) validateLabel(s string) (err error) {
} }
return nil return nil
} }
if !p.validateLabels { if p.checkHyphens {
return nil
}
trie := p.trie // p.validateLabels is only set if trie is set.
if len(s) > 4 && s[2] == '-' && s[3] == '-' { if len(s) > 4 && s[2] == '-' && s[3] == '-' {
return &labelError{s, "V2"} return &labelError{s, "V2"}
} }
if s[0] == '-' || s[len(s)-1] == '-' { if s[0] == '-' || s[len(s)-1] == '-' {
return &labelError{s, "V3"} return &labelError{s, "V3"}
} }
}
if !p.checkJoiners {
return nil
}
trie := p.trie // p.checkJoiners is only set if trie is set.
// TODO: merge the use of this in the trie. // TODO: merge the use of this in the trie.
v, sz := trie.lookupString(s) v, sz := trie.lookupString(s)
x := info(v) x := info(v)

83
vendor/golang.org/x/net/idna/idna9.0.0.go generated vendored
View file

@ -66,15 +66,14 @@ func Transitional(transitional bool) Option {
// VerifyDNSLength sets whether a Profile should fail if any of the IDN parts // VerifyDNSLength sets whether a Profile should fail if any of the IDN parts
// are longer than allowed by the RFC. // are longer than allowed by the RFC.
//
// This option corresponds to the VerifyDnsLength flag in UTS #46.
func VerifyDNSLength(verify bool) Option { func VerifyDNSLength(verify bool) Option {
return func(o *options) { o.verifyDNSLength = verify } return func(o *options) { o.verifyDNSLength = verify }
} }
// RemoveLeadingDots removes leading label separators. Leading runes that map to // RemoveLeadingDots removes leading label separators. Leading runes that map to
// dots, such as U+3002 IDEOGRAPHIC FULL STOP, are removed as well. // dots, such as U+3002 IDEOGRAPHIC FULL STOP, are removed as well.
//
// This is the behavior suggested by the UTS #46 and is adopted by some
// browsers.
func RemoveLeadingDots(remove bool) Option { func RemoveLeadingDots(remove bool) Option {
return func(o *options) { o.removeLeadingDots = remove } return func(o *options) { o.removeLeadingDots = remove }
} }
@ -82,6 +81,8 @@ func RemoveLeadingDots(remove bool) Option {
// ValidateLabels sets whether to check the mandatory label validation criteria // ValidateLabels sets whether to check the mandatory label validation criteria
// as defined in Section 5.4 of RFC 5891. This includes testing for correct use // as defined in Section 5.4 of RFC 5891. This includes testing for correct use
// of hyphens ('-'), normalization, validity of runes, and the context rules. // of hyphens ('-'), normalization, validity of runes, and the context rules.
// In particular, ValidateLabels also sets the CheckHyphens and CheckJoiners flags
// in UTS #46.
func ValidateLabels(enable bool) Option { func ValidateLabels(enable bool) Option {
return func(o *options) { return func(o *options) {
// Don't override existing mappings, but set one that at least checks // Don't override existing mappings, but set one that at least checks
@ -90,25 +91,48 @@ func ValidateLabels(enable bool) Option {
o.mapping = normalize o.mapping = normalize
} }
o.trie = trie o.trie = trie
o.validateLabels = enable o.checkJoiners = enable
o.checkHyphens = enable
if enable {
o.fromPuny = validateFromPunycode o.fromPuny = validateFromPunycode
} else {
o.fromPuny = nil
}
}
}
// CheckHyphens sets whether to check for correct use of hyphens ('-') in
// labels. Most web browsers do not have this option set, since labels such as
// "r3---sn-apo3qvuoxuxbt-j5pe" are in common use.
//
// This option corresponds to the CheckHyphens flag in UTS #46.
func CheckHyphens(enable bool) Option {
return func(o *options) { o.checkHyphens = enable }
}
// CheckJoiners sets whether to check the ContextJ rules as defined in Appendix
// A of RFC 5892, concerning the use of joiner runes.
//
// This option corresponds to the CheckJoiners flag in UTS #46.
func CheckJoiners(enable bool) Option {
return func(o *options) {
o.trie = trie
o.checkJoiners = enable
} }
} }
// StrictDomainName limits the set of permissable ASCII characters to those // StrictDomainName limits the set of permissable ASCII characters to those
// allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the // allowed in domain names as defined in RFC 1034 (A-Z, a-z, 0-9 and the
// hyphen). This is set by default for MapForLookup and ValidateForRegistration. // hyphen). This is set by default for MapForLookup and ValidateForRegistration,
// but is only useful if ValidateLabels is set.
// //
// This option is useful, for instance, for browsers that allow characters // This option is useful, for instance, for browsers that allow characters
// outside this range, for example a '_' (U+005F LOW LINE). See // outside this range, for example a '_' (U+005F LOW LINE). See
// http://www.rfc-editor.org/std/std3.txt for more details This option // http://www.rfc-editor.org/std/std3.txt for more details.
// corresponds to the UseSTD3ASCIIRules option in UTS #46. //
// This option corresponds to the UseSTD3ASCIIRules flag in UTS #46.
func StrictDomainName(use bool) Option { func StrictDomainName(use bool) Option {
return func(o *options) { return func(o *options) { o.useSTD3Rules = use }
o.trie = trie
o.useSTD3Rules = use
o.fromPuny = validateFromPunycode
}
} }
// NOTE: the following options pull in tables. The tables should not be linked // NOTE: the following options pull in tables. The tables should not be linked
@ -116,6 +140,8 @@ func StrictDomainName(use bool) Option {
// BidiRule enables the Bidi rule as defined in RFC 5893. Any application // BidiRule enables the Bidi rule as defined in RFC 5893. Any application
// that relies on proper validation of labels should include this rule. // that relies on proper validation of labels should include this rule.
//
// This option corresponds to the CheckBidi flag in UTS #46.
func BidiRule() Option { func BidiRule() Option {
return func(o *options) { o.bidirule = bidirule.ValidString } return func(o *options) { o.bidirule = bidirule.ValidString }
} }
@ -152,7 +178,8 @@ func MapForLookup() Option {
type options struct { type options struct {
transitional bool transitional bool
useSTD3Rules bool useSTD3Rules bool
validateLabels bool checkHyphens bool
checkJoiners bool
verifyDNSLength bool verifyDNSLength bool
removeLeadingDots bool removeLeadingDots bool
@ -225,8 +252,11 @@ func (p *Profile) String() string {
if p.useSTD3Rules { if p.useSTD3Rules {
s += ":UseSTD3Rules" s += ":UseSTD3Rules"
} }
if p.validateLabels { if p.checkHyphens {
s += ":ValidateLabels" s += ":CheckHyphens"
}
if p.checkJoiners {
s += ":CheckJoiners"
} }
if p.verifyDNSLength { if p.verifyDNSLength {
s += ":VerifyDNSLength" s += ":VerifyDNSLength"
@ -255,9 +285,10 @@ var (
punycode = &Profile{} punycode = &Profile{}
lookup = &Profile{options{ lookup = &Profile{options{
transitional: true, transitional: true,
useSTD3Rules: true,
validateLabels: true,
removeLeadingDots: true, removeLeadingDots: true,
useSTD3Rules: true,
checkHyphens: true,
checkJoiners: true,
trie: trie, trie: trie,
fromPuny: validateFromPunycode, fromPuny: validateFromPunycode,
mapping: validateAndMap, mapping: validateAndMap,
@ -265,8 +296,9 @@ var (
}} }}
display = &Profile{options{ display = &Profile{options{
useSTD3Rules: true, useSTD3Rules: true,
validateLabels: true,
removeLeadingDots: true, removeLeadingDots: true,
checkHyphens: true,
checkJoiners: true,
trie: trie, trie: trie,
fromPuny: validateFromPunycode, fromPuny: validateFromPunycode,
mapping: validateAndMap, mapping: validateAndMap,
@ -274,8 +306,9 @@ var (
}} }}
registration = &Profile{options{ registration = &Profile{options{
useSTD3Rules: true, useSTD3Rules: true,
validateLabels: true,
verifyDNSLength: true, verifyDNSLength: true,
checkHyphens: true,
checkJoiners: true,
trie: trie, trie: trie,
fromPuny: validateFromPunycode, fromPuny: validateFromPunycode,
mapping: validateRegistration, mapping: validateRegistration,
@ -339,7 +372,7 @@ func (p *Profile) process(s string, toASCII bool) (string, error) {
continue continue
} }
labels.set(u) labels.set(u)
if err == nil && p.validateLabels { if err == nil && p.fromPuny != nil {
err = p.fromPuny(p, u) err = p.fromPuny(p, u)
} }
if err == nil { if err == nil {
@ -629,16 +662,18 @@ func (p *Profile) validateLabel(s string) error {
if p.bidirule != nil && !p.bidirule(s) { if p.bidirule != nil && !p.bidirule(s) {
return &labelError{s, "B"} return &labelError{s, "B"}
} }
if !p.validateLabels { if p.checkHyphens {
return nil
}
trie := p.trie // p.validateLabels is only set if trie is set.
if len(s) > 4 && s[2] == '-' && s[3] == '-' { if len(s) > 4 && s[2] == '-' && s[3] == '-' {
return &labelError{s, "V2"} return &labelError{s, "V2"}
} }
if s[0] == '-' || s[len(s)-1] == '-' { if s[0] == '-' || s[len(s)-1] == '-' {
return &labelError{s, "V3"} return &labelError{s, "V3"}
} }
}
if !p.checkJoiners {
return nil
}
trie := p.trie // p.checkJoiners is only set if trie is set.
// TODO: merge the use of this in the trie. // TODO: merge the use of this in the trie.
v, sz := trie.lookupString(s) v, sz := trie.lookupString(s)
x := info(v) x := info(v)

4
vendor/golang.org/x/net/internal/socket/cmsghdr_linux_32bit.go generated vendored
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build (arm || mips || mipsle || 386) && linux //go:build (arm || mips || mipsle || 386 || ppc) && linux
// +build arm mips mipsle 386 // +build arm mips mipsle 386 ppc
// +build linux // +build linux
package socket package socket

4
vendor/golang.org/x/net/internal/socket/iovec_32bit.go generated vendored
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build (arm || mips || mipsle || 386) && (darwin || dragonfly || freebsd || linux || netbsd || openbsd) //go:build (arm || mips || mipsle || 386 || ppc) && (darwin || dragonfly || freebsd || linux || netbsd || openbsd)
// +build arm mips mipsle 386 // +build arm mips mipsle 386 ppc
// +build darwin dragonfly freebsd linux netbsd openbsd // +build darwin dragonfly freebsd linux netbsd openbsd
package socket package socket

103
vendor/golang.org/x/net/internal/socket/mmsghdr_unix.go generated vendored
View file

@ -7,25 +7,13 @@
package socket package socket
import "net" import (
"net"
"sync"
)
type mmsghdrs []mmsghdr type mmsghdrs []mmsghdr
func (hs mmsghdrs) pack(ms []Message, parseFn func([]byte, string) (net.Addr, error), marshalFn func(net.Addr) []byte) error {
for i := range hs {
vs := make([]iovec, len(ms[i].Buffers))
var sa []byte
if parseFn != nil {
sa = make([]byte, sizeofSockaddrInet6)
}
if marshalFn != nil {
sa = marshalFn(ms[i].Addr)
}
hs[i].Hdr.pack(vs, ms[i].Buffers, ms[i].OOB, sa)
}
return nil
}
func (hs mmsghdrs) unpack(ms []Message, parseFn func([]byte, string) (net.Addr, error), hint string) error { func (hs mmsghdrs) unpack(ms []Message, parseFn func([]byte, string) (net.Addr, error), hint string) error {
for i := range hs { for i := range hs {
ms[i].N = int(hs[i].Len) ms[i].N = int(hs[i].Len)
@ -41,3 +29,86 @@ func (hs mmsghdrs) unpack(ms []Message, parseFn func([]byte, string) (net.Addr,
} }
return nil return nil
} }
// mmsghdrsPacker packs Message-slices into mmsghdrs (re-)using pre-allocated buffers.
type mmsghdrsPacker struct {
// hs are the pre-allocated mmsghdrs.
hs mmsghdrs
// sockaddrs is the pre-allocated buffer for the Hdr.Name buffers.
// We use one large buffer for all messages and slice it up.
sockaddrs []byte
// vs are the pre-allocated iovecs.
// We allocate one large buffer for all messages and slice it up. This allows to reuse the buffer
// if the number of buffers per message is distributed differently between calls.
vs []iovec
}
func (p *mmsghdrsPacker) prepare(ms []Message) {
n := len(ms)
if n <= cap(p.hs) {
p.hs = p.hs[:n]
} else {
p.hs = make(mmsghdrs, n)
}
if n*sizeofSockaddrInet6 <= cap(p.sockaddrs) {
p.sockaddrs = p.sockaddrs[:n*sizeofSockaddrInet6]
} else {
p.sockaddrs = make([]byte, n*sizeofSockaddrInet6)
}
nb := 0
for _, m := range ms {
nb += len(m.Buffers)
}
if nb <= cap(p.vs) {
p.vs = p.vs[:nb]
} else {
p.vs = make([]iovec, nb)
}
}
func (p *mmsghdrsPacker) pack(ms []Message, parseFn func([]byte, string) (net.Addr, error), marshalFn func(net.Addr, []byte) int) mmsghdrs {
p.prepare(ms)
hs := p.hs
vsRest := p.vs
saRest := p.sockaddrs
for i := range hs {
nvs := len(ms[i].Buffers)
vs := vsRest[:nvs]
vsRest = vsRest[nvs:]
var sa []byte
if parseFn != nil {
sa = saRest[:sizeofSockaddrInet6]
saRest = saRest[sizeofSockaddrInet6:]
} else if marshalFn != nil {
n := marshalFn(ms[i].Addr, saRest)
if n > 0 {
sa = saRest[:n]
saRest = saRest[n:]
}
}
hs[i].Hdr.pack(vs, ms[i].Buffers, ms[i].OOB, sa)
}
return hs
}
var defaultMmsghdrsPool = mmsghdrsPool{
p: sync.Pool{
New: func() interface{} {
return new(mmsghdrsPacker)
},
},
}
type mmsghdrsPool struct {
p sync.Pool
}
func (p *mmsghdrsPool) Get() *mmsghdrsPacker {
return p.p.Get().(*mmsghdrsPacker)
}
func (p *mmsghdrsPool) Put(packer *mmsghdrsPacker) {
p.p.Put(packer)
}

3
vendor/golang.org/x/net/internal/socket/msghdr_linux.go generated vendored
View file

@ -17,6 +17,9 @@ func (h *msghdr) pack(vs []iovec, bs [][]byte, oob []byte, sa []byte) {
if sa != nil { if sa != nil {
h.Name = (*byte)(unsafe.Pointer(&sa[0])) h.Name = (*byte)(unsafe.Pointer(&sa[0]))
h.Namelen = uint32(len(sa)) h.Namelen = uint32(len(sa))
} else {
h.Name = nil
h.Namelen = 0
} }
} }

4
vendor/golang.org/x/net/internal/socket/msghdr_linux_32bit.go generated vendored
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build (arm || mips || mipsle || 386) && linux //go:build (arm || mips || mipsle || 386 || ppc) && linux
// +build arm mips mipsle 386 // +build arm mips mipsle 386 ppc
// +build linux // +build linux
package socket package socket

16
vendor/golang.org/x/net/internal/socket/rawconn_mmsg.go generated vendored
View file

@ -17,14 +17,13 @@ func (c *Conn) recvMsgs(ms []Message, flags int) (int, error) {
for i := range ms { for i := range ms {
ms[i].raceWrite() ms[i].raceWrite()
} }
hs := make(mmsghdrs, len(ms)) packer := defaultMmsghdrsPool.Get()
defer defaultMmsghdrsPool.Put(packer)
var parseFn func([]byte, string) (net.Addr, error) var parseFn func([]byte, string) (net.Addr, error)
if c.network != "tcp" { if c.network != "tcp" {
parseFn = parseInetAddr parseFn = parseInetAddr
} }
if err := hs.pack(ms, parseFn, nil); err != nil { hs := packer.pack(ms, parseFn, nil)
return 0, err
}
var operr error var operr error
var n int var n int
fn := func(s uintptr) bool { fn := func(s uintptr) bool {
@ -50,14 +49,13 @@ func (c *Conn) sendMsgs(ms []Message, flags int) (int, error) {
for i := range ms { for i := range ms {
ms[i].raceRead() ms[i].raceRead()
} }
hs := make(mmsghdrs, len(ms)) packer := defaultMmsghdrsPool.Get()
var marshalFn func(net.Addr) []byte defer defaultMmsghdrsPool.Put(packer)
var marshalFn func(net.Addr, []byte) int
if c.network != "tcp" { if c.network != "tcp" {
marshalFn = marshalInetAddr marshalFn = marshalInetAddr
} }
if err := hs.pack(ms, nil, marshalFn); err != nil { hs := packer.pack(ms, nil, marshalFn)
return 0, err
}
var operr error var operr error
var n int var n int
fn := func(s uintptr) bool { fn := func(s uintptr) bool {

4
vendor/golang.org/x/net/internal/socket/rawconn_msg.go generated vendored
View file

@ -55,7 +55,9 @@ func (c *Conn) sendMsg(m *Message, flags int) error {
vs := make([]iovec, len(m.Buffers)) vs := make([]iovec, len(m.Buffers))
var sa []byte var sa []byte
if m.Addr != nil { if m.Addr != nil {
sa = marshalInetAddr(m.Addr) var a [sizeofSockaddrInet6]byte
n := marshalInetAddr(m.Addr, a[:])
sa = a[:n]
} }
h.pack(vs, m.Buffers, m.OOB, sa) h.pack(vs, m.Buffers, m.OOB, sa)
var operr error var operr error

7
vendor/golang.org/x/net/internal/socket/sys_const_unix.go generated vendored
View file

@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
//go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris //go:build aix || darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris || zos
// +build aix darwin dragonfly freebsd linux netbsd openbsd solaris // +build aix darwin dragonfly freebsd linux netbsd openbsd solaris zos
package socket package socket
@ -15,4 +15,7 @@ const (
sysAF_INET6 = unix.AF_INET6 sysAF_INET6 = unix.AF_INET6
sysSOCK_RAW = unix.SOCK_RAW sysSOCK_RAW = unix.SOCK_RAW
sizeofSockaddrInet4 = unix.SizeofSockaddrInet4
sizeofSockaddrInet6 = unix.SizeofSockaddrInet6
) )

18
vendor/golang.org/x/net/internal/socket/sys_const_zos.go generated vendored
View file

@ -1,18 +0,0 @@
// Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build zos
// +build zos
package socket
import "syscall"
const (
sysAF_UNSPEC = syscall.AF_UNSPEC
sysAF_INET = syscall.AF_INET
sysAF_INET6 = syscall.AF_INET6
sysSOCK_RAW = syscall.SOCK_RAW
)

10
vendor/golang.org/x/net/internal/socket/sys_linux_ppc.go generated vendored Normal file
View file

@ -0,0 +1,10 @@
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
package socket
const (
sysRECVMMSG = 0x157
sysSENDMMSG = 0x15d
)

27
vendor/golang.org/x/net/internal/socket/sys_posix.go generated vendored
View file

@ -17,35 +17,36 @@ import (
"time" "time"
) )
func marshalInetAddr(a net.Addr) []byte { // marshalInetAddr writes a in sockaddr format into the buffer b.
// The buffer must be sufficiently large (sizeofSockaddrInet4/6).
// Returns the number of bytes written.
func marshalInetAddr(a net.Addr, b []byte) int {
switch a := a.(type) { switch a := a.(type) {
case *net.TCPAddr: case *net.TCPAddr:
return marshalSockaddr(a.IP, a.Port, a.Zone) return marshalSockaddr(a.IP, a.Port, a.Zone, b)
case *net.UDPAddr: case *net.UDPAddr:
return marshalSockaddr(a.IP, a.Port, a.Zone) return marshalSockaddr(a.IP, a.Port, a.Zone, b)
case *net.IPAddr: case *net.IPAddr:
return marshalSockaddr(a.IP, 0, a.Zone) return marshalSockaddr(a.IP, 0, a.Zone, b)
default: default:
return nil return 0
} }
} }
func marshalSockaddr(ip net.IP, port int, zone string) []byte { func marshalSockaddr(ip net.IP, port int, zone string, b []byte) int {
if ip4 := ip.To4(); ip4 != nil { if ip4 := ip.To4(); ip4 != nil {
b := make([]byte, sizeofSockaddrInet)
switch runtime.GOOS { switch runtime.GOOS {
case "android", "illumos", "linux", "solaris", "windows": case "android", "illumos", "linux", "solaris", "windows":
NativeEndian.PutUint16(b[:2], uint16(sysAF_INET)) NativeEndian.PutUint16(b[:2], uint16(sysAF_INET))
default: default:
b[0] = sizeofSockaddrInet b[0] = sizeofSockaddrInet4
b[1] = sysAF_INET b[1] = sysAF_INET
} }
binary.BigEndian.PutUint16(b[2:4], uint16(port)) binary.BigEndian.PutUint16(b[2:4], uint16(port))
copy(b[4:8], ip4) copy(b[4:8], ip4)
return b return sizeofSockaddrInet4
} }
if ip6 := ip.To16(); ip6 != nil && ip.To4() == nil { if ip6 := ip.To16(); ip6 != nil && ip.To4() == nil {
b := make([]byte, sizeofSockaddrInet6)
switch runtime.GOOS { switch runtime.GOOS {
case "android", "illumos", "linux", "solaris", "windows": case "android", "illumos", "linux", "solaris", "windows":
NativeEndian.PutUint16(b[:2], uint16(sysAF_INET6)) NativeEndian.PutUint16(b[:2], uint16(sysAF_INET6))
@ -58,9 +59,9 @@ func marshalSockaddr(ip net.IP, port int, zone string) []byte {
if zone != "" { if zone != "" {
NativeEndian.PutUint32(b[24:28], uint32(zoneCache.index(zone))) NativeEndian.PutUint32(b[24:28], uint32(zoneCache.index(zone)))
} }
return b return sizeofSockaddrInet6
} }
return nil return 0
} }
func parseInetAddr(b []byte, network string) (net.Addr, error) { func parseInetAddr(b []byte, network string) (net.Addr, error) {
@ -77,7 +78,7 @@ func parseInetAddr(b []byte, network string) (net.Addr, error) {
var ip net.IP var ip net.IP
var zone string var zone string
if af == sysAF_INET { if af == sysAF_INET {
if len(b) < sizeofSockaddrInet { if len(b) < sizeofSockaddrInet4 {
return nil, errors.New("short address") return nil, errors.New("short address")
} }
ip = make(net.IP, net.IPv4len) ip = make(net.IP, net.IPv4len)

3
vendor/golang.org/x/net/internal/socket/sys_stub.go generated vendored
View file

@ -15,6 +15,9 @@ const (
sysAF_INET6 = 0xa sysAF_INET6 = 0xa
sysSOCK_RAW = 0x3 sysSOCK_RAW = 0x3
sizeofSockaddrInet4 = 0x10
sizeofSockaddrInet6 = 0x1c
) )
func marshalInetAddr(ip net.IP, port int, zone string) []byte { func marshalInetAddr(ip net.IP, port int, zone string) []byte {

19
vendor/golang.org/x/net/internal/socket/sys_windows.go generated vendored
View file

@ -22,25 +22,8 @@ const (
sysAF_INET6 = windows.AF_INET6 sysAF_INET6 = windows.AF_INET6
sysSOCK_RAW = windows.SOCK_RAW sysSOCK_RAW = windows.SOCK_RAW
)
type sockaddrInet struct { sizeofSockaddrInet4 = 0x10
Family uint16
Port uint16
Addr [4]byte /* in_addr */
Zero [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const (
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_aix_ppc64.go generated vendored
View file

@ -34,27 +34,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]uint8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_darwin_386.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_darwin_amd64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_darwin_arm.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_darwin_arm64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_dragonfly_amd64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_freebsd_386.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_freebsd_amd64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_freebsd_arm.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_freebsd_arm64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_386.go generated vendored
View file

@ -29,25 +29,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_amd64.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_arm.go generated vendored
View file

@ -29,25 +29,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_arm64.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_mips.go generated vendored
View file

@ -29,25 +29,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_mips64.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_mips64le.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_mipsle.go generated vendored
View file

@ -29,25 +29,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

35
vendor/golang.org/x/net/internal/socket/zsys_linux_ppc.go generated vendored Normal file
View file

@ -0,0 +1,35 @@
// Code generated by cmd/cgo -godefs; DO NOT EDIT.
// cgo -godefs defs_linux.go
package socket
type iovec struct {
Base *byte
Len uint32
}
type msghdr struct {
Name *byte
Namelen uint32
Iov *iovec
Iovlen uint32
Control *byte
Controllen uint32
Flags int32
}
type mmsghdr struct {
Hdr msghdr
Len uint32
}
type cmsghdr struct {
Len uint32
Level int32
Type int32
}
const (
sizeofIovec = 0x8
sizeofMsghdr = 0x1c
)

18
vendor/golang.org/x/net/internal/socket/zsys_linux_ppc64.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_ppc64le.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_riscv64.go generated vendored
View file

@ -34,25 +34,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

18
vendor/golang.org/x/net/internal/socket/zsys_linux_s390x.go generated vendored
View file

@ -32,25 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
X__pad [8]uint8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x38 sizeofMsghdr = 0x38
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_netbsd_386.go generated vendored
View file

@ -29,27 +29,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_netbsd_amd64.go generated vendored
View file

@ -32,27 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_netbsd_arm.go generated vendored
View file

@ -29,27 +29,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_netbsd_arm64.go generated vendored
View file

@ -32,27 +32,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_openbsd_386.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_openbsd_amd64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_openbsd_arm.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x8 sizeofIovec = 0x8
sizeofMsghdr = 0x1c sizeofMsghdr = 0x1c
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_openbsd_arm64.go generated vendored
View file

@ -26,27 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

20
vendor/golang.org/x/net/internal/socket/zsys_openbsd_mips64.go generated vendored
View file

@ -24,27 +24,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Len uint8
Family uint8
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Len uint8
Family uint8
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x1c
) )

19
vendor/golang.org/x/net/internal/socket/zsys_solaris_amd64.go generated vendored
View file

@ -26,26 +26,7 @@ type cmsghdr struct {
Type int32 Type int32
} }
type sockaddrInet struct {
Family uint16
Port uint16
Addr [4]byte /* in_addr */
Zero [8]int8
}
type sockaddrInet6 struct {
Family uint16
Port uint16
Flowinfo uint32
Addr [16]byte /* in6_addr */
Scope_id uint32
X__sin6_src_id uint32
}
const ( const (
sizeofIovec = 0x10 sizeofIovec = 0x10
sizeofMsghdr = 0x30 sizeofMsghdr = 0x30
sizeofSockaddrInet = 0x10
sizeofSockaddrInet6 = 0x20
) )

6
vendor/golang.org/x/net/internal/socket/zsys_zos_s390x.go generated vendored
View file

@ -25,8 +25,4 @@ type cmsghdr struct {
Type int32 Type int32
} }
const ( const sizeofCmsghdr = 12
sizeofCmsghdr = 12
sizeofSockaddrInet = 16
sizeofSockaddrInet6 = 28
)

6
vendor/golang.org/x/net/ipv4/control_bsd.go generated vendored
View file

@ -14,11 +14,13 @@ import (
"golang.org/x/net/internal/iana" "golang.org/x/net/internal/iana"
"golang.org/x/net/internal/socket" "golang.org/x/net/internal/socket"
"golang.org/x/sys/unix"
) )
func marshalDst(b []byte, cm *ControlMessage) []byte { func marshalDst(b []byte, cm *ControlMessage) []byte {
m := socket.ControlMessage(b) m := socket.ControlMessage(b)
m.MarshalHeader(iana.ProtocolIP, sysIP_RECVDSTADDR, net.IPv4len) m.MarshalHeader(iana.ProtocolIP, unix.IP_RECVDSTADDR, net.IPv4len)
return m.Next(net.IPv4len) return m.Next(net.IPv4len)
} }
@ -31,7 +33,7 @@ func parseDst(cm *ControlMessage, b []byte) {
func marshalInterface(b []byte, cm *ControlMessage) []byte { func marshalInterface(b []byte, cm *ControlMessage) []byte {
m := socket.ControlMessage(b) m := socket.ControlMessage(b)
m.MarshalHeader(iana.ProtocolIP, sysIP_RECVIF, syscall.SizeofSockaddrDatalink) m.MarshalHeader(iana.ProtocolIP, sockoptReceiveInterface, syscall.SizeofSockaddrDatalink)
return m.Next(syscall.SizeofSockaddrDatalink) return m.Next(syscall.SizeofSockaddrDatalink)
} }

4
vendor/golang.org/x/net/ipv4/control_unix.go generated vendored
View file

@ -12,6 +12,8 @@ import (
"golang.org/x/net/internal/iana" "golang.org/x/net/internal/iana"
"golang.org/x/net/internal/socket" "golang.org/x/net/internal/socket"
"golang.org/x/sys/unix"
) )
func setControlMessage(c *socket.Conn, opt *rawOpt, cf ControlFlags, on bool) error { func setControlMessage(c *socket.Conn, opt *rawOpt, cf ControlFlags, on bool) error {
@ -65,7 +67,7 @@ func setControlMessage(c *socket.Conn, opt *rawOpt, cf ControlFlags, on bool) er
func marshalTTL(b []byte, cm *ControlMessage) []byte { func marshalTTL(b []byte, cm *ControlMessage) []byte {
m := socket.ControlMessage(b) m := socket.ControlMessage(b)
m.MarshalHeader(iana.ProtocolIP, sysIP_RECVTTL, 1) m.MarshalHeader(iana.ProtocolIP, unix.IP_RECVTTL, 1)
return m.Next(1) return m.Next(1)
} }

3
vendor/golang.org/x/net/ipv4/sys_aix.go generated vendored
View file

@ -18,6 +18,9 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
// IP_RECVIF is defined on AIX but doesn't work. IP_RECVINTERFACE must be used instead.
const sockoptReceiveInterface = unix.IP_RECVINTERFACE
var ( var (
ctlOpts = [ctlMax]ctlOpt{ ctlOpts = [ctlMax]ctlOpt{
ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL}, ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL},

8
vendor/golang.org/x/net/ipv4/sys_asmreqn.go generated vendored
View file

@ -12,6 +12,8 @@ import (
"unsafe" "unsafe"
"golang.org/x/net/internal/socket" "golang.org/x/net/internal/socket"
"golang.org/x/sys/unix"
) )
func (so *sockOpt) getIPMreqn(c *socket.Conn) (*net.Interface, error) { func (so *sockOpt) getIPMreqn(c *socket.Conn) (*net.Interface, error) {
@ -19,7 +21,7 @@ func (so *sockOpt) getIPMreqn(c *socket.Conn) (*net.Interface, error) {
if _, err := so.Get(c, b); err != nil { if _, err := so.Get(c, b); err != nil {
return nil, err return nil, err
} }
mreqn := (*ipMreqn)(unsafe.Pointer(&b[0])) mreqn := (*unix.IPMreqn)(unsafe.Pointer(&b[0]))
if mreqn.Ifindex == 0 { if mreqn.Ifindex == 0 {
return nil, nil return nil, nil
} }
@ -31,13 +33,13 @@ func (so *sockOpt) getIPMreqn(c *socket.Conn) (*net.Interface, error) {
} }
func (so *sockOpt) setIPMreqn(c *socket.Conn, ifi *net.Interface, grp net.IP) error { func (so *sockOpt) setIPMreqn(c *socket.Conn, ifi *net.Interface, grp net.IP) error {
var mreqn ipMreqn var mreqn unix.IPMreqn
if ifi != nil { if ifi != nil {
mreqn.Ifindex = int32(ifi.Index) mreqn.Ifindex = int32(ifi.Index)
} }
if grp != nil { if grp != nil {
mreqn.Multiaddr = [4]byte{grp[0], grp[1], grp[2], grp[3]} mreqn.Multiaddr = [4]byte{grp[0], grp[1], grp[2], grp[3]}
} }
b := (*[sizeofIPMreqn]byte)(unsafe.Pointer(&mreqn))[:sizeofIPMreqn] b := (*[unix.SizeofIPMreqn]byte)(unsafe.Pointer(&mreqn))[:unix.SizeofIPMreqn]
return so.Set(c, b) return so.Set(c, b)
} }

2
vendor/golang.org/x/net/ipv4/sys_bsd.go generated vendored
View file

@ -17,6 +17,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const sockoptReceiveInterface = unix.IP_RECVIF
var ( var (
ctlOpts = [ctlMax]ctlOpt{ ctlOpts = [ctlMax]ctlOpt{
ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL}, ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL},

4
vendor/golang.org/x/net/ipv4/sys_darwin.go generated vendored
View file

@ -15,6 +15,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const sockoptReceiveInterface = unix.IP_RECVIF
var ( var (
ctlOpts = [ctlMax]ctlOpt{ ctlOpts = [ctlMax]ctlOpt{
ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL}, ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL},
@ -27,7 +29,7 @@ var (
ssoTOS: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TOS, Len: 4}}, ssoTOS: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TOS, Len: 4}},
ssoTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TTL, Len: 4}}, ssoTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TTL, Len: 4}},
ssoMulticastTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_TTL, Len: 1}}, ssoMulticastTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_TTL, Len: 1}},
ssoMulticastInterface: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_IF, Len: sizeofIPMreqn}, typ: ssoTypeIPMreqn}, ssoMulticastInterface: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_IF, Len: unix.SizeofIPMreqn}, typ: ssoTypeIPMreqn},
ssoMulticastLoopback: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_LOOP, Len: 4}}, ssoMulticastLoopback: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_LOOP, Len: 4}},
ssoReceiveTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_RECVTTL, Len: 4}}, ssoReceiveTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_RECVTTL, Len: 4}},
ssoReceiveDst: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_RECVDSTADDR, Len: 4}}, ssoReceiveDst: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_RECVDSTADDR, Len: 4}},

2
vendor/golang.org/x/net/ipv4/sys_dragonfly.go generated vendored
View file

@ -14,6 +14,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const sockoptReceiveInterface = unix.IP_RECVIF
var ( var (
ctlOpts = [ctlMax]ctlOpt{ ctlOpts = [ctlMax]ctlOpt{
ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL}, ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL},

4
vendor/golang.org/x/net/ipv4/sys_freebsd.go generated vendored
View file

@ -17,6 +17,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const sockoptReceiveInterface = unix.IP_RECVIF
var ( var (
ctlOpts = [ctlMax]ctlOpt{ ctlOpts = [ctlMax]ctlOpt{
ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL}, ctlTTL: {unix.IP_RECVTTL, 1, marshalTTL, parseTTL},
@ -46,7 +48,7 @@ var (
func init() { func init() {
freebsdVersion, _ = syscall.SysctlUint32("kern.osreldate") freebsdVersion, _ = syscall.SysctlUint32("kern.osreldate")
if freebsdVersion >= 1000000 { if freebsdVersion >= 1000000 {
sockOpts[ssoMulticastInterface] = &sockOpt{Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_IF, Len: sizeofIPMreqn}, typ: ssoTypeIPMreqn} sockOpts[ssoMulticastInterface] = &sockOpt{Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_IF, Len: unix.SizeofIPMreqn}, typ: ssoTypeIPMreqn}
} }
if runtime.GOOS == "freebsd" && runtime.GOARCH == "386" { if runtime.GOOS == "freebsd" && runtime.GOARCH == "386" {
archs, _ := syscall.Sysctl("kern.supported_archs") archs, _ := syscall.Sysctl("kern.supported_archs")

2
vendor/golang.org/x/net/ipv4/sys_linux.go generated vendored
View file

@ -25,7 +25,7 @@ var (
ssoTOS: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TOS, Len: 4}}, ssoTOS: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TOS, Len: 4}},
ssoTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TTL, Len: 4}}, ssoTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_TTL, Len: 4}},
ssoMulticastTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_TTL, Len: 4}}, ssoMulticastTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_TTL, Len: 4}},
ssoMulticastInterface: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_IF, Len: sizeofIPMreqn}, typ: ssoTypeIPMreqn}, ssoMulticastInterface: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_IF, Len: unix.SizeofIPMreqn}, typ: ssoTypeIPMreqn},
ssoMulticastLoopback: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_LOOP, Len: 4}}, ssoMulticastLoopback: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_MULTICAST_LOOP, Len: 4}},
ssoReceiveTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_RECVTTL, Len: 4}}, ssoReceiveTTL: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_RECVTTL, Len: 4}},
ssoPacketInfo: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_PKTINFO, Len: 4}}, ssoPacketInfo: {Option: socket.Option{Level: iana.ProtocolIP, Name: unix.IP_PKTINFO, Len: 4}},

2
vendor/golang.org/x/net/ipv4/sys_solaris.go generated vendored
View file

@ -15,6 +15,8 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
const sockoptReceiveInterface = unix.IP_RECVIF
var ( var (
ctlOpts = [ctlMax]ctlOpt{ ctlOpts = [ctlMax]ctlOpt{
ctlTTL: {unix.IP_RECVTTL, 4, marshalTTL, parseTTL}, ctlTTL: {unix.IP_RECVTTL, 4, marshalTTL, parseTTL},

4
vendor/golang.org/x/net/ipv4/zsys_aix_ppc64.go generated vendored
View file

@ -8,10 +8,6 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x20
sysIP_RECVTTL = 0x22
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
) )

11
vendor/golang.org/x/net/ipv4/zsys_darwin.go generated vendored
View file

@ -4,16 +4,11 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x14
sysIP_RECVTTL = 0x18
sizeofSockaddrStorage = 0x80 sizeofSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -46,12 +41,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr [4]byte /* in_addr */ Multiaddr [4]byte /* in_addr */
Sourceaddr [4]byte /* in_addr */ Sourceaddr [4]byte /* in_addr */

4
vendor/golang.org/x/net/ipv4/zsys_dragonfly.go generated vendored
View file

@ -4,10 +4,6 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x14
sysIP_RECVTTL = 0x41
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
) )

11
vendor/golang.org/x/net/ipv4/zsys_freebsd_386.go generated vendored
View file

@ -4,15 +4,10 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x14
sysIP_RECVTTL = 0x41
sizeofSockaddrStorage = 0x80 sizeofSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -39,12 +34,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr [4]byte /* in_addr */ Multiaddr [4]byte /* in_addr */
Sourceaddr [4]byte /* in_addr */ Sourceaddr [4]byte /* in_addr */

11
vendor/golang.org/x/net/ipv4/zsys_freebsd_amd64.go generated vendored
View file

@ -4,15 +4,10 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x14
sysIP_RECVTTL = 0x41
sizeofSockaddrStorage = 0x80 sizeofSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -39,12 +34,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr [4]byte /* in_addr */ Multiaddr [4]byte /* in_addr */
Sourceaddr [4]byte /* in_addr */ Sourceaddr [4]byte /* in_addr */

11
vendor/golang.org/x/net/ipv4/zsys_freebsd_arm.go generated vendored
View file

@ -4,15 +4,10 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x14
sysIP_RECVTTL = 0x41
sizeofSockaddrStorage = 0x80 sizeofSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -39,12 +34,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr [4]byte /* in_addr */ Multiaddr [4]byte /* in_addr */
Sourceaddr [4]byte /* in_addr */ Sourceaddr [4]byte /* in_addr */

11
vendor/golang.org/x/net/ipv4/zsys_freebsd_arm64.go generated vendored
View file

@ -4,15 +4,10 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVDSTADDR = 0x7
sysIP_RECVIF = 0x14
sysIP_RECVTTL = 0x41
sizeofSockaddrStorage = 0x80 sizeofSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -39,12 +34,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr [4]byte /* in_addr */ Multiaddr [4]byte /* in_addr */
Sourceaddr [4]byte /* in_addr */ Sourceaddr [4]byte /* in_addr */

9
vendor/golang.org/x/net/ipv4/zsys_linux_386.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_amd64.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_arm.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_arm64.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_mips.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_mips64.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_mips64le.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_mipsle.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_ppc.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x84 sizeofGroupReq = 0x84
sizeofGroupSourceReq = 0x104 sizeofGroupSourceReq = 0x104
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_ppc64.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_ppc64le.go generated vendored
View file

@ -4,15 +4,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -53,12 +50,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

9
vendor/golang.org/x/net/ipv4/zsys_linux_riscv64.go generated vendored
View file

@ -7,15 +7,12 @@
package ipv4 package ipv4
const ( const (
sysIP_RECVTTL = 0xc
sizeofKernelSockaddrStorage = 0x80 sizeofKernelSockaddrStorage = 0x80
sizeofSockaddrInet = 0x10 sizeofSockaddrInet = 0x10
sizeofInetPktinfo = 0xc sizeofInetPktinfo = 0xc
sizeofSockExtendedErr = 0x10 sizeofSockExtendedErr = 0x10
sizeofIPMreq = 0x8 sizeofIPMreq = 0x8
sizeofIPMreqn = 0xc
sizeofIPMreqSource = 0xc sizeofIPMreqSource = 0xc
sizeofGroupReq = 0x88 sizeofGroupReq = 0x88
sizeofGroupSourceReq = 0x108 sizeofGroupSourceReq = 0x108
@ -56,12 +53,6 @@ type ipMreq struct {
Interface [4]byte /* in_addr */ Interface [4]byte /* in_addr */
} }
type ipMreqn struct {
Multiaddr [4]byte /* in_addr */
Address [4]byte /* in_addr */
Ifindex int32
}
type ipMreqSource struct { type ipMreqSource struct {
Multiaddr uint32 Multiaddr uint32
Interface uint32 Interface uint32

Some files were not shown because too many files have changed in this diff Show more