Skip to content
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.

Sign up for GitHub

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

Fallback to original URL if the beginIndex is invalid #143

Merged
merged 3 commits into from
Mar 14, 2024
Merged

Fallback to original URL if the beginIndex is invalid #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc8c040
Fallback to original URL if the beginIndex is invalid
Mar 13, 2024
c47b213
Adds test case that reproduces the issue
Mar 13, 2024
e6b28eb
Return the original url before any mutations as a fallback in the err…
Mar 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions WordPressUtils/src/androidTest/java/org/wordpress/android/util/PhotonUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,12 @@ public void getPhotonImageUrlUsesSslOnHttpsImageUrl() {

assertThat(photonUrl, equalTo("https://i0.wp.com/mysite.com/test.jpg?strip=info&quality=65&resize=2,1&ssl=1"));
}

@Test
public void getPhotonImageUrlWithErroneousSchemePosition() {
String imageUrl = "mysite.com/test.jpg#http://another.com";
String photonUrl = PhotonUtils.getPhotonImageUrl(imageUrl, 1, 1);

assertThat(photonUrl, equalTo(imageUrl));
}
}
10 changes: 9 additions & 1 deletion WordPressUtils/src/main/java/org/wordpress/android/util/PhotonUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ public static String getPhotonImageUrl(String imageUrl, int width, int height, Q
return "";
}

String originalUrl = imageUrl;

// make sure it's valid
int schemePos = imageUrl.indexOf("://");
if (schemePos == -1) {
Expand Down Expand Up @@ -138,6 +140,12 @@ public static String getPhotonImageUrl(String imageUrl, int width, int height, Q
query += "&ssl=1";
}

return "https://i0.wp.com/" + imageUrl.substring(schemePos + 3, imageUrl.length()) + query;
int beginIndex = schemePos + 3;
if (beginIndex < 0 || beginIndex > imageUrl.length()) {
// Fallback to original URL if the beginIndex is invalid to avoid `StringIndexOutOfBoundsException`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NP: It seems that imageUrl is conditionally mutated a few times prior to this. Should we tweak this code comment to not mention "original" URL? Or, alternatively, if that is what we want, store it in a local var at the top of the function and return it here without mutation? 🤔

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good suggestion @mkevins 👍
In the other scheme error that the imageUrl is returned it hasn't been mutated yet. I think it makes sense to keep a copy of the url before any changes and return that.
I changed the code with e6b28eb

// Ref: https://github.com/wordpress-mobile/WordPress-Android/issues/18626
return originalUrl;
}
return "https://i0.wp.com/" + imageUrl.substring(beginIndex) + query;
}
}
Loading