Fail earlier on cache corruptions #6495
Merged
Conversation
This file contains 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
yschimke
commented
Dec 30, 2020
| @@ -1258,7 +1258,7 @@ class HttpUrl internal constructor( | |||
| this.scheme = base.scheme | |||
| } else { | |||
| throw IllegalArgumentException( | |||
| "Expected URL scheme 'http' or 'https' but no colon was found") | |||
| "Expected URL scheme 'http' or 'https' but no scheme was found for $input") | |||
There was a problem hiding this comment.
Happy to drop this for PII reasons if there is concern, although as a corrupted url, the debug value seems higher than normal.
There was a problem hiding this comment.
Log up to 6 characters? Like www.ex... ?
yschimke
commented
Dec 30, 2020
| val urlLine = source.readUtf8LineStrict() | ||
| // Choice here is between failing with a correct RuntimeException | ||
| // or mostly silently with an IOException | ||
| url = urlLine.toHttpUrlOrNull() ?: throw IOException("Cache Failure for $urlLine").also { |
There was a problem hiding this comment.
3 options here
- runtime exception - fatal...
- io exception only
- io exception and log a warning
There was a problem hiding this comment.
change cache failure to cache corruption ?
swankjesse
approved these changes
Jan 9, 2021
| @@ -1258,7 +1258,7 @@ class HttpUrl internal constructor( | |||
| this.scheme = base.scheme | |||
| } else { | |||
| throw IllegalArgumentException( | |||
| "Expected URL scheme 'http' or 'https' but no colon was found") | |||
| "Expected URL scheme 'http' or 'https' but no scheme was found for $input") | |||
There was a problem hiding this comment.
Log up to 6 characters? Like www.ex... ?
| val urlLine = source.readUtf8LineStrict() | ||
| // Choice here is between failing with a correct RuntimeException | ||
| // or mostly silently with an IOException | ||
| url = urlLine.toHttpUrlOrNull() ?: throw IOException("Cache Failure for $urlLine").also { |
There was a problem hiding this comment.
change cache failure to cache corruption ?
|
Could this fix be backported to 4.9.x, please? |
yschimke
added a commit
to yschimke/okhttp
that referenced
this pull request
Nov 28, 2021
swankjesse
pushed a commit
that referenced
this pull request
Nov 29, 2021
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.
Fail earlier on cache corruption, log warning instead of failing terminally.