From 04b8bca4b60667aae45c463b7122b2dc1f4e70f2 Mon Sep 17 00:00:00 2001 From: Sn0rt Date: Mon, 17 Jul 2023 16:06:55 +0800 Subject: [PATCH] feat: release APISIX 3.4.1 (#9849) Signed-off-by: Sn0rt --- CHANGELOG.md | 9 +++ apisix/core/version.lua | 2 +- docs/en/latest/building-apisix.md | 2 +- docs/en/latest/config.json | 2 +- docs/zh/latest/CHANGELOG.md | 7 ++ docs/zh/latest/config.json | 2 +- rockspec/apisix-3.4.1-0.rockspec | 103 ++++++++++++++++++++++++++++++ rockspec/apisix-master-0.rockspec | 2 +- 8 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 rockspec/apisix-3.4.1-0.rockspec diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ed7484e4cfe..44c75d9f5594 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,7 @@ title: Changelog ## Table of Contents +- [3.4.1](#341) - [3.4.0](#340) - [3.3.0](#330) - [3.2.1](#321) @@ -71,6 +72,14 @@ title: Changelog - [0.7.0](#070) - [0.6.0](#060) +## 3.4.1 + +The 3.4.1 version is mainly for security update. + +### Security + +- Upgrade the `lua-resty-jwt` module to version 0.2.5. [#9837](https://github.com/apache/apisix/pull/9837) + ## 3.4.0 ### Core diff --git a/apisix/core/version.lua b/apisix/core/version.lua index 7ba204811a82..4aaa8386a46f 100644 --- a/apisix/core/version.lua +++ b/apisix/core/version.lua @@ -20,5 +20,5 @@ -- @module core.version return { - VERSION = "3.4.0" + VERSION = "3.4.1" } diff --git a/docs/en/latest/building-apisix.md b/docs/en/latest/building-apisix.md index 01d4ac331240..49e813c3a78a 100644 --- a/docs/en/latest/building-apisix.md +++ b/docs/en/latest/building-apisix.md @@ -52,7 +52,7 @@ curl https://raw.githubusercontent.com/apache/apisix/master/utils/install-depend Save the APISIX version to an environment variable to be used next: ```shell -APISIX_VERSION='3.4.0' +APISIX_VERSION='3.4.1' ``` Clone the APISIX source code of this version into a new directory `apisix-APISIX_VERSION`: diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json index 96fc3c57d524..f29792d33095 100644 --- a/docs/en/latest/config.json +++ b/docs/en/latest/config.json @@ -1,5 +1,5 @@ { - "version": "3.4.0", + "version": "3.4.1", "sidebar": [ { "type": "category", diff --git a/docs/zh/latest/CHANGELOG.md b/docs/zh/latest/CHANGELOG.md index b53b9ff0ee04..e489563cbb54 100644 --- a/docs/zh/latest/CHANGELOG.md +++ b/docs/zh/latest/CHANGELOG.md @@ -23,6 +23,7 @@ title: CHANGELOG ## Table of Contents +- [3.4.1](#341) - [3.4.0](#340) - [3.3.0](#330) - [3.2.1](#321) @@ -71,6 +72,12 @@ title: CHANGELOG - [0.7.0](#070) - [0.6.0](#060) +## 3.4.1 + +### Security + +- 升级 `lua-resty-jwt` 到 0.2.5 版本。修复安全问题 [#9837](https://github.com/apache/apisix/pull/9837) + ## 3.4.0 ### Core diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json index 5e3627a6c7c5..4781e545319c 100644 --- a/docs/zh/latest/config.json +++ b/docs/zh/latest/config.json @@ -1,5 +1,5 @@ { - "version": "3.4.0", + "version": "3.4.1", "sidebar": [ { "type": "doc", diff --git a/rockspec/apisix-3.4.1-0.rockspec b/rockspec/apisix-3.4.1-0.rockspec new file mode 100644 index 000000000000..df64af4a0b6e --- /dev/null +++ b/rockspec/apisix-3.4.1-0.rockspec @@ -0,0 +1,103 @@ +-- +-- 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. +-- + +package = "apisix" +version = "3.4.1-0" +supported_platforms = {"linux", "macosx"} + +source = { + url = "git://github.com/apache/apisix", + branch = "3.4.1", +} + +description = { + summary = "Apache APISIX is a cloud-native microservices API gateway, delivering the ultimate performance, security, open source and scalable platform for all your APIs and microservices.", + homepage = "https://github.com/apache/apisix", + license = "Apache License 2.0", +} + +dependencies = { + "lua-resty-ctxdump = 0.1-0", + "api7-lua-resty-dns-client = 7.0.1", + "lua-resty-template = 2.0", + "lua-resty-etcd = 1.10.4", + "api7-lua-resty-http = 0.2.0", + "lua-resty-balancer = 0.04", + "lua-resty-ngxvar = 0.5.2", + "lua-resty-jit-uuid = 0.0.7", + "lua-resty-healthcheck-api7 = 3.0.0", + "api7-lua-resty-jwt = 0.2.5", + "lua-resty-hmac-ffi = 0.05", + "lua-resty-cookie = 0.1.0", + "lua-resty-session = 3.10", + "opentracing-openresty = 0.1", + "lua-resty-radixtree = 2.8.2", + "lua-protobuf = 0.4.1", + "lua-resty-openidc = 1.7.5", + "luafilesystem = 1.7.0-2", + "api7-lua-tinyyaml = 0.4.2", + "nginx-lua-prometheus = 0.20221218", + "jsonschema = 0.9.8", + "lua-resty-ipmatcher = 0.6.1", + "lua-resty-kafka = 0.20-0", + "lua-resty-logger-socket = 2.0.1-0", + "skywalking-nginx-lua = 0.6.0", + "base64 = 1.5-2", + "binaryheap = 0.4", + "api7-dkjson = 0.1.1", + "resty-redis-cluster = 1.02-4", + "lua-resty-expr = 1.3.2", + "graphql = 0.0.2", + "argparse = 0.7.1-1", + "luasocket = 3.1.0-1", + "luasec = 0.9-1", + "lua-resty-consul = 0.3-2", + "penlight = 1.9.2-1", + "ext-plugin-proto = 0.6.0", + "casbin = 1.41.5", + "api7-snowflake = 2.0-1", + "inspect == 3.1.1", + "lualdap = 1.2.6-1", + "lua-resty-rocketmq = 0.3.0-0", + "opentelemetry-lua = 0.2-3", + "net-url = 0.9-1", + "xml2lua = 1.5-2", + "nanoid = 0.1-1", + "lua-resty-mediador = 0.1.2-1", + "lua-resty-ldap = 0.2.2-0" +} + +build = { + type = "make", + build_variables = { + CFLAGS="$(CFLAGS)", + LIBFLAG="$(LIBFLAG)", + LUA_LIBDIR="$(LUA_LIBDIR)", + LUA_BINDIR="$(LUA_BINDIR)", + LUA_INCDIR="$(LUA_INCDIR)", + LUA="$(LUA)", + OPENSSL_INCDIR="$(OPENSSL_INCDIR)", + OPENSSL_LIBDIR="$(OPENSSL_LIBDIR)", + }, + install_variables = { + ENV_INST_PREFIX="$(PREFIX)", + ENV_INST_BINDIR="$(BINDIR)", + ENV_INST_LIBDIR="$(LIBDIR)", + ENV_INST_LUADIR="$(LUADIR)", + ENV_INST_CONFDIR="$(CONFDIR)", + }, +} diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec index ab3bee75c877..ec72357b159c 100644 --- a/rockspec/apisix-master-0.rockspec +++ b/rockspec/apisix-master-0.rockspec @@ -40,7 +40,7 @@ dependencies = { "lua-resty-ngxvar = 0.5.2", "lua-resty-jit-uuid = 0.0.7", "lua-resty-healthcheck-api7 = 3.0.0", - "api7-lua-resty-jwt = 0.2.4", + "api7-lua-resty-jwt = 0.2.5", "lua-resty-hmac-ffi = 0.05", "lua-resty-cookie = 0.1.0", "lua-resty-session = 3.10",