fix backend audit findings (auth, upload, sync, data, ocr, contract)
CI / lint-backend (push) Failing after 1m39s
CI / lint-mobile (push) Canceled after 11m8s
CI / test-backend (push) Canceled after 0s
CI / test-mobile (push) Canceled after 0s
CI / build-backend (push) Canceled after 0s
CI / docker (push) Canceled after 0s
CI / lint-backend (push) Failing after 1m39s
CI / lint-mobile (push) Canceled after 11m8s
CI / test-backend (push) Canceled after 0s
CI / test-mobile (push) Canceled after 0s
CI / build-backend (push) Canceled after 0s
CI / docker (push) Canceled after 0s
This commit is contained in:
+122
-48
@@ -20,12 +20,22 @@ var ErrNameConflict = errors.New("name conflict")
|
||||
|
||||
// NewID returns an opaque lowercase 32-hex identifier (charset ^[0-9a-f]{32}$),
|
||||
// mirroring the mobile's lower(hex(randomblob(16))). Never a UUID.
|
||||
// Panics on entropy failure (legacy) — prefer NewIDErr for new code.
|
||||
func NewID() string {
|
||||
buf := make([]byte, 16)
|
||||
if _, err := rand.Read(buf); err != nil {
|
||||
id, err := NewIDErr()
|
||||
if err != nil {
|
||||
panic(fmt.Sprintf("crypto/rand failed: %v", err))
|
||||
}
|
||||
return hex.EncodeToString(buf)
|
||||
return id
|
||||
}
|
||||
|
||||
// NewIDErr is the non-panicking variant (cf. FEEDBACK A5).
|
||||
func NewIDErr() (string, error) {
|
||||
buf := make([]byte, 16)
|
||||
if _, err := rand.Read(buf); err != nil {
|
||||
return "", fmt.Errorf("crypto/rand failed: %w", err)
|
||||
}
|
||||
return hex.EncodeToString(buf), nil
|
||||
}
|
||||
|
||||
func isUniqueViolation(err error) bool {
|
||||
@@ -33,6 +43,14 @@ func isUniqueViolation(err error) bool {
|
||||
return errors.As(err, &pqErr) && pqErr.Code == "23505"
|
||||
}
|
||||
|
||||
// isForeignKeyViolation reports a Postgres FK violation (23503). Une
|
||||
// violation de FK parent (dossier cible disparu en course) est mappée vers
|
||||
// ErrNotFound — cible inexistante — plutôt que de fuir en 500.
|
||||
func isForeignKeyViolation(err error) bool {
|
||||
var pqErr *pq.Error
|
||||
return errors.As(err, &pqErr) && pqErr.Code == "23503"
|
||||
}
|
||||
|
||||
type FileRow struct {
|
||||
ID string
|
||||
Name string
|
||||
@@ -108,42 +126,39 @@ const grantedCTE = `
|
||||
AND r.deleted_at IS NULL AND g.depth < 100
|
||||
)`
|
||||
|
||||
func (r *Resources) folderExists(ownerID, folderID string) (bool, error) {
|
||||
var exists int
|
||||
err := r.DB.QueryRow(
|
||||
`SELECT 1 FROM resources
|
||||
WHERE resource_id = $1 AND user_id = $2 AND type = 'folder' AND deleted_at IS NULL`,
|
||||
folderID, ownerID,
|
||||
).Scan(&exists)
|
||||
if err == sql.ErrNoRows {
|
||||
return false, nil
|
||||
}
|
||||
return err == nil, err
|
||||
}
|
||||
|
||||
// insert persiste une ligne file/folder avec parent-check ATOMIQUE
|
||||
// (single-statement INSERT...SELECT) : le dossier parent (quand non vide)
|
||||
// doit exister, appartenir au même owner, être un folder non supprimé —
|
||||
// sinon ErrNotFound. L'ancien SELECT-then-INSERT (TOCTOU : parent supprimé
|
||||
// entre check et insert → FK 500) est remplacé ; une violation FK résiduelle
|
||||
// (course) est mappée vers ErrNotFound, jamais 500.
|
||||
func (r *Resources) insert(ownerID, id, name, parentResourceID, resourceType string, size int64, mimeType, extension *string) error {
|
||||
if parentResourceID != "" {
|
||||
ok, err := r.folderExists(ownerID, parentResourceID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !ok {
|
||||
return fmt.Errorf("folder %s: %w", parentResourceID, ErrNotFound)
|
||||
}
|
||||
}
|
||||
var parentID any
|
||||
if parentResourceID != "" {
|
||||
parentID = parentResourceID
|
||||
}
|
||||
_, err := r.DB.Exec(
|
||||
result, err := r.DB.Exec(
|
||||
`INSERT INTO resources (resource_id, type, name, parent_id, user_id, size_bytes, mime_type, extension)
|
||||
VALUES ($1, $2, $3, $4, $5, $6, $7, $8)`,
|
||||
id, resourceType, name, parentID, ownerID, size, mimeType, extension,
|
||||
SELECT $1, $2, $3, NULLIF($4, ''), $5, $6, $7, $8
|
||||
WHERE $4 = '' OR EXISTS (
|
||||
SELECT 1 FROM resources
|
||||
WHERE resource_id = $4 AND user_id = $5 AND type = 'folder' AND deleted_at IS NULL
|
||||
)`,
|
||||
id, resourceType, name, parentResourceID, ownerID, size, mimeType, extension,
|
||||
)
|
||||
if isUniqueViolation(err) {
|
||||
return ErrNameConflict
|
||||
}
|
||||
return err
|
||||
if isForeignKeyViolation(err) {
|
||||
return fmt.Errorf("folder %s: %w", parentResourceID, ErrNotFound)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
affected, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if affected == 0 {
|
||||
return fmt.Errorf("folder %s: %w", parentResourceID, ErrNotFound)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// InsertFile persists a file metadata row for the owner device. The parent
|
||||
@@ -270,6 +285,26 @@ func (r *Resources) GetResourceOwner(resourceID string) (string, error) {
|
||||
return ownerID, err
|
||||
}
|
||||
|
||||
// GetParentID returns the parent_id ('""' si racine) d'une ressource non
|
||||
// supprimée. No-rows → ErrNotFound. Sert au check de cycle des moves.
|
||||
func (r *Resources) GetParentID(resourceID string) (string, error) {
|
||||
var parent sql.NullString
|
||||
err := r.DB.QueryRow(
|
||||
`SELECT parent_id FROM resources WHERE resource_id = $1 AND deleted_at IS NULL`,
|
||||
resourceID,
|
||||
).Scan(&parent)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return "", ErrNotFound
|
||||
}
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
if !parent.Valid {
|
||||
return "", nil
|
||||
}
|
||||
return parent.String, nil
|
||||
}
|
||||
|
||||
// DeleteFile soft-deletes the file (deleted_at), returning its id.
|
||||
func (r *Resources) DeleteFile(ownerID, resourceID string) (string, error) {
|
||||
result, err := r.DB.Exec(
|
||||
@@ -369,26 +404,28 @@ func (r *Resources) GetFolder(ownerID, resourceID string) (FolderRow, error) {
|
||||
return row, err
|
||||
}
|
||||
|
||||
// MoveResource sets parent_id (root when parentResourceID empty). The target
|
||||
// folder must exist and belong to the owner. Absent source is a no-op.
|
||||
// MoveResource sets parent_id (root when parentResourceID empty) avec
|
||||
// parent-check ATOMIQUE (single-statement) : la cible doit exister,
|
||||
// appartenir au même owner, être un folder non supprimé. Source absente /
|
||||
// non-owned OU cible absente → ErrNotFound (même code : le choix A8
|
||||
// move-non-owned → NOT_FOUND est appliqué ici, cf. LOT 3 pour la doc
|
||||
// sync). Violation FK résiduelle (course) → ErrNotFound, jamais 500.
|
||||
func (r *Resources) MoveResource(ownerID, resourceID, parentResourceID string) error {
|
||||
if parentResourceID != "" {
|
||||
if _, err := r.GetFolder(ownerID, parentResourceID); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
var parentID any
|
||||
if parentResourceID != "" {
|
||||
parentID = parentResourceID
|
||||
}
|
||||
result, err := r.DB.Exec(
|
||||
`UPDATE resources SET parent_id = $3, updated_at = NOW()
|
||||
WHERE resource_id = $1 AND user_id = $2 AND deleted_at IS NULL`,
|
||||
resourceID, ownerID, parentID,
|
||||
`UPDATE resources SET parent_id = NULLIF($3, ''), updated_at = NOW()
|
||||
WHERE resource_id = $1 AND user_id = $2 AND deleted_at IS NULL
|
||||
AND ($3 = '' OR EXISTS (
|
||||
SELECT 1 FROM resources
|
||||
WHERE resource_id = $3 AND user_id = $2 AND type = 'folder' AND deleted_at IS NULL
|
||||
))`,
|
||||
resourceID, ownerID, parentResourceID,
|
||||
)
|
||||
if err != nil && isUniqueViolation(err) {
|
||||
return ErrNameConflict
|
||||
}
|
||||
if err != nil && isForeignKeyViolation(err) {
|
||||
return fmt.Errorf("folder %s: %w", parentResourceID, ErrNotFound)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -402,7 +439,7 @@ func (r *Resources) MoveResource(ownerID, resourceID, parentResourceID string) e
|
||||
return nil
|
||||
}
|
||||
|
||||
// UpdateName renames a resource. Absent source is a no-op.
|
||||
// UpdateName renames a resource. Absent / not owned → ErrNotFound.
|
||||
func (r *Resources) UpdateName(ownerID, resourceID, name string) error {
|
||||
result, err := r.DB.Exec(
|
||||
`UPDATE resources SET name = $3, updated_at = NOW()
|
||||
@@ -425,8 +462,18 @@ func (r *Resources) UpdateName(ownerID, resourceID, name string) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
// UpdateNameOwned renames a resource OWNED by ownerID. Absent / not owned →
|
||||
// ErrNotFound, sibling homonyme → ErrNameConflict. Variante scopée
|
||||
// canonique (sémantique identique à UpdateName, nom aligné sur TouchOwned
|
||||
// pour LOT 3).
|
||||
func (r *Resources) UpdateNameOwned(ownerID, resourceID, name string) error {
|
||||
return r.UpdateName(ownerID, resourceID, name)
|
||||
}
|
||||
|
||||
// UpdateNameByID renames a resource without owner scoping — the caller
|
||||
// (service) has already verified the user's effective access (editor+).
|
||||
// Conservée volontairement pour update_metadata : un editor non-owner peut
|
||||
// renommer, UpdateNameOwned rejetterait à tort.
|
||||
func (r *Resources) UpdateNameByID(resourceID, name string) error {
|
||||
result, err := r.DB.Exec(
|
||||
`UPDATE resources SET name = $2, updated_at = NOW()
|
||||
@@ -519,8 +566,35 @@ func (r *Resources) ExistsOwner(ownerID, resourceID string) (bool, error) {
|
||||
return err == nil, err
|
||||
}
|
||||
|
||||
// TouchOwned bumps updated_at on a non-deleted resource OWNED by ownerID so
|
||||
// that the grantee's delta snapshot picks it up after a share is created.
|
||||
// Absent / not owned → ErrNotFound. C'est la variante scopée à utiliser
|
||||
// (LOT 3 : migrer les appelants sync vers TouchOwned).
|
||||
func (r *Resources) TouchOwned(ownerID, resourceID string) error {
|
||||
result, err := r.DB.Exec(
|
||||
`UPDATE resources SET updated_at = NOW()
|
||||
WHERE resource_id = $1 AND user_id = $2 AND deleted_at IS NULL`,
|
||||
resourceID, ownerID,
|
||||
)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
affected, err := result.RowsAffected()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if affected == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// TouchResource bumps updated_at on a non-deleted resource so that the
|
||||
// grantee's delta snapshot picks it up after a share is created.
|
||||
//
|
||||
// Deprecated: non scopée (touche n'importe quel owner) — préférer TouchOwned.
|
||||
// Plus aucun appelant sync (migrés vers TouchOwned) ; conservée pour
|
||||
// compatibilité des appelants externes éventuels.
|
||||
func (r *Resources) TouchResource(resourceID string) error {
|
||||
_, err := r.DB.Exec(
|
||||
`UPDATE resources SET updated_at = NOW() WHERE resource_id = $1 AND deleted_at IS NULL`,
|
||||
|
||||
Reference in New Issue
Block a user