mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2024-10-31 22:18:52 +00:00
use errorsv2.AsV2()
This commit is contained in:
parent
175c8700d1
commit
d8992392ad
3 changed files with 12 additions and 11 deletions
|
@ -18,13 +18,14 @@
|
|||
package users
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/log"
|
||||
|
||||
errorsv2 "codeberg.org/gruf/go-errors/v2"
|
||||
)
|
||||
|
||||
// InboxPOSTHandler deals with incoming POST requests to an actor's inbox.
|
||||
|
@ -32,18 +33,18 @@ import (
|
|||
func (m *Module) InboxPOSTHandler(c *gin.Context) {
|
||||
_, err := m.processor.Fedi().InboxPost(c.Request.Context(), c.Writer, c.Request)
|
||||
if err != nil {
|
||||
errWithCode := new(gtserror.WithCode)
|
||||
errWithCode := errorsv2.AsV2[gtserror.WithCode](err)
|
||||
|
||||
if !errors.As(err, errWithCode) {
|
||||
if errWithCode == nil {
|
||||
// Something else went wrong, and someone forgot to return
|
||||
// an errWithCode! It's chill though. Log the error but don't
|
||||
// return it as-is to the caller, to avoid leaking internals.
|
||||
log.Errorf(c.Request.Context(), "returning Bad Request to caller, err was: %q", err)
|
||||
*errWithCode = gtserror.NewErrorBadRequest(err)
|
||||
errWithCode = gtserror.NewErrorBadRequest(err)
|
||||
}
|
||||
|
||||
// Pass along confirmed error with code to the main error handler
|
||||
apiutil.ErrorHandler(c, *errWithCode, m.processor.InstanceGetV1)
|
||||
apiutil.ErrorHandler(c, errWithCode, m.processor.InstanceGetV1)
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -89,7 +89,7 @@ func (f *federatingActor) PostInboxScheme(ctx context.Context, w http.ResponseWr
|
|||
// so we specifically have to check for already wrapped with code.
|
||||
//
|
||||
ctx, authenticated, err := f.sideEffectActor.AuthenticatePostInbox(ctx, w, r)
|
||||
if errors.As(err, new(gtserror.WithCode)) {
|
||||
if errorsv2.AsV2[gtserror.WithCode](err) != nil {
|
||||
// If it was already wrapped with an
|
||||
// HTTP code then don't bother rewrapping
|
||||
// it, just return it as-is for caller to
|
||||
|
@ -131,7 +131,7 @@ func (f *federatingActor) PostInboxScheme(ctx context.Context, w http.ResponseWr
|
|||
// Check authorization of the activity; this will include blocks.
|
||||
authorized, err := f.sideEffectActor.AuthorizePostInbox(ctx, w, activity)
|
||||
if err != nil {
|
||||
if errors.As(err, new(errOtherIRIBlocked)) {
|
||||
if errorsv2.AsV2[*errOtherIRIBlocked](err) != nil {
|
||||
// There's no direct block between requester(s) and
|
||||
// receiver. However, one or more of the other IRIs
|
||||
// involved in the request (account replied to, note
|
||||
|
@ -139,7 +139,7 @@ func (f *federatingActor) PostInboxScheme(ctx context.Context, w http.ResponseWr
|
|||
// by the receiver. We don't need to return 403 here,
|
||||
// instead, just return 202 accepted but don't do any
|
||||
// further processing of the activity.
|
||||
return true, nil
|
||||
return true, nil //nolint
|
||||
}
|
||||
|
||||
// Real error has occurred.
|
||||
|
|
|
@ -21,13 +21,13 @@ import (
|
|||
"bytes"
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/http/httptest"
|
||||
"net/url"
|
||||
"testing"
|
||||
|
||||
errorsv2 "codeberg.org/gruf/go-errors/v2"
|
||||
"github.com/stretchr/testify/suite"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/ap"
|
||||
"github.com/superseriousbusiness/gotosocial/internal/gtscontext"
|
||||
|
@ -101,8 +101,8 @@ func (suite *FederatingProtocolTestSuite) authenticatePostInbox(
|
|||
|
||||
recorder := httptest.NewRecorder()
|
||||
newContext, authed, err := suite.federator.AuthenticatePostInbox(ctx, recorder, request)
|
||||
if withCode := new(gtserror.WithCode); (errors.As(err, withCode) &&
|
||||
(*withCode).Code() >= 500) || (err != nil && (*withCode) == nil) {
|
||||
if withCode := errorsv2.AsV2[gtserror.WithCode](err); // nocollapse
|
||||
(withCode != nil && withCode.Code() >= 500) || (err != nil && withCode == nil) {
|
||||
// NOTE: the behaviour here is a little strange as we have
|
||||
// the competing code styles of the go-fed interface expecting
|
||||
// that any err is a no-go, but authed bool is intended to be
|
||||
|
|
Loading…
Reference in a new issue