diff --git a/copy-restart.sh b/copy-restart.sh index 8c4b7fd..53ef697 100755 --- a/copy-restart.sh +++ b/copy-restart.sh @@ -8,9 +8,8 @@ echo "================" echo "END TOMCAT STOP " echo "================" -cp -v "${cwd}/mirror/war/mirror.war" /home/user/app/tomcat/webapps -cp -v "${cwd}/mispbridge/war/mispbridge.war" /home/user/app/tomcat/webapps -cp -v "${cwd}/mispclient/war/mispclient.war" /home/user/app/tomcat/webapps +#cp -v "${cwd}/mirror/war/mirror.war" /home/user/app/tomcat/webapps +cp -v "${cwd}/misp-rev/target/misp-rev-0.1.war" /home/user/app/tomcat/webapps echo "================" echo "END COPY" diff --git a/make-war.sh b/make-war.sh deleted file mode 100755 index cc51c78..0000000 --- a/make-war.sh +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/bash - -echo "================" -echo "START RUN" -echo "================" -cwd=$(pwd) - - -# compile and distribute the misphelper.jar -cd "${cwd}/out/production/misphelper" || exit - -jar -cvf misphelper.jar ./com/olexyn/misp/helper/* - - - -echo "================" -echo "END MispHelper JAR" -echo "================" - - - - -a='misp' -b='bridge' - - -n="${a}${b}" -pkg="/com/olexyn/${a}/${b}" -out="/out/production/${n}${pkg}" -wrapper="/${n}/war/wrapper" - -# copy misphelper.jar to wrapper/.../lib -cp -v"${cwd}/out/production/misphelper/misphelper.jar" "${cwd}${wrapper}/WEB-INF/lib" - -# copy compiled code into the wrapper. -cp -vr "${cwd}${out}" "${cwd}${wrapper}/WEB-INF/classes/com/olexyn/${a}" - -# compress .war -cd "${cwd}${wrapper}" || exit -jar -cvf "../${n}.war" * - - -echo "================" -echo "END MispBridge WAR" -echo "================" - - -a='misp' -b='client' - - -n="${a}${b}" -pkg="/com/olexyn/${a}/${b}" -out="/out/production/${n}${pkg}" -wrapper="/${n}/war/wrapper" - -# copy misphelper.jar to wrapper/.../lib -cp -v "${cwd}/out/production/misphelper/misphelper.jar" "${cwd}${wrapper}/WEB-INF/lib" - -# copy compiled code into the wrapper. -cp -vr "${cwd}${out}" "${cwd}${wrapper}/WEB-INF/classes/com/olexyn/${a}" - -# compress .war -cd "${cwd}${wrapper}" || exit -jar -cvf "../${n}.war" * - - -echo "================" -echo "END MispClient WAR" -echo "================" - - - -a='mirror' - -pkg="/com/olexyn/${a}" -out="/out/production/${a}${pkg}" -wrapper="/${a}/war/wrapper" - -# copy misphelper.jar to wrapper/.../lib -cp -v "${cwd}/out/production/misphelper/misphelper.jar" "${cwd}${wrapper}/WEB-INF/lib" - -# copy compiled code into the wrapper. -cp -vr "${cwd}${out}" "${cwd}${wrapper}/WEB-INF/classes/com/olexyn" - -# compress .war -cd "${cwd}${wrapper}" || exit -jar -cvf "../${a}.war" * - -echo "================" -echo "END Mirror WAR" -echo "================" \ No newline at end of file diff --git a/mirror/build.xml b/mirror/build.xml new file mode 100644 index 0000000..0b59974 --- /dev/null +++ b/mirror/build.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mirror/war/wrapper/WEB-INF/lib/commons-io.jar b/mirror/lib/commons-io.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/commons-io.jar rename to mirror/lib/commons-io.jar diff --git a/mirror/war/wrapper/WEB-INF/lib/commons-logging-1.0.4.jar b/mirror/lib/commons-logging-1.0.4.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/commons-logging-1.0.4.jar rename to mirror/lib/commons-logging-1.0.4.jar diff --git a/mirror/war/wrapper/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar b/mirror/lib/javax.servlet-3.0.0.v201112011016.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar rename to mirror/lib/javax.servlet-3.0.0.v201112011016.jar diff --git a/mirror/war/wrapper/WEB-INF/lib/json-20190722.jar b/mirror/lib/json-20190722.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/json-20190722.jar rename to mirror/lib/json-20190722.jar diff --git a/mirror/war/wrapper/WEB-INF/lib/junit-3.8.1.jar b/mirror/lib/junit-3.8.1.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/junit-3.8.1.jar rename to mirror/lib/junit-3.8.1.jar diff --git a/mirror/war/wrapper/WEB-INF/lib/misphelper.jar b/mirror/lib/misphelper.jar similarity index 89% rename from mirror/war/wrapper/WEB-INF/lib/misphelper.jar rename to mirror/lib/misphelper.jar index 4ba063b..4e9639c 100644 Binary files a/mirror/war/wrapper/WEB-INF/lib/misphelper.jar and b/mirror/lib/misphelper.jar differ diff --git a/mirror/war/wrapper/WEB-INF/lib/spring-1.2.6.jar b/mirror/lib/spring-1.2.6.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/spring-1.2.6.jar rename to mirror/lib/spring-1.2.6.jar diff --git a/mirror/war/wrapper/WEB-INF/lib/spring-mock-1.2.6.jar b/mirror/lib/spring-mock-1.2.6.jar similarity index 100% rename from mirror/war/wrapper/WEB-INF/lib/spring-mock-1.2.6.jar rename to mirror/lib/spring-mock-1.2.6.jar diff --git a/mirror/mirror.iml b/mirror/mirror.iml index e0e7627..1ac42cb 100644 --- a/mirror/mirror.iml +++ b/mirror/mirror.iml @@ -10,7 +10,6 @@ - diff --git a/mirror/war/mirror.war b/mirror/war/mirror.war deleted file mode 100644 index 23b69ce..0000000 Binary files a/mirror/war/mirror.war and /dev/null differ diff --git a/mirror/war/wrapper/META-INF/MANIFEST.MF b/mirror/war/wrapper/META-INF/MANIFEST.MF deleted file mode 100644 index 4ee800d..0000000 --- a/mirror/war/wrapper/META-INF/MANIFEST.MF +++ /dev/null @@ -1,4 +0,0 @@ -Manifest-Version: 1.0 -Ant-Version: Apache Ant 1.6.5 -Created-By: 1.5.0_06-b05 (Sun Microsystems Inc.) - 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 deleted file mode 100644 index 1ce2177..0000000 Binary files a/mirror/war/wrapper/WEB-INF/classes/com/olexyn/mirror/Mirror.class and /dev/null differ diff --git a/mirror/war/wrapper/WEB-INF/web.xml b/mirror/web.xml similarity index 100% rename from mirror/war/wrapper/WEB-INF/web.xml rename to mirror/web.xml diff --git a/mirror/war/wrapper/hello.jsp b/mirror/web/hello.jsp similarity index 100% rename from mirror/war/wrapper/hello.jsp rename to mirror/web/hello.jsp diff --git a/mirror/war/wrapper/images/tomcat.gif b/mirror/web/images/tomcat.gif similarity index 100% rename from mirror/war/wrapper/images/tomcat.gif rename to mirror/web/images/tomcat.gif diff --git a/mirror/war/wrapper/index.html b/mirror/web/index.html similarity index 100% rename from mirror/war/wrapper/index.html rename to mirror/web/index.html diff --git a/mispbridge/README.md b/misp-fwd/README.md similarity index 100% rename from mispbridge/README.md rename to misp-fwd/README.md diff --git a/misp-fwd/install-locally.sh b/misp-fwd/install-locally.sh new file mode 100755 index 0000000..8282387 --- /dev/null +++ b/misp-fwd/install-locally.sh @@ -0,0 +1,10 @@ +#!/bin/bash +version="0.1" +file="target/misp-fwd-${version}.war" +groupId="com.olexyn.misp.fwd" +artifactId="misp-fwd" + + + +mvn package +mvn install:install-file -Dfile=${file} -DgroupId=${groupId} -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=war -DgeneratePom=true diff --git a/misp-fwd/misp-fwd.iml b/misp-fwd/misp-fwd.iml new file mode 100644 index 0000000..ab636bf --- /dev/null +++ b/misp-fwd/misp-fwd.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/misp-fwd/pom.xml b/misp-fwd/pom.xml new file mode 100644 index 0000000..1611c74 --- /dev/null +++ b/misp-fwd/pom.xml @@ -0,0 +1,97 @@ + + + + 4.0.0 + + com.olexyn.misp.fwd + misp-fwd + 0.1 + war + + misp-fwd Maven Webapp + + http://www.example.com + + + UTF-8 + + + + + + junit + junit + 4.11 + test + + + com.olexyn.misp.helper + misp-helper + 0.1 + compile + + + commons-io + commons-io + 2.6 + compile + + + org.eclipse.jetty.orbit + javax.servlet + 3.0.0.v201112011016 + compile + + + org.json + json + 20190722 + compile + + + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + 11 + 11 + true + + + + maven-surefire-plugin + 2.22.1 + + + maven-war-plugin + 3.2.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + + diff --git a/mispbridge/src/com/olexyn/misp/bridge/BridgeServlet.java b/misp-fwd/src/main/java/com/olexyn/misp/fwd/FwdProxy.java similarity index 89% rename from mispbridge/src/com/olexyn/misp/bridge/BridgeServlet.java rename to misp-fwd/src/main/java/com/olexyn/misp/fwd/FwdProxy.java index 324b03f..07d0b01 100644 --- a/mispbridge/src/com/olexyn/misp/bridge/BridgeServlet.java +++ b/misp-fwd/src/main/java/com/olexyn/misp/fwd/FwdProxy.java @@ -1,4 +1,4 @@ -package com.olexyn.misp.bridge; +package com.olexyn.misp.fwd; import com.olexyn.misp.helper.JsonHelper; import com.olexyn.misp.helper.Ride; @@ -8,12 +8,14 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.io.ObjectOutputStream; import java.io.PrintWriter; import java.util.HashMap; import java.util.Map; -public class BridgeServlet extends HttpServlet { +public class FwdProxy extends HttpServlet { protected static final String MISP_CLIENT_URL = "http://localhost:9090/mispclient/core"; @@ -74,9 +76,28 @@ public class BridgeServlet extends HttpServlet { */ protected void handleGetRequest(HttpServletRequest request, HttpServletResponse response) throws IOException, InterruptedException { final Ride ride; - String parsedRequest = IOUtils.toString(request.getReader()); + + //final ServletInputStream in = request.getInputStream(); + final String parsedRequest = null; //new String(in.readAllBytes()); + byte[] foo =null; + try{ + ByteArrayOutputStream byteOut = new ByteArrayOutputStream(); + ObjectOutputStream objOut = new ObjectOutputStream(byteOut); + objOut.writeObject(request); + int br =0; + foo = byteOut.toByteArray(); + objOut.close(); + byteOut.close(); + br=1; + + }catch (IOException e){ + int br =0; + } + int br =0; + + synchronized (available) { while (available.size() < 1) { diff --git a/misp-fwd/src/main/webapp/WEB-INF/web.xml b/misp-fwd/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..26f5142 --- /dev/null +++ b/misp-fwd/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,22 @@ + + + + + misp-fwd + + + misp-fwd + com.olexyn.misp.fwd.FwdProxy + + + + misp-fwd + /core + + + diff --git a/misp-fwd/src/main/webapp/images/io42630.png b/misp-fwd/src/main/webapp/images/io42630.png new file mode 100644 index 0000000..01d99bf Binary files /dev/null and b/misp-fwd/src/main/webapp/images/io42630.png differ diff --git a/misp-fwd/src/main/webapp/index.jsp b/misp-fwd/src/main/webapp/index.jsp new file mode 100644 index 0000000..24fd5b1 --- /dev/null +++ b/misp-fwd/src/main/webapp/index.jsp @@ -0,0 +1,20 @@ + + +misp-fwd + + + + + + + + + + +
+ +
+

