features: append cors plugin #1327
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@Miss-you please take a look, thx |
membphis
requested changes
Mar 24, 2020
lua/apisix/plugins/cors.lua
Outdated
| properties = { | ||
| allow_origins = { | ||
| description = | ||
| "you can use '*' to allow all origins when no credentials,".. |
There was a problem hiding this comment.
code style: please add a space credentials," ..
lua/apisix/plugins/cors.lua
Outdated
| end | ||
|
|
||
| if not conf.allow_origins then | ||
| conf.allow_origins = "*" |
There was a problem hiding this comment.
we can set default value by jsonschema.
lua/apisix/plugins/cors.lua
Outdated
| end | ||
|
|
||
| if not conf.allow_methods then | ||
| conf.allow_methods = "*" |
There was a problem hiding this comment.
ditto, please fix other similar issues
lua/apisix/plugins/cors.lua
Outdated
| if conf.allow_origins == "**" then | ||
| conf.allow_origins = ngx.var.http_origin or '*' | ||
| end | ||
| if str_find(conf.allow_origins, ",") then |
There was a problem hiding this comment.
optimize: plain model
lua/apisix/plugins/cors.lua
Outdated
| end | ||
| if str_find(conf.allow_origins, ",") then | ||
| local finded = false | ||
| for origin in str_gmatch(conf.allow_origins, "([^,]+)") do |
There was a problem hiding this comment.
ngx.re.gmatch is better performance
|
@ShiningRush missing doc |
membphis
requested changes
Mar 28, 2020
doc/plugins/cors-cn.md
Outdated
|
|
||
| ## 属性 | ||
|
|
||
| - `allow_origins`: `可选`.允许跨域访问的Origin, 格式如：`scheme`://`host`:`port`, 比如: https://somehost.com:8081. 多个值使用 `,` 分割, `allow_credential` 为 `false` 时可以使用 `*` 来表示所有 Origin均允许通过。你也可以在启用了 `allow_credential` 后使用 `**` 强制允许所有Origin都通过，但请注意这样存在安全隐患。默认值为 `*`。 |
There was a problem hiding this comment.
add space between English and Chinese
| - `allow_credential`: 是否允许跨域访问的请求方携带凭据(如 Cookie 等), 默认值为: `false`。 | ||
|
|
||
| ## 如何启用 | ||
| 创建 `Route` 或 `Service` 对象，并配置 `cors` 插件。 |
doc/plugins/cors-cn.md
Outdated
| ```shell | ||
| curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' | ||
| { | ||
| "methods": ["GET"], |
doc/plugins/cors-cn.md
Outdated
| ```shell | ||
| $ curl http://127.0.0.1:9080/apisix/admin/routes/1 -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1' -X PUT -d ' | ||
| { | ||
| "methods": ["GET"], |
|
add a reference to doc: https://github.com/apache/incubator-apisix#features |
|
The ci show the |
|
you should revert them:
|
membphis
approved these changes
Mar 29, 2020
moonming
approved these changes
Mar 29, 2020
SaberMaster
pushed a commit
to SaberMaster/incubator-apisix
that referenced
this pull request
Jun 30, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
cors plugin
Full changelog