summaryrefslogtreecommitdiff
path: root/internal/processing
diff options
context:
space:
mode:
Diffstat (limited to 'internal/processing')
-rw-r--r--internal/processing/account/delete.go32
-rw-r--r--internal/processing/application/application.go38
-rw-r--r--internal/processing/application/create.go (renamed from internal/processing/app.go)48
-rw-r--r--internal/processing/application/delete.go70
-rw-r--r--internal/processing/application/get.go104
-rw-r--r--internal/processing/processor.go7
6 files changed, 278 insertions, 21 deletions
diff --git a/internal/processing/account/delete.go b/internal/processing/account/delete.go
index 0064d7eb4..ab64c3270 100644
--- a/internal/processing/account/delete.go
+++ b/internal/processing/account/delete.go
@@ -107,19 +107,33 @@ func (p *Processor) deleteUserAndTokensForAccount(ctx context.Context, account *
return gtserror.Newf("db error getting user: %w", err)
}
- tokens := []*gtsmodel.Token{}
- if err := p.state.DB.GetWhere(ctx, []db.Where{{Key: "user_id", Value: user.ID}}, &tokens); err != nil {
- return gtserror.Newf("db error getting tokens: %w", err)
+ // Get all applications owned by user.
+ apps, err := p.state.DB.GetApplicationsManagedByUserID(ctx, user.ID, nil)
+ if err != nil {
+ return gtserror.Newf("db error getting apps: %w", err)
}
- for _, t := range tokens {
- // Delete any OAuth applications associated with this token.
- if err := p.state.DB.DeleteApplicationByClientID(ctx, t.ClientID); err != nil {
- return gtserror.Newf("db error deleting application: %w", err)
+ // Delete each app and any tokens it had created
+ // (not necessarily owned by deleted account).
+ for _, a := range apps {
+ if err := p.state.DB.DeleteApplicationByID(ctx, a.ID); err != nil {
+ return gtserror.Newf("db error deleting app: %w", err)
}
- // Delete the token itself.
- if err := p.state.DB.DeleteByID(ctx, t.ID, t); err != nil {
+ if err := p.state.DB.DeleteTokensByClientID(ctx, a.ClientID); err != nil {
+ return gtserror.Newf("db error deleting tokens for app: %w", err)
+ }
+ }
+
+ // Get any remaining access tokens owned by user.
+ tokens, err := p.state.DB.GetAccessTokens(ctx, user.ID, nil)
+ if err != nil {
+ return gtserror.Newf("db error getting tokens: %w", err)
+ }
+
+ // Delete each token.
+ for _, t := range tokens {
+ if err := p.state.DB.DeleteTokenByID(ctx, t.ID); err != nil {
return gtserror.Newf("db error deleting token: %w", err)
}
}
diff --git a/internal/processing/application/application.go b/internal/processing/application/application.go
new file mode 100644
index 000000000..4ad35749e
--- /dev/null
+++ b/internal/processing/application/application.go
@@ -0,0 +1,38 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package application
+
+import (
+ "github.com/superseriousbusiness/gotosocial/internal/state"
+ "github.com/superseriousbusiness/gotosocial/internal/typeutils"
+)
+
+type Processor struct {
+ state *state.State
+ converter *typeutils.Converter
+}
+
+func New(
+ state *state.State,
+ converter *typeutils.Converter,
+) Processor {
+ return Processor{
+ state: state,
+ converter: converter,
+ }
+}
diff --git a/internal/processing/app.go b/internal/processing/application/create.go
index c9bd4eb68..d1340a39f 100644
--- a/internal/processing/app.go
+++ b/internal/processing/application/create.go
@@ -15,24 +15,28 @@
// You should have received a copy of the GNU Affero General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
-package processing
+package application
import (
"context"
+ "errors"
"fmt"
"net/url"
"strings"
"github.com/google/uuid"
apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
- apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
"github.com/superseriousbusiness/gotosocial/internal/id"
"github.com/superseriousbusiness/gotosocial/internal/oauth"
)
-func (p *Processor) AppCreate(ctx context.Context, authed *apiutil.Auth, form *apimodel.ApplicationCreateRequest) (*apimodel.Application, gtserror.WithCode) {
+func (p *Processor) Create(
+ ctx context.Context,
+ managedByUserID string,
+ form *apimodel.ApplicationCreateRequest,
+) (*apimodel.Application, gtserror.WithCode) {
// Set default 'read' for
// scopes if it's not set.
var scopes string
@@ -49,13 +53,32 @@ func (p *Processor) AppCreate(ctx context.Context, authed *apiutil.Auth, form *a
// Redirect URIs can be just one value, or can be passed
// as a newline-separated list of strings. Ensure each URI
// is parseable + normalize it by reconstructing from *url.URL.
- for _, redirectStr := range strings.Split(form.RedirectURIs, "\n") {
+ // Also ensure we don't add multiple copies of the same URI.
+ redirectStrs := strings.Split(form.RedirectURIs, "\n")
+ added := make(map[string]struct{}, len(redirectStrs))
+
+ for _, redirectStr := range redirectStrs {
+ redirectStr = strings.TrimSpace(redirectStr)
+ if redirectStr == "" {
+ continue
+ }
+
redirectURI, err := url.Parse(redirectStr)
if err != nil {
errText := fmt.Sprintf("error parsing redirect URI: %v", err)
return nil, gtserror.NewErrorBadRequest(err, errText)
}
- redirectURIs = append(redirectURIs, redirectURI.String())
+
+ redirectURIStr := redirectURI.String()
+ if _, alreadyAdded := added[redirectURIStr]; !alreadyAdded {
+ redirectURIs = append(redirectURIs, redirectURIStr)
+ added[redirectURIStr] = struct{}{}
+ }
+ }
+
+ if len(redirectURIs) == 0 {
+ errText := "no redirect URIs left after trimming space"
+ return nil, gtserror.NewErrorBadRequest(errors.New(errText), errText)
}
} else {
// No redirect URI(s) provided, just set default oob.
@@ -71,13 +94,14 @@ func (p *Processor) AppCreate(ctx context.Context, authed *apiutil.Auth, form *a
// Generate + store app
// to put in the database.
app := &gtsmodel.Application{
- ID: id.NewULID(),
- Name: form.ClientName,
- Website: form.Website,
- RedirectURIs: redirectURIs,
- ClientID: clientID,
- ClientSecret: uuid.NewString(),
- Scopes: scopes,
+ ID: id.NewULID(),
+ Name: form.ClientName,
+ Website: form.Website,
+ RedirectURIs: redirectURIs,
+ ClientID: clientID,
+ ClientSecret: uuid.NewString(),
+ Scopes: scopes,
+ ManagedByUserID: managedByUserID,
}
if err := p.state.DB.PutApplication(ctx, app); err != nil {
return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/application/delete.go b/internal/processing/application/delete.go
new file mode 100644
index 000000000..02f5e4bfa
--- /dev/null
+++ b/internal/processing/application/delete.go
@@ -0,0 +1,70 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package application
+
+import (
+ "context"
+ "errors"
+
+ apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
+ "github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
+)
+
+func (p *Processor) Delete(
+ ctx context.Context,
+ userID string,
+ appID string,
+) (*apimodel.Application, gtserror.WithCode) {
+ app, err := p.state.DB.GetApplicationByID(ctx, appID)
+ if err != nil && !errors.Is(err, db.ErrNoEntries) {
+ err := gtserror.Newf("db error getting app %s: %w", appID, err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ if app == nil {
+ err := gtserror.Newf("app %s not found in the db", appID)
+ return nil, gtserror.NewErrorNotFound(err)
+ }
+
+ if app.ManagedByUserID != userID {
+ err := gtserror.Newf("app %s not managed by user %s", appID, userID)
+ return nil, gtserror.NewErrorNotFound(err)
+ }
+
+ // Convert app before deletion.
+ apiApp, err := p.converter.AppToAPIAppSensitive(ctx, app)
+ if err != nil {
+ err := gtserror.Newf("error converting app to api app: %w", err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ // Delete app itself.
+ if err := p.state.DB.DeleteApplicationByID(ctx, appID); err != nil {
+ err := gtserror.Newf("db error deleting app %s: %w", appID, err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ // Delete all tokens owned by app.
+ if err := p.state.DB.DeleteTokensByClientID(ctx, app.ClientID); err != nil {
+ err := gtserror.Newf("db error deleting tokens for app %s: %w", appID, err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ return apiApp, nil
+}
diff --git a/internal/processing/application/get.go b/internal/processing/application/get.go
new file mode 100644
index 000000000..0a3eb8e04
--- /dev/null
+++ b/internal/processing/application/get.go
@@ -0,0 +1,104 @@
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+package application
+
+import (
+ "context"
+ "errors"
+
+ apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model"
+ "github.com/superseriousbusiness/gotosocial/internal/db"
+ "github.com/superseriousbusiness/gotosocial/internal/gtserror"
+ "github.com/superseriousbusiness/gotosocial/internal/log"
+ "github.com/superseriousbusiness/gotosocial/internal/paging"
+)
+
+func (p *Processor) Get(
+ ctx context.Context,
+ userID string,
+ appID string,
+) (*apimodel.Application, gtserror.WithCode) {
+ app, err := p.state.DB.GetApplicationByID(ctx, appID)
+ if err != nil && !errors.Is(err, db.ErrNoEntries) {
+ err := gtserror.Newf("db error getting app %s: %w", appID, err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ if app == nil {
+ err := gtserror.Newf("app %s not found in the db", appID)
+ return nil, gtserror.NewErrorNotFound(err)
+ }
+
+ if app.ManagedByUserID != userID {
+ err := gtserror.Newf("app %s not managed by user %s", appID, userID)
+ return nil, gtserror.NewErrorNotFound(err)
+ }
+
+ apiApp, err := p.converter.AppToAPIAppSensitive(ctx, app)
+ if err != nil {
+ err := gtserror.Newf("error converting app to api app: %w", err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ return apiApp, nil
+}
+
+func (p *Processor) GetPage(
+ ctx context.Context,
+ userID string,
+ page *paging.Page,
+) (*apimodel.PageableResponse, gtserror.WithCode) {
+ apps, err := p.state.DB.GetApplicationsManagedByUserID(ctx, userID, page)
+ if err != nil && !errors.Is(err, db.ErrNoEntries) {
+ err := gtserror.Newf("db error getting apps: %w", err)
+ return nil, gtserror.NewErrorInternalError(err)
+ }
+
+ count := len(apps)
+ if count == 0 {
+ return paging.EmptyResponse(), nil
+ }
+
+ var (
+ // Get the lowest and highest
+ // ID values, used for paging.
+ lo = apps[count-1].ID
+ hi = apps[0].ID
+
+ // Best-guess items length.
+ items = make([]interface{}, 0, count)
+ )
+
+ for _, app := range apps {
+ apiApp, err := p.converter.AppToAPIAppSensitive(ctx, app)
+ if err != nil {
+ log.Errorf(ctx, "error converting app to api app: %v", err)
+ continue
+ }
+
+ // Append req to return items.
+ items = append(items, apiApp)
+ }
+
+ return paging.PackageResponse(paging.ResponseParams{
+ Items: items,
+ Path: "/api/v1/apps",
+ Next: page.Next(lo, hi),
+ Prev: page.Prev(lo, hi),
+ }), nil
+}
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index 0bba23089..0324f49cf 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -29,6 +29,7 @@ import (
"github.com/superseriousbusiness/gotosocial/internal/processing/account"
"github.com/superseriousbusiness/gotosocial/internal/processing/admin"
"github.com/superseriousbusiness/gotosocial/internal/processing/advancedmigrations"
+ "github.com/superseriousbusiness/gotosocial/internal/processing/application"
"github.com/superseriousbusiness/gotosocial/internal/processing/common"
"github.com/superseriousbusiness/gotosocial/internal/processing/conversations"
"github.com/superseriousbusiness/gotosocial/internal/processing/fedi"
@@ -81,6 +82,7 @@ type Processor struct {
account account.Processor
admin admin.Processor
advancedmigrations advancedmigrations.Processor
+ application application.Processor
conversations conversations.Processor
fedi fedi.Processor
filtersv1 filtersv1.Processor
@@ -113,6 +115,10 @@ func (p *Processor) AdvancedMigrations() *advancedmigrations.Processor {
return &p.advancedmigrations
}
+func (p *Processor) Application() *application.Processor {
+ return &p.application
+}
+
func (p *Processor) Conversations() *conversations.Processor {
return &p.conversations
}
@@ -221,6 +227,7 @@ func NewProcessor(
// processors + pin them to this struct.
processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, parseMentionFunc)
processor.admin = admin.New(&common, state, cleaner, subscriptions, federator, converter, mediaManager, federator.TransportController(), emailSender)
+ processor.application = application.New(state, converter)
processor.conversations = conversations.New(state, converter, visFilter)
processor.fedi = fedi.New(state, &common, converter, federator, visFilter)
processor.filtersv1 = filtersv1.New(state, converter, &processor.stream)
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-02 12:45:35 +0000