misp-fwd

+
+ + diff --git a/misp-fwd/target/classes/com/olexyn/misp/fwd/BridgeServlet.class b/misp-fwd/target/classes/com/olexyn/misp/fwd/BridgeServlet.class new file mode 100644 index 0000000..4dcb108 Binary files /dev/null and b/misp-fwd/target/classes/com/olexyn/misp/fwd/BridgeServlet.class differ diff --git a/misp-fwd/target/maven-archiver/pom.properties b/misp-fwd/target/maven-archiver/pom.properties new file mode 100644 index 0000000..73c31fc --- /dev/null +++ b/misp-fwd/target/maven-archiver/pom.properties @@ -0,0 +1,4 @@ +#Created by Apache Maven 3.6.3 +groupId=com.olexyn.misp.fwd +artifactId=misp-fwd +version=0.1 diff --git a/misp-fwd/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/misp-fwd/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..43dc1cb --- /dev/null +++ b/misp-fwd/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1 @@ +com/olexyn/misp/fwd/BridgeServlet.class diff --git a/misp-fwd/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/misp-fwd/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..d89a267 --- /dev/null +++ b/misp-fwd/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1 @@ +/home/user/ws/idea/misp/misp-fwd/src/main/java/com/olexyn/misp/fwd/BridgeServlet.java diff --git a/misp-fwd/target/misp-fwd-0.1.war b/misp-fwd/target/misp-fwd-0.1.war new file mode 100644 index 0000000..098f168 Binary files /dev/null and b/misp-fwd/target/misp-fwd-0.1.war differ diff --git a/misp-fwd/target/misp-fwd-0.1/WEB-INF/classes/com/olexyn/misp/fwd/BridgeServlet.class b/misp-fwd/target/misp-fwd-0.1/WEB-INF/classes/com/olexyn/misp/fwd/BridgeServlet.class new file mode 100644 index 0000000..4dcb108 Binary files /dev/null and b/misp-fwd/target/misp-fwd-0.1/WEB-INF/classes/com/olexyn/misp/fwd/BridgeServlet.class differ diff --git a/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/commons-io-2.6.jar b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/commons-io-2.6.jar new file mode 100644 index 0000000..00556b1 Binary files /dev/null and b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/commons-io-2.6.jar differ diff --git a/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar new file mode 100644 index 0000000..b135409 Binary files /dev/null and b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar differ diff --git a/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/json-20190722.jar b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/json-20190722.jar new file mode 100644 index 0000000..6db21f6 Binary files /dev/null and b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/json-20190722.jar differ diff --git a/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/misp-helper-0.1.jar b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/misp-helper-0.1.jar new file mode 100644 index 0000000..74bca5b Binary files /dev/null and b/misp-fwd/target/misp-fwd-0.1/WEB-INF/lib/misp-helper-0.1.jar differ diff --git a/misp-fwd/target/misp-fwd-0.1/WEB-INF/web.xml b/misp-fwd/target/misp-fwd-0.1/WEB-INF/web.xml new file mode 100644 index 0000000..9f88c1f --- /dev/null +++ b/misp-fwd/target/misp-fwd-0.1/WEB-INF/web.xml @@ -0,0 +1,7 @@ + + + + Archetype Created Web Application + diff --git a/misp-fwd/target/misp-fwd-0.1/index.jsp b/misp-fwd/target/misp-fwd-0.1/index.jsp new file mode 100644 index 0000000..c38169b --- /dev/null +++ b/misp-fwd/target/misp-fwd-0.1/index.jsp @@ -0,0 +1,5 @@ + + +

