aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-08-28 17:14:05 +1200
committerAnton Tananaev <anton.tananaev@gmail.com>2018-08-28 17:14:05 +1200
commit5de2f5a094469e87ff04e8605665ca8b9f33aa7a (patch)
tree6a5fdcf519113c5ea4d91ad2f3a8e510424d19e0
parent74519eebedc75fec380005a2a1e6300ddd803ceb (diff)
downloadtraccar-server-5de2f5a094469e87ff04e8605665ca8b9f33aa7a.tar.gz
traccar-server-5de2f5a094469e87ff04e8605665ca8b9f33aa7a.tar.bz2
traccar-server-5de2f5a094469e87ff04e8605665ca8b9f33aa7a.zip
Start Applet protocol implementation
-rw-r--r--setup/default.xml1
-rw-r--r--src/org/traccar/protocol/AppletProtocol.java46
-rw-r--r--src/org/traccar/protocol/AppletProtocolDecoder.java47
-rw-r--r--test/org/traccar/ProtocolTest.java6
-rw-r--r--test/org/traccar/protocol/AppletProtocolDecoderTest.java27
5 files changed, 127 insertions, 0 deletions
diff --git a/setup/default.xml b/setup/default.xml
index 9437747ed..88aa425c6 100644
--- a/setup/default.xml
+++ b/setup/default.xml
@@ -252,5 +252,6 @@
<entry key='autotrack.port'>5172</entry>
<entry key='tek.port'>5173</entry>
<entry key='wristband.port'>5174</entry>
+ <entry key='applet.port'>5175</entry>
</properties>
diff --git a/src/org/traccar/protocol/AppletProtocol.java b/src/org/traccar/protocol/AppletProtocol.java
new file mode 100644
index 000000000..2ad459e8b
--- /dev/null
+++ b/src/org/traccar/protocol/AppletProtocol.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import io.netty.handler.codec.http.HttpObjectAggregator;
+import io.netty.handler.codec.http.HttpRequestDecoder;
+import io.netty.handler.codec.http.HttpResponseEncoder;
+import org.traccar.BaseProtocol;
+import org.traccar.PipelineBuilder;
+import org.traccar.TrackerServer;
+
+import java.util.List;
+
+public class AppletProtocol extends BaseProtocol {
+
+ public AppletProtocol() {
+ super("applet");
+ }
+
+ @Override
+ public void initTrackerServers(List<TrackerServer> serverList) {
+ serverList.add(new TrackerServer(false, getName()) {
+ @Override
+ protected void addProtocolHandlers(PipelineBuilder pipeline) {
+ pipeline.addLast("httpEncoder", new HttpResponseEncoder());
+ pipeline.addLast("httpDecoder", new HttpRequestDecoder());
+ pipeline.addLast("httpAggregator", new HttpObjectAggregator(16384));
+ pipeline.addLast("objectDecoder", new AppletProtocolDecoder(AppletProtocol.this));
+ }
+ });
+ }
+
+}
diff --git a/src/org/traccar/protocol/AppletProtocolDecoder.java b/src/org/traccar/protocol/AppletProtocolDecoder.java
new file mode 100644
index 000000000..ee859d4d0
--- /dev/null
+++ b/src/org/traccar/protocol/AppletProtocolDecoder.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2018 Anton Tananaev (anton@traccar.org)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.protocol;
+
+import io.netty.channel.Channel;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import org.traccar.BaseHttpProtocolDecoder;
+import org.traccar.DeviceSession;
+
+import java.net.SocketAddress;
+
+public class AppletProtocolDecoder extends BaseHttpProtocolDecoder {
+
+ public AppletProtocolDecoder(AppletProtocol protocol) {
+ super(protocol);
+ }
+
+ @Override
+ protected Object decode(Channel channel, SocketAddress remoteAddress, Object msg) throws Exception {
+
+ FullHttpRequest request = (FullHttpRequest) msg;
+
+ DeviceSession deviceSession = getDeviceSession(channel, remoteAddress, request.headers().get("From"));
+ if (deviceSession != null) {
+ sendResponse(channel, HttpResponseStatus.OK);
+ } else {
+ sendResponse(channel, HttpResponseStatus.BAD_REQUEST);
+ }
+
+ return null;
+ }
+
+}
diff --git a/test/org/traccar/ProtocolTest.java b/test/org/traccar/ProtocolTest.java
index e6a718d22..939b3bd2c 100644
--- a/test/org/traccar/ProtocolTest.java
+++ b/test/org/traccar/ProtocolTest.java
@@ -4,6 +4,8 @@ import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import io.netty.buffer.Unpooled;
import io.netty.handler.codec.http.DefaultFullHttpRequest;
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.HttpHeaders;
import io.netty.handler.codec.http.HttpMethod;
import io.netty.handler.codec.http.HttpVersion;
import org.traccar.helper.DataConverter;
@@ -74,6 +76,10 @@ public class ProtocolTest extends BaseTest {
return new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, method, url, data);
}
+ protected DefaultFullHttpRequest request(HttpMethod method, String url, HttpHeaders headers) {
+ return new DefaultFullHttpRequest(HttpVersion.HTTP_1_1, method, url, Unpooled.buffer(), headers, new DefaultHttpHeaders());
+ }
+
protected void verifyNotNull(BaseProtocolDecoder decoder, Object object) throws Exception {
assertNotNull(decoder.decode(null, null, object));
}
diff --git a/test/org/traccar/protocol/AppletProtocolDecoderTest.java b/test/org/traccar/protocol/AppletProtocolDecoderTest.java
new file mode 100644
index 000000000..ebe489b57
--- /dev/null
+++ b/test/org/traccar/protocol/AppletProtocolDecoderTest.java
@@ -0,0 +1,27 @@
+package org.traccar.protocol;
+
+import io.netty.handler.codec.http.DefaultHttpHeaders;
+import io.netty.handler.codec.http.HttpMethod;
+import org.junit.Test;
+import org.traccar.ProtocolTest;
+
+public class AppletProtocolDecoderTest extends ProtocolTest {
+
+ @Test
+ public void testDecode() throws Exception {
+
+ AppletProtocolDecoder decoder = new AppletProtocolDecoder(new AppletProtocol());
+
+ DefaultHttpHeaders headers = new DefaultHttpHeaders();
+
+ headers.add("HOST", "192.168.0.1:8080");
+ headers.add("X-Admin-Protocol", "globalplatform-remote-admin/1.0");
+ headers.add("X-Admin-From", "8943170080001406197F");
+ headers.add("User-Agent", "oma-scws-admin-agent/1.1");
+ headers.add("From", "8943170080001406197F");
+
+ verifyNull(decoder, request(HttpMethod.POST, "/pli?=", headers));
+
+ }
+
+}