Skip to content

RDKB-64863 GUI displays incorrect security mode [Open (Risky)] after … #123

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavankumar464 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

RDKB-64863 GUI displays incorrect security mode [Open (Risky)] after … #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19eff7f
RDKB-64863 GUI displays incorrect security mode [Open (Risky)] after …
pavankumar464 May 25, 2026
193b1ca
Syntax error in utility.jst
pavankumar464 May 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 0 additions & 36 deletions source/Styles/xb3/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,42 +55,6 @@ function MiniApplySSID($ssid) {
setStr("Device.WiFi.Radio."+$apply_rf+".X_CISCO_COM_ApplySettingSSID", $apply_id, false);
setStr("Device.WiFi.Radio."+$apply_rf+".X_CISCO_COM_ApplySetting", "true", true);
}
// security_mode from encrypt_mode & encrypt_method
function security_mode($encrypt_mode, $encrypt_method) {
$security = "None";
if ("WEP-64" == $encrypt_mode){
$security = "WEP_64";
}
else if ("WEP-128" == $encrypt_mode){
$security = "WEP_128";
}
else if ("WPA-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA_PSK_TKIP";
}
else{
$security = "WPA_PSK_AES";
}
}
else if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
else{
$security = "WPA2_PSK_TKIPAES";
}
}
else if ("WPA-WPA2-Personal" == $encrypt_mode){
$security = "WPAWPA2_PSK_TKIPAES";
}
else{
$security = "None";
}
return $security;
}
$response_message = '';
//ssid 1,2 for all
//ssid 3,4 for mso only
Expand Down
55 changes: 55 additions & 0 deletions source/Styles/xb3/jst/includes/actionHandlerUtility.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,4 +359,59 @@ function voiceDML(){
return $voiceDML;
}
$tvdml = voiceDML();

