mirror/phylum
1
0
Fork 0
mirror of https://codeberg.org/shroff/phylum.git synced 2026-05-04 02:59:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix permissions in ResourceByPath and ResourceByID

Browse Source
This commit is contained in:
Abhishek Shroff
2024-08-06 18:00:46 +05:30
parent 8a2216e6b8
commit a084f22d91
3 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/internal/app/core/filesystem.go
+4 -3
View File
@@ -41,9 +41,10 @@ type filesystem struct {
func OpenFileSystem(db *db.DbHandler, ctx context.Context, cs storage.Storage, root Resource, user int32) (FileSystem, error) {
if root == nil {
if res, err := db.Queries().RootResource(ctx, user); err != nil {
if res, err := db.Queries().RootResource(ctx, user); err == nil {
root = resource{
id: rootUUID,
owner: res.Owner,
permission: res.Permission,
parentID: rootUUID,
name: res.Name,
@@ -83,7 +84,7 @@ func (f filesystem) ResourceByPath(path string) (Resource, error) {
segments = []string{}
}
res, err := f.db.Queries().ResourceByPath(f.ctx, sql.ResourceByPathParams{Root: f.root.ID(), Search: segments, UserID: f.user})
res, err := f.db.Queries().ResourceByPath(f.ctx, sql.ResourceByPathParams{Root: f.root.ID(), Permission: f.root.Permission(), Search: segments, UserID: f.user})
if err != nil {
return nil, fs.ErrNotExist
}
@@ -106,7 +107,7 @@ func (f filesystem) ResourceByPath(path string) (Resource, error) {
}
func (f filesystem) ResourceByID(id uuid.UUID) (Resource, error) {
res, err := f.db.Queries().ResourceByIdWithPermissions(f.ctx, sql.ResourceByIdWithPermissionsParams{Root: f.root.ID(), ResourceID: id, UserID: f.user})
res, err := f.db.Queries().ResourceByIdWithPermissions(f.ctx, sql.ResourceByIdWithPermissionsParams{Root: f.root.ID(), Permission: f.root.Permission(), ResourceID: id, UserID: f.user})
// TODO: check found
if err == pgx.ErrNoRows || !res.Found {
err = fs.ErrNotExist
server/internal/sql/permissions.sql.go
+11 -9
View File
@@ -105,15 +105,11 @@ WITH RECURSIVE nodes(resid, id, parent, found, permission) AS (
WHEN r.id = $1::uuid THEN true
ELSE false
END,
CASE
WHEN r.owner = $3::int THEN 127
WHEN p.permission IS NOT NULL THEN p.permission
ELSE 0
END
$3::int
FROM resources r
LEFT JOIN permissions p
on r.id = p.resource_id
AND p.user_id = $3::int
AND p.user_id = $4::int
WHERE r.id = $2::uuid
UNION ALL
SELECT n.resid, r.id, r.parent,
@@ -124,7 +120,7 @@ WITH RECURSIVE nodes(resid, id, parent, found, permission) AS (
END,
CASE
WHEN n.permission IS NOT NULL THEN n.permission
WHEN r.owner = $3::int THEN 127
WHEN r.owner = $4::int THEN 127
WHEN p.permission IS NOT NULL THEN p.permission
ELSE 0
END
@@ -132,7 +128,7 @@ WITH RECURSIVE nodes(resid, id, parent, found, permission) AS (
JOIN nodes n
ON r.id = n.parent
LEFT JOIN permissions p
ON r.id = p.resource_id AND p.user_id = $3::int
ON r.id = p.resource_id AND p.user_id = $4::int
WHERE n.id != '00000000-0000-0000-0000-000000000000'::uuid
)
SELECT resid AS id, found, r.owner, permission, r.id, r.parent, name, dir, created, modified, deleted, size, etag FROM nodes n
@@ -144,6 +140,7 @@ WHERE n.id = $1::uuid
type ResourceByIdWithPermissionsParams struct {
Root uuid.UUID
ResourceID uuid.UUID
Permission int32
UserID int32
}
@@ -164,7 +161,12 @@ type ResourceByIdWithPermissionsRow struct {
}
func (q *Queries) ResourceByIdWithPermissions(ctx context.Context, arg ResourceByIdWithPermissionsParams) (ResourceByIdWithPermissionsRow, error) {
row := q.db.QueryRow(ctx, resourceByIdWithPermissions, arg.Root, arg.ResourceID, arg.UserID)
row := q.db.QueryRow(ctx, resourceByIdWithPermissions,
arg.Root,
arg.ResourceID,
arg.Permission,
arg.UserID,
)
var i ResourceByIdWithPermissionsRow
err := row.Scan(
&i.ID,
server/sql/queries/permissions.sql
+1 -5
View File
@@ -46,11 +46,7 @@ WITH RECURSIVE nodes(resid, id, parent, found, permission) AS (
WHEN r.id = @root::uuid THEN true
ELSE false
END,
CASE
WHEN r.owner = @user_id::int THEN 127
WHEN p.permission IS NOT NULL THEN p.permission
ELSE 0
END
@permission::int
FROM resources r
LEFT JOIN permissions p
on r.id = p.resource_id