Raise error when CleanupSubDirectoryJob targets a non–pair-tree directory#853
Merged
aprilrieger merged 1 commit intomainfrom Mar 26, 2026
Merged
Raise error when CleanupSubDirectoryJob targets a non–pair-tree directory#853aprilrieger merged 1 commit intomainfrom
aprilrieger merged 1 commit intomainfrom
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
2 participants
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.
ref #842
The CleanupSubDirectoryJob should raise an error if passed one of these directories (e.g. tenant UUID roots under uploads, or any top-level dir that is not a two-character hex pair-tree segment).
What this PR does
At the start of perform, we call assert_hex_pair_tree_directory!(directory) before any glob/delete work.
The allowed shape matches CleanupUploadFilesJob::HEX_TOP_DIR_PATTERN: the basename of the directory must be exactly two hex characters (00–ff). Anything else (tenant UUID, hyrax, uploaded_collection_thumbnails, etc.) raises ArgumentError with a message that explains the allowed pattern and shows what was passed.
discard_on ArgumentError is configured so mis-queued jobs don’t burn retries under a broad StandardError retry policy; the error is logged and the job is discarded after the failure is visible.