NYANDEV/forgejo
NYANDEV/forgejo
4
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-08 18:04:14 +01:00
Code Issues 2 Projects 1 Releases Packages Wiki Activity

fixed tests

Browse source 
part1, one test still failing
This commit is contained in:
Clemens 2024-03-28 09:36:08 +01:00
parent d624ebb712
commit 1ad7bdf983
11 changed files with 43 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
models/forgefed/activity_test.go
View file

@ -110,7 +110,7 @@ func Test_StarUnmarshalJSON(t *testing.T) {
} }
} }
func TestAcivityValidation(t *testing.T) { func TestActivityValidation(t *testing.T) {
sut := new(ForgeLike) sut := new(ForgeLike)
sut.UnmarshalJSON([]byte(`{"type":"Like", sut.UnmarshalJSON([]byte(`{"type":"Like",
"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1", "actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
@ -123,16 +123,16 @@ func TestAcivityValidation(t *testing.T) {
sut.UnmarshalJSON([]byte(`{"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1", sut.UnmarshalJSON([]byte(`{"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
"object":"https://codeberg.org/api/activitypub/repository-id/1", "object":"https://codeberg.org/api/activitypub/repository-id/1",
"startTime": "2014-12-31T23:00:00-08:00"}`)) "startTime": "2014-12-31T23:00:00-08:00"}`))
if sut.Validate()[0] != "Field type may not be empty" { if sut.Validate()[0] != "Field type should not be empty" {
t.Errorf("validation error expected but was: %v\n", sut.Validate()) t.Errorf("validation error expected but was: %v\n", sut.Validate()[0])
} }
sut.UnmarshalJSON([]byte(`{"type":"bad-type", sut.UnmarshalJSON([]byte(`{"type":"bad-type",
"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1", "actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
"object":"https://codeberg.org/api/activitypub/repository-id/1", "object":"https://codeberg.org/api/activitypub/repository-id/1",
"startTime": "2014-12-31T23:00:00-08:00"}`)) "startTime": "2014-12-31T23:00:00-08:00"}`))
if sut.Validate()[0] != "Value bad-type is not contained in allowed values [[Like]]" { if sut.Validate()[0] != "Value bad-type is not contained in allowed values [Like]" {
t.Errorf("validation error expected but was: %v\n", sut.Validate()) t.Errorf("validation error expected but was: %v\n", sut.Validate()[0])
} }
sut.UnmarshalJSON([]byte(`{"type":"Like", sut.UnmarshalJSON([]byte(`{"type":"Like",

10
models/forgefed/actor_test.go
View file

@ -66,7 +66,7 @@ func TestActorIdValidation(t *testing.T) {
sut.Host = "an.other.host" sut.Host = "an.other.host"
sut.Port = "" sut.Port = ""
sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/" sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/"
if sut.Validate()[0] != "Field userId may not be empty" { if sut.Validate()[0] != "Field userId should not be empty" {
t.Errorf("validation error expected but was: %v\n", sut.Validate()) t.Errorf("validation error expected but was: %v\n", sut.Validate())
} }
@ -78,8 +78,8 @@ func TestActorIdValidation(t *testing.T) {
sut.Host = "an.other.host" sut.Host = "an.other.host"
sut.Port = "" sut.Port = ""
sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1?illegal=action" sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1?illegal=action"
if sut.Validate()[0] != "not all input: \"https://an.other.host/api/v1/activitypub/user-id/1?illegal=action\" was parsed: \"https://an.other.host/api/v1/activitypub/user-id/1\"" { if sut.Validate()[0] != "not all input was parsed, \nUnvalidated Input:\"https://an.other.host/api/v1/activitypub/user-id/1?illegal=action\" \nParsed URI: \"https://an.other.host/api/v1/activitypub/user-id/1\"" {
t.Errorf("validation error expected but was: %v\n", sut.Validate()) t.Errorf("validation error expected but was: %v\n", sut.Validate()[0])
} }
} }
@ -104,8 +104,8 @@ func TestPersonIdValidation(t *testing.T) {
sut.Host = "an.other.host" sut.Host = "an.other.host"
sut.Port = "" sut.Port = ""
sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1" sut.UnvalidatedInput = "https://an.other.host/api/v1/activitypub/user-id/1"
if sut.Validate()[0] != "Value forgejox is not contained in allowed values [[forgejo gitea]]" { if sut.Validate()[0] != "Value forgejox is not contained in allowed values [forgejo gitea]" {
t.Errorf("validation error expected but was: %v\n", sut.Validate()) t.Errorf("validation error expected but was: %v\n", sut.Validate()[0])
} }
} }

2
models/forgefed/nodeinfo_test.go
View file

@ -52,7 +52,7 @@ func Test_NodeInfoWellKnownValidate(t *testing.T) {
} }
sut = NodeInfoWellKnown{Href: "./federated-repo.prod.meissa.de/api/v1/nodeinfo"} sut = NodeInfoWellKnown{Href: "./federated-repo.prod.meissa.de/api/v1/nodeinfo"}
if _, err := validation.IsValid(sut); err.Error() != "Href has to be absolute\nValue is not contained in allowed values [[http https]]" { if _, err := validation.IsValid(sut); err.Error() != "Href has to be absolute\nValue is not contained in allowed values [http https]" {
t.Errorf("validation error expected but was: %v\n", err) t.Errorf("validation error expected but was: %v\n", err)
} }

9
models/repo/repo_test.go
View file

@ -217,3 +217,12 @@ func TestComposeSSHCloneURL(t *testing.T) {
setting.SSH.Port = 123 setting.SSH.Port = 123
assert.Equal(t, "ssh://git@[::1]:123/user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo")) assert.Equal(t, "ssh://git@[::1]:123/user/repo.git", repo_model.ComposeSSHCloneURL("user", "repo"))
} }
func TestAPAPIURL(t *testing.T) {
repo := repo_model.Repository{ID: 1}
url := repo.APAPIURL()
expected := "https://try.gitea.io/api/v1/activitypub/repository-id/1"
if url != expected {
t.Errorf("unexpected APAPIURL, expected: %q, actual: %q", expected, url)
}
}

13
models/repo/star.go
View file

@ -11,7 +11,8 @@ import (
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/forgefed" "code.gitea.io/gitea/models/forgefed"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/activitypub"
//"code.gitea.io/gitea/modules/activitypub"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/timeutil" "code.gitea.io/gitea/modules/timeutil"
@ -94,10 +95,10 @@ func sendLikeActivities(ctx context.Context, doer user_model.User, repoID int64)
return err return err
} }
apclient, err := activitypub.NewClient(ctx, &doer, doer.APAPIURL()) /*apclient, err := activitypub.NewClient(ctx, &doer, doer.APAPIURL())
if err != nil { if err != nil {
return err return err
} }*/
for _, federatedRepo := range federatedRepos { for _, federatedRepo := range federatedRepos {
target := federatedRepo.Uri + "/inbox/" // A like goes to the inbox of the federated repo target := federatedRepo.Uri + "/inbox/" // A like goes to the inbox of the federated repo
@ -107,16 +108,16 @@ func sendLikeActivities(ctx context.Context, doer user_model.User, repoID int64)
return err return err
} }
log.Info("Like Activity: %v", likeActivity) log.Info("Like Activity: %v", likeActivity)
json, err := likeActivity.MarshalJSON() /*json, err := likeActivity.MarshalJSON()
if err != nil { if err != nil {
return err return err
} }*/
// TODO: decouple loading & creating activities from sending them - use two loops. // TODO: decouple loading & creating activities from sending them - use two loops.
// TODO: set timeouts for outgoing request in oder to mitigate DOS by slow lories // TODO: set timeouts for outgoing request in oder to mitigate DOS by slow lories
// TODO: Check if we need to respect rate limits // TODO: Check if we need to respect rate limits
// ToDo: Change this to the standalone table of FederatedRepos // ToDo: Change this to the standalone table of FederatedRepos
apclient.Post([]byte(json), target) //apclient.Post([]byte(json), target)
} }
return nil return nil

2
models/user/user.go
View file

@ -303,7 +303,7 @@ func (u *User) HTMLURL() string {
// APAPIURL returns the IRI to the api endpoint of the user // APAPIURL returns the IRI to the api endpoint of the user
func (u *User) APAPIURL() string { func (u *User) APAPIURL() string {
return setting.AppURL + url.PathEscape("api/v1/activitypub/user-id/") + url.PathEscape(string(u.ID)) return fmt.Sprintf("%vapi/v1/activitypub/user-id/%v", setting.AppURL, url.PathEscape(fmt.Sprintf("%v", u.ID)))
} }
// OrganisationLink returns the organization sub page link. // OrganisationLink returns the organization sub page link.

9
models/user/user_test.go
View file

@ -60,6 +60,15 @@ func TestCanCreateOrganization(t *testing.T) {
assert.False(t, user.CanCreateOrganization()) assert.False(t, user.CanCreateOrganization())
} }
func TestAPAPIURL(t *testing.T) {
user := user_model.User{ID: 1}
url := user.APAPIURL()
expected := "https://try.gitea.io/api/v1/activitypub/user-id/1"
if url != expected {
t.Errorf("unexpected APAPIURL, expected: %q, actual: %q", expected, url)
}
}
func TestSearchUsers(t *testing.T) { func TestSearchUsers(t *testing.T) {
assert.NoError(t, unittest.PrepareTestDatabase()) assert.NoError(t, unittest.PrepareTestDatabase())
testSuccess := func(opts *user_model.SearchUserOptions, expectedUserOrOrgIDs []int64) { testSuccess := func(opts *user_model.SearchUserOptions, expectedUserOrOrgIDs []int64) {

2
modules/forgefed/federation_service.go
View file

@ -82,7 +82,7 @@ func LikeActivity(ctx context.Context, form any, repositoryID int64) (int, strin
// execute the activity if the repo was not stared already // execute the activity if the repo was not stared already
alreadyStared := repo.IsStaring(ctx, user.ID, repositoryID) alreadyStared := repo.IsStaring(ctx, user.ID, repositoryID)
if !alreadyStared { if !alreadyStared {
err = repo.StarRepo(ctx, user, repositoryID, true) err = repo.StarRepo(ctx, *user, repositoryID, true)
if err != nil { if err != nil {
return http.StatusNotAcceptable, "Error staring", err return http.StatusNotAcceptable, "Error staring", err
} }

2
modules/validation/validatable.go
View file

@ -62,7 +62,7 @@ func ValidateOneOf(value any, allowed []any) []string {
return []string{} return []string{}
} }
} }
return []string{fmt.Sprintf("Value %v is not contained in allowed values [%v]", value, allowed)} return []string{fmt.Sprintf("Value %v is not contained in allowed values %v", value, allowed)}
} }
func ValidateSuffix(str, suffix string) bool { func ValidateSuffix(str, suffix string) bool {

4
routers/api/v1/user/star.go
View file

@ -157,7 +157,7 @@ func Star(ctx *context.APIContext) {
// "$ref": "#/responses/notFound" // "$ref": "#/responses/notFound"
// TODO: why is this *context.APIContext passed, where a context.Context is expected? // TODO: why is this *context.APIContext passed, where a context.Context is expected?
err := repo_model.StarRepo(ctx, ctx.Doer, ctx.Repo.Repository.ID, true) err := repo_model.StarRepo(ctx, *ctx.Doer, ctx.Repo.Repository.ID, true)
if err != nil { if err != nil {
ctx.Error(http.StatusInternalServerError, "StarRepo", err) ctx.Error(http.StatusInternalServerError, "StarRepo", err)
return return
@ -188,7 +188,7 @@ func Unstar(ctx *context.APIContext) {
// "404": // "404":
// "$ref": "#/responses/notFound" // "$ref": "#/responses/notFound"
err := repo_model.StarRepo(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID, false) err := repo_model.StarRepo(ctx, *ctx.Doer, ctx.Repo.Repository.ID, false)
if err != nil { if err != nil {
ctx.Error(http.StatusInternalServerError, "StarRepo", err) ctx.Error(http.StatusInternalServerError, "StarRepo", err)
return return

4
routers/web/repo/repo.go
View file

@ -316,9 +316,9 @@ func Action(ctx *context.Context) {
case "unwatch": case "unwatch":
err = repo_model.WatchRepo(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID, false) err = repo_model.WatchRepo(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID, false)
case "star": case "star":
err = repo_model.StarRepo(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID, true) err = repo_model.StarRepo(ctx, *ctx.Doer, ctx.Repo.Repository.ID, true)
case "unstar": case "unstar":
err = repo_model.StarRepo(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID, false) err = repo_model.StarRepo(ctx, *ctx.Doer, ctx.Repo.Repository.ID, false)
case "accept_transfer": case "accept_transfer":
err = acceptOrRejectRepoTransfer(ctx, true) err = acceptOrRejectRepoTransfer(ctx, true)
case "reject_transfer": case "reject_transfer":