fix: prevent cross-tenant memory id overwrite#6
Open
NeerajCodz wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Motivation
tenant_idand tenant-scoped reads while writes still upsert by globalid, enabling a cross-tenant overwrite when an attacker supplies an existing memoryidfrom another tenant.(tenant_id, user_id)scope.Description
TestMemoryStore::upsert_memorythat returnsCoreError::Conflictif an existing record with the sameidbelongs to a differenttenant_idoruser_idand only updates whenid,tenant_id, anduser_idall match (src/testkit/mod.rs).upsert_memoryto restrict theON CONFLICT (id) DO UPDATEto rows wherenextral_memories.tenant_id = EXCLUDED.tenant_id AND nextral_memories.user_id = EXCLUDED.user_id, and return aCoreError::Conflictwhen no rows are affected (indicating a cross-tenant id collision) (src/adapters/postgres.rs).tenant_awith a caller-suppliedid, then verifies that an ingest fromtenant_busing the sameidis rejected with aConflictand that the originaltenant_arecord remains intact (src/lib.rstests).Testing
cargo test -qand observed all tests pass.running 12 tests ... test result: ok. 12 passed; 0 failed.Codex Task