diff options
13 files changed, 34 insertions, 32 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); diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java index 19054634..3a64b23e 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/AuthenticationDataBuilderTest.java @@ -1,6 +1,7 @@ package at.gv.egiz.eaaf.core.impl.idp.auth; import java.io.ByteArrayInputStream; +import java.util.Base64; import java.util.HashMap; import java.util.Map; @@ -10,7 +11,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.data.EaafConstants; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -174,7 +174,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -201,7 +201,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -227,7 +227,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -253,7 +253,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); @@ -283,7 +283,7 @@ public class AuthenticationDataBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))) + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))) .parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java index 16c2079a..072db94b 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/IdentityLinkTest.java @@ -5,6 +5,7 @@ import java.io.UnsupportedEncodingException; import java.math.BigInteger; import java.security.PublicKey; import java.security.interfaces.RSAPublicKey; +import java.util.Base64; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Assert; @@ -12,7 +13,6 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.BlockJUnit4ClassRunner; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.exceptions.EaafParserException; import at.gv.egiz.eaaf.core.impl.idp.auth.data.IdentityLink; @@ -32,8 +32,8 @@ public class IdentityLinkTest { @Before public void testInit() throws EaafParserException, UnsupportedEncodingException { idl = (IdentityLink) new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(AuthenticationDataBuilderTest.DUMMY_IDL_2.getBytes( - "UTF-8")))).parseIdentityLink(); + new ByteArrayInputStream(Base64.getDecoder().decode( + AuthenticationDataBuilderTest.DUMMY_IDL_2.getBytes("UTF-8")))).parseIdentityLink(); } diff --git a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java index 7092031f..609cf314 100644 --- a/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java +++ b/eaaf_core/src/test/java/at/gv/egiz/eaaf/core/impl/idp/auth/attributes/AbstractAttributeBuilderTest.java @@ -1,12 +1,12 @@ package at.gv.egiz.eaaf.core.impl.idp.auth.attributes; import java.io.ByteArrayInputStream; +import java.util.Base64; import java.util.HashMap; import java.util.Map; import org.junit.BeforeClass; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.idp.IAttributeGenerator; import at.gv.egiz.eaaf.core.api.idp.IAuthData; @@ -149,7 +149,7 @@ public abstract class AbstractAttributeBuilderTest { final HashMap<String, Object> sessionStore = new HashMap<>(); final AuthProcessDataWrapper wrapper = new AuthProcessDataWrapper(sessionStore); wrapper.setIdentityLink(new SimpleIdentityLinkAssertionParser( - new ByteArrayInputStream(Base64Utils.decode(DUMMY_IDL_2.getBytes()))).parseIdentityLink()); + new ByteArrayInputStream(Base64.getDecoder().decode(DUMMY_IDL_2.getBytes()))).parseIdentityLink()); pendingReq.setRawDataToTransaction(sessionStore); } diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java index cf26694c..a81a4270 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/builder/BpkBuilder.java @@ -191,8 +191,6 @@ public class BpkBuilder { final byte[] inputBytes = input.getBytes("ISO-8859-1"); result = encrypt(inputBytes, publicKey); return new String(Base64.getEncoder().encode(result), "ISO-8859-1").replaceAll("\r\n", ""); - // return new String(Base64Utils.encode(result, - // "ISO-8859-1")).replaceAll("\r\n", ""); } catch (final Exception e) { throw new EaafBuilderException("bPK encryption FAILED", null, e.getMessage(), e); diff --git a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java index f242c90c..97610e28 100644 --- a/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java +++ b/eaaf_core_utils/src/main/java/at/gv/egiz/eaaf/core/impl/credential/KeyStoreConfiguration.java @@ -62,6 +62,7 @@ public class KeyStoreConfiguration { /** * Use filePaths as it is and does not make it absolut. */ + @Builder.Default private boolean skipMakeAbsolutPaths = false; /** diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java b/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java index d78bdbd7..50f0fef0 100644 --- a/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java +++ b/eaaf_modules/eaaf_module_auth_sl20/src/test/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtilsSoftwareKeyTest.java @@ -2,6 +2,7 @@ package at.gv.egiz.eaaf.modules.auth.sl20.utils; import java.security.KeyStore; import java.security.Provider; +import java.util.Base64; import org.apache.commons.lang3.RandomStringUtils; import org.junit.Assert; @@ -9,7 +10,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.exceptions.EaafException; import at.gv.egiz.eaaf.core.impl.credential.KeyStoreConfiguration; @@ -36,11 +36,12 @@ public class JsonSecurityUtilsSoftwareKeyTest extends AbstractJsonSecurityUtilsT @Test public void invalidSignatureRandomBase64UrlEncoded() { - String testValue = Base64Utils.encodeToUrlSafeString(RandomStringUtils.randomAlphanumeric(10).getBytes()) + String testValue = Base64.getUrlEncoder().encodeToString(RandomStringUtils.randomAlphanumeric(10) + .getBytes()) + "." - + Base64Utils.encodeToUrlSafeString(RandomStringUtils.randomAlphanumeric(10).getBytes()) + + Base64.getUrlEncoder().encodeToString(RandomStringUtils.randomAlphanumeric(10).getBytes()) + "." - + Base64Utils.encodeToUrlSafeString(RandomStringUtils.randomAlphanumeric(10).getBytes()); + + Base64.getUrlEncoder().encodeToString(RandomStringUtils.randomAlphanumeric(10).getBytes()); try { joseTools.validateSignature(testValue); diff --git a/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java b/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java index b9e9e517..0a85c3c8 100644 --- a/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java +++ b/eaaf_modules/eaaf_module_moa-sig/src/test/java/console/PdfSigDecoder.java @@ -3,8 +3,8 @@ package console; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; +import java.util.Base64; -import org.springframework.util.Base64Utils; import org.springframework.util.StreamUtils; import iaik.asn1.ASN1; @@ -28,12 +28,12 @@ public class PdfSigDecoder { for (int i = 0; i < test.length() / 2; i++) { bytes[i] = (byte) Integer.parseInt(test.substring(i * 2, i * 2 + 2), 16); } - Base64Utils.encodeToString(bytes); + Base64.getEncoder().encodeToString(bytes); final ASN1 asn1 = new ASN1(bytes); System.out.println(asn1.toString()); - System.out.println(Base64Utils.encodeToString(bytes)); + System.out.println(Base64.getEncoder().encodeToString(bytes)); } diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java index bbe1d95f..56ea16ae 100644 --- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java +++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java @@ -22,6 +22,7 @@ package at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder; import java.security.MessageDigest; import java.time.Instant; import java.util.ArrayList; +import java.util.Base64; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -59,7 +60,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.util.Base64Utils; import at.gv.egiz.eaaf.core.api.data.EaafConstants; import at.gv.egiz.eaaf.core.api.data.ILoALevelMapper; @@ -333,7 +333,7 @@ public class Pvp2AssertionBuilder implements PvpConstants { try { final MessageDigest md = MessageDigest.getInstance("SHA-1"); final byte[] hash = md.digest((nameID + random).getBytes("ISO-8859-1")); - subjectNameID.setValue(Base64Utils.encodeToString(hash)); + subjectNameID.setValue(Base64.getEncoder().encodeToString(hash)); subjectNameID.setNameQualifier(null); subjectNameID.setFormat(NameIDType.TRANSIENT); |