Rebase feature/RDKEMW-8178 branch inline with develop

.github/CODEOWNERS

@@ -2,4 +2,4 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-*       @rdkcentral/rdke_ghec_sysint_maintainer @rdkcentral/rdke_ghec_sysint_admin
+*       @rdkcentral/rdke_ghec_sysint_maintainer

.github/workflows/cla.yml

@@ -0,0 +1,20 @@
+name: "CLA"
+
+permissions:
+  contents: read
+  pull-requests: write
+  actions: write
+  statuses: write
+
+on:
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened, closed, synchronize]
+
+jobs:
+  CLA-Lite:
+    name: "Signature"
+    uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@v1
+    secrets:
+      PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}

.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml

@@ -1,11 +1,18 @@
 name: Fossid Stateless Diff Scan
 
-on: pull_request
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+
+permissions:
+  contents: read
+  pull-requests: read
 
 jobs:
   call-fossid-workflow:
-    uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@develop
-    secrets: 
+    if: ${{ ! github.event.pull_request.head.repo.fork }}
+    uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@1.0.0
+    secrets:
         FOSSID_CONTAINER_USERNAME: ${{ secrets.FOSSID_CONTAINER_USERNAME }}
         FOSSID_CONTAINER_PASSWORD: ${{ secrets.FOSSID_CONTAINER_PASSWORD }}
         FOSSID_HOST_USERNAME: ${{ secrets.FOSSID_HOST_USERNAME }}

etc/10-unmanaged-devices

@@ -1,2 +1,2 @@
 [keyfile]
-unmanaged-devices=interface-name:ap*;interface-name:dobby*;interface-name:lo;interface-name:p2p*;interface-name:veth*;interface-name:ip*;interface-name:wlan1
+unmanaged-devices=interface-name:ap*;interface-name:dobby*;interface-name:lo;interface-name:p2p*;interface-name:veth*;interface-name:ip*;interface-name:wlan1;interface-name:wl0.2

etc/device.properties

@@ -21,6 +21,7 @@ NETWORK_ID=192.168.100.0/24
 POTOMAC_IDENTITY_FILE=/etc/dropbear/dropbear_rsa_host_key
 POTOMAC_USER=root
 RDK_EMULATOR=false
+LABSIGNED_ENABLED=false
 SCHEDULE_REBOOT_INTERVAL=144
 UDHCP_INTERFACE=eth0
 WAN_INTERFACE=eth0

etc/dnsmasq-dobby.conf

@@ -0,0 +1 @@
+interface=dobby0

lib/rdk/NM_Bootstrap.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 ##############################################################################
 # If not stated otherwise in this file or this component's LICENSE file the
@@ -19,11 +19,31 @@
 # limitations under the License.
 ##############################################################################
 
-WIFI_WPA_SUPPLICANT_CONF="/opt/secure/wifi/wpa_supplicant.conf"
+BOOT_TYPE=$(grep "BOOT_TYPE" /tmp/bootType | cut -d '=' -f 2)
+RDKV_SUPP_CONF="/opt/secure/wifi/wpa_supplicant.conf"
+MIGRATION_JSON="/opt/secure/migration/migration_data_store.json"
 
-if [ -f $WIFI_WPA_SUPPLICANT_CONF ]; then
-  SSID=$(cat $WIFI_WPA_SUPPLICANT_CONF | grep -w ssid= | cut -d '"' -f 2)
-  PSK_LINE=$(grep psk= "$WIFI_WPA_SUPPLICANT_CONF")
+if [ -f $RDKV_SUPP_CONF ]; then
+
+  #########################
+  # SSID Extraction #
+  #########################
+  # Efficiently extract the line containing ssid=
+  SSID_LINE=$(grep -m 1 "^[[:space:]]*ssid=" "$RDKV_SUPP_CONF")
+
+  # CASE 1: SSID is a quoted readable string like ssid="Test's iPhone"
+  if [[ "$SSID_LINE" =~ ssid=\"(.*)\" ]]; then
+      SSID="${BASH_REMATCH[1]}"
+      echo "`/bin/timestamp`: Found quoted SSID: $SSID. Do nothing as it's already in the correct format." >>  /opt/logs/NMMonitor.log
+
+  # CASE 2: SSID is a hex string like ssid=4b61...
+  elif [[ "$SSID_LINE" =~ ssid=([a-fA-F0-9]+) ]]; then
+      HEX_SSID="${BASH_REMATCH[1]}"
+      SSID=$(printf '%b' "$(printf '%s' "$HEX_SSID" | sed 's/../\\x&/g')")
+      echo "`/bin/timestamp`: Converted Hex to SSID: $SSID" >>  /opt/logs/NMMonitor.log
+  fi
+
+  PSK_LINE=$(grep psk= "$RDKV_SUPP_CONF")
 
   # Case 1: Quoted passphrase
   if [[ "$PSK_LINE" =~ psk=\"(.+)\" ]]; then
@@ -37,6 +57,77 @@ if [ -f $WIFI_WPA_SUPPLICANT_CONF ]; then
   else
     PSK=""
   fi
-  echo "`/bin/timestamp` :$0: Removed nmcli SSID connect" >>  /opt/logs/NMMonitor.log
-  sed -i '/network={/,/}/d' /opt/secure/wifi/wpa_supplicant.conf
+
+  #########################
+  # Key_Mgmt Extraction   #
+  #########################
+  KEY_MGMT_LINE=$(grep -m 1 '^[[:space:]]*key_mgmt=' "$RDKV_SUPP_CONF")                  
+  # Extract value after '=' and remove quotes                                            
+  KEY_MGMT_VALUE=$(printf '%s\n' "$KEY_MGMT_LINE" | sed 's/.*key_mgmt=//; s/"//g')       
+
+  if [ "$KEY_MGMT_VALUE" = "SAE" ] || [ "$KEY_MGMT_VALUE" = "SAE FT-SAE" ]; then
+      KEY_MGMT=sae                                                                
+  else                                        
+      KEY_MGMT=wpa-psk                                                       
+  fi 
+  echo "`/bin/timestamp`: key_mgmt is $KEY_MGMT" >> /opt/logs/NMMonitor.log   
+
+  sed -i '/network={/,/}/d' "$RDKV_SUPP_CONF"
+fi
+
+
+if [ "$BOOT_TYPE" == "BOOT_MIGRATION" ]; then
+    if [ -f $MIGRATION_JSON ]; then
+        echo "`/bin/timestamp` :$0: BOOT_TYPE=$BOOT_TYPE... Waiting for IMMUI connect" >>  /opt/logs/NMMonitor.log
+        echo "`/bin/timestamp` :$0: Disable Ethernet for Migration" >>  /opt/logs/NMMonitor.log
+        nmcli dev set eth0 managed no
+
+        if [ -d /opt/NetworkManager ]; then
+         rm -rf /opt/NetworkManager/
+        fi
+        if [ -d /opt/secure/NetworkManager/system-connections ]; then
+         rm -rf /opt/secure/NetworkManager/system-connections/*
+        fi
+        nmcli conn reload
+        exit 0
+    else
+        echo "`/bin/timestamp` :$0: BOOT_TYPE=$BOOT_TYPE... But migration data JSON does not exist" >>  /opt/logs/NMMonitor.log
+    fi
+fi
+
+if [ -z "$SSID" ]; then
+      echo "`/bin/timestamp` :$0: No SSID found in supplicant conf" >>  /opt/logs/NMMonitor.log
+      echo "`/bin/timestamp` :$0: Trying with previously configured settings" >>  /opt/logs/NMMonitor.log
+
+      if [ ! -d /opt/secure/NetworkManager/system-connections ]; then
+         mkdir -p /opt/secure/NetworkManager/system-connections
+      fi
+      if [ -d /opt/NetworkManager/system-connections ]; then
+         cp /opt/NetworkManager/system-connections/* /opt/secure/NetworkManager/system-connections/
+         rm -rf /opt/NetworkManager/system-connections/*
+      fi
+      nmcli conn reload
+else
+      if [ -d /opt/NetworkManager/system-connections ]; then
+         rm -rf /opt/NetworkManager/system-connections/*
+      fi
+      if [ -d /opt/secure/NetworkManager/system-connections ]; then
+         echo "`/bin/timestamp` :$0: Listing the connection profiles in device: " >>  /opt/logs/NMMonitor.log
+         ls -lh /opt/secure/NetworkManager/system-connections >> /opt/logs/NMMonitor.log
+         echo "`/bin/timestamp` :$0: Deleting existing wifi profiles if any..." >>  /opt/logs/NMMonitor.log
+         for f in /opt/secure/NetworkManager/system-connections/*; do
+             if grep -q "type=wifi" "$f"; then
+                 rm -f "$f"
+             fi
+         done
+      fi
+      if [ -z "$PSK" ]; then
+          #connect to wifi
+          nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID"
+          nmcli conn reload
+      else
+          #connect to wifi
+          nmcli conn add type wifi con-name "$SSID" autoconnect yes ifname wlan0 ssid "$SSID" wifi-sec.key-mgmt "$KEY_MGMT"  wifi-sec.psk "$PSK"
+          nmcli conn reload
+      fi
 fi

lib/rdk/NM_Dispatcher.sh

@@ -40,6 +40,67 @@ NMdispatcherLog()
 {
     echo "$(/bin/timestamp) : $0: $*" >> $NM_LOG_FILE
 }
+
+# Refactored from updateGlobalIPInfo.sh
+refresh_devicedetails()
+{
+    #Refresh device cache info
+    if [ -f /lib/rdk/getDeviceDetails.sh ]; then
+        sh /lib/rdk/getDeviceDetails.sh refresh $1
+    else
+        NMdispatcherLog "DeviceDetails file not present"
+    fi
+}
+
+check_valid_IPaddress()
+{
+    local mode=$1
+    local addr=$2
+    # Neglect IPV6 ULA address and autoconfigured IPV4 address
+    if [ "x$mode" == "xipv6" ]; then
+        if [[ $addr == fc* || $addr == fd* ]]; then
+            return 1
+        fi
+    elif [ "x$mode" == "xipv4" ]; then
+        autoIPTrunc=$(echo $addr | cut -d "." -f1-2)
+        if [ "$autoIPTrunc" == "169.254" ]; then
+            return 1
+        fi
+    fi
+    return 0
+}
+
+update_global_ip_info_add()
+{
+    local cmd=$1
+    local mode=$2
+    local ifc=$3
+    local addr=$4
+    local flags=$5
+
+    NMdispatcherLog "update_global_ip_info: cmd:$cmd, mode:$mode, ifc:$ifc, addr:$addr, flags:$flags"
+
+    if [ "x$cmd" == "xadd" ] && [ "x$flags" == "xglobal" ]; then
+        if ! check_valid_IPaddress "$mode" "$addr"; then
+            return
+        fi
+
+        if [[ "$ifc" == "$ESTB_INTERFACE" || "$ifc" == "$DEFAULT_ESTB_INTERFACE" || "$ifc" == "$ESTB_INTERFACE:0" ]]; then
+            NMdispatcherLog "Updating Box/ESTB IP"
+            echo "$addr" > /tmp/.$mode$ESTB_INTERFACE
+            refresh_devicedetails "estb_ip"
+        elif [[ "$ifc" == "$MOCA_INTERFACE" || "$ifc" == "$MOCA_INTERFACE:0" ]]; then
+            NMdispatcherLog "Updating MoCA IP"
+            echo "$addr" > /tmp/.$mode$MOCA_INTERFACE
+            refresh_devicedetails "moca_ip"
+        elif [[ "$ifc" == "$WIFI_INTERFACE" || "$ifc" == "$WIFI_INTERFACE:0" ]]; then
+            NMdispatcherLog "Updating Wi-Fi IP"
+            echo "$addr" > /tmp/.$mode$WIFI_INTERFACE
+            refresh_devicedetails "boxIP"
+        fi
+    fi
+}
+
 NMdispatcherLog "From NM_Dispatcher.sh $1 $2"
 
 netInfoLog() {
@@ -106,20 +167,39 @@ checkDefaultRoute_Add() {
 interfaceName=$1
 interfaceStatus=$2
 
+if [ "$interfaceStatus" = "connectivity-change" ] && [ -z "$interfaceName" ]; then
+    NMdispatcherLog "Global connectivity-change - checking all interfaces"
+    for iface in $ETHERNET_INTERFACE $WIFI_INTERFACE; do
+        # Skip if interface doesn't exist
+        if [ ! -e "/sys/class/net/$iface" ]; then
+            continue
+        fi
+        # Check carrier state
+        CARRIER=$(cat /sys/class/net/$iface/carrier 2>/dev/null || echo "0")
+        if [ "$CARRIER" = "0" ]; then
+                NMdispatcherLog "$iface - stopping avahi-autoipd"
+                /usr/sbin/avahi-autoipd --kill "$iface" 2>/dev/null || true
+        else
+                if pgrep -f "avahi-autoipd.*$iface" > /dev/null 2>&1; then
+                    NMdispatcherLog "avahi-autoipd already running for $iface"
+                else
+                    NMdispatcherLog "Started avahi-autoipd for $iface"
+                    /usr/sbin/avahi-autoipd --daemonize --syslog "$iface"
+                fi
+        fi
+    done
+    exit 0
+fi
+
 if [ "$interfaceStatus" = "up" ]; then
-    /usr/bin/nm-online -q -t 60 # If Network manager is not online wait for 60 sec. TODO: Revisit this during connectivity check enable time
+
     CON_STATE=$(nmcli -t -f GENERAL.STATE device show "$interfaceName" 2>/dev/null | cut -d: -f2)
     NMdispatcherLog "Connection state of interface $interfaceName=$CON_STATE"
-    if [ "$CON_STATE" = "100 (connected)" ] || [ "$CON_STATE" = "120 (connected (site only))" ]; then
-        NMdispatcherLog "Connection state of $interfaceName is connected."
-        sh /lib/rdk/connectivitycheck.sh &
-    else
-        NMdispatcherLog "Connection state of $interfaceName Up But Not Fully connected."
-    fi
 fi
 
 if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then
     if [ "$interfaceStatus" == "dhcp4-change" ]; then
+        /usr/sbin/avahi-autoipd --kill "$interfaceName" 2>/dev/null
         mode="ipv4"
         gwip=$(/sbin/ip -4 route | awk '/default/ { print $3 }' | head -n1 | awk '{print $1;}')
         imode=2
@@ -132,8 +212,8 @@ if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then
     fi
 
     if [ "$interfaceStatus" == "dhcp6-change" ] || [ "$interfaceStatus" == "dhcp4-change" ]; then
-        sh -x /lib/rdk/updateGlobalIPInfo.sh "add" $mode $interfaceName $ipaddr "global"
-        NMdispatcherLog "updateGlobalIPInfo.sh"
+        update_global_ip_info_add "add" "$mode" "$interfaceName" "$ipaddr" "global"
+        NMdispatcherLog "update_global_ip_info completed"
 
         sh /lib/rdk/ipv6addressChange.sh "add" $mode $interfaceName $ipaddr "global"
         NMdispatcherLog "ipv6addressChange.sh"
@@ -144,18 +224,6 @@ if [ "x$interfaceName" != "x" ] && [ "$interfaceName" != "lo" ]; then
         checkDefaultRoute_Add  $imode $interfaceName $ipaddr $gwip $interfaceName "metric" "add"
         NMdispatcherLog "checkDefaultRoute_Add"
     fi
-    # Restart dnsmasq if it's running under NetworkManager
-    DNSMASQ_PID_FILE="/var/run/NetworkManager/dnsmasq.pid"
-
-    if [ -f "$DNSMASQ_PID_FILE" ]; then
-        DNSMASQ_PID=$(cat "$DNSMASQ_PID_FILE")
-        if [ -n "$DNSMASQ_PID" ]; then
-            echo "$DT_TIME Killing dnsmasq PID $DNSMASQ_PID" >> /opt/logs/NMMonitor.log
-            kill -TERM "$DNSMASQ_PID"
-        else
-            echo "$DT_TIME dnsmasq PID not running or invalid" >> /opt/logs/NMMonitor.log
-        fi
-    fi
     if [ "$interfaceName" == "wlan0" ]; then
         touch /tmp/wifi-on
     fi