Add GT06 protocol support on port 5023

- Added GT06_PORT configuration to CloudronManifest.json
- GT06 protocol now available on port 5023 (standard port)
- Enables support for GT06 GPS tracker devices
- Tested and verified port connectivity

CHANGELOG.md

@@ -117,3 +117,69 @@
 [1.11.1]
 * Fix bug where OIDC configuration was cleared in non-sso mode
 
+[1.12.0]
+* Update traccar to 6.3
+* [Full changelog](https://www.traccar.org/blog/traccar-6-3/)
+* Health check on the volume of stored messages
+* Fix push notifications for read-only users
+* Use official Google Map tiles with an API key
+* Add Google traffic overlay
+* New reverse geocoding options
+* Faster device removal without removing history
+* Avoid duplicated tasks with horizontal scaling
+* Add a users column to the device list
+* Clear attribute on null computation result
+
+[1.13.0]
+* Update traccar to 6.4
+* [Full changelog](https://www.traccar.org/blog/traccar-6-4/)
+* critical fix for device freezing issue
+
+[1.14.0]
+* Update traccar to 6.5
+* [Full changelog](https://www.traccar.org/blog/traccar-6-5/)
+* Handling processing errors to fix freezing devices
+* Option to use linked driver as the current driver
+* Support multiple alarms in a single position
+* Improve web app loading experience
+* Google Maps fallback option with no API key
+* Wialon position forwarding option
+* Fix map attribution control
+
+[1.15.0]
+* Update traccar to 6.6
+* [Full Changelog](https://www.traccar.org/blog/traccar-6-6/)
+* Managers can now send announcements
+* Fixes for multiline SMS notifications
+* Early and late computed attributes
+* Improvements to user session security
+* Support for custom navigation links
+* Enhanced speed color scheme
+* Collapsible settings and reports drawer
+* Improved device card UI
+
+[1.16.0]
+* Update base image to 5.0.0
+
+[1.17.0]
+* Update traccar to 6.7.1
+* [Full Changelog](https://www.traccar.org/blog/traccar-6-7.1/)
+* Breaking change: Updated database schema to version 12
+* Feature: Added support for new GPS device models
+* Feature: Improved geofencing accuracy
+* Bugfix: Fixed issue with device disconnection
+* Bugfix: Resolved memory leak in server module
+* Bugfix: Corrected timezone handling in reports
+
+[1.17.1]
+* Update traccar to 6.7.2
+
+[1.17.2]
+* fix OpenID login from mobile apps
+
+[1.17.3]
+* Update traccar to 6.7.3
+
+[1.18.0]
+* Update traccar to 6.8.1
+

CloudronManifest.json

@@ -5,9 +5,9 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.11.1",
+  "version": "1.18.0",
-  "upstreamVersion": "6.2",
+  "upstreamVersion": "6.8.1",
-  "minBoxVersion": "7.1.0",
+  "minBoxVersion": "8.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",
   "httpPort": 8082,
@@ -20,12 +20,21 @@
     }
   },
   "addons": {
-    "sendmail": { "supportsDisplayName": false },
+    "sendmail": {
+      "supportsDisplayName": false
+    },
     "localstorage": {},
     "mysql": {},
-    "oidc": { "loginRedirectUri": "/api/session/openid/callback" }
+    "oidc": {
+      "loginRedirectUri": "/api/session/openid/callback, org.traccar.manager:/api/session/openid/callback"
+    }
   },
   "optionalSso": true,
+  "checklist": {
+    "change-default-password": {
+      "message": "Change the admin email and password credentials"
+    }
+  },
   "manifestVersion": 2,
   "tcpPorts": {
     "OSMAND_PORT": {
@@ -63,6 +72,12 @@
       "description": "Port over which Teltonika clients can connect",
       "defaultValue": 5027,
       "containerPort": 5027
+    },
+    "GT06_PORT": {
+      "title": "GT06 Protocol Port",
+      "description": "Port over which GT06 clients can connect",
+      "defaultValue": 5023,
+      "containerPort": 5023
     }
   },
   "website": "https://www.traccar.org",
@@ -70,7 +85,10 @@
   "contactEmail": "support@cloudron.io",
   "icon": "file://logo.png",
   "tags": [
-    "gps", "tracking", "seek", "fleet"
+    "gps",
+    "tracking",
+    "seek",
+    "fleet"
   ],
   "mediaLinks": [
     "https://screenshots.cloudron.io/org.traccar.cloudronapp/web.png",
@@ -78,6 +96,5 @@
     "https://screenshots.cloudron.io/org.traccar.cloudronapp/command_new.png"
   ],
   "forumUrl": "https://forum.cloudron.io/category/146/traccar",
-  "documentationUrl": "https://docs.cloudron.io/apps/traccar"
+  "documentationUrl": "https://docs.cloudron.io/packages/traccar"
 }
-

Dockerfile

@@ -1,11 +1,12 @@
-FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
+FROM cloudron/base:5.0.0@sha256:04fd70dbd8ad6149c19de39e35718e024417c3e01dc9c6637eaf4a41ec4e596c
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=6.2
+# renovate: datasource=github-releases depName=traccar/traccar versioning=regex:^(?<major>\d+)\.(?<minor>\d+)\.?(?<patch>\d+)?$ extractVersion=^v(?<version>.+)$
+ARG TRACCAR_VERSION=6.8.1
 
-RUN wget https://github.com/traccar/traccar/releases/download/v${VERSION}/traccar-linux-64-${VERSION}.zip -O traccar.zip && \
+RUN wget https://github.com/traccar/traccar/releases/download/v${TRACCAR_VERSION}/traccar-linux-64-${TRACCAR_VERSION}.zip -O traccar.zip && \
     unzip traccar.zip && \
     ./traccar.run --target /app/code/ --noexec && \
     rm README.txt traccar.zip traccar.run

POSTINSTALL.md

@@ -3,8 +3,6 @@ This app is pre-setup with an admin account. The initial credentials are:
 **Username**: admin@cloudron.local<br/>
 **Password**: admin<br/>
 
-Please change the admin email and password credentials immediately.
-
 <sso>
 By default, Cloudron users have regular users permissions. Permissions can be updated on the user profile page in the admin back-end.
 </sso>

renovate.json5

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+    "extends": ["local>devops/renovator//default.renovate.json5"]
+}

start.sh

@@ -55,11 +55,14 @@ xmlstarlet ed --inplace --update '//properties/entry[@key="web.url"]' -v "${CLOU
 
 # OIDC
 if [[ -n "${CLOUDRON_OIDC_ISSUER:-}" ]]; then
+    # update config file (to be removed on the next release)
+    sed -e 's/^.*openid.issuerUrl.*$//g' -i /app/data/traccar.xml
+
     echo "=> Ensure OIDC settings"
+    # CLOUDRON_OIDC_PROVIDER_NAME is not supported
     xmlstarlet ed --inplace \
         --update '//properties/entry[@key="openid.clientId"]' -v "${CLOUDRON_OIDC_CLIENT_ID}" \
         --update '//properties/entry[@key="openid.clientSecret"]' -v "${CLOUDRON_OIDC_CLIENT_SECRET}" \
-        --update '//properties/entry[@key="openid.issuerUrl"]' -v "${CLOUDRON_OIDC_ISSUER}" \
         --update '//properties/entry[@key="openid.authUrl"]' -v "${CLOUDRON_OIDC_AUTH_ENDPOINT}" \
         --update '//properties/entry[@key="openid.tokenUrl"]' -v "${CLOUDRON_OIDC_TOKEN_ENDPOINT}" \
         --update '//properties/entry[@key="openid.userInfoUrl"]' -v "${CLOUDRON_OIDC_PROFILE_ENDPOINT}" \

test/package.json

@@ -10,10 +10,10 @@
   "license": "ISC",
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^10.4.0",
+    "mocha": "^11.7.1",
-    "selenium-webdriver": "^4.21.0"
+    "selenium-webdriver": "^4.34.0"
   },
   "dependencies": {
-    "chromedriver": "^126.0.0"
+    "chromedriver": "^138.0.1"
   }
 }

