RDKEMW-17726, RDKEMW-17727: Fix the Migration of RDKV-to-RDKE by jincysam87 · Pull Request #529 · rdkcentral/sysint

jincysam87 · 2026-05-01T18:04:12Z

Reason for change: Fix the SSID name in HEX format, support for SAE during migration
Test Procedure: Test with SSID name in HEX format, WPA3 personal mode as security mode
Risks: Medium
Signed-off-by: jincysaramma_sam@comcast.com

Revert "RDKEMW-10725:gstreamer-cleanup conditions when cdl_flashed_fi…

Copilot

Pull request overview

This PR updates the NetworkManager bootstrap migration logic to better migrate Wi‑Fi profiles from RDKV to RDKE, specifically aiming to handle SSIDs stored in hex format and to support WPA3/SAE during migration.

Changes:

Add SSID extraction logic that attempts to decode hex-formatted SSIDs from wpa_supplicant.conf.
Add key_mgmt detection to choose sae vs wpa-psk when creating the nmcli connection.
Move NetworkManager state cleanup and adjust quoting for SSID/PSK checks and nmcli invocation.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-05-01T18:07:50Z

+    elif [[ "$PSK_LINE" =~ psk=([a-fA-F0-9]+) ]]; then
+      HEX_PSK="${BASH_REMATCH[1]}"
+      PSK=$(printf "$(echo "$HEX_PSK" | sed 's/../\\x&/g')")
+      echo "Converted Hex PSK to string"


The unquoted psk= value in wpa_supplicant.conf is a 64-hex raw PSK (not a hex-encoded passphrase). Converting it to bytes via printf will produce binary (and can truncate at NUL), and it won’t be accepted by nmcli wifi-sec.psk. This should stay as the original 64-hex string (and the regex should enforce exactly 64 hex chars).

Suggested change

elif [[ "$PSK_LINE" =~ psk=([a-fA-F0-9]+) ]]; then

HEX_PSK="${BASH_REMATCH[1]}"

PSK=$(printf "$(echo "$HEX_PSK" | sed 's/../\\x&/g')")

echo "Converted Hex PSK to string"

elif [[ "$PSK_LINE" =~ psk=([a-fA-F0-9]{64})$ ]]; then

PSK="${BASH_REMATCH[1]}"

echo "PSK in raw 64-hex format"

Copilot · 2026-05-01T18:07:50Z

