Use proxy authentication if set

code-asher · code-asher · commit 6a904d4989ae · 2024-02-09T18:04:11.000-09:00
I also set the proxy selector although it seems like it already uses the
proxy somehow, it is just not authenticating.
diff --git a/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt b/src/main/kotlin/com/coder/gateway/sdk/CoderRestClientService.kt
@@ -22,6 +22,8 @@ import com.intellij.openapi.components.Service
 import com.intellij.openapi.diagnostic.Logger
 import com.intellij.openapi.extensions.PluginId
 import com.intellij.openapi.util.SystemInfo
+import com.intellij.util.net.HttpConfigurable
+import okhttp3.Credentials
 import okhttp3.OkHttpClient
 import okhttp3.internal.tls.OkHostnameVerifier
 import okhttp3.logging.HttpLoggingInterceptor
@@ -95,9 +97,22 @@ class CoderRestClient(
             pluginVersion = PluginManagerCore.getPlugin(PluginId.getId("com.coder.gateway"))!!.version // this is the id from the plugin.xml
         }
 
+        val proxy = HttpConfigurable.getInstance()
+
         val socketFactory = coderSocketFactory(settings)
         val trustManagers = coderTrustManagers(settings.tlsCAPath)
         httpClient = OkHttpClient.Builder()
+            .proxySelector(proxy.onlyBySettingsSelector)
+            .proxyAuthenticator { _, response ->
+                val login = proxy.proxyLogin
+                val pass = proxy.plainProxyPassword
+                if (proxy.PROXY_AUTHENTICATION && login != null && pass != null) {
+                    val credentials = Credentials.basic(login, pass)
+                    response.request.newBuilder()
+                        .header("Proxy-Authorization", credentials)
+                        .build()
+                } else null
+            }
             .sslSocketFactory(socketFactory, trustManagers[0] as X509TrustManager)
             .hostnameVerifier(CoderHostnameVerifier(settings.tlsAlternateHostname))
             .addInterceptor { it.proceed(it.request().newBuilder().addHeader("Coder-Session-Token", token).build()) }
@@ -451,4 +466,4 @@ class MergedSystemTrustManger(private val otherTrustManager: X509TrustManager) :
     override fun getAcceptedIssuers(): Array<X509Certificate> {
         return otherTrustManager.acceptedIssuers + systemTrustManager.acceptedIssuers
     }
-}
+}
