mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-01-16 10:33:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Attempt fixing join logic if already banned

Browse source
This commit is contained in:
Devon Hudson 2023-05-18 20:23:01 -06:00
parent 16f9cc40aa
commit e0665fa1b8
No known key found for this signature in database
GPG key ID: CD06B18E77F6A628
3 changed files with 70 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
federationapi/routing/join.go
View file

@ -159,45 +159,43 @@ func MakeJoin(
BuildEventTemplate: createJoinTemplate, BuildEventTemplate: createJoinTemplate,
} }
response, internalErr := gomatrixserverlib.HandleMakeJoin(input) response, internalErr := gomatrixserverlib.HandleMakeJoin(input)
if internalErr != nil { switch e := internalErr.(type) {
switch e := internalErr.(type) { case nil:
case nil: case spec.InternalServerError:
case spec.InternalServerError: util.GetLogger(httpReq.Context()).WithError(internalErr)
util.GetLogger(httpReq.Context()).WithError(internalErr) return util.JSONResponse{
return util.JSONResponse{ Code: http.StatusInternalServerError,
Code: http.StatusInternalServerError, JSON: spec.InternalServerError{},
JSON: spec.InternalServerError{}, }
} case spec.MatrixError:
case spec.MatrixError: util.GetLogger(httpReq.Context()).WithError(internalErr)
util.GetLogger(httpReq.Context()).WithError(internalErr) code := http.StatusInternalServerError
code := http.StatusInternalServerError switch e.ErrCode {
switch e.ErrCode { case spec.ErrorForbidden:
case spec.ErrorForbidden: code = http.StatusForbidden
code = http.StatusForbidden case spec.ErrorNotFound:
case spec.ErrorNotFound: code = http.StatusNotFound
code = http.StatusNotFound case spec.ErrorUnableToAuthoriseJoin:
case spec.ErrorUnableToAuthoriseJoin: code = http.StatusBadRequest
code = http.StatusBadRequest case spec.ErrorBadJSON:
case spec.ErrorBadJSON: code = http.StatusBadRequest
code = http.StatusBadRequest }
}
return util.JSONResponse{ return util.JSONResponse{
Code: code, Code: code,
JSON: e, JSON: e,
} }
case spec.IncompatibleRoomVersionError: case spec.IncompatibleRoomVersionError:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr)
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: e, JSON: e,
} }
default: default:
util.GetLogger(httpReq.Context()).WithError(internalErr) util.GetLogger(httpReq.Context()).WithError(internalErr)
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.Unknown("unknown error"), JSON: spec.Unknown("unknown error"),
}
} }
} }
@ -253,41 +251,38 @@ func SendJoin(
Verifier: keys, Verifier: keys,
StateQuerier: &JoinRoomQuerier{roomserver: rsAPI}, StateQuerier: &JoinRoomQuerier{roomserver: rsAPI},
} }
response, err := gomatrixserverlib.HandleSendJoin(input) response, joinErr := gomatrixserverlib.HandleSendJoin(input)
if err != nil { switch e := joinErr.(type) {
// TODO: Double check this reflects old logic case nil:
switch e := err.(type) { case spec.InternalServerError:
case nil: util.GetLogger(httpReq.Context()).WithError(joinErr)
case spec.InternalServerError: return util.JSONResponse{
util.GetLogger(httpReq.Context()).WithError(err) Code: http.StatusInternalServerError,
return util.JSONResponse{ JSON: spec.InternalServerError{},
Code: http.StatusInternalServerError, }
JSON: spec.InternalServerError{}, case spec.MatrixError:
} util.GetLogger(httpReq.Context()).WithError(joinErr)
case spec.MatrixError: code := http.StatusInternalServerError
util.GetLogger(httpReq.Context()).WithError(err) switch e.ErrCode {
code := http.StatusInternalServerError case spec.ErrorForbidden:
switch e.ErrCode { code = http.StatusForbidden
case spec.ErrorForbidden: case spec.ErrorNotFound:
code = http.StatusForbidden code = http.StatusNotFound
case spec.ErrorNotFound: case spec.ErrorUnsupportedRoomVersion:
code = http.StatusNotFound code = http.StatusInternalServerError
case spec.ErrorUnsupportedRoomVersion: case spec.ErrorBadJSON:
code = http.StatusInternalServerError code = http.StatusBadRequest
case spec.ErrorBadJSON: }
code = http.StatusBadRequest
}
return util.JSONResponse{ return util.JSONResponse{
Code: code, Code: code,
JSON: e, JSON: e,
} }
default: default:
util.GetLogger(httpReq.Context()).WithError(err) util.GetLogger(httpReq.Context()).WithError(joinErr)
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusBadRequest,
JSON: spec.Unknown("unknown error"), JSON: spec.Unknown("unknown error"),
}
} }
} }

