You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2022/10/13 07:02:25 UTC
[syncope] branch master updated: Upgrading gmavenplus-plugin, Jackson, Nimbus JOSE JWT and Swagger UI
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 952ebc2a00 Upgrading gmavenplus-plugin, Jackson, Nimbus JOSE JWT and Swagger UI
952ebc2a00 is described below
commit 952ebc2a008b3c26bf2a343d184aaa5b82d3e248
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Oct 10 15:41:12 2022 +0200
Upgrading gmavenplus-plugin, Jackson, Nimbus JOSE JWT and Swagger UI
---
.../core/rest/cxf/service/AbstractService.java | 2 +-
.../resources/domains/jpa-json/MasterContent.xml | 1 -
.../src/main/resources/domains/MasterContent.xml | 1 -
.../apache/syncope/fit/core/UserIssuesITCase.java | 45 ++++++++++++----------
pom.xml | 8 ++--
5 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractService.java b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractService.java
index 245e19b299..441bd120a8 100644
--- a/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractService.java
+++ b/core/idrepo/rest-cxf/src/main/java/org/apache/syncope/core/rest/cxf/service/AbstractService.java
@@ -62,7 +62,7 @@ public abstract class AbstractService implements JAXRSService {
protected String getActualKey(final AnyDAO<?> dao, final String pretendingKey) {
String actualKey = pretendingKey;
if (uriInfo.getPathParameters(true).containsKey("key")) {
- final String keyInPath = uriInfo.getPathParameters(true).get("key").get(0);
+ String keyInPath = uriInfo.getPathParameters(true).get("key").get(0);
if (actualKey == null) {
actualKey = keyInPath;
} else if (!actualKey.equals(keyInPath)) {
diff --git a/core/persistence-jpa-json/src/main/resources/domains/jpa-json/MasterContent.xml b/core/persistence-jpa-json/src/main/resources/domains/jpa-json/MasterContent.xml
index fc6c0f4c16..d11e887c2a 100644
--- a/core/persistence-jpa-json/src/main/resources/domains/jpa-json/MasterContent.xml
+++ b/core/persistence-jpa-json/src/main/resources/domains/jpa-json/MasterContent.xml
@@ -47,7 +47,6 @@ under the License.
<Implementation id="PushJobDelegate" type="TASKJOB_DELEGATE" engine="JAVA"
body="org.apache.syncope.core.provisioning.java.pushpull.PushJobDelegate"/>
-
<Implementation id="ExpiredAccessTokenCleanup" type="TASKJOB_DELEGATE" engine="JAVA"
body="org.apache.syncope.core.provisioning.java.job.ExpiredAccessTokenCleanup"/>
<SchedTask id="89de5014-e3f5-4462-84d8-d97575740baf" name="Access Token Cleanup Task" active="1"
diff --git a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
index 6bc79a5168..3e32eeffd9 100644
--- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
@@ -47,7 +47,6 @@ under the License.
<Implementation id="PushJobDelegate" type="TASKJOB_DELEGATE" engine="JAVA"
body="org.apache.syncope.core.provisioning.java.pushpull.PushJobDelegate"/>
-
<Implementation id="ExpiredAccessTokenCleanup" type="TASKJOB_DELEGATE" engine="JAVA"
body="org.apache.syncope.core.provisioning.java.job.ExpiredAccessTokenCleanup"/>
<SchedTask id="89de5014-e3f5-4462-84d8-d97575740baf" name="Access Token Cleanup Task" active="1"
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
index 0eab07f324..c15b8e807f 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserIssuesITCase.java
@@ -94,26 +94,6 @@ import org.springframework.jdbc.core.JdbcTemplate;
public class UserIssuesITCase extends AbstractITCase {
- @Test
- public void issueSYNCOPE1699() throws Exception {
- UserTO userTO = createUser(UserITCase.getUniqueSample("syncope1669@apache.org")).getEntity();
-
- UserUR req = new UserUR();
- req.setUsername(new StringReplacePatchItem.Builder().value("newUsername" + getUUIDString()).build());
-
- WebClient webClient = WebClient.create(ADDRESS + "/users/" + userTO.getKey(), ADMIN_UNAME, ADMIN_PWD, null).
- accept(MediaType.APPLICATION_JSON_TYPE).
- type(MediaType.APPLICATION_JSON_TYPE);
-
- Response response = webClient.invoke("PATCH", JSON_MAPPER.writeValueAsString(req));
- assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
-
- // Key is mismatched in the path parameter and the request body.
- req.setKey(UUID.randomUUID().toString());
- response = webClient.invoke("PATCH", JSON_MAPPER.writeValueAsString(req));
- assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
- }
-
@Test
public void issue186() {
// 1. create an user with strict mandatory attributes only
@@ -1576,4 +1556,29 @@ public class UserIssuesITCase extends AbstractITCase {
assertFalse(userTO.getAuxClasses().contains("csv"), "Should not contain removed auxiliary classes");
assertFalse(userTO.getRoles().contains("Other"), "Should not contain removed roles");
}
+
+ @Test
+ public void issueSYNCOPE1699() throws Exception {
+ UserTO userTO = createUser(UserITCase.getUniqueSample("syncope1669@apache.org")).getEntity();
+
+ UserUR req = new UserUR();
+ req.setUsername(new StringReplacePatchItem.Builder().value("newUsername" + getUUIDString()).build());
+
+ WebClient webClient = WebClient.create(ADDRESS + "/users/" + userTO.getKey(), ADMIN_UNAME, ADMIN_PWD, null).
+ accept(MediaType.APPLICATION_JSON_TYPE).
+ type(MediaType.APPLICATION_JSON_TYPE);
+
+ Response response = webClient.invoke("PATCH", JSON_MAPPER.writeValueAsString(req));
+ assertEquals(Response.Status.OK.getStatusCode(), response.getStatus());
+
+ // Key is mismatched in the path parameter and the request body.
+ req.setKey(UUID.randomUUID().toString());
+ response = webClient.invoke("PATCH", JSON_MAPPER.writeValueAsString(req));
+ assertEquals(Response.Status.BAD_REQUEST.getStatusCode(), response.getStatus());
+
+ // reading user by its username still works
+ userTO = USER_SERVICE.read(userTO.getKey());
+ userTO = USER_SERVICE.read(userTO.getUsername());
+ assertNotNull(userTO);
+ }
}
diff --git a/pom.xml b/pom.xml
index a60c0e012d..0f829ef50c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,9 +413,9 @@ under the License.
<cxf.version>3.5.3</cxf.version>
<bouncycastle.version>1.70</bouncycastle.version>
- <nimbus-jose-jwt.version>9.25.4</nimbus-jose-jwt.version>
+ <nimbus-jose-jwt.version>9.25.5</nimbus-jose-jwt.version>
- <jackson.version>2.14.0-rc1</jackson.version>
+ <jackson.version>2.14.0-rc2</jackson.version>
<spring-boot.version>2.7.4</spring-boot.version>
<spring-cloud-gateway.version>3.1.4</spring-cloud-gateway.version>
@@ -456,7 +456,7 @@ under the License.
<h2.version>2.1.214</h2.version>
<swagger-core.version>2.2.3</swagger-core.version>
- <swagger-ui.version>4.14.2</swagger-ui.version>
+ <swagger-ui.version>4.14.3</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -2047,7 +2047,7 @@ under the License.
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
<artifactId>gmavenplus-plugin</artifactId>
- <version>1.13.1</version>
+ <version>2.0.0</version>
<dependencies>
<dependency>
<groupId>org.apache.groovy</groupId>