serv/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-27 06:03:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Use and validate source in ActorID struct

Browse source
This commit is contained in:
erik 2023-11-24 12:48:14 +01:00 committed by Michael Jerger
parent 546ce50337
commit 3a938b6c3f
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
models/activitypub/actor.go
View file

@ -5,6 +5,8 @@ import (
"net/url" "net/url"
"strconv" "strconv"
"strings" "strings"
"code.gitea.io/gitea/modules/forgefed"
) )
type Validatable interface { // ToDo: What is the right package for this interface? type Validatable interface { // ToDo: What is the right package for this interface?
@ -70,8 +72,13 @@ func (a ActorID) Validate() []string {
err = append(err, res.Error()) err = append(err, res.Error())
} }
if !strings.Contains(a.path, "api/v1/activitypub/user-id") { // This needs to happen in dependence to the star source type. switch a.source {
err = append(err, fmt.Errorf("the Path to the API was invalid: %v", a.path).Error()) case "forgejo", "gitea":
if !strings.Contains(a.path, "api/v1/activitypub/user-id") {
err = append(err, fmt.Errorf("the Path to the API was invalid: %v", a.path).Error())
}
default:
err = append(err, fmt.Errorf("currently only forgeo and gitea sources are allowed from actor id").Error())
} }
return err return err
@ -104,8 +111,9 @@ func ParseActorID(actor string) (ActorID, error) {
userId := pathWithUserID[len(pathWithUserID)-1] userId := pathWithUserID[len(pathWithUserID)-1]
return ActorID{ // ToDo: maybe keep original input to validate against (maybe extra method) return ActorID{ // ToDo: maybe keep original input to validate against (maybe extra method)
schema: u.Scheme, // ToDo: Add source type field
userId: userId, userId: userId,
source: star.Source,
schema: u.Scheme, // ToDo: Add source type field
host: u.Host, host: u.Host,
path: u.Path, path: u.Path,
port: u.Port(), port: u.Port(),