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/07/04 12:00:32 UTC
[syncope] branch master updated (09ea39b15a -> 931e6e3cf1)
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
from 09ea39b15a [SYNCOPE-1545] Allow to bypass approval prompt for OIDC apps
new 653fd0f268 Upgrading Curator and MariaDB JDBC driver
new 931e6e3cf1 [SYNCOPE-1545] Completing bypass approval prompt for OIDC apps
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../clientapps/ClientAppModalPanelBuilder.java | 12 ++++++++----
.../console/clientapps/OIDCRPDirectoryPanel.java | 4 +++-
.../clientapps/ClientAppDirectoryPanel.properties | 1 +
.../ClientAppDirectoryPanel_fr_CA.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_it.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_ja.properties | 1 +
.../ClientAppDirectoryPanel_pt_BR.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_ru.properties | 1 +
.../console/policies/PolicyDirectoryPanel.properties | 2 +-
.../policies/PolicyDirectoryPanel_fr_CA.properties | 2 +-
.../policies/PolicyDirectoryPanel_it.properties | 2 +-
.../policies/PolicyDirectoryPanel_ja.properties | 2 +-
.../policies/PolicyDirectoryPanel_pt_BR.properties | 2 +-
.../policies/PolicyDirectoryPanel_ru.properties | 2 +-
.../org/apache/syncope/fit/sra/OIDCSRAITCase.java | 1 +
.../java/org/apache/syncope/fit/ui/OIDC4UIITCase.java | 1 +
pom.xml | 4 ++--
sra/src/test/resources/keyStore.p12 | Bin 2793 -> 2722 bytes
18 files changed, 27 insertions(+), 13 deletions(-)
[syncope] 02/02: [SYNCOPE-1545] Completing bypass approval prompt for OIDC apps
Posted by il...@apache.org.
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
commit 931e6e3cf130df09141341b0f3852204f69cffca
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Jul 4 14:00:24 2022 +0200
[SYNCOPE-1545] Completing bypass approval prompt for OIDC apps
---
.../clientapps/ClientAppModalPanelBuilder.java | 12 ++++++++----
.../console/clientapps/OIDCRPDirectoryPanel.java | 4 +++-
.../clientapps/ClientAppDirectoryPanel.properties | 1 +
.../ClientAppDirectoryPanel_fr_CA.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_it.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_ja.properties | 1 +
.../ClientAppDirectoryPanel_pt_BR.properties | 1 +
.../clientapps/ClientAppDirectoryPanel_ru.properties | 1 +
.../console/policies/PolicyDirectoryPanel.properties | 2 +-
.../policies/PolicyDirectoryPanel_fr_CA.properties | 2 +-
.../policies/PolicyDirectoryPanel_it.properties | 2 +-
.../policies/PolicyDirectoryPanel_ja.properties | 2 +-
.../policies/PolicyDirectoryPanel_pt_BR.properties | 2 +-
.../policies/PolicyDirectoryPanel_ru.properties | 2 +-
.../org/apache/syncope/fit/sra/OIDCSRAITCase.java | 1 +
.../java/org/apache/syncope/fit/ui/OIDC4UIITCase.java | 1 +
sra/src/test/resources/keyStore.p12 | Bin 2793 -> 2722 bytes
17 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
index 6c09a82cb9..e9a93ef6f4 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
@@ -77,7 +77,7 @@ public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractM
@Override
protected Map<String, String> load() {
return PolicyRestClient.list(PolicyType.ACCESS).stream().
- collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getName));
+ collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getName));
}
};
@@ -88,7 +88,7 @@ public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractM
@Override
protected Map<String, String> load() {
return PolicyRestClient.list(PolicyType.ATTR_RELEASE).stream().
- collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getName));
+ collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getName));
}
};
@@ -99,7 +99,7 @@ public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractM
@Override
protected Map<String, String> load() {
return PolicyRestClient.list(PolicyType.AUTH).stream().
- collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getName));
+ collect(Collectors.toMap(PolicyTO::getKey, PolicyTO::getName));
}
};
@@ -189,6 +189,8 @@ public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractM
fields.add(clientId.setRequired(true));
name.getField().add(new IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+ private static final long serialVersionUID = -6139318907146065915L;
+
@Override
protected void onUpdate(final AjaxRequestTarget target) {
if (StringUtils.isBlank(clientId.getModelObject())) {
@@ -206,7 +208,9 @@ public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractM
fields.add(new AjaxCheckBoxPanel(
"field", "signIdToken", new PropertyModel<>(clientAppTO, "signIdToken")));
fields.add(new AjaxCheckBoxPanel(
- "field", "jwtAccessToken", new PropertyModel<>(clientAppTO, "jwtAccessToken")));
+ "field", "jwtAccessToken", new PropertyModel<>(clientAppTO, "jwtAccessToken")));
+ fields.add(new AjaxCheckBoxPanel(
+ "field", "bypassApprovalPrompt", new PropertyModel<>(clientAppTO, "bypassApprovalPrompt")));
AjaxDropDownChoicePanel<OIDCSubjectType> subjectType = new AjaxDropDownChoicePanel<>(
"field", "subjectType", new PropertyModel<>(clientAppTO, "subjectType"), false);
diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
index 7a6ae15171..92387b6095 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/OIDCRPDirectoryPanel.java
@@ -33,7 +33,7 @@ import org.apache.wicket.model.StringResourceModel;
public class OIDCRPDirectoryPanel extends ClientAppDirectoryPanel<OIDCRPClientAppTO> {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -9182884609300468766L;
public OIDCRPDirectoryPanel(final String id, final PageReference pageRef) {
super(id, ClientAppType.OIDCRP, pageRef);
@@ -54,6 +54,8 @@ public class OIDCRPDirectoryPanel extends ClientAppDirectoryPanel<OIDCRPClientAp
new StringResourceModel("redirectUris", this), "redirectUris", "redirectUris"));
columns.add(new BooleanConditionColumn<>(new StringResourceModel("logout")) {
+ private static final long serialVersionUID = -8236820422411536323L;
+
@Override
protected boolean isCondition(final IModel<OIDCRPClientAppTO> rowModel) {
return StringUtils.isNotBlank(rowModel.getObject().getLogoutUri());
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
index d2e4bb4c77..625bcf3dab 100644
--- a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel.properties
@@ -57,3 +57,4 @@ accessPolicy=Access Policy
attrReleasePolicy=Attribute Release Policy
properties.title=Properties for ${name}
type_extensions.title=properties
+bypassApprovalPrompt=Bypass Approval Prompt
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
index aead9b0b9e..b90f283f43 100644
--- a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_fr_CA.properties
@@ -57,3 +57,4 @@ accessPolicy=Access Policy
attrReleasePolicy=Attribute Release Policy
properties.title=Properties for ${name}
type_extensions.title=properties
+bypassApprovalPrompt=Bypass Approval Prompt
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
index 49ccbf60b3..d280a11c3c 100644
--- a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_it.properties
@@ -57,3 +57,4 @@ accessPolicy=Politica Accesso
attrReleasePolicy=Politica Rilascio Attributi
properties.title=Propriet\u00e0 di ${name}
type_extensions.title=propriet\u00e0
+bypassApprovalPrompt=Salta richiesta approvazione
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
index 114a9d2c3c..d3d1364c84 100644
--- a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ja.properties
@@ -57,3 +57,4 @@ accessPolicy=Access Policy
attrReleasePolicy=Attribute Release Policy
properties.title=Properties for ${name}
type_extensions.title=properties
+bypassApprovalPrompt=Bypass Approval Prompt
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
index d2e4bb4c77..625bcf3dab 100644
--- a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_pt_BR.properties
@@ -57,3 +57,4 @@ accessPolicy=Access Policy
attrReleasePolicy=Attribute Release Policy
properties.title=Properties for ${name}
type_extensions.title=properties
+bypassApprovalPrompt=Bypass Approval Prompt
diff --git a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
index 3882b4872d..47b953f751 100644
--- a/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
+++ b/client/am/console/src/main/resources/org/apache/syncope/client/console/clientapps/ClientAppDirectoryPanel_ru.properties
@@ -58,3 +58,4 @@ accessPolicy=Access Policy
attrReleasePolicy=Attribute Release Policy
properties.title=Properties for ${name}
type_extensions.title=properties
+bypassApprovalPrompt=Bypass Approval Prompt
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
index 98454bb6a6..bf70e37271 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.properties
@@ -38,7 +38,7 @@ type_extensions.title=required attributes
type_extensions.class=fas fa-check-circle
claim.title=rejected attributes
claim.class=far fa-check-circle
-status=Status
+status=Attribute Consent
allowedAttrs=Allowed Attributes
excludedAttrs=Excluded Attributes
includeOnlyAttrs=Include Only Attributes
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_fr_CA.properties
index 8adddbd263..543306b952 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_fr_CA.properties
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_fr_CA.properties
@@ -38,7 +38,7 @@ type_extensions.title=required attributes
type_extensions.class=fas fa-check-circle
claim.title=rejected attributes
claim.class=far fa-check-circle
-status=Status
+status=Attribute Consent
allowedAttrs=Allowed Attributes
excludedAttrs=Excluded Attributes
includeOnlyAttrs=Include Only Attributes
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
index 99c62d4816..bef719541a 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_it.properties
@@ -38,7 +38,7 @@ type_extensions.title=attributi richiesti
type_extensions.class=fas fa-check-circle
claim.title=attributi rifiutati
claim.class=far fa-check-circle
-status=Stato
+status=Consenso Attributi
allowedAttrs=Attributi Consentiti
excludedAttrs=Attributi Esclusi
includeOnlyAttrs=Attributi Inclusi
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ja.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ja.properties
index f167bf3b22..470d5f6027 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ja.properties
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ja.properties
@@ -38,7 +38,7 @@ type_extensions.title=required attributes
type_extensions.class=fas fa-check-circle
claim.title=rejected attributes
claim.class=far fa-check-circle
-status=Status
+status=Attribute Consent
allowedAttrs=Allowed Attributes
excludedAttrs=Excluded Attributes
includeOnlyAttrs=Include Only Attributes
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
index 87254c0787..2641920a58 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_pt_BR.properties
@@ -38,7 +38,7 @@ type_extensions.title=required attributes
type_extensions.class=fas fa-check-circle
claim.title=rejected attributes
claim.class=far fa-check-circle
-status=Status
+status=Attribute Consent
allowedAttrs=Allowed Attributes
excludedAttrs=Excluded Attributes
includeOnlyAttrs=Include Only Attributes
diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
index 963b7d6b2d..da193407a5 100644
--- a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
+++ b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/policies/PolicyDirectoryPanel_ru.properties
@@ -39,7 +39,7 @@ type_extensions.title=required attributes
type_extensions.class=fas fa-check-circle
claim.title=rejected attributes
claim.class=far fa-check-circle
-status=Status
+status=Attribute Consent
allowedAttrs=Allowed Attributes
excludedAttrs=Excluded Attributes
includeOnlyAttrs=Include Only Attributes
diff --git a/fit/wa-reference/src/test/java/org/apache/syncope/fit/sra/OIDCSRAITCase.java b/fit/wa-reference/src/test/java/org/apache/syncope/fit/sra/OIDCSRAITCase.java
index 08f5a35b6f..5cb2c39e49 100644
--- a/fit/wa-reference/src/test/java/org/apache/syncope/fit/sra/OIDCSRAITCase.java
+++ b/fit/wa-reference/src/test/java/org/apache/syncope/fit/sra/OIDCSRAITCase.java
@@ -96,6 +96,7 @@ public class OIDCSRAITCase extends AbstractSRAITCase {
app.setClientAppId(clientAppId);
app.setClientId(clientId);
app.setClientSecret(clientSecret);
+ app.setBypassApprovalPrompt(false);
Response response = CLIENT_APP_SERVICE.create(ClientAppType.OIDCRP, app);
if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) {
diff --git a/fit/wa-reference/src/test/java/org/apache/syncope/fit/ui/OIDC4UIITCase.java b/fit/wa-reference/src/test/java/org/apache/syncope/fit/ui/OIDC4UIITCase.java
index 8839169402..f4dbfb4f79 100644
--- a/fit/wa-reference/src/test/java/org/apache/syncope/fit/ui/OIDC4UIITCase.java
+++ b/fit/wa-reference/src/test/java/org/apache/syncope/fit/ui/OIDC4UIITCase.java
@@ -66,6 +66,7 @@ public class OIDC4UIITCase extends AbstractUIITCase {
app.setClientAppId(appId);
app.setClientId(appName);
app.setClientSecret(appName);
+ app.setBypassApprovalPrompt(false);
Response response = CLIENT_APP_SERVICE.create(ClientAppType.OIDCRP, app);
if (response.getStatusInfo().getStatusCode() != Response.Status.CREATED.getStatusCode()) {
diff --git a/sra/src/test/resources/keyStore.p12 b/sra/src/test/resources/keyStore.p12
index c4b213cf32..a5d951c8e2 100644
Binary files a/sra/src/test/resources/keyStore.p12 and b/sra/src/test/resources/keyStore.p12 differ
[syncope] 01/02: Upgrading Curator and MariaDB JDBC driver
Posted by il...@apache.org.
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
commit 653fd0f268cb17c051a9297ac7ce5d1b4fcfbd03
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Mon Jul 4 14:00:01 2022 +0200
Upgrading Curator and MariaDB JDBC driver
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e2328ef2c..79f5d49c57 100644
--- a/pom.xml
+++ b/pom.xml
@@ -475,7 +475,7 @@ under the License.
<antlr4.version>4.10.1</antlr4.version>
- <curator.version>5.2.0</curator.version>
+ <curator.version>5.3.0</curator.version>
<zookeeper.version>3.8.0</zookeeper.version>
<testds.port>1389</testds.port>
@@ -512,7 +512,7 @@ under the License.
<jdbc.postgresql.version>42.3.6</jdbc.postgresql.version>
<jdbc.mysql.version>8.0.28</jdbc.mysql.version>
- <jdbc.mariadb.version>2.7.5</jdbc.mariadb.version>
+ <jdbc.mariadb.version>3.0.5</jdbc.mariadb.version>
<jdbc.mssql.version>10.2.1.jre</jdbc.mssql.version>
<jdbc.oracle.version>21.5.0.0</jdbc.oracle.version>