From f3c1c09985b2e438022c77a67ba224976d8518ab Mon Sep 17 00:00:00 2001 From: ledemkam Date: Mon, 5 May 2025 10:35:12 +0200 Subject: [PATCH 1/3] implmnt keytore and update securityConfig with swaggerui --- docker-compose.yml | 41 +++++++++++++++++++++++++++++ pom.xml | 10 +++++-- src/main/resources/application.yml | 6 ++--- src/main/resources/keystore.p12 | Bin 0 -> 2734 bytes 4 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 docker-compose.yml create mode 100644 src/main/resources/keystore.p12 diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..a178eab --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,41 @@ + +services: + mysql: + image: mysql:8.0 + container_name: recipe-demo-mysql + environment: + MYSQL_ROOT_PASSWORD: db_password + MYSQL_DATABASE: recipe-demo + MYSQL_USER: db_username + MYSQL_PASSWORD: db_password + ports: + - "3306:3306" + volumes: + - mysql_data:/var/lib/mysql + healthcheck: + test: ["CMD", "mysqladmin", "ping", "-h", "localhost"] + interval: 10s + timeout: 5s + retries: 5 + + recipe-app: + build: + context: . + dockerfile: Dockerfile + container_name: recipe-demo-app + depends_on: + mysql: + condition: service_healthy + ports: + - "8443:8443" + environment: + - SPRING_DATASOURCE_URL=jdbc:mysql://mysql:3306/recipe-demo + - SPRING_DATASOURCE_USERNAME=db_username + - SPRING_DATASOURCE_PASSWORD=db_password + - APP_SECRET_KEY=your_secret_key + - APP_FRONTEND_URL=http://localhost:5173 + volumes: + - ./keystore.p12:/app/keystore.p12 + +volumes: + mysql_data: \ No newline at end of file diff --git a/pom.xml b/pom.xml index 937417e..85076b6 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.2 + 3.4.5 com.cwa @@ -27,7 +27,7 @@ - 17 + 24 @@ -49,6 +49,11 @@ lombok true + + io.swagger.core.v3 + swagger-annotations + 2.2.30 + org.springframework.boot spring-boot-starter-test @@ -119,3 +124,4 @@ + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 18855af..377b3fd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -25,13 +25,13 @@ logging: app: frontend-url: http://localhost:5173 - secret-key: your_secret_key + secret-key: 2Om+oLWjsmVB17belDyJMHxvfPcjP6yglLYYmOHzSeQ= expiration-time: 86400000 server: port: 8443 ssl: key-store: classpath:keystore.p12 - key-store-password: password + key-store-password: recipe key-store-type: PKCS12 - key-alias: your_alias \ No newline at end of file + key-alias: recipe-api-ssl \ No newline at end of file diff --git a/src/main/resources/keystore.p12 b/src/main/resources/keystore.p12 new file mode 100644 index 0000000000000000000000000000000000000000..ad27fb68fc36fbab2f494a6bd619d5a1e7859ede GIT binary patch literal 2734 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 H89Dy|CW+c+ literal 0 HcmV?d00001 From c6e536478b5b6ab643207ffc08c5090c41f7141b Mon Sep 17 00:00:00 2001 From: ledemkam Date: Mon, 5 May 2025 10:39:03 +0200 Subject: [PATCH 2/3] update --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 377b3fd..6e3fdb3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,4 +34,4 @@ server: key-store: classpath:keystore.p12 key-store-password: recipe key-store-type: PKCS12 - key-alias: recipe-api-ssl \ No newline at end of file + key-alias: locahost \ No newline at end of file From fa5faaf874cda6fe659d5e71a3550cfb6d87d0cd Mon Sep 17 00:00:00 2001 From: ledemkam Date: Mon, 5 May 2025 11:00:31 +0200 Subject: [PATCH 3/3] update --- src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6e3fdb3..f395cde 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -34,4 +34,4 @@ server: key-store: classpath:keystore.p12 key-store-password: recipe key-store-type: PKCS12 - key-alias: locahost \ No newline at end of file + key-alias: lokalhost \ No newline at end of file