Skip to content

Release 2.10.0 #159

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

Closed
bunnam988 wants to merge 5 commits into from
Closed

Release 2.10.0 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
df73ccc
Merge tag '2.9.0' into develop
bunnam988 Aug 21, 2026
54fef65
RDKCOM-5628: RDKBDEV-3486 RDKBACCL-1962 Fix RDKB Security Vulnerabili…
vanemage Aug 26, 2026
cafe4c8
XB10-2825: [RATS][Aker] Device Pause page is not loading (#158)
pavankumar464 Aug 31, 2026
adf8275
RDKB-66533 : Harden $_GET['mac_ssid'] handling with shared validation…
pavankumar464 Aug 31, 2026
45e7f6a
Add changelog for release 2.10.0
bunnam988 Sep 2, 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
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@ 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).

#### [2.10.0](https://github.com/rdkcentral/webui/compare/2.9.0...2.10.0)

- RDKB-66533 : Harden $_GET['mac_ssid'] handling with shared validation helper [`#152`](https://github.com/rdkcentral/webui/pull/152)
- XB10-2825: [RATS][Aker] Device Pause page is not loading [`#158`](https://github.com/rdkcentral/webui/pull/158)
- RDKCOM-5628: RDKBDEV-3486 RDKBACCL-1962 Fix RDKB Security Vulnerability [`#151`](https://github.com/rdkcentral/webui/pull/151)
- Merge tag '2.9.0' into develop [`df73ccc`](https://github.com/rdkcentral/webui/commit/df73ccc46951666a33a3469f548a99e1c5b4ccae)

#### [2.9.0](https://github.com/rdkcentral/webui/compare/2.8.0...2.9.0)

> 21 August 2026

- RDKB-66345 Disable 160MHz if DFS at boot up is false [`#149`](https://github.com/rdkcentral/webui/pull/149)
- Add changelog for release 2.9.0 [`e422bc5`](https://github.com/rdkcentral/webui/commit/e422bc560fb51d1b3a3fefc08ab1440537fee3ff)

#### [2.8.0](https://github.com/rdkcentral/webui/compare/2.7.1...2.8.0)

Expand Down
13 changes: 11 additions & 2 deletions source/Styles/xb3/config/webgui.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,19 @@ fi

if [ ! -d "/tmp/pcontrol" ]
then
mkdir /tmp/pcontrol
mkdir /tmp/pcontrol
fi

if [ -d "/usr/www/cmn" ]
then
cp -rf /usr/www/cmn/ /tmp/pcontrol
fi

if [ -d "/usr/hgw" ]
then
cp -rf /usr/hgw/cmn/ /tmp/pcontrol
fi

cp -rf /usr/www/cmn/ /tmp/pcontrol
#Dynamically create pause screen file
#removed chmod as part of CISCOXB3-6294 since etc is read-only FileSystem
sh /etc/pauseBlockGenerateHtml.sh
Expand Down
13 changes: 13 additions & 0 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 @@ -1148,6 +1148,19 @@ function cleanJsonDms($dm_key, $param_json) {
return $param_json;
}

function getValidatedMacSsidValueJs() {
var $mac_ssid_v = "";
if(isset($_GET['mac_ssid']) && preg_match('/^\d+$/', $_GET['mac_ssid']) == 1) {
$mac_ssid_v = intval($_GET['mac_ssid']);
if ($mac_ssid_v < 1 || $mac_ssid_v > 17)
$mac_ssid_v = "";
else
$mac_ssid_v = String($mac_ssid_v);
}

return htmlspecialchars(json_encode($mac_ssid_v), ENT_NOQUOTES, 'UTF-8');
}

/**
* Discription: time rounded to 5 min
*
Expand Down
10 changes: 5 additions & 5 deletions source/Styles/xb3/jst/wireless_network_configuration.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<?%
$ret = init_psmMode("Gateway > Connection > Wi-Fi", "nav-wifi-config");
if ("" != $ret){echo( $ret); exit(0);}
if(isset($_GET['mac_ssid']))
if ($_GET['mac_ssid'] > 18) die();
?>
<?%
$Mesh_Enable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable");
Expand Down Expand Up @@ -342,6 +340,9 @@ else {
array_remove($ssids,1);
array_remove($ssids,0);
}

$mac_ssid_v_js = getValidatedMacSsidValueJs();

$dfsEnable= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DFS.Enable");
$dfsAtBootup= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DFSatBootUp.Enable");
$modelName= getStr("Device.DeviceInfo.ModelName");
Expand Down Expand Up @@ -854,9 +855,8 @@ $(document).ready(function() {

});
setTimeout(function(){
var mac_ssid_GET = "<?% echo( $_GET['mac_ssid']);?>";
var ssids = "<?% echo( $ssids);?>";
if((ssids.includes(mac_ssid_GET)) && mac_ssid_GET) {
var mac_ssid_GET = <?% echo($mac_ssid_v_js);?>;
if (mac_ssid_GET !== "" && $("#mac_ssid option[value='" + mac_ssid_GET + "']").length > 0) {
$("#mac_ssid").val(mac_ssid_GET);
}
update_Wi_Fi_control_list();
Expand Down
36 changes: 30 additions & 6 deletions source/Styles/xb6/jst/actionHandler/ajaxSet_wireless_network_configuration_onewifi.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,15 @@ function validChecksum($WPS_pin){
$accum += 1 * (intval($WPS_pin / 1) % 10);
return (0 == ($accum % 10));
}
function ResolveRadioFromSsid($ssid){
$ssid_tmp = String($ssid);
$ssid_lower_layers = String(getStr("Device.WiFi.SSID."+$ssid_tmp+".LowerLayers"));
LogStr(" : value of ssid_lower_layers" + $ssid_lower_layers);
if (preg_match('/Radio\\.1(\\.|$)/', $ssid_lower_layers) == 1) return 1;
if (preg_match('/Radio\\.2(\\.|$)/', $ssid_lower_layers) == 1) return 2;
if (preg_match('/Radio\\.3(\\.|$)/', $ssid_lower_layers) == 1) return 3;
return "";
}
function validFilterParam($ft){
for(var $keytmp in $ft) { $val=$ft[$keytmp];/*p2j-foreach*/
if(!(printableCharacters($val[0]) && validMAC($val[1]))) return false;
Expand All @@ -66,7 +75,20 @@ if ($_POST['configInfo']) {
//$jsConfig = '{"ssid_number":"1", "ft":[["1","2"],["c","d"]], "target":"save_filter"}';
$arConfig = json_decode($jsConfig, true);
//print_r($arConfig);
$i = $arConfig['ssid_number'];
$i = (array_key_exists('ssid_number', $arConfig)) ? String($arConfig['ssid_number']) : "";
$ssid_log = substr(String($i), 0, 32);
if ($i != "" && strlen($i) > 3) {
LogStr(" : security_event:invalid_ssid_number_length:" + String(strlen($i)) + " value_prefix:" + $ssid_log);
http_response_code(400);
echo( '{"error":"invalid_ssid_number"}');
exit(0);
}
if ($i != "" && preg_match("/^(?:[1-9]|1[0-9]|2[0-4])$/", $i) != 1) {
LogStr(" : security_event:invalid_ssid_number_format value_prefix:" + $ssid_log);
http_response_code(400);
echo( '{"error":"invalid_ssid_number"}');
exit(0);
}
if($i == "17")
{
$Radio_3_Enable = getStr("Device.WiFi.Radio.3.Enable");
Expand Down Expand Up @@ -111,11 +133,13 @@ if (array_key_exists('band_steering', $arConfig))
}
else
{
$i = $arConfig['ssid_number'];
if($i == 17)
$r=3; //17th is private ssid for 6 GHz(radio 3)
else
$r = $i;
$r = ResolveRadioFromSsid($i);
if ($r == "") {
LogStr(" : ResolveRadioFromSsid returned security_event:invalid_ssid_mapping ssid:" + substr(String($i), 0, 32));
http_response_code(400);
echo( '{"error":"invalid_ssid_mapping"}');
exit(0);
}
$channel = getStr("Device.WiFi.Radio."+$r+".AutoChannelEnable");
if ("save_config" == $arConfig['target'])
{
Expand Down
10 changes: 5 additions & 5 deletions source/Styles/xb6/jst/wireless_network_configuration.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<?%
$ret = init_psmMode("Gateway > Connection > Wi-Fi", "nav-wifi-config");
if ("" != $ret){echo( $ret); exit(0);}
if(isset($_GET['mac_ssid']))
if ($_GET['mac_ssid'] > 18) die();
?>
<?%
$Mesh_Enable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable");
Expand Down Expand Up @@ -455,6 +453,9 @@ else {
array_remove($ssids,0);
array_remove($ssids,6);
}

$mac_ssid_v_js = getValidatedMacSsidValueJs();

$dfsEnable= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DFS.Enable");
$dfsAtBootup= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DFSatBootUp.Enable");
$modelName= getStr("Device.DeviceInfo.ModelName");
Expand Down Expand Up @@ -1114,9 +1115,8 @@ $(document).ready(function() {

});
setTimeout(function(){
var mac_ssid_GET = "<?% echo( $_GET['mac_ssid']);?>";
var ssids = "<?% echo( $ssids);?>";
if((ssids.includes(mac_ssid_GET)) && mac_ssid_GET) {
var mac_ssid_GET = <?% echo($mac_ssid_v_js);?>;
if (mac_ssid_GET !== "" && $("#mac_ssid option[value='" + mac_ssid_GET + "']").length > 0) {
$("#mac_ssid").val(mac_ssid_GET);
}
update_Wi_Fi_control_list();
Expand Down
10 changes: 5 additions & 5 deletions source/Styles/xb6/jst/wireless_network_configuration_onewifi.jst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,6 @@
<?%
$ret = init_psmMode("Gateway > Connection > Wi-Fi", "nav-wifi-config");
if ("" != $ret){echo( $ret); exit(0);}
if(isset($_GET['mac_ssid']))
if ($_GET['mac_ssid'] > 18) die();
?>
<?%
$Mesh_Enable = getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_xOpsDeviceMgmt.Mesh.Enable");
Expand Down Expand Up @@ -463,6 +461,9 @@ else {
array_remove($ssids,0);
array_remove($ssids,6);
}

$mac_ssid_v_js = getValidatedMacSsidValueJs();

$dfsEnable= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DFS.Enable");
$dfsAtBootup= getStr("Device.DeviceInfo.X_RDKCENTRAL-COM_RFC.Feature.DFSatBootUp.Enable");
$platformSupported = "false";
Expand Down Expand Up @@ -1133,9 +1134,8 @@ $(document).ready(function() {

});
setTimeout(function(){
var mac_ssid_GET = "<?% echo( $_GET['mac_ssid']);?>";
var ssids = "<?% echo( $ssids);?>";
if((ssids.includes(mac_ssid_GET)) && mac_ssid_GET) {
var mac_ssid_GET = <?% echo($mac_ssid_v_js);?>;
if (mac_ssid_GET !== "" && $("#mac_ssid option[value='" + mac_ssid_GET + "']").length > 0) {
$("#mac_ssid").val(mac_ssid_GET);
}
update_Wi_Fi_control_list();
Expand Down
Loading