diff --git a/mirror/src/com/olexyn/mirror/Mirror.java b/mirror/src/com/olexyn/mirror/Mirror.java index f2790f7..df7fa25 100644 --- a/mirror/src/com/olexyn/mirror/Mirror.java +++ b/mirror/src/com/olexyn/mirror/Mirror.java @@ -20,11 +20,21 @@ public class Mirror extends HttpServlet { protected static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; - private final List getList = new ArrayList<>(); - private final List postList = new ArrayList<>(); - private final List putList = new ArrayList<>(); + private final List list = new ArrayList<>(); + + private void addRequest(HttpServletRequest request){ + synchronized (list) { + StringBuffer sb = new StringBuffer(); + sb.append(request.getRequestURL().toString()); + sb.append(WebPrint.SPLIT); + sb.append(request.getMethod()); + sb.append(WebPrint.SPLIT); + sb.append(request.getQueryString()); + list.add(sb.toString()); + } + } // ####### // // ####### @@ -32,9 +42,7 @@ public class Mirror extends HttpServlet { @Override public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { - synchronized (getList) { - getList.add(IOUtils.toString(request.getReader())); - } + addRequest(request); PrintWriter print = response.getWriter(); @@ -48,9 +56,14 @@ public class Mirror extends HttpServlet { print.println(""); print.println(""); print.println(""); - synchronized (getList) { - print.println(WebPrint.list(getList, "GET")); + synchronized (list) { + + print.println(WebPrint.requestList(list)); } + + + + print.println(" "); @@ -58,19 +71,15 @@ public class Mirror extends HttpServlet { @Override - public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException { + public void doPost(HttpServletRequest request, HttpServletResponse response) { - synchronized (postList) { - postList.add(IOUtils.toString(request.getReader())); - } + addRequest(request); } @Override - public void doPut(HttpServletRequest request, HttpServletResponse response) throws IOException{ - synchronized (putList){ - putList.add(IOUtils.toString(request.getReader())); - } + public void doPut(HttpServletRequest request, HttpServletResponse response){ + addRequest(request); } } diff --git a/mirror/war/mirror.war b/mirror/war/mirror.war new file mode 100644 index 0000000..0e0f854 Binary files /dev/null and b/mirror/war/mirror.war differ diff --git a/mirror/war/wrapper/WEB-INF/classes/com/olexyn/mirror/Mirror.class b/mirror/war/wrapper/WEB-INF/classes/com/olexyn/mirror/Mirror.class new file mode 100644 index 0000000..1ce2177 Binary files /dev/null and b/mirror/war/wrapper/WEB-INF/classes/com/olexyn/mirror/Mirror.class differ diff --git a/mirror/war/wrapper/WEB-INF/lib/misphelper.jar b/mirror/war/wrapper/WEB-INF/lib/misphelper.jar new file mode 100644 index 0000000..c76904c Binary files /dev/null and b/mirror/war/wrapper/WEB-INF/lib/misphelper.jar differ diff --git a/mispbridge/war/mispbridge.war b/mispbridge/war/mispbridge.war new file mode 100644 index 0000000..2866fa7 Binary files /dev/null and b/mispbridge/war/mispbridge.war differ diff --git a/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/BridgeServlet.class b/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/BridgeServlet.class new file mode 100644 index 0000000..9770e71 Binary files /dev/null and b/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/BridgeServlet.class differ diff --git a/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/Debug.class b/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/Debug.class new file mode 100644 index 0000000..5720d85 Binary files /dev/null and b/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/Debug.class differ diff --git a/mispbridge/war/wrapper/WEB-INF/lib/misphelper.jar b/mispbridge/war/wrapper/WEB-INF/lib/misphelper.jar new file mode 100644 index 0000000..c76904c Binary files /dev/null and b/mispbridge/war/wrapper/WEB-INF/lib/misphelper.jar differ diff --git a/mispclient/war/mispclient.war b/mispclient/war/mispclient.war new file mode 100644 index 0000000..f19396a Binary files /dev/null and b/mispclient/war/mispclient.war differ diff --git a/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/ClientServlet.class b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/ClientServlet.class new file mode 100644 index 0000000..ed0541d Binary files /dev/null and b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/ClientServlet.class differ diff --git a/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/ConnectionHelper.class b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/ConnectionHelper.class new file mode 100644 index 0000000..b9c4609 Binary files /dev/null and b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/ConnectionHelper.class differ diff --git a/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/Debug.class b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/Debug.class new file mode 100644 index 0000000..37c5e27 Binary files /dev/null and b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/Debug.class differ diff --git a/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/PostRideRunnable.class b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/PostRideRunnable.class new file mode 100644 index 0000000..754d52b Binary files /dev/null and b/mispclient/war/wrapper/WEB-INF/classes/com/olexyn/misp/client/PostRideRunnable.class differ diff --git a/mispclient/war/wrapper/WEB-INF/lib/misphelper.jar b/mispclient/war/wrapper/WEB-INF/lib/misphelper.jar new file mode 100644 index 0000000..c76904c Binary files /dev/null and b/mispclient/war/wrapper/WEB-INF/lib/misphelper.jar differ diff --git a/misphelper/src/com/olexyn/misp/helper/WebPrint.java b/misphelper/src/com/olexyn/misp/helper/WebPrint.java new file mode 100644 index 0000000..c6616a2 --- /dev/null +++ b/misphelper/src/com/olexyn/misp/helper/WebPrint.java @@ -0,0 +1,66 @@ +package com.olexyn.misp.helper; + +import java.util.List; + +public class WebPrint { + + final static public String SPLIT = "io32413445353"; + + public static String list(List list, String type) { + StringBuilder sb = new StringBuilder(); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + + for (String entry : list) { + sb.append(""); + } + + return sb.toString(); + } + + + public static String requestList(List list) { + + StringBuilder sb = new StringBuilder(); + sb.append("
"); + sb.append("List: "); + sb.append(type); + sb.append("
"); + sb.append(entry); + sb.append("
"); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + + for (String entry : list) { + String[] split = entry.split(SPLIT); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + sb.append(""); + } + + return sb.toString(); + } + + + + +}
"); + sb.append("URL"); + sb.append(""); + sb.append("Method"); + sb.append(""); + sb.append("Query"); + sb.append("
"); + sb.append(split[0]); + sb.append(""); + sb.append(split[1]); + sb.append(""); + sb.append(split[2]); + sb.append("