mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-01-04 02:31:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

[server] Pass along resource.Permissions and InheritedPermissions

Browse Source
This commit is contained in:
Abhishek Shroff
2024-09-16 10:30:00 +05:30
parent 92cfca8d4d
commit 5f8a64954b
3 changed files with 79 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/internal/command/appcmd/resource.go
View File

@@ -104,7 +104,7 @@ func setupResourceRmCommand() *cobra.Command {
func setupResourceLsCommand() *cobra.Command {
details := func(r core.Resource) string {
return fmt.Sprintf("%s %4d %s", r.ID().String(), r.Permission(), r.Name())
return fmt.Sprintf("%s %4d %s", r.ID().String(), r.UserPermission(), r.Name())
}
cmd := cobra.Command{
Use: "ls <path | uuid>",
@@ -152,7 +152,7 @@ func setupResourceLsCommand() *cobra.Command {
logrus.Info("Name: " + r.Name())
logrus.Info(" ID: " + r.ID().String())
logrus.Info("Perm: " + core.PermissionString(r.Permission()))
logrus.Info("Perm: " + core.PermissionString(r.UserPermission()))
// if specificPermissions != nil {
// logrus.Info()

111
server/internal/core/filesystem.go
View File

@@ -118,26 +118,28 @@ func (f filesystem) ResourceByID(id uuid.UUID) (Resource, error) {
delTime = &res.Deleted.Time
}
return resource{
id: res.ID,
permission: res.UserPermission,
parentID: res.Parent,
name: res.Name,
size: res.Size.Int64,
collection: res.Dir,
modTime: res.Modified.Time,
delTime: delTime,
sha256sum: res.Sha256sum.String,
id: res.ID,
userPermission: res.UserPermission,
parentID: res.Parent,
name: res.Name,
size: res.Size.Int64,
collection: res.Dir,
modTime: res.Modified.Time,
delTime: delTime,
sha256sum: res.Sha256sum.String,
permissions: res.Permissions,
inheritedPermissions: res.InheritedPermissions,
}, nil
}
func (f filesystem) OpenRead(r Resource, start, length int64) (io.ReadCloser, error) {
if r.Permission() < PermissionReadOnly {
if r.UserPermission() < PermissionReadOnly {
return nil, ErrInsufficientPermissions
}
return f.cs.OpenRead(r.ID(), start, length)
}
func (f filesystem) OpenWrite(r Resource) (io.WriteCloser, error) {
if r.Permission() < PermissionReadWrite {
if r.UserPermission() < PermissionReadWrite {
return nil, ErrInsufficientPermissions
}
return f.cs.OpenWrite(r.ID(), sha256.New, func(len int, sum string) error {
@@ -150,7 +152,7 @@ func (f filesystem) OpenWrite(r Resource) (io.WriteCloser, error) {
}
func (f filesystem) ReadDir(r Resource) ([]Resource, error) {
if r.Permission() < PermissionReadOnly {
if r.UserPermission() < PermissionReadOnly {
return nil, ErrInsufficientPermissions
}
if !r.IsDir() {
@@ -168,15 +170,16 @@ func (f filesystem) ReadDir(r Resource) ([]Resource, error) {
result := make([]Resource, len(children))
for i, c := range children {
result[i] = resource{
id: c.ID,
permission: 0, // not needed
parentID: c.Parent,
name: c.Name,
size: c.Size.Int64,
modTime: c.Modified.Time,
delTime: nil,
collection: c.Dir,
sha256sum: c.Sha256sum.String,
id: c.ID,
parentID: c.Parent,
name: c.Name,
size: c.Size.Int64,
modTime: c.Modified.Time,
delTime: nil,
collection: c.Dir,
sha256sum: c.Sha256sum.String,
userPermission: 0, // Not part of the query since it is never needed
permissions: c.Permissions,
}
}
return result, nil
@@ -186,7 +189,7 @@ func (f filesystem) CreateMemberResource(r Resource, id uuid.UUID, name string,
if !r.IsDir() {
return nil, ErrResourceNotCollection
}
if r.Permission() < PermissionReadWrite {
if r.UserPermission() < PermissionReadWrite {
return nil, ErrInsufficientPermissions
}
if id == uuid.Nil {
@@ -214,20 +217,20 @@ func (f filesystem) CreateMemberResource(r Resource, id uuid.UUID, name string,
return nil, err
}
return resource{
id: id,
parentID: result.Parent,
permission: r.Permission(),
name: result.Name,
size: 0,
modTime: result.Modified.Time,
delTime: nil,
collection: dir,
sha256sum: "",
id: id,
parentID: result.Parent,
userPermission: r.UserPermission(),
name: result.Name,
size: 0,
modTime: result.Modified.Time,
delTime: nil,
collection: dir,
sha256sum: "",
}, nil
}
func (f filesystem) DeleteRecursive(r Resource, hardDelete bool) (uuid.UUIDs, error) {
if r.Permission() < PermissionReadWrite {
if r.UserPermission() < PermissionReadWrite {
return nil, ErrInsufficientPermissions
}
// TODO: versioning
@@ -274,22 +277,22 @@ func (f filesystem) UpdateName(r Resource, name string) (Resource, error) {
if err != nil {
return nil, err
}
if parent.Permission() < PermissionReadWrite {
if parent.UserPermission() < PermissionReadWrite {
return nil, ErrInsufficientPermissions
}
if r, err := f.db.UpdateResourceName(f.ctx, db.UpdateResourceNameParams{ID: r.ID(), Name: name}); err != nil {
return nil, err
} else {
return resource{
id: r.ID,
parentID: r.Parent,
permission: 0, // TODO: set correctly
name: r.Name,
size: r.Size.Int64,
modTime: r.Modified.Time,
delTime: &r.Deleted.Time,
collection: r.Dir,
sha256sum: r.Sha256sum.String,
id: r.ID,
parentID: r.Parent,
userPermission: 0, // TODO: set correctly
name: r.Name,
size: r.Size.Int64,
modTime: r.Modified.Time,
delTime: &r.Deleted.Time,
collection: r.Dir,
sha256sum: r.Sha256sum.String,
}, nil
}
}
@@ -305,35 +308,35 @@ func (f filesystem) UpdateParent(r Resource, parent uuid.UUID) (Resource, error)
if err != nil {
return nil, err
}
if oldParent.Permission() < PermissionReadWrite {
if oldParent.UserPermission() < PermissionReadWrite {
return nil, ErrInsufficientPermissions
}
newParent, err := f.ResourceByID(parent)
if err != nil {
return nil, err
}
if newParent.Permission() < PermissionReadWrite {
if newParent.UserPermission() < PermissionReadWrite {
return nil, ErrInsufficientPermissions
}
if r, err := f.db.UpdateResourceParent(f.ctx, db.UpdateResourceParentParams{ID: r.ID(), Parent: parent}); err != nil {
return nil, err
} else {
return resource{
id: r.ID,
parentID: r.Parent,
permission: 0, // TODO: set correctly
name: r.Name,
size: r.Size.Int64,
modTime: r.Modified.Time,
delTime: &r.Deleted.Time,
collection: r.Dir,
sha256sum: r.Sha256sum.String,
id: r.ID,
parentID: r.Parent,
userPermission: 0, // TODO: set correctly
name: r.Name,
size: r.Size.Int64,
modTime: r.Modified.Time,
delTime: &r.Deleted.Time,
collection: r.Dir,
sha256sum: r.Sha256sum.String,
}, nil
}
}
func (f filesystem) UpdatePermissions(r Resource, userID int32, permission Permission) error {
if r.Permission() < PermissionReadWriteShare {
if r.UserPermission() < PermissionReadWriteShare {
return ErrInsufficientPermissions
}
if permission > PermissionReadWriteShare {

32
server/internal/core/resource.go
View File

@@ -13,30 +13,32 @@ type Resource interface {
ParentID() *uuid.UUID
Name() string
Size() int64
Permission() int32
ModTime() time.Time
DelTime() *time.Time
IsDir() bool
ETag() string
ContentType() string
UserPermission() int32
Permissions() string
InheritedPermissions() string
}
type resource struct {
id uuid.UUID
permission int32
parentID *uuid.UUID
name string
size int64
collection bool
modTime time.Time
delTime *time.Time
sha256sum string
id uuid.UUID
parentID *uuid.UUID
name string
size int64
collection bool
modTime time.Time
delTime *time.Time
sha256sum string
userPermission int32
permissions []byte
inheritedPermissions []byte
}
func (r resource) ID() uuid.UUID { return r.id }
func (r resource) Permission() int32 { return r.permission }
func (r resource) ParentID() *uuid.UUID { return r.parentID }
func (r resource) Name() string { return r.name }
@@ -63,3 +65,9 @@ func (r resource) ContentType() string {
}
return "application/octet-stream"
}
func (r resource) UserPermission() int32 { return r.userPermission }
func (r resource) Permissions() string { return string(r.permissions) }
func (r resource) InheritedPermissions() string { return string(r.inheritedPermissions) }