syncope git commit: Switch to using Mime decoder
Repository: syncope Updated Branches: refs/heads/master 4ba66c335 -> eb69eb8dd Switch to using Mime decoder Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/eb69eb8d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/eb69eb8d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/eb69eb8d Branch: refs/heads/master Commit: eb69eb8dd511c9e77d4cea2fc2dbd2cf65616ee2 Parents: 4ba66c3 Author: Colm O hEigeartaighAuthored: Mon Apr 3 15:01:51 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Apr 3 15:01:51 2017 +0100 -- .../java/org/apache/syncope/core/logic/saml2/SAML2IdPEntity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/eb69eb8d/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2IdPEntity.java -- diff --git a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2IdPEntity.java b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2IdPEntity.java index 40cecf7..a9b1b0d 100644 --- a/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2IdPEntity.java +++ b/ext/saml2sp/logic/src/main/java/org/apache/syncope/core/logic/saml2/SAML2IdPEntity.java @@ -98,7 +98,7 @@ public class SAML2IdPEntity { for (X509Data x509Data : key.getKeyInfo().getX509Datas()) { for (org.opensaml.xmlsec.signature.X509Certificate cert : x509Data.getX509Certificates()) { try (ByteArrayInputStream bais = new ByteArrayInputStream( -Base64.getDecoder().decode(cert.getValue( { +Base64.getMimeDecoder().decode(cert.getValue( { chain.add(X509Certificate.class.cast(cf.generateCertificate(bais))); } }
syncope git commit: [SYNCOPE-1052] fixed captcha api to reload captcha, this api is reacheable only if captcha is enabled
Repository: syncope Updated Branches: refs/heads/master 4fe838d2d -> 4ba66c335 [SYNCOPE-1052] fixed captcha api to reload captcha, this api is reacheable only if captcha is enabled Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4ba66c33 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4ba66c33 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4ba66c33 Branch: refs/heads/master Commit: 4ba66c335f5ab7bc7f51ea2ef1568ad03b299eda Parents: 4fe838d Author: Andrea PatricelliAuthored: Mon Apr 3 13:15:06 2017 +0200 Committer: Andrea Patricelli Committed: Mon Apr 3 14:08:48 2017 +0200 -- .../client/enduser/SyncopeEnduserApplication.java | 13 + .../client/enduser/resources/CaptchaResource.java | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/4ba66c33/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java index 7bec115..cfed2c5 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.syncope.client.enduser.annotations.Resource; import org.apache.syncope.client.enduser.init.ClassPathScanImplementationLookup; import org.apache.syncope.client.enduser.init.EnduserInitializer; +import org.apache.syncope.client.enduser.resources.CaptchaResource; import org.apache.syncope.client.lib.SyncopeClientFactoryBean; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.wicket.Page; @@ -156,6 +157,18 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali } } } +//mount captcha resource only if captcha is enabled +if (captchaEnabled) { +mountResource("/api/captcha", new ResourceReference("captcha") { + +private static final long serialVersionUID = -128426276529456602L; + +@Override +public IResource getResource() { +return new CaptchaResource(); +} +}); +} } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/4ba66c33/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java index 7cae211..528bc46 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java @@ -21,13 +21,11 @@ package org.apache.syncope.client.enduser.resources; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.RandomStringUtils; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; -import org.apache.syncope.client.enduser.annotations.Resource; import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource; import org.apache.wicket.request.cycle.RequestCycle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Resource(key = "captcha", path = "/api/captcha") public class CaptchaResource extends CaptchaImageResource { private static final long serialVersionUID = 8293404296348102926L;
syncope git commit: [SYNCOPE-1052] fixed captcha api to reload captcha, this api is reacheable only if captcha is enabled
Repository: syncope Updated Branches: refs/heads/2_0_X 68bd6b431 -> e985d3248 [SYNCOPE-1052] fixed captcha api to reload captcha, this api is reacheable only if captcha is enabled Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e985d324 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e985d324 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e985d324 Branch: refs/heads/2_0_X Commit: e985d3248a6476b522b200bc9381a5629beff3df Parents: 68bd6b4 Author: Andrea PatricelliAuthored: Mon Apr 3 13:15:06 2017 +0200 Committer: Andrea Patricelli Committed: Mon Apr 3 14:09:33 2017 +0200 -- .../client/enduser/SyncopeEnduserApplication.java | 13 + .../client/enduser/resources/CaptchaResource.java | 2 -- 2 files changed, 13 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/e985d324/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java index 7bec115..cfed2c5 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeEnduserApplication.java @@ -28,6 +28,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.syncope.client.enduser.annotations.Resource; import org.apache.syncope.client.enduser.init.ClassPathScanImplementationLookup; import org.apache.syncope.client.enduser.init.EnduserInitializer; +import org.apache.syncope.client.enduser.resources.CaptchaResource; import org.apache.syncope.client.lib.SyncopeClientFactoryBean; import org.apache.syncope.common.lib.SyncopeConstants; import org.apache.wicket.Page; @@ -156,6 +157,18 @@ public class SyncopeEnduserApplication extends WebApplication implements Seriali } } } +//mount captcha resource only if captcha is enabled +if (captchaEnabled) { +mountResource("/api/captcha", new ResourceReference("captcha") { + +private static final long serialVersionUID = -128426276529456602L; + +@Override +public IResource getResource() { +return new CaptchaResource(); +} +}); +} } @Override http://git-wip-us.apache.org/repos/asf/syncope/blob/e985d324/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java index 7cae211..528bc46 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/CaptchaResource.java @@ -21,13 +21,11 @@ package org.apache.syncope.client.enduser.resources; import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang3.RandomStringUtils; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; -import org.apache.syncope.client.enduser.annotations.Resource; import org.apache.wicket.extensions.markup.html.captcha.CaptchaImageResource; import org.apache.wicket.request.cycle.RequestCycle; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Resource(key = "captcha", path = "/api/captcha") public class CaptchaResource extends CaptchaImageResource { private static final long serialVersionUID = 8293404296348102926L;
syncope git commit: Updating to WSS4J release
Repository: syncope Updated Branches: refs/heads/2_0_X f34001a05 -> 68bd6b431 Updating to WSS4J release Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/68bd6b43 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/68bd6b43 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/68bd6b43 Branch: refs/heads/2_0_X Commit: 68bd6b431fb691510b09aab8d68fe68cccfea662 Parents: f34001a Author: Colm O hEigeartaighAuthored: Mon Apr 3 12:32:15 2017 +0100 Committer: Francesco Chicchiriccò Committed: Mon Apr 3 13:33:43 2017 +0200 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/68bd6b43/pom.xml -- diff --git a/pom.xml b/pom.xml index c30a580..805be1c 100644 --- a/pom.xml +++ b/pom.xml @@ -593,7 +593,7 @@ under the License. org.apache.wss4j wss4j-ws-security-dom - 2.1.9-SNAPSHOT + 2.1.9 org.jasypt
syncope git commit: Updating to WSS4J release
Repository: syncope Updated Branches: refs/heads/master cc6132dd0 -> 4fe838d2d Updating to WSS4J release Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4fe838d2 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4fe838d2 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4fe838d2 Branch: refs/heads/master Commit: 4fe838d2d7c09ebb3063c7baa3739bfe6c9e8325 Parents: cc6132d Author: Colm O hEigeartaighAuthored: Mon Apr 3 12:32:15 2017 +0100 Committer: Colm O hEigeartaigh Committed: Mon Apr 3 12:32:15 2017 +0100 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/4fe838d2/pom.xml -- diff --git a/pom.xml b/pom.xml index 636ff18..27c69a9 100644 --- a/pom.xml +++ b/pom.xml @@ -588,7 +588,7 @@ under the License. org.apache.wss4j wss4j-ws-security-dom - 2.1.9-SNAPSHOT + 2.1.9 org.jasypt
[1/2] syncope git commit: Upgrading izpack and frontend-maven-plugin
Repository: syncope Updated Branches: refs/heads/2_0_X dd7a74a2c -> f34001a05 refs/heads/master b0f0381d8 -> cc6132dd0 Upgrading izpack and frontend-maven-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f34001a0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f34001a0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f34001a0 Branch: refs/heads/2_0_X Commit: f34001a05c4e24109cb50cf33783f8e9ebf4b18a Parents: dd7a74a Author: Francesco ChicchiriccòAuthored: Mon Apr 3 09:20:36 2017 +0200 Committer: Francesco Chicchiriccò Committed: Mon Apr 3 09:20:36 2017 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f34001a0/pom.xml -- diff --git a/pom.xml b/pom.xml index 254c8e1..c30a580 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ under the License. 3.4.8 0.0.2 -5.0.10 +5.1.0 4.3.6 3.0.0 0.23.1 @@ -1707,7 +1707,7 @@ under the License. com.github.eirslett frontend-maven-plugin - 1.3 + 1.4 org.codehaus.mojo
[2/2] syncope git commit: Upgrading izpack and frontend-maven-plugin
Upgrading izpack and frontend-maven-plugin Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cc6132dd Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cc6132dd Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cc6132dd Branch: refs/heads/master Commit: cc6132dd05fbe92941f26ce29a729a7a733ca69e Parents: b0f0381 Author: Francesco ChicchiriccòAuthored: Mon Apr 3 09:20:36 2017 +0200 Committer: Francesco Chicchiriccò Committed: Mon Apr 3 09:20:49 2017 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/cc6132dd/pom.xml -- diff --git a/pom.xml b/pom.xml index a43b88a..636ff18 100644 --- a/pom.xml +++ b/pom.xml @@ -440,7 +440,7 @@ under the License. 3.4.8 0.0.2 -5.0.10 +5.1.0 4.3.6 3.0.0 1.0.0 @@ -1702,7 +1702,7 @@ under the License. com.github.eirslett frontend-maven-plugin - 1.3 + 1.4 org.codehaus.mojo