Use a more secure cookie jar

fioan89 · fioan89 · commit a0ce782f0c81 · 2022-06-02T17:34:02.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -24,6 +24,7 @@ dependencies {
     implementation(platform("com.squareup.okhttp3:okhttp-bom:4.9.3"))
     implementation("com.squareup.retrofit2:converter-gson:2.9.0")
     implementation("com.squareup.okhttp3:okhttp")
+    implementation("com.squareup.okhttp3:okhttp-urlconnection")
     implementation("com.squareup.okhttp3:logging-interceptor")
 
     implementation(files("lib/webrtc-java-0.6.0.jar"))
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -13,13 +13,12 @@ import com.intellij.openapi.components.Service
 import com.jetbrains.gateway.sdk.convertors.InstantConverter
 import com.jetbrains.gateway.sdk.convertors.RTCIceServerAdapter
 import dev.onvoid.webrtc.RTCIceServer
-import okhttp3.Cookie
-import okhttp3.CookieJar
-import okhttp3.HttpUrl
+import okhttp3.JavaNetCookieJar
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import java.net.CookieManager
 import java.time.Instant
 
 @Service(Service.Level.APP)
@@ -42,13 +41,12 @@ class CoderRestClientService {
 
         val interceptor = HttpLoggingInterceptor()
         interceptor.setLevel(HttpLoggingInterceptor.Level.BODY)
-
         retroRestClient = Retrofit.Builder()
             .baseUrl("${uriScheme.scheme}://$hostPath:$port")
             .client(
                 OkHttpClient.Builder()
                     .addInterceptor(interceptor)
-                    .cookieJar(CoderCookieJar())
+                    .cookieJar(JavaNetCookieJar(CookieManager()))
                     .build()
             )
             .addConverterFactory(GsonConverterFactory.create(gson))
@@ -88,20 +86,4 @@ class CoderRestClientService {
         return sshKeysResponse.body()!!
     }
 
-    private class CoderCookieJar : CookieJar {
-        private lateinit var coderCookies: List<Cookie>
-        override fun loadForRequest(url: HttpUrl): List<Cookie> {
-            if (!url.encodedPath.endsWith("user/login")) {
-                return coderCookies
-            }
-            return emptyList()
-        }
-
-        override fun saveFromResponse(url: HttpUrl, cookies: List<Cookie>) {
-            if (url.encodedPath.endsWith("user/login")) {
-                coderCookies = ArrayList(cookies)
-            }
-        }
-
-    }
 }