Hello World!

+ + diff --git a/misp-helper/install-locally.sh b/misp-helper/install-locally.sh new file mode 100755 index 0000000..0fe410e --- /dev/null +++ b/misp-helper/install-locally.sh @@ -0,0 +1,10 @@ +#!/bin/bash +version="0.1" +file="target/misp-helper-${version}.jar" +groupId="com.olexyn.misp.helper" +artifactId="misp-helper" + + + +mvn package +mvn install:install-file -Dfile=${file} -DgroupId=${groupId} -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=jar -DgeneratePom=true diff --git a/misp-helper/misp-helper.iml b/misp-helper/misp-helper.iml new file mode 100644 index 0000000..a5ea870 --- /dev/null +++ b/misp-helper/misp-helper.iml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/misp-helper/pom.xml b/misp-helper/pom.xml new file mode 100644 index 0000000..a23a86e --- /dev/null +++ b/misp-helper/pom.xml @@ -0,0 +1,87 @@ + + + + 4.0.0 + + com.olexyn.misp.helper + misp-helper + 0.1 + + misp-helper + A simple misp-helper. + + http://www.example.com + + + UTF-8 + 1.11 + 1.11 + + + + + junit + junit + 3.8.1 + + + org.json + json + 20190722 + + + + + + + + + maven-clean-plugin + 3.1.0 + + + maven-site-plugin + 3.7.1 + + + maven-project-info-reports-plugin + 3.0.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-jar-plugin + 3.0.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + + + + + + maven-project-info-reports-plugin + + + + diff --git a/misphelper/src/com/olexyn/misp/helper/JsonHelper.java b/misp-helper/src/main/java/com/olexyn/misp/helper/JsonHelper.java similarity index 100% rename from misphelper/src/com/olexyn/misp/helper/JsonHelper.java rename to misp-helper/src/main/java/com/olexyn/misp/helper/JsonHelper.java diff --git a/misphelper/src/com/olexyn/misp/helper/Ride.java b/misp-helper/src/main/java/com/olexyn/misp/helper/Ride.java similarity index 100% rename from misphelper/src/com/olexyn/misp/helper/Ride.java rename to misp-helper/src/main/java/com/olexyn/misp/helper/Ride.java diff --git a/misphelper/src/com/olexyn/misp/helper/WebPrint.java b/misp-helper/src/main/java/com/olexyn/misp/helper/WebPrint.java similarity index 100% rename from misphelper/src/com/olexyn/misp/helper/WebPrint.java rename to misp-helper/src/main/java/com/olexyn/misp/helper/WebPrint.java diff --git a/misp-helper/src/main/main.iml b/misp-helper/src/main/main.iml new file mode 100644 index 0000000..908ad4f --- /dev/null +++ b/misp-helper/src/main/main.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/misp-helper/src/site/site.xml b/misp-helper/src/site/site.xml new file mode 100644 index 0000000..dcd7d4f --- /dev/null +++ b/misp-helper/src/site/site.xml @@ -0,0 +1,26 @@ + + + + + misp-helper + https://maven.apache.org/images/apache-maven-project.png + https://www.apache.org/ + + + + https://maven.apache.org/images/maven-logo-black-on-white.png + https://maven.apache.org/ + + + + org.apache.maven.skins + maven-fluido-skin + 1.7 + + + + + + + \ No newline at end of file diff --git a/misp-helper/src/test/java/com/olexyn/misp/helper/AppTest.java b/misp-helper/src/test/java/com/olexyn/misp/helper/AppTest.java new file mode 100644 index 0000000..e7d8a71 --- /dev/null +++ b/misp-helper/src/test/java/com/olexyn/misp/helper/AppTest.java @@ -0,0 +1,38 @@ +package com.olexyn.misp.helper; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +/** + * Unit test for simple App. + */ +public class AppTest + extends TestCase +{ + /** + * Create the test case + * + * @param testName name of the test case + */ + public AppTest( String testName ) + { + super( testName ); + } + + /** + * @return the suite of tests being tested + */ + public static Test suite() + { + return new TestSuite( AppTest.class ); + } + + /** + * Rigourous Test :-) + */ + public void testApp() + { + assertTrue( true ); + } +} diff --git a/misp-helper/src/test/test.iml b/misp-helper/src/test/test.iml new file mode 100644 index 0000000..a0e49a3 --- /dev/null +++ b/misp-helper/src/test/test.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/misp-helper/target/classes/com/olexyn/misp/helper/JsonHelper.class b/misp-helper/target/classes/com/olexyn/misp/helper/JsonHelper.class new file mode 100644 index 0000000..6651caf Binary files /dev/null and b/misp-helper/target/classes/com/olexyn/misp/helper/JsonHelper.class differ diff --git a/misp-helper/target/classes/com/olexyn/misp/helper/Ride.class b/misp-helper/target/classes/com/olexyn/misp/helper/Ride.class new file mode 100644 index 0000000..e0ae665 Binary files /dev/null and b/misp-helper/target/classes/com/olexyn/misp/helper/Ride.class differ diff --git a/misp-helper/target/classes/com/olexyn/misp/helper/WebPrint.class b/misp-helper/target/classes/com/olexyn/misp/helper/WebPrint.class new file mode 100644 index 0000000..a814146 Binary files /dev/null and b/misp-helper/target/classes/com/olexyn/misp/helper/WebPrint.class differ diff --git a/misp-helper/target/maven-archiver/pom.properties b/misp-helper/target/maven-archiver/pom.properties new file mode 100644 index 0000000..c64fdc1 --- /dev/null +++ b/misp-helper/target/maven-archiver/pom.properties @@ -0,0 +1,4 @@ +#Created by Apache Maven 3.6.3 +version=0.1 +groupId=com.olexyn.misp.helper +artifactId=misp-helper diff --git a/misp-helper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/misp-helper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..292821a --- /dev/null +++ b/misp-helper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +com/olexyn/misp/helper/JsonHelper.class +com/olexyn/misp/helper/Ride.class +com/olexyn/misp/helper/WebPrint.class diff --git a/misp-helper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/misp-helper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..48af24a --- /dev/null +++ b/misp-helper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/user/ws/idea/misp/misp-helper/src/main/java/com/olexyn/misp/helper/Ride.java +/home/user/ws/idea/misp/misp-helper/src/main/java/com/olexyn/misp/helper/JsonHelper.java +/home/user/ws/idea/misp/misp-helper/src/main/java/com/olexyn/misp/helper/WebPrint.java diff --git a/misp-helper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/misp-helper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst new file mode 100644 index 0000000..0e43ac5 --- /dev/null +++ b/misp-helper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst @@ -0,0 +1 @@ +com/olexyn/misp/helper/AppTest.class diff --git a/misp-helper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/misp-helper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst new file mode 100644 index 0000000..32ed4c6 --- /dev/null +++ b/misp-helper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst @@ -0,0 +1 @@ +/home/user/ws/idea/misp/misp-helper/src/test/java/com/olexyn/misp/helper/AppTest.java diff --git a/misp-helper/target/misp-helper-0.1.jar b/misp-helper/target/misp-helper-0.1.jar new file mode 100644 index 0000000..74bca5b Binary files /dev/null and b/misp-helper/target/misp-helper-0.1.jar differ diff --git a/misp-helper/target/surefire-reports/TEST-com.olexyn.misp.helper.AppTest.xml b/misp-helper/target/surefire-reports/TEST-com.olexyn.misp.helper.AppTest.xml new file mode 100644 index 0000000..91fe936 --- /dev/null +++ b/misp-helper/target/surefire-reports/TEST-com.olexyn.misp.helper.AppTest.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/misp-helper/target/surefire-reports/com.olexyn.misp.helper.AppTest.txt b/misp-helper/target/surefire-reports/com.olexyn.misp.helper.AppTest.txt new file mode 100644 index 0000000..188d0b3 --- /dev/null +++ b/misp-helper/target/surefire-reports/com.olexyn.misp.helper.AppTest.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.olexyn.misp.helper.AppTest +------------------------------------------------------------------------------- +Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s - in com.olexyn.misp.helper.AppTest diff --git a/misp-helper/target/test-classes/com/olexyn/misp/helper/AppTest.class b/misp-helper/target/test-classes/com/olexyn/misp/helper/AppTest.class new file mode 100644 index 0000000..40f405d Binary files /dev/null and b/misp-helper/target/test-classes/com/olexyn/misp/helper/AppTest.class differ diff --git a/misp-rev/install-locally.sh b/misp-rev/install-locally.sh new file mode 100755 index 0000000..9504c27 --- /dev/null +++ b/misp-rev/install-locally.sh @@ -0,0 +1,10 @@ +#!/bin/bash +version="0.1" +file="target/misp-rev-${version}.war" +groupId="com.olexyn.misp.rev" +artifactId="misp-rev" + + + +mvn package +mvn install:install-file -Dfile=${file} -DgroupId=${groupId} -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=war -DgeneratePom=true diff --git a/misp-rev/misp-rev.iml b/misp-rev/misp-rev.iml new file mode 100644 index 0000000..c73dbed --- /dev/null +++ b/misp-rev/misp-rev.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/misp-rev/pom.xml b/misp-rev/pom.xml new file mode 100644 index 0000000..eff9fc0 --- /dev/null +++ b/misp-rev/pom.xml @@ -0,0 +1,90 @@ + + + + 4.0.0 + + com.olexyn.misp.rev + misp-rev + 0.1 + war + + misp-rev Maven Webapp + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + com.olexyn.misp.helper + misp-helper + 0.1 + compile + + + commons-io + commons-io + 2.6 + compile + + + org.eclipse.jetty.orbit + javax.servlet + 3.0.0.v201112011016 + compile + + + org.json + json + 20190722 + compile + + + + + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-war-plugin + 3.2.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + + diff --git a/misp-rev/src/main/java/com/olexyn/misp/rev/ConnectionHelper.java b/misp-rev/src/main/java/com/olexyn/misp/rev/ConnectionHelper.java new file mode 100644 index 0000000..f66d3f8 --- /dev/null +++ b/misp-rev/src/main/java/com/olexyn/misp/rev/ConnectionHelper.java @@ -0,0 +1,16 @@ +package com.olexyn.misp.rev; + +import com.olexyn.misp.helper.Ride; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import org.json.JSONObject; + +public class ConnectionHelper { + + + +} diff --git a/misp-rev/src/main/java/com/olexyn/misp/rev/Main.java b/misp-rev/src/main/java/com/olexyn/misp/rev/Main.java new file mode 100644 index 0000000..22843e6 --- /dev/null +++ b/misp-rev/src/main/java/com/olexyn/misp/rev/Main.java @@ -0,0 +1,12 @@ +package com.olexyn.misp.rev; + +public class Main { + + + + public static void main(String... args){ + new RevProxy(); + } + + +} diff --git a/misp-rev/src/main/java/com/olexyn/misp/rev/RevProxy.java b/misp-rev/src/main/java/com/olexyn/misp/rev/RevProxy.java new file mode 100644 index 0000000..c171c00 --- /dev/null +++ b/misp-rev/src/main/java/com/olexyn/misp/rev/RevProxy.java @@ -0,0 +1,169 @@ +package com.olexyn.misp.rev; + + +import com.olexyn.misp.helper.Ride; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.HttpURLConnection; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; + + +public class RevProxy { + + protected static final String MISP_BRIDGE_URL = "http://localhost:9090/mispbridge/core"; + protected static final String APP_URL = "http://localhost:9090/mirror/core"; + + public static final int AVAILABLE_RIDES_OVERHEAD_TRIGGER = 4; + public static final int AVAILABLE_RIDES_OVERHEAD = 8; + + + public final Map available = new HashMap<>(); + public final Map booked = new HashMap<>(); + public final Map loaded = new HashMap<>(); + + + public RevProxy() { + + Thread postRideThread = new Thread(new PostRideRunnable(this)); + postRideThread.setName("postRideThread"); + postRideThread.start(); + + Thread getRequestThread = new Thread(new GetRequestRunnable(this)); + getRequestThread.setName("getRequestThread"); + getRequestThread.start(); + + Thread getRideRequestDataThread = new Thread(new GetRideRequestDataRunnable(this)); + getRideRequestDataThread.setName("getRideRequestDataThread"); + getRideRequestDataThread.start(); + } + + + void sendPostRide() throws IOException { + + final Ride ride = new Ride(); + + synchronized (available) { available.put(ride.getID(), ride); } + + final String result = send("POST", MISP_BRIDGE_URL, ride.json()); + + synchronized (available) { + available.remove(ride.getID()); + ride.setRequest(new Ride(result).getRequest()); + } + + synchronized (booked) { booked.put(ride.getID(), ride); } + } + + + void sendGetRequest(Ride ride) throws IOException { + + synchronized (booked) {booked.remove(ride.getID()); } + + final String result = send("GET", APP_URL, ride.getRequest()); + ride.setData(result); + + synchronized (loaded) {loaded.put(ride.getID(), ride); } + } + + + void sendGetRideRequestData(Ride ride) throws IOException { + + send("GET", MISP_BRIDGE_URL, ride.json()); + + synchronized (loaded) {loaded.remove(ride.getID()); } + } + + + private static String send(String method, String urlString, String body) throws IOException { + + URL url = new URL(urlString); + HttpURLConnection connection = (HttpURLConnection) url.openConnection(); + connection.setRequestMethod(method); + + connection.setDoOutput(true); + DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); + outputStream.writeBytes(body); + outputStream.flush(); + outputStream.close(); + + BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); + String out; + StringBuilder sb = new StringBuilder(); + while ((out = in.readLine()) != null) { sb.append(out); } + in.close(); + return sb.toString(); + } + + +} + + +class PostRideRunnable implements Runnable { + + final private RevProxy adapter; + + public PostRideRunnable(RevProxy adapter) { + this.adapter = adapter; + } + + @Override + public void run() { + while (true) { + synchronized (adapter.available) { + if (adapter.available.size() < RevProxy.AVAILABLE_RIDES_OVERHEAD_TRIGGER) { + for (int i = 0; i < RevProxy.AVAILABLE_RIDES_OVERHEAD; i++) { + try {adapter.sendPostRide();} catch (IOException ignored) {} + } + } + } + } + } +} + + +class GetRequestRunnable implements Runnable { + + final private RevProxy adapter; + + public GetRequestRunnable(RevProxy adapter) { + this.adapter = adapter; + } + + @Override + public void run() { + while (true) { + synchronized (adapter.booked) { + if (adapter.booked.size() > 0) { + final Ride ride = adapter.booked.entrySet().iterator().next().getValue(); + try { adapter.sendGetRequest(ride); } catch (IOException ignored) {} + } + } + } + } +} + +class GetRideRequestDataRunnable implements Runnable { + + final private RevProxy adapter; + + public GetRideRequestDataRunnable(RevProxy adapter) { + this.adapter = adapter; + } + + @Override + public void run() { + while (true) { + synchronized (adapter.loaded) { + if (adapter.loaded.size() > 0) { + final Ride ride = adapter.loaded.entrySet().iterator().next().getValue(); + try { adapter.sendGetRideRequestData(ride); } catch (IOException ignored) {} + } + } + } + } +} \ No newline at end of file diff --git a/misp-rev/src/main/webapp/WEB-INF/web.xml b/misp-rev/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..717dad2 --- /dev/null +++ b/misp-rev/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,22 @@ + + + + + misp-fwd + + + misp-rev + com.olexyn.misp.rev.RevProxy + + + + misp-rev + /core + + + diff --git a/misp-rev/src/main/webapp/images/io42630.png b/misp-rev/src/main/webapp/images/io42630.png new file mode 100644 index 0000000..01d99bf Binary files /dev/null and b/misp-rev/src/main/webapp/images/io42630.png differ diff --git a/misp-rev/src/main/webapp/index.jsp b/misp-rev/src/main/webapp/index.jsp new file mode 100644 index 0000000..d53407d --- /dev/null +++ b/misp-rev/src/main/webapp/index.jsp @@ -0,0 +1,20 @@ + + +misp-rev + + + + + + + + + + +
+ +
+

misp-rev

+
+ + diff --git a/misp-rev/target/maven-archiver/pom.properties b/misp-rev/target/maven-archiver/pom.properties new file mode 100644 index 0000000..543cc2b --- /dev/null +++ b/misp-rev/target/maven-archiver/pom.properties @@ -0,0 +1,4 @@ +#Created by Apache Maven 3.6.3 +groupId=com.olexyn.misp.rev +artifactId=misp-rev +version=0.1 diff --git a/misp-rev/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/misp-rev/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..56a1969 --- /dev/null +++ b/misp-rev/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,6 @@ +com/olexyn/misp/rev/PostRideRunnable.class +com/olexyn/misp/rev/GetRideRequestDataRunnable.class +com/olexyn/misp/rev/Main.class +com/olexyn/misp/rev/ConnectionHelper.class +com/olexyn/misp/rev/GetRequestRunnable.class +com/olexyn/misp/rev/RevProxy.class diff --git a/misp-rev/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/misp-rev/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..c15be10 --- /dev/null +++ b/misp-rev/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/user/ws/idea/misp/misp-rev/src/main/java/com/olexyn/misp/rev/Main.java +/home/user/ws/idea/misp/misp-rev/src/main/java/com/olexyn/misp/rev/RevProxy.java +/home/user/ws/idea/misp/misp-rev/src/main/java/com/olexyn/misp/rev/ConnectionHelper.java diff --git a/misp-rev/target/misp-rev-0.1.war b/misp-rev/target/misp-rev-0.1.war new file mode 100644 index 0000000..74148ef Binary files /dev/null and b/misp-rev/target/misp-rev-0.1.war differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/ConnectionHelper.class b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/ConnectionHelper.class new file mode 100644 index 0000000..5556589 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/ConnectionHelper.class differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/GetRequestRunnable.class b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/GetRequestRunnable.class new file mode 100644 index 0000000..cd40cdb Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/GetRequestRunnable.class differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/GetRideRequestDataRunnable.class b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/GetRideRequestDataRunnable.class new file mode 100644 index 0000000..514e3a3 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/GetRideRequestDataRunnable.class differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/Main.class b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/Main.class new file mode 100644 index 0000000..d3a13dd Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/Main.class differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/PostRideRunnable.class b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/PostRideRunnable.class new file mode 100644 index 0000000..31d86b1 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/PostRideRunnable.class differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/RevProxy.class b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/RevProxy.class new file mode 100644 index 0000000..6f69c61 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/classes/com/olexyn/misp/rev/RevProxy.class differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/lib/commons-io-2.6.jar b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/commons-io-2.6.jar new file mode 100644 index 0000000..00556b1 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/commons-io-2.6.jar differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar new file mode 100644 index 0000000..b135409 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/javax.servlet-3.0.0.v201112011016.jar differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/lib/json-20190722.jar b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/json-20190722.jar new file mode 100644 index 0000000..6db21f6 Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/json-20190722.jar differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/lib/misp-helper-0.1.jar b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/misp-helper-0.1.jar new file mode 100644 index 0000000..74bca5b Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/WEB-INF/lib/misp-helper-0.1.jar differ diff --git a/misp-rev/target/misp-rev-0.1/WEB-INF/web.xml b/misp-rev/target/misp-rev-0.1/WEB-INF/web.xml new file mode 100644 index 0000000..717dad2 --- /dev/null +++ b/misp-rev/target/misp-rev-0.1/WEB-INF/web.xml @@ -0,0 +1,22 @@ + + + + + misp-fwd + + + misp-rev + com.olexyn.misp.rev.RevProxy + + + + misp-rev + /core + + + diff --git a/misp-rev/target/misp-rev-0.1/images/io42630.png b/misp-rev/target/misp-rev-0.1/images/io42630.png new file mode 100644 index 0000000..01d99bf Binary files /dev/null and b/misp-rev/target/misp-rev-0.1/images/io42630.png differ diff --git a/misp-rev/target/misp-rev-0.1/index.jsp b/misp-rev/target/misp-rev-0.1/index.jsp new file mode 100644 index 0000000..d53407d --- /dev/null +++ b/misp-rev/target/misp-rev-0.1/index.jsp @@ -0,0 +1,20 @@ + + +misp-rev + + + + + + + + + + +
+ +
+

