feat(playstation): Emit outcome for skipped fields #4862
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
tobias-wilfert
commented
Jun 25, 2025
Comment on lines
+181
to
+192
| impl IntoResponse for BadMultipart { | ||
| fn into_response(self) -> Response { | ||
| let status_code = match self { | ||
| BadMultipart::Multipart( | ||
| multer::Error::FieldSizeExceeded { .. } | multer::Error::StreamSizeExceeded { .. }, | ||
| ) => StatusCode::PAYLOAD_TOO_LARGE, | ||
| _ => StatusCode::BAD_REQUEST, | ||
| }; | ||
|
|
||
| (status_code, ApiErrorResponse::from_error(&self)).into_response() | ||
| } | ||
| } |
There was a problem hiding this comment.
This copies the behaviour found here:
relay/relay-server/src/extractors/remote.rs
Lines 61 to 70 in 25f09a4
tobias-wilfert
commented
Jun 25, 2025
| @@ -177,7 +215,10 @@ where | |||
| let content_type = field.content_type().cloned(); | |||
| let field = LimitedField::new(field, config.max_attachment_size()); | |||
| match field.bytes().await { | |||
| Err(multer::Error::FieldSizeExceeded { .. }) if ignore_large_fields => continue, | |||
| Err(multer::Error::FieldSizeExceeded { limit, .. }) if ignore_large_fields => { | |||
There was a problem hiding this comment.
Cheating here a bit by putting the consumed size into the error rather than the limit that is breached such that we can use that value to generate the outcome.
tobias-wilfert
commented
Jun 25, 2025
relay-server/src/utils/multipart.rs
Outdated
Comment on lines
408
to
420
| |quantity| { | ||
| outcome_aggregator.send(TrackOutcome { | ||
| timestamp: request_meta.received_at(), | ||
| scoping: request_meta.get_partial_scoping(), | ||
| outcome: Outcome::Invalid(DiscardReason::TooLarge( | ||
| DiscardItemType::Attachment(DiscardAttachmentType::Attachment), | ||
| )), | ||
| event_id: None, | ||
| remote_addr: request_meta.remote_addr(), | ||
| category: DataCategory::Attachment, | ||
| quantity, | ||
| }) | ||
| }, |
There was a problem hiding this comment.
I tried making this a method of UnconstrainedMultipart but that did not work since we also need the self.multiparts when invoking multipart_items hence it is like this.
3 tasks
loewenheim
reviewed
Jun 26, 2025
Dav1dde
reviewed
Jun 27, 2025
loewenheim
approved these changes
Jul 17, 2025
Comment on lines
388
to
+394
| multipart_from_request(request, multer::Constraints::new()) | ||
| .map(Self) | ||
| .map_err(Remote) | ||
| .map(|multipart| UnconstrainedMultipart { | ||
| multipart, | ||
| outcome_aggregator: state.outcome_aggregator().clone(), | ||
| request_meta, | ||
| }) | ||
| .map_err(Into::into) |
There was a problem hiding this comment.
I think this is clearer like this:
let multipart = multipart_from_request(request, multer::Constraints::new())?;
Ok(UnconstrainedMultipart {
multipart,
outcome_aggregator: state.outcome_aggregator().clone(),
request_meta,
})
(can't make a suggestion because deleted lines)
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.
Currently there is no communication to the user about a field being skipped. This PR adds the logic for emitting outcomes for skipped fields such that the users are aware of these skipped fields.
Follow up to: #4793