mirror of
https://github.com/octoleo/plantuml-server.git
synced 2025-02-03 19:18:25 +00:00
HTTP redirect after POST
This commit is contained in:
Arnaud Roques
parent
e7ed068417
commit
94fb4cd383
@ -24,25 +24,24 @@
|
|||||||
package net.sourceforge.plantuml.servlet;
|
package net.sourceforge.plantuml.servlet;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.URLDecoder;
|
import java.io.InputStream;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
import java.util.StringTokenizer;
|
import java.util.StringTokenizer;
|
||||||
import java.util.regex.Matcher;
|
import java.util.regex.Matcher;
|
||||||
import java.util.regex.Pattern;
|
import java.util.regex.Pattern;
|
||||||
|
|
||||||
|
import javax.net.ssl.HttpsURLConnection;
|
||||||
import javax.servlet.RequestDispatcher;
|
import javax.servlet.RequestDispatcher;
|
||||||
import javax.servlet.ServletException;
|
import javax.servlet.ServletException;
|
||||||
import javax.servlet.http.HttpServlet;
|
import javax.servlet.http.HttpServlet;
|
||||||
import javax.servlet.http.HttpServletRequest;
|
import javax.servlet.http.HttpServletRequest;
|
||||||
import javax.servlet.http.HttpServletResponse;
|
import javax.servlet.http.HttpServletResponse;
|
||||||
|
|
||||||
import net.sourceforge.plantuml.FileFormat;
|
import net.sourceforge.plantuml.api.PlantumlUtils;
|
||||||
import net.sourceforge.plantuml.FileFormatOption;
|
|
||||||
import net.sourceforge.plantuml.SourceStringReader;
|
|
||||||
import net.sourceforge.plantuml.StringUtils;
|
|
||||||
import net.sourceforge.plantuml.code.Transcoder;
|
import net.sourceforge.plantuml.code.Transcoder;
|
||||||
import net.sourceforge.plantuml.code.TranscoderUtil;
|
import net.sourceforge.plantuml.code.TranscoderUtil;
|
||||||
import net.sourceforge.plantuml.servlet.utility.Configuration;
|
import net.sourceforge.plantuml.png.MetadataTag;
|
||||||
import net.sourceforge.plantuml.api.PlantumlUtils;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Original idea from Achim Abeling for Confluence macro
|
* Original idea from Achim Abeling for Confluence macro
|
||||||
@ -50,7 +49,7 @@ import net.sourceforge.plantuml.api.PlantumlUtils;
|
|||||||
*
|
*
|
||||||
* This class is the old all-in-one historic implementation of the PlantUml server.
|
* This class is the old all-in-one historic implementation of the PlantUml server.
|
||||||
* See package.html for the new design. It's a work in progress.
|
* See package.html for the new design. It's a work in progress.
|
||||||
*
|
*
|
||||||
* Modified by Arnaud Roques
|
* Modified by Arnaud Roques
|
||||||
* Modified by Pablo Lalloni
|
* Modified by Pablo Lalloni
|
||||||
* Modified by Maxime Sinclair
|
* Modified by Maxime Sinclair
|
||||||
@ -59,120 +58,133 @@ import net.sourceforge.plantuml.api.PlantumlUtils;
|
|||||||
@SuppressWarnings("serial")
|
@SuppressWarnings("serial")
|
||||||
public class PlantUmlServlet extends HttpServlet {
|
public class PlantUmlServlet extends HttpServlet {
|
||||||
|
|
||||||
private static final Pattern URL_PATTERN = Pattern.compile(".*/(.*)"); // Last part of the URL
|
private static final String DEFAULT_ENCODED_TEXT = "SyfFKj2rKt3CoKnELR1Io4ZDoSa70000";
|
||||||
private static final Pattern ENCODED_PATTERN = Pattern.compile("^[a-zA-Z0-9\\-\\_]+$"); // Format of a compressed
|
|
||||||
// diagram
|
|
||||||
private static final Pattern START_PATTERN = Pattern.compile("/\\w+/start/(.*)");
|
|
||||||
|
|
||||||
@Override
|
// Last part of the URL
|
||||||
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
public static final Pattern urlPattern = Pattern.compile("^.*[^a-zA-Z0-9\\-\\_]([a-zA-Z0-9\\-\\_]+)");
|
||||||
|
|
||||||
final String uri = request.getRequestURI();
|
// Format of a compressed diagram
|
||||||
Matcher startumlMatcher = START_PATTERN.matcher(uri);
|
public static final Pattern encodedPattern = Pattern.compile("^[a-zA-Z0-9\\-\\_]+$");
|
||||||
if (startumlMatcher.matches()) {
|
|
||||||
System.out.println("PlantUML WARNING This syntax is deprecated.");
|
|
||||||
String source = startumlMatcher.group(1);
|
|
||||||
handleImage(response, source, uri);
|
|
||||||
} else {
|
|
||||||
doPost(request, response);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
private static final Pattern recoverUmlPattern = Pattern.compile("/\\w+/uml/(.*)");
|
||||||
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
|
|
||||||
IOException {
|
|
||||||
|
|
||||||
request.setCharacterEncoding("UTF-8");
|
@Override
|
||||||
String text = request.getParameter("text");
|
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
|
||||||
String url = request.getParameter("url");
|
request.setCharacterEncoding("UTF-8");
|
||||||
String encoded = "";
|
String text = request.getParameter("text");
|
||||||
|
|
||||||
Transcoder transcoder = getTranscoder();
|
String metadata = request.getParameter("metadata");
|
||||||
// the URL form has been submitted
|
if (metadata != null) {
|
||||||
if (url != null && !url.trim().isEmpty()) {
|
InputStream img = null;
|
||||||
// Catch the last part of the URL if necessary
|
try {
|
||||||
Matcher m1 = URL_PATTERN.matcher(url);
|
img = getImage(new URL(metadata));
|
||||||
if (m1.find()) {
|
MetadataTag metadataTag = new MetadataTag(img, "plantuml");
|
||||||
url = m1.group(1);
|
String data = metadataTag.getData();
|
||||||
}
|
if (data != null) {
|
||||||
// Check it's a valid compressed text
|
text = data;
|
||||||
Matcher m2 = ENCODED_PATTERN.matcher(url);
|
}
|
||||||
if (m2.find()) {
|
} finally {
|
||||||
url = m2.group(0);
|
if (img != null) {
|
||||||
text = transcoder.decode(url);
|
img.close();
|
||||||
} else {
|
}
|
||||||
System.out.println("PlantUML ERROR Not a valid compressed string : " + url);
|
}
|
||||||
}
|
}
|
||||||
}
|
try {
|
||||||
// the Text form has been submitted
|
text = getTextFromUrl(request, text);
|
||||||
if (text != null && !text.trim().isEmpty()) {
|
} catch (Exception e) {
|
||||||
encoded = transcoder.encode(text);
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
request.setAttribute("decoded", text);
|
// no Text form has been submitted
|
||||||
request.setAttribute("encoded", encoded);
|
if (text == null || text.trim().isEmpty()) {
|
||||||
|
redirectNow(request, response, DEFAULT_ENCODED_TEXT);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// check if an image map is necessary
|
final String encoded = getTranscoder().encode(text);
|
||||||
if (text != null && PlantumlUtils.hasCMapData(text)) {
|
request.setAttribute("decoded", text);
|
||||||
request.setAttribute("mapneeded", Boolean.TRUE);
|
request.setAttribute("encoded", encoded);
|
||||||
}
|
|
||||||
|
|
||||||
// forward to index.jsp
|
// check if an image map is necessary
|
||||||
RequestDispatcher dispatcher = request.getRequestDispatcher("/index.jsp");
|
if (text != null && PlantumlUtils.hasCMapData(text)) {
|
||||||
dispatcher.forward(request, response);
|
request.setAttribute("mapneeded", Boolean.TRUE);
|
||||||
return;
|
}
|
||||||
}
|
// forward to index.jsp
|
||||||
|
final RequestDispatcher dispatcher = request.getRequestDispatcher("/index.jsp");
|
||||||
|
dispatcher.forward(request, response);
|
||||||
|
|
||||||
public void init() throws ServletException {
|
}
|
||||||
getServletConfig().getServletContext().setAttribute("cfg", Configuration.get());
|
|
||||||
}
|
|
||||||
|
|
||||||
private Transcoder getTranscoder() {
|
@Override
|
||||||
return TranscoderUtil.getDefaultTranscoder();
|
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException,
|
||||||
}
|
IOException {
|
||||||
|
request.setCharacterEncoding("UTF-8");
|
||||||
|
|
||||||
// This method will be removed in a near future, please don't use it.
|
String text = request.getParameter("text");
|
||||||
private void handleImage(HttpServletResponse response, String source, String uri) throws IOException {
|
String encoded = DEFAULT_ENCODED_TEXT;
|
||||||
source = URLDecoder.decode(source, "UTF-8");
|
|
||||||
StringBuilder plantUmlSource = new StringBuilder();
|
|
||||||
|
|
||||||
StringTokenizer tokenizer = new StringTokenizer(source, "/@");
|
try {
|
||||||
while (tokenizer.hasMoreTokens()) {
|
text = getTextFromUrl(request, text);
|
||||||
String token = tokenizer.nextToken();
|
encoded = getTranscoder().encode(text);
|
||||||
plantUmlSource.append(token).append("\n");
|
} catch (Exception e) {
|
||||||
}
|
e.printStackTrace();
|
||||||
sendImage(response, plantUmlSource.toString(), uri);
|
}
|
||||||
|
|
||||||
|
redirectNow(request, response, encoded);
|
||||||
|
}
|
||||||
|
|
||||||
|
private String getTextFromUrl(HttpServletRequest request, String text) throws IOException {
|
||||||
|
String url = request.getParameter("url");
|
||||||
|
final Matcher recoverUml = recoverUmlPattern.matcher(request.getRequestURI());
|
||||||
|
// the URL form has been submitted
|
||||||
|
if (recoverUml.matches()) {
|
||||||
|
final String data = recoverUml.group(1);
|
||||||
|
text = getTranscoder().decode(data);
|
||||||
|
} else if (url != null && !url.trim().isEmpty()) {
|
||||||
|
// Catch the last part of the URL if necessary
|
||||||
|
final Matcher m1 = urlPattern.matcher(url);
|
||||||
|
if (m1.find()) {
|
||||||
|
url = m1.group(1);
|
||||||
|
}
|
||||||
|
text = getTranscoder().decode(url);
|
||||||
|
}
|
||||||
|
return text;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void redirectNow(HttpServletRequest request, HttpServletResponse response, String encoded)
|
||||||
|
throws IOException {
|
||||||
|
final String result = request.getContextPath() + "/uml/" + encoded;
|
||||||
|
response.sendRedirect(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
private Transcoder getTranscoder() {
|
||||||
|
return TranscoderUtil.getDefaultTranscoder();
|
||||||
|
}
|
||||||
|
|
||||||
|
static private HttpURLConnection getConnection(URL url) throws IOException {
|
||||||
|
if (url.getProtocol().startsWith("https")) {
|
||||||
|
HttpsURLConnection con = (HttpsURLConnection) url.openConnection();
|
||||||
|
con.setRequestMethod("GET");
|
||||||
|
con.setReadTimeout(10000); // 10 seconds
|
||||||
|
// printHttpsCert(con);
|
||||||
|
con.connect();
|
||||||
|
return con;
|
||||||
|
} else {
|
||||||
|
HttpURLConnection con = (HttpURLConnection) url.openConnection();
|
||||||
|
con.setRequestMethod("GET");
|
||||||
|
con.setReadTimeout(10000); // 10 seconds
|
||||||
|
con.connect();
|
||||||
|
return con;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static public InputStream getImage(URL url) throws IOException {
|
||||||
|
InputStream is = null;
|
||||||
|
HttpURLConnection con = getConnection(url);
|
||||||
|
is = con.getInputStream();
|
||||||
|
return is;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
// This method will be removed in a near future, please don't use it.
|
|
||||||
private void sendImage(HttpServletResponse response, String text, String uri) throws IOException {
|
|
||||||
final String uml;
|
|
||||||
if (text.startsWith("@startuml")) {
|
|
||||||
uml = text;
|
|
||||||
} else {
|
|
||||||
StringBuilder plantUmlSource = new StringBuilder();
|
|
||||||
plantUmlSource.append("@startuml\n");
|
|
||||||
plantUmlSource.append(text);
|
|
||||||
if (text.endsWith("\n") == false) {
|
|
||||||
plantUmlSource.append("\n");
|
|
||||||
}
|
|
||||||
plantUmlSource.append("@enduml");
|
|
||||||
uml = plantUmlSource.toString();
|
|
||||||
}
|
|
||||||
// Write the first image to "os"
|
|
||||||
long today = System.currentTimeMillis();
|
|
||||||
if (StringUtils.isDiagramCacheable(uml)) {
|
|
||||||
// Add http headers to force the browser to cache the image
|
|
||||||
response.addDateHeader("Expires", today + 31536000000L);
|
|
||||||
// today + 1 year
|
|
||||||
response.addDateHeader("Last-Modified", 1261440000000L);
|
|
||||||
// 2009 dec 22 constant date in the past
|
|
||||||
response.addHeader("Cache-Control", "public");
|
|
||||||
}
|
|
||||||
response.setContentType("image/png");
|
|
||||||
SourceStringReader reader = new SourceStringReader(uml);
|
|
||||||
reader.generateImage(response.getOutputStream(), new FileFormatOption(FileFormat.PNG, false));
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -45,7 +45,7 @@
|
|||||||
</servlet>
|
</servlet>
|
||||||
<!-- Patterns of the servlet -->
|
<!-- Patterns of the servlet -->
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
<servlet-name>welcome</servlet-name>
|
<servlet-name>plantumlservlet</servlet-name>
|
||||||
<url-pattern>/welcome</url-pattern>
|
<url-pattern>/welcome</url-pattern>
|
||||||
</servlet-mapping>
|
</servlet-mapping>
|
||||||
<servlet-mapping>
|
<servlet-mapping>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user