diff --git a/.gitignore b/.gitignore index 54db5d9..453440f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ *.db-shm *.key .cluster-key-* -data \ No newline at end of file +data +suggestions \ No newline at end of file diff --git a/acl/acl.go b/acl/acl.go index 5994d2f..16dfb7d 100644 --- a/acl/acl.go +++ b/acl/acl.go @@ -11,14 +11,14 @@ import ( type Permission = permission.Permission const ( - PermissionRead = permission.Read - PermissionWrite = permission.Write - PermissionCreate = permission.Create - PermissionDelete = permission.Delete - PermissionShare = permission.Share - PermissionManage = permission.Manage - PermissionAdmin = permission.Admin - PermissionAll = permission.All + PermissionRead = permission.Read + PermissionWrite = permission.Write + PermissionCreate = permission.Create + PermissionDelete = permission.Delete + PermissionShare = permission.Share + PermissionAdmin = permission.Admin + PermissionRequest = permission.Request + PermissionAll = permission.All ) type Entry struct { diff --git a/acl/permissions_test.go b/acl/permissions_test.go index e0609e6..9673546 100644 --- a/acl/permissions_test.go +++ b/acl/permissions_test.go @@ -12,6 +12,9 @@ import ( ) 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() { t.Fatal("PermissionAll devrait être valide") } @@ -25,8 +28,11 @@ func TestPermissionValidAndHas(t *testing.T) { if !PermissionAdmin.Has(PermissionRead) { t.Fatal("PermissionAdmin devrait impliquer PermissionRead") } - if !PermissionAll.Has(PermissionManage) { - t.Fatal("PermissionAll devrait contenir PermissionManage") + if !PermissionAll.Has(PermissionRequest) { + t.Fatal("PermissionAll devrait contenir PermissionRequest") + } + if PermissionRequest.Has(PermissionRead) { + t.Fatal("PermissionRequest ne devrait pas impliquer PermissionRead") } if PermissionRead.Has(PermissionWrite) { t.Fatal("PermissionRead ne devrait pas impliquer PermissionWrite") diff --git a/content/p2_test.go b/content/p2_test.go index f554067..9075146 100644 --- a/content/p2_test.go +++ b/content/p2_test.go @@ -172,9 +172,9 @@ func TestApplyRetention(t *testing.T) { 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}) - if _, err := manageDenied.ApplyRetention(ctx, env.owner.ID, env.videoID); !errors.Is(err, document.ErrPermissionDenied) { - t.Fatalf("ApplyRetention sans Manage : erreur = %v, attendu ErrPermissionDenied", err) + adminDenied := NewService(*env.db, env.store, testBackendID, &testAuthorizer{allowed: permission.Write}) + if _, err := adminDenied.ApplyRetention(ctx, env.owner.ID, env.videoID); !errors.Is(err, document.ErrPermissionDenied) { + t.Fatalf("ApplyRetention sans Admin : erreur = %v, attendu ErrPermissionDenied", err) } if _, err := env.db.WriteDB.ExecContext(ctx, diff --git a/content/retention.go b/content/retention.go index 518f475..2bd0910 100644 --- a/content/retention.go +++ b/content/retention.go @@ -44,7 +44,7 @@ func (s *Service) ApplyRetention(ctx context.Context, actorID, documentID ident. if documentRow.DeletedAt.Valid { 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 } diff --git a/document/enforcement_test.go b/document/enforcement_test.go index ae0cce6..217acf0 100644 --- a/document/enforcement_test.go +++ b/document/enforcement_test.go @@ -173,9 +173,9 @@ func TestEnforcementRename(t *testing.T) { 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) { - 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) @@ -198,10 +198,10 @@ func TestEnforcementMove(t *testing.T) { authorizer.active = map[ident.UUID]bool{mover.ID: true} 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) { t.Fatalf("sans Create sur la cible : erreur = %v, attendu ErrPermissionDenied", err) } diff --git a/document/mutate.go b/document/mutate.go index 35b74eb..bef6280 100644 --- a/document/mutate.go +++ b/document/mutate.go @@ -82,7 +82,7 @@ func (s *Service) Move(ctx context.Context, actorID, documentID, newParentID ide if err != nil { 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 } if document.ParentID == nil { diff --git a/permission/permission.go b/permission/permission.go index 852f183..f793396 100644 --- a/permission/permission.go +++ b/permission/permission.go @@ -8,8 +8,8 @@ const ( Create Delete Share - Manage Admin + Request ) const All = Read | @@ -17,8 +17,8 @@ const All = Read | Create | Delete | Share | - Manage | - Admin + Admin | + Request func (p Permission) Valid() bool { return p > 0 && p <= All