From 7f7fbd96ef482e4bf6bed46cb62dce8691661cd4 Mon Sep 17 00:00:00 2001 From: cdanger Date: Sun, 27 Mar 2022 21:09:36 +0200 Subject: [PATCH 1/7] updating poms for 11.0.1-SNAPSHOT development --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index bde165f..18604a9 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 10.1.2-SNAPSHOT + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index aa631d4..467d1b2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 10.1.2-SNAPSHOT + 11.0.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index adf30c2..060ca8d 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 10.1.2-SNAPSHOT + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index ca036fa..d32e0a1 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 10.1.2-SNAPSHOT + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index 24411f3..09d71c7 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 10.1.2-SNAPSHOT + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-webapp From 8b2792c3d9e23c0b2c497932693d32fd74f905a5 Mon Sep 17 00:00:00 2001 From: cdanger Date: Sun, 27 Mar 2022 23:39:55 +0200 Subject: [PATCH 2/7] updating develop poms to master versions to avoid merge conflicts --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index 18604a9..e7718c1 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.0 ../pom.xml authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index 467d1b2..d5da0c3 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.0 pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index 060ca8d..f98fa8d 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.0 ../pom.xml authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index d32e0a1..27a37f4 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.0 ../pom.xml authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index 09d71c7..f95bcde 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.0 ../pom.xml authzforce-ce-server-webapp From 111d00cba86998d837072058ba3fb73021c8a92e Mon Sep 17 00:00:00 2001 From: cdanger Date: Sun, 27 Mar 2022 23:39:55 +0200 Subject: [PATCH 3/7] Updating develop poms back to pre merge state --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index e7718c1..18604a9 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.0 + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index d5da0c3..467d1b2 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 11.0.0 + 11.0.1-SNAPSHOT pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index f98fa8d..060ca8d 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.0 + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index 27a37f4..d32e0a1 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.0 + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index f95bcde..09d71c7 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.0 + 11.0.1-SNAPSHOT ../pom.xml authzforce-ce-server-webapp From 96675d27f8f8db47b7ad2fea493aacefbd70e7c6 Mon Sep 17 00:00:00 2001 From: Cyril Dangerville <1372580+cdanger@users.noreply.github.com> Date: Mon, 28 Mar 2022 01:50:58 +0200 Subject: [PATCH 4/7] Update CHANGELOG.md --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bdd09a2..1575dc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,8 +20,8 @@ Issues reported on [GitHub](https://github.com/authzforce/server/issues) are ref - authzforce-ce-core-pdp-api to 21.2.0 ### Added -- Feature: XPath variables in `AttributeSelector`s' and `xPathExpression` `AttributeValue`s' XPath expressions can now be defined by XACML `VariableDefinitions` (variable name used as XACML `VariableId`), which means XACML Variables can be used as XPath variables there. -- Feature: XACML `VariableReference`s can be used (indirectly) in `Match` elements through special `AttributeDesignators`, i.e. by enabling the new built-in Attribute Provider (`XacmlVariableBasedAttributeProvider` class) with an `attributeProvider` element of the new type `XacmlVarBasedAttributeProviderDescriptor` in PDP configuration, any `AttributeDesignator`s with `Category` matching the `attributeProvider/@category` in PDP configuration is handled as a `VariableReference` and the `AttributeId` is handled as the `VariableId`. +- **New feature**: XPath variables in `AttributeSelector`s' and `xPathExpression` `AttributeValue`s' XPath expressions can now be defined by XACML `VariableDefinitions` (variable name used as XACML `VariableId`), which means XACML Variables can be used as XPath variables there. +- **New feature**: XACML `VariableReference`s can be used (indirectly) in `Match` elements through special `AttributeDesignators`, i.e. by enabling the new built-in Attribute Provider (`XacmlVariableBasedAttributeProvider` class) with an `attributeProvider` element of the new type `XacmlVarBasedAttributeProviderDescriptor` in PDP configuration, any `AttributeDesignator`s with `Category` matching the `attributeProvider/@category` in PDP configuration is handled as a `VariableReference` and the `AttributeId` is handled as the `VariableId`. ### Fixed - [GH-66]: Support any XML namespace prefix declared on root PolicySet element in XACML AttributeSelectors' XPath expressions (namespace-aware evaluation). From df6e4dd91d8d8600cb303617d16dc166f3663afa Mon Sep 17 00:00:00 2001 From: cdanger Date: Thu, 9 Jun 2022 16:33:32 +0200 Subject: [PATCH 5/7] - Fixed #22 --- dist/src/docker/Dockerfile.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist/src/docker/Dockerfile.tmpl b/dist/src/docker/Dockerfile.tmpl index b88e3e0..85b6904 100644 --- a/dist/src/docker/Dockerfile.tmpl +++ b/dist/src/docker/Dockerfile.tmpl @@ -23,7 +23,7 @@ # The alternative is to use FROM ubuntu:* then install tomcat ubuntu package and use upstart/sysctl init script but this is not the way to go: # https://github.com/docker/docker/issues/6800 -FROM tomcat:9-jre11-slim +FROM tomcat:9-jre11-temurin-focal MAINTAINER AuthzForce Team ENV DEBIAN_FRONTEND noninteractive From 36f44cf49b2a104a2d78f1c49fe044a9a848d0c8 Mon Sep 17 00:00:00 2001 From: cdanger Date: Thu, 9 Jun 2022 16:33:47 +0200 Subject: [PATCH 6/7] - Fixed #22 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1575dc4..812708e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ All notable changes to this project are documented in this file following the [K Issues reported on [GitHub](https://github.com/authzforce/server/issues) are referenced in the form of `[GH-N]`, where N is the issue number. Issues reported on [OW2](https://jira.ow2.org/browse/AUTHZFORCE/) are mentioned in the form of `[OW2-N]`, where N is the issue number. +## 11.0.1 +### Fixed +- [GH-22]: replaced vulnerable Tomcat base image with latest official (tomcat:9-jre11-temurin-focal) for Docker. + + ## 11.0.0 ### Changed - **Supported PDP configuration schema version is now 8.0 minimum: if you are already using AuthzForce Server 10.x or older and wish to migrate to this new version, follow the [Upgrader tool instructions](upgrader/src/README.md)** From bfaeebb1075492ab9f1d8a5ad3d1b286098cf769 Mon Sep 17 00:00:00 2001 From: cdanger Date: Thu, 9 Jun 2022 16:34:51 +0200 Subject: [PATCH 7/7] updating poms for branch'release/11.0.1' with non-snapshot versions --- dist/pom.xml | 2 +- pom.xml | 2 +- rest-service/pom.xml | 2 +- upgrader/pom.xml | 2 +- webapp/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dist/pom.xml b/dist/pom.xml index 18604a9..aa64523 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.1 ../pom.xml authzforce-ce-server-dist diff --git a/pom.xml b/pom.xml index 467d1b2..024dbef 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.1 pom ${project.groupId}:${project.artifactId} AuthzForce CE Server diff --git a/rest-service/pom.xml b/rest-service/pom.xml index 060ca8d..060298e 100644 --- a/rest-service/pom.xml +++ b/rest-service/pom.xml @@ -4,7 +4,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.1 ../pom.xml authzforce-ce-server-rest-service diff --git a/upgrader/pom.xml b/upgrader/pom.xml index d32e0a1..38305db 100644 --- a/upgrader/pom.xml +++ b/upgrader/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.1 ../pom.xml authzforce-ce-server-upgrader diff --git a/webapp/pom.xml b/webapp/pom.xml index 09d71c7..ed52a99 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -3,7 +3,7 @@ org.ow2.authzforce authzforce-ce-server - 11.0.1-SNAPSHOT + 11.0.1 ../pom.xml authzforce-ce-server-webapp