Merge branch 'RM-4611_mid_support' into 'master'

RM-4611: MID support

See merge request cdoc2/cdoc2-shares-server!17

Author: Olesja Aarma

server-db/build-image.sh

@@ -11,3 +11,4 @@ LIQUIBASE_IMAGE_NAME=cdoc2-shares-server-liquibase
 # version shows what version of shares-server is used in pair with liquibase image
 # Docker version should be same as shares-server-version although server-db pom version might be different
 docker build -t ${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/${LIQUIBASE_IMAGE_NAME}:${SHARES_SERVER_VERSION} ../server-db/src/main/resources/db
+docker tag ${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/${LIQUIBASE_IMAGE_NAME}:${SHARES_SERVER_VERSION}  ${DOCKER_REGISTRY}/${DOCKER_REPOSITORY}/${LIQUIBASE_IMAGE_NAME}:latest

shares-server/pom.xml

@@ -11,7 +11,7 @@
 
 	<groupId>ee.cyber.cdoc2</groupId>
 	<artifactId>cdoc2-shares-server</artifactId>
-	<version>0.3.0-SNAPSHOT</version>
+	<version>0.4.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>cdoc2-shares-server</name>
@@ -64,27 +64,19 @@
 					<version>SID-1.6.1-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
-				<!-- nimbus-jose-jwt JWK.parseFromPEMEncodedObjects() fails run-time with ClassNotFound for
-                 org/bouncycastle/openssl/jcajce/JcaPEMKeyConverter . Fix it -->
-				<dependency>
-					<groupId>org.bouncycastle</groupId>
-					<artifactId>bcpkix-jdk18on</artifactId>
-					<version>1.78</version>
-					<scope>test</scope>
-				</dependency>
-			</dependencies>
-		</profile>
-
-		<profile>
-			<id>excludePkcs11AndSlowTests</id>
-			<properties>
-				<tests>!(pkcs11 | slow)</tests>
-			</properties>
-		</profile>
-
-		<profile>
-			<id>github_ci_fork</id>
-			<!-- for forks use base maven repo "open-eid/cdoc2-java-ref-impl" -->
+        </dependencies>
+    </profile>
+
+    <profile>
+        <id>excludePkcs11AndSlowTests</id>
+        <properties>
+            <tests>!(pkcs11 | slow)</tests>
+        </properties>
+    </profile>
+
+    <profile>
+        <id>github_ci_fork</id>
+        <!-- for forks use base maven repo "open-eid/cdoc2-java-ref-impl" -->
 			<activation>
 				<property>
 					<!-- defined by maven.yml for forks only -->
@@ -195,7 +187,7 @@
 		<dependency>
 			<groupId>ee.cyber.cdoc2</groupId>
 			<artifactId>cdoc2-auth-token</artifactId>
-			<version>0.2.0-SNAPSHOT</version>
+			<version>0.3.2-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>

shares-server/src/test/java/ee/cyber/cdoc2/server/TestData.java

@@ -8,7 +8,9 @@
 import java.security.KeyStore;
 import java.security.cert.X509Certificate;
 import java.util.Properties;
+import java.util.Set;
 
+import com.nimbusds.jose.JWSAlgorithm;
 import com.nimbusds.jose.JWSSigner;
 import com.nimbusds.jose.crypto.RSASSASigner;
 import com.nimbusds.jose.jwk.JWK;
@@ -172,22 +174,21 @@ public static String generateTestAuthTicket(String eid, String serverUrl, String
 
         JWK jwk = JWK.parseFromPEMEncodedObjects(TEST_RSAKEY);
         RSAKey privateKey = jwk.toRSAKey();
-//        RSAKey rsaPublicJWK = new RSAKey.Builder(privateKey.toRSAPublicKey())
-//            .keyID(etsi.toString())
-//            .build();
 
-        JWSSigner jwsSigner = new RSASSASigner(privateKey);
+        JWSSigner jwsSigner = new RSASSASigner(privateKey) {
+            // Smart-ID JWSSigner supports only RS256
+            @Override
+            public Set<JWSAlgorithm> supportedJWSAlgorithms() {
+                return Set.of(JWSAlgorithm.RS256);
+            }
+        };
 
         AuthTokenCreator token = AuthTokenCreator.builder()
             .withEtsiIdentifier(etsi) // "iss" field etsi/PNOEE-30303039914
             .withShareAccessData(new ShareAccessData(
                 serverUrl,
                 shareId,
                 nonce))
-//            .withShareAccessData(new ShareAccessData(
-//                "https://cdoc-ccs.smit.ee:443/key-shares/",
-//                "5BAE4603-C33C-4425-B301-125F2ACF9B1E",
-//                "9d23660840b427f405009d970d269770417bc769"))
             .build();
 
 

shares-server/src/test/java/ee/cyber/cdoc2/server/api/KeyShareApiAuthenticationTest.java

@@ -165,5 +165,4 @@ void shouldAuthenticateAndGetKeyShare() {
         assertArrayEquals(SHARE, resp.getBody().getShare());
     }
 
-
 }