octoleo/plantuml-server
1
0
Fork 0
mirror of https://github.com/octoleo/plantuml-server.git synced 2025-01-03 05:00:14 +00:00
Code Issues Releases Wiki Activity

HTTP redirect after POST

Browse Source
This commit is contained in:
Arnaud Roques 2016-05-18 22:55:16 +02:00
parent 85699130d0
commit 8737cea8e6
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/sourceforge/plantuml/servlet/PlantUmlServlet.java
View File

@ -49,7 +49,7 @@ import net.sourceforge.plantuml.png.MetadataTag;
* *
* 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
@ -61,12 +61,9 @@ public class PlantUmlServlet extends HttpServlet {
private static final String DEFAULT_ENCODED_TEXT = "SyfFKj2rKt3CoKnELR1Io4ZDoSa70000"; private static final String DEFAULT_ENCODED_TEXT = "SyfFKj2rKt3CoKnELR1Io4ZDoSa70000";
// Last part of the URL // Last part of the URL
public static final Pattern urlPattern = Pattern.compile("^.*[^a-zA-Z0-9\\-\\_]([a-zA-Z0-9\\-\\_]+)"); public static final Pattern URL_PATTERN = Pattern.compile("^.*[^a-zA-Z0-9\\-\\_]([a-zA-Z0-9\\-\\_]+)");
// Format of a compressed diagram private static final Pattern RECOVER_UML_PATTERN = Pattern.compile("/\\w+/uml/(.*)");
public static final Pattern encodedPattern = Pattern.compile("^[a-zA-Z0-9\\-\\_]+$");
private static final Pattern recoverUmlPattern = Pattern.compile("/\\w+/uml/(.*)");
@Override @Override
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException {
@ -135,14 +132,14 @@ public class PlantUmlServlet extends HttpServlet {
private String getTextFromUrl(HttpServletRequest request, String text) throws IOException { private String getTextFromUrl(HttpServletRequest request, String text) throws IOException {
String url = request.getParameter("url"); String url = request.getParameter("url");
final Matcher recoverUml = recoverUmlPattern.matcher(request.getRequestURI()); final Matcher recoverUml = RECOVER_UML_PATTERN.matcher(request.getRequestURI());
// the URL form has been submitted // the URL form has been submitted
if (recoverUml.matches()) { if (recoverUml.matches()) {
final String data = recoverUml.group(1); final String data = recoverUml.group(1);
text = getTranscoder().decode(data); text = getTranscoder().decode(data);
} else if (url != null && !url.trim().isEmpty()) { } else if (url != null && !url.trim().isEmpty()) {
// Catch the last part of the URL if necessary // Catch the last part of the URL if necessary
final Matcher m1 = urlPattern.matcher(url); final Matcher m1 = URL_PATTERN.matcher(url);
if (m1.find()) { if (m1.find()) {
url = m1.group(1); url = m1.group(1);
} }