mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 04:52:24 -05:00
[feature] Support new model of interaction flow for forward compat with v0.21.0 (#4394)
~~Still WIP!~~ This PR allows v0.20.0 of GtS to be forward-compatible with the interaction request / authorization flow that will fully replace the current flow in v0.21.0. Basically, this means we need to recognize LikeRequest, ReplyRequest, and AnnounceRequest, and in response to those requests, deliver either a Reject or an Accept, with the latter pointing towards a LikeAuthorization, ReplyAuthorization, or AnnounceAuthorization, respectively. This can then be used by the remote instance to prove to third parties that the interaction has been accepted by the interactee. These Authorization types need to be dereferencable to third parties, so we need to serve them. As well as recognizing the above "polite" interaction request types, we also need to still serve appropriate responses to "impolite" interaction request types, where an instance that's unaware of interaction policies tries to interact with a post by sending a reply, like, or boost directly, without wrapping it in a WhateverRequest type. Doesn't fully close https://codeberg.org/superseriousbusiness/gotosocial/issues/4026 but gets damn near (just gotta update the federating with GtS documentation). Migrations tested on both Postgres and SQLite. Co-authored-by: kim <grufwub@gmail.com> Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4394 Co-authored-by: tobi <tobi.smethurst@protonmail.com> Co-committed-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
parent
33fed81a8d
commit
754b7be9cf
126 changed files with 6637 additions and 1778 deletions
|
|
@ -22,6 +22,7 @@ import (
|
|||
"math/big"
|
||||
"time"
|
||||
|
||||
"code.superseriousbusiness.org/gotosocial/internal/gtserror"
|
||||
"code.superseriousbusiness.org/gotosocial/internal/log"
|
||||
"codeberg.org/gruf/go-kv/v2"
|
||||
"github.com/oklog/ulid"
|
||||
|
|
@ -33,62 +34,71 @@ const (
|
|||
randomRange = 631152381 // ~20 years in seconds
|
||||
)
|
||||
|
||||
// bigRandomRange contains randomRange as big.Int.
|
||||
var bigRandomRange = big.NewInt(randomRange)
|
||||
|
||||
// ULID represents a Universally Unique Lexicographically Sortable Identifier of 26 characters. See https://github.com/oklog/ulid
|
||||
type ULID string
|
||||
|
||||
// NewULID returns a new ULID string using the current time.
|
||||
func NewULID() string {
|
||||
ulid, err := ulid.New(
|
||||
ulid.Timestamp(time.Now()), rand.Reader,
|
||||
)
|
||||
// newAt returns a new ulid.ULID from timestamp,
|
||||
// else panics with caller's caller information.
|
||||
func newAt(ts uint64) string {
|
||||
ulid, err := ulid.New(ts, rand.Reader)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
panic(gtserror.NewfAt(4, "error generating ulid: %w", err))
|
||||
}
|
||||
return ulid.String()
|
||||
}
|
||||
|
||||
// NewULID returns a new ULID
|
||||
// string using the current time.
|
||||
func NewULID() string {
|
||||
return newAt(ulid.Now())
|
||||
}
|
||||
|
||||
// NewULIDFromTime returns a new ULID string using
|
||||
// given time, or from current time on any error.
|
||||
func NewULIDFromTime(t time.Time) string {
|
||||
ts := ulid.Timestamp(t)
|
||||
if ts > ulid.MaxTime() {
|
||||
log.WarnKVs(nil, kv.Fields{
|
||||
{K: "caller", V: log.Caller(2)},
|
||||
{K: "caller", V: log.Caller(3)},
|
||||
{K: "value", V: t},
|
||||
{K: "msg", V: "invalid ulid time"},
|
||||
}...)
|
||||
ts = ulid.Now()
|
||||
}
|
||||
return ulid.MustNew(ts, rand.Reader).String()
|
||||
return newAt(ts)
|
||||
}
|
||||
|
||||
// NewRandomULID returns a new ULID string using a random time in an ~80 year range around the current datetime, or an error if something goes wrong.
|
||||
func NewRandomULID() (string, error) {
|
||||
b1, err := rand.Int(rand.Reader, big.NewInt(randomRange))
|
||||
// NewRandomULID returns a new ULID string using a random
|
||||
// time in an ~80 year range around the current datetime.
|
||||
func NewRandomULID() string {
|
||||
n1, err := rand.Int(rand.Reader, bigRandomRange)
|
||||
if err != nil {
|
||||
return "", err
|
||||
panic(gtserror.NewfAt(3, "error reading rand: %w", err))
|
||||
}
|
||||
r1 := time.Duration(int(b1.Int64()))
|
||||
|
||||
b2, err := rand.Int(rand.Reader, big.NewInt(randomRange))
|
||||
n2, err := rand.Int(rand.Reader, bigRandomRange)
|
||||
if err != nil {
|
||||
return "", err
|
||||
panic(gtserror.NewfAt(3, "error reading rand: %w", err))
|
||||
}
|
||||
r2 := -time.Duration(int(b2.Int64()))
|
||||
|
||||
arbitraryTime := time.Now().Add(r1 * time.Second).Add(r2 * time.Second)
|
||||
newUlid, err := ulid.New(ulid.Timestamp(arbitraryTime), rand.Reader)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return newUlid.String(), nil
|
||||
// Random addition and decrement durations.
|
||||
add := time.Duration(n1.Int64()) * time.Second
|
||||
dec := -time.Duration(n2.Int64()) * time.Second
|
||||
|
||||
// Return new ULID string from now.
|
||||
t := time.Now().Add(add).Add(dec)
|
||||
return newAt(ulid.Timestamp(t))
|
||||
}
|
||||
|
||||
// TimeFromULID parses a ULID string and returns the
|
||||
// encoded time.Time{}, or error with caller prefix.
|
||||
func TimeFromULID(id string) (time.Time, error) {
|
||||
parsed, err := ulid.ParseStrict(id)
|
||||
if err != nil {
|
||||
return time.Time{}, err
|
||||
return time.Time{}, gtserror.NewfAt(3, "could not extract time (malformed ulid): %w", err)
|
||||
}
|
||||
|
||||
return ulid.Time(parsed.Time()), nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue