Add repo_id for attachment (#16958)
When create a new issue or comment and paste/upload an attachment/image, it will not assign an issue id before submit. So if user give up the creating, the attachments will lost key feature and become dirty content. We don't know if we need to delete the attachment even if the repository deleted. This PR add a repo_id in attachment table so that even if a new upload attachment with no issue_id or release_id but should have repo_id. When deleting a repository, they could also be deleted. Co-authored-by: 6543 <6543@obermui.de>tokarchuk/v1.17
Lunny Xiao
3 years ago
committed by
GitHub
parent
f55cd033ed
commit
ddc709ff7f
@ -0,0 +1,33 @@ |
||||
// 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 migrations |
||||
|
||||
import ( |
||||
"xorm.io/xorm" |
||||
) |
||||
|
||||
func addRepoIDForAttachment(x *xorm.Engine) error { |
||||
type Attachment struct { |
||||
ID int64 `xorm:"pk autoincr"` |
||||
UUID string `xorm:"uuid UNIQUE"` |
||||
RepoID int64 `xorm:"INDEX"` // this should not be zero
|
||||
IssueID int64 `xorm:"INDEX"` // maybe zero when creating
|
||||
ReleaseID int64 `xorm:"INDEX"` // maybe zero when creating
|
||||
UploaderID int64 `xorm:"INDEX DEFAULT 0"` |
||||
} |
||||
if err := x.Sync2(new(Attachment)); err != nil { |
||||
return err |
||||
} |
||||
|
||||
if _, err := x.Exec("UPDATE `attachment` set repo_id = (SELECT repo_id FROM `issue` WHERE `issue`.id = `attachment`.issue_id) WHERE `attachment`.issue_id > 0"); err != nil { |
||||
return err |
||||
} |
||||
|
||||
if _, err := x.Exec("UPDATE `attachment` set repo_id = (SELECT repo_id FROM `release` WHERE `release`.id = `attachment`.release_id) WHERE `attachment`.release_id > 0"); err != nil { |
||||
return err |
||||
} |
||||
|
||||
return nil |
||||
} |
||||
@ -0,0 +1,71 @@ |
||||
// 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 migrations |
||||
|
||||
import ( |
||||
"testing" |
||||
|
||||
"github.com/stretchr/testify/assert" |
||||
) |
||||
|
||||
func Test_addRepoIDForAttachment(t *testing.T) { |
||||
type Attachment struct { |
||||
ID int64 `xorm:"pk autoincr"` |
||||
UUID string `xorm:"uuid UNIQUE"` |
||||
RepoID int64 `xorm:"INDEX"` // this should not be zero
|
||||
IssueID int64 `xorm:"INDEX"` // maybe zero when creating
|
||||
ReleaseID int64 `xorm:"INDEX"` // maybe zero when creating
|
||||
UploaderID int64 `xorm:"INDEX DEFAULT 0"` |
||||
} |
||||
|
||||
type Issue struct { |
||||
ID int64 |
||||
RepoID int64 |
||||
} |
||||
|
||||
type Release struct { |
||||
ID int64 |
||||
RepoID int64 |
||||
} |
||||
|
||||
// Prepare and load the testing database
|
||||
x, deferrable := prepareTestEnv(t, 0, new(Attachment), new(Issue), new(Release)) |
||||
defer deferrable() |
||||
if x == nil || t.Failed() { |
||||
return |
||||
} |
||||
|
||||
// Run the migration
|
||||
if err := addRepoIDForAttachment(x); err != nil { |
||||
assert.NoError(t, err) |
||||
return |
||||
} |
||||
|
||||
var issueAttachments []*Attachment |
||||
err := x.Where("issue_id > 0").Find(&issueAttachments) |
||||
assert.NoError(t, err) |
||||
for _, attach := range issueAttachments { |
||||
assert.Greater(t, attach.RepoID, 0) |
||||
assert.Greater(t, attach.IssueID, 0) |
||||
var issue Issue |
||||
has, err := x.ID(attach.IssueID).Get(&issue) |
||||
assert.NoError(t, err) |
||||
assert.True(t, has) |
||||
assert.EqualValues(t, attach.RepoID, issue.RepoID) |
||||
} |
||||
|
||||
var releaseAttachments []*Attachment |
||||
err = x.Where("release_id > 0").Find(&releaseAttachments) |
||||
assert.NoError(t, err) |
||||
for _, attach := range releaseAttachments { |
||||
assert.Greater(t, attach.RepoID, 0) |
||||
assert.Greater(t, attach.IssueID, 0) |
||||
var release Release |
||||
has, err := x.ID(attach.ReleaseID).Get(&release) |
||||
assert.NoError(t, err) |
||||
assert.True(t, has) |
||||
assert.EqualValues(t, attach.RepoID, release.RepoID) |
||||
} |
||||
} |
||||
@ -0,0 +1,57 @@ |
||||
// 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 attachment |
||||
|
||||
import ( |
||||
"bytes" |
||||
"fmt" |
||||
"io" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
"code.gitea.io/gitea/modules/storage" |
||||
"code.gitea.io/gitea/modules/upload" |
||||
|
||||
"github.com/google/uuid" |
||||
) |
||||
|
||||
// NewAttachment creates a new attachment object, but do not verify.
|
||||
func NewAttachment(attach *models.Attachment, file io.Reader) (*models.Attachment, error) { |
||||
if attach.RepoID == 0 { |
||||
return nil, fmt.Errorf("attachment %s should belong to a repository", attach.Name) |
||||
} |
||||
|
||||
err := models.WithTx(func(ctx models.DBContext) error { |
||||
attach.UUID = uuid.New().String() |
||||
size, err := storage.Attachments.Save(attach.RelativePath(), file, -1) |
||||
if err != nil { |
||||
return fmt.Errorf("Create: %v", err) |
||||
} |
||||
attach.Size = size |
||||
|
||||
return models.Insert(ctx, attach) |
||||
}) |
||||
|
||||
return attach, err |
||||
} |
||||
|
||||
// UploadAttachment upload new attachment into storage and update database
|
||||
func UploadAttachment(file io.Reader, actorID, repoID, releaseID int64, fileName string, allowedTypes string) (*models.Attachment, error) { |
||||
buf := make([]byte, 1024) |
||||
n, _ := file.Read(buf) |
||||
if n > 0 { |
||||
buf = buf[:n] |
||||
} |
||||
|
||||
if err := upload.Verify(buf, fileName, allowedTypes); err != nil { |
||||
return nil, err |
||||
} |
||||
|
||||
return NewAttachment(&models.Attachment{ |
||||
RepoID: repoID, |
||||
UploaderID: actorID, |
||||
ReleaseID: releaseID, |
||||
Name: fileName, |
||||
}, io.MultiReader(bytes.NewReader(buf), file)) |
||||
} |
||||
@ -0,0 +1,42 @@ |
||||
// 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 attachment |
||||
|
||||
import ( |
||||
"os" |
||||
"path/filepath" |
||||
"testing" |
||||
|
||||
"code.gitea.io/gitea/models" |
||||
|
||||
"github.com/stretchr/testify/assert" |
||||
) |
||||
|
||||
func TestMain(m *testing.M) { |
||||
models.MainTest(m, filepath.Join("..", "..")) |
||||
} |
||||
|
||||
func TestUploadAttachment(t *testing.T) { |
||||
assert.NoError(t, models.PrepareTestDatabase()) |
||||
|
||||
user := models.AssertExistsAndLoadBean(t, &models.User{ID: 1}).(*models.User) |
||||
|
||||
fPath := "./attachment_test.go" |
||||
f, err := os.Open(fPath) |
||||
assert.NoError(t, err) |
||||
defer f.Close() |
||||
|
||||
attach, err := NewAttachment(&models.Attachment{ |
||||
RepoID: 1, |
||||
UploaderID: user.ID, |
||||
Name: filepath.Base(fPath), |
||||
}, f) |
||||
assert.NoError(t, err) |
||||
|
||||
attachment, err := models.GetAttachmentByUUID(attach.UUID) |
||||
assert.NoError(t, err) |
||||
assert.EqualValues(t, user.ID, attachment.UploaderID) |
||||
assert.Equal(t, int64(0), attachment.DownloadCount) |
||||
} |
||||
Loading…
Reference in new issue