MF-1087 - Remove WebSocket adapter #1120
Merged
Conversation
This file contains hidden or 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
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
|
I approved this one. However - one thing to check: NginX conf, does it use WS only over MQTT? Additionally, https://github.com/mainflux/mainflux/issues/1088 must be addressed quickly after this one is merged, as CT becomes redundant. |
|
@drasko I removed from Nginx conf the ws-adapter endpoint. Correct me if I'm wrong but I think that MQTT over WS is configured here: https://github.com/mainflux/mainflux/blob/master/docker/nginx/nginx-key.conf#L89 I'll take #1088 when we are done with this one. |
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
mteodor
previously approved these changes
Apr 17, 2020
dborovcanin
requested changes
Apr 17, 2020
Comment on lines
-141
to
-152
| if (r.uri.startsWith('/ws') && (!auth || !auth.length)) { | ||
| var a; | ||
| for (a in r.args) { | ||
| if (a == 'authorization' && r.args[a] === clientKey) { | ||
| return clientKey; | ||
| } | ||
| } | ||
|
|
||
| r.error('Authorization param does not match certificate'); | ||
| return ''; | ||
| } | ||
|
|
There was a problem hiding this comment.
Please don't remove this. We want to keep MQTT over WS.
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
dborovcanin
previously approved these changes
Apr 17, 2020
|
@manuio Can you just make sure you update the vendor ? I don't see any removal regarding WS like Gorilla package. Besides this LGTM. |
Codecov Report
@@ Coverage Diff @@
## master #1120 +/- ##
==========================================
- Coverage 76.23% 76.22% -0.01%
==========================================
Files 96 94 -2
Lines 6721 6546 -175
==========================================
- Hits 5124 4990 -134
+ Misses 1251 1220 -31
+ Partials 346 336 -10 Continue to review full report at Codecov.
|
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
nmarcetic
approved these changes
Apr 17, 2020
dborovcanin
approved these changes
Apr 17, 2020
dborovcanin
pushed a commit
that referenced
this pull request
Apr 17, 2020
* MF-1087 - Remove WebSocket adapter Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm all ws directory Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Remove /ws endpoint from ssl/authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm gorilla from vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert gorilla to vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
dborovcanin
pushed a commit
that referenced
this pull request
Apr 17, 2020
* MF-1087 - Remove WebSocket adapter Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm all ws directory Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Remove /ws endpoint from ssl/authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm gorilla from vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert gorilla to vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
dborovcanin
pushed a commit
that referenced
this pull request
Apr 17, 2020
* MF-1087 - Remove WebSocket adapter Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm all ws directory Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Remove /ws endpoint from ssl/authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm gorilla from vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert gorilla to vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
manuio
added a commit
that referenced
this pull request
Oct 12, 2020
* MF-1087 - Remove WebSocket adapter Signed-off- 8000 by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm all ws directory Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Remove /ws endpoint from ssl/authorization.js Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Rm gorilla from vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com> * Revert gorilla to vendor Signed-off-by: Manuel Imperiale <manuel.imperiale@gmail.com>
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.
Signed-off-by: Manuel Imperiale manuel.imperiale@gmail.com
Resolves #1087