Add proxy support for clients using AMQPS_WS #558
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
|
Azure Pipelines successfully started running 5 pipeline(s). |
timtay-microsoft
force-pushed
the
proxyAmqp
branch
from
12a5c98 to
97215b0
Compare
|
Azure Pipelines successfully started running 1 pipeline(s). |
3 similar comments
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Azure Pipelines successfully started running 1 pipeline(s). |
timtay-microsoft
force-pushed
the
proxyAmqp
branch
3 times, most recently
from
c851ec0 to
c67372c
Compare
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
timtay-microsoft
force-pushed
the
proxyAmqp
branch
from
c67372c to
24c9e39
Compare
|
Azure Pipelines successfully started running 1 pipeline(s). |
2 similar comments
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
Azure Pipelines successfully started running 1 pipeline(s). |
timtay-microsoft
force-pushed
the
proxyAmqp
branch
from
24c9e39 to
4fbf2a1
Compare
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Java Prod Basic |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Java Canary Basic |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| @@ -1185,29 +1208,6 @@ private String chooseHostname() | |||
| return this.deviceClientConfig.getIotHubHostname(); | |||
| } | |||
|
|
|||
| private String getErrorCondition(ErrorCondition condition) | |||
There was a problem hiding this comment.
This logic was unused, so I removed it
|
/azp run |
|
Azure Pipelines successfully started running 5 pipeline(s). |
davilu
approved these changes
Jul 30, 2019
| { | ||
| throw new UnsupportedOperationException("Cannot use proxy unsupported unless you are using HTTPS"); | ||
| throw new UnsupportedOperationException("Use of proxies is unsupported unless using HTTPS or AMQPS_WS"); |
There was a problem hiding this comment.
It should be IllegalArgumentException instead of UnsupportedOperationException.
There was a problem hiding this comment.
I'll address this in the next PR, sure
|
|
||
| if (protocol == AMQPS_WS && proxySettings.getUsername() != null) | ||
| { | ||
| throw new UnsupportedOperationException("Use of username/password authentication is not supported for AMQPS_WS proxies"); |
There was a problem hiding this comment.
I'll address this in the next PR, sure
| @@ -557,7 +568,8 @@ public void onConnectionBound(Event event) | |||
| { | |||
| // Codes_SRS_AMQPSIOTHUBCONNECTION_25_049: [If websocket enabled the event handler shall configure the transport layer for websocket.] | |||
| WebSocketImpl webSocket = new WebSocketImpl(); | |||
| webSocket.configure(this.hostName, WEB_SOCKET_PATH, 0, WEB_SOCKET_SUB_PROTOCOL, null, null); | |||
| String query = "iothub-no-client-cert=true"; | |||
There was a problem hiding this comment.
Please add a const for this magic string.
There was a problem hiding this comment.
I'll address this in the next PR, sure
| @@ -557,7 +568,8 @@ public void onConnectionBound(Event event) | |||
| { | |||
| // Codes_SRS_AMQPSIOTHUBCONNECTION_25_049: [If websocket enabled the event handler shall configure the transport layer for websocket.] | |||
| WebSocketImpl webSocket = new WebSocketImpl(); | |||
| webSocket.configure(this.hostName, WEB_SOCKET_PATH, 0, WEB_SOCKET_SUB_PROTOCOL, null, null); | |||
| String query = "iothub-no-client-cert=true"; | |||
| webSocket.configure(this.hostName, WEB_SOCKET_PATH, query, 443, WEB_SOCKET_SUB_PROTOCOL, null, null); | |||
There was a problem hiding this comment.
Please add a const for HTTPS port 443.
There was a problem hiding this comment.
I'll address this in the next PR, sure
| //this.amqpSessionManager to sever the connection | ||
| //twinSubscribed = false; | ||
| } | ||
| { |
There was a problem hiding this comment.
Remove unused code if we don't have plan to support it.
This was referenced Sep 30, 2019
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.
Building on earlier work for proxy support for HTTPS, this PR enables AMQPS_WS to communicate over proxies now, too.
A part of this pr is migrating away from maintaining the Websocket layer implementation over proton-j, and instead taking a dependency on the proton-j-extensions jar, which is very similar, but also includes proxy support.
Also adding a simple sample for using proxy when sending telemetry