Reduce jdk8 dependencies in client

ktorio · Aug 23, 2019 · 06077ee · 06077ee
1 parent e7a3aac
commit 06077ee
Show file tree

Hide file tree

Showing 35 changed files with 218 additions and 122 deletions.
diff --git a/gradle/jdk.gradle b/gradle/jdk.gradle
@@ -1,15 +1,17 @@
 project.ext.jdk8Modules = [
-    'ktor-http',
-    'ktor-utils',
-
     'ktor-client-tests',
 
-    'ktor-network-tls',
     'ktor-server-core', 'ktor-server-host-common', 'ktor-server-servlet', 'ktor-server-netty', 'ktor-server-tomcat',
     'ktor-server-test-host',
 
-    'ktor-websockets', 'ktor-webjars', 'ktor-metrics', 'ktor-server-sessions', 'ktor-auth', 'ktor-auth-jwt'
+    'ktor-websockets', 'ktor-webjars', 'ktor-metrics', 'ktor-server-sessions', 'ktor-auth', 'ktor-auth-jwt',
+
+    'ktor-network-tls-certificates'
 ]
 
 project.ext.jdk7Modules = [
+    'ktor-http',
+    'ktor-utils',
+    'ktor-network-tls',
+    'ktor-websockets'
 ]
diff --git a/gradle/jvm.gradle b/gradle/jvm.gradle
@@ -53,7 +53,6 @@ kotlin {
             api("org.jetbrains.kotlinx:atomicfu:$atomicfu_version")
 
             api group: 'org.slf4j', name: 'slf4j-api', version: slf4j_version
-            api group: 'com.typesafe', name: 'config', version: typesafe_config_version
         }
 
         jvmTest.dependencies {

diff --git a/ktor-client/ktor-client-android/build.gradle.kts b/ktor-client/ktor-client-android/build.gradle.kts
@@ -8,6 +8,7 @@ kotlin.sourceSets {
         dependencies {
             api(project(":ktor-client:ktor-client-tests"))
             api(project(":ktor-network:ktor-network-tls"))
+            api(project(":ktor-network:ktor-network-tls:ktor-network-tls-certificates"))
         }
     }
 }
diff --git a/ktor-client/ktor-client-cio/build.gradle b/ktor-client/ktor-client-cio/build.gradle
@@ -8,6 +8,7 @@ kotlin.sourceSets {
     }
     jvmTest.dependencies {
         api project(':ktor-client:ktor-client-tests')
+        api project(':ktor-network:ktor-network-tls:ktor-network-tls-certificates')
         api group: 'ch.qos.logback', name: 'logback-classic', version: logback_version
     }
 }
