Truncate long URL fragments in Android page info popup

Truncate long URL fragments in Android page info popup

This replaces percent-encoding whitespace as a method to combat the use
of crafted URL fragments to inject messages into the page info popup. By
truncating the URL so that at most two lines of the fragment are shown,
we prevent lengthy messages from being injected while minimising the
effect on most URLs.

BUG=466351
Committed: https://crrev.com/5bf8a2dccf4777c5f065d918d1d9a2bbaa013f9f
Cr-Commit-Position: refs/heads/master@{#325358}

[tsergeant, 2015-04-15 01:10:57]

tsergeant@chromium.org changed reviewers:
+ dtrainor@chromium.org, sashab@chromium.org

[tsergeant, 2015-04-15 01:10:58]

dtrainor@, can you please review?

sashab@, can you take a quick look if you get a chance?

[juhonurm, 2015-04-15 05:00:40]

juhonurm@gmail.com changed reviewers:
+ juhonurm@gmail.com

[juhonurm, 2015-04-15 05:00:41]

https://codereview.chromium.org/1077483002/diff/40001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
(right):

https://codereview.chromium.org/1077483002/diff/40001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java:135:
int originEndIndex = OmniboxUrlEmphasizer.getOriginEndIndex(urlText, mProfile);
OmniboxUrlEmphasizer.getOriginEndIndex only works with http(s) URLs, so for
example with an FTP URL, a situation where mTruncatedUrlLinesToDisplay >
mFullLinesToDisplay is possible. That shouldn't be.

[tsergeant, 2015-04-15 05:47:20]

Thanks, good pickup.

https://codereview.chromium.org/1077483002/diff/40001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
(right):

https://codereview.chromium.org/1077483002/diff/40001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java:135:
int originEndIndex = OmniboxUrlEmphasizer.getOriginEndIndex(urlText, mProfile);
On 2015/04/15 05:00:41, juhonurm wrote:
> OmniboxUrlEmphasizer.getOriginEndIndex only works with http(s) URLs, so for
> example with an FTP URL, a situation where mTruncatedUrlLinesToDisplay >
> mFullLinesToDisplay is possible. That shouldn't be. 

Done.

[juhonurm, 2015-04-15 06:07:58]

https://codereview.chromium.org/1077483002/diff/60001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
(right):

https://codereview.chromium.org/1077483002/diff/60001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java:150:
fragmentStartIndex = urlText.length();
Now the original issue is ignored in non-HTTP(S) URLs.

[tsergeant, 2015-04-15 07:13:54]

/facepalm

Thanks, actually fixed this time.

https://codereview.chromium.org/1077483002/diff/60001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java
(right):

https://codereview.chromium.org/1077483002/diff/60001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java:150:
fragmentStartIndex = urlText.length();
On 2015/04/15 06:07:57, juhonurm wrote:
> Now the original issue is ignored in non-HTTP(S) URLs. 

Done.

[juhonurm, 2015-04-15 13:26:08]

lgtm

[David Trainor- moved to gerrit, 2015-04-15 16:30:04]

lgtm

[tsergeant, 2015-04-16 00:12:04]

The CQ bit was checked by tsergeant@chromium.org

[commit-bot: I haz the power, 2015-04-16 00:12:37]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1077483002/80001

[commit-bot: I haz the power, 2015-04-16 00:36:30]

Committed patchset #5 (id:80001)

[commit-bot: I haz the power, 2015-04-16 00:37:21]

Patchset 5 (id:??) landed as
https://crrev.com/5bf8a2dccf4777c5f065d918d1d9a2bbaa013f9f
Cr-Commit-Position: refs/heads/master@{#325358}