-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
feat: initial wasm support #5288
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -74,6 +74,7 @@ build-cache/ | |
t/fuzzing/__pycache__/ | ||
boofuzz-results/ | ||
*.pyc | ||
*.wasm | ||
# release tar package | ||
*.tgz | ||
release/* |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -298,7 +298,31 @@ local config_schema = { | |
} | ||
} | ||
} | ||
} | ||
}, | ||
wasm = { | ||
type = "object", | ||
properties = { | ||
plugins = { | ||
type = "array", | ||
minItems = 1, | ||
items = { | ||
type = "object", | ||
properties = { | ||
name = { | ||
type = "string" | ||
}, | ||
file = { | ||
type = "string" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ditoo |
||
}, | ||
priority = { | ||
type = "integer" | ||
} | ||
}, | ||
required = {"name", "file", "priority"} | ||
} | ||
} | ||
} | ||
}, | ||
} | ||
} | ||
|
||
|
@@ -712,6 +736,7 @@ Please modify "admin_key" in conf/config.yaml . | |
for k,v in pairs(yaml_conf.nginx_config) do | ||
sys_conf[k] = v | ||
end | ||
sys_conf["wasm"] = yaml_conf.wasm | ||
|
||
|
||
local wrn = sys_conf["worker_rlimit_nofile"] | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,120 @@ | ||
-- | ||
-- Licensed to the Apache Software Foundation (ASF) under one or more | ||
-- contributor license agreements. See the NOTICE file distributed with | ||
-- this work for additional information regarding copyright ownership. | ||
-- The ASF licenses this file to You under the Apache License, Version 2.0 | ||
-- (the "License"); you may not use this file except in compliance with | ||
-- the License. You may obtain a copy of the License at | ||
-- | ||
-- http://www.apache.org/licenses/LICENSE-2.0 | ||
-- | ||
-- Unless required by applicable law or agreed to in writing, software | ||
-- distributed under the License is distributed on an "AS IS" BASIS, | ||
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
-- See the License for the specific language governing permissions and | ||
-- limitations under the License. | ||
-- | ||
local core = require("apisix.core") | ||
local support_wasm, wasm = pcall(require, "resty.proxy-wasm") | ||
local concat = table.concat | ||
|
||
|
||
local schema = { | ||
type = "object", | ||
properties = { | ||
conf = { | ||
type = "string" | ||
}, | ||
}, | ||
required = {"conf"} | ||
} | ||
local _M = {} | ||
|
||
|
||
local function check_schema(conf) | ||
return core.schema.check(schema, conf) | ||
end | ||
|
||
|
||
local get_plugin_ctx_key | ||
do | ||
local key_buf = { | ||
nil, | ||
nil, | ||
} | ||
|
||
function get_plugin_ctx_key(ctx) | ||
key_buf[1] = ctx.conf_type | ||
key_buf[2] = ctx.conf_id | ||
return concat(key_buf, "#", 1, 2) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. style: There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The current way is faster |
||
end | ||
end | ||
|
||
local function fetch_plugin_ctx(conf, ctx, plugin) | ||
if not conf.plugin_ctxs then | ||
conf.plugin_ctxs = {} | ||
end | ||
|
||
local ctxs = conf.plugin_ctxs | ||
local key = get_plugin_ctx_key(ctx) | ||
local plugin_ctx = ctxs[key] | ||
local err | ||
if not plugin_ctx then | ||
plugin_ctx, err = wasm.on_configure(plugin, conf.conf) | ||
if not plugin_ctx then | ||
return nil, err | ||
end | ||
|
||
ctxs[key] = plugin_ctx | ||
end | ||
|
||
return plugin_ctx | ||
end | ||
|
||
|
||
local function access_wrapper(self, conf, ctx) | ||
local plugin_ctx, err = fetch_plugin_ctx(conf, ctx, self.plugin) | ||
if not plugin_ctx then | ||
core.log.error("failed to init wasm plugin ctx: ", err) | ||
return 503 | ||
end | ||
|
||
local ok, err = wasm.on_http_request_headers(plugin_ctx) | ||
if not ok then | ||
core.log.error("failed to run wasm plugin: ", err) | ||
return 503 | ||
end | ||
end | ||
|
||
|
||
function _M.require(attrs) | ||
if not support_wasm then | ||
return nil, "need to build APISIX-OpenResty to support wasm" | ||
nic-chen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
end | ||
|
||
local name = attrs.name | ||
local priority = attrs.priority | ||
local plugin, err = wasm.load(name, attrs.file) | ||
if not plugin then | ||
return nil, err | ||
nic-chen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
end | ||
|
||
local mod = { | ||
version = 0.1, | ||
name = name, | ||
priority = priority, | ||
schema = schema, | ||
check_schema = check_schema, | ||
plugin = plugin, | ||
type = "wasm", | ||
} | ||
mod.access = function (conf, ctx) | ||
return access_wrapper(mod, conf, ctx) | ||
end | ||
|
||
-- the returned values need to be the same as the Lua's 'require' | ||
return true, mod | ||
end | ||
|
||
|
||
return _M |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lack of a reasonable length range?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't need to have a limitation of the length. Otherwise people will ask they can't set a xxx with length yyy.