Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: null pointer when CORS maxAge is not specified #2133

Merged
merged 2 commits into from
Nov 1, 2023
Merged

fix: null pointer when CORS maxAge is not specified #2133

merged 2 commits into from
Nov 1, 2023

Conversation

zhaohuabing
Copy link
Member

fix #2132

@zhaohuabing
fix nullpointer
709f9e0 
Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
@zhaohuabing zhaohuabing requested a review from a team as a code owner October 31, 2023 08:32
@zhaohuabing
Merge branch 'main' into fix-cors
6c4144f 
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
@codecov
Copy link

codecov bot commented Oct 31, 2023 •
edited
Loading

Codecov Report

Merging #2133 (6c4144f) into main (57e1aec) will increase coverage by 0.04%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #2133      +/-   ##
==========================================
+ Coverage   64.30%   64.34%   +0.04%     
==========================================
  Files         107      107              
  Lines       14623    14624       +1     
==========================================
+ Hits         9403     9410       +7     
+ Misses       4657     4652       -5     
+ Partials      563      562       -1
Files Coverage Δ
internal/xds/translator/cors.go 66.32% <100.00%> (+0.34%) ⬆️

... and 3 files with indirect coverage changes

Xunzhuo
Xunzhuo reviewed Oct 31, 2023
View reviewed changes
Copy link
Member

@Xunzhuo Xunzhuo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if it is nil, will it have the default value?

@zhaohuabing
Copy link
Member Author

zhaohuabing commented Oct 31, 2023 •
edited
Loading

if it is nil, will it have the default value?

It's an optional setting, the default value is an empty string.

