Add check signature config option

SpaiR · Nov 7, 2018 · 5fb9ba7 · 5fb9ba7
1 parent fa8125b
commit 5fb9ba7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/src/main/kotlin/io/github/spair/repoxbot/EntryPointVerticle.kt b/src/main/kotlin/io/github/spair/repoxbot/EntryPointVerticle.kt
@@ -11,8 +11,8 @@ import io.vertx.core.http.HttpMethod
 import io.vertx.core.http.HttpServerRequest
 import io.vertx.core.json.JsonObject
 import io.vertx.core.logging.LoggerFactory
-import java.net.HttpURLConnection
 import com.fasterxml.jackson.core.JsonParseException
+import java.net.HttpURLConnection
 
 class EntryPointVerticle : AbstractVerticle() {
 
@@ -46,7 +46,9 @@ class EntryPointVerticle : AbstractVerticle() {
                 val secretKey = getSharedConfig(GITHUB_SECRET)
                 val payload = body.toJsonObject()
 
-                if (Signature.isEqualSignature(signature, secretKey, payload.toString())) {
+                val shouldCheckSign = getSharedConfig(CHECK_SIGN).toBoolean()
+
+                if (!shouldCheckSign || (shouldCheckSign && Signature.isCorrectSignature(signature, secretKey, payload.toString()))) {
                     val response = processPayload(request.headers()[EVENT_HEADER], payload)
                     request.response().setStatusCode(HttpURLConnection.HTTP_OK).end(response)
                 } else {
@@ -66,9 +68,9 @@ class EntryPointVerticle : AbstractVerticle() {
             PING_EVENT -> {
                 val zen = payload.getString("zen")
                 logger.info("Ping event caught. Zen: $zen")
-                zen
+                "Pong! Zen was: '$zen'"
             }
             else -> "Unknown event caught. Event: $event"
-        } ?: "Empty response"
+        }
     }
 }
diff --git a/src/main/kotlin/io/github/spair/repoxbot/MainVerticle.kt b/src/main/kotlin/io/github/spair/repoxbot/MainVerticle.kt
@@ -38,6 +38,7 @@ class MainVerticle : AbstractVerticle() {
 
         setConfigOrDefault(PORT, DEFAULT_PORT)
         setConfigOrDefault(ENTRY_POINT, DEFAULT_ENTRY_POINT)
+        setConfigOrDefault(CHECK_SIGN, DEFAULT_CHECK_SIGN)
 
         logger.info("Configuration initialized! " +
                 "RepoXBot now works with next GitHub repository: ${sharedConfig[GITHUB_ORG]}/${sharedConfig[GITHUB_REPO]}; " +

diff --git a/src/main/kotlin/io/github/spair/repoxbot/constant/config.kt b/src/main/kotlin/io/github/spair/repoxbot/constant/config.kt
@@ -7,6 +7,8 @@ const val GITHUB_SECRET = "github_secret"
 
 const val PORT = "port"
 const val ENTRY_POINT = "entry_point"
+const val CHECK_SIGN = "check_sign"
 
 const val DEFAULT_PORT = "8080"
 const val DEFAULT_ENTRY_POINT = "/handle"
+const val DEFAULT_CHECK_SIGN = "true"
diff --git a/src/main/kotlin/io/github/spair/repoxbot/util/Signature.kt b/src/main/kotlin/io/github/spair/repoxbot/util/Signature.kt
@@ -8,7 +8,7 @@ object Signature {
     private const val HMAC_SHA1_ALGORITHM = "HmacSHA1"
     private val hexArray = "0123456789ABCDEF".toCharArray()
 
-    fun isEqualSignature(signature: String, secretKey: String, xData: String): Boolean {
+    fun isCorrectSignature(signature: String, secretKey: String, xData: String): Boolean {
         val signingKey = SecretKeySpec(secretKey.toByteArray(), HMAC_SHA1_ALGORITHM)
         val mac = Mac.getInstance(HMAC_SHA1_ALGORITHM).apply { init(signingKey) }
         return signature.equals(toHextString(mac.doFinal(xData.toByteArray())), ignoreCase = true)