summaryrefslogtreecommitdiffstats
path: root/services/attachment
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2021-09-08 23:19:30 +0800
committerGitHub <noreply@github.com>2021-09-08 17:19:30 +0200
commitddc709ff7f94bd627ac05209a16ea5a5e24b7413 (patch)
tree1420d827e00769c1a8330c6b1a80e7cbbc343332 /services/attachment
parentf55cd033ed8dbee04e90faede5cca2dcf697e102 (diff)
downloadgitea-ddc709ff7f94bd627ac05209a16ea5a5e24b7413.tar.gz
gitea-ddc709ff7f94bd627ac05209a16ea5a5e24b7413.zip
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>
Diffstat (limited to 'services/attachment')
-rw-r--r--services/attachment/attachment.go57
-rw-r--r--services/attachment/attachment_test.go42
2 files changed, 99 insertions, 0 deletions
diff --git a/services/attachment/attachment.go b/services/attachment/attachment.go
new file mode 100644
index 0000000000..4c356cd079
--- /dev/null
+++ b/services/attachment/attachment.go
@@ -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))
+}
diff --git a/services/attachment/attachment_test.go b/services/attachment/attachment_test.go
new file mode 100644
index 0000000000..c11204b221
--- /dev/null
+++ b/services/attachment/attachment_test.go
@@ -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)
+}