2
go.mod
View file

@ -22,7 +22,7 @@ require (
github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e github.com/matrix-org/dugong v0.0.0-20210921133753-66e6b1c67e2e
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91 github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530
github.com/matrix-org/gomatrixserverlib v0.0.0-20230518221530-f41738532873 github.com/matrix-org/gomatrixserverlib v0.0.0-20230519022133-034dde7ceade
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 github.com/matrix-org/util v0.0.0-20221111132719-399730281e66
github.com/mattn/go-sqlite3 v1.14.16 github.com/mattn/go-sqlite3 v1.14.16

6
go.sum
View file

@ -323,10 +323,8 @@ github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91 h1:s7fexw
github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91/go.mod h1:e+cg2q7C7yE5QnAXgzo512tgFh1RbQLC0+jozuegKgo= github.com/matrix-org/go-sqlite3-js v0.0.0-20220419092513-28aa791a1c91/go.mod h1:e+cg2q7C7yE5QnAXgzo512tgFh1RbQLC0+jozuegKgo=
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 h1:kHKxCOLcHH8r4Fzarl4+Y3K5hjothkVW5z7T1dUM11U= github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530 h1:kHKxCOLcHH8r4Fzarl4+Y3K5hjothkVW5z7T1dUM11U=
github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= github.com/matrix-org/gomatrix v0.0.0-20220926102614-ceba4d9f7530/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230518202814-d3404175a985 h1:PNGINQ/Gb4VG1ict/9Iq6SyaFm3a0Q2+gu4kcfKMKAw= github.com/matrix-org/gomatrixserverlib v0.0.0-20230519022133-034dde7ceade h1:53MMZAg6mtFkP5LJd3S3rzvrri0huELoq8gaRePpHv8=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230518202814-d3404175a985/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU= github.com/matrix-org/gomatrixserverlib v0.0.0-20230519022133-034dde7ceade/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230518221530-f41738532873 h1:c6JhZasD3Ma7A+eIP14gfZTHDR8SKEJ8VCKHmByCHpg=
github.com/matrix-org/gomatrixserverlib v0.0.0-20230518221530-f41738532873/go.mod h1:H9V9N3Uqn1bBJqYJNGK1noqtgJTaCEhtTdcH/mp50uU=
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a h1:awrPDf9LEFySxTLKYBMCiObelNx/cBuv/wzllvCCH3A= github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a h1:awrPDf9LEFySxTLKYBMCiObelNx/cBuv/wzllvCCH3A=
github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a/go.mod h1:HchJX9oKMXaT2xYFs0Ha/6Zs06mxLU8k6F1ODnrGkeQ= github.com/matrix-org/pinecone v0.11.1-0.20230210171230-8c3b24f2649a/go.mod h1:HchJX9oKMXaT2xYFs0Ha/6Zs06mxLU8k6F1ODnrGkeQ=
github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 h1:6z4KxomXSIGWqhHcfzExgkH3Z3UkIXry4ibJS4Aqz2Y= github.com/matrix-org/util v0.0.0-20221111132719-399730281e66 h1:6z4KxomXSIGWqhHcfzExgkH3Z3UkIXry4ibJS4Aqz2Y=