// $security_mode from $encrypt_mode & $encrypt_method
function security_mode($encrypt_mode, $encrypt_method) {
$security = "None";
if ("WEP-64" == $encrypt_mode){
$security = "WEP_64";
}
else if ("WEP-128" == $encrypt_mode){
$security = "WEP_128";
}
else if ("WPA-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA_PSK_TKIP";
}
else {
$security = "WPA_PSK_AES";
}
}
else if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
else {
$security = "WPA2_PSK_TKIPAES";
}
}
else if ("WPA-WPA2-Personal" == $encrypt_mode){
$security = "WPAWPA2_PSK_TKIPAES";
}
else if ("WPA3-Personal" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Only";
else if("AES+GCMP" == $encrypt_method)
$security = "WPA3-Personal Only AES_GCMP";
}
else if ("WPA3-Personal-Transition" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Transition";
else if("AES+GCMP" == $encrypt_method)
$security = "WPA3-Personal Transition AES_GCMP";
}
else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Compatibility";
else if("AES+GCMP" == $encrypt_method)
$security = "WPA3-Personal Compatibility AES_GCMP";
Comment on lines +395 to +410
}
else {
$security = "None";
}
return $security;
}
?>
58 changes: 31 additions & 27 deletions source/Styles/xb3/jst/includes/utility.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,35 +91,39 @@ function KeyExtGet($root, $param)
//return a string of encryption type
function encrypt_map($mode, $method)
{
$method = str_replace("AES+TKIP", "TKIP/AES", $method);
if ($method == "AES+TKIP") {
$method = "TKIP/AES";
} else if ($method == "AES+GCMP") {
$method = "GCMP/AES";
}
switch ($mode)
{
case "None":
return "Open (risky)";
case "WEP-64":
return "WEP 64 (risky)";
case "WEP-128":
return "WEP 128 (risky)";
case "WPA-Personal":
return "WPA-PSK ("+$method+")";
case "WPA2-Personal":
return "WPA2-PSK ("+$method+")";
case "WPA-WPA2-Personal":
return "WPAWPA2-PSK ("+$method+")";
case "WPA-Enterprise":
return "WPA ("+$method+")";
case "WPA2-Enterprise":
return "WPA2 ("+$method+")";
case "WPA-WPA2-Enterprise":
return "WPAWPA2 ("+$method+")";
case "WPA3-Personal":
return "WPA3-Personal Only";
case "WPA3-Personal-Transition":
return "WPA3-Personal Transition";
case "WPA3-Personal-Compatibility":
return "WPA3-Personal Compatibility";
default:
return "WPAWPA2-PSK (TKIP/AES)";
case "None":
return "Open (risky)";
case "WEP-64":
return "WEP 64 (risky)";
case "WEP-128":
return "WEP 128 (risky)";
case "WPA-Personal":
return "WPA-PSK ("+$method+")";
case "WPA2-Personal":
return "WPA2-PSK ("+$method+")";
case "WPA-WPA2-Personal":
return "WPAWPA2-PSK ("+$method+")";
case "WPA-Enterprise":
return "WPA ("+$method+")";
case "WPA2-Enterprise":
return "WPA2 ("+$method+")";
case "WPA-WPA2-Enterprise":
return "WPAWPA2 ("+$method+")";
case "WPA3-Personal":
return "WPA3-Personal Only";
case "WPA3-Personal-Transition":
return "WPA3-Personal Transition";
case "WPA3-Personal-Compatibility":
return "WPA3-Personal Compatibility";
default:
return "WPAWPA2-PSK (TKIP/AES)";
}
}
/**
Expand Down
36 changes: 2 additions & 34 deletions source/Styles/xb3/jst/wireless_network_configuration_edit.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,40 +157,8 @@ if ("false" == $wifi_value['Radio_'+$rf+'_Enable']){
$supported_mode = $wifi_value['SupportedStandards'];
if ("1-11"==$possible_channels)
$possible_channels = "1,2,3,4,5,6,7,8,9,10,11";
$security = "None";
if ("WEP-64" == $encrypt_mode){
$security = "WEP_64";
$network_password = $network_pass_64;
}
else if ("WEP-128" == $encrypt_mode){
$security = "WEP_128";
$network_password = $network_pass_128;
}
else if ("WPA-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA_PSK_TKIP";
}
else{
$security = "WPA_PSK_AES";
}
}
else if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
else{
$security = "WPA2_PSK_TKIPAES";
}
}
else if ("WPA-WPA2-Personal" == $encrypt_mode){
$security = "WPAWPA2_PSK_TKIPAES";
}
else{
$security = "None";
}
$security = encrypt_map($encrypt_mode, $encrypt_method);

Comment on lines +160 to +161
//for SSID 1 and 2 don't show password for mso user
$password_mso_user = !(($id == 1 || $id == 2) && ($_SESSION["loginuser"] == "mso"));
?>
Expand Down
45 changes: 0 additions & 45 deletions source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,51 +71,6 @@ $get_encrypt_mode = getStr("Device.WiFi.AccessPoint."+$i+".Security.ModeEnabled"
$get_encrypt_method = getStr("Device.WiFi.AccessPoint."+$i+".Security.X_CISCO_COM_EncryptionMethod");
$WifiPersonalizationEnable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_WiFiNeedsPersonalization");

// security_mode from $encrypt_mode & $encrypt_method
function security_mode($encrypt_mode, $encrypt_method) {
$security = "None";
if ("WEP-64" == $encrypt_mode){
$security = "WEP_64";
}
else if ("WEP-128" == $encrypt_mode){
$security = "WEP_128";
}
else if ("WPA-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA_PSK_TKIP";
}
else {
$security = "WPA_PSK_AES";
}
}
else if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
else {
$security = "WPA2_PSK_TKIPAES";
}
}
else if ("WPA-WPA2-Personal" == $encrypt_mode){
$security = "WPAWPA2_PSK_TKIPAES";
}
else if ("WPA3-Personal" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Only";
}
else if ("WPA3-Personal-Transition" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Transition";
}
else {
$security = "None";
}
return $security;
}

if($i != 1 && $i != 2 && $i != 17) $Mesh_Mode = false;
if($i != 1 && $i != 2 && $i != 17) $HCM_Mode = "Disable";
$response_message = '';
Expand Down
49 changes: 0 additions & 49 deletions source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_edit_onewifi.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,55 +71,6 @@ $get_encrypt_mode = getStr("Device.WiFi.AccessPoint."+$i+".Security.ModeEnabled"
$get_encrypt_method = getStr("Device.WiFi.AccessPoint."+$i+".Security.X_CISCO_COM_EncryptionMethod");
$WifiPersonalizationEnable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_WiFiNeedsPersonalization");

// security_mode from $encrypt_mode & $encrypt_method
function security_mode($encrypt_mode, $encrypt_method) {
$security = "None";
if ("WEP-64" == $encrypt_mode){
$security = "WEP_64";
}
else if ("WEP-128" == $encrypt_mode){
$security = "WEP_128";
}
else if ("WPA-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA_PSK_TKIP";
}
else {
$security = "WPA_PSK_AES";
}
}
else if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
else {
$security = "WPA2_PSK_TKIPAES";
}
}
else if ("WPA-WPA2-Personal" == $encrypt_mode){
$security = "WPAWPA2_PSK_TKIPAES";
}
else if ("WPA3-Personal" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Only";
}
else if ("WPA3-Personal-Transition" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Transition";
}
else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Compatibility";
}
else {
$security = "None";
}
return $security;
}

if($i != 1 && $i != 2 && $i != 17) $Mesh_Mode = false;
if($i != 1 && $i != 2 && $i != 17) $HCM_Mode = "Disable";
$response_message = '';
Expand Down
23 changes: 3 additions & 20 deletions source/Styles/xb6/jst/wireless_network_configuration_edit.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ if($id != 1 && $id != 2 && $id != 17) $Mesh_Mode = 'false';
if(strstr($_SESSION["lanMode"], "bridge-static") ) {
if($_SESSION["loginuser"] != "mso")
{
if($OperatingChannelBandwidth == "6GHz")
if($OperatingChannelBandwidth == "6GHz")
array_remove($valid_ids,4);
array_remove($valid_ids,3);
array_remove($valid_ids,2);
Expand All @@ -167,7 +167,7 @@ if(strstr($_SESSION["lanMode"], "bridge-static") ) {
}
else
{
if($OperatingChannelBandwidth == "6GHz")
if($OperatingChannelBandwidth == "6GHz")
array_remove($valid_ids,4);
array_remove($valid_ids,1);
array_remove($valid_ids,0);
Expand All @@ -188,24 +188,7 @@ $supported_mode = $wifi_value['SupportedStandards'];

if ("1-11"==$possible_channels)
$possible_channels = "1,2,3,4,5,6,7,8,9,10,11";
$security = "None";
if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
}else if ("WPA3-Personal" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Only";
}else if ("WPA3-Personal-Transition" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Transition";
}
else{
$security = "None";
}
$security = encrypt_map($encrypt_mode, $encrypt_method);

Comment on lines 189 to 192
//for SSID 1 and 2 don't show password for mso user
$password_mso_user = !(($id == 1 || $id == 2 || $id == 17) && ($_SESSION["loginuser"] == "mso"));
Expand Down
22 changes: 1 addition & 21 deletions source/Styles/xb6/jst/wireless_network_configuration_edit_onewifi.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,27 +198,7 @@ $supported_mode = getStr("Device.WiFi.Radio."+$rf+".SupportedStandards")

if ("1-11"==$possible_channels)
$possible_channels = "1,2,3,4,5,6,7,8,9,10,11";
$security = "None";
if ("WPA2-Personal" == $encrypt_mode){
if ("TKIP" == $encrypt_method){
$security = "WPA2_PSK_TKIP";
}
else if ("AES" == $encrypt_method){
$security = "WPA2_PSK_AES";
}
}else if ("WPA3-Personal" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Only";
}else if ("WPA3-Personal-Transition" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Transition";
}else if ("WPA3-Personal-Compatibility" == $encrypt_mode){
if ("AES" == $encrypt_method)
$security = "WPA3-Personal Compatibility";
}
else{
$security = "None";
}
$security = encrypt_map($encrypt_mode, $encrypt_method);

Comment on lines 199 to 202
//for SSID 1 and 2 don't show password for mso user
$password_mso_user = !(($id == 1 || $id == 2 || $id == 17) && ($_SESSION["loginuser"] == "mso"));
Expand Down
Loading