mirrors/forgejo
1
0
Fork 1
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-05-18 03:52:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactoring separate model & module

Browse source
This commit is contained in:
Michael Jerger 2024-05-03 08:12:04 +02:00
parent 720367af68
commit e7759d0784
13 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
models/forgefed/activity.go → modules/forgefed/activity.go
View file

0
models/forgefed/activity_test.go → modules/forgefed/activity_test.go
View file

0
models/forgefed/forgefed.go → modules/forgefed/forgefed.go
View file

0
models/forgefed/repository.go → modules/forgefed/repository.go
View file

0
models/forgefed/repository_test.go → modules/forgefed/repository_test.go
View file

3
modules/validation/validatable_test.go
View file

@ -16,9 +16,8 @@ type Sut struct {
func (sut Sut) Validate() []string {
if sut.valid {
return []string{}
} else {
return []string{"invalid"}
}
return []string{"invalid"}
}
func Test_IsValid(t *testing.T) {

4
routers/api/v1/activitypub/repository.go
View file

@ -8,7 +8,7 @@ import (
"net/http"
"strings"
forgefed_model "code.gitea.io/gitea/models/forgefed"
"code.gitea.io/gitea/modules/forgefed"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/web"
@ -36,7 +36,7 @@ func Repository(ctx *context.APIContext) {
// "$ref": "#/responses/ActivityPub"
link := fmt.Sprintf("%s/api/v1/activitypub/repository-id/%d", strings.TrimSuffix(setting.AppURL, "/"), ctx.Repo.Repository.ID)
repo := forgefed_model.RepositoryNew(ap.IRI(link))
repo := forgefed.RepositoryNew(ap.IRI(link))
repo.Name = ap.NaturalLanguageValuesNew()
err := repo.Name.Set("en", ap.Content(ctx.Repo.Repository.Name))

2
routers/api/v1/activitypub/response.go
View file

@ -6,8 +6,8 @@ package activitypub
import (
"net/http"
"code.gitea.io/gitea/models/forgefed"
"code.gitea.io/gitea/modules/activitypub"
"code.gitea.io/gitea/modules/forgefed"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/services/context"

2
routers/api/v1/api.go
View file

@ -73,7 +73,6 @@ import (
actions_model "code.gitea.io/gitea/models/actions"
auth_model "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/forgefed"
issues_model "code.gitea.io/gitea/models/issues"
"code.gitea.io/gitea/models/organization"
"code.gitea.io/gitea/models/perm"
@ -81,6 +80,7 @@ import (
repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/forgefed"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
api "code.gitea.io/gitea/modules/structs"

2
routers/api/v1/swagger/options.go
View file

@ -5,7 +5,7 @@
package swagger
import (
ffed "code.gitea.io/gitea/models/forgefed"
ffed "code.gitea.io/gitea/modules/forgefed"
api "code.gitea.io/gitea/modules/structs"
"code.gitea.io/gitea/services/forms"
)

4
services/federation/federation_service.go
View file

@ -7,7 +7,7 @@ import (
"context"
"net/http"
"code.gitea.io/gitea/models/forgefed"
fm "code.gitea.io/gitea/modules/forgefed"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/validation"
)
@ -20,7 +20,7 @@ import (
// Star the repo if it wasn't already stared
// Do some mitigation against out of order attacks
func ProcessLikeActivity(ctx context.Context, form any, repositoryID int64) (int, string, error) {
activity := form.(*forgefed.ForgeLike)
activity := form.(*fm.ForgeLike)
if res, err := validation.IsValid(activity); !res {
return http.StatusNotAcceptable, "Invalid activity", err
}

2
templates/swagger/v1_json.tmpl generated
View file

@ -21389,7 +21389,7 @@
"ForgeLike": {
"description": "ForgeLike activity data type",
"type": "object",
"x-go-package": "code.gitea.io/gitea/models/forgefed"
"x-go-package": "code.gitea.io/gitea/modules/forgefed"
},
"GPGKey": {
"description": "GPGKey a user GPG key to sign commit and tag in repository",

14
tests/integration/api_activitypub_repository_test.go
View file

@ -11,9 +11,9 @@ import (
"testing"
"code.gitea.io/gitea/models/db"
forgefed_model "code.gitea.io/gitea/models/forgefed"
"code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/activitypub"
forgefed_modules "code.gitea.io/gitea/modules/forgefed"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/routers"
@ -35,7 +35,7 @@ func TestActivityPubRepository(t *testing.T) {
body := resp.Body.Bytes()
assert.Contains(t, string(body), "@context")
var repository forgefed_model.Repository
var repository forgefed_modules.Repository
err := repository.UnmarshalJSON(body)
assert.NoError(t, err)
@ -81,12 +81,12 @@ func TestActivityPubRepositoryInboxValid(t *testing.T) {
repositoryID := 2
c, err := activitypub.NewClient(db.DefaultContext, actionsUser, "not used")
assert.NoError(t, err)
repoInboxUrl := fmt.Sprintf("%s/api/v1/activitypub/repository-id/%v/inbox",
repoInboxURL := fmt.Sprintf("%s/api/v1/activitypub/repository-id/%v/inbox",
srv.URL, repositoryID)
activity := []byte(fmt.Sprintf(`{"type":"Like","startTime":"2024-03-27T00:00:00Z","actor":"%s/api/v1/activitypub/user-id/2","object":"%s/api/v1/activitypub/repository-id/%v"}`,
srv.URL, srv.URL, repositoryID))
resp, err := c.Post(activity, repoInboxUrl)
resp, err := c.Post(activity, repoInboxURL)
assert.NoError(t, err)
assert.Equal(t, http.StatusNoContent, resp.StatusCode)
})
@ -114,11 +114,11 @@ func TestActivityPubRepositoryInboxInvalid(t *testing.T) {
repositoryID := 2
c, err := activitypub.NewClient(db.DefaultContext, actionsUser, "not used")
assert.NoError(t, err)
repoInboxUrl := fmt.Sprintf("%s/api/v1/activitypub/repository-id/%v/inbox",
repoInboxURL := fmt.Sprintf("%s/api/v1/activitypub/repository-id/%v/inbox",
srv.URL, repositoryID)
activity := []byte(fmt.Sprintf(`{"type":"Wrong"}`))
resp, err := c.Post(activity, repoInboxUrl)
activity := []byte(`{"type":"Wrong"}`)
resp, err := c.Post(activity, repoInboxURL)
assert.NoError(t, err)
assert.Equal(t, http.StatusNotAcceptable, resp.StatusCode)
})