Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cdanger committed Feb 18, 2024
2 parents 0f6a7fb + ffe55f7 commit d6adc40
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 3 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,26 @@ All notable changes to this project are documented in this file following the [K
Issues reported on [GitHub](https://github.com/authzforce/core/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.


## 7.0.0
### Changed
- Upgraded parent project authzforce-ce-parent: 9.1.0
- **Migrated to Java 17 as the minimum required JRE version from now on**
- **Jakara XML Binding API (JAXB): 4.0** (javax.xml.bind.* packages/classes replaced with jakarta.xml.bind.*)
- Upgraded Apache CXF dependencies (cxf-*): 4.0.3
- Upgraded authzforce-ce-xacml-model, authzforce-ce-pdp-ext-model, authzforce-ce-xmlns-model: 9.1.0
- Upgraded dependency authzforce-ce-jaxrs-utils: 3.0.0
- **Jakarta RESTful Web Services API (JAX-RS): 3.0.0** (javax.ws.rs.* packages/classes replaced with jakarta.ws.rs.*)
- authzforce-ce-xacml-json-model: 4.1.0
- Upgraded AuthzForce Core dependencies (authzforce-ce-core-pdp-*): 21.0.1
- authzforce-ce-core-pdp-api: 22.0.0
- Upgraded dependency snakeyaml: 2.2
- Upgraded Spring-Boot-Dependencies (due to CVEs): 3.1.8

### Fixed
- [AuthzForce Core - GH-83](https://github.com/authzforce/core/issues/83): NoSuchElementException thrown when the rule combining algorithm is permit-unless-deny and there is no Deny rule but at least one Permit rule with Obligation/Advice.
- [AuthzForce Core - GH-92](https://github.com/authzforce/core/issues/92) Deny-overrides rule combining algorithm - Missing obligations in case of multiple Permit Rules and no Deny Rule (only the Obligations from the first Permit Rule were returned).


## 6.1.0
### Added
- authzforce/core#69 : Support for XACML `<StatusDetail>` / `<MissingAttributeDetail>`s, returned when missing named Attribute(s) in AttributeDesignator/AttributeSelector expressions, and may be returned by custom PDP extensions as well. See the example of [custom RequestPreprocessor](https://github.com/authzforce/core/blob/release-20.3.0/pdp-testutils/src/test/java/org/ow2/authzforce/core/pdp/testutil/test/CustomTestRequestPreprocessorFactory.java) (PDP extension) adding AttributeId/Category to [custom AttributeValues](https://github.com/authzforce/core/blob/release-20.3.0/pdp-testutils/src/test/java/org/ow2/authzforce/core/pdp/testutil/test/TestExtensibleSimpleValue.java) (PDP extension) and the [custom function](pdp-testutils/src/test/java/org/ow2/authzforce/core/pdp/testutil/test/TestExtensibleSimpleValueEqualFunction.java) (PDP extension) using this info to throw a standard `missing-attribute` error with `<MissingAttributeDetail>` inside a `<StatusDetail>` element; and also the [example of XACML response](https://github.com/authzforce/core/blob/release-20.3.0/pdp-testutils/src/test/resources/custom/CustomRequestPreproc/response.xml) and [PDP configuration](https://github.com/authzforce/core/blob/release-20.3.0/pdp-testutils/src/test/resources/custom/CustomRequestPreproc/pdp.xml).
Expand Down
2 changes: 1 addition & 1 deletion cxf-spring-boot-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM openjdk:11-jre-slim
FROM eclipse-temurin:17-jre-alpine
LABEL maintainer="AuthzForce Team"
LABEL org.label-schema.schema-version="1.0"
LABEL org.label-schema.vendor="THALES"
Expand Down
6 changes: 4 additions & 2 deletions cxf-spring-boot-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>${spring-boot.version}</version>
<!--<version>${spring-boot.version}</version>-->
<!-- Upgrading Spring boot version to fix CVE-2023-6378-->
<version>3.1.8</version>
<type>pom</type>
<scope>import</scope>
<!-- jsonassert depends on com.vaadin.external.google:android-json whose classes conflict with org.json:json; same issue with json-path -->
Expand Down Expand Up @@ -55,7 +57,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.0</version>
<version>2.2</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
Expand Down

0 comments on commit d6adc40

Please sign in to comment.