Compare commits
1
Commits
8d48fadd01
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2beba7d010 |
@@ -4,3 +4,4 @@
|
|||||||
*.key
|
*.key
|
||||||
.cluster-key-*
|
.cluster-key-*
|
||||||
data
|
data
|
||||||
|
suggestions
|
||||||
+1
-1
@@ -16,8 +16,8 @@ const (
|
|||||||
PermissionCreate = permission.Create
|
PermissionCreate = permission.Create
|
||||||
PermissionDelete = permission.Delete
|
PermissionDelete = permission.Delete
|
||||||
PermissionShare = permission.Share
|
PermissionShare = permission.Share
|
||||||
PermissionManage = permission.Manage
|
|
||||||
PermissionAdmin = permission.Admin
|
PermissionAdmin = permission.Admin
|
||||||
|
PermissionRequest = permission.Request
|
||||||
PermissionAll = permission.All
|
PermissionAll = permission.All
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
func TestPermissionValidAndHas(t *testing.T) {
|
func TestPermissionValidAndHas(t *testing.T) {
|
||||||
|
if PermissionAdmin != 32 || PermissionRequest != 64 {
|
||||||
|
t.Fatalf("bits = admin %d, request %d ; attendu 32 et 64", PermissionAdmin, PermissionRequest)
|
||||||
|
}
|
||||||
if !PermissionAll.Valid() {
|
if !PermissionAll.Valid() {
|
||||||
t.Fatal("PermissionAll devrait être valide")
|
t.Fatal("PermissionAll devrait être valide")
|
||||||
}
|
}
|
||||||
@@ -25,8 +28,11 @@ func TestPermissionValidAndHas(t *testing.T) {
|
|||||||
if !PermissionAdmin.Has(PermissionRead) {
|
if !PermissionAdmin.Has(PermissionRead) {
|
||||||
t.Fatal("PermissionAdmin devrait impliquer PermissionRead")
|
t.Fatal("PermissionAdmin devrait impliquer PermissionRead")
|
||||||
}
|
}
|
||||||
if !PermissionAll.Has(PermissionManage) {
|
if !PermissionAll.Has(PermissionRequest) {
|
||||||
t.Fatal("PermissionAll devrait contenir PermissionManage")
|
t.Fatal("PermissionAll devrait contenir PermissionRequest")
|
||||||
|
}
|
||||||
|
if PermissionRequest.Has(PermissionRead) {
|
||||||
|
t.Fatal("PermissionRequest ne devrait pas impliquer PermissionRead")
|
||||||
}
|
}
|
||||||
if PermissionRead.Has(PermissionWrite) {
|
if PermissionRead.Has(PermissionWrite) {
|
||||||
t.Fatal("PermissionRead ne devrait pas impliquer PermissionWrite")
|
t.Fatal("PermissionRead ne devrait pas impliquer PermissionWrite")
|
||||||
|
|||||||
+3
-3
@@ -172,9 +172,9 @@ func TestApplyRetention(t *testing.T) {
|
|||||||
t.Fatalf("second résultat = %+v, attendu 0 purgée et 3 conservées", again)
|
t.Fatalf("second résultat = %+v, attendu 0 purgée et 3 conservées", again)
|
||||||
}
|
}
|
||||||
|
|
||||||
manageDenied := NewService(*env.db, env.store, testBackendID, &testAuthorizer{allowed: permission.Write})
|
adminDenied := NewService(*env.db, env.store, testBackendID, &testAuthorizer{allowed: permission.Write})
|
||||||
if _, err := manageDenied.ApplyRetention(ctx, env.owner.ID, env.videoID); !errors.Is(err, document.ErrPermissionDenied) {
|
if _, err := adminDenied.ApplyRetention(ctx, env.owner.ID, env.videoID); !errors.Is(err, document.ErrPermissionDenied) {
|
||||||
t.Fatalf("ApplyRetention sans Manage : erreur = %v, attendu ErrPermissionDenied", err)
|
t.Fatalf("ApplyRetention sans Admin : erreur = %v, attendu ErrPermissionDenied", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, err := env.db.WriteDB.ExecContext(ctx,
|
if _, err := env.db.WriteDB.ExecContext(ctx,
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ func (s *Service) ApplyRetention(ctx context.Context, actorID, documentID ident.
|
|||||||
if documentRow.DeletedAt.Valid {
|
if documentRow.DeletedAt.Valid {
|
||||||
return RetentionResult{}, fmt.Errorf("%w: %s", document.ErrDocumentDeleted, documentID)
|
return RetentionResult{}, fmt.Errorf("%w: %s", document.ErrDocumentDeleted, documentID)
|
||||||
}
|
}
|
||||||
if err := s.can(ctx, actorID, documentID, permission.Manage); err != nil {
|
if err := s.can(ctx, actorID, documentID, permission.Admin); err != nil {
|
||||||
return RetentionResult{}, err
|
return RetentionResult{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -173,9 +173,9 @@ func TestEnforcementRename(t *testing.T) {
|
|||||||
t.Fatalf("sans Write : erreur = %v, attendu ErrPermissionDenied", err)
|
t.Fatalf("sans Write : erreur = %v, attendu ErrPermissionDenied", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
authorizer.grant(writer.ID, folder.ID, permission.Manage)
|
authorizer.grant(writer.ID, folder.ID, permission.Request)
|
||||||
if _, err := service.Rename(ctx, writer.ID, folder.ID, "Aventure"); !errors.Is(err, ErrPermissionDenied) {
|
if _, err := service.Rename(ctx, writer.ID, folder.ID, "Aventure"); !errors.Is(err, ErrPermissionDenied) {
|
||||||
t.Fatalf("avec Manage seul : erreur = %v, attendu ErrPermissionDenied", err)
|
t.Fatalf("avec Request seul : erreur = %v, attendu ErrPermissionDenied", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
authorizer.grant(writer.ID, folder.ID, permission.Write)
|
authorizer.grant(writer.ID, folder.ID, permission.Write)
|
||||||
@@ -198,10 +198,10 @@ func TestEnforcementMove(t *testing.T) {
|
|||||||
authorizer.active = map[ident.UUID]bool{mover.ID: true}
|
authorizer.active = map[ident.UUID]bool{mover.ID: true}
|
||||||
|
|
||||||
if _, err := service.Move(ctx, mover.ID, folder.ID, libraryB.ID); !errors.Is(err, ErrPermissionDenied) {
|
if _, err := service.Move(ctx, mover.ID, folder.ID, libraryB.ID); !errors.Is(err, ErrPermissionDenied) {
|
||||||
t.Fatalf("sans Manage : erreur = %v, attendu ErrPermissionDenied", err)
|
t.Fatalf("sans Admin : erreur = %v, attendu ErrPermissionDenied", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
authorizer.grant(mover.ID, folder.ID, permission.Manage)
|
authorizer.grant(mover.ID, folder.ID, permission.Admin)
|
||||||
if _, err := service.Move(ctx, mover.ID, folder.ID, libraryB.ID); !errors.Is(err, ErrPermissionDenied) {
|
if _, err := service.Move(ctx, mover.ID, folder.ID, libraryB.ID); !errors.Is(err, ErrPermissionDenied) {
|
||||||
t.Fatalf("sans Create sur la cible : erreur = %v, attendu ErrPermissionDenied", err)
|
t.Fatalf("sans Create sur la cible : erreur = %v, attendu ErrPermissionDenied", err)
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -82,7 +82,7 @@ func (s *Service) Move(ctx context.Context, actorID, documentID, newParentID ide
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if err := s.can(ctx, actorID, documentID, permission.Manage); err != nil {
|
if err := s.can(ctx, actorID, documentID, permission.Admin); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if document.ParentID == nil {
|
if document.ParentID == nil {
|
||||||
|
|||||||
@@ -8,8 +8,8 @@ const (
|
|||||||
Create
|
Create
|
||||||
Delete
|
Delete
|
||||||
Share
|
Share
|
||||||
Manage
|
|
||||||
Admin
|
Admin
|
||||||
|
Request
|
||||||
)
|
)
|
||||||
|
|
||||||
const All = Read |
|
const All = Read |
|
||||||
@@ -17,8 +17,8 @@ const All = Read |
|
|||||||
Create |
|
Create |
|
||||||
Delete |
|
Delete |
|
||||||
Share |
|
Share |
|
||||||
Manage |
|
Admin |
|
||||||
Admin
|
Request
|
||||||
|
|
||||||
func (p Permission) Valid() bool {
|
func (p Permission) Valid() bool {
|
||||||
return p > 0 && p <= All
|
return p > 0 && p <= All
|
||||||
|
|||||||
Reference in New Issue
Block a user