rebase

.github/workflows/L2-tests.yml

@@ -23,37 +23,26 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/rfc'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: rfc
 
       - name: Check out dependent repostiories
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/iarmmgrs'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: iarmmgrs
 
       - name: Check out dependent repostiories
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/iarmbus'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: iarmbus
 
       - name: Check out dependent repostiories
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/tr69hostif'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: tr69hostif
 
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v1
 
@@ -74,7 +63,7 @@ jobs:
 
       - name: Move dependent repositories in native-platform container to /usr
         run: |
-          docker exec -i native-platform /bin/bash -c "mv /mnt/L2_CONTAINER_SHARED_VOLUME/rfc /usr/ && mv /mnt/L2_CONTAINER_SHARED_VOLUME/iarmmgrs /usr/ && mv /mnt/L2_CONTAINER_SHARED_VOLUME/iarmbus /usr/ && mv /mnt/L2_CONTAINER_SHARED_VOLUME/tr69hostif /usr/"
+          docker exec -i native-platform /bin/bash -c "rm -rf /usr/rfc && mv /mnt/L2_CONTAINER_SHARED_VOLUME/rfc /usr/ && mv /mnt/L2_CONTAINER_SHARED_VOLUME/iarmmgrs /usr/ && rm -rf /usr/iarmbus && mv /mnt/L2_CONTAINER_SHARED_VOLUME/iarmbus /usr/ && mv /mnt/L2_CONTAINER_SHARED_VOLUME/tr69hostif /usr/"
 
       - name: Enter Inside Platform native container and run L2 Test
         run: |

.github/workflows/native_full_build.yml

@@ -1,12 +1,9 @@
 name: Build Component in Native Environment
 
 on:
-  workflow_dispatch:
-    inputs:
-      branch:
-        description: 'Branch to build'
-        required: true
-        default: 'develop'
+  pull_request:
+    branches: [ develop  ]
+    paths: ['**/*.c', '**/*.cpp', '**/*.cc', '**/*.cxx', '**/*.h', '**/*.hpp', '**/*.sh' ]
 
 jobs:
   build-systemtimemgr-on-pr:
@@ -30,28 +27,24 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/rfc'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: rfc
 
       - name: Check out dependent repostiories
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/iarmmgrs'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: iarmmgrs
 
       - name: Check out dependent repostiories
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/iarmbus'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: iarmbus
 
       - name: Check out dependent repostiories
         uses: actions/checkout@v4
         with:
           repository: 'rdkcentral/tr69hostif'
-          token: ${{ secrets.GH_ACTION_PULL }}
           path: tr69hostif
 
 

CHANGELOG.md

@@ -4,9 +4,33 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.2.6](https://github.com/rdkcentral/remote_debugger/compare/1.2.5...1.2.6)
+
+- Feature/rdk 56115 coverity [`#108`](https://github.com/rdkcentral/remote_debugger/pull/108)
+- [RDKE] L2 Tests And Integration With CI for Remote Debugger Dynamic Updates [`#98`](https://github.com/rdkcentral/remote_debugger/pull/98)
+- RDKECMF-219 Enable component build workflow on Pull Request and remove unnecessary token [`#70`](https://github.com/rdkcentral/remote_debugger/pull/70)
+- RDK-56451 [RDKE] Move tr69hostif L2 binary into common docker repo [`#104`](https://github.com/rdkcentral/remote_debugger/pull/104)
+- RDK-56115 : [RDKE] Fix coverity issues in RRD [`6edfc37`](https://github.com/rdkcentral/remote_debugger/commit/6edfc376fbd899e2992ed2c26cdeb86351c925aa)
+- RDK-56115 : Coverity fix [`4955236`](https://github.com/rdkcentral/remote_debugger/commit/49552366c6ff0d59024e3a449e3a52868a4222de)
+- RDK-56115 : Coverity fix [`8f37f99`](https://github.com/rdkcentral/remote_debugger/commit/8f37f9936ec865d68eb05eb6f0137888cbdb627d)
+
+#### [1.2.5](https://github.com/rdkcentral/remote_debugger/compare/1.2.4...1.2.5)
+
+> 27 March 2025
+
+- RDK-55702: Update the MW clients to use Power Manager Plugin [`#100`](https://github.com/rdkcentral/remote_debugger/pull/100)
+- RDKEMW-1768 -Fix UT in RRD with Static profile update and Null Check [`#102`](https://github.com/rdkcentral/remote_debugger/pull/102)
+- RDKECMF-219 Remove redundant variable [`#96`](https://github.com/rdkcentral/remote_debugger/pull/96)
+- RDKB-58835-[Productisation] Enable RRD Dynamic Profile for RDKB platforms [`#88`](https://github.com/rdkcentral/remote_debugger/pull/88)
+- 1.2.5 release changelog updates [`8c49b9c`](https://github.com/rdkcentral/remote_debugger/commit/8c49b9cd05f4c16c5ea2dea79963a2b81b697d6a)
+- Merge tag '1.2.4' into develop [`9c234d3`](https://github.com/rdkcentral/remote_debugger/commit/9c234d33e7649424a503259411c749e024e8d986)
+
 #### [1.2.4](https://github.com/rdkcentral/remote_debugger/compare/1.2.3...1.2.4)
 
+> 6 March 2025
+
 - RDKB-58835  : [Productisation] Enable RRD Dynamic Profile for RDKB platforms [`#83`](https://github.com/rdkcentral/remote_debugger/pull/83)
+- 1.2.4 release changelog updates [`d167642`](https://github.com/rdkcentral/remote_debugger/commit/d167642d7f037c2255d94e2e2ed36f2151defef3)
 
 #### [1.2.3](https://github.com/rdkcentral/remote_debugger/compare/1.2.2...1.2.3)
 

run_l2.sh

@@ -27,6 +27,9 @@ mkdir -p "$RESULT_DIR"
 mkdir -p "$OUTPUT_DIR"
 mkdir -p "$STATIC_PROFILE_DIR"
 mkdir -p "$LIB_DIR"
+mkdir -p /media/apps/RDK-RRD-Test/etc/rrd
+
+touch /media/apps/RDK-RRD-Test/etc/rrd/remote_debugger.json
 
 apt-get remove systemd
 apt-get update && apt-get install -y tcpdump
@@ -56,6 +59,10 @@ rm -rf /tmp/rrd/*
 rm -rf /opt/logs/remotedebugger.log*
 
 # Run L2 Test cases
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_dynamic_profile_missing_report.json test/functional-tests/tests/test_rrd_dynamic_profile_missing_report.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_dynamic_profile_harmful_report.json test/functional-tests/tests/test_rrd_dynamic_profile_harmful_report.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_dynamic_profile_report.json test/functional-tests/tests/test_rrd_dynamic_profile_report.py
+pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_append_dynamic_profile_static_notfound.json test/functional-tests/tests/test_rrd_append_dynamic_profile_static_notfound.py
 pytest  --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_single_instance.json test/functional-tests/tests/test_rrd_single_instance.py
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_start_control.json test/functional-tests/tests/test_rrd_start_control.py
 pytest --json-report --json-report-summary --json-report-file $RESULT_DIR/rrd_start_subscribe_and_wait.json test/functional-tests/tests/test_rrd_start_subscribe_and_wait.py

src/rrdCommandSanity.c

@@ -18,6 +18,7 @@
 */
 
 #include "rrdCommandSanity.h"
+#include <ctype.h>
 
 /*
  * @function updateBackgroundCmd
@@ -131,9 +132,21 @@ int isCommandsValid(char *issuecmd,cJSON *sanitylist)
     {
          subcmd = cJSON_GetArrayItem(sanitylist, i);
          checkcmd = cJSON_Print(subcmd); // Print each command from the sanity command array in Json
+         int len = strlen(checkcmd);
+         if (len >= 2 && checkcmd[0] == '"' && checkcmd[len - 1] == '"') 
+         {
+             checkcmd[len - 1] = '\0'; // Remove closing quote
+             checkcmd++;               // Move pointer forward to skip opening quote
+             len -= 2;            // Adjust length after removing quotes
+         }
+         // Trim trailing spaces
+         int j = len - 1;
+         while (j >= 0 && isspace(checkcmd[j])) {
+         checkcmd[j] = '\0';
+         j--;
+         }
          RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Checking for \"%s\" string in Issue commands... \n",__FUNCTION__,__LINE__,checkcmd);
          sanitystr = strstr(issuecmd,checkcmd);
-         cJSON_free(checkcmd); // free each command from the sanity command array
          if (sanitystr)
          {
              RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Found harmful commands: %s, Exiting!!! \n",__FUNCTION__,__LINE__,sanitystr);

src/rrdCommon.h

@@ -34,7 +34,11 @@ extern "C"
 #include "rdk_debug.h"
 #ifdef IARMBUS_SUPPORT
 #include "rdmMgr.h"
+#if defined(PWRMGR_PLUGIN)
+#include "power_controller.h"
+#else
 #include "pwrMgr.h"
+#endif
 #include "tr181api.h"
 #endif
 #endif

src/rrdDynamic.c

@@ -82,7 +82,9 @@ void RRDProcessDeepSleepAwakeEvents(data_buf *rbuf)
                 }
                 /*Initiate RDM Manager Download Request*/
                 RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Sending RDM Download Request for DeepSleep dynamic package...\n", __FUNCTION__, __LINE__);
+#if !defined(GTEST_ENABLE)
                 RRDRdmManagerDownloadRequest(&issueStructNode, dynJSONPath, rbuf, true);
+#endif
                 /*Free Recieved Buffer and Dynamic Json Path Pointer*/
                 free(dynJSONPath);
                 free(rbuf->mdata);
@@ -157,6 +159,7 @@ int RRDGetProfileStringLength(issueNodeData *pissueStructNode, bool isDeepSleepA
  * @param bool isDeepSleepAwakeEvent - Flag to indicate if this is a deep sleep awake event.
  * @return void
  */
+#if !defined(GTEST_ENABLE)
 void RRDRdmManagerDownloadRequest(issueNodeData *pissueStructNode, char *dynJSONPath, data_buf *rbuf, bool isDeepSleepAwakeEvent)
 {
     char *paramString = NULL;
@@ -216,7 +219,7 @@ void RRDRdmManagerDownloadRequest(issueNodeData *pissueStructNode, char *dynJSON
                 {
 #ifdef IARMBUS_SUPPORT
                     if (isDeepSleepAwakeEvent)
-                        strncpy(msgDataString, paramString, msgDataStringSize);
+                        strncpy(msgDataString, paramString, (msgDataStringSize - strlen(RDM_PKG_SUFFIX)));
                     else
                         snprintf(msgDataString, msgDataStringSize, "%s%s", RDM_PKG_PREFIX, pissueStructNode->Node);
 #else
@@ -279,7 +282,7 @@ void RRDRdmManagerDownloadRequest(issueNodeData *pissueStructNode, char *dynJSON
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Exiting...\n", __FUNCTION__, __LINE__);
     return;
 }
-
+#endif
 /*
  * @function RRDCheckIssueInDynamicProfile
  * @brief Checks for a specific issue in the dynamic JSON profile associated with the given

src/rrdEventProcess.c

@@ -22,6 +22,7 @@
 #include "rrdEventProcess.h"
 
 #define COMMAND_DELIM ';'
+#define RRD_TMP_DIR "/tmp/"
 
 static void processIssueType(data_buf *rbuf);
 static void processIssueTypeInDynamicProfile(data_buf *rbuf, issueNodeData *pIssueNode);
@@ -58,7 +59,7 @@ void processWebCfgTypeEvent(data_buf *rbuf)
  */
 void processIssueTypeEvent(data_buf *rbuf)
 {
-    char **cmdMap;
+    char **cmdMap = NULL;
     int index = 0, count = 0, dataMsgLen = 0;
     data_buf *cmdBuff = NULL;
 
@@ -189,6 +190,7 @@ static void processIssueType(data_buf *rbuf)
 		RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Checking Issue from Static... \n", __FUNCTION__, __LINE__);
                 processIssueTypeInStaticProfile(rbuf, pIssueNode);
             }
+	    //CID-336989: Resource leak
         }
         else
         {
@@ -294,9 +296,12 @@ static void processIssueTypeInStaticProfile(data_buf *rbuf, issueNodeData *pIssu
     isStaticIssue = findIssueInParsedJSON(pIssueNode, jsonParsed);
     if (isStaticIssue)
     {
-        // Issue in Static Profile JSON
         RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Issue Data Node: %s and Sub-Node: %s found in Static JSON File %s... \n", __FUNCTION__, __LINE__, pIssueNode->Node, pIssueNode->subNode, RRD_JSON_FILE);
-        checkIssueNodeInfo(pIssueNode, jsonParsed, rbuf, false, NULL); // sanity Check and Get Command List
+	// CID 336988: Double free (USE_AFTER_FREE)
+	if(rbuf)
+	{
+	    checkIssueNodeInfo(pIssueNode, jsonParsed, rbuf, false, NULL); // sanity Check and Get Command List
+	}
     }
     else
     {
@@ -321,7 +326,11 @@ issueData* processIssueTypeInDynamicProfileappend(data_buf *rbuf, issueNodeData
 
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Entering.. \n", __FUNCTION__, __LINE__);
     rrdjsonlen = strlen(RRD_JSON_FILE);
+#ifdef IARMBUS_SUPPORT
     persistentAppslen = strlen(RRD_MEDIA_APPS);
+#else
+    persistentAppslen = strlen(RRD_TMP_DIR);
+#endif
     prefixlen = strlen(RDM_PKG_PREFIX);
     dynJSONPath = (char *)malloc(persistentAppslen + prefixlen + strlen(pIssueNode->Node) + rrdjsonlen + 1);
 
@@ -330,15 +339,20 @@ issueData* processIssueTypeInDynamicProfileappend(data_buf *rbuf, issueNodeData
         RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
         return dynamicdata;
     }
+#ifdef IARMBUS_SUPPORT
     sprintf(dynJSONPath, "%s%s%s%s", RRD_MEDIA_APPS, RDM_PKG_PREFIX, pIssueNode->Node, RRD_JSON_FILE);
-
+#else	
+    sprintf(dynJSONPath, "%s%s%s%s", RRD_TMP_DIR, RDM_PKG_PREFIX, pIssueNode->Node, RRD_JSON_FILE);
+#endif
     RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Checking Dynamic Profile... \n", __FUNCTION__, __LINE__);
     jsonParsed = readAndParseJSON(dynJSONPath);
     if (jsonParsed == NULL)
     {
         RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Dynamic Profile Parse/Read failed... %s\n", __FUNCTION__, __LINE__, dynJSONPath);
         RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Going to RDM Request... \n", __FUNCTION__, __LINE__);
+#if !defined(GTEST_ENABLE)
         RRDRdmManagerDownloadRequest(pIssueNode, dynJSONPath, rbuf, false); //goto RDM_RRD_REQ_LABEL;
+#endif
     }
     else
     {
@@ -422,7 +436,11 @@ static void processIssueTypeInInstalledPackage(data_buf *rbuf, issueNodeData *pI
     RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: ...Entering.. \n", __FUNCTION__, __LINE__);
 #if !defined(GTEST_ENABLE)
     rrdjsonlen = strlen(RRD_JSON_FILE);
+#ifdef IARMBUS_SUPPORT
     persistentAppslen = strlen(RRD_MEDIA_APPS);
+#else
+    persistentAppslen = strlen(RRD_TMP_DIR);
+#endif
     prefixlen = strlen(RDM_PKG_PREFIX);
     suffixlen = strlen(RDM_PKG_SUFFIX);
     dynJSONPath = (char *)malloc(persistentAppslen + prefixlen + suffixlen + strlen(pIssueNode->Node) + rrdjsonlen + 1);
@@ -437,7 +455,11 @@ static void processIssueTypeInInstalledPackage(data_buf *rbuf, issueNodeData *pI
         return;
     }
 #if !defined(GTEST_ENABLE)
+#ifdef IARMBUS_SUPPORT
     sprintf(dynJSONPath, "%s%s%s%s", RRD_MEDIA_APPS, RDM_PKG_PREFIX, pIssueNode->Node, RRD_JSON_FILE);
+#else
+    sprintf(dynJSONPath, "%s%s%s%s", RRD_TMP_DIR, RDM_PKG_PREFIX, pIssueNode->Node, RRD_JSON_FILE);
+#endif
 #else
     sprintf(dynJSONPath, "%s", rbuf->jsonPath);
 #endif
@@ -448,7 +470,9 @@ static void processIssueTypeInInstalledPackage(data_buf *rbuf, issueNodeData *pI
     {
         RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Dynamic Profile Parse/Read failed... %s\n", __FUNCTION__, __LINE__, dynJSONPath);
         RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Going to RDM Request... \n", __FUNCTION__, __LINE__);
+#if !defined(GTEST_ENABLE)	    
         RRDRdmManagerDownloadRequest(pIssueNode, dynJSONPath, rbuf, false); //goto RDM_RRD_REQ_LABEL;
+#endif
     }
     else
     {
@@ -465,7 +489,9 @@ static void processIssueTypeInInstalledPackage(data_buf *rbuf, issueNodeData *pI
         else
         {
             // Issue Data not in Dynamic Profile JSON
+#if !defined(GTEST_ENABLE)
             RRDRdmManagerDownloadRequest(pIssueNode, dynJSONPath, rbuf, false);
+#endif
         }
     }
     freeParsedJson(jsonParsed);