-
Notifications
You must be signed in to change notification settings - Fork 193
Verify object tagging #2473
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
Merged
Merged
Verify object tagging #2473
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
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
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
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
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
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 |
|---|---|---|
|
|
@@ -19,6 +19,7 @@ | |
| import static com.adobe.testing.s3mock.S3Exception.BAD_REQUEST_CONTENT; | ||
| import static com.adobe.testing.s3mock.S3Exception.BAD_REQUEST_MD5; | ||
| import static com.adobe.testing.s3mock.S3Exception.INVALID_REQUEST_RETAIN_DATE; | ||
| import static com.adobe.testing.s3mock.S3Exception.INVALID_TAG; | ||
| import static com.adobe.testing.s3mock.S3Exception.NOT_FOUND_OBJECT_LOCK; | ||
| import static com.adobe.testing.s3mock.S3Exception.NOT_MODIFIED; | ||
| import static com.adobe.testing.s3mock.S3Exception.NO_SUCH_KEY; | ||
|
|
@@ -49,8 +50,10 @@ | |
| import java.nio.file.Path; | ||
| import java.time.Instant; | ||
| import java.util.ArrayList; | ||
| import java.util.HashSet; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.regex.Pattern; | ||
| import org.jspecify.annotations.Nullable; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
@@ -59,6 +62,14 @@ public class ObjectService extends ServiceBase { | |
| static final String WILDCARD_ETAG = "\"*\""; | ||
| static final String WILDCARD = "*"; | ||
| private static final Logger LOG = LoggerFactory.getLogger(ObjectService.class); | ||
| private static final Pattern TAG_ALLOWED_CHARS = Pattern.compile("[\\w+ \\-=.:/@]*"); | ||
| private static final int MAX_ALLOWED_TAGS = 50; | ||
| private static final int MIN_ALLOWED_TAG_KEY_LENGTH = 1; | ||
| private static final int MAX_ALLOWED_TAG_KEY_LENGTH = 128; | ||
| private static final int MIN_ALLOWED_TAG_VALUE_LENGTH = 0; | ||
| private static final int MAX_ALLOWED_TAG_VALUE_LENGTH = 256; | ||
| private static final String DISALLOWED_TAG_KEY_PREFIX = "aws:"; | ||
|
|
||
| private final BucketStore bucketStore; | ||
| private final ObjectStore objectStore; | ||
|
|
||
|
|
@@ -175,6 +186,48 @@ public void setObjectTags(String bucketName, String key, @Nullable String versio | |
| objectStore.storeObjectTags(bucketMetadata, uuid, versionId, tags); | ||
| } | ||
|
|
||
| public void verifyObjectTags(List<Tag> tags) { | ||
|
||
| if (tags.size() > MAX_ALLOWED_TAGS) { | ||
| throw INVALID_TAG; | ||
| } | ||
| verifyDuplicateTagKeys(tags); | ||
| for (var tag : tags) { | ||
| verifyTagKeyPrefix(tag.key()); | ||
| verifyTagLength(MIN_ALLOWED_TAG_KEY_LENGTH, MAX_ALLOWED_TAG_KEY_LENGTH, tag.key()); | ||
| verifyTagChars(tag.key()); | ||
|
|
||
| verifyTagLength(MIN_ALLOWED_TAG_VALUE_LENGTH, MAX_ALLOWED_TAG_VALUE_LENGTH, tag.value()); | ||
| verifyTagChars(tag.value()); | ||
| } | ||
| } | ||
|
|
||
| private void verifyDuplicateTagKeys(List<Tag> tags) { | ||
| var tagKeys = new HashSet<String>(); | ||
| for (var tag : tags) { | ||
| if (!tagKeys.add(tag.key())) { | ||
| throw INVALID_TAG; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private void verifyTagKeyPrefix(String tagKey) { | ||
| if (tagKey.startsWith(DISALLOWED_TAG_KEY_PREFIX)) { | ||
| throw INVALID_TAG; | ||
| } | ||
| } | ||
|
|
||
| private void verifyTagLength(int minLength, int maxLength, String tag) { | ||
| if (tag.length() < minLength || tag.length() > maxLength) { | ||
| throw INVALID_TAG; | ||
| } | ||
| } | ||
|
|
||
| private void verifyTagChars(String tag) { | ||
| if (!TAG_ALLOWED_CHARS.matcher(tag).matches()) { | ||
| throw INVALID_TAG; | ||
| } | ||
| } | ||
|
|
||
| public void setLegalHold(String bucketName, String key, @Nullable String versionId, LegalHold legalHold) { | ||
| var bucketMetadata = bucketStore.getBucketMetadata(bucketName); | ||
| var uuid = bucketMetadata.getID(key); | ||
|
|
||
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.
The INVALID_TAG error message mentions duplicate keys and length issues but omits illegal-character failures. Consider updating it to reflect all validation rules.