-
Notifications
You must be signed in to change notification settings - Fork 113
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Extract node lock-handling code into separate file, start writing tests
- Loading branch information
Showing
3 changed files
with
318 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,200 @@ | ||
// Copyright 2018-2021 CERN | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
// | ||
// In applying this license, CERN does not waive the privileges and immunities | ||
// granted to it by virtue of its status as an Intergovernmental Organization | ||
// or submit itself to any jurisdiction. | ||
|
||
package node | ||
|
||
import ( | ||
"context" | ||
"encoding/json" | ||
"os" | ||
|
||
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" | ||
types "github.com/cs3org/go-cs3apis/cs3/types/v1beta1" | ||
"github.com/cs3org/reva/pkg/appctx" | ||
ctxpkg "github.com/cs3org/reva/pkg/ctx" | ||
"github.com/cs3org/reva/pkg/errtypes" | ||
"github.com/cs3org/reva/pkg/utils" | ||
"github.com/pkg/errors" | ||
) | ||
|
||
// SetLock sets a lock on the node | ||
func (n *Node) SetLock(ctx context.Context, lock *provider.Lock) error { | ||
// check existing lock | ||
if l, _ := n.ReadLock(ctx); l != nil { | ||
lockID, _ := ctxpkg.ContextGetLockID(ctx) | ||
if l.LockId != lockID { | ||
return errtypes.Locked(l.LockId) | ||
} | ||
} | ||
|
||
// O_EXCL to make open fail when the file already exists | ||
f, err := os.OpenFile(n.LockFilePath(), os.O_EXCL|os.O_CREATE|os.O_WRONLY, 0600) | ||
if err != nil { | ||
return errors.Wrap(err, "Decomposedfs: could not create lock file") | ||
} | ||
defer f.Close() | ||
|
||
if err := json.NewEncoder(f).Encode(lock); err != nil { | ||
return errors.Wrap(err, "Decomposedfs: could not write lock file") | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// ReadLock reads the lock id for a node | ||
func (n Node) ReadLock(ctx context.Context) (*provider.Lock, error) { | ||
f, err := os.Open(n.LockFilePath()) | ||
if err != nil { | ||
if os.IsNotExist(err) { | ||
return nil, errtypes.NotFound("no lock found") | ||
} | ||
return nil, errors.Wrap(err, "Decomposedfs: could not open lock file") | ||
} | ||
defer f.Close() | ||
|
||
lock := &provider.Lock{} | ||
if err := json.NewDecoder(f).Decode(lock); err != nil { | ||
appctx.GetLogger(ctx).Error().Err(err).Msg("Decomposedfs: could not decode lock file, ignoring") | ||
return nil, errors.Wrap(err, "Decomposedfs: could not read lock file") | ||
} | ||
return lock, nil | ||
} | ||
|
||
// RefreshLock refreshes the node's lock | ||
func (n *Node) RefreshLock(ctx context.Context, lock *provider.Lock) error { | ||
f, err := os.OpenFile(n.LockFilePath(), os.O_RDWR, os.ModeExclusive) | ||
switch { | ||
case os.IsNotExist(err): | ||
return errtypes.PreconditionFailed("lock does not exist") | ||
case err != nil: | ||
return errors.Wrap(err, "Decomposedfs: could not open lock file") | ||
} | ||
defer f.Close() | ||
|
||
oldLock := &provider.Lock{} | ||
if err := json.NewDecoder(f).Decode(oldLock); err != nil { | ||
return errors.Wrap(err, "Decomposedfs: could not read lock") | ||
} | ||
|
||
// check lock | ||
if oldLock.LockId != lock.LockId { | ||
return errtypes.PreconditionFailed("mismatching lock") | ||
} | ||
|
||
u := ctxpkg.ContextMustGetUser(ctx) | ||
if !utils.UserEqual(oldLock.User, u.Id) { | ||
return errtypes.PermissionDenied("cannot refresh lock of another holder") | ||
} | ||
|
||
if !utils.UserEqual(oldLock.User, lock.GetUser()) { | ||
return errtypes.PermissionDenied("cannot change holder when refreshing a lock") | ||
} | ||
|
||
if err := json.NewEncoder(f).Encode(lock); err != nil { | ||
return errors.Wrap(err, "Decomposedfs: could not write lock file") | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// Unlock unlocks the node | ||
func (n *Node) Unlock(ctx context.Context, lock *provider.Lock) error { | ||
f, err := os.OpenFile(n.LockFilePath(), os.O_RDONLY, os.ModeExclusive) | ||
switch { | ||
case os.IsNotExist(err): | ||
return errtypes.PreconditionFailed("lock does not exist") | ||
case err != nil: | ||
return errors.Wrap(err, "Decomposedfs: could not open lock file") | ||
} | ||
|
||
oldLock := &provider.Lock{} | ||
if err := json.NewDecoder(f).Decode(oldLock); err != nil { | ||
_ = f.Close() | ||
return errors.Wrap(err, "Decomposedfs: could not read lock") | ||
} | ||
|
||
// check lock | ||
if lock == nil || (oldLock.LockId != lock.LockId) { | ||
return errtypes.Locked(oldLock.LockId) | ||
} | ||
|
||
u := ctxpkg.ContextMustGetUser(ctx) | ||
if !utils.UserEqual(oldLock.User, u.Id) { | ||
_ = f.Close() | ||
return errtypes.PermissionDenied("mismatching holder") | ||
} | ||
_ = f.Close() | ||
|
||
return os.Remove(f.Name()) | ||
} | ||
|
||
// CheckLock compares the context lock with the node lock | ||
func (n *Node) CheckLock(ctx context.Context) error { | ||
lockID, _ := ctxpkg.ContextGetLockID(ctx) | ||
lock, _ := n.ReadLock(ctx) | ||
if lock != nil { | ||
switch lockID { | ||
case "": | ||
return errtypes.Locked(lock.LockId) // no lockid in request | ||
case lock.LockId: | ||
return nil // ok | ||
default: | ||
return errtypes.PreconditionFailed("mismatching lock") | ||
} | ||
} | ||
if lockID != "" { | ||
return errtypes.PreconditionFailed("not locked") | ||
} | ||
return nil // ok | ||
} | ||
|
||
func readLocksIntoOpaque(ctx context.Context, lockPath string, ri *provider.ResourceInfo) { | ||
f, err := os.Open(lockPath) | ||
if err != nil { | ||
appctx.GetLogger(ctx).Error().Err(err).Msg("Decomposedfs: could not open lock file") | ||
return | ||
} | ||
defer f.Close() | ||
|
||
lock := &provider.Lock{} | ||
if err := json.NewDecoder(f).Decode(lock); err != nil { | ||
appctx.GetLogger(ctx).Error().Err(err).Msg("Decomposedfs: could not read lock file") | ||
} | ||
|
||
// reencode to ensure valid json | ||
var b []byte | ||
if b, err = json.Marshal(lock); err != nil { | ||
appctx.GetLogger(ctx).Error().Err(err).Msg("Decomposedfs: could not marshal locks") | ||
} | ||
if ri.Opaque == nil { | ||
ri.Opaque = &types.Opaque{ | ||
Map: map[string]*types.OpaqueEntry{}, | ||
} | ||
} | ||
ri.Opaque.Map["lock"] = &types.OpaqueEntry{ | ||
Decoder: "json", | ||
Value: b, | ||
} | ||
// TODO support advisory locks? | ||
} | ||
|
||
// TODO only exclusive locks for WOPI? or advisory locks? | ||
func (n *Node) hasLocks(ctx context.Context) bool { | ||
_, err := os.Stat(n.LockFilePath()) // FIXME better error checking | ||
return err == nil | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,118 @@ | ||
package node_test | ||
|
||
import ( | ||
"context" | ||
"os" | ||
|
||
"github.com/google/uuid" | ||
. "github.com/onsi/ginkgo" | ||
. "github.com/onsi/gomega" | ||
|
||
userpb "github.com/cs3org/go-cs3apis/cs3/identity/user/v1beta1" | ||
provider "github.com/cs3org/go-cs3apis/cs3/storage/provider/v1beta1" | ||
ctxpkg "github.com/cs3org/reva/pkg/ctx" | ||
"github.com/cs3org/reva/pkg/storage/utils/decomposedfs/node" | ||
helpers "github.com/cs3org/reva/pkg/storage/utils/decomposedfs/testhelpers" | ||
) | ||
|
||
var _ = Describe("Node locks", func() { | ||
var ( | ||
env *helpers.TestEnv | ||
|
||
lock *provider.Lock | ||
n *node.Node | ||
id string | ||
name string | ||
) | ||
|
||
BeforeEach(func() { | ||
var err error | ||
env, err = helpers.NewTestEnv() | ||
Expect(err).ToNot(HaveOccurred()) | ||
|
||
lock = &provider.Lock{ | ||
Type: provider.LockType_LOCK_TYPE_EXCL, | ||
User: env.Owner.Id, | ||
LockId: uuid.New().String(), | ||
} | ||
id = "fooId" | ||
name = "foo" | ||
n = node.New(id, "", name, 10, "", env.Owner.Id, env.Lookup) | ||
}) | ||
|
||
AfterEach(func() { | ||
if env != nil { | ||
env.Cleanup() | ||
} | ||
}) | ||
|
||
Describe("SetLock", func() { | ||
It("sets the lock", func() { | ||
_, err := os.Stat(n.LockFilePath()) | ||
Expect(err).To(HaveOccurred()) | ||
|
||
err = n.SetLock(env.Ctx, lock) | ||
Expect(err).ToNot(HaveOccurred()) | ||
|
||
_, err = os.Stat(n.LockFilePath()) | ||
Expect(err).ToNot(HaveOccurred()) | ||
}) | ||
}) | ||
|
||
Context("with an existing lock", func() { | ||
BeforeEach(func() { | ||
err := n.SetLock(env.Ctx, lock) | ||
Expect(err).ToNot(HaveOccurred()) | ||
}) | ||
|
||
Describe("Unlock", func() { | ||
It("refuses to unlock without having a lock", func() { | ||
err := n.Unlock(env.Ctx, nil) | ||
Expect(err.Error()).To(ContainSubstring(lock.LockId)) | ||
}) | ||
|
||
It("refuses to unlock without having the proper lock", func() { | ||
wrongLock := &provider.Lock{ | ||
Type: provider.LockType_LOCK_TYPE_EXCL, | ||
User: env.Owner.Id, | ||
LockId: uuid.New().String(), | ||
} | ||
err := n.Unlock(env.Ctx, wrongLock) | ||
Expect(err.Error()).To(ContainSubstring(lock.LockId)) | ||
}) | ||
|
||
It("refuses to unlock for others even if they have the lock", func() { | ||
otherUser := &userpb.User{ | ||
Id: &userpb.UserId{ | ||
Idp: "idp", | ||
OpaqueId: "foo", | ||
Type: userpb.UserType_USER_TYPE_PRIMARY, | ||
}, | ||
Username: "foo", | ||
} | ||
otherCtx := ctxpkg.ContextSetUser(context.Background(), otherUser) | ||
|
||
err := n.Unlock(otherCtx, lock) | ||
Expect(err).To(HaveOccurred()) | ||
Expect(err.Error()).To(ContainSubstring("mismatching")) | ||
}) | ||
|
||
It("unlocks when the owner uses the lock", func() { | ||
err := n.Unlock(env.Ctx, lock) | ||
Expect(err).ToNot(HaveOccurred()) | ||
|
||
_, err = os.Stat(n.LockFilePath()) | ||
Expect(err).To(HaveOccurred()) | ||
}) | ||
|
||
It("fails to unlock an unlocked node", func() { | ||
err := n.Unlock(env.Ctx, lock) | ||
Expect(err).ToNot(HaveOccurred()) | ||
|
||
err = n.Unlock(env.Ctx, lock) | ||
Expect(err).To(HaveOccurred()) | ||
Expect(err.Error()).To(ContainSubstring("lock does not exist")) | ||
}) | ||
}) | ||
}) | ||
}) |
Oops, something went wrong.