diff --git a/ktor-network/ktor-network-tls/build.gradle b/ktor-network/ktor-network-tls/build.gradle
@@ -1,4 +1,10 @@
-kotlin.sourceSets.jvmMain.dependencies {
-    api project(':ktor-network')
-    api project(':ktor-http:ktor-http-cio')
+kotlin.sourceSets {
+    jvmMain.dependencies {
+        api project(':ktor-network')
+        api project(':ktor-http:ktor-http-cio')
+    }
+
+    jvmTest.dependencies {
+        api project(':ktor-network:ktor-network-tls:ktor-network-tls-certificates')
+    }
 }
diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/OID.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/OID.kt
@@ -4,7 +4,10 @@
 
 package io.ktor.network.tls
 
-internal data class OID(val identifier: String) {
+import io.ktor.util.*
+
+@InternalAPI
+data class OID(val identifier: String) {
     val asArray: IntArray = identifier.split(".", " ").map { it.trim().toInt() }.toIntArray()
 
     companion object {
@@ -23,20 +26,21 @@ internal data class OID(val identifier: String) {
         /**
          * Algorithm OID
          */
-        val Sha1withRSAEncryption = OID("1.2.840.113549.1.1.5")
         val ECDSAwithSHA384Encryption = OID("1.2.840.10045.4.3.3")
         val ECDSAwithSHA256Encryption = OID("1.2.840.10045.4.3.2")
 
+        val RSAwithSHA512Encryption = OID("1.2.840.113549.1.1.13")
         val RSAwithSHA384Encryption = OID("1.2.840.113549.1.1.12")
         val RSAwithSHA256Encryption = OID("1.2.840.113549.1.1.11")
+        val RSAwithSHA1Encryption = OID("1.2.840.113549.1.1.5")
 
         /**
          * EC curves
          */
         val secp256r1 = OID("1.2.840.10045.3.1.7")
 
         fun fromAlgorithm(algorithm: String): OID = when (algorithm) {
-            "SHA1withRSA" -> Sha1withRSAEncryption
+            "SHA1withRSA" -> RSAwithSHA1Encryption
             "SHA384withECDSA" -> ECDSAwithSHA384Encryption
             "SHA256withECDSA" -> ECDSAwithSHA256Encryption
             "SHA384withRSA" -> RSAwithSHA384Encryption
@@ -46,7 +50,8 @@ internal data class OID(val identifier: String) {
     }
 }
 
-internal fun keysGenerationAlgorithm(algorithm: String): String = when {
+@InternalAPI
+fun keysGenerationAlgorithm(algorithm: String): String = when {
     algorithm.endsWith("ecdsa", ignoreCase = true) -> "EC"
     algorithm.endsWith("dsa", ignoreCase = true) -> "DSA"
     algorithm.endsWith("rsa", ignoreCase = true) -> "RSA"

diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientHandshake.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/TLSClientHandshake.kt
@@ -218,10 +218,8 @@ internal class TLSClientHandshake(
 
                     serverCertificate = x509s.firstOrNull { certificate ->
                         SupportedSignatureAlgorithms.any {
-                            it.name.equals(
-                                certificate.sigAlgName,
-                                ignoreCase = true
-                            )
+                            val oid = it.oid?.identifier ?: return@any false
+                            oid.equals(certificate.sigAlgOID, ignoreCase = true)
                         }
                     } ?: throw TLSException("No suitable server certificate received: $certs")
                 }
@@ -235,7 +233,7 @@ internal class TLSClientHandshake(
                     repeat(hashAndSignCount / 2) {
                         val hash = packet.readByte()
                         val sign = packet.readByte()
-                        hashAndSign += HashAndSign(hash, sign)
+                        hashAndSign += HashAndSign.byCode(hash, sign)
                     }
 
                     val authoritiesSize = packet.readShort().toInt() and 0xFFFF
@@ -282,7 +280,7 @@ internal class TLSClientHandshake(
 
                             encryptionInfo = generateECKeys(curve, point)
                         }
-                        SecretExchangeType.RSA -> {
+                        RSA -> {
                             packet.release()
                             error("Server key exchange handshake doesn't expected in RCA exchange type")
                         }
@@ -333,7 +331,7 @@ internal class TLSClientHandshake(
 
     private fun generatePreSecret(encryptionInfo: EncryptionInfo?): ByteArray =
         when (serverHello.cipherSuite.exchangeType) {
-            SecretExchangeType.RSA -> ByteArray(48).also {
+            RSA -> ByteArray(48).also {
                 config.random.nextBytes(it)
                 it[0] = 0x03
                 it[1] = 0x03

diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/extensions/SignatureAlgorithm.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/extensions/SignatureAlgorithm.kt
@@ -5,6 +5,7 @@
 package io.ktor.network.tls.extensions
 
 import io.ktor.network.tls.*
+import io.ktor.util.*
 import kotlinx.io.core.*
 
 /**
@@ -55,29 +56,35 @@ enum class SignatureAlgorithm(val code: Byte) {
 
 /**
  * Hash and signature algorithm pair
- * @property hash algorithm
- * @property sign algorithm
+ *
+ * @property hash algorithm.
+ * @property sign algorithm.
+ * @property oid [object identifier](https://en.wikipedia.org/wiki/Object_identifier).
  */
-data class HashAndSign(val hash: HashAlgorithm, val sign: SignatureAlgorithm) {
-    constructor(hash: Byte, sign: Byte) : this(HashAlgorithm.byCode(hash), SignatureAlgorithm.byCode(sign))
+data class HashAndSign(val hash: HashAlgorithm, val sign: SignatureAlgorithm, val oid: OID? = null) {
+    constructor(hash: Byte, sign: Byte, oid: String? = null) : this(
+        HashAlgorithm.byCode(hash), SignatureAlgorithm.byCode(sign), oid?.let{ OID(it) }
+    )
 
     /**
      * String representation of this algorithms pair
      */
     val name: String = "${hash.name}with${sign.name}"
+
+    companion object
 }
 
 /**
  * List of supported combinations of hash and signature algorithms
  */
 val SupportedSignatureAlgorithms: List<HashAndSign> = listOf(
-    HashAndSign(HashAlgorithm.SHA384, SignatureAlgorithm.ECDSA),
-    HashAndSign(HashAlgorithm.SHA256, SignatureAlgorithm.ECDSA),
+    HashAndSign(HashAlgorithm.SHA384, SignatureAlgorithm.ECDSA, OID.ECDSAwithSHA384Encryption),
+    HashAndSign(HashAlgorithm.SHA256, SignatureAlgorithm.ECDSA, OID.ECDSAwithSHA256Encryption),
 
-    HashAndSign(HashAlgorithm.SHA512, SignatureAlgorithm.RSA),
-    HashAndSign(HashAlgorithm.SHA384, SignatureAlgorithm.RSA),
-    HashAndSign(HashAlgorithm.SHA256, SignatureAlgorithm.RSA),
-    HashAndSign(HashAlgorithm.SHA1, SignatureAlgorithm.RSA)
+    HashAndSign(HashAlgorithm.SHA512, SignatureAlgorithm.RSA, OID.RSAwithSHA512Encryption),
+    HashAndSign(HashAlgorithm.SHA384, SignatureAlgorithm.RSA, OID.RSAwithSHA384Encryption),
+    HashAndSign(HashAlgorithm.SHA256, SignatureAlgorithm.RSA, OID.RSAwithSHA256Encryption),
+    HashAndSign(HashAlgorithm.SHA1, SignatureAlgorithm.RSA, OID.RSAwithSHA1Encryption)
 )
 
 internal fun ByteReadPacket.parseSignatureAlgorithms(): List<HashAndSign> {
@@ -97,8 +104,12 @@ internal fun ByteReadPacket.parseSignatureAlgorithms(): List<HashAndSign> {
 internal fun ByteReadPacket.readHashAndSign(): HashAndSign {
     val hash = readByte()
     val sign = readByte()
+    return HashAndSign.byCode(hash, sign)
+}
 
-    check(sign != SignatureAlgorithm.ANON.code) { "Anonymous signature not al" }
+@InternalAPI
+fun HashAndSign.Companion.byCode(hash: Byte, sign: Byte): HashAndSign {
+    check(sign != SignatureAlgorithm.ANON.code) { "Anonymous signature not allowed." }
 
-    return HashAndSign(hash, sign)
+    return SupportedSignatureAlgorithms.find { it.hash.code == hash && it.sign.code == sign } ?: HashAndSign(hash, sign)
 }
diff --git a/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/extensions/TLSExtension.kt b/ktor-network/ktor-network-tls/jvm/src/io/ktor/network/tls/extensions/TLSExtension.kt
@@ -7,7 +7,7 @@ package io.ktor.network.tls.extensions
 import io.ktor.network.tls.*
 import kotlinx.io.core.*
 
-internal enum class TLSExtensionType(val code: Short) {
+enum class TLSExtensionType(val code: Short) {
     SERVER_NAME(0),
     MAX_FRAGMENT_LENGTH(1),
     CLIENT_CERTIFICATE_URL(2),

diff --git a/ktor-network/ktor-network-tls/ktor-network-tls-certificates/build.gradle.kts b/ktor-network/ktor-network-tls/ktor-network-tls-certificates/build.gradle.kts
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2014-2019 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
+ */
+
+kotlin {
+    sourceSets {
+        jvmMain {
+            dependencies {
+                api(project(":ktor-network:ktor-network-tls"))
+            }
+        }
+    }
+}
diff --git a/.../network/tls/certificates/Certificates.kt → .../network/tls/certificates/Certificates.kt b/.../network/tls/certificates/Certificates.kt → .../network/tls/certificates/Certificates.kt
diff --git a/...ktor/network/tls/certificates/builders.kt → ...ktor/network/tls/certificates/builders.kt b/...ktor/network/tls/certificates/builders.kt → ...ktor/network/tls/certificates/builders.kt
@@ -49,7 +49,7 @@ class CertificateBuilder internal constructor() {
     var keySizeInBits: Int = 1024
 
     internal fun build(): CertificateInfo {
-        val algorithm = HashAndSign(hash, sign)
+        val algorithm = HashAndSign.byCode(hash.code, sign.code)
         val keys = KeyPairGenerator.getInstance(keysGenerationAlgorithm(algorithm.name))!!.apply {
             initialize(keySizeInBits)
         }.genKeyPair()!!

diff --git a/ktor-server/ktor-server-core/build.gradle b/ktor-server/ktor-server-core/build.gradle
@@ -5,6 +5,7 @@ kotlin.sourceSets {
         api project(':ktor-utils')
         api project(':ktor-http')
 
+        api group: 'com.typesafe', name: 'config', version: typesafe_config_version
         api group: 'org.jetbrains.kotlin', name: 'kotlin-reflect', version: kotlin_version
     }
     jvmTest.dependencies {

diff --git a/.../http/ApplicationResponsePropertiesJvm.kt → .../http/ApplicationResponsePropertiesJvm.kt b/.../http/ApplicationResponsePropertiesJvm.kt → .../http/ApplicationResponsePropertiesJvm.kt
diff --git a/ktor-http/jvm/src/io/ktor/http/HttpDate.kt → ...ver-core/jvm/src/io/ktor/http/HttpDate.kt b/ktor-http/jvm/src/io/ktor/http/HttpDate.kt → ...ver-core/jvm/src/io/ktor/http/HttpDate.kt
diff --git a/...io/ktor/http/content/CachingOptionsJvm.kt → ...io/ktor/http/content/CachingOptionsJvm.kt b/...io/ktor/http/content/CachingOptionsJvm.kt → ...io/ktor/http/content/CachingOptionsJvm.kt
diff --git a/...rc/io/ktor/http/content/JarFileContent.kt → ...rc/io/ktor/http/content/JarFileContent.kt b/...rc/io/ktor/http/content/JarFileContent.kt → ...rc/io/ktor/http/content/JarFileContent.kt
diff --git a/...ktor/http/content/LastModifiedJavaTime.kt → ...ktor/http/content/LastModifiedJavaTime.kt b/...ktor/http/content/LastModifiedJavaTime.kt → ...ktor/http/content/LastModifiedJavaTime.kt
@@ -18,5 +18,6 @@ fun LastModifiedVersion(lastModified: ZonedDateTime) : LastModifiedVersion = Las
 /**
  * Construct [LastModifiedVersion] version from a [FileTime] instance
  */
-fun LastModifiedVersion(lastModified: FileTime) : LastModifiedVersion = LastModifiedVersion(GMTDate(lastModified.toMillis()))
+fun LastModifiedVersion(lastModified: FileTime) : LastModifiedVersion =
+    LastModifiedVersion(GMTDate(lastModified.toMillis()))
 
diff --git a/.../io/ktor/http/content/LocalFileContent.kt → .../io/ktor/http/content/LocalFileContent.kt b/.../io/ktor/http/content/LocalFileContent.kt → .../io/ktor/http/content/LocalFileContent.kt
@@ -40,12 +40,14 @@ class LocalFileContent(
 fun LocalFileContent(
     baseDir: File, relativePath: String,
     contentType: ContentType = ContentType.defaultForFilePath(relativePath)
-): LocalFileContent = LocalFileContent(baseDir.combineSafe(relativePath), contentType)
+): LocalFileContent =
+    LocalFileContent(baseDir.combineSafe(relativePath), contentType)
 
 /**
  * Creates an instance of [LocalFileContent] for a file designated by [relativePath] in a [baseDir]
  */
 fun LocalFileContent(
     baseDir: Path, relativePath: Path,
     contentType: ContentType = ContentType.defaultForFile(relativePath)
-): LocalFileContent = LocalFileContent(baseDir.combineSafe(relativePath), contentType)
+): LocalFileContent =
+    LocalFileContent(baseDir.combineSafe(relativePath), contentType)
diff --git a/ktor-utils/jvm/src/io/ktor/util/DatesJvm.kt → ...ver-core/jvm/src/io/ktor/util/DatesJvm.kt b/ktor-utils/jvm/src/io/ktor/util/DatesJvm.kt → ...ver-core/jvm/src/io/ktor/util/DatesJvm.kt
diff --git a/...ls/jvm/src/io/ktor/util/date/DateUtils.kt → ...re/jvm/src/io/ktor/util/date/DateUtils.kt b/...ls/jvm/src/io/ktor/util/date/DateUtils.kt → ...re/jvm/src/io/ktor/util/date/DateUtils.kt
@@ -10,7 +10,8 @@ import java.util.concurrent.*
 /**
  * Convert [Instant] to [GMTDate]
  */
-fun Instant.toGMTDate(): GMTDate = GMTDate(TimeUnit.SECONDS.toMillis(atZone(ZoneOffset.UTC).toEpochSecond()))
+fun Instant.toGMTDate(): GMTDate =
+    GMTDate(TimeUnit.SECONDS.toMillis(atZone(ZoneOffset.UTC).toEpochSecond()))
 
 /**
  * Convert [ZonedDateTime] to [GMTDate]

diff --git a/...m/test/io/ktor/tests/utils/DateJvmTest.kt → ...m/test/io/ktor/tests/utils/DateJvmTest.kt b/...m/test/io/ktor/tests/utils/DateJvmTest.kt → ...m/test/io/ktor/tests/utils/DateJvmTest.kt
diff --git a/ktor-server/ktor-server-test-host/build.gradle b/ktor-server/ktor-server-test-host/build.gradle
@@ -4,6 +4,7 @@ kotlin.sourceSets.jvmMain.dependencies {
     api project(':ktor-server:ktor-server-core')
     api project(':ktor-server:ktor-server-host-common')
     api project(':ktor-network:ktor-network-tls')
+    api project(':ktor-network:ktor-network-tls:ktor-network-tls-certificates')
     api project(':ktor-client:ktor-client-core')
     api project(':ktor-client:ktor-client-jetty')
     api project(':ktor-client:ktor-client-cio')

diff --git a/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/features/CompressionTest.kt b/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/features/CompressionTest.kt
@@ -351,8 +351,8 @@ class CompressionTest {
                         init {
                             versions += LastModifiedVersion(dateTime)
                             caching = CachingOptions(
-                                    cacheControl = CacheControl.NoCache(CacheControl.Visibility.Public),
-                                    expires = dateTime
+                                cacheControl = CacheControl.NoCache(CacheControl.Visibility.Public),
+                                expires = dateTime
                             )
                         }
 

diff --git a/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/features/StaticContentTest.kt b/ktor-server/ktor-server-tests/jvm/test/io/ktor/tests/server/features/StaticContentTest.kt
@@ -158,7 +158,12 @@ class StaticContentTest {
     @Test
     fun testSendLocalFile() = withTestApplication {
         application.intercept(ApplicationCallPipeline.Call) {
-            call.respond(LocalFileContent(basedir, "/features/StaticContentTest.kt".replaceSeparators()))
+            call.respond(
+                LocalFileContent(
+                    basedir,
+                    "/features/StaticContentTest.kt".replaceSeparators()
+                )
+            )
         }
 
         handleRequest(HttpMethod.Get, "/").let { result ->
@@ -193,10 +198,20 @@ class StaticContentTest {
     fun testSendLocalFileBadRelative() = withTestApplication {
         application.intercept(ApplicationCallPipeline.Call) {
             assertFailsWithSuspended<Exception> {
-                call.respond(LocalFileContent(basedir, "/../../../../../../../../../../../../../etc/passwd"))
+                call.respond(
+                    LocalFileContent(
+                        basedir,
+                        "/../../../../../../../../../../../../../etc/passwd"
+                    )
+                )
             }
             assertFailsWithSuspended<Exception> {
-                call.respond(LocalFileContent(basedir, "../../../../../../../../../../../../../etc/passwd"))
+                call.respond(
+                    LocalFileContent(
+                        basedir,
+                        "../../../../../../../../../../../../../etc/passwd"
+                    )
+                )
             }
             assertFailsWithSuspended<Exception> {
                 call.respond(LocalFileContent(basedir.toPath(), Paths.get("../build.gradle")))