mirror of
https://codeberg.org/forgejo/forgejo
synced 2024-11-25 19:26:09 +01:00
Update NewRepositoryID with case for following repo
This commit is contained in:
parent
9c9333868c
commit
75c93e5319
|
@ -125,11 +125,18 @@ type RepositoryID struct {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Factory function for RepositoryID. Created struct is asserted to be valid.
|
// Factory function for RepositoryID. Created struct is asserted to be valid.
|
||||||
func NewRepositoryID(uri, source string) (RepositoryID, error) {
|
func NewRepositoryID(uri, source string, isFollowing bool) (RepositoryID, error) {
|
||||||
// ToDo: Here we check if the uri is coming from OUR machine. This fails for any urls pointing to other machines.
|
|
||||||
if !validation.IsAPIURL(uri) {
|
if isFollowing {
|
||||||
return RepositoryID{}, fmt.Errorf("uri %s is not a valid repo url on this host %s", uri, setting.AppURL+"api")
|
if !validation.IsValidURL(uri) {
|
||||||
|
return RepositoryID{}, fmt.Errorf("uri %s is not a valid url on their host: %s", uri, setting.AppURL+"api")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if !validation.IsAPIURL(uri) {
|
||||||
|
return RepositoryID{}, fmt.Errorf("uri %s is not a valid repo url on our host: %s", uri, setting.AppURL+"api")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
result, err := newActorID(uri)
|
result, err := newActorID(uri)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return RepositoryID{}, err
|
return RepositoryID{}, err
|
||||||
|
|
|
@ -52,7 +52,7 @@ func TestNewRepositoryId(t *testing.T) {
|
||||||
expected.Host = "localhost"
|
expected.Host = "localhost"
|
||||||
expected.Port = "3000"
|
expected.Port = "3000"
|
||||||
expected.UnvalidatedInput = "http://localhost:3000/api/activitypub/repository-id/1"
|
expected.UnvalidatedInput = "http://localhost:3000/api/activitypub/repository-id/1"
|
||||||
sut, _ := NewRepositoryID("http://localhost:3000/api/activitypub/repository-id/1", "forgejo")
|
sut, _ := NewRepositoryID("http://localhost:3000/api/activitypub/repository-id/1", "forgejo", false)
|
||||||
if sut != expected {
|
if sut != expected {
|
||||||
t.Errorf("expected: %v\n but was: %v\n", expected, sut)
|
t.Errorf("expected: %v\n but was: %v\n", expected, sut)
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,7 @@ func ProcessLikeActivity(ctx context.Context, form any, repositoryID int64) (int
|
||||||
log.Info("Actor accepted:%v", actorID)
|
log.Info("Actor accepted:%v", actorID)
|
||||||
|
|
||||||
// parse objectID (repository)
|
// parse objectID (repository)
|
||||||
objectID, err := fm.NewRepositoryID(activity.Object.GetID().String(), string(forgefed.ForgejoSourceType))
|
objectID, err := fm.NewRepositoryID(activity.Object.GetID().String(), string(forgefed.ForgejoSourceType), false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return http.StatusNotAcceptable, "Invalid objectId", err
|
return http.StatusNotAcceptable, "Invalid objectId", err
|
||||||
}
|
}
|
||||||
|
@ -222,7 +222,7 @@ func StoreFollowingRepoList(ctx context.Context, localRepoID int64, followingRep
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return http.StatusInternalServerError, "Wrong FederationHost", err
|
return http.StatusInternalServerError, "Wrong FederationHost", err
|
||||||
}
|
}
|
||||||
followingRepoID, err := fm.NewRepositoryID(uri, string(federationHost.NodeInfo.SoftwareName))
|
followingRepoID, err := fm.NewRepositoryID(uri, string(federationHost.NodeInfo.SoftwareName), true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return http.StatusNotAcceptable, "Invalid federated repo", err
|
return http.StatusNotAcceptable, "Invalid federated repo", err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue