Skip to content
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

Add load url to set cookie, redirect to index.html #60

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Add load url to set cookie, redirect to index.html #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87e3ca4
* add fake HASH as valid hash for testing purposes
parrt Nov 21, 2022
db57672
clean up load servlet
parrt Nov 21, 2022
f5726ff
snapshot... The seems mostly OK but I'd like to change how we do rout…
parrt Nov 23, 2022
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
133 changes: 1 addition & 132 deletions src/org/antlr/v4/server/ANTLRHttpServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,152 +1,20 @@
package org.antlr.v4.server;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.stream.JsonReader;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.antlr.v4.server.persistent.PersistenceLayer;
import org.antlr.v4.server.persistent.cloudstorage.CloudStoragePersistenceLayer;
import org.antlr.v4.server.unique.DummyUniqueKeyGenerator;
import org.antlr.v4.server.unique.UniqueKeyGenerator;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.slf4j.LoggerFactory;



import java.io.*;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Optional;

import static org.antlr.v4.server.GrammarProcessor.interp;

public class ANTLRHttpServer {
public static final String IMAGES_DIR = "/tmp/antlr-images";

public static class ParseServlet extends DefaultServlet {
static final ch.qos.logback.classic.Logger LOGGER =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger(ANTLRHttpServer.class);

@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException
{

JsonObject jsonResponse = new JsonObject();
try {
response.setContentType("text/plain;charset=utf-8");
response.setContentType("text/html;");
response.addHeader("Access-Control-Allow-Origin", "*");

JsonObject jsonObj = JsonParser.parseReader(request.getReader()).getAsJsonObject();
// System.out.println(jsonObj);

String grammar = jsonObj.get("grammar").getAsString();
String lexGrammar = jsonObj.get("lexgrammar").getAsString(); // can be null
String input = jsonObj.get("input").getAsString();
String startRule = jsonObj.get("start").getAsString();

StringBuilder logMsg = new StringBuilder();
logMsg.append("GRAMMAR:\n");
logMsg.append(grammar);
logMsg.append("\nLEX GRAMMAR:\n");
logMsg.append(lexGrammar);
logMsg.append("\nINPUT:\n\"\"\"");
logMsg.append(input);
logMsg.append("\"\"\"\n");
logMsg.append("STARTRULE: ");
logMsg.append(startRule);
logMsg.append('\n');
LOGGER.info(logMsg.toString());

if (grammar.strip().length() == 0 && lexGrammar.strip().length() == 0) {
jsonResponse.addProperty("arg_error", "missing either combined grammar or lexer and " +
"parser both");
}
else if (grammar.strip().length() == 0 && lexGrammar.strip().length() > 0) {
jsonResponse.addProperty("arg_error", "missing parser grammar");
}
else if (startRule.strip().length() == 0) {
jsonResponse.addProperty("arg_error", "missing start rule");
}
else if (input.length() == 0) {
jsonResponse.addProperty("arg_error", "missing input");
}
else {
try {
jsonResponse = interp(grammar, lexGrammar, input, startRule);
}
catch (ParseCancellationException pce) {
jsonResponse.addProperty("exception_trace", "parser timeout ("+GrammarProcessor.MAX_PARSE_TIME_MS+"ms)");
}
catch (Throwable e) {
e.printStackTrace(System.err);
}
}
}
catch (Exception e) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
jsonResponse.addProperty("exception_trace", sw.toString());
jsonResponse.addProperty("exception", e.getMessage());
}
LOGGER.info("RESULT:\n"+jsonResponse);
response.setStatus(HttpServletResponse.SC_OK);
PrintWriter w = response.getWriter();
w.write(new Gson().toJson(jsonResponse));
w.flush();
}
}

public static class ShareServlet extends DefaultServlet {
static final ch.qos.logback.classic.Logger LOGGER =
(ch.qos.logback.classic.Logger)LoggerFactory.getLogger(ANTLRHttpServer.class);

@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException
{
final JsonObject jsonResponse = new JsonObject();
try {
response.setContentType("text/plain;charset=utf-8");
response.setContentType("text/html;");
response.addHeader("Access-Control-Allow-Origin", "*");

JsonObject jsonObj = JsonParser.parseReader(request.getReader()).getAsJsonObject();
PersistenceLayer<String> persistenceLayer = new CloudStoragePersistenceLayer();
UniqueKeyGenerator keyGen = new DummyUniqueKeyGenerator();
Optional<String> uniqueKey = keyGen.generateKey();
persistenceLayer.persist(new Gson().toJson(jsonResponse).getBytes(StandardCharsets.UTF_8),
uniqueKey.orElseThrow());

jsonResponse.addProperty("resource_id", uniqueKey.orElseThrow());
}
catch (Exception e) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
jsonResponse.addProperty("exception_trace", sw.toString());
jsonResponse.addProperty("exception", e.getMessage());

}
LOGGER.info("RESULT:\n"+jsonResponse);
response.setStatus(HttpServletResponse.SC_OK);
PrintWriter w = response.getWriter();
w.write(new Gson().toJson(jsonResponse));
w.flush();
}
}

public static void main(String[] args) throws Exception {
new File(IMAGES_DIR).mkdirs();

Expand All @@ -168,6 +36,7 @@ public static void main(String[] args) throws Exception {
context.setContextPath("/");
context.addServlet(new ServletHolder(new ParseServlet()), "/parse/*");
context.addServlet(new ServletHolder(new ShareServlet()), "/share/*");
context.addServlet(new ServletHolder(new LoadServlet()), "/load/*");

ServletHolder holderHome = new ServletHolder("static-home", DefaultServlet.class);
holderHome.setInitParameter("resourceBase", "static");
Expand Down
2 changes: 1 addition & 1 deletion src/org/antlr/v4/server/GrammarProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

import static org.antlr.v4.gui.Interpreter.profilerColumnNames;
import static org.antlr.v4.server.ANTLRHttpServer.IMAGES_DIR;
import static org.antlr.v4.server.ANTLRHttpServer.ParseServlet.LOGGER;
import static org.antlr.v4.server.ParseServlet.LOGGER;
import static us.parr.lib.ParrtSys.execInDir;

import java.io.*;
Expand Down
50 changes: 50 additions & 0 deletions src/org/antlr/v4/server/LoadServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package org.antlr.v4.server;

import jakarta.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.antlr.v4.server.persistent.PersistenceLayer;
import org.antlr.v4.server.persistent.cloudstorage.CloudStoragePersistenceLayer;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.security.InvalidKeyException;

public class LoadServlet extends DefaultServlet {
static final ch.qos.logback.classic.Logger LOGGER =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ANTLRHttpServer.class);

@Override
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException {
try {
String path = request.getPathInfo();
String hash = path.substring(path.indexOf('/') + 1);
PersistenceLayer<String> persistenceLayer = new CloudStoragePersistenceLayer();
if ( !persistenceLayer.exists(hash) ) {
LOGGER.info("Load: Unknown " + hash);
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
return;
}

LOGGER.info("Load: " + hash);
Cookie hashCookie = new Cookie("resource_id", hash);
hashCookie.setPath("/");
hashCookie.setComment("__SAME_SITE_LAX__"); // Chrome apparently needs this or cookies disappear
response.addCookie(hashCookie);
response.sendRedirect("/index.html");
}
catch (Exception e) {
PrintWriter pw = response.getWriter();
e.printStackTrace(pw);
pw.flush();
response.setContentType("text/plain;charset=utf-8");
response.setContentType("text/html;");
response.addHeader("Access-Control-Allow-Origin", "*");
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
}
}
}
84 changes: 84 additions & 0 deletions src/org/antlr/v4/server/ParseServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
package org.antlr.v4.server;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.antlr.v4.runtime.misc.ParseCancellationException;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;

import static org.antlr.v4.server.GrammarProcessor.interp;

public class ParseServlet extends DefaultServlet {
static final ch.qos.logback.classic.Logger LOGGER =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ANTLRHttpServer.class);

@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException {

JsonObject jsonResponse = new JsonObject();
try {
response.setContentType("text/plain;charset=utf-8");
response.setContentType("text/html;");
response.addHeader("Access-Control-Allow-Origin", "*");

JsonObject jsonObj = JsonParser.parseReader(request.getReader()).getAsJsonObject();
// System.out.println(jsonObj);

String grammar = jsonObj.get("grammar").getAsString();
String lexGrammar = jsonObj.get("lexgrammar").getAsString(); // can be null
String input = jsonObj.get("input").getAsString();
String startRule = jsonObj.get("start").getAsString();

StringBuilder logMsg = new StringBuilder();
logMsg.append("GRAMMAR:\n");
logMsg.append(grammar);
logMsg.append("\nLEX GRAMMAR:\n");
logMsg.append(lexGrammar);
logMsg.append("\nINPUT:\n\"\"\"");
logMsg.append(input);
logMsg.append("\"\"\"\n");
logMsg.append("STARTRULE: ");
logMsg.append(startRule);
logMsg.append('\n');
LOGGER.info(logMsg.toString());

if (grammar.strip().length() == 0 && lexGrammar.strip().length() == 0) {
jsonResponse.addProperty("arg_error", "missing either combined grammar or lexer and " +
"parser both");
} else if (grammar.strip().length() == 0 && lexGrammar.strip().length() > 0) {
jsonResponse.addProperty("arg_error", "missing parser grammar");
} else if (startRule.strip().length() == 0) {
jsonResponse.addProperty("arg_error", "missing start rule");
} else if (input.length() == 0) {
jsonResponse.addProperty("arg_error", "missing input");
} else {
try {
jsonResponse = interp(grammar, lexGrammar, input, startRule);
} catch (ParseCancellationException pce) {
jsonResponse.addProperty("exception_trace", "parser timeout (" + GrammarProcessor.MAX_PARSE_TIME_MS + "ms)");
} catch (Throwable e) {
e.printStackTrace(System.err);
}
}
} catch (Exception e) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
jsonResponse.addProperty("exception_trace", sw.toString());
jsonResponse.addProperty("exception", e.getMessage());
}
LOGGER.info("RESULT:\n" + jsonResponse);
response.setStatus(HttpServletResponse.SC_OK);
PrintWriter w = response.getWriter();
w.write(new Gson().toJson(jsonResponse));
w.flush();
}
}
57 changes: 57 additions & 0 deletions src/org/antlr/v4/server/ShareServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
package org.antlr.v4.server;

import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import org.antlr.v4.server.persistent.PersistenceLayer;
import org.antlr.v4.server.persistent.cloudstorage.CloudStoragePersistenceLayer;
import org.antlr.v4.server.unique.DummyUniqueKeyGenerator;
import org.antlr.v4.server.unique.UniqueKeyGenerator;
import org.eclipse.jetty.servlet.DefaultServlet;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.nio.charset.StandardCharsets;
import java.util.Optional;

public class ShareServlet extends DefaultServlet {
static final ch.qos.logback.classic.Logger LOGGER =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(ANTLRHttpServer.class);

@Override
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws IOException {
final JsonObject jsonResponse = new JsonObject();
try {
response.setContentType("text/plain;charset=utf-8");
response.setContentType("text/html;");
response.addHeader("Access-Control-Allow-Origin", "*");

JsonObject jsonObj = JsonParser.parseReader(request.getReader()).getAsJsonObject();
PersistenceLayer<String> persistenceLayer = new CloudStoragePersistenceLayer();
UniqueKeyGenerator keyGen = new DummyUniqueKeyGenerator();
// TODO: store jsonObj
Optional<String> uniqueKey = keyGen.generateKey();
persistenceLayer.persist(new Gson().toJson(jsonResponse).getBytes(StandardCharsets.UTF_8),
uniqueKey.orElseThrow());

jsonResponse.addProperty("resource_id", uniqueKey.orElseThrow());
} catch (Exception e) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
e.printStackTrace(pw);
jsonResponse.addProperty("exception_trace", sw.toString());
jsonResponse.addProperty("exception", e.getMessage());

}
LOGGER.info("RESULT:\n" + jsonResponse);
response.setStatus(HttpServletResponse.SC_OK);
PrintWriter w = response.getWriter();
w.write(new Gson().toJson(jsonResponse));
w.flush();
}
}
3 changes: 3 additions & 0 deletions src/org/antlr/v4/server/persistent/PersistenceLayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ public interface PersistenceLayer<K> {
*/
void persist(byte[] buffer, K identifier) throws IOException;

/** Return true if the identifier exists in the underlying storage system. */
boolean exists(String identifier);

/**
* Retrieves the content from
* @param identifier identifier for the persisted content
Expand Down
Loading