From 6ee4ddbdb9dd901e1650988cd6f5409e84267b33 Mon Sep 17 00:00:00 2001 From: Michal Cichra Date: Thu, 7 Jun 2018 10:01:49 +0200 Subject: [PATCH 1/5] [management] fix policies API Setting cjson.array_mt would not serialize non integer elements resulting in always empty array response. --- gateway/src/apicast/management.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/gateway/src/apicast/management.lua b/gateway/src/apicast/management.lua index e22c3e1b8..a396a14b7 100644 --- a/gateway/src/apicast/management.lua +++ b/gateway/src/apicast/management.lua @@ -10,8 +10,6 @@ local resolver_cache = require('resty.resolver.cache') local env = require('resty.env') local policy_manifests_loader = require('apicast.policy_manifests_loader') -local setmetatable = setmetatable - local live = { status = 'live', success = true } local function json_response(body, status) @@ -129,7 +127,6 @@ end function _M.get_all_policy_manifests() local manifests = policy_manifests_loader.get_all() - setmetatable(manifests, cjson.array_mt) return json_response({ policies = manifests }) end From 63276afee3e03143a1cd4d6b5552349d0e2a9462 Mon Sep 17 00:00:00 2001 From: Michal Cichra Date: Mon, 4 Jun 2018 14:06:56 +0200 Subject: [PATCH 2/5] [ci] print TAP output of prove --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 1c9593706..d221458a6 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ prove: HARNESS ?= TAP::Harness prove: PROVE_FILES ?= $(call prove-files) prove: export TEST_NGINX_RANDOMIZE=1 prove: $(ROVER) nginx ## Test nginx - $(ROVER) exec script/prove -j$(NPROC) --harness=$(HARNESS) $(PROVE_FILES) + $(ROVER) exec script/prove --verbose -j$(NPROC) --harness=$(HARNESS) $(PROVE_FILES) prove-docker: apicast-source prove-docker: export IMAGE_NAME ?= apicast-test From 9fa7faeb34f736ab11574b9fc01fb5331a34d0e7 Mon Sep 17 00:00:00 2001 From: Michal Cichra Date: Mon, 4 Jun 2018 14:05:27 +0200 Subject: [PATCH 3/5] [rover] update lua-resty-jwt to support OpenSSL 1.1 --- gateway/Roverfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gateway/Roverfile.lock b/gateway/Roverfile.lock index c2df1e6c7..4ea77c735 100644 --- a/gateway/Roverfile.lock +++ b/gateway/Roverfile.lock @@ -9,7 +9,7 @@ lua-resty-env 0.4.0-1||production lua-resty-execvp 0.1.1-1||production lua-resty-http 0.12-0||production lua-resty-iputils 0.3.0-1||development -lua-resty-jwt 0.1.11-0||production +lua-resty-jwt 0.2.0-0||production lua-resty-repl 0.0.6-0||development lua-resty-url 0.2.0-1||production lua-term 0.7-1||testing From b2d17696b4446b14e50019b6f5a8765b860747e4 Mon Sep 17 00:00:00 2001 From: Michal Cichra Date: Wed, 30 May 2018 15:02:24 +0200 Subject: [PATCH 4/5] [ci] use OpenResty 1.13.6.2 --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8e76f04ef..82fc2de4a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,5 +1,5 @@ s2i-image: &s2i-image - image: quay.io/3scale/s2i-openresty-centos7:1.13.6.1-rover12 + image: quay.io/3scale/s2i-openresty-centos7:1.13.6.2-1 environment: TEST_NGINX_BINARY: openresty LUA_BIN_PATH: /opt/app-root/bin @@ -55,7 +55,7 @@ jobs: environment: S2I_VERSION: "1.1.9a-40ad911d" DOCKER_COMPOSE_VERSION: "1.16.1" - OPENRESTY_VERSION: "1.13.6.1-rover12" + OPENRESTY_VERSION: "1.13.6.2-1" steps: - <<: *setup-docker - run: | From 423c3e6324584e7494ac220c21fc1813a58819e0 Mon Sep 17 00:00:00 2001 From: Michal Cichra Date: Mon, 11 Jun 2018 08:59:50 +0200 Subject: [PATCH 5/5] [changelog] upgraded OpenResty --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed1e1a5cc..bd698c5af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/). - `THREESCALE_PORTAL_ENDPOINT` and `THREESCALE_CONFIG_FILE` are not required anymore [PR #702](https://github.com/3scale/apicast/pull/702) - The `scope` of the Rate Limit policy is `service` by default [PR #704](https://github.com/3scale/apicast/pull/704) - Decoded JWTs are now exposed in the policies context by the APIcast policy [PR #718](https://github.com/3scale/apicast/pull/718) +- Upgraded OpenResty to 1.13.6.2, uses OpenSSL 1.1 [PR #733](https://github.com/3scale/apicast/pull/733) ### Fixed