RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Encode correctly http parameters

Browse source 
If the value of the parameters had URI reserved characters, they must
be encoded. URI builder handles that.
This commit is contained in:
Oscar Gonzalez Fernandez 2013-06-05 18:52:15 +02:00
parent f14de444ac
commit dc639f61a3
1 changed files with 24 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
libreplan-webapp/src/main/java/org/libreplan/web/print/CutyPrint.java
View file

@ -42,6 +42,7 @@ import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.UriBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@ -224,7 +225,29 @@ public class CutyPrint {
});
String pageToSnapshot = CallbackServlet.registerAndCreateURLFor(
request, snapshotRequestHandler);
return createCaptureURL(request, printParameters, pageToSnapshot);
return createCaptureURL(pageToSnapshot);
}
private String createCaptureURL(String capturePath) {
String hostName = resolveLocalHost();
String uri = String.format("%s://%s:%s", request.getScheme(),
hostName, request.getLocalPort());
UriBuilder result = UriBuilder.fromUri(uri).path(capturePath);
for (Entry<String, String> entry : printParameters.entrySet()) {
result = result.queryParam(entry.getKey(), entry.getValue());
}
return result.build().toASCIIString();
}
private String resolveLocalHost() {
try {
InetAddress host = InetAddress
.getByName(request.getLocalName());
return host.getHostName();
} catch (UnknownHostException e) {
throw new RuntimeException(e);
}
}
private int buildMinWidthParam() {
@ -317,32 +340,6 @@ public class CutyPrint {
+ extension;
}
private static String createCaptureURL(HttpServletRequest request,
Map<String, String> parameters, String capturePath) {
// Add capture destination callback URL
String hostName = resolveLocalHost(request);
String result = request.getScheme() + "://" + hostName
+ ":" + request.getLocalPort() + capturePath;
if (parameters != null) {
result += "?";
for (String key : parameters.keySet()) {
result += key + "=" + parameters.get(key) + "&";
}
result = result.substring(0,
(result.length() - 1));
}
return result;
}
private static String resolveLocalHost(HttpServletRequest request) {
try {
InetAddress host = InetAddress.getByName(request.getLocalName());
return host.getHostName();
} catch (UnknownHostException e) {
throw new RuntimeException(e);
}
}
private static int calculatePlannerWidthForPrintingScreen(Planner planner,
int minWidthForTaskNameColumn) {
if (planner != null && planner.getTimeTracker() != null) {