Chore/gradle update

.gitignore

@@ -12,6 +12,7 @@ webapp/build
 .settings/
 bin/
 artifacts/
+.DS_Store
 
 !src/main/webapp/WEB-INF
 src/main/webapp/*

.vscode/settings.json

@@ -0,0 +1,4 @@
+{
+    "java.compile.nullAnalysis.mode": "automatic",
+    "java.configuration.updateBuildConfiguration": "automatic"
+}

Dockerfile

@@ -0,0 +1,28 @@
+
+FROM yarnpkg/node-yarn:latest as webappbuild
+
+ARG LANGUAGE=en
+
+# Build the webapp
+COPY ./webapp/ /webapp/
+WORKDIR /webapp
+RUN yarn install && ./build.sh ${LANGUAGE}
+
+FROM gradle:7.6-jdk11 as javabuild
+
+# Build the java app
+COPY ./ /app/
+WORKDIR /app
+RUN gradle build
+
+FROM tomee:9.0-jre11
+
+# Copy the webapp to the webapps directory
+COPY --from=webappbuild /webapp/build/ /usr/local/tomee/webapps/ROOT/
+
+# Copy the war file to the webapps directory
+COPY --from=javabuild /app/build/libs/irma_email_issuer-1.1.0.war /usr/local/tomee/webapps/
+
+EXPOSE 8080
+
+CMD ["catalina.sh", "run"]

README.md

@@ -1,16 +1,68 @@
 
-# Email server
+# irma_email_issuer
 
 Add an email address for use in your [Yivi app](https://github.com/privacybydesign/irma_mobile).
 
+## Running (development)
+The easiest way to run the irma_email_issuer for development purposes is via Docker.
 
-## Setting up the server
+### Configuration
+Various configuration files, keys and settings need to be in place to be able to build and run the apps.
+
+1. To generate the required keys for the issuer, run:
+```bash
+$ utils/keygen.sh ./src/main/resources/sk ./src/main/resources/pk
+```
+
+2. Create the Java app configuration:
+Copy the file `src/main/resources/config.sample.json` to `src/main/resources/main/config.json`.
+
+4. Update docker-compose.yml with your local IP address:
+Set the `- "--url=http://ip-address:8088"` parameter inside `docker-compose.yml` to match the IP address of your development machine. For example:
+```yml
+    entrypoint:
+      - "--url=http://192.168.1.105:8088"
+```
+Note: do not use `127.0.0.1` or `0.0.0.0` as IP addresses as this will result in the app not being able to find the issuer.
+
+### Run
+Use docker-compose to spin up the containers:
+```bash
+$ docker-compose up
+```
+
+By default, docker-compose caches docker images, so on a second run the previous built images will be used. A fresh build can be enforced using the --build flag.
+```bash
+$ docker-compose up --build
+```
+
+## Manual
+
+Using this construction you need to run the irma server and 
 
 1. Generate JWT keys for the issuer
 ```bash
-./utils/keygen.sh ./src/main/resources/sk ./src/main/resources/pk
+$ utils/keygen.sh ./src/main/resources/sk ./src/main/resources/pk
 ```
+
 2. Copy the file `src/main/resources/config.sample.json` to
- `build/resources/main/config.json` and modify it.
-3. Run `gradle appRun` in the root directory of this project.
-4. Navigate to `http://localhost:8080/irma_email_issuer/api/hello`
+ `src/main/resources/main/config.json` and modify it.
+todo: voorbeeld
+
+3. Build the webapp
+```bash
+$ cd webapp && yarn install && yarn build en && cd ../
+```
+If you want to build another language, for example Dutch, change `build en` to `build nl`.
+
+4. Copy the file `webapp/config.example.js` to `webapp/build/assets/config.js` and modify it 
+
+5. Run `gradle appRun` in the root directory of this project.
+
+To open the webapp navigate to `http://localhost:8080`. The API is accessible via `http://localhost:8080/irma_email_issuer/api`
+
+## Test
+You can run the tests, defined in `src/test/java/foundation/privacybydesign/email`, using the following command:
+```bash
+$ gradle test
+```

build.gradle

@@ -2,9 +2,9 @@ group 'foundation.privacybydesign.email'
 version '1.1.0'
 
 apply plugin: 'war'
-apply plugin: 'org.akhikhl.gretty'
+apply plugin: 'org.gretty'
 
-sourceCompatibility = 1.7
+sourceCompatibility = 11
 
 buildscript {
     repositories {
@@ -13,32 +13,38 @@ buildscript {
         }
     }
     dependencies {
-        classpath "gradle.plugin.org.akhikhl.gretty:gretty:1.4.2"
+        classpath "org.gretty:gretty:4.0.3"
     }
 }
 
 repositories {
-    mavenLocal()
     maven {
         url "https://credentials.github.io/repos/maven2/"
     }
     mavenCentral()
 }
 
 dependencies {
-    compile 'org.glassfish.jersey.core:jersey-server:2.25'
-    compile 'org.glassfish.jersey.containers:jersey-container-servlet:2.25'
-    compile 'ch.qos.logback:logback-classic:1.1.7'
-    compile 'com.sun.mail:javax.mail:1.5.6'
-
-    compile 'org.irmacard.api:irma_api_common:1.2.2'
-    compile 'foundation.privacybydesign.common:irma_server_common:0.3.2'
-
-    testCompile group: 'junit', name: 'junit', version: '4.12'
+    implementation 'org.glassfish.jersey.core:jersey-server:3.0.0'
+    implementation 'org.glassfish.jersey.containers:jersey-container-servlet:3.0.0'
+    implementation 'org.glassfish.jersey.inject:jersey-hk2:3.0.0'
+    implementation 'ch.qos.logback:logback-classic:1.1.7'
+    implementation 'com.sun.mail:jakarta.mail:2.0.1'
+    implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
+
+    implementation 'io.jsonwebtoken:jjwt:0.9.1'
+    implementation 'com.google.code.gson:gson:2.8.9'
+    implementation 'org.apache.commons:commons-lang3:3.7'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.67'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:3.0.1'
+
+    implementation 'org.irmacard.api:irma_api_common:2.0.0'
+
+    testImplementation group: 'junit', name: 'junit', version: '4.13.1'
 }
 
 gretty {
     contextConfigFile = file('src/main/resources/jetty-env.xml')
-    scanInterval = 10
-    inplaceMode = "hard"
+    extraResourceBase 'webapp/build'
 }

docker-compose.yml

@@ -0,0 +1,63 @@
+version: "3.8"
+name: irma_email_issuer
+
+services:
+  # Irma issuer service
+  irmaserver:
+    image: ghcr.io/privacybydesign/irma:v0.13.2
+    container_name: irma_server
+    working_dir: /irmago
+    ports:
+      - 8088:8088
+    expose:
+      - 8088
+    networks:
+      - irma-net
+    entrypoint:
+      - "irma"
+      - "server"
+      - "--no-auth=false"
+      - "--requestors={\"irma_email_issuer\":{\"auth_method\":\"publickey\",\"key_file\": \"/config/pk.pem\"} }"
+      - "--port=8088"
+      - "--jwt-privkey-file=/config/sk.pem"
+      - "--url=http://ip-address:8088" # Your localhost IP-address here. This is required for the app to be able to connect to the issuer
+    volumes:
+      - ./src/main/resources/:/config/
+
+  # Mailhog service
+  mailhog:
+    image: mailhog/mailhog
+    networks:
+      # We use a localhost alias such that the test configuration also works for users who run it without Docker.
+      irma-net:
+        aliases:
+          - mailhog.localhost
+    ports:
+      - 1025:1025
+      - 8025:8025 # Port of the web interface
+
+  # Service that runs the SMS issuer webapp and api
+  irma_email_issuer:
+      platform: linux/x86_64
+      build:
+        context: .
+        dockerfile: Dockerfile
+      container_name: irma_email_issuer
+      volumes:
+        # Make keys and config files available for Java app
+        - ./src/resources/main/:/config/
+        # Make config.js available for webapp
+        - ./webapp/config.example.js:/usr/local/tomee/webapps/ROOT/assets/config.js:ro"
+      ports:
+        - 8080:8080
+      expose:
+        - 8080
+      networks:
+        - irma-net
+
+# Docker Desktop for MacOS does not support exposing ports when using host networking. Therefore,
+# we have to use bridge networking and expose the ports manually.
+# https://github.com/docker/for-mac/issues/1031
+networks:
+  irma-net:
+    driver: bridge

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/foundation/privacybydesign/email/Client.java

@@ -2,8 +2,6 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-
-import java.io.IOException;
 import java.util.HashMap;
 
 public class Client {

src/main/java/foundation/privacybydesign/email/EmailConfiguration.java

@@ -1,6 +1,6 @@
 package foundation.privacybydesign.email;
 
-import foundation.privacybydesign.common.BaseConfiguration;
+import foundation.privacybydesign.email.common.BaseConfiguration;
 import io.jsonwebtoken.SignatureAlgorithm;
 import org.irmacard.api.common.util.GsonUtil;
 import org.slf4j.Logger;
@@ -12,7 +12,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-public class EmailConfiguration extends BaseConfiguration {
+public class EmailConfiguration extends BaseConfiguration<EmailConfiguration> {
     private static Logger logger = LoggerFactory.getLogger(Client.class);
 
     static EmailConfiguration instance;

src/main/java/foundation/privacybydesign/email/EmailRestApi.java

@@ -1,7 +1,5 @@
 package foundation.privacybydesign.email;
 
-import foundation.privacybydesign.common.email.EmailTokens;
-import foundation.privacybydesign.common.filters.RateLimit;
 import org.irmacard.api.common.ApiClient;
 import org.irmacard.api.common.CredentialRequest;
 import org.irmacard.api.common.issuing.IdentityProviderRequest;
@@ -10,10 +8,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.mail.internet.AddressException;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.mail.internet.AddressException;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
@@ -79,6 +77,9 @@ public Response sendEmail(@FormParam("email") String email,
         } catch (UnsupportedEncodingException e) {
             logger.error("Invalid return URL: {}: {}", client.getReturnURL(), e.getMessage());
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+        } catch (Exception e) {
+            logger.error("Sending mail failed:\n{}", e.getMessage());
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
         }
         return Response.status(Response.Status.OK).entity(OK_RESPONSE).build();
     }
@@ -93,7 +94,6 @@ public Response sendEmail(@FormParam("email") String email,
     @POST
     @Path("/send-email-token")
     @Produces(MediaType.TEXT_PLAIN)
-    @RateLimit
     public Response sendEmailToken(@FormParam("email") String emailAddress,
                                    @FormParam("language") String language) {
         EmailConfiguration conf = EmailConfiguration.getInstance();
@@ -128,6 +128,9 @@ public Response sendEmailToken(@FormParam("email") String emailAddress,
             logger.error("Invalid address: {}", e.getMessage());
             return Response.status(Response.Status.BAD_REQUEST).entity
                     (ERR_ADDRESS_MALFORMED).build();
+        } catch (Exception e) {
+            logger.error("Sending mail failed:\n{}", e.getMessage());
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
         }
         return Response.status(Response.Status.OK).entity
                 (OK_RESPONSE).build();