+    PSK_LINE=$(grep psk= "$RDKV_SUPP_CONF") 
+    # Case 1: Quoted passphrase
+    if [[ "$PSK_LINE" =~ psk=\"(.+)\" ]]; then


grep psk= may return multiple matches (multiple network blocks), resulting in PSK_LINE containing multiple lines and the regex capturing an unexpected value. Consider selecting the intended network block (or at least using -m 1 and anchoring to the psk= key) so SSID/PSK don’t become mismatched.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 5 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-05-01T18:31:58Z

+    # Extract the line containing ssid=
+    SSID_LINE=$(grep -m 1 "ssid=" "$RDKV_SUPP_CONF")

-  # Case 1: Quoted passphrase
-  if [[ "$PSK_LINE" =~ psk=\"(.+)\" ]]; then
-    PSK="${BASH_REMATCH[1]}"
+    # Case 1: SSID is a quoted readable string like ssid="Test's iPhone"
+    if [[ "$SSID_LINE" =~ ssid=\"(.*)\" ]]; then
+        SSID="${BASH_REMATCH[1]}"
+        echo "SSID in quoted format SSID: $SSID"


SSID_LINE=$(grep -m 1 "ssid=" ...) will match any first occurrence of ssid= in the file (including outside a network={} block or not aligned with the psk/key_mgmt you later read). Since the migration depends on SSID/PSK/key_mgmt being from the same network block, consider parsing the first network={...} stanza (or the stanza you intend to migrate) as a unit (e.g., with awk/sed) and extracting all fields from that same block.

Copilot · 2026-05-01T18:31:58Z

+        # Convert hex string to readable UTF-8 string
+        # Using printf with \x formatting for each byte pair
+        SSID=$(printf "$(echo "$HEX_SSID" | sed 's/../\\x&/g')")
+        echo "Converted Hex SSID to string: $SSID"


Hex SSID decoding doesn’t validate that the captured hex string has an even number of characters (byte pairs). With an odd-length value, the sed 's/../\\x&/g' + printf sequence will produce an invalid escape and can yield a corrupted SSID. Add an explicit even-length check (and fail/log) before attempting the conversion.

Suggested change

# Convert hex string to readable UTF-8 string

# Using printf with \x formatting for each byte pair

SSID=$(printf "$(echo "$HEX_SSID" | sed 's/../\\x&/g')")

echo "Converted Hex SSID to string: $SSID"

if (( ${#HEX_SSID} % 2 != 0 )); then

echo "Invalid hex SSID with odd length: $HEX_SSID"

else

# Convert hex string to readable UTF-8 string

# Using printf with \x formatting for each byte pair

SSID=$(printf "$(echo "$HEX_SSID" | sed 's/../\\x&/g')")

echo "Converted Hex SSID to string: $SSID"

fi

Copilot · 2026-05-01T18:31:59Z

+    if grep -q "key_mgmt=SAE FT-SAE" "$RDKV_SUPP_CONF"; then
+        echo "key_mgmt is SAE"
+        KEY_MGMT=sae
+    else
+        echo "key_mgmt is wpa-psk"
+        KEY_MGMT=wpa-psk
+    fi


The SAE detection only matches the exact text key_mgmt=SAE FT-SAE. Common wpa_supplicant configs use key_mgmt=SAE (or may include SAE among other tokens with different spacing/order), which would currently fall back to wpa-psk and configure nmcli incorrectly for WPA3. Use a more flexible match (e.g., look for SAE as a token on the key_mgmt= line) and ideally extract it from the same network block as the selected SSID.

Copilot · 2026-05-01T18:31:59Z

+if [[ -f "$RDKV_SUPP_CONF" ]]; then
+    #########################
+    # SSID Extraction #
+    #########################
+    # Extract the line containing ssid=
+    SSID_LINE=$(grep -m 1 "ssid=" "$RDKV_SUPP_CONF")

-  # Case 1: Quoted passphrase
-  if [[ "$PSK_LINE" =~ psk=\"(.+)\" ]]; then
-    PSK="${BASH_REMATCH[1]}"
+    # Case 1: SSID is a quoted readable string like ssid="Test's iPhone"
+    if [[ "$SSID_LINE" =~ ssid=\"(.*)\" ]]; then
+        SSID="${BASH_REMATCH[1]}"
+        echo "SSID in quoted format SSID: $SSID"


This logic relies on bash-specific features ([[ ... ]], regex matching with =~, and BASH_REMATCH). Since the script is invoked via #!/bin/sh, it will fail on systems where /bin/sh is not bash/ksh (e.g., dash). Either switch the shebang to bash or rewrite the matching/extraction using POSIX-compatible constructs.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-05-01T20:01:10Z

+        # Convert hex string to readable UTF-8 string
+        # Using printf with \x formatting for each byte pair
+        SSID=$(printf "$(echo "$HEX_SSID" | sed 's/../\\x&/g')")
+        echo "Converted Hex SSID to string: $SSID"


Hex SSID decoding uses printf "$(...)" where the decoded bytes become part of the format string. If the SSID contains % (common), printf will treat it as a format specifier and can error or corrupt output. Use a constant format string (e.g., printf '%b' ...) and also validate that the hex length is even before attempting byte-pair decoding.

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+    sed -i '/network={/,/}/d' "$RDKV_SUPP_CONF"
+
+else
+    echo "Config file not found." >>  /opt/logs/NMMonitor.log


Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 1 comment.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

+    KEY_MGMT_LINE=$(grep -m 1 '^[[:space:]]*key_mgmt=' "$RDKV_SUPP_CONF")

+    case "$KEY_MGMT_LINE" in
+        *SAE*)
+            echo "`/bin/timestamp`:key_mgmt is SAE" >>  /opt/logs/NMMonitor.log
+            KEY_MGMT=sae
+            ;;
+        *)
+            echo "`/bin/timestamp`:key_mgmt is wpa-psk" >>  /opt/logs/NMMonitor.log
+            KEY_MGMT=wpa-psk
+            ;;


jincysam87 added 3 commits May 1, 2026 11:32

Merge pull request #527 from rdkcentral/develop

82333d6

Revert "RDKEMW-10725:gstreamer-cleanup conditions when cdl_flashed_fi…

Update NM_Bootstrap.sh

c514db1

Update NM_Bootstrap.sh

03cccf8

Copilot AI review requested due to automatic review settings May 1, 2026 18:04

jincysam87 requested a review from a team as a code owner May 1, 2026 18:04

Copilot started reviewing on behalf of jincysam87 May 1, 2026 18:04 View session

Update NM_Bootstrap.sh

fbbcaee

Copilot AI reviewed May 1, 2026

View reviewed changes

Apply suggestion from @Copilot

af1551a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 1, 2026 18:27

Copilot started reviewing on behalf of jincysam87 May 1, 2026 18:28 View session

Copilot AI reviewed May 1, 2026

View reviewed changes

Apply suggestion from @Copilot

469683a

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 1, 2026 19:57

Copilot started reviewing on behalf of jincysam87 May 1, 2026 19:58 View session

Copilot AI reviewed May 1, 2026

View reviewed changes

jincysam87 added 2 commits May 1, 2026 16:25

Update NM_Bootstrap.sh

8b8d8e8

Update NM_Bootstrap.sh

56cf640

Copilot AI review requested due to automatic review settings May 1, 2026 20:25

Copilot started reviewing on behalf of jincysam87 May 1, 2026 20:26 View session

Copilot AI reviewed May 1, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

jincysam87 and others added 2 commits May 1, 2026 16:43

Update NM_Bootstrap.sh

b6630fd

Apply suggestion from @Copilot

6c1557b

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 1, 2026 20:45

Copilot started reviewing on behalf of jincysam87 May 1, 2026 20:45 View session

Copilot AI reviewed May 1, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Apply suggestion from @Copilot

6b48e5e

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 1, 2026 20:53

jincysam87 and others added 2 commits May 1, 2026 16:53

Apply suggestion from @Copilot

c92b1d0

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Apply suggestion from @Copilot

5313146

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Apply suggestions from code review

3b1271a

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 4, 2026 14:10

Copilot started reviewing on behalf of jincysam87 May 4, 2026 14:10 View session

Copilot AI reviewed May 4, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

sed -i '/network={/,/}/d' "$RDKV_SUPP_CONF"

else

echo "Config file not found." >> /opt/logs/NMMonitor.log

jincysam87 and others added 2 commits May 4, 2026 10:15

Update NM_Bootstrap.sh

e768afa

Potential fix for pull request finding

b04bfe3

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 4, 2026 14:16

Copilot started reviewing on behalf of jincysam87 May 4, 2026 14:16 View session

Copilot AI reviewed May 4, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Potential fix for pull request finding

79a6f52

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 4, 2026 15:04

Copilot started reviewing on behalf of jincysam87 May 4, 2026 15:05 View session

Potential fix for pull request finding

0966df5

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed May 4, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Potential fix for pull request finding

904ca7e

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 4, 2026 16:04

Copilot started reviewing on behalf of jincysam87 May 4, 2026 16:05 View session

Copilot started reviewing on behalf of jincysam87 May 4, 2026 16:06 View session

Copilot AI reviewed May 4, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Potential fix for pull request finding

15f6e22

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 4, 2026 17:29

Copilot started reviewing on behalf of jincysam87 May 4, 2026 17:29 View session

Potential fix for pull request finding

7e27c5e

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed May 4, 2026

View reviewed changes

Comment thread lib/rdk/NM_Bootstrap.sh Outdated

Potential fix for pull request finding

0ac0a20

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings May 4, 2026 17:33

Copilot started reviewing on behalf of jincysam87 May 4, 2026 17:34 View session

Copilot AI reviewed May 4, 2026

View reviewed changes

jincysam87 closed this May 4, 2026

github-actions Bot locked and limited conversation to collaborators May 4, 2026

Conversation

jincysam87 commented May 1, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI May 1, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!