Skip to content

Commit 65493c0

Browse files
lghiurolamilekan000andrei-tyk
authored
TT-14590 kinopenapi CVE fix - Use internal fork of kinopen-api and import update gql translator (#7024)
<details open> <summary><a href="https://tyktech.atlassian.net/browse/TT-14590" title="TT-14590" target="_blank">TT-14590</a></summary> <br /> <table> <tr> <th>Summary</th> <td>Cherry pick kin-openapi CVE fix</td> </tr> <tr> <th>Type</th> <td> <img alt="Story" src="https://tyktech.atlassian.net/rest/api/2/universal_avatar/view/type/issuetype/avatar/10315?size=medium" /> Story </td> </tr> <tr> <th>Status</th> <td>In Dev</td> </tr> <tr> <th>Points</th> <td>N/A</td> </tr> <tr> <th>Labels</th> <td>-</td> </tr> </table> </details> <!-- do not remove this marker as it will break jira-lint's functionality. added_by_jira_lint --> --- [TT-14590](https://tyktech.atlassian.net/browse/TT-14590) uses internal fork for kinopen-api, that fixes latest CVE [TT-14590]: https://tyktech.atlassian.net/browse/TT-14590 --------- Co-authored-by: olalekan odukoya <odukoyaonline@gmail.com> Co-authored-by: andrei-tyk <97896463+andrei-tyk@users.noreply.github.com> Co-authored-by: Andrei <andrei@tyk.io>
1 parent aedc223 commit 65493c0

36 files changed

+42
-48
lines changed

apidef/adapter/openapi.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"net/url"
1010
"path"
1111

12-
"github.com/getkin/kin-openapi/openapi3"
12+
"github.com/TykTechnologies/kin-openapi/openapi3"
1313

1414
"github.com/TykTechnologies/graphql-go-tools/pkg/astprinter"
1515
"github.com/TykTechnologies/graphql-go-tools/pkg/operationreport"

apidef/oas/authentication.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sort"
88
"time"
99

10-
"github.com/getkin/kin-openapi/openapi3"
10+
"github.com/TykTechnologies/kin-openapi/openapi3"
1111
"github.com/mitchellh/mapstructure"
1212

1313
"github.com/TykTechnologies/tyk/apidef"

apidef/oas/default.go

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

12-
"github.com/getkin/kin-openapi/openapi3"
12+
"github.com/TykTechnologies/kin-openapi/openapi3"
1313
)
1414

1515
const (

apidef/oas/default_test.go

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

99
"github.com/TykTechnologies/tyk/apidef"
1010

11-
"github.com/getkin/kin-openapi/openapi3"
11+
"github.com/TykTechnologies/kin-openapi/openapi3"
1212
"github.com/stretchr/testify/assert"
1313
)
1414

apidef/oas/example.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package oas
22

3-
import "github.com/getkin/kin-openapi/openapi3"
3+
import "github.com/TykTechnologies/kin-openapi/openapi3"
44

55
// ExampleExtractor returns an example payload according to the openapi3.SchemaRef object.
66
func ExampleExtractor(schema *openapi3.SchemaRef) interface{} {

apidef/oas/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/getkin/kin-openapi/openapi3"
7+
"github.com/TykTechnologies/kin-openapi/openapi3"
88
"github.com/stretchr/testify/assert"
99
)
1010

apidef/oas/fixtures_test.go

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

12-
"github.com/getkin/kin-openapi/openapi3"
12+
"github.com/TykTechnologies/kin-openapi/openapi3"
1313
"github.com/goccy/go-yaml"
1414
"github.com/stretchr/testify/assert"
1515

apidef/oas/oas.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77
"strings"
88

9-
"github.com/getkin/kin-openapi/openapi3"
9+
"github.com/TykTechnologies/kin-openapi/openapi3"
1010

1111
"github.com/TykTechnologies/tyk/apidef"
1212
"github.com/TykTechnologies/tyk/config"

apidef/oas/oas_test.go

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

1111
"github.com/TykTechnologies/storage/persistent/model"
1212

13-
"github.com/getkin/kin-openapi/openapi3"
13+
"github.com/TykTechnologies/kin-openapi/openapi3"
1414
"github.com/stretchr/testify/assert"
1515

1616
"github.com/TykTechnologies/tyk/apidef"

apidef/oas/old_oas.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package oas
22

33
import (
4-
"github.com/getkin/kin-openapi/openapi3"
4+
"github.com/TykTechnologies/kin-openapi/openapi3"
55

66
openapifork "github.com/TykTechnologies/kin-openapi/openapi3"
77
)

0 commit comments

Comments
 (0)