ziggi/mstore
1
0
Fork 0
Code Pull Requests Actions Packages Projects Releases Wiki Activity

added beta file locker; updates tests

Browse Source
This commit is contained in:
Олег Бородин
2026-02-25 16:12:25 +02:00
parent d6d2721c88
commit 3cf01ae30b
5 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/operator/file.go
+28 -14
View File
@@ -51,12 +51,12 @@ func cleanFilepath(filename string) (string, error) {
return filepath.Clean(filename), nil
}
func (oper *Operator) FileInfo(ctx context.Context, operatorID string, param *FileInfoParams) (int, *FileInfoResult, error) {
func (oper *Operator) FileInfo(ctx context.Context, operatorID string, params *FileInfoParams) (int, *FileInfoResult, error) {
var err error
code := http.StatusOK
res := &FileInfoResult{}
xfilepath, err := cleanFilepath(param.Filepath)
xfilepath, err := cleanFilepath(params.Filepath)
if err != nil {
code := http.StatusInternalServerError
return code, res, err
@@ -65,6 +65,10 @@ func (oper *Operator) FileInfo(ctx context.Context, operatorID string, param *Fi
filename := path.Base(xfilepath)
collection := path.Dir(xfilepath)
resName := params.Filepath
oper.iLock.WaitAndLock(resName)
defer oper.iLock.Done(resName)
exist, fileDescr, err := oper.mdb.GetFileByCollectionName(ctx, collection, filename)
if err != nil {
code := http.StatusInternalServerError
@@ -101,27 +105,31 @@ type PutFileResult struct{}
const defaultContentType = "application/octet-stream"
// TODO: checking catalog and file names conflict
func (oper *Operator) PutFile(ctx context.Context, operatorID string, param *PutFileParams) (int, *PutFileResult, error) {
func (oper *Operator) PutFile(ctx context.Context, operatorID string, params *PutFileParams) (int, *PutFileResult, error) {
var err error
res := &PutFileResult{}
if param.ContentSize == "" {
if params.ContentSize == "" {
code := http.StatusLengthRequired
err = fmt.Errorf("Required Content-Size header is empty")
return code, res, err
}
size, err := strconv.ParseInt(param.ContentSize, 10, 64)
size, err := strconv.ParseInt(params.ContentSize, 10, 64)
if err != nil {
code := http.StatusLengthRequired
return code, res, err
}
contentType := param.ContentType
contentType := params.ContentType
if contentType == "" {
contentType = defaultContentType
}
resName := params.Filepath
oper.iLock.WaitAndLock(resName)
defer oper.iLock.Done(resName)
// TODO: convert file path to a unified and secure state
xfilepath, err := cleanFilepath(param.Filepath)
xfilepath, err := cleanFilepath(params.Filepath)
if err != nil {
code := http.StatusInternalServerError
return code, res, err
@@ -129,7 +137,7 @@ func (oper *Operator) PutFile(ctx context.Context, operatorID string, param *Put
filename := path.Base(xfilepath)
collection := path.Dir(xfilepath)
tmpname, size, checksum, err := oper.store.WriteTempFile(param.Source)
tmpname, size, checksum, err := oper.store.WriteTempFile(params.Source)
if err != nil {
code := http.StatusInternalServerError
return code, res, err
@@ -198,13 +206,11 @@ type GetFileResult struct {
ContentUpdatedBy string
}
func (oper *Operator) GetFile(ctx context.Context, operatorID string, param *GetFileParams) (int, *GetFileResult, error) {
func (oper *Operator) GetFile(ctx context.Context, operatorID string, params *GetFileParams) (int, *GetFileResult, error) {
var err error
res := &GetFileResult{}
// TODO: convert file path to a unified and secure state
xfilepath, err := cleanFilepath(param.Filepath)
xfilepath, err := cleanFilepath(params.Filepath)
if err != nil {
code := http.StatusInternalServerError
return code, res, err
@@ -212,6 +218,10 @@ func (oper *Operator) GetFile(ctx context.Context, operatorID string, param *Get
filename := path.Base(xfilepath)
collection := path.Dir(xfilepath)
resName := params.Filepath
oper.iLock.WaitAndLock(resName)
defer oper.iLock.Done(resName)
descrExists, fileDescr, err := oper.mdb.GetFileByCollectionName(ctx, collection, filename)
if err != nil {
code := http.StatusInternalServerError
@@ -247,12 +257,12 @@ type DeleteFileParams struct {
}
type DeleteFileResult struct{}
func (oper *Operator) DeleteFile(ctx context.Context, operatorID string, param *DeleteFileParams) (int, *DeleteFileResult, error) {
func (oper *Operator) DeleteFile(ctx context.Context, operatorID string, params *DeleteFileParams) (int, *DeleteFileResult, error) {
var err error
res := &DeleteFileResult{}
code := http.StatusOK
xfilepath, err := cleanFilepath(param.Filepath)
xfilepath, err := cleanFilepath(params.Filepath)
if err != nil {
code := http.StatusInternalServerError
return code, res, err
@@ -260,6 +270,10 @@ func (oper *Operator) DeleteFile(ctx context.Context, operatorID string, param *
filename := path.Base(xfilepath)
collection := path.Dir(xfilepath)
resName := params.Filepath
oper.iLock.WaitAndLock(resName)
defer oper.iLock.Done(resName)
descrExists, _, err := oper.mdb.GetFileByCollectionName(ctx, collection, filename)
if err != nil {
code = http.StatusInternalServerError
app/operator/operator.go
+2
View File
@@ -26,6 +26,7 @@ type Operator struct {
store *storage.Storage
logg *logger.Logger
iLock *locker.Locker
fLock *locker.Locker
}
func NewOperator(params *OperatorParams) (*Operator, error) {
@@ -35,6 +36,7 @@ func NewOperator(params *OperatorParams) (*Operator, error) {
store: params.Store,
}
oper.iLock = locker.NewLocker()
oper.fLock = locker.NewLocker()
oper.logg = logger.NewLoggerWithSubject("operator")
return oper, err
}