Improve the error caused in the slackapi#792 scenario

seratch · Aug 11, 2021 · 3688808 · 3688808
1 parent 2fb3e82
commit 3688808
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/...k-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientJavaWSImpl.java b/...k-api-client/src/main/java/com/slack/api/socket_mode/impl/SocketModeClientJavaWSImpl.java
@@ -219,17 +219,29 @@ public UnderlyingWebSocketSession(URI serverUri, Map<String, String> httpHeaders
             // FIXME: the proxy settings here may not work
             SlackConfig slackConfig = smc.getSlack().getHttpClient().getConfig();
             Map<String, String> proxyHeaders = slackConfig.getProxyHeaders();
+            if (proxyHeaders == null) {
+                proxyHeaders = new HashMap<>();
+            }
+
             String proxyUrl = slackConfig.getProxyUrl();
             if (proxyUrl != null) {
                 if (smc.getLogger().isDebugEnabled()) {
                     smc.getLogger().debug("The SocketMode client's going to use an HTTP proxy: {}", proxyUrl);
                 }
                 ProxyUrlUtil.ProxyUrl parsedProxy = ProxyUrlUtil.parse(proxyUrl);
+                if (parsedProxy.getUsername() != null && parsedProxy.getPassword() != null) {
+                    // see also: https://github.com/slackapi/java-slack-sdk/issues/792#issuecomment-895961176
+                    String message = "Unfortunately, " +
+                            "having username:password with the Java-WebSocket library is not yet supported. " +
+                            "Consider using other implementations such SocketModeClient.Backend.Tyrus.";
+                    throw new UnsupportedOperationException(message);
+                }
+
                 InetSocketAddress proxyAddress = new InetSocketAddress(parsedProxy.getHost(), parsedProxy.getPort());
                 this.setProxy(new Proxy(Proxy.Type.HTTP, proxyAddress));
                 ProxyUrlUtil.setProxyAuthorizationHeader(proxyHeaders, parsedProxy);
             }
-            if (slackConfig.getProxyHeaders() != null) {
+            if (proxyHeaders != null && !proxyHeaders.isEmpty()) {
                 for (Map.Entry<String, String> each : proxyHeaders.entrySet()) {
                     this.addHeader(each.getKey(), each.getValue());
                 }

diff --git a/slack-api-client/src/main/java/com/slack/api/util/http/ProxyUrlUtil.java b/slack-api-client/src/main/java/com/slack/api/util/http/ProxyUrlUtil.java
@@ -48,14 +48,14 @@ public static ProxyUrl parse(String proxyUrl) {
                     .username(userAndPassword[0])
                     .password(userAndPassword[1])
                     .host(hostAndPort[0])
-                    .port(hostAndPort.length == 2 ? Integer.parseInt(hostAndPort[1]) : 80)
+                    .port(hostAndPort.length == 2 ? Integer.parseInt(hostAndPort[1].replace("/", "")) : 80)
                     .build();
         } else {
             String[] hostAndPort = proxyUrl.split("://")[1].split(":");
             return ProxyUrl.builder()
                     .schema(schema)
                     .host(hostAndPort[0])
-                    .port(hostAndPort.length == 2 ? Integer.parseInt(hostAndPort[1]) : 80)
+                    .port(hostAndPort.length == 2 ? Integer.parseInt(hostAndPort[1].replace("/", "")) : 80)
                     .build();
         }
     }

diff --git a/slack-api-client/src/test/java/test_locally/api/socket_mode/SocketModeClientTest.java b/slack-api-client/src/test/java/test_locally/api/socket_mode/SocketModeClientTest.java
@@ -146,6 +146,15 @@ public void messageReceiver() throws Exception {
     // JavaWebSocket implementation
     // -------------------------------------------------
 
+    @Test(expected = UnsupportedOperationException.class)
+    public void proxyAuth() throws Exception {
+        SlackConfig config = new SlackConfig();
+        config.setMethodsEndpointUrlPrefix(webApiServer.getMethodsEndpointPrefix());
+        config.setProxyUrl("http://user:pass@localhost:9000/");
+        Slack slack = Slack.getInstance(config);
+        slack.socketMode(VALID_APP_TOKEN, SocketModeClient.Backend.JavaWebSocket);
+    }
+
     @Test
     public void attributes_JavaWebSocket() throws Exception {
         try (SocketModeClient client = slack.socketMode(VALID_APP_TOKEN, SocketModeClient.Backend.JavaWebSocket)) {