mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-11-18 11:07:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

[chore]: Bump github.com/gorilla/websocket from 1.5.0 to 1.5.1 (#2335)

Browse source 
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: kim <grufwub@gmail.com>
This commit is contained in:
dependabot[bot] 2023-11-28 11:05:07 +00:00 • committed by GitHub
commit 2eb8b8eeb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
29 changed files with 1203 additions and 632 deletions
Download patch file Download diff file Expand all files Collapse all files

27
internal/api/client/streaming/stream.go
View file

@ -162,24 +162,27 @@ func (m *Module) StreamGETHandler(c *gin.Context) {
}
if token != "" {
// Token was provided, use it to authorize stream.
account, errWithCode = m.processor.Stream().Authorize(c.Request.Context(), token)
if errWithCode != nil {
apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
}
} else {
// No explicit token was provided:
// try regular oauth as a last resort.
account, errWithCode = func() (*gtsmodel.Account, gtserror.WithCode) {
authed, err := oauth.Authed(c, true, true, true, true)
if err != nil {
return nil, gtserror.NewErrorUnauthorized(err, err.Error())
}
authed, err := oauth.Authed(c, true, true, true, true)
if err != nil {
errWithCode := gtserror.NewErrorUnauthorized(err, err.Error())
apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
}
return authed.Account, nil
}()
}
if errWithCode != nil {
apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
return
// Set the auth'ed account.
account = authed.Account
}
// Get the initial requested stream type, if there is one.

15
internal/api/client/streaming/streaming_test.go
View file

@ -19,6 +19,7 @@ package streaming_test
import (
"bufio"
"encoding/base64"
"errors"
"fmt"
"io/ioutil"
@ -227,17 +228,21 @@ func (suite *StreamingTestSuite) TestSecurityHeader() {
ctx.Request.Header.Set("Connection", "upgrade")
ctx.Request.Header.Set("Upgrade", "websocket")
ctx.Request.Header.Set("Sec-Websocket-Version", "13")
ctx.Request.Header.Set("Sec-Websocket-Key", "abcd")
key := [16]byte{'h', 'e', 'l', 'l', 'o', ' ', 'w', 'o', 'r', 'l', 'd'}
key64 := base64.StdEncoding.EncodeToString(key[:]) // sec-websocket-key must be base64 encoded and 16 bytes long
ctx.Request.Header.Set("Sec-Websocket-Key", key64)
suite.streamingModule.StreamGETHandler(ctx)
// check response
suite.EqualValues(http.StatusOK, recorder.Code)
result := recorder.Result()
defer result.Body.Close()
_, err := ioutil.ReadAll(result.Body)
b, err := ioutil.ReadAll(result.Body)
suite.NoError(err)
// check response
if !suite.EqualValues(http.StatusOK, recorder.Code) {
suite.T().Logf("%s", b)
}
}
func TestStreamingTestSuite(t *testing.T) {