From 70b34320883a3f71c874918618b622986268ecfc Mon Sep 17 00:00:00 2001 From: aaron-kumar Date: Sun, 21 Jul 2024 08:08:43 +0530 Subject: [PATCH] eDEC Codelist v8.9, dependabot and docker fix --- .github/workflows/build-docker.yml | 2 +- .github/workflows/publish-docker.yml | 2 +- .../oxalis/sniffer/identifier/PeppolParticipantIdTest.java | 5 +++-- .../network/oxalis/statistics/security/EncryptionTest.java | 2 +- .../network/oxalis/statistics/security/SignatureTest.java | 2 +- .../java/network/oxalis/test/security/CertificateMock.java | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index bd01064d9..d73a37587 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -41,7 +41,7 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/arm64/v8 push: true - tags: norstella/oxalis:6.5.0-latest + tags: norstella/oxalis:6.6.1-latest cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml index e1af0d48c..96b8076ff 100644 --- a/.github/workflows/publish-docker.yml +++ b/.github/workflows/publish-docker.yml @@ -64,7 +64,7 @@ jobs: file: ./Dockerfile platforms: linux/amd64,linux/arm64/v8 push: true - tags: norstella/oxalis:6.5.0 + tags: norstella/oxalis:6.6.0 cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java index 38bbbd6e6..3018a9869 100644 --- a/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java +++ b/oxalis-legacy/oxalis-document-sniffer/src/test/java/network/oxalis/sniffer/identifier/PeppolParticipantIdTest.java @@ -56,13 +56,14 @@ public void testFoedselsnummerWhichCouldBeUsedByDigitalMultiKanal() { public void testParsePeppolParticpantId() throws Exception { ParticipantId no976098897 = ParticipantId.valueOf("0192:976098897"); + ParticipantId my05976098897 = ParticipantId.valueOf("0230:976098897"); assertEquals(no976098897, new ParticipantId(PeppolIcd.NO_ORG, "976098897")); no976098897 = ParticipantId.valueOf("0192:976098897"); assertEquals(no976098897, new ParticipantId(PeppolIcd.NO_ORG, "976098897")); - no976098897 = ParticipantId.valueOf("0213:976098897"); - assertEquals(no976098897, new ParticipantId(PeppolIcd.FI_VAT, "976098897")); + my05976098897 = ParticipantId.valueOf("0230:05976098897"); + assertEquals(my05976098897, new ParticipantId(PeppolIcd.MY_EIF, "05976098897")); //invalid iso code will not be parsed. try { diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java index 34a965fb9..a0aed86ab 100644 --- a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java +++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/EncryptionTest.java @@ -49,7 +49,7 @@ public class EncryptionTest { @BeforeClass public void createKeyPair() throws NoSuchAlgorithmException, InvalidAlgorithmParameterException { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA"); - keyPairGenerator.initialize(1024); // Medium security is fine + keyPairGenerator.initialize(2048); keyPair = keyPairGenerator.generateKeyPair(); KeyGenerator keyGenerator = KeyGenerator.getInstance("DES"); diff --git a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java index 08e254517..0978db254 100644 --- a/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java +++ b/oxalis-legacy/oxalis-statistics/src/test/java/network/oxalis/statistics/security/SignatureTest.java @@ -99,7 +99,7 @@ private byte[] encrypt(KeyPair keyPair) throws NoSuchAlgorithmException, NoSuchP private KeyPair generateKeyPair() throws NoSuchAlgorithmException, NoSuchProviderException { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("DSA"); SecureRandom secureRandom = SecureRandom.getInstance("SHA1PRNG", "SUN"); - keyPairGenerator.initialize(1024, secureRandom); + keyPairGenerator.initialize(2048, secureRandom); return keyPairGenerator.generateKeyPair(); } diff --git a/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java b/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java index 20dcf5d8f..1bf6c4d73 100644 --- a/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java +++ b/oxalis-test/src/main/java/network/oxalis/test/security/CertificateMock.java @@ -44,7 +44,7 @@ public class CertificateMock { public static X509Certificate withCN(String cn) { try { KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", "BC"); - keyPairGenerator.initialize(1024, new SecureRandom()); // No ment to be secure! + keyPairGenerator.initialize(2048, new SecureRandom()); KeyPair keyPair = keyPairGenerator.generateKeyPair();