Skip to content

Commit 5bf1f9e

Browse files
rafaeljustorafaeljusto
authored
Merge pull request #91 from Teamwork/fix/yaml-security-fix
Fix: Upgrade gopkg.in/yaml.v2 to gopkg.in/yaml.v3 due to security issue
2 parents d062f3c + 8d531be commit 5bf1f9e

File tree

69 files changed

+3897
-2120
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+3897
-2120
lines changed

‎docparse/jsonschema.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111

1212
"github.com/teamwork/utils/goutil"
1313
"github.com/teamwork/utils/sliceutil"
14-
yaml "gopkg.in/yaml.v2"
14+
yaml "gopkg.in/yaml.v3"
1515
)
1616

1717
// The Schema Object allows the definition of input and output data types.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ go 1.12
44

55
require (
66
github.com/davecgh/go-spew v1.1.1 // indirect
7-
github.com/imdario/mergo v0.3.7
7+
github.com/imdario/mergo v0.3.13
88
github.com/pmezard/go-difflib v1.0.0 // indirect
99
github.com/teamwork/test v0.0.0-20181126061546-2ff8918eb6a4
1010
github.com/teamwork/utils v0.0.0-20190114034940-d6a1f27ce92c
11-
gopkg.in/yaml.v2 v2.2.2
11+
gopkg.in/yaml.v3 v3.0.1
1212
zgo.at/sconfig v1.2.2-0.20211017232425-870f818a71b7
1313
)

‎go.sum‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
arp242.net/sconfig v0.0.0-20180901013357-c014d3b7a101 h1:V6CYq+es2ncUeJ2jzJxWVviAs7iNW/jvPb4+3LHOXsE=
2-
arp242.net/sconfig v0.0.0-20180901013357-c014d3b7a101/go.mod h1:s7teWAlHUlC2xRICC2FKERk6kQBI9lREHKRfWIWF+lA=
31
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
42
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5-
github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
6-
github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
3+
github.com/imdario/mergo v0.3.13 h1:lFzP57bqS/wsqKssCGmtLAb8A0wKjLGrve2q3PPVcBk=
4+
github.com/imdario/mergo v0.3.13/go.mod h1:4lJ1jqUDcsbIECGy0RUJAXNIhg+6ocWgb1ALK2O4oXg=
75
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
86
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
97
github.com/teamwork/test v0.0.0-20181126061546-2ff8918eb6a4 h1:/ujiGN1Gf1yBNvRoXSn/c24mbyjQN+r3nXOKLXfUt+A=
@@ -12,7 +10,8 @@ github.com/teamwork/utils v0.0.0-20190114034940-d6a1f27ce92c h1:5/hkqtufOyLP25ta
1210
github.com/teamwork/utils v0.0.0-20190114034940-d6a1f27ce92c/go.mod h1:rmPaJUVv426LGg3QR31m1N0bfpCdCVyh3dCWsJTQeDA=
1311
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
1412
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
15-
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
16-
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
13+
gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
14+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
15+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
1716
zgo.at/sconfig v1.2.2-0.20211017232425-870f818a71b7 h1:fw2yuIGMHzSRYrZUVOt/c1O/igkJIXorj/FNCg+tg2E=
1817
zgo.at/sconfig v1.2.2-0.20211017232425-870f818a71b7/go.mod h1:RXEBQABoIc7RnagqaT+7BHU81g1okqSLeND/YJLZiDE=

‎html/html.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"os"
1010

1111
"github.com/teamwork/kommentaar/docparse"
12-
yaml "gopkg.in/yaml.v2"
12+
yaml "gopkg.in/yaml.v3"
1313
)
1414