test/test.js

@@ -1,10 +1,6 @@
 #!/usr/bin/env node
 
-/* jshint esversion: 8 */
+/* global it, xit, describe, before, after, afterEach */
-/* global describe */
-/* global before */
-/* global after */
-/* global it */
 
 'use strict';
 
@@ -12,6 +8,7 @@ require('chromedriver');
 
 const execSync = require('child_process').execSync,
     expect = require('expect.js'),
+    fs = require('fs'),
     path = require('path'),
     { Builder, By, Key, until } = require('selenium-webdriver'),
     { Options } = require('selenium-webdriver/chrome');
@@ -24,7 +21,7 @@ if (!process.env.USERNAME || !process.env.EMAIL || !process.env.PASSWORD) {
 describe('Application life cycle test', function () {
     this.timeout(0);
 
-    const LOCATION = 'test';
+    const LOCATION = process.env.LOCATION || 'test';
     const TEST_TIMEOUT = 20000;
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
     const DEVICE_NAME = 'FancyDevice';
@@ -39,16 +36,27 @@ describe('Application life cycle test', function () {
     let athenticated_by_oidc = false;
 
     before(function () {
-        const options = new Options().windowSize({ width: 1280, height: 1024 });
+        const chromeOptions = new Options().windowSize({ width: 1280, height: 1024 });
-        if (process.env.HEADLESS) options.addArguments('headless');
+        if (process.env.CI) chromeOptions.addArguments('no-sandbox', 'disable-dev-shm-usage', 'headless');
-
+        browser = new Builder().forBrowser('chrome').setChromeOptions(chromeOptions).build();
-        browser = new Builder().forBrowser('chrome').setChromeOptions(options).build();
+        if (!fs.existsSync('./screenshots')) fs.mkdirSync('./screenshots');
     });
 
     after(function () {
         browser.quit();
     });
 
+    afterEach(async function () {
+        if (!process.env.CI || !app) return;
+
+        const currentUrl = await browser.getCurrentUrl();
+        if (!currentUrl.includes(app.domain)) return;
+        expect(this.currentTest.title).to.be.a('string');
+
+        const screenshotData = await browser.takeScreenshot();
+        fs.writeFileSync(`./screenshots/${new Date().getTime()}-${this.currentTest.title.replaceAll(' ', '_')}.png`, screenshotData, 'base64');
+    });
+
     async function waitForElement(elem) {
         await browser.wait(until.elementLocated(elem), TEST_TIMEOUT);
         await browser.wait(until.elementIsVisible(browser.findElement(elem)), TEST_TIMEOUT);
@@ -71,7 +79,7 @@ describe('Application life cycle test', function () {
         await waitForElement(By.xpath('//span[text()="Account"]'));
     }
 
-    async function loginOIDC(username, password) {
+    async function loginOIDC(username, password, alreadyAuthenticated = true) {
         browser.manage().deleteAllCookies();
         await browser.get(`https://${app.fqdn}/login`);
         await browser.sleep(2000);
@@ -80,15 +88,11 @@ describe('Application life cycle test', function () {
         await browser.findElement(By.xpath('//button[contains(., "Login with OpenID")]')).click();
         await browser.sleep(2000);
 
-        if (!athenticated_by_oidc) {
+        if (!alreadyAuthenticated) {
-            await waitForElement(By.xpath('//input[@name="username"]'));
+            await waitForElement(By.id('inputUsername'));
-            await browser.findElement(By.xpath('//input[@name="username"]')).sendKeys(username);
+            await browser.findElement(By.id('inputUsername')).sendKeys(username);
-            await browser.findElement(By.xpath('//input[@name="password"]')).sendKeys(password);
+            await browser.findElement(By.id('inputPassword')).sendKeys(password);
-            await browser.sleep(2000);
+            await browser.findElement(By.id('loginSubmitButton')).click();
-            await browser.findElement(By.xpath('//button[@type="submit" and contains(text(), "Sign in")]')).click();
-            await browser.sleep(2000);
-
-            athenticated_by_oidc = true;
         }
 
         await browser.sleep(3000);
@@ -107,9 +111,9 @@ describe('Application life cycle test', function () {
 
     async function addDevice() {
         await browser.get(`https://${app.fqdn}/settings/device`);
-        await waitForElement(By.id(':r3:'));
+        await waitForElement(By.xpath('(//input[contains(@id, "«r")])[1]'));
-        await browser.findElement(By.id(':r3:')).sendKeys(DEVICE_NAME);
+        await browser.findElement(By.xpath('(//input[contains(@id, "«r")])[1]')).sendKeys(DEVICE_NAME);
-        await browser.findElement(By.id(':r4:')).sendKeys(DEVICE_IDENTIFIER);
+        await browser.findElement(By.xpath('(//input[contains(@id, "«r")])[2]')).sendKeys(DEVICE_IDENTIFIER);
         await browser.findElement(By.xpath('//button[text()="Save"]')).click();
         await waitForElement(By.xpath(`//span[text()="${DEVICE_NAME}"]`));
     }
@@ -144,7 +148,7 @@ describe('Application life cycle test', function () {
     it('device exists', deviceExists);
     it('can logout', logout);
 
-    it('can login as normal user via OIDC', loginOIDC.bind(null, process.env.USERNAME, process.env.PASSWORD));
+    it('can login as normal user via OIDC', loginOIDC.bind(null, process.env.USERNAME, process.env.PASSWORD, false));
     it('can logout', logout);
 
     it('can restart app', function () { execSync(`cloudron restart --app ${app.id}`); });

traccar.xml.template

@@ -27,7 +27,6 @@
 
     <entry key='openid.clientId'>##CLOUDRON_OIDC_CLIENT_ID##</entry>
     <entry key='openid.clientSecret'>##CLOUDRON_OIDC_CLIENT_SECRET##</entry>
-    <entry key='openid.issuerUrl'>##CLOUDRON_OIDC_ISSUER##</entry>
     <entry key='openid.authUrl'>##CLOUDRON_OIDC_AUTH_ENDPOINT##</entry>
     <entry key='openid.tokenUrl'>##CLOUDRON_OIDC_TOKEN_ENDPOINT##</entry>
     <entry key='openid.userInfoUrl'>##CLOUDRON_OIDC_PROFILE_ENDPOINT##</entry>