Store enclosure metadata without fetching remote URLs #175
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.roller.weblogger.util; | ||
|
|
||
| import java.util.regex.Pattern; | ||
| import org.apache.commons.validator.routines.UrlValidator; | ||
|
|
||
| /** | ||
| * Validated metadata for an RSS or Atom enclosure. | ||
| */ | ||
| public final class EnclosureMetadata { | ||
|
|
||
| private static final UrlValidator URL_VALIDATOR = new UrlValidator( | ||
|
Contributor
There was a problem hiding this comment.
|
||
| new String[] {"http", "https"}, UrlValidator.ALLOW_LOCAL_URLS); | ||
|
|
||
| private static final Pattern MEDIA_TYPE = Pattern.compile( | ||
|
Contributor
There was a problem hiding this comment. This admits |
||
| "[!#$%&'*+.^_`|~0-9A-Za-z-]+/[!#$%&'*+.^_`|~0-9A-Za-z-]+"); | ||
|
|
||
| private final String url; | ||
| private final String contentType; | ||
| private final String length; | ||
|
|
||
| private EnclosureMetadata(String url, String contentType, String length) { | ||
| this.url = url; | ||
| this.contentType = contentType; | ||
| this.length = length; | ||
| } | ||
|
|
||
| public static EnclosureMetadata of(String url, String contentType, String length) { | ||
| String normalizedUrl = normalize(url); | ||
| String normalizedType = normalize(contentType); | ||
| String normalizedLength = normalize(length); | ||
|
|
||
| if (!URL_VALIDATOR.isValid(normalizedUrl)) { | ||
| throw new IllegalArgumentException("Enclosure URL must be an absolute HTTP or HTTPS URL"); | ||
| } | ||
| if (!MEDIA_TYPE.matcher(normalizedType).matches()) { | ||
| throw new IllegalArgumentException("Enclosure type must be a valid media type"); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Nit: no upper bound; |
||
|
|
||
| final long byteLength; | ||
| try { | ||
| byteLength = Long.parseLong(normalizedLength); | ||
| } catch (NumberFormatException e) { | ||
| throw new IllegalArgumentException("Enclosure length must be a non-negative integer", e); | ||
| } | ||
| if (byteLength < 0) { | ||
| throw new IllegalArgumentException("Enclosure length must be a non-negative integer"); | ||
| } | ||
|
|
||
| return new EnclosureMetadata( | ||
| normalizedUrl, normalizedType, Long.toString(byteLength)); | ||
| } | ||
|
|
||
| private static String normalize(String value) { | ||
| return value == null ? "" : value.trim(); | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public String getContentType() { | ||
| return contentType; | ||
| } | ||
|
|
||
| public String getLength() { | ||
| return length; | ||
| } | ||
| } | ||
Oops, something went wrong.
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 is fatal where the old flow was advisory (
addMessageand continue), and existing entries can't pass it: the removedMediacastUtilstoredcon.getContentType()verbatim, soatt_mediacast_typemay beaudio/mpeg; charset=utf-8orvideo/mp4;codecs=avc1, whichMEDIA_TYPErejects. The author then can't save any change to that entry until they notice and hand-edit the type. Either accept parameters in the regex (and strip them), or treat an invalid legacy value as "clear the enclosure and warn" instead of refusing the save. Also, one generic message for three fields: a blank Length (new field, previously auto-filled) produces the same text as a bad URL.