mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
Oauth/token (#7)
* add host and protocol options * some fiddling * tidying up and comments * tick off /oauth/token * tidying a bit * tidying * go mod tidy * allow attaching middleware to server * add middleware * more user friendly * add comments * comments * store account + app * tidying * lots of restructuring * lint + tidy
This commit is contained in:
Tobi Smethurst
GitHub
@@ -28,9 +28,10 @@ import (
|
||||
|
||||
// Initialize will initialize the database given in the config for use with GoToSocial
|
||||
var Initialize action.GTSAction = func(ctx context.Context, c *config.Config, log *logrus.Logger) error {
|
||||
db, err := New(ctx, c, log)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return db.CreateSchema(ctx)
|
||||
// db, err := New(ctx, c, log)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
return nil
|
||||
// return db.CreateSchema(ctx)
|
||||
}
|
||||
|
||||
@@ -30,30 +30,47 @@ import (
|
||||
|
||||
const dbTypePostgres string = "POSTGRES"
|
||||
|
||||
// DB provides methods for interacting with an underlying database (for now, just postgres).
|
||||
// The function mapping lines up with the DB interface described in go-fed.
|
||||
// See here: https://github.com/go-fed/activity/blob/master/pub/database.go
|
||||
// DB provides methods for interacting with an underlying database or other storage mechanism (for now, just postgres).
|
||||
type DB interface {
|
||||
/*
|
||||
GO-FED DATABASE FUNCTIONS
|
||||
*/
|
||||
pub.Database
|
||||
// Federation returns an interface that's compatible with go-fed, for performing federation storage/retrieval functions.
|
||||
// See: https://pkg.go.dev/github.com/go-fed/activity@v1.0.0/pub?utm_source=gopls#Database
|
||||
Federation() pub.Database
|
||||
|
||||
/*
|
||||
ANY ADDITIONAL DESIRED FUNCTIONS
|
||||
*/
|
||||
// CreateTable creates a table for the given interface
|
||||
CreateTable(i interface{}) error
|
||||
|
||||
// CreateSchema should populate the database with the required tables
|
||||
CreateSchema(context.Context) error
|
||||
// DropTable drops the table for the given interface
|
||||
DropTable(i interface{}) error
|
||||
|
||||
// Stop should stop and close the database connection cleanly, returning an error if this is not possible
|
||||
Stop(context.Context) error
|
||||
Stop(ctx context.Context) error
|
||||
|
||||
// IsHealthy should return nil if the database connection is healthy, or an error if not
|
||||
IsHealthy(context.Context) error
|
||||
IsHealthy(ctx context.Context) error
|
||||
|
||||
// GetByID gets one entry by its id.
|
||||
GetByID(id string, i interface{}) error
|
||||
|
||||
// GetWhere gets one entry where key = value
|
||||
GetWhere(key string, value interface{}, i interface{}) error
|
||||
|
||||
// GetAll gets all entries of interface type i
|
||||
GetAll(i interface{}) error
|
||||
|
||||
// Put stores i
|
||||
Put(i interface{}) error
|
||||
|
||||
// Update by id updates i with id id
|
||||
UpdateByID(id string, i interface{}) error
|
||||
|
||||
// Delete by id removes i with id id
|
||||
DeleteByID(id string, i interface{}) error
|
||||
|
||||
// Delete where deletes i where key = value
|
||||
DeleteWhere(key string, value interface{}, i interface{}) error
|
||||
}
|
||||
|
||||
// New returns a new database service that satisfies the Service interface and, by extension,
|
||||
// New returns a new database service that satisfies the DB interface and, by extension,
|
||||
// the go-fed database interface described here: https://github.com/go-fed/activity/blob/master/pub/database.go
|
||||
func New(ctx context.Context, c *config.Config, log *logrus.Logger) (DB, error) {
|
||||
switch strings.ToUpper(c.DBConfig.Type) {
|
||||
|
||||
137
internal/db/pg-fed.go
Normal file
137
internal/db/pg-fed.go
Normal file
@@ -0,0 +1,137 @@
|
||||
package db
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"net/url"
|
||||
"sync"
|
||||
|
||||
"github.com/go-fed/activity/pub"
|
||||
"github.com/go-fed/activity/streams"
|
||||
"github.com/go-fed/activity/streams/vocab"
|
||||
"github.com/go-pg/pg/v10"
|
||||
)
|
||||
|
||||
type postgresFederation struct {
|
||||
locks *sync.Map
|
||||
conn *pg.DB
|
||||
}
|
||||
|
||||
func newPostgresFederation(conn *pg.DB) pub.Database {
|
||||
return &postgresFederation{
|
||||
locks: new(sync.Map),
|
||||
conn: conn,
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
GO-FED DB INTERFACE-IMPLEMENTING FUNCTIONS
|
||||
*/
|
||||
func (pf *postgresFederation) Lock(ctx context.Context, id *url.URL) error {
|
||||
// Before any other Database methods are called, the relevant `id`
|
||||
// entries are locked to allow for fine-grained concurrency.
|
||||
|
||||
// Strategy: create a new lock, if stored, continue. Otherwise, lock the
|
||||
// existing mutex.
|
||||
mu := &sync.Mutex{}
|
||||
mu.Lock() // Optimistically lock if we do store it.
|
||||
i, loaded := pf.locks.LoadOrStore(id.String(), mu)
|
||||
if loaded {
|
||||
mu = i.(*sync.Mutex)
|
||||
mu.Lock()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Unlock(ctx context.Context, id *url.URL) error {
|
||||
// Once Go-Fed is done calling Database methods, the relevant `id`
|
||||
// entries are unlocked.
|
||||
|
||||
i, ok := pf.locks.Load(id.String())
|
||||
if !ok {
|
||||
return errors.New("missing an id in unlock")
|
||||
}
|
||||
mu := i.(*sync.Mutex)
|
||||
mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) InboxContains(ctx context.Context, inbox *url.URL, id *url.URL) (bool, error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) GetInbox(ctx context.Context, inboxIRI *url.URL) (inbox vocab.ActivityStreamsOrderedCollectionPage, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) SetInbox(ctx context.Context, inbox vocab.ActivityStreamsOrderedCollectionPage) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Owns(ctx context.Context, id *url.URL) (owns bool, err error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) ActorForOutbox(ctx context.Context, outboxIRI *url.URL) (actorIRI *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) ActorForInbox(ctx context.Context, inboxIRI *url.URL) (actorIRI *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) OutboxForInbox(ctx context.Context, inboxIRI *url.URL) (outboxIRI *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Exists(ctx context.Context, id *url.URL) (exists bool, err error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Get(ctx context.Context, id *url.URL) (value vocab.Type, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Create(ctx context.Context, asType vocab.Type) error {
|
||||
t, err := streams.NewTypeResolver()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := t.Resolve(ctx, asType); err != nil {
|
||||
return err
|
||||
}
|
||||
asType.GetTypeName()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Update(ctx context.Context, asType vocab.Type) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Delete(ctx context.Context, id *url.URL) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) GetOutbox(ctx context.Context, outboxIRI *url.URL) (inbox vocab.ActivityStreamsOrderedCollectionPage, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) SetOutbox(ctx context.Context, outbox vocab.ActivityStreamsOrderedCollectionPage) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) NewID(ctx context.Context, t vocab.Type) (id *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Followers(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Following(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (pf *postgresFederation) Liked(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
@@ -22,30 +22,26 @@ import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/go-fed/activity/streams"
|
||||
"github.com/go-fed/activity/streams/vocab"
|
||||
"github.com/go-fed/activity/pub"
|
||||
"github.com/go-pg/pg/extra/pgdebug"
|
||||
"github.com/go-pg/pg/v10"
|
||||
"github.com/go-pg/pg/v10/orm"
|
||||
"github.com/gotosocial/gotosocial/internal/config"
|
||||
"github.com/gotosocial/gotosocial/internal/gtsmodel"
|
||||
"github.com/gotosocial/oauth2/v4"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// postgresService satisfies the DB interface
|
||||
type postgresService struct {
|
||||
config *config.DBConfig
|
||||
conn *pg.DB
|
||||
log *logrus.Entry
|
||||
cancel context.CancelFunc
|
||||
locks *sync.Map
|
||||
tokenStore oauth2.TokenStore
|
||||
config *config.DBConfig
|
||||
conn *pg.DB
|
||||
log *logrus.Entry
|
||||
cancel context.CancelFunc
|
||||
federationDB pub.Database
|
||||
}
|
||||
|
||||
// newPostgresService returns a postgresService derived from the provided config, which implements the go-fed DB interface.
|
||||
@@ -102,36 +98,20 @@ func newPostgresService(ctx context.Context, c *config.Config, log *logrus.Entry
|
||||
return nil, errors.New("db connection timeout")
|
||||
}
|
||||
|
||||
// acc := model.StubAccount()
|
||||
// if _, err := conn.Model(acc).Returning("id").Insert(); err != nil {
|
||||
// cancel()
|
||||
// return nil, fmt.Errorf("db insert error: %s", err)
|
||||
// }
|
||||
// log.Infof("created account with id %s", acc.ID)
|
||||
|
||||
// note := &model.Note{
|
||||
// Visibility: &model.Visibility{
|
||||
// Local: true,
|
||||
// },
|
||||
// CreatedAt: time.Now(),
|
||||
// UpdatedAt: time.Now(),
|
||||
// }
|
||||
// if _, err := conn.WithContext(ctx).Model(note).Returning("id").Insert(); err != nil {
|
||||
// cancel()
|
||||
// return nil, fmt.Errorf("db insert error: %s", err)
|
||||
// }
|
||||
// log.Infof("created note with id %s", note.ID)
|
||||
|
||||
// we can confidently return this useable postgres service now
|
||||
return &postgresService{
|
||||
config: c.DBConfig,
|
||||
conn: conn,
|
||||
log: log,
|
||||
cancel: cancel,
|
||||
locks: &sync.Map{},
|
||||
config: c.DBConfig,
|
||||
conn: conn,
|
||||
log: log,
|
||||
cancel: cancel,
|
||||
federationDB: newPostgresFederation(conn),
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Federation() pub.Database {
|
||||
return ps.federationDB
|
||||
}
|
||||
|
||||
/*
|
||||
HANDY STUFF
|
||||
*/
|
||||
@@ -187,118 +167,6 @@ func derivePGOptions(c *config.Config) (*pg.Options, error) {
|
||||
return options, nil
|
||||
}
|
||||
|
||||
/*
|
||||
GO-FED DB INTERFACE-IMPLEMENTING FUNCTIONS
|
||||
*/
|
||||
func (ps *postgresService) Lock(ctx context.Context, id *url.URL) error {
|
||||
// Before any other Database methods are called, the relevant `id`
|
||||
// entries are locked to allow for fine-grained concurrency.
|
||||
|
||||
// Strategy: create a new lock, if stored, continue. Otherwise, lock the
|
||||
// existing mutex.
|
||||
mu := &sync.Mutex{}
|
||||
mu.Lock() // Optimistically lock if we do store it.
|
||||
i, loaded := ps.locks.LoadOrStore(id.String(), mu)
|
||||
if loaded {
|
||||
mu = i.(*sync.Mutex)
|
||||
mu.Lock()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Unlock(ctx context.Context, id *url.URL) error {
|
||||
// Once Go-Fed is done calling Database methods, the relevant `id`
|
||||
// entries are unlocked.
|
||||
|
||||
i, ok := ps.locks.Load(id.String())
|
||||
if !ok {
|
||||
return errors.New("missing an id in unlock")
|
||||
}
|
||||
mu := i.(*sync.Mutex)
|
||||
mu.Unlock()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) InboxContains(ctx context.Context, inbox *url.URL, id *url.URL) (bool, error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) GetInbox(ctx context.Context, inboxIRI *url.URL) (inbox vocab.ActivityStreamsOrderedCollectionPage, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) SetInbox(ctx context.Context, inbox vocab.ActivityStreamsOrderedCollectionPage) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Owns(ctx context.Context, id *url.URL) (owns bool, err error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) ActorForOutbox(ctx context.Context, outboxIRI *url.URL) (actorIRI *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) ActorForInbox(ctx context.Context, inboxIRI *url.URL) (actorIRI *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) OutboxForInbox(ctx context.Context, inboxIRI *url.URL) (outboxIRI *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Exists(ctx context.Context, id *url.URL) (exists bool, err error) {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Get(ctx context.Context, id *url.URL) (value vocab.Type, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Create(ctx context.Context, asType vocab.Type) error {
|
||||
t, err := streams.NewTypeResolver()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if err := t.Resolve(ctx, asType); err != nil {
|
||||
return err
|
||||
}
|
||||
asType.GetTypeName()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Update(ctx context.Context, asType vocab.Type) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Delete(ctx context.Context, id *url.URL) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) GetOutbox(ctx context.Context, outboxIRI *url.URL) (inbox vocab.ActivityStreamsOrderedCollectionPage, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) SetOutbox(ctx context.Context, outbox vocab.ActivityStreamsOrderedCollectionPage) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) NewID(ctx context.Context, t vocab.Type) (id *url.URL, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Followers(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Following(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (ps *postgresService) Liked(ctx context.Context, actorIRI *url.URL) (followers vocab.ActivityStreamsCollection, err error) {
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
/*
|
||||
EXTRA FUNCTIONS
|
||||
*/
|
||||
@@ -338,6 +206,46 @@ func (ps *postgresService) IsHealthy(ctx context.Context) error {
|
||||
return ps.conn.Ping(ctx)
|
||||
}
|
||||
|
||||
func (ps *postgresService) TokenStore() oauth2.TokenStore {
|
||||
return ps.tokenStore
|
||||
func (ps *postgresService) CreateTable(i interface{}) error {
|
||||
return ps.conn.Model(i).CreateTable(&orm.CreateTableOptions{
|
||||
IfNotExists: true,
|
||||
})
|
||||
}
|
||||
|
||||
func (ps *postgresService) DropTable(i interface{}) error {
|
||||
return ps.conn.Model(i).DropTable(&orm.DropTableOptions{
|
||||
IfExists: true,
|
||||
})
|
||||
}
|
||||
|
||||
func (ps *postgresService) GetByID(id string, i interface{}) error {
|
||||
return ps.conn.Model(i).Where("id = ?", id).Select()
|
||||
}
|
||||
|
||||
func (ps *postgresService) GetWhere(key string, value interface{}, i interface{}) error {
|
||||
return ps.conn.Model(i).Where(fmt.Sprintf("%s = ?", key), value).Select()
|
||||
}
|
||||
|
||||
func (ps *postgresService) GetAll(i interface{}) error {
|
||||
return ps.conn.Model(i).Select()
|
||||
}
|
||||
|
||||
func (ps *postgresService) Put(i interface{}) error {
|
||||
_, err := ps.conn.Model(i).Insert(i)
|
||||
return err
|
||||
}
|
||||
|
||||
func (ps *postgresService) UpdateByID(id string, i interface{}) error {
|
||||
_, err := ps.conn.Model(i).OnConflict("(id) DO UPDATE").Insert()
|
||||
return err
|
||||
}
|
||||
|
||||
func (ps *postgresService) DeleteByID(id string, i interface{}) error {
|
||||
_, err := ps.conn.Model(i).Where("id = ?", id).Delete()
|
||||
return err
|
||||
}
|
||||
|
||||
func (ps *postgresService) DeleteWhere(key string, value interface{}, i interface{}) error {
|
||||
_, err := ps.conn.Model(i).Where(fmt.Sprintf("%s = ?", key), value).Delete()
|
||||
return err
|
||||
}
|
||||
Reference in New Issue
Block a user