Merge pull request #48 from usdot-jpo-ode/release/2025-q1

Merge Release/2025 q1 into master
CDOT-CV · Jan 27, 2025 · e82a5d7 · e82a5d7
2 parents 23b593e + e48c3cb
commit e82a5d7
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
      options: "--user root"
    steps:
      - name: checkout code
-       uses: actions/checkout@v2 # This action to checkout the code
+       uses: actions/checkout@v4 # This action to checkout the code
      - name: Install Deps
        run: |
          apt update
@@ -26,7 +26,7 @@ jobs:
          sudo apt-get -y update
          sudo apt-get -y install docker-ce   
      - name: set up Cmake
-       uses: jwlawson/actions-setup-cmake@v1.13  # this action is used to setup and install Cmake with required versions
+       uses: jwlawson/actions-setup-cmake@v2  # this action is used to setup and install Cmake with required versions
        with:
          cmake-version: '3.16'  
      - name: install g++
@@ -43,7 +43,7 @@ jobs:
          cmake --build _cmake_build
          cmake --build _cmake_build --target install  
      - name: Install sonar-scanner and build-wrapper
-       uses: sonarsource/sonarcloud-github-c-cpp@v2  # This Action Installs sonar cloud and build wrapper to run sonar scan analysis  
+       uses: sonarsource/sonarcloud-github-c-cpp@v3  # This Action Installs sonar cloud and build wrapper to run sonar scan analysis  
      - name: Build and Generate test coverage
        run: |
          cd $GITHUB_WORKSPACE