1515
var funcMap = template.FuncMap{

‎openapi2/openapi2.go‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package openapi2 // import "github.com/teamwork/kommentaar/openapi2"
66

77
import (
8+
"bytes"
89
"encoding/json"
910
"fmt"
1011
"io"
@@ -14,7 +15,7 @@ import (
1415
"github.com/imdario/mergo"
1516
"github.com/teamwork/kommentaar/docparse"
1617
"github.com/teamwork/utils/goutil"
17-
yaml "gopkg.in/yaml.v2"
18+
yaml "gopkg.in/yaml.v3"
1819
)
1920

2021
type (
@@ -469,7 +470,11 @@ func write(outFormat string, w io.Writer, prog *docparse.Program) error {
469470
case "json":
470471
d, err = json.Marshal(&out)
471472
case "yaml":
472-
d, err = yaml.Marshal(&out)
473+
var b bytes.Buffer
474+
yamlEncoder := yaml.NewEncoder(&b)
475+
yamlEncoder.SetIndent(2)
476+
err = yamlEncoder.Encode(&out)
477+
d = b.Bytes()
473478
default:
474479
err = fmt.Errorf("unknown format: %#v", outFormat)
475480
}

‎testdata/openapi2/src/blank-line/want.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,21 @@ info:
33
title: x
44
version: x
55
consumes:
6-
- application/json
6+
- application/json
77
produces:
8-
- application/json
8+
- application/json
99
tags:
10-
- name: tag
10+
- name: tag
1111
paths:
1212
/path:
1313
post:
1414
operationId: POST_path
1515
tags:
16-
- tag
16+
- tag
1717
consumes:
18-
- application/x-www-form-urlencoded
18+
- application/x-www-form-urlencoded
1919
produces:
20-
- application/json
20+
- application/json
2121
responses:
2222
200:
2323
description: 200 OK (no data)

‎testdata/openapi2/src/description-print-var/want.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ info:
33
title: x
44
version: x
55
consumes:
6-
- application/json
6+
- application/json
77
produces:
8-
- application/json
8+
- application/json
99
paths:
1010
/path:
1111
post:
@@ -39,7 +39,7 @@ paths:
3939
4040
I'm escaped $foo
4141
produces:
42-
- application/json
42+
- application/json
4343
responses:
4444
200:
4545
description: 200 OK (no data)

‎testdata/openapi2/src/embedded-pointer/want.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ info:
33
title: x
44
version: x
55
consumes:
6-
- application/json
6+
- application/json
77
produces:
8-
- application/json
8+
- application/json
99
paths:
1010
/path:
1111
post:
1212
operationId: POST_path
1313
produces:
14-
- application/json
14+
- application/json
1515
responses:
1616
200:
1717
description: 200 OK

‎testdata/openapi2/src/embedded-sometimes/want.yaml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,31 @@ info:
33
title: x
44
version: x
55
consumes:
6-
- application/json
6+
- application/json
77
produces:
8-
- application/json
8+
- application/json
99
tags:
10-
- name: foobar
10+
- name: foobar
1111
paths:
1212
/foo/{id}:
1313
post:
1414
operationId: POST_foo_{id}
1515
tags:
16-
- foobar
16+
- foobar
1717
consumes:
18-
- application/json
18+
- application/json
1919
produces:
20-
- application/json
20+
- application/json
2121
parameters:
22-
- name: id
23-
in: path
24-
type: integer
25-
required: true
26-
- name: embedded-sometimes.RequestObj
27-
in: body
28-
required: true
29-
schema:
30-
$ref: '#/definitions/embedded-sometimes.RequestObj'
22+
- name: id
23+
in: path
24+
type: integer
25+
required: true
26+
- name: embedded-sometimes.RequestObj
27+
in: body
28+
required: true
29+
schema:
30+
$ref: '#/definitions/embedded-sometimes.RequestObj'
3131
responses:
3232
200:
3333
description: 200 OK

‎testdata/openapi2/src/endpoint-extend/want.yaml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ info:
33
title: x
44
version: x
55
consumes:
6-
- application/json
6+
- application/json
77
produces:
8-
- application/json
8+
- application/json
99
paths:
1010
/path:
1111
post:
1212
consumes:
13-
- application/xml
13+
- application/xml
1414
operationId: POST_path
1515
parameters:
16-
- in: body
17-
name: endpoint-extend.reqRef
18-
required: true
19-
schema:
20-
$ref: '#/definitions/endpoint-extend.reqRef'
16+
- in: body
17+
name: endpoint-extend.reqRef
18+
required: true
19+
schema:
20+
$ref: '#/definitions/endpoint-extend.reqRef'
2121
produces:
22-
- application/json
22+
- application/json
2323
responses:
2424
"200":
2525
description: 200 OK (no data)

0 commit comments

Comments
 (0)