summaryrefslogtreecommitdiffstats
path: root/msb-core/openresty-ext
diff options
context:
space:
mode:
authorzhouruiyu <zhouruiyu@huawei.com>2016-10-31 16:51:39 +0800
committerzhouruiyu <zhouruiyu@huawei.com>2016-10-31 16:51:39 +0800
commit82d735771cb9678cd8d5240fb9f434ae28eb1ac0 (patch)
treea1094509c16dd291131931d075d92f5651c96f60 /msb-core/openresty-ext
parentf247d9d96e6bd79d006a24b2c69a5120251c895a (diff)
change the driver redirect timeout to 5 minute ; change the auth plugin white list path into portal-package.
https://jira.open-o.org/browse/OCS-142 Change-Id: Ifbb83e8f8b7eefc273dc448420e2d9c1eb91fd65 Signed-off-by: zhouruiyu <zhouruiyu@huawei.com>
Diffstat (limited to 'msb-core/openresty-ext')
-rw-r--r--msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua2
-rw-r--r--msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua4
2 files changed, 4 insertions, 2 deletions
diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua
index 6eafc61..8e0624b 100644
--- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua
+++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/auth.lua
@@ -25,7 +25,7 @@ local redirect_url = "/openoui/common/login.html"
local white_list= {
auth_token_url,
redirect_url,
- '/openoui/common/'
+ '/portal-package/common/'
};
local function verify_value(value)
diff --git a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua
index fac8a64..45d327d 100644
--- a/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua
+++ b/msb-core/openresty-ext/src/assembly/resources/openresty/nginx/luaext/plugins/driver_manager.lua
@@ -104,7 +104,9 @@ function _M.access()
local actual_body = get_body_params()
ngx.log(ngx.ERR, "HTTP request to driver... ", " Request to driver manager")
- local res, err = http.new():request_uri(driver_url, {
+ local httpc = http.new();
+ httpc:set_timeout(300000);
+ local res, err = httpc:request_uri(driver_url, {
method = ngx.req.get_method(),
body = actual_body,
headers = actual_headers