@@ -57,15 +57,15 @@ jobs:
          gcov $GITHUB_WORKSPACE/cv-lib/src/*.cpp --object-directory /__w/jpo-cvdp/jpo-cvdp/build/cv-lib/CMakeFiles/CVLib.dir/src/
          gcov $GITHUB_WORKSPACE/src/*.cpp --object-directory /__w/jpo-cvdp/jpo-cvdp/build/CMakeFiles/ppm_tests.dir/src/              
      - name: Archive code coverage results
-       uses: actions/upload-artifact@v3 # This action is used to capture the test artifacts and exits if no files are found
+       uses: actions/upload-artifact@v4 # This action is used to capture the test artifacts and exits if no files are found
        with:
-         name: jpo-cvdp
+         name: jpo-cvdp-code-coverage
          path: /__w/jpo-cvdp/jpo-cvdp/coverage/
          if-no-files-found: error              
      - name: Archive buildwrapper output
-       uses: actions/upload-artifact@v3  # This action is used to capture the builwrapper output files used by sonarscan.
+       uses: actions/upload-artifact@v4  # This action is used to capture the builwrapper output files used by sonarscan.
        with: 
-         name: jpo-cvdp
+         name: jpo-cvdp-buildwrapper-output
          path: /home/runner/work/jpo-cvdp/jpo-cvdp/bw-output       
      - name: Setup SonarScanner
        uses: warchant/setup-sonar-scanner@v7 # This action is used to setup sonar scanner with required versions.

diff --git a/data/I_80_test.json b/data/I_80_test.json
@@ -8,3 +8,4 @@
 {"metadata": {"logFileName": "bsm.uper", "odeReceivedAt": "2017-09-26T20:00:08.48Z[UTC]", "payloadType": "us.dot.its.jpo.ode.model.OdeBsmPayload", "recordGeneratedBy": "OBU", "recordType": "bsmRxRecord", "recrodGeneratedAt": "2016-08-10T16:35:45.138Z[UTC]", "sanitized": false, "schemaVersion": 3, "serialId": {"bundleId": 12, "bundleSize": 1, "recordId": 5, "serialNumber": 0, "streamId": "f9c7635a-7763-4e21-bece-cb1104f143b9"}, "validSignature": true}, "payload": {"data": {"coreData": {"accelSet": {"accelYaw": 0.0}, "accuracy": {}, "brakes": {"abs": "unavailable", "auxBrakes": "unavailable", "brakeBoost": "unavailable", "scs": "unavailable", "traction": "unavailable", "wheelBrakes": {"leftFront": false, "leftRear": false, "rightFront": false, "rightRear": true, "unavailable": false}}, "heading": 270.425, "id": "BEA10000", "msgCnt": 85, "position": {"elevation": 204.1, "latitude": 42.24576, "longitude": -83.62337}, "secMark": 600, "size": {"length": 1000, "width": 30}, "speed": 6.86}, "partII": [{"id": "VEHICLESAFETYEXT", "value": {"pathHistory": {"crumbData": [{"elevationOffset": 9.5, "latOffset": 3.5e-06, "lonOffset": 0.0131071, "timeOffset": 33.2}, {"elevationOffset": 4.6, "latOffset": 7.4e-05, "lonOffset": 0.0131071, "timeOffset": 44.6}, {"elevationOffset": 3.5, "latOffset": 9.44e-05, "lonOffset": 5.1e-06, "timeOffset": 49.3}, {"elevationOffset": 204.7, "latOffset": 0.0001826, "lonOffset": 6.37e-05, "timeOffset": 71.7}, {"elevationOffset": 204.7, "latOffset": 0.0001313, "lonOffset": 6.06e-05, "timeOffset": 80.2}, {"elevationOffset": 204.7, "latOffset": 0.0001535, "lonOffset": 7.48e-05, "timeOffset": 92.9}, {"elevationOffset": 204.7, "latOffset": 0.000165, "lonOffset": 0.0001171, "timeOffset": 126.4}, {"elevationOffset": 204.7, "latOffset": 0.0001363, "lonOffset": 0.0001, "timeOffset": 136.1}, {"elevationOffset": 204.7, "latOffset": 0.0001196, "lonOffset": 0.0001028, "timeOffset": 141.9}, {"elevationOffset": 204.7, "latOffset": 0.0001111, "lonOffset": 9.8e-05, "timeOffset": 143.0}, {"elevationOffset": 204.7, "latOffset": 0.0131071, "lonOffset": 9.5e-06, "timeOffset": 348.0}, {"elevationOffset": 12.6, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 437.8}, {"elevationOffset": 11.5, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 468.2}, {"elevationOffset": 10.0, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 474.0}, {"elevationOffset": 10.2, "latOffset": 0.0131071, "lonOffset": 7e-06, "timeOffset": 481.3}]}, "pathPrediction": {"confidence": 0.0, "radiusOfCurve": 0.0}}}]}, "dataType": "us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}, "schemaVersion": 3}
 {"metadata": {"logFileName": "bsm.uper", "odeReceivedAt": "2017-09-26T20:00:08.48Z[UTC]", "payloadType": "us.dot.its.jpo.ode.model.OdeBsmPayload", "recordGeneratedBy": "OBU", "recordType": "bsmRxRecord", "recrodGeneratedAt": "2016-08-10T16:35:45.138Z[UTC]", "sanitized": false, "schemaVersion": 3, "serialId": {"bundleId": 12, "bundleSize": 1, "recordId": 5, "serialNumber": 0, "streamId": "f9c7635a-7763-4e21-bece-cb1104f143b9"}, "validSignature": true}, "payload": {"data": {"coreData": {"accelSet": {"accelYaw": 0.0}, "accuracy": {}, "brakes": {"abs": "unavailable", "auxBrakes": "unavailable", "brakeBoost": "unavailable", "scs": "unavailable", "traction": "unavailable", "wheelBrakes": {"leftFront": false, "leftRear": false, "rightFront": false, "rightRear": true, "unavailable": false}}, "heading": 270.4375, "id": "BEA10000", "msgCnt": 86, "position": {"elevation": 204.2, "latitude": 42.24576, "longitude": -83.62337}, "secMark": 700, "size": {"length": 1000, "width": 30}, "speed": 6.84}, "partII": [{"id": "VEHICLESAFETYEXT", "value": {"pathHistory": {"crumbData": [{"elevationOffset": 9.5, "latOffset": 3.5e-06, "lonOffset": 0.0131071, "timeOffset": 33.2}, {"elevationOffset": 4.6, "latOffset": 7.4e-05, "lonOffset": 0.0131071, "timeOffset": 44.6}, {"elevationOffset": 3.5, "latOffset": 9.44e-05, "lonOffset": 5.1e-06, "timeOffset": 49.3}, {"elevationOffset": 204.7, "latOffset": 0.0001826, "lonOffset": 6.37e-05, "timeOffset": 71.7}, {"elevationOffset": 204.7, "latOffset": 0.0001313, "lonOffset": 6.06e-05, "timeOffset": 80.2}, {"elevationOffset": 204.7, "latOffset": 0.0001535, "lonOffset": 7.48e-05, "timeOffset": 92.9}, {"elevationOffset": 204.7, "latOffset": 0.000165, "lonOffset": 0.0001171, "timeOffset": 126.4}, {"elevationOffset": 204.7, "latOffset": 0.0001363, "lonOffset": 0.0001, "timeOffset": 136.1}, {"elevationOffset": 204.7, "latOffset": 0.0001196, "lonOffset": 0.0001028, "timeOffset": 141.9}, {"elevationOffset": 204.7, "latOffset": 0.0001111, "lonOffset": 9.8e-05, "timeOffset": 143.0}, {"elevationOffset": 204.7, "latOffset": 0.0131071, "lonOffset": 9.5e-06, "timeOffset": 348.0}, {"elevationOffset": 12.6, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 437.8}, {"elevationOffset": 11.5, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 468.2}, {"elevationOffset": 10.0, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 474.0}, {"elevationOffset": 10.2, "latOffset": 0.0131071, "lonOffset": 7e-06, "timeOffset": 481.3}]}, "pathPrediction": {"confidence": 0.0, "radiusOfCurve": 0.0}}}]}, "dataType": "us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}, "schemaVersion": 3}
 {"metadata": {"logFileName": "bsm.uper", "odeReceivedAt": "2017-09-26T20:00:08.48Z[UTC]", "payloadType": "us.dot.its.jpo.ode.model.OdeBsmPayload", "recordGeneratedBy": "OBU", "recordType": "bsmRxRecord", "recrodGeneratedAt": "2016-08-10T16:35:45.138Z[UTC]", "sanitized": false, "schemaVersion": 3, "serialId": {"bundleId": 12, "bundleSize": 1, "recordId": 5, "serialNumber": 0, "streamId": "f9c7635a-7763-4e21-bece-cb1104f143b9"}, "validSignature": true}, "payload": {"data": {"coreData": {"accelSet": {"accelYaw": 0.0}, "accuracy": {}, "brakes": {"abs": "unavailable", "auxBrakes": "unavailable", "brakeBoost": "unavailable", "scs": "unavailable", "traction": "unavailable", "wheelBrakes": {"leftFront": false, "leftRear": false, "rightFront": false, "rightRear": true, "unavailable": false}}, "heading": 270.1375, "id": "BEA10000", "msgCnt": 87, "position": {"elevation": 204.2, "latitude": 42.24576, "longitude": -83.62338}, "secMark": 800, "size": {"length": 1000, "width": 30}, "speed": 6.74}, "partII": [{"id": "VEHICLESAFETYEXT", "value": {"pathHistory": {"crumbData": [{"elevationOffset": 9.5, "latOffset": 3.5e-06, "lonOffset": 0.0131071, "timeOffset": 33.2}, {"elevationOffset": 4.6, "latOffset": 7.4e-05, "lonOffset": 0.0131071, "timeOffset": 44.6}, {"elevationOffset": 3.5, "latOffset": 9.44e-05, "lonOffset": 5.1e-06, "timeOffset": 49.3}, {"elevationOffset": 204.7, "latOffset": 0.0001826, "lonOffset": 6.37e-05, "timeOffset": 71.7}, {"elevationOffset": 204.7, "latOffset": 0.0001313, "lonOffset": 6.06e-05, "timeOffset": 80.2}, {"elevationOffset": 204.7, "latOffset": 0.0001535, "lonOffset": 7.48e-05, "timeOffset": 92.9}, {"elevationOffset": 204.7, "latOffset": 0.000165, "lonOffset": 0.0001171, "timeOffset": 126.4}, {"elevationOffset": 204.7, "latOffset": 0.0001363, "lonOffset": 0.0001, "timeOffset": 136.1}, {"elevationOffset": 204.7, "latOffset": 0.0001196, "lonOffset": 0.0001028, "timeOffset": 141.9}, {"elevationOffset": 204.7, "latOffset": 0.0001111, "lonOffset": 9.8e-05, "timeOffset": 143.0}, {"elevationOffset": 204.7, "latOffset": 0.0131071, "lonOffset": 9.5e-06, "timeOffset": 348.0}, {"elevationOffset": 12.6, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 437.8}, {"elevationOffset": 11.5, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 468.2}, {"elevationOffset": 10.0, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 474.0}, {"elevationOffset": 10.2, "latOffset": 0.0131071, "lonOffset": 7e-06, "timeOffset": 481.3}]}, "pathPrediction": {"confidence": 0.0, "radiusOfCurve": 0.0}}}]}, "dataType": "us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}, "schemaVersion": 3}
+{"metadata": {"logFileName": "bsm.uper", "odeReceivedAt": "2017-09-26T20:00:08.48Z[UTC]", "payloadType": "us.dot.its.jpo.ode.model.OdeBsmPayload", "recordGeneratedBy": "OBU", "recordType": "bsmRxRecord", "recrodGeneratedAt": "2016-08-10T16:35:45.138Z[UTC]", "sanitized": false, "schemaVersion": 3, "serialId": {"bundleId": 12, "bundleSize": 1, "recordId": 5, "serialNumber": 0, "streamId": "f9c7635a-7763-4e21-bece-cb1104f143b9"}, "validSignature": true, "asn1": "0022e12d18466c65c1493800000e00e4616183e85a8f0100c000038081bc001480b8494c4c950cd8cde6e9651116579f22a424dd78fffff00761e4fd7eb7d07f7fff80005f11d1020214c1c0ffc7c016aff4017a0ff65403b0fd204c20ffccc04f8fe40c420ffe6404cefe60e9a10133408fcfde1438103ab4138f00e1eec1048ec160103e237410445c171104e26bc103dc4154305c2c84103b1c1c8f0a82f42103f34262d1123198103dac25fb12034ce10381c259f12038ca103574251b10e3b2210324c23ad0f23d8efffe0000209340d10000004264bf00"}, "payload": {"data": {"coreData": {"accelSet": {"accelYaw": 0.0}, "accuracy": {}, "brakes": {"abs": "unavailable", "auxBrakes": "unavailable", "brakeBoost": "unavailable", "scs": "unavailable", "traction": "unavailable", "wheelBrakes": {"leftFront": false, "leftRear": false, "rightFront": false, "rightRear": true, "unavailable": false}}, "heading": 270.1375, "id": "BEA10001", "msgCnt": 87, "position": {"elevation": 204.2, "latitude": 42.24576, "longitude": -83.62338}, "secMark": 800, "size": {"length": 1000, "width": 30}, "speed": 6.74}, "partII": [{"id": "VEHICLESAFETYEXT", "value": {"pathHistory": {"crumbData": [{"elevationOffset": 9.5, "latOffset": 3.5e-06, "lonOffset": 0.0131071, "timeOffset": 33.2}, {"elevationOffset": 4.6, "latOffset": 7.4e-05, "lonOffset": 0.0131071, "timeOffset": 44.6}, {"elevationOffset": 3.5, "latOffset": 9.44e-05, "lonOffset": 5.1e-06, "timeOffset": 49.3}, {"elevationOffset": 204.7, "latOffset": 0.0001826, "lonOffset": 6.37e-05, "timeOffset": 71.7}, {"elevationOffset": 204.7, "latOffset": 0.0001313, "lonOffset": 6.06e-05, "timeOffset": 80.2}, {"elevationOffset": 204.7, "latOffset": 0.0001535, "lonOffset": 7.48e-05, "timeOffset": 92.9}, {"elevationOffset": 204.7, "latOffset": 0.000165, "lonOffset": 0.0001171, "timeOffset": 126.4}, {"elevationOffset": 204.7, "latOffset": 0.0001363, "lonOffset": 0.0001, "timeOffset": 136.1}, {"elevationOffset": 204.7, "latOffset": 0.0001196, "lonOffset": 0.0001028, "timeOffset": 141.9}, {"elevationOffset": 204.7, "latOffset": 0.0001111, "lonOffset": 9.8e-05, "timeOffset": 143.0}, {"elevationOffset": 204.7, "latOffset": 0.0131071, "lonOffset": 9.5e-06, "timeOffset": 348.0}, {"elevationOffset": 12.6, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 437.8}, {"elevationOffset": 11.5, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 468.2}, {"elevationOffset": 10.0, "latOffset": 0.0131071, "lonOffset": 0.0131071, "timeOffset": 474.0}, {"elevationOffset": 10.2, "latOffset": 0.0131071, "lonOffset": 7e-06, "timeOffset": 481.3}]}, "pathPrediction": {"confidence": 0.0, "radiusOfCurve": 0.0}}}]}, "dataType": "us.dot.its.jpo.ode.plugin.j2735.J2735Bsm"}, "schemaVersion": 3}
diff --git a/docs/Release_notes.md b/docs/Release_notes.md
@@ -1,6 +1,19 @@
 Jpo-cvdp Release Notes
 ----------------------------
 
+Version 1.5.0, released January 2025
+----------------------------------------
+### **Summary**
+The jpo-cvdp 1.5.0 release includes an enhancement to redact the "asn1" field from BSM messages, ensuring that filtered BSM messages no longer contain the field. Additionally, it updates GitHub Actions workflows with the latest versions of third-party actions from external repositories to eliminate Node.js and other deprecation warnings.
+
+Enhancements in this release:
+- [CDOT PR 54](https://github.com/CDOT-CV/jpo-cvdp/pull/54): BSM "asn1" Field Redaction
+- [USDOT PR 45](https://github.com/usdot-jpo-ode/jpo-cvdp/pull/45): Update GitHub Actions Third-Party Action Versions
+
+Known Issues:
+- No known issues at this time.
+
+
 Version 1.4.0, released September 2024
 ----------------------------------------
 ### **Summary**

diff --git a/src/bsmHandler.cpp b/src/bsmHandler.cpp
@@ -184,6 +184,10 @@ bool BSMHandler::process( const std::string& message_json ) {
     }
 
     metadata["sanitized"] = true;
+
+    if (metadata.HasMember("asn1")) {
+        metadata["asn1"].SetString("", document.GetAllocator());
+    }
 
     // get the payload type
     if (!metadata.HasMember("payloadType")) {