add option to control if https should be secure (no restart required)

pwielgolaski · Jul 2, 2017 · eb5db59 · eb5db59
1 parent 8c2f379
commit eb5db59
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/src/main/java/jetbrains/buildServer/auth/oauth/OAuthClient.java b/src/main/java/jetbrains/buildServer/auth/oauth/OAuthClient.java
@@ -1,23 +1,32 @@
 package jetbrains.buildServer.auth.oauth;
 
 import com.intellij.openapi.util.text.StringUtil;
-import okhttp3.*;
+import okhttp3.FormBody;
+import okhttp3.HttpUrl;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
 import org.apache.log4j.Logger;
 import org.json.simple.JSONValue;
 import org.springframework.http.MediaType;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.Map;
 
 public class OAuthClient {
 
     private AuthenticationSchemeProperties properties;
     private static final Logger log = Logger.getLogger(OAuthClient.class);
-    private final OkHttpClient httpClient;
+    private final Map<Boolean, OkHttpClient> httpClients = new HashMap<>();
 
     public OAuthClient(AuthenticationSchemeProperties properties) {
         this.properties = properties;
-        this.httpClient = HttpClientFactory.createClient(properties.isAllowInsecureHttps());
+    }
+
+    private OkHttpClient getHttpClient() {
+        return httpClients.computeIfAbsent(properties.isAllowInsecureHttps(), HttpClientFactory::createClient);
     }
 
     public String getRedirectUrl(String state) {
@@ -48,7 +57,7 @@ public String getAccessToken(String code) throws IOException {
                 .addHeader("Accept", MediaType.APPLICATION_JSON_VALUE)
                 .post(formBody)
                 .build();
-        Response response = httpClient.newCall(request).execute();
+        Response response = getHttpClient().newCall(request).execute();
         Map jsonResponse = (Map) JSONValue.parse(response.body().string());
         return (String) jsonResponse.get("access_token");
     }
@@ -58,7 +67,7 @@ public Map getUserData(String token) throws IOException {
                 .url(properties.getUserEndpoint())
                 .addHeader("Authorization","Bearer " + token)
                 .build();
-        String response = httpClient.newCall(request).execute().body().string();
+        String response = getHttpClient().newCall(request).execute().body().string();
         log.debug("Fetched user data: " + response);
         return (Map) JSONValue.parse(response);
     }

diff --git a/src/main/resources/buildServerResources/editOAuthSchemeProperties.jsp b/src/main/resources/buildServerResources/editOAuthSchemeProperties.jsp
@@ -81,7 +81,7 @@
 <div>
     <prop:checkboxProperty uncheckedValue="false" name="<%=ConfigKey.allowInsecureHttps.toString()%>"/>
     <label width="100%" for="<%=ConfigKey.allowInsecureHttps%>">Insecure https</label><br/>
-    <span class="grayNote">Allow insecure https access like invalid certificate (restart required)</span>
+    <span class="grayNote">Allow insecure https access like invalid certificate</span>
 </div>
 <script type="text/javascript">
     BS.TeamCityOAuth.init('#<%=ConfigKey.preset.toString()%>');