diff options
Diffstat (limited to 'eaaf_core/src/main/java')
5 files changed, 12 insertions, 10 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java index 2c125cc0..f748fdcb 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/builder/AbstractAuthenticationDataBuilder.java @@ -23,6 +23,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; +import java.util.Base64; import java.util.Collection; import java.util.Collections; import java.util.HashSet; @@ -34,7 +35,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.lang.NonNull; import org.springframework.util.Assert; -import org.springframework.util.Base64Utils; import org.w3c.dom.DOMException; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -403,7 +403,7 @@ public abstract class AbstractAuthenticationDataBuilder implements IAuthenticati + " --> Parse basic user info's from that attribute."); InputStream idlStream = null; try { - idlStream = new ByteArrayInputStream(Base64Utils.decodeFromString(pvpAttrIdl)); + idlStream = new ByteArrayInputStream(Base64.getDecoder().decode(pvpAttrIdl)); idlFromPvpAttr = new SimpleIdentityLinkAssertionParser(idlStream).parseIdentityLink(); parseBasicUserInfosFromIdl(authData, idlFromPvpAttr, getThreadLocalVariable(authProcessData)); diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java index acb877c2..2d326a3a 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/data/SimpleIdentityLinkAssertionParser.java @@ -22,9 +22,9 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.data; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.ArrayList; +import java.util.Base64; import java.util.List; -import org.springframework.util.Base64Utils; import org.w3c.dom.Element; import org.w3c.dom.traversal.NodeIterator; @@ -207,7 +207,7 @@ public class SimpleIdentityLinkAssertionParser { Element certElem; while ((certElem = (Element) rsaIter.nextNode()) != null) { final String content = DomUtils.getText(certElem); - certs.add(new String(Base64Utils.decodeFromString(content), "UTF-8")); + certs.add(new String(Base64.getDecoder().decode(content), "UTF-8")); } final String[] result = new String[certs.size()]; diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidEidTokenBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidEidTokenBuilder.java index be208e8e..f8b025d8 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidEidTokenBuilder.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidEidTokenBuilder.java @@ -19,9 +19,10 @@ package at.gv.egiz.eaaf.core.impl.idp.builder.attributes; +import java.util.Base64; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -50,7 +51,7 @@ public class EidEidTokenBuilder implements IPvpAttributeBuilder { } return g.buildStringAttribute(EID_E_ID_TOKEN_FRIENDLY_NAME, EID_E_ID_TOKEN_NAME, - Base64Utils.encodeToString(((IEidAuthData) authData).getEidToken())); + Base64.getEncoder().encodeToString(((IEidAuthData) authData).getEidToken())); } else { log.info(EID_E_ID_TOKEN_FRIENDLY_NAME + " is only available in AuthHandler context"); } diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidIdentityLinkBuilder.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidIdentityLinkBuilder.java index b7249786..0f007fdf 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidIdentityLinkBuilder.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidIdentityLinkBuilder.java @@ -20,10 +20,10 @@ package at.gv.egiz.eaaf.core.impl.idp.builder.attributes; import java.io.IOException; +import java.util.Base64; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -54,7 +54,7 @@ public class EidIdentityLinkBuilder implements IPvpAttributeBuilder { ilAssertion = authData.getIdentityLink().getSerializedSamlAssertion(); return g.buildStringAttribute(EID_IDENTITY_LINK_FRIENDLY_NAME, EID_IDENTITY_LINK_NAME, - Base64Utils.encodeToString(ilAssertion.getBytes("UTF-8"))); + Base64.getEncoder().encodeToString(ilAssertion.getBytes("UTF-8"))); } catch (final IOException e) { log.warn("IdentityLink serialization error.", e); diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidSignerCertificate.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidSignerCertificate.java index daed8455..8e369628 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidSignerCertificate.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/builder/attributes/EidSignerCertificate.java @@ -19,9 +19,10 @@ package at.gv.egiz.eaaf.core.impl.idp.builder.attributes; +import java.util.Base64; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -50,7 +51,7 @@ public class EidSignerCertificate implements IPvpAttributeBuilder { final byte[] signerCertificate = ((IEidAuthData) authData).getSignerCertificate(); if (signerCertificate != null) { return g.buildStringAttribute(EID_SIGNER_CERTIFICATE_FRIENDLY_NAME, - EID_SIGNER_CERTIFICATE_NAME, Base64Utils.encodeToString(signerCertificate)); + EID_SIGNER_CERTIFICATE_NAME, Base64.getEncoder().encodeToString(signerCertificate)); } else { log.debug("{} is not available", EID_SIGNER_CERTIFICATE_FRIENDLY_NAME); |