mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-30 23:12:25 -05:00 
			
		
		
		
	[feature] More consistent API error handling (#637)
* update templates * start reworking api error handling * update template * return AP status at web endpoint if negotiated * start making api error handling much more consistent * update account endpoints to new error handling * use new api error handling in admin endpoints * go fmt ./... * use api error logic in app * use generic error handling in auth * don't export generic error handler * don't defer clearing session * user nicer error handling on oidc callback handler * tidy up the sign in handler * tidy up the token handler * use nicer error handling in blocksget * auth emojis endpoint * fix up remaining api endpoints * fix whoopsie during login flow * regenerate swagger docs * change http error logging to debug
This commit is contained in:
		
					parent
					
						
							
								91c0ed863a
							
						
					
				
			
			
				commit
				
					
						1ede54ddf6
					
				
			
		
					 130 changed files with 2154 additions and 1673 deletions
				
			
		|  | @ -22,18 +22,16 @@ import ( | |||
| 	"fmt" | ||||
| 	"net/http" | ||||
| 
 | ||||
| 	"github.com/sirupsen/logrus" | ||||
| 
 | ||||
| 	"github.com/gin-gonic/gin" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/api/model" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/gtserror" | ||||
| 	"github.com/superseriousbusiness/gotosocial/internal/oauth" | ||||
| ) | ||||
| 
 | ||||
| // these consts are used to ensure users can't spam huge entries into our database | ||||
| const ( | ||||
| 	// permitted length for most fields | ||||
| 	formFieldLen = 64 | ||||
| 	// redirect can be a bit bigger because we probably need to encode data in the redirect uri | ||||
| 	formFieldLen    = 64 | ||||
| 	formRedirectLen = 512 | ||||
| ) | ||||
| 
 | ||||
|  | @ -64,56 +62,63 @@ const ( | |||
| //     description: "The newly-created application." | ||||
| //     schema: | ||||
| //       "$ref": "#/definitions/application" | ||||
| //   '401': | ||||
| //      description: unauthorized | ||||
| //   '400': | ||||
| //      description: bad request | ||||
| //   '422': | ||||
| //      description: unprocessable | ||||
| //   '401': | ||||
| //      description: unauthorized | ||||
| //   '403': | ||||
| //      description: forbidden | ||||
| //   '404': | ||||
| //      description: not found | ||||
| //   '406': | ||||
| //      description: not acceptable | ||||
| //   '500': | ||||
| //      description: internal error | ||||
| //      description: internal server error | ||||
| func (m *Module) AppsPOSTHandler(c *gin.Context) { | ||||
| 	l := logrus.WithField("func", "AppsPOSTHandler") | ||||
| 	l.Trace("entering AppsPOSTHandler") | ||||
| 
 | ||||
| 	authed, err := oauth.Authed(c, false, false, false, false) | ||||
| 	if err != nil { | ||||
| 		c.JSON(http.StatusUnauthorized, gin.H{"error": err.Error()}) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorUnauthorized(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if _, err := api.NegotiateAccept(c, api.JSONAcceptHeaders...); err != nil { | ||||
| 		c.JSON(http.StatusNotAcceptable, gin.H{"error": err.Error()}) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorNotAcceptable(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	form := &model.ApplicationCreateRequest{} | ||||
| 	if err := c.ShouldBind(form); err != nil { | ||||
| 		c.JSON(http.StatusUnprocessableEntity, gin.H{"error": err.Error()}) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	// check lengths of fields before proceeding so the user can't spam huge entries into the database | ||||
| 	if len(form.ClientName) > formFieldLen { | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("client_name must be less than %d bytes", formFieldLen)}) | ||||
| 		return | ||||
| 	} | ||||
| 	if len(form.Website) > formFieldLen { | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("website must be less than %d bytes", formFieldLen)}) | ||||
| 		return | ||||
| 	} | ||||
| 	if len(form.RedirectURIs) > formRedirectLen { | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("redirect_uris must be less than %d bytes", formRedirectLen)}) | ||||
| 		return | ||||
| 	} | ||||
| 	if len(form.Scopes) > formFieldLen { | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": fmt.Sprintf("scopes must be less than %d bytes", formFieldLen)}) | ||||
| 		err := fmt.Errorf("client_name must be less than %d bytes", formFieldLen) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	apiApp, err := m.processor.AppCreate(c.Request.Context(), authed, form) | ||||
| 	if err != nil { | ||||
| 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) | ||||
| 	if len(form.RedirectURIs) > formRedirectLen { | ||||
| 		err := fmt.Errorf("redirect_uris must be less than %d bytes", formRedirectLen) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if len(form.Scopes) > formFieldLen { | ||||
| 		err := fmt.Errorf("scopes must be less than %d bytes", formFieldLen) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	if len(form.Website) > formFieldLen { | ||||
| 		err := fmt.Errorf("website must be less than %d bytes", formFieldLen) | ||||
| 		api.ErrorHandler(c, gtserror.NewErrorBadRequest(err, err.Error()), m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
| 	apiApp, errWithCode := m.processor.AppCreate(c.Request.Context(), authed, form) | ||||
| 	if errWithCode != nil { | ||||
| 		api.ErrorHandler(c, errWithCode, m.processor.InstanceGet) | ||||
| 		return | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue