Improve the error caused in the #792 scenario #807
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
seratch
added
enhancement
seratch
commented
Aug 11, 2021
| @@ -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) { | |||
There was a problem hiding this comment.
As the getProxyHeaders() method can return null value, we have a null check like we do in the default SocketModeClientTyrusImpl
| 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 |
| @@ -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) | |||
There was a problem hiding this comment.
I found this potential issue while writing unit tests
| public void proxyAuth() throws Exception { | ||
| SlackConfig config = new SlackConfig(); | ||
| config.setMethodsEndpointUrlPrefix(webApiServer.getMethodsEndpointPrefix()); | ||
| config.setProxyUrl("http://user:pass@localhost:9000/"); |
There was a problem hiding this comment.
Using "http://localhost:9000/" still works. Also, passing static proxyHeaders also works.
seratch
commented
Aug 11, 2021
| @@ -173,7 +173,7 @@ public String issueSocketModeUrl(String appToken) throws IOException { | |||
| } catch (SlackApiException e) { | |||
| String message = "Failed to connect to the Socket Mode API endpoint. (" + | |||
| "status: " + e.getResponse().code() + ", " + | |||
| "error: " + e.getError().getError() + | |||
| "error: " + (e.getError() != null ? e.getError().getError() : "") + | |||
There was a problem hiding this comment.
e.getError() cannot be null in a usual situation... but, just in case, we want to improve this part not to throw NPE (I encountered with the mock proxy sever returning 502 status)
Codecov Report
@@ Coverage Diff @@
## main #807 +/- ##
============================================
+ Coverage 76.75% 77.06% +0.31%
- Complexity 3395 3401 +6
============================================
Files 380 380
Lines 10224 10229 +5
Branches 997 1000 +3
============================================
+ Hits 7847 7883 +36
+ Misses 1800 1762 -38
- Partials 577 584 +7
Continue to review full report at Codecov.
|
seratch
commented
Aug 11, 2021
| 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()) { |
There was a problem hiding this comment.
for improvement; proxyHeaders can be passed for other purposes
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request improves the developer experience in the scenario described in #792
Category (place an
xin each of the[ ])Requirements
Please read the Contributing guidelines and Code of Conduct before creating this issue or pull request. By submitting, you are agreeing to the those rules.