diff --git a/docker-compose.yml b/docker-compose.yml index 6aebfa640..63535e6e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -546,6 +546,9 @@ services: - SMTP_USER=${SMTP_USER} - SMTP_PASS=${SMTP_PASS} - SMTP_FROM=${SMTP_FROM} + - SMTP_SOCKS_HOST=${SMTP_SOCKS_HOST} + - SMTP_SOCKS_PORT=${SMTP_SOCKS_PORT} + - SMTP_PROXY_ENABLED=${SMTP_PROXY_ENABLED} - TOKEN_ISSUER_URL=${KC_ISSUER_URL} - OTP_CODE_RESPONSE_ENABLED=${OTP_CODE_RESPONSE_ENABLED} depends_on: diff --git a/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/config/PostgresConfig.kt b/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/config/PostgresConfig.kt index 0c554085b..94cc7cc4a 100644 --- a/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/config/PostgresConfig.kt +++ b/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/config/PostgresConfig.kt @@ -2,12 +2,14 @@ package co.nilin.opex.otp.app.config import org.springframework.beans.factory.annotation.Value import org.springframework.context.annotation.Configuration +import org.springframework.context.annotation.Profile import org.springframework.core.io.Resource import org.springframework.data.r2dbc.repository.config.EnableR2dbcRepositories import org.springframework.r2dbc.core.DatabaseClient @Configuration @EnableR2dbcRepositories(basePackages = ["co.nilin.opex"]) +@Profile("!test") class PostgresConfig( db: DatabaseClient, @Value("classpath:schema.sql") private val schemaResource: Resource diff --git a/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/service/message/EmailSender.kt b/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/service/message/EmailSender.kt index e9912bfb4..402e72c93 100644 --- a/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/service/message/EmailSender.kt +++ b/otp/otp-app/src/main/kotlin/co/nilin/opex/otp/app/service/message/EmailSender.kt @@ -8,6 +8,7 @@ import jakarta.mail.internet.MimeMessage import org.springframework.beans.factory.annotation.Value import org.springframework.stereotype.Component + @Component class EmailSender( @Value("\${otp.email.host}") @@ -19,7 +20,13 @@ class EmailSender( @Value("\${otp.email.password}") private val password: String, @Value("\${otp.email.from}") - private val from: String + private val from: String, + @Value("\${otp.email.proxy.enabled}") + private val proxyIsEnabled: Boolean, + @Value("\${otp.email.proxy.host}") + private val proxyHost: String?, + @Value("\${otp.email.proxy.port}") + private val proxyPort: String? ) : MessageSender { private val logger by LoggerDelegate() @@ -34,6 +41,11 @@ class EmailSender( properties["mail.smtp.starttls.enable"] = "true" properties["mail.smtp.from"] = from properties["mail.smtp.ssl.protocols"] = "TLSv1.2" + if (proxyIsEnabled) { + properties["mail.smtp.socks.host"] = proxyHost + properties["mail.smtp.socks.port"] = proxyPort + } + val session = Session.getDefaultInstance(properties) return try { diff --git a/otp/otp-app/src/test/kotlin/co/nilin/opex/otp/app/conttroller/OTPControllerIT.kt b/otp/otp-app/src/test/kotlin/co/nilin/opex/otp/app/conttroller/OTPControllerIT.kt new file mode 100644 index 000000000..c83c6a29e --- /dev/null +++ b/otp/otp-app/src/test/kotlin/co/nilin/opex/otp/app/conttroller/OTPControllerIT.kt @@ -0,0 +1,38 @@ +package co.nilin.opex.otp.app.conttroller + + +import co.nilin.opex.otp.app.service.message.EmailSender +import kotlinx.coroutines.runBlocking +import org.junit.jupiter.api.Assertions +import org.junit.jupiter.api.Disabled +import org.junit.jupiter.api.Test + + +class EmailSenderIT { + @Disabled("Manual test: requires real SMTP + proxy") + @Test + fun `should send email via real smtp`() = runBlocking { + + val sender = EmailSender( + host = requireEnv("SMTP_HOST"), + port = requireEnv("SMTP_PORT"), + username = requireEnv("SMTP_USER"), + password = requireEnv("SMTP_PASS"), + from = requireEnv("SMTP_FROM"), + proxyIsEnabled = true, + proxyHost = requireEnv("SMTP_SOCKS_HOST"), + proxyPort = requireEnv("SMTP_SOCKS_PORT") + ) + + val result = sender.send( + receiver = requireEnv("SMTP_RECEIVER"), + message = "

Integration Test

", + metadata = emptyMap() + ) + + Assertions.assertTrue(result) + } + + private fun requireEnv(key: String): String = + System.getenv(key) ?: error("Missing env: $key") +} \ No newline at end of file diff --git a/otp/otp-app/src/test/resources/application.yml b/otp/otp-app/src/test/resources/application.yml new file mode 100644 index 000000000..909266384 --- /dev/null +++ b/otp/otp-app/src/test/resources/application.yml @@ -0,0 +1,42 @@ +spring: + main: + web-application-type: none + + # 🚫 disable everything noisy + autoconfigure: + exclude: + - org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration + - org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration + - org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration + + cloud: + consul: + enabled: false + config: + enabled: false + + vault: + enabled: false + + kafka: + bootstrap-servers: "" +otp: + response-enabled: ${OTP_CODE_RESPONSE_ENABLED:false} + sms: + provider: + url: ${SMS_PROVIDER_URL} + api-key: ${SMS_PROVIDER_API_KEY} + template: ${SMS_PROVIDER_TEMPLATE} + email: + host: ${SMTP_HOST} + port: ${SMTP_PORT} + username: ${SMTP_USER} + password: ${SMTP_PASS} + from: ${SMTP_FROM} + proxy: + enabled: ${SMTP_PROXY_ENABLED:false} + host: ${SMTP_PROXY_HOST} + port: ${SMTP_PROXY_PORT} + custom-message: + enabled: ${CUSTOM_MESSAGE_ENABLED:false} + base-url: ${CUSTOM_MESSAGE_URL} \ No newline at end of file diff --git a/otp/pom.xml b/otp/pom.xml index 0266dd847..712576203 100644 --- a/otp/pom.xml +++ b/otp/pom.xml @@ -33,6 +33,29 @@ logbook-spring-boot-webflux-autoconfigure 3.9.0 + + org.testcontainers + junit-jupiter + 1.18.0 + test + + + org.springframework.boot + spring-boot-starter-test + test + + + org.mockito + mockito-core + + + + + org.mockito + mockito-core + 5.4.0 + test +