From 49fb020678049e103172154e2b010b301a3e73dd Mon Sep 17 00:00:00 2001
From: InsanusMokrassar <ovsyannikov.alexey95@gmail.com>
Date: Wed, 6 Mar 2019 12:23:28 +0800
Subject: [PATCH] add private key config for webhook and opportunity to work
 with ssl directly in bot

---
 .../extensions/WebhookPrivateKeyConfig.kt     | 25 +++++++++++++++++++
 .../utils/extensions/Webhooks.kt              | 23 +++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/WebhookPrivateKeyConfig.kt

diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/WebhookPrivateKeyConfig.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/WebhookPrivateKeyConfig.kt
new file mode 100644
index 0000000000..db2bfc3a02
--- /dev/null
+++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/WebhookPrivateKeyConfig.kt
@@ -0,0 +1,25 @@
+package com.github.insanusmokrassar.TelegramBotAPI.utils.extensions
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import java.io.FileInputStream
+import java.security.KeyStore
+
+@Serializable
+data class WebhookPrivateKeyConfig(
+    @SerialName("keyStore")
+    private val keyStorePath: String,
+    private val keyStorePassword: String,
+    val aliasName: String,
+    private val aliasPassword: String
+) {
+    @Transient
+    val keyStore = KeyStore.getInstance("JKS").apply {
+        load(FileInputStream(keyStorePath), keyStorePassword())
+    }
+
+    fun keyStorePassword(): CharArray = keyStorePassword.toCharArray()
+
+    fun aliasPassword(): CharArray = aliasPassword.toCharArray()
+}
diff --git a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt
index b86ff55bda..e7124e23c6 100644
--- a/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt
+++ b/src/main/kotlin/com/github/insanusmokrassar/TelegramBotAPI/utils/extensions/Webhooks.kt
@@ -17,9 +17,13 @@ import io.ktor.server.netty.Netty
 import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.serialization.json.Json
+import java.io.FileInputStream
+import java.security.KeyStore
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
+
+
 /**
  * Reverse proxy webhook.
  *
@@ -33,6 +37,7 @@ suspend fun RequestsExecutor.setWebhook(
     url: String,
     port: Int,
     certificate: InputFile? = null,
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
     scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
     allowedUpdates: List<String>? = null,
     maxAllowedConnections: Int? = null,
@@ -62,6 +67,7 @@ suspend fun RequestsExecutor.setWebhook(
         scope = scope
     )
     val env = applicationEngineEnvironment {
+
         module {
             fun Application.main() {
                 routing {
@@ -78,10 +84,21 @@ suspend fun RequestsExecutor.setWebhook(
             }
             main()
         }
-        connector {
-            host = "0.0.0.0"
+        privateKeyConfig ?.let {
+            sslConnector(
+                privateKeyConfig.keyStore,
+                privateKeyConfig.aliasName,
+                privateKeyConfig::keyStorePassword,
+                privateKeyConfig::aliasPassword
+            ) {
+                host = "0.0.0.0"
+                this.port = port
+            }
+        } ?: connector {
+            host = "localhost"
             this.port = port
         }
+
     }
     val engine = embeddedServer(engineFactory, env)
 
@@ -120,6 +137,7 @@ suspend fun RequestsExecutor.setWebhook(
     port: Int,
     filter: UpdatesFilter,
     certificate: InputFile? = null,
+    privateKeyConfig: WebhookPrivateKeyConfig? = null,
     scope: CoroutineScope = CoroutineScope(Executors.newFixedThreadPool(4).asCoroutineDispatcher()),
     maxAllowedConnections: Int? = null,
     engineFactory: ApplicationEngineFactory<*, *> = Netty
@@ -127,6 +145,7 @@ suspend fun RequestsExecutor.setWebhook(
     url,
     port,
     certificate,
+    privateKeyConfig,
     scope,
     filter.allowedUpdates,
     maxAllowedConnections,