@Xunzhuo Xunzhuo changed the title fix #2132 fix: null pointer when CORS maxAge is not specified Oct 31, 2023
arkodg
arkodg reviewed Oct 31, 2023
View reviewed changes
internal/xds/translator/cors.go
@@ -126,7 +126,9 @@ func patchRouteWithCORSConfig(route *routev3.Route, irRoute *ir.HTTPRoute) error
allowMethods = strings.Join(irRoute.CORS.AllowMethods, ", ")
allowHeaders = strings.Join(irRoute.CORS.AllowHeaders, ", ")
exposeHeaders = strings.Join(irRoute.CORS.ExposeHeaders, ", ")
maxAge = strconv.Itoa(int(irRoute.CORS.MaxAge.Seconds()))
if irRoute.CORS.MaxAge != nil {
Copy link
Contributor

@arkodg arkodg Oct 31, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a test that only sets allowOrigins and allowMethods and rest are unset ?

@arkodg arkodg added this to the 0.6.0 milestone Nov 1, 2023
@arkodg arkodg merged commit 35c4fea into envoyproxy:main Nov 1, 2023
18 checks passed
arkodg pushed a commit to arkodg/gateway that referenced this pull request Nov 1, 2023
@zhaohuabing @arkodg
fix: null pointer when CORS maxAge is not specified (envoyproxy#2133)
4ee83d2 
fix nullpointer

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 35c4fea)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
arkodg added a commit that referenced this pull request Nov 1, 2023
@arkodg @zhaohuabing
@Xunzhuo @dependabot @zirain @slayer321
[release/v0.6] Cherry-pick fixes into v0.6 (#2150)
c62a470 
* Fix TestE2E/RateLimitBasedJwtClaims test (#2097)

* Revert "Skip RateLimitBasedJwtClaimsTest test (#2096)"

This reverts commit ef7a2a4.

fix e2e test

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* fix XValidation

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

---------

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
(cherry picked from commit f301527)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* add a newer PR reference in rc release docs (#2101)

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit fae8cd8)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix: panic when using nil xdsRouteAction (#2104)

Signed-off-by: bitliu <bitliu@tencent.com>
(cherry picked from commit 77445de)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* remove cors, jwt, rl assignment from route translator (#2105)

All the translations and assignments now happen in the policy
translators

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit d65ab59)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix: use lowercases of eg admin config fields (#2107)

(cherry picked from commit ef5e450)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix: testGatewayClassWithParamRef e2e test flaky (#2114)

(cherry picked from commit 4047268)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* build(deps): bump sigs.k8s.io/yaml from 1.3.0 to 1.4.0 (#2118)

Bumps [sigs.k8s.io/yaml](https://github.com/kubernetes-sigs/yaml) from 1.3.0 to 1.4.0.
- [Release notes](https://github.com/kubernetes-sigs/yaml/releases)
- [Changelog](https://github.com/kubernetes-sigs/yaml/blob/master/RELEASE.md)
- [Commits](kubernetes-sigs/yaml@v1.3.0...v1.4.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/yaml
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit bf93a4e)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* build(deps): bump github.com/bufbuild/buf from 1.27.1 to 1.27.2 in /tools/src/buf (#2121)

build(deps): bump github.com/bufbuild/buf in /tools/src/buf

Bumps [github.com/bufbuild/buf](https://github.com/bufbuild/buf) from 1.27.1 to 1.27.2.
- [Release notes](https://github.com/bufbuild/buf/releases)
- [Changelog](https://github.com/bufbuild/buf/blob/main/CHANGELOG.md)
- [Commits](bufbuild/buf@v1.27.1...v1.27.2)

---
updated-dependencies:
- dependency-name: github.com/bufbuild/buf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 58146ff)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* build(deps): bump github.com/go-logr/logr from 1.2.4 to 1.3.0 (#2117)

Bumps [github.com/go-logr/logr](https://github.com/go-logr/logr) from 1.2.4 to 1.3.0.
- [Release notes](https://github.com/go-logr/logr/releases)
- [Changelog](https://github.com/go-logr/logr/blob/master/CHANGELOG.md)
- [Commits](go-logr/logr@v1.2.4...v1.3.0)

---
updated-dependencies:
- dependency-name: github.com/go-logr/logr
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit d1cbf5e)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* build(deps): bump envoyproxy/toolshed from actions-v0.0.25 to 0.1.2 (#2116)

Bumps [envoyproxy/toolshed](https://github.com/envoyproxy/toolshed) from actions-v0.0.25 to 0.1.2. This release includes the previously tagged commit.
- [Release notes](https://github.com/envoyproxy/toolshed/releases)
- [Commits](envoyproxy/toolshed@actions-v0.0.25...actions-v0.1.2)

---
updated-dependencies:
- dependency-name: envoyproxy/toolshed
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 7b6344d)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* build(deps): bump actions/setup-node from 3 to 4 (#2115)

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 3 to 4.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v3...v4)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 5523099)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* chore: add more EnvoyProxy cases (#2120)

Signed-off-by: zirain <zirain2009@gmail.com>
(cherry picked from commit 268a6ef)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* build(deps): bump github.com/golangci/golangci-lint from 1.55.0 to 1.55.1 in /tools/src/golangci-lint (#2119)

build(deps): bump github.com/golangci/golangci-lint

Bumps [github.com/golangci/golangci-lint](https://github.com/golangci/golangci-lint) from 1.55.0 to 1.55.1.
- [Release notes](https://github.com/golangci/golangci-lint/releases)
- [Changelog](https://github.com/golangci/golangci-lint/blob/master/CHANGELOG.md)
- [Commits](golangci/golangci-lint@v1.55.0...v1.55.1)

---
updated-dependencies:
- dependency-name: github.com/golangci/golangci-lint
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
(cherry picked from commit be86295)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* feat: CEL Validation in BackendTrafficPolicy (#2110)

* feat: CEL Validation in BackendTrafficPolicy

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>

* leastRequest with consistentHash nil test

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>

---------

Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>
(cherry picked from commit b45ae24)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* e2e: eg controlplane metrics (#2106)

* e2e: eg controlplane metrics

Signed-off-by: zirain <zirain2009@gmail.com>

* update

Signed-off-by: zirain <zirain2009@gmail.com>

* update

Signed-off-by: zirain <zirain2009@gmail.com>

* update name

Signed-off-by: zirain <zirain2009@gmail.com>

* rename

Signed-off-by: zirain <zirain2009@gmail.com>

* wait more

Signed-off-by: zirain <zirain2009@gmail.com>

* add comment

Signed-off-by: zirain <zirain2009@gmail.com>

* update

Signed-off-by: zirain <zirain2009@gmail.com>

---------

Signed-off-by: zirain <zirain2009@gmail.com>
(cherry picked from commit 046a593)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* chore: fix http2_protocol_options  warning message (#2048)

chore:fix http2_protocol_options warning message

Signed-off-by: zhaonan <zhaonan06@corp.netease.com>
(cherry picked from commit 179d265)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix Failed to update SecurityPolicy status (#2128)

fix #2127

Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 57e1aec)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix: add missing status equal for SecurityPolicy (#2134)

(cherry picked from commit 71c09f2)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix jwt doc (#2135)

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
(cherry picked from commit df1e209)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* Bump Gateway API to v1.0.0 (#2142)

(cherry picked from commit 3dd0ee7)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* Enable HTTPRouteRewritePath test (#2112)

* Enable HTTPRouteRewritePath test

Fixes: #2004

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix prefix match

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* make testdata

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix path match

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* rm trailing /

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* sort on path match type

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* make testdata

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* temp var

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix url rewrite

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

---------

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 2b3bc9f)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* helm: remove kube-rbac-proxy and update metrics service (#2108)

(cherry picked from commit 0c5b054)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* doc: user doc for CORS (#2137)

* cors docs

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

* address comments

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>

---------

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
(cherry picked from commit d0dc987)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix(ci): bump go version to 1.21 (#2144)

* fix(ci): bump go version to 1.21

Signed-off-by: bitliu <bitliu@tencent.com>

* update

Signed-off-by: bitliu <bitliu@tencent.com>

---------

Signed-off-by: bitliu <bitliu@tencent.com>
(cherry picked from commit 6e81fb3)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* conformance: Enable HTTPRouteBackendProtocolH2C conformance test (#2136)

* nit

Signed-off-by: zirain <zirain2009@gmail.com>

* build Cluster depends on route type and service appProtocol

Signed-off-by: zirain <zirain2009@gmail.com>

* enable HTTPRouteBackendProtocolH2C conformance test

Signed-off-by: zirain <zirain2009@gmail.com>

* lint

Signed-off-by: zirain <zirain2009@gmail.com>

* fix

Signed-off-by: zirain <zirain2009@gmail.com>

* address comment

Signed-off-by: zirain <zirain2009@gmail.com>

* move to package internal/ir

Signed-off-by: zirain <zirain2009@gmail.com>

---------

Signed-off-by: zirain <zirain2009@gmail.com>
(cherry picked from commit 6d532c1)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* Fix attachedRoutes computation (#2085)

* Fix attachedRoutes computation

* Fixes: #2077
* Fixes: #1916

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* make testdata

Signed-off-by: Arko Dasgupta <arko@tetrate.io>

---------

Signed-off-by: Arko Dasgupta <arko@tetrate.io>
(cherry picked from commit 93a12e7)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix comments in loadbalancer api (#2145)

Signed-off-by: zhaonan <zhaonan06@corp.netease.com>
(cherry picked from commit 77bcb3c)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix(docs): incorrect quickstart links (#2146)

Signed-off-by: bitliu <bitliu@tencent.com>
(cherry picked from commit defed57)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

* fix: null pointer when CORS maxAge is not specified (#2133)

fix nullpointer

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
(cherry picked from commit 35c4fea)
Signed-off-by: Arko Dasgupta <arko@tetrate.io>

---------

Signed-off-by: huabing zhao <zhaohuabing@gmail.com>
Signed-off-by: Arko Dasgupta <arko@tetrate.io>
Signed-off-by: bitliu <bitliu@tencent.com>
Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: zirain <zirain2009@gmail.com>
Signed-off-by: slayer321 <sachin.maurya7666@gmail.com>
Signed-off-by: zhaonan <zhaonan06@corp.netease.com>
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>
Co-authored-by: Huabing Zhao <zhaohuabing@gmail.com>
Co-authored-by: Xunzhuo <bitliu@tencent.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: zirain <zirain2009@gmail.com>
Co-authored-by: Sachin Maurya <57769917+slayer321@users.noreply.github.com>
Co-authored-by: tmsnan <zhaonan06@corp.netease.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Xunzhuo Xunzhuo Xunzhuo approved these changes

@arkodg arkodg arkodg approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.6.0
Development

Successfully merging this pull request may close these issues.

Null pointer when CORS maxAge is not specified
3 participants
@zhaohuabing @arkodg @Xunzhuo