Skip to content

diff.jsp link encoding #4837

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

Merged
merged 4 commits into from
Sep 1, 2025
Merged

diff.jsp link encoding #4837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dc929e
add missing space
vladak Sep 1, 2025
b76b21f
add missing parameter
vladak Sep 1, 2025
42cc87b
use isEmpty() instead of length check
vladak Sep 1, 2025
3fcfaf8
construct URL from scratch
vladak Sep 1, 2025
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
5 changes: 3 additions & 2 deletions opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,7 @@ private void populateGenreIfEmpty(DiffData data, InputStream[] inArray) {
}
}
}

private void populateRevisionData(DiffData data) {
try {
data.revision = Diff.diff(data.file[0], data.file[1]);
Expand All @@ -384,7 +385,7 @@ private void populateRevisionURLDetails(DiffData data, String[] filePath) {
filePath[i] + "@" + data.rev[i], null);
data.param[i] = u.getRawQuery();
} catch (URISyntaxException e) {
LOGGER.log(Level.WARNING, "Failed to create URI: ", Laundromat.launderLog(e.toString()));
LOGGER.log(Level.WARNING, "Failed to create URI: {}", Laundromat.launderLog(e.toString()));
}
});
}
Expand Down Expand Up @@ -1219,7 +1220,7 @@ public boolean isDir() {
}

private static String trailingSlash(String path) {
return path.length() == 0 || path.charAt(path.length() - 1) != PATH_SEPARATOR
return path.isEmpty() || path.charAt(path.length() - 1) != PATH_SEPARATOR
? PATH_SEPARATOR_STRING
: "";
}
Expand Down
20 changes: 10 additions & 10 deletions opengrok-web/src/main/webapp/diff.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ include file="/mast.jsp"
int ln2 = 0;
String rp1 = data.getParam(0);
String rp2 = data.getParam(1);
String reqURI = request.getRequestURI();
String baseURL = request.getContextPath() + Prefix.DIFF_P + cfg.getUriEncodedPath();
String[] file1 = data.getFile(0);
String[] file2 = data.getFile(1);

Expand All @@ -169,7 +169,7 @@ include file="/mast.jsp"
}
%></span><%
} else {
%> <span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
%> <span><a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= t.getAbbrev() %>&amp;
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %><%= full ? '1' : '0'%>"><%= t.toString() %>
Expand All @@ -186,21 +186,21 @@ include file="/mast.jsp"
<div class="ctype"><%
if (!full) {
%>
<span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
<span><a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= Util.uriEncode(rp2) %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>1">full</a></span>
<span class="active">compact</span><%
} else {
%>
<span class="active">full</span>
<span> <a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
<span> <a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= Util.uriEncode(rp2) %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
<%= QueryParameters.DIFF_LEVEL_PARAM_EQ %>0">compact</a></span><%
}
%><span><a href="#" id="toggle-jumper">jumper</a></span>
<span><a href="<%= reqURI %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
<span><a href="<%= baseURL %>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= Util.uriEncode(rp1) %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= Util.uriEncode(rp2) %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= DiffType.TEXT %>&amp;
action=download">download diff</a></span><%
Expand Down Expand Up @@ -277,7 +277,7 @@ action=download">download diff</a></span><%
Util.htmlize(file2[j]) %><br/><%
}
%><br/>--- <strong><%= cn2 - ln2 - 16
%> unchanged lines hidden</strong> (<a href="<%= reqURI
%> unchanged lines hidden</strong> (<a href="<%= baseURL
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
Expand Down Expand Up @@ -341,7 +341,7 @@ action=download">download diff</a></span><%
Util.htmlize(file1[j]) %><br/><%
}
%><br/>--- <strong><%= cn1 - ln1 - 16
%> unchanged lines hidden</strong> (<a href="<%= reqURI
%> unchanged lines hidden</strong> (<a href="<%= baseURL
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
Expand All @@ -358,7 +358,7 @@ action=download">download diff</a></span><%
Util.htmlize(file2[j]) %><br/><%
}
%><br/>--- <strong><%= cn2 - ln2 - 16
%> unchanged lines hidden</strong> (<a href="<%= reqURI
%> unchanged lines hidden</strong> (<a href="<%= baseURL
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
Expand Down Expand Up @@ -400,7 +400,7 @@ action=download">download diff</a></span><%
Util.htmlize(file1[j]) %><br/><%
}
%><br/>--- <strong><%= cn1 - ln1 - 16
%> unchanged lines hidden</strong> (<a href="<%= reqURI
%> unchanged lines hidden</strong> (<a href="<%= baseURL
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
Expand Down Expand Up @@ -432,7 +432,7 @@ action=download">download diff</a></span><%
Util.htmlize(file2[j]) %><br/><%
}
%><br/>--- <strong><%= cn2 - ln2 - 16
%> unchanged lines hidden</strong> (<a href="<%= reqURI
%> unchanged lines hidden</strong> (<a href="<%= baseURL
%>?<%= QueryParameters.REVISION_1_PARAM_EQ %><%= rp1 %>&amp;
<%= QueryParameters.REVISION_2_PARAM_EQ %><%= rp2 %>&amp;
<%= QueryParameters.FORMAT_PARAM_EQ %><%= type.getAbbrev() %>&amp;
Expand Down
Loading