Preserve staged resource identities and expose upload receipts
This commit is contained in:
@@ -65,6 +65,18 @@ func (s *service) uploadAsset(w http.ResponseWriter, r *http.Request, project, a
|
||||
reject(w, 400, "invalid_idempotency_key")
|
||||
return nil
|
||||
}
|
||||
resourceID := strings.ToLower(r.Header.Get("X-Resource-Id"))
|
||||
if resourceID != "" && !uuidSlugPattern.MatchString(resourceID) {
|
||||
reject(w, 400, "invalid_resource_id")
|
||||
return nil
|
||||
}
|
||||
respond := func(info assetInfo) {
|
||||
if resourceID == "" {
|
||||
reply(w, 201, info)
|
||||
} else {
|
||||
reply(w, 201, response{"protocol_version": 2, "request_id": key, "status": "applied", "asset": info})
|
||||
}
|
||||
}
|
||||
tx, err := s.db.BeginTx(r.Context(), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -146,18 +158,28 @@ func (s *service) uploadAsset(w http.ResponseWriter, r *http.Request, project, a
|
||||
var previous string
|
||||
err = tx.QueryRowContext(r.Context(), `SELECT id::text,digest FROM canvas_assets WHERE project=$1 AND workspace_id=$2 AND uploaded_by=$3 AND idempotency_key=$4`, project, workspace, account, key).Scan(&info.ID, &previous)
|
||||
if err == nil {
|
||||
if previous != hash {
|
||||
if previous != hash || resourceID != "" && resourceID != info.ID {
|
||||
reject(w, 409, "idempotency_conflict")
|
||||
return nil
|
||||
}
|
||||
info.URL = s.assetURL(project, workspace, info.ID)
|
||||
reply(w, 201, info)
|
||||
respond(info)
|
||||
return nil
|
||||
}
|
||||
if err != sql.ErrNoRows {
|
||||
return err
|
||||
}
|
||||
err = tx.QueryRowContext(r.Context(), `INSERT INTO canvas_assets(project,workspace_id,uploaded_by,mime_type,bytes,width,height,digest,idempotency_key) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9) RETURNING id::text`, project, workspace, account, mime, encoded, width, height, hash, key).Scan(&info.ID)
|
||||
if resourceID != "" {
|
||||
var occupied bool
|
||||
if err = tx.QueryRowContext(r.Context(), `SELECT EXISTS(SELECT 1 FROM canvas_assets WHERE project=$1 AND workspace_id=$2 AND id=$3)`, project, workspace, resourceID).Scan(&occupied); err != nil {
|
||||
return err
|
||||
}
|
||||
if occupied {
|
||||
reject(w, 409, "resource_identity_conflict")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
err = tx.QueryRowContext(r.Context(), `INSERT INTO canvas_assets(project,workspace_id,uploaded_by,mime_type,bytes,width,height,digest,idempotency_key,id) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,COALESCE(NULLIF($10,'')::uuid,gen_random_uuid())) RETURNING id::text`, project, workspace, account, mime, encoded, width, height, hash, key, resourceID).Scan(&info.ID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -165,7 +187,40 @@ func (s *service) uploadAsset(w http.ResponseWriter, r *http.Request, project, a
|
||||
return err
|
||||
}
|
||||
info.URL = s.assetURL(project, workspace, info.ID)
|
||||
reply(w, 201, info)
|
||||
respond(info)
|
||||
return nil
|
||||
}
|
||||
|
||||
// A missing receipt is unknown: callers may only retry the same resource/key/bytes.
|
||||
func (s *service) assetOperation(w http.ResponseWriter, r *http.Request, project, account string) error {
|
||||
if r.Method != http.MethodGet {
|
||||
reject(w, 405, "method_not_allowed")
|
||||
return nil
|
||||
}
|
||||
key, workspace := r.PathValue("request"), r.PathValue("workspace")
|
||||
if !uuidSlugPattern.MatchString(key) {
|
||||
reject(w, 400, "invalid_idempotency_key")
|
||||
return nil
|
||||
}
|
||||
tx, err := s.db.BeginTx(r.Context(), nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
if _, _, err = lockWorkspace(r.Context(), tx, project, workspace, account); err != nil {
|
||||
return err
|
||||
}
|
||||
var info assetInfo
|
||||
err = tx.QueryRowContext(r.Context(), `SELECT id::text,mime_type,octet_length(bytes),width,height FROM canvas_assets WHERE project=$1 AND workspace_id=$2 AND uploaded_by=$3 AND idempotency_key=$4`, project, workspace, account, key).Scan(&info.ID, &info.MIME, &info.Bytes, &info.Width, &info.Height)
|
||||
if err == sql.ErrNoRows {
|
||||
reply(w, 404, response{"protocol_version": 2, "request_id": key, "status": "unknown", "error": "asset_receipt_unknown"})
|
||||
return nil
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
info.URL = s.assetURL(project, workspace, info.ID)
|
||||
reply(w, 200, response{"protocol_version": 2, "request_id": key, "status": "applied", "asset": info})
|
||||
return nil
|
||||
}
|
||||
func assetReadable(r *http.Request, tx *sql.Tx, project, workspace, id, account string) (bool, error) {
|
||||
|
||||
Reference in New Issue
Block a user