misp-rev

+
+ + diff --git a/mispadapter/mispadapter.iml b/mispadapter/mispadapter.iml index 5ec3e18..cf570e0 100644 --- a/mispadapter/mispadapter.iml +++ b/mispadapter/mispadapter.iml @@ -7,7 +7,6 @@ - diff --git a/mispadapter/src/com/olexyn/misp/adapter/Adapter.java b/mispadapter/src/com/olexyn/misp/adapter/Adapter.java deleted file mode 100644 index 021c7e3..0000000 --- a/mispadapter/src/com/olexyn/misp/adapter/Adapter.java +++ /dev/null @@ -1,183 +0,0 @@ -package com.olexyn.misp.adapter; - - -import com.olexyn.misp.helper.Ride; - -import javax.servlet.ServletException; -import java.io.DataOutputStream; -import java.io.IOException; -import java.net.HttpURLConnection; -import java.util.HashMap; -import java.util.Map; - - -public class Adapter { - - protected static final String MISP_BRIDGE_URL = "http://localhost:9090/mispbridge/core"; - protected static final String APP_URL = "http://localhost:9090/mirror/core"; - - public static final int AVAILABLE_RIDES_OVERHEAD_TRIGGER = 2; - public static final int AVAILABLE_RIDES_OVERHEAD = 4; - - - public final Map available = new HashMap<>(); - public final Map booked = new HashMap<>(); - public final Map loaded = new HashMap<>(); - - - public Adapter() { - - // Thread : while AvailableRides < 256 , add Ride to AvailableRides , send POST (Ride) [DONE] - Thread postRideThread = new Thread(new PostRideRunnable(this)); - postRideThread.setName("postRideThread"); - postRideThread.start(); - } - - - - /** - * Generated by Loop. - * Prepare payload for the request. - * Process the parsed response. - */ - final void sendPostRide() throws IOException, InterruptedException, ServletException { - - final Ride ride = new Ride(); - - synchronized (available) { - available.put(ride.getID(), ride); - } - - final Ride parsedRide = doSendPostRide(ride); - - synchronized (available) { - available.remove(ride.getID()); - ride.setRequest(parsedRide.getRequest()); - } - - synchronized (booked) { - booked.put(ride.getID(), ride); - } - sendGetRequest(ride); - } - - - /** - * Send POST (Ride). - * Parse response. - */ - protected Ride doSendPostRide(Ride ride) throws IOException, InterruptedException, ServletException { - // send POST (Ride) - final HttpURLConnection connection = ConnectionHelper.make("POST", MISP_BRIDGE_URL); - - connection.setDoOutput(true); - DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); - outputStream.writeBytes(ride.json()); - outputStream.flush(); - outputStream.close(); - - Ride rideXa= ConnectionHelper.parseRide(connection); - rideXa.setRequest("ff"); - return rideXa; - } - - - /** - * Prepare payload for the request. - * Process the parsed response. - */ - final void sendGetRequest(Ride ride) throws IOException, InterruptedException { - - - ride.setData(doSendGetRequest(ride.getRequest())); - - synchronized (booked) { - booked.remove(ride.getID()); - } - synchronized (loaded) { - loaded.put(ride.getID(), ride); - } - - sendGetRideRequestData(ride); - } - - - /** - * Send GET (Request) to App. - * Parse response. - */ - protected String doSendGetRequest(String request) throws IOException, InterruptedException { - - // send GET (Ride) - final HttpURLConnection connection = ConnectionHelper.make("GET", APP_URL); - - connection.setDoOutput(true); - DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); - outputStream.writeBytes(request); - outputStream.flush(); - outputStream.close(); - - return ConnectionHelper.parseString(connection); - } - - - /** - * Prepare payload for the request. - * Process the parsed response. - */ - final protected void sendGetRideRequestData(Ride ride) throws IOException, InterruptedException { - doSendGetRideRequest(ride); - synchronized (loaded) { - loaded.remove(ride.getID()); - } - } - - - /** - * Send GET (Ride)(Request)(Data). - * Parse response. - */ - protected void doSendGetRideRequest(Ride ride) throws IOException, InterruptedException { - - HttpURLConnection connection = ConnectionHelper.make("GET", MISP_BRIDGE_URL); - - connection.setDoOutput(true); - DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream()); - outputStream.writeBytes(ride.json()); - outputStream.flush(); - outputStream.close(); - } -} - - -/** - * While AvailableRides < 256 , - * add Ride to AvailableRides , - * send POST (Ride). - */ -class PostRideRunnable implements Runnable { - - Adapter adapter; - - public PostRideRunnable(Adapter adapter) { - this.adapter = adapter; - } - - @Override - public void run() { - while (true) { - if (adapter.available.size() < Adapter.AVAILABLE_RIDES_OVERHEAD_TRIGGER) { - for (int i = 0; i < Adapter.AVAILABLE_RIDES_OVERHEAD; i++) { - try {adapter.sendPostRide();} catch (IOException | InterruptedException | ServletException e) { e.printStackTrace(); } - try { - Thread.sleep(100); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } - } - } -} - - diff --git a/mispadapter/src/com/olexyn/misp/adapter/ConnectionHelper.java b/mispadapter/src/com/olexyn/misp/adapter/ConnectionHelper.java deleted file mode 100644 index 4d53798..0000000 --- a/mispadapter/src/com/olexyn/misp/adapter/ConnectionHelper.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.olexyn.misp.adapter; - -import com.olexyn.misp.helper.Ride; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; -import org.json.JSONObject; - -public class ConnectionHelper { - - - public static HttpURLConnection make(String method, String urlString) throws IOException { - URL url = new URL(urlString); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setRequestMethod(method); - connection.setRequestProperty("User-Agent", "USER_AGENT"); - connection.setRequestProperty("Accept-Language", "en-US,en;q=0.5"); - connection.setRequestProperty("Content-Type", "application/json"); - return connection; - } - - - public static Ride parseRide(HttpURLConnection connection) throws IOException { - return new Ride(parseString(connection)); - } - - public static String parseString(HttpURLConnection connection) throws IOException { - BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream())); - String out; - StringBuilder sb = new StringBuilder(); - while ((out = in.readLine()) != null) { sb.append(out); } - in.close(); - return sb.toString(); - } -} diff --git a/mispadapter/src/com/olexyn/misp/adapter/Main.java b/mispadapter/src/com/olexyn/misp/adapter/Main.java deleted file mode 100644 index 18ef129..0000000 --- a/mispadapter/src/com/olexyn/misp/adapter/Main.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.olexyn.misp.adapter; - -public class Main { - - - - public static void Main(String... args){ - - } - - -} diff --git a/mispbridge/war/mispbridge.war b/mispbridge/war/mispbridge.war index a146f6a..63a95ab 100644 Binary files a/mispbridge/war/mispbridge.war 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 index 7a25294..5d5ba21 100644 Binary files a/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/BridgeServlet.class and b/mispbridge/war/wrapper/WEB-INF/classes/com/olexyn/misp/bridge/BridgeServlet.class differ diff --git a/misphelper/aub-app/pom.xml b/misphelper/aub-app/pom.xml new file mode 100644 index 0000000..1281c75 --- /dev/null +++ b/misphelper/aub-app/pom.xml @@ -0,0 +1,67 @@ + + + + 4.0.0 + + com.olexyn.app.sub + aub-app + 1.0-SNAPSHOT + war + + aub-app Maven Webapp + + http://www.example.com + + + UTF-8 + 1.7 + 1.7 + + + + + junit + junit + 4.11 + test + + + + + aub-app + + + + maven-clean-plugin + 3.1.0 + + + + maven-resources-plugin + 3.0.2 + + + maven-compiler-plugin + 3.8.0 + + + maven-surefire-plugin + 2.22.1 + + + maven-war-plugin + 3.2.2 + + + maven-install-plugin + 2.5.2 + + + maven-deploy-plugin + 2.8.2 + + + + + diff --git a/misphelper/build.xml b/misphelper/build.xml new file mode 100644 index 0000000..6115e80 --- /dev/null +++ b/misphelper/build.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/misphelper/pom.xml b/misphelper/pom.xml new file mode 100644 index 0000000..4f2b184 --- /dev/null +++ b/misphelper/pom.xml @@ -0,0 +1,22 @@ + + 4.0.0 + + com.olexyn.misp.helper + misphelper + 1.0-SNAPSHOT + + + 1.7 + 1.7 + + + + + org.json + json + 20190722 + compile + + + diff --git a/misphelper/target/classes/com/olexyn/misp/helper/JsonHelper.class b/misphelper/target/classes/com/olexyn/misp/helper/JsonHelper.class new file mode 100644 index 0000000..6651caf Binary files /dev/null and b/misphelper/target/classes/com/olexyn/misp/helper/JsonHelper.class differ diff --git a/misphelper/target/classes/com/olexyn/misp/helper/Ride.class b/misphelper/target/classes/com/olexyn/misp/helper/Ride.class new file mode 100644 index 0000000..e0ae665 Binary files /dev/null and b/misphelper/target/classes/com/olexyn/misp/helper/Ride.class differ diff --git a/misphelper/target/classes/com/olexyn/misp/helper/WebPrint.class b/misphelper/target/classes/com/olexyn/misp/helper/WebPrint.class new file mode 100644 index 0000000..a814146 Binary files /dev/null and b/misphelper/target/classes/com/olexyn/misp/helper/WebPrint.class differ diff --git a/misphelper/target/maven-archiver/pom.properties b/misphelper/target/maven-archiver/pom.properties new file mode 100644 index 0000000..9498243 --- /dev/null +++ b/misphelper/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Fri Apr 24 00:43:07 CEST 2020 +version=1.0-SNAPSHOT +groupId=com.olexyn.misp.helper +artifactId=misphelper diff --git a/misphelper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/misphelper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst new file mode 100644 index 0000000..292821a --- /dev/null +++ b/misphelper/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -0,0 +1,3 @@ +com/olexyn/misp/helper/JsonHelper.class +com/olexyn/misp/helper/Ride.class +com/olexyn/misp/helper/WebPrint.class diff --git a/misphelper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/misphelper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst new file mode 100644 index 0000000..6e7825e --- /dev/null +++ b/misphelper/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst @@ -0,0 +1,3 @@ +/home/user/ws/idea/misp/misphelper/src/main/java/com/olexyn/misp/helper/WebPrint.java +/home/user/ws/idea/misp/misphelper/src/main/java/com/olexyn/misp/helper/JsonHelper.java +/home/user/ws/idea/misp/misphelper/src/main/java/com/olexyn/misp/helper/Ride.java diff --git a/mirror/war/wrapper/META-INF/war-tracker b/misphelper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst similarity index 100% rename from mirror/war/wrapper/META-INF/war-tracker rename to misphelper/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst diff --git a/misphelper/target/misphelper-1.0-SNAPSHOT.jar b/misphelper/target/misphelper-1.0-SNAPSHOT.jar new file mode 100644 index 0000000..3221900 Binary files /dev/null and b/misphelper/target/misphelper-1.0-SNAPSHOT.jar differ