|
|
|
// Copyright 2021 The Gitea Authors. All rights reserved.
|
|
|
|
// Use of this source code is governed by a MIT-style
|
|
|
|
// license that can be found in the LICENSE file.
|
|
|
|
|
|
|
|
package integration
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"encoding/binary"
|
|
|
|
"fmt"
|
|
|
|
"io"
|
|
|
|
"net/http"
|
|
|
|
neturl "net/url"
|
|
|
|
"testing"
|
|
|
|
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
|
|
"code.gitea.io/gitea/models/packages"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
|
|
"code.gitea.io/gitea/models/unittest"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
Simplify how git repositories are opened (#28937)
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
10 months ago
|
|
|
"code.gitea.io/gitea/modules/gitrepo"
|
|
|
|
"code.gitea.io/gitea/modules/json"
|
|
|
|
cargo_module "code.gitea.io/gitea/modules/packages/cargo"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
cargo_router "code.gitea.io/gitea/routers/api/packages/cargo"
|
|
|
|
cargo_service "code.gitea.io/gitea/services/packages/cargo"
|
|
|
|
"code.gitea.io/gitea/tests"
|
|
|
|
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
)
|
|
|
|
|
|
|
|
func TestPackageCargo(t *testing.T) {
|
|
|
|
onGiteaRun(t, testPackageCargo)
|
|
|
|
}
|
|
|
|
|
|
|
|
func testPackageCargo(t *testing.T, _ *neturl.URL) {
|
|
|
|
user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2})
|
|
|
|
|
|
|
|
packageName := "cargo-package"
|
|
|
|
packageVersion := "1.0.3"
|
|
|
|
packageDescription := "Package Description"
|
|
|
|
packageAuthor := "KN4CK3R"
|
|
|
|
packageHomepage := "https://gitea.io/"
|
|
|
|
packageLicense := "MIT"
|
|
|
|
|
|
|
|
createPackage := func(name, version string) io.Reader {
|
|
|
|
metadata := `{
|
|
|
|
"name":"` + name + `",
|
|
|
|
"vers":"` + version + `",
|
|
|
|
"description":"` + packageDescription + `",
|
|
|
|
"authors": ["` + packageAuthor + `"],
|
|
|
|
"deps":[
|
|
|
|
{
|
|
|
|
"name":"dep",
|
|
|
|
"version_req":"1.0",
|
|
|
|
"registry": "https://gitea.io/user/_cargo-index",
|
|
|
|
"kind": "normal",
|
|
|
|
"default_features": true
|
|
|
|
}
|
|
|
|
],
|
|
|
|
"homepage":"` + packageHomepage + `",
|
|
|
|
"license":"` + packageLicense + `"
|
|
|
|
}`
|
|
|
|
|
|
|
|
var buf bytes.Buffer
|
|
|
|
binary.Write(&buf, binary.LittleEndian, uint32(len(metadata)))
|
|
|
|
buf.WriteString(metadata)
|
|
|
|
binary.Write(&buf, binary.LittleEndian, uint32(4))
|
|
|
|
buf.WriteString("test")
|
|
|
|
return &buf
|
|
|
|
}
|
|
|
|
|
|
|
|
err := cargo_service.InitializeIndexRepository(db.DefaultContext, user, user)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
repo, err := repo_model.GetRepositoryByOwnerAndName(db.DefaultContext, user.Name, cargo_service.IndexRepositoryName)
|
|
|
|
assert.NotNil(t, repo)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
readGitContent := func(t *testing.T, path string) string {
|
Simplify how git repositories are opened (#28937)
## Purpose
This is a refactor toward building an abstraction over managing git
repositories.
Afterwards, it does not matter anymore if they are stored on the local
disk or somewhere remote.
## What this PR changes
We used `git.OpenRepository` everywhere previously.
Now, we should split them into two distinct functions:
Firstly, there are temporary repositories which do not change:
```go
git.OpenRepository(ctx, diskPath)
```
Gitea managed repositories having a record in the database in the
`repository` table are moved into the new package `gitrepo`:
```go
gitrepo.OpenRepository(ctx, repo_model.Repo)
```
Why is `repo_model.Repository` the second parameter instead of file
path?
Because then we can easily adapt our repository storage strategy.
The repositories can be stored locally, however, they could just as well
be stored on a remote server.
## Further changes in other PRs
- A Git Command wrapper on package `gitrepo` could be created. i.e.
`NewCommand(ctx, repo_model.Repository, commands...)`. `git.RunOpts{Dir:
repo.RepoPath()}`, the directory should be empty before invoking this
method and it can be filled in the function only. #28940
- Remove the `RepoPath()`/`WikiPath()` functions to reduce the
possibility of mistakes.
---------
Co-authored-by: delvh <dev.lh@web.de>
10 months ago
|
|
|
gitRepo, err := gitrepo.OpenRepository(db.DefaultContext, repo)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
defer gitRepo.Close()
|
|
|
|
|
|
|
|
commit, err := gitRepo.GetBranchCommit(repo.DefaultBranch)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
blob, err := commit.GetBlobByPath(path)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
content, err := blob.GetBlobContent(1024)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
return content
|
|
|
|
}
|
|
|
|
|
|
|
|
root := fmt.Sprintf("%sapi/packages/%s/cargo", setting.AppURL, user.Name)
|
|
|
|
url := fmt.Sprintf("%s/api/v1/crates", root)
|
|
|
|
|
|
|
|
t.Run("Index", func(t *testing.T) {
|
|
|
|
t.Run("Git/Config", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
content := readGitContent(t, cargo_service.ConfigFileName)
|
|
|
|
|
|
|
|
var config cargo_service.Config
|
|
|
|
err := json.Unmarshal([]byte(content), &config)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
assert.Equal(t, url, config.DownloadURL)
|
|
|
|
assert.Equal(t, root, config.APIURL)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("HTTP/Config", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
req := NewRequest(t, "GET", root+"/"+cargo_service.ConfigFileName)
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var config cargo_service.Config
|
|
|
|
err := json.Unmarshal(resp.Body.Bytes(), &config)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
assert.Equal(t, url, config.DownloadURL)
|
|
|
|
assert.Equal(t, root, config.APIURL)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Upload", func(t *testing.T) {
|
|
|
|
t.Run("InvalidNameOrVersion", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
content := createPackage("0test", "1.0.0")
|
|
|
|
|
|
|
|
req := NewRequestWithBody(t, "PUT", url+"/new", content).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp := MakeRequest(t, req, http.StatusBadRequest)
|
|
|
|
|
|
|
|
var status cargo_router.StatusResponse
|
|
|
|
DecodeJSON(t, resp, &status)
|
|
|
|
assert.False(t, status.OK)
|
|
|
|
|
|
|
|
content = createPackage("test", "-1.0.0")
|
|
|
|
|
|
|
|
req = NewRequestWithBody(t, "PUT", url+"/new", content).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp = MakeRequest(t, req, http.StatusBadRequest)
|
|
|
|
|
|
|
|
DecodeJSON(t, resp, &status)
|
|
|
|
assert.False(t, status.OK)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("InvalidContent", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
metadata := `{"name":"test","vers":"1.0.0"}`
|
|
|
|
|
|
|
|
var buf bytes.Buffer
|
|
|
|
binary.Write(&buf, binary.LittleEndian, uint32(len(metadata)))
|
|
|
|
buf.WriteString(metadata)
|
|
|
|
binary.Write(&buf, binary.LittleEndian, uint32(4))
|
|
|
|
buf.WriteString("te")
|
|
|
|
|
|
|
|
req := NewRequestWithBody(t, "PUT", url+"/new", &buf).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
MakeRequest(t, req, http.StatusBadRequest)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Valid", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
req := NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion))
|
|
|
|
MakeRequest(t, req, http.StatusUnauthorized)
|
|
|
|
|
|
|
|
req = NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var status cargo_router.StatusResponse
|
|
|
|
DecodeJSON(t, resp, &status)
|
|
|
|
assert.True(t, status.OK)
|
|
|
|
|
|
|
|
pvs, err := packages.GetVersionsByPackageType(db.DefaultContext, user.ID, packages.TypeCargo)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Len(t, pvs, 1)
|
|
|
|
|
|
|
|
pd, err := packages.GetPackageDescriptor(db.DefaultContext, pvs[0])
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.NotNil(t, pd.SemVer)
|
|
|
|
assert.IsType(t, &cargo_module.Metadata{}, pd.Metadata)
|
|
|
|
assert.Equal(t, packageName, pd.Package.Name)
|
|
|
|
assert.Equal(t, packageVersion, pd.Version.Version)
|
|
|
|
|
|
|
|
pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pvs[0].ID)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Len(t, pfs, 1)
|
|
|
|
assert.Equal(t, fmt.Sprintf("%s-%s.crate", packageName, packageVersion), pfs[0].Name)
|
|
|
|
assert.True(t, pfs[0].IsLead)
|
|
|
|
|
|
|
|
pb, err := packages.GetBlobByID(db.DefaultContext, pfs[0].BlobID)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, 4, pb.Size)
|
|
|
|
|
|
|
|
req = NewRequestWithBody(t, "PUT", url+"/new", createPackage(packageName, packageVersion)).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
MakeRequest(t, req, http.StatusConflict)
|
|
|
|
|
|
|
|
t.Run("Index", func(t *testing.T) {
|
|
|
|
t.Run("Git", func(t *testing.T) {
|
|
|
|
t.Run("Entry", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
content := readGitContent(t, cargo_service.BuildPackagePath(packageName))
|
|
|
|
|
|
|
|
var entry cargo_service.IndexVersionEntry
|
|
|
|
err := json.Unmarshal([]byte(content), &entry)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
assert.Equal(t, packageName, entry.Name)
|
|
|
|
assert.Equal(t, packageVersion, entry.Version)
|
|
|
|
assert.Equal(t, pb.HashSHA256, entry.FileChecksum)
|
|
|
|
assert.False(t, entry.Yanked)
|
|
|
|
assert.Len(t, entry.Dependencies, 1)
|
|
|
|
dep := entry.Dependencies[0]
|
|
|
|
assert.Equal(t, "dep", dep.Name)
|
|
|
|
assert.Equal(t, "1.0", dep.Req)
|
|
|
|
assert.Equal(t, "normal", dep.Kind)
|
|
|
|
assert.True(t, dep.DefaultFeatures)
|
|
|
|
assert.Empty(t, dep.Features)
|
|
|
|
assert.False(t, dep.Optional)
|
|
|
|
assert.Nil(t, dep.Target)
|
|
|
|
assert.NotNil(t, dep.Registry)
|
|
|
|
assert.Equal(t, "https://gitea.io/user/_cargo-index", *dep.Registry)
|
|
|
|
assert.Nil(t, dep.Package)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Rebuild", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
err := cargo_service.RebuildIndex(db.DefaultContext, user, user)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
_ = readGitContent(t, cargo_service.BuildPackagePath(packageName))
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("HTTP", func(t *testing.T) {
|
|
|
|
t.Run("Entry", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
req := NewRequest(t, "GET", root+"/"+cargo_service.BuildPackagePath(packageName))
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var entry cargo_service.IndexVersionEntry
|
|
|
|
err := json.Unmarshal(resp.Body.Bytes(), &entry)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
assert.Equal(t, packageName, entry.Name)
|
|
|
|
assert.Equal(t, packageVersion, entry.Version)
|
|
|
|
assert.Equal(t, pb.HashSHA256, entry.FileChecksum)
|
|
|
|
assert.False(t, entry.Yanked)
|
|
|
|
assert.Len(t, entry.Dependencies, 1)
|
|
|
|
dep := entry.Dependencies[0]
|
|
|
|
assert.Equal(t, "dep", dep.Name)
|
|
|
|
assert.Equal(t, "1.0", dep.Req)
|
|
|
|
assert.Equal(t, "normal", dep.Kind)
|
|
|
|
assert.True(t, dep.DefaultFeatures)
|
|
|
|
assert.Empty(t, dep.Features)
|
|
|
|
assert.False(t, dep.Optional)
|
|
|
|
assert.Nil(t, dep.Target)
|
|
|
|
assert.NotNil(t, dep.Registry)
|
|
|
|
assert.Equal(t, "https://gitea.io/user/_cargo-index", *dep.Registry)
|
|
|
|
assert.Nil(t, dep.Package)
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Download", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
pv, err := packages.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages.TypeCargo, packageName, packageVersion)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, 0, pv.DownloadCount)
|
|
|
|
|
|
|
|
pfs, err := packages.GetFilesByVersionID(db.DefaultContext, pv.ID)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.Len(t, pfs, 1)
|
|
|
|
|
|
|
|
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/%s/download", url, neturl.PathEscape(packageName), neturl.PathEscape(pv.Version))).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
assert.Equal(t, "test", resp.Body.String())
|
|
|
|
|
|
|
|
pv, err = packages.GetVersionByNameAndVersion(db.DefaultContext, user.ID, packages.TypeCargo, packageName, packageVersion)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
assert.EqualValues(t, 1, pv.DownloadCount)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Search", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
cases := []struct {
|
|
|
|
Query string
|
|
|
|
Page int
|
|
|
|
PerPage int
|
|
|
|
ExpectedTotal int64
|
|
|
|
ExpectedResults int
|
|
|
|
}{
|
|
|
|
{"", 0, 0, 1, 1},
|
|
|
|
{"", 1, 10, 1, 1},
|
|
|
|
{"cargo", 1, 0, 1, 1},
|
|
|
|
{"cargo", 1, 10, 1, 1},
|
|
|
|
{"cargo", 2, 10, 1, 0},
|
|
|
|
{"test", 0, 10, 0, 0},
|
|
|
|
}
|
|
|
|
|
|
|
|
for i, c := range cases {
|
|
|
|
req := NewRequest(t, "GET", fmt.Sprintf("%s?q=%s&page=%d&per_page=%d", url, c.Query, c.Page, c.PerPage)).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var result cargo_router.SearchResult
|
|
|
|
DecodeJSON(t, resp, &result)
|
|
|
|
|
|
|
|
assert.Equal(t, c.ExpectedTotal, result.Meta.Total, "case %d: unexpected total hits", i)
|
|
|
|
assert.Len(t, result.Crates, c.ExpectedResults, "case %d: unexpected result count", i)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Yank", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
req := NewRequest(t, "DELETE", fmt.Sprintf("%s/%s/%s/yank", url, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion))).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var status cargo_router.StatusResponse
|
|
|
|
DecodeJSON(t, resp, &status)
|
|
|
|
assert.True(t, status.OK)
|
|
|
|
|
|
|
|
content := readGitContent(t, cargo_service.BuildPackagePath(packageName))
|
|
|
|
|
|
|
|
var entry cargo_service.IndexVersionEntry
|
|
|
|
err := json.Unmarshal([]byte(content), &entry)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
assert.True(t, entry.Yanked)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("Unyank", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
req := NewRequest(t, "PUT", fmt.Sprintf("%s/%s/%s/unyank", url, neturl.PathEscape(packageName), neturl.PathEscape(packageVersion))).
|
|
|
|
AddBasicAuth(user.Name)
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var status cargo_router.StatusResponse
|
|
|
|
DecodeJSON(t, resp, &status)
|
|
|
|
assert.True(t, status.OK)
|
|
|
|
|
|
|
|
content := readGitContent(t, cargo_service.BuildPackagePath(packageName))
|
|
|
|
|
|
|
|
var entry cargo_service.IndexVersionEntry
|
|
|
|
err := json.Unmarshal([]byte(content), &entry)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
assert.False(t, entry.Yanked)
|
|
|
|
})
|
|
|
|
|
|
|
|
t.Run("ListOwners", func(t *testing.T) {
|
|
|
|
defer tests.PrintCurrentTest(t)()
|
|
|
|
|
|
|
|
req := NewRequest(t, "GET", fmt.Sprintf("%s/%s/owners", url, neturl.PathEscape(packageName)))
|
|
|
|
resp := MakeRequest(t, req, http.StatusOK)
|
|
|
|
|
|
|
|
var owners cargo_router.Owners
|
|
|
|
DecodeJSON(t, resp, &owners)
|
|
|
|
|
|
|
|
assert.Len(t, owners.Users, 1)
|
|
|
|
assert.Equal(t, user.ID, owners.Users[0].ID)
|
|
|
|
assert.Equal(t, user.Name, owners.Users[0].Login)
|
|
|
|
assert.Equal(t, user.DisplayName(), owners.Users[0].Name)
|
|
|
|
})
|
|
|
|
}
|