feat: httpsでアクセスできるように設定

.gitignore

@@ -26,3 +26,5 @@
 .swp
 /.nb-gradle/
 **/build/
+
+/selfcert/

common/src/main/java/com/linecorp/line/auth/fido/fido2/common/AuthenticatorTransport.java

@@ -29,7 +29,8 @@ public enum AuthenticatorTransport {
     USB("usb"),
     NFC("nfc"),
     BLE("ble"),
-    INTERNAL("internal");
+    INTERNAL("internal"),
+    HYBRID("hybrid");
 
     @JsonValue
     @Getter private final String value;

docker-compose.yml

@@ -1,3 +1,4 @@
+# /line-fido2-server/docker-compose.yml
 version : "3.8"
 services:
     build:
@@ -13,14 +14,44 @@ services:
         context: .
         dockerfile: ./rpserver/Dockerfile
       ports:
-        - "8080:8080"
+        - "127.0.0.2:8080:8080"
       restart: always
+      networks:
+        app_net:
+          ipv4_address: 172.30.0.2 # コンテナのIPアドレスを指定する
+
     fido2:
       container_name: fido2-server
       image: fido2:latest
       build:
         context: .
         dockerfile: ./server/Dockerfile
       ports:
-        - "8081:8081"
+        - "127.0.0.1:8080:8081"
       restart: always
+      networks:
+        app_net:
+          ipv4_address: 172.30.0.3 # コンテナのIPアドレスを指定する    
+
+    nginx:
+      image: nginx:alpine
+      restart: always
+      volumes: # ローカルPCのディレクトリ:コンテナの中のディレクトリ
+        - ./nginx:/etc/nginx   
+        - ./selfcert:/etc/cert/
+      ports:
+            - 80:80
+            - 443:443
+      extra_hosts:
+        - "host.docker.internal:host-gateway"
+      networks:
+        app_net:
+          ipv4_address: 172.30.0.4        
+
+networks:
+  app_net:
+    driver: bridge
+    ipam:
+     driver: default
+     config:
+       - subnet: 172.30.0.0/24 # コンテナのIPアドレスを指定するために設定

nginx/nginx.conf

@@ -0,0 +1,26 @@
+events {
+    worker_connections  16;
+}
+http {
+    server {
+        listen 443 ssl;
+    	ssl_certificate     /etc/cert/exampletthoge.com+2.pem;
+    	ssl_certificate_key /etc/cert/exampletthoge.com+2-key.pem;
+        server_name  exampletthoge.com;
+        location / {
+            proxy_pass http://172.30.0.2:8080/; # rpコンテナのipアドレス:port
+            proxy_redirect off;
+        }
+    }
+
+    server {
+        listen 443 ssl;
+    	ssl_certificate     /etc/cert/fido2.exampletthoge.com+2.pem;
+    	ssl_certificate_key /etc/cert/fido2.exampletthoge.com+2-key.pem;
+        server_name  fido2.exampletthoge.com;
+        location / {
+            proxy_pass http://172.30.0.3:8081/; # fido2コンテナのipアドレス:port
+            proxy_redirect off;
+        }
+    }
+}

rpserver/src/main/java/com/linecorp/line/auth/fido/fido2/rpserver/controller/AdapterController.java

@@ -196,14 +196,14 @@ public AdapterServerResponse sendRegistrationResponse(
         String scheme = httpServletRequest.getScheme();
 
         StringBuilder builder = new StringBuilder()
-                .append(scheme)
+                .append("https")
                 .append("://")
                 .append(rpOrigin);
 
-        if (!StringUtils.isEmpty(rpPort)) {
-            builder.append(":")
-                   .append(rpPort);
-        }
+        // if (!StringUtils.isEmpty(rpPort)) {
+        //     builder.append(":")
+        //            .append(rpPort);
+        // }
 
         // set header
         HttpHeaders httpHeaders = new HttpHeaders();
@@ -302,14 +302,14 @@ public AdapterServerResponse sendAuthenticationResponse(
         // prepare origin
         String scheme = httpServletRequest.getScheme();
         StringBuilder builder = new StringBuilder()
-                .append(scheme)
+                .append("https")
                 .append("://")
                 .append(rpOrigin);
 
-        if (!StringUtils.isEmpty(rpPort)) {
-            builder.append(":")
-                   .append(rpPort);
-        }
+        // if (!StringUtils.isEmpty(rpPort)) {
+        //     builder.append(":")
+        //            .append(rpPort);
+        // }
 
         // set header
         HttpHeaders httpHeaders = new HttpHeaders();

rpserver/src/main/resources/application-docker.yml

@@ -6,11 +6,11 @@ spring:
       cache: false
 fido2:
   rp:
-    id: localhost
-    origin: localhost
-    port: 8080
+    id: exampletthoge.com
+    origin: exampletthoge.com
+    port: 443
 conformance:
-  url: http://localhost:8080
+  url: https://exampletthoge.com
 logging:
   level:
     org.springframework.web: DEBUG

server/Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jdk-slim
+FROM --platform=linux/amd64 openjdk:8-jdk-slim
 EXPOSE 8081
 COPY --from=build-image:latest /workspace/app/server/build/libs/server-*.jar server.jar
 ENTRYPOINT ["java","-jar","/server.jar"]

server/build.gradle

@@ -97,7 +97,7 @@ dependencies {
     implementation('redis.clients:jedis:3.5.0')
 
     //logging
-    implementation('org.zalando:logbook-spring-boot-starter:1.8.1')
+    // implementation('org.zalando:logbook-spring-boot-starter:1.8.1')
 
     //swagger
     implementation('io.springfox:springfox-swagger2:2.9.2')

spring-boot-starter/line-fido2-spring-boot-demo/build.gradle

@@ -34,7 +34,7 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.18'
 
     //logging
-    implementation('org.zalando:logbook-spring-boot-starter:1.8.1')
+    // implementation('org.zalando:logbook-spring-boot-starter:1.8.1')
 
     //local redis
     implementation('com.github.kstyrc:embedded-redis:0.6')