Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 39 additions & 2 deletions server/e2e/proto_project_export_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package e2e

import (
"archive/zip"
"bytes"
"context"
"encoding/json"
"testing"

pb "github.com/reearth/reearth/server/internal/adapter/internalapi/schemas/internalapi/v1"
Expand Down Expand Up @@ -88,7 +91,8 @@ func TestInternalAPI_export(t *testing.T) {

resp.Header("Content-Type").Contains("application/zip")
body := resp.Body().Raw()
assert.Greater(t, len(body), 0)
assert.Greater(t, len(body), 4)
assert.Equal(t, "PK\x03\x04", string(body[:4])) // check zip file hedder

// private => Error!
exp, err = client.ExportProject(ctx, &pb.ExportProjectRequest{
Expand Down Expand Up @@ -131,7 +135,40 @@ func TestInternalAPI_export(t *testing.T) {

resp.Header("Content-Type").Contains("application/zip")
body := resp.Body().Raw()
assert.Greater(t, len(body), 0)
assert.Greater(t, len(body), 4)
assert.Equal(t, "PK\x03\x04", string(body[:4])) // zip header

data := []byte(body)

r, err := zip.NewReader(bytes.NewReader(data), int64(len(data)))
require.NoError(t, err)

var pjBytes []byte
for _, f := range r.File {
if f.Name == "project.json" {
rc, err := f.Open()
require.NoError(t, err)

var buf bytes.Buffer
_, err = buf.ReadFrom(rc)
rc.Close()
require.NoError(t, err)

pjBytes = buf.Bytes()
break
}
}
require.NotNil(t, pjBytes, "project.json should exist in the zip")
assert.True(t, json.Valid(pjBytes), "project.json must be valid JSON")

var doc map[string]any
require.NoError(t, json.Unmarshal(pjBytes, &doc))

_, ok := doc["project"].(map[string]any)
assert.True(t, ok, "`project` must exist and be an object")

_, ok = doc["scene"].(map[string]any)
assert.True(t, ok, "`scene` must exist and be an object")

})
}
5 changes: 3 additions & 2 deletions server/internal/app/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ func initReposAndGateways(ctx context.Context, conf *config.Config, debug bool)
func initFile(ctx context.Context, conf *config.Config) (fileRepo gateway.File) {
var err error
if conf.GCS.IsConfigured() {
log.Infofc(ctx, "[Storage] GCS storage is used: %s", conf.GCS.BucketName)
isFake := conf.GCS.IsFake
fileRepo, err = gcs.NewFile(isFake, conf.GCS.BucketName, conf.AssetBaseURL, conf.GCS.PublicationCacheControl)
if err != nil {
Expand All @@ -177,15 +178,15 @@ func initFile(ctx context.Context, conf *config.Config) (fileRepo gateway.File)
}

if conf.S3.IsConfigured() {
log.Infofc(ctx, "file: S3 storage is used: %s\n", conf.S3.BucketName)
log.Infofc(ctx, "[Storage] S3 storage is used: %s", conf.S3.BucketName)
fileRepo, err = s3.NewS3(ctx, conf.S3.BucketName, conf.AssetBaseURL, conf.S3.PublicationCacheControl)
if err != nil {
log.Warnf("file: failed to init S3 storage: %s\n", err.Error())
}
return
}

log.Infof("file: local storage is used")
log.Infof("[Storage] local afero storage is used")
afs := afero.NewBasePathFs(afero.NewOsFs(), "tmp/afero")
fileRepo, err = fs.NewFile(afs, conf.AssetBaseURL)
if err != nil {
Expand Down
38 changes: 36 additions & 2 deletions server/internal/infrastructure/gcs/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -427,17 +427,51 @@ func (f *fileRepo) read(ctx context.Context, filename string) (io.ReadCloser, er
return resp.Body, nil
}

reader, err := bucket.Object(filename).NewReader(ctx)
obj := bucket.Object(filename)

attrs, err := obj.Attrs(ctx)
if err != nil {
if errors.Is(err, storage.ErrObjectNotExist) {
return nil, rerror.ErrNotFound
}
log.Errorfc(ctx, "gcs: attrs err: %+v\n", err)
return nil, rerror.ErrInternalByWithContext(ctx, err)
}

reader, err := obj.Generation(attrs.Generation).NewReader(ctx)
if err != nil {
if errors.Is(err, storage.ErrObjectNotExist) {
if OK := f.exists(ctx, bucket, filename); OK {
return nil, errors.New("no read permission")
}
return nil, rerror.ErrNotFound
}
return nil, visualizer.ErrorWithCallerLogging(ctx, "gcs: read object err", rerror.ErrInternalByWithContext(ctx, err))
log.Errorfc(ctx, "gcs: generation read err: %+v\n", err)
return nil, rerror.ErrInternalByWithContext(ctx, err)
}

return reader, nil
}

func (f *fileRepo) exists(ctx context.Context, bucket *storage.BucketHandle, filename string) bool {
fmt.Printf("Checking existence: %s\n", filename)

obj := bucket.Object(filename)
attrs, err := obj.Attrs(ctx)
if err != nil {
if errors.Is(err, storage.ErrObjectNotExist) {
fmt.Printf("File does NOT exist: %s\n", filename)
return false
}
fmt.Printf("Error checking existence: %+v\n", err)
return false
}

fmt.Printf("OK! File exist: %s , Updated: %v (Size: %d bytes, Generation: %d)\n",
filename, attrs.Updated, attrs.Size, attrs.Generation)
return true
}

func (f *fileRepo) upload(ctx context.Context, filename string, content io.Reader) (int64, error) {
if filename == "" {
return 0, gateway.ErrInvalidFile
Expand Down
4 changes: 2 additions & 2 deletions server/internal/usecase/interactor/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -269,10 +269,10 @@ func (d ProjectDeleter) Delete(ctx context.Context, prj *project.Project, force
}

func IsCurrentHostAssets(ctx context.Context, u string) bool {
if strings.HasPrefix(u, "assets/") || strings.HasPrefix(u, "/assets") {
if strings.HasPrefix(u, "assets/") && strings.HasPrefix(u, adapter.CurrentHost(ctx)) {
return true
}
return strings.HasPrefix(u, adapter.CurrentHost(ctx))
return false
}

func ReplaceToCurrentHost(ctx context.Context, urlString string) string {
Expand Down