Upgrader.Upgrade: use http.ResposnseController #871

ninedraft · 2023-11-22T19:47:16Z

Since go1.20 http.ResponseController is a preferable tool for connection hijacking. It allows to use custom response writer interceptors with Unwrap() http.ResponseWriter method.

server_test.go

AlexVulaj

Thanks for the contribution! Approved.

This MR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/gorilla/websocket](https://github.com/gorilla/websocket) | require | patch | `v1.5.1` -> `v1.5.3` | --- ### Release Notes <details> <summary>gorilla/websocket (github.com/gorilla/websocket)</summary> ### [`v1.5.3`](https://github.com/gorilla/websocket/releases/tag/v1.5.3) [Compare Source](gorilla/websocket@v1.5.2...v1.5.3) #### Important change This reverts the websockets package back to gorilla/websocket@931041c #### What's Changed - Fixes subprotocol selection (aling with rfc6455) by [@KSDaemon](https://github.com/KSDaemon) in gorilla/websocket#823 - Update README.md, replace master to main by [@mstmdev](https://github.com/mstmdev) in gorilla/websocket#862 - Use status code constant by [@mstmdev](https://github.com/mstmdev) in gorilla/websocket#864 - conn.go: default close handler should not return ErrCloseSent. by [@pnx](https://github.com/pnx) in gorilla/websocket#865 - fix: replace ioutil.readfile with os.readfile by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#868 - fix: add comment for the readBufferSize and writeBufferSize by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#869 - Remove noisy printf in NextReader() and beginMessage() by [@bcreane](https://github.com/bcreane) in gorilla/websocket#878 - docs(echoreadall): fix function echoReadAll comment by [@XdpCs](https://github.com/XdpCs) in gorilla/websocket#881 - make tests parallel by [@ninedraft](https://github.com/ninedraft) in gorilla/websocket#872 - Upgrader.Upgrade: use http.ResposnseController by [@ninedraft](https://github.com/ninedraft) in gorilla/websocket#871 - Do not handle network error in `SetCloseHandler()` by [@nak3](https://github.com/nak3) in gorilla/websocket#863 - perf: reduce timer in write_control by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#879 - fix: lint example code by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#890 - feat: format message type by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#889 - Remove hideTempErr to allow downstream users to check for errors like net.ErrClosed by [@UnAfraid](https://github.com/UnAfraid) in gorilla/websocket#894 - Do not timeout when WriteControl deadline is zero in gorilla/websocket#898 - Excludes errchecks linter by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#904 - Return errors instead of printing to logs by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#897 - Revert " Update go version & add verification/testing tools ([#840](gorilla/websocket#840))" by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#908 - Fixes broken random value generation by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#926 - Reverts back to v1.5.0 by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#929 #### New Contributors - [@KSDaemon](https://github.com/KSDaemon) made their first contribution in gorilla/websocket#823 - [@mstmdev](https://github.com/mstmdev) made their first contribution in gorilla/websocket#862 - [@pnx](https://github.com/pnx) made their first contribution in gorilla/websocket#865 - [@rfyiamcool](https://github.com/rfyiamcool) made their first contribution in gorilla/websocket#868 - [@bcreane](https://github.com/bcreane) made their first contribution in gorilla/websocket#878 - [@XdpCs](https://github.com/XdpCs) made their first contribution in gorilla/websocket#881 - [@ninedraft](https://github.com/ninedraft) made their first contribution in gorilla/websocket#872 - [@nak3](https://github.com/nak3) made their first contribution in gorilla/websocket#863 - [@UnAfraid](https://github.com/UnAfraid) made their first contribution in gorilla/websocket#894 - [@apoorvajagtap](https://github.com/apoorvajagtap) made their first contribution in gorilla/websocket#904 **Full Changelog**: gorilla/websocket@v1.5.1...v1.5.3 ### [`v1.5.2`](https://github.com/gorilla/websocket/releases/tag/v1.5.2) [Compare Source](gorilla/websocket@v1.5.1...v1.5.2) #### What's Changed - Fixes subprotocol selection (aling with rfc6455) by [@KSDaemon](https://github.com/KSDaemon) in gorilla/websocket#823 - Update README.md, replace master to main by [@mstmdev](https://github.com/mstmdev) in gorilla/websocket#862 - Use status code constant by [@mstmdev](https://github.com/mstmdev) in gorilla/websocket#864 - conn.go: default close handler should not return ErrCloseSent. by [@pnx](https://github.com/pnx) in gorilla/websocket#865 - fix: replace ioutil.readfile with os.readfile by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#868 - fix: add comment for the readBufferSize and writeBufferSize by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#869 - Remove noisy printf in NextReader() and beginMessage() by [@bcreane](https://github.com/bcreane) in gorilla/websocket#878 - docs(echoreadall): fix function echoReadAll comment by [@XdpCs](https://github.com/XdpCs) in gorilla/websocket#881 - make tests parallel by [@ninedraft](https://github.com/ninedraft) in gorilla/websocket#872 - Upgrader.Upgrade: use http.ResposnseController by [@ninedraft](https://github.com/ninedraft) in gorilla/websocket#871 - Do not handle network error in `SetCloseHandler()` by [@nak3](https://github.com/nak3) in gorilla/websocket#863 - perf: reduce timer in write_control by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#879 - fix: lint example code by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#890 - feat: format message type by [@rfyiamcool](https://github.com/rfyiamcool) in gorilla/websocket#889 - Remove hideTempErr to allow downstream users to check for errors like net.ErrClosed by [@UnAfraid](https://github.com/UnAfraid) in gorilla/websocket#894 - Do not timeout when WriteControl deadline is zero in gorilla/websocket#898 - Excludes errchecks linter by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#904 - Return errors instead of printing to logs by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#897 - Revert " Update go version & add verification/testing tools ([#840](gorilla/websocket#840))" by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#908 - Fixes broken random value generation by [@apoorvajagtap](https://github.com/apoorvajagtap) in gorilla/websocket#926 #### New Contributors - [@KSDaemon](https://github.com/KSDaemon) made their first contribution in gorilla/websocket#823 - [@mstmdev](https://github.com/mstmdev) made their first contribution in gorilla/websocket#862 - [@pnx](https://github.com/pnx) made their first contribution in gorilla/websocket#865 - [@rfyiamcool](https://github.com/rfyiamcool) made their first contribution in gorilla/websocket#868 - [@bcreane](https://github.com/bcreane) made their first contribution in gorilla/websocket#878 - [@XdpCs](https://github.com/XdpCs) made their first contribution in gorilla/websocket#881 - [@ninedraft](https://github.com/ninedraft) made their first contribution in gorilla/websocket#872 - [@nak3](https://github.com/nak3) made their first contribution in gorilla/websocket#863 - [@UnAfraid](https://github.com/UnAfraid) made their first contribution in gorilla/websocket#894 - [@apoorvajagtap](https://github.com/apoorvajagtap) made their first contribution in gorilla/websocket#904 **Full Changelog**: gorilla/websocket@v1.5.1...v1.5.2 </details> --- - [ ] If you want to rebase/retry this MR, check this box ---    See merge request alpine/infra/build-server-status!14

pull-request-size bot added the size/M label Nov 22, 2023

ninedraft changed the title ~~use http.ResposnseController~~ Upgrader.Upgrade: use http.ResposnseController Nov 22, 2023

pull-request-size bot added size/S and removed size/M labels Dec 13, 2023

AlexVulaj reviewed Jan 22, 2024

View reviewed changes

server_test.go Show resolved Hide resolved

ninedraft added 2 commits January 21, 2024 22:48

use http.ResposnseController

661bda8

fix: don't use errors.ErrUnsupported, it's available only since go1.21

1c378f1

AlexVulaj approved these changes Jan 22, 2024

View reviewed changes

AlexVulaj merged commit 0f0acef into gorilla:main Jan 22, 2024
9 of 10 checks passed

ghost mentioned this pull request Jun 19, 2024

Use http.ResponseController #933

Merged

12 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrader.Upgrade: use http.ResposnseController #871

Upgrader.Upgrade: use http.ResposnseController #871

ninedraft commented Nov 22, 2023 •

edited

Loading

AlexVulaj left a comment

Upgrader.Upgrade: use http.ResposnseController #871

Upgrader.Upgrade: use http.ResposnseController #871

Conversation

ninedraft commented Nov 22, 2023 • edited Loading

AlexVulaj left a comment

Choose a reason for hiding this comment

ninedraft commented Nov 22, 2023 •

edited

Loading