From 12de48ebbbf2c7f5f397b44d1efd057c348bff53 Mon Sep 17 00:00:00 2001 From: Rene Zubcevic Date: Thu, 9 May 2019 12:24:28 +0100 Subject: [PATCH] additional environment entries to support https on webgoat --- .../src/main/resources/application.properties | 15 +++++++++++---- .../src/main/resources/goatkeystore.pkcs12 | Bin 0 -> 2563 bytes .../src/main/resources/application.properties | 6 +++--- 3 files changed, 14 insertions(+), 7 deletions(-) create mode 100644 webgoat-container/src/main/resources/goatkeystore.pkcs12 diff --git a/webgoat-container/src/main/resources/application.properties b/webgoat-container/src/main/resources/application.properties index ba8b75afc..281b53230 100644 --- a/webgoat-container/src/main/resources/application.properties +++ b/webgoat-container/src/main/resources/application.properties @@ -2,10 +2,17 @@ server.error.include-stacktrace=always server.error.path=/error.html server.session.timeout=600 server.contextPath=/WebGoat -server.port=8080 -server.address=127.0.0.1 +server.port=${WEBGOAT_PORT:8080} +server.address=${WEBGOAT_HOST:127.0.0.1} -spring.datasource.url=jdbc:hsqldb:hsql://localhost:9001/webgoat +server.ssl.key-store-type=${WEBGOAT_KEYSTORE_TYPE:PKCS12} +server.ssl.key-store=${WEBGOAT_KEYSTORE:classpath:goatkeystore.pkcs12} +server.ssl.key-store-password=${WEBGOAT_KEYSTORE_PASSWORD:password} +server.ssl.key-alias=${WEBGOAT_KEY_ALIAS:goat} +server.ssl.enabled=${WEBGOAT_SSLENABLED:false} +security.require-ssl=${WEBGOAT_SSLENABLED:false} + +spring.datasource.url=jdbc:hsqldb:hsql://${WEBGOAT_HOST:127.0.0.1}:${WEBGOAT_HSQLPORT:9001}/webgoat spring.jpa.hibernate.ddl-auto=update spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect spring.datasource.driver-class-name=org.hsqldb.jdbc.JDBCDriver @@ -36,7 +43,7 @@ webgoat.database.driver=org.hsqldb.jdbcDriver webgoat.database.connection.string=jdbc:hsqldb:mem:{USER} webgoat.default.language=en -webwolf.host=${WEBWOLF_HOST:localhost} +webwolf.host=${WEBWOLF_HOST:127.0.0.1} webwolf.port=${WEBWOLF_PORT:9090} webwolf.url=http://${webwolf.host}:${webwolf.port}/WebWolf webwolf.url.landingpage=http://${webwolf.host}:${webwolf.port}/landing diff --git a/webgoat-container/src/main/resources/goatkeystore.pkcs12 b/webgoat-container/src/main/resources/goatkeystore.pkcs12 new file mode 100644 index 0000000000000000000000000000000000000000..c7e335790226c383d469d30421dba2722b9075ba GIT binary patch literal 2563 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 KVq{{7FZnlqN49