-
Notifications
You must be signed in to change notification settings - Fork 492
fix: copy in-memory push configs so callers cannot mutate stored webhooks #1218
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
anxkhn
wants to merge
1
commit into
a2aproject:main
Choose a base branch
from
anxkhn:fix/inmemory-push-copy
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+33
−6
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,6 +12,14 @@ | |
| logger = logging.getLogger(__name__) | ||
|
|
||
|
|
||
| def _copy_config( | ||
| notification_config: TaskPushNotificationConfig, | ||
| ) -> TaskPushNotificationConfig: | ||
| stored = TaskPushNotificationConfig() | ||
| stored.CopyFrom(notification_config) | ||
| return stored | ||
|
|
||
|
|
||
| class InMemoryPushNotificationConfigStore(PushNotificationConfigStore): | ||
| """In-memory implementation of PushNotificationConfigStore interface. | ||
|
|
||
|
|
@@ -48,16 +56,18 @@ async def set_info( | |
| if task_id not in owner_infos: | ||
| owner_infos[task_id] = [] | ||
|
|
||
| if not notification_config.id: | ||
| notification_config.id = task_id | ||
| stored = TaskPushNotificationConfig() | ||
| stored.CopyFrom(notification_config) | ||
|
Comment on lines
+59
to
+60
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Consider using _copy_config for consistency |
||
| if not stored.id: | ||
| stored.id = task_id | ||
|
|
||
| # Remove existing config with the same ID | ||
| for config in owner_infos[task_id]: | ||
| if config.id == notification_config.id: | ||
| if config.id == stored.id: | ||
| owner_infos[task_id].remove(config) | ||
| break | ||
|
|
||
| owner_infos[task_id].append(notification_config) | ||
| owner_infos[task_id].append(stored) | ||
| logger.debug( | ||
| 'Push notification config for task %s with config id %s for owner %s saved/updated.', | ||
| task_id, | ||
|
|
@@ -77,7 +87,7 @@ async def get_info( | |
| owner = self.owner_resolver(context) | ||
| with self.lock: | ||
| owner_infos = self._get_owner_push_notification_infos(owner) | ||
| return list(owner_infos.get(task_id, [])) | ||
| return [_copy_config(item) for item in owner_infos.get(task_id, [])] | ||
|
|
||
| async def get_info_for_dispatch( | ||
| self, | ||
|
|
@@ -90,7 +100,9 @@ async def get_info_for_dispatch( | |
| with self.lock: | ||
| results: list[TaskPushNotificationConfig] = [] | ||
| for all_configs in self._push_notification_infos.values(): | ||
| results.extend(all_configs.get(task_id, [])) | ||
| results.extend( | ||
| _copy_config(item) for item in all_configs.get(task_id, []) | ||
| ) | ||
| return results | ||
|
|
||
| async def delete_info( | ||
|
|
||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this leads to spec violation for on_create_task_push_notification_config (3.1.7: "Outputs: - TaskPushNotificationConfig: Created configuration with assigned ID")
on_create_task_push_notification_config is expected to set id for TaskPushNotificationConfig response if not provided by caller.