Skip to content

RDKEMW-19912: Ignore System App to change PowerState request if SYSTEM_SLEEP_REQUEST_KEY not configured #206

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

Merged
apatel859 merged 2 commits into from
Jun 15, 2026
Merged

RDKEMW-19912: Ignore System App to change PowerState request if SYSTEM_SLEEP_REQUEST_KEY not configured #206

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
b24aadf
RDKEMW-19912: Update gdial.cpp
yuvaramachandran-gurusamy Jun 12, 2026
8668994
RDKEMW-19912: Fix for L1 test failure
yuvaramachandran-gurusamy Jun 15, 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
18 changes: 14 additions & 4 deletions server/plat/gdial.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,13 @@ int gdial_os_application_start(const char *app_name, const char *payload, const
auto parsed_query{parse_query(query_string)};
if (parsed_query["action"] == "sleep") {
const char *system_key = getenv("SYSTEM_SLEEP_REQUEST_KEY");
if (system_key && parsed_query["key"] != system_key) {
GDIAL_LOGINFO("system app request to change device to sleep mode, key comparison failed: user provided '%s'", parsed_query["key"].c_str());
if ((NULL == system_key) || (system_key && parsed_query["key"] != system_key)) {
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
if (NULL == system_key) {
GDIAL_LOGINFO("SYSTEM_SLEEP_REQUEST_KEY is not configured, So ignoring system app request to change device to sleep mode");
}
else {
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
GDIAL_LOGINFO("system app request to change device to sleep mode, key comparison failed: user provided '%s'", parsed_query["key"].c_str());
}
GDIAL_LOGTRACE("Exiting ...");
return GDIAL_APP_ERROR_INTERNAL;
}
Expand All @@ -534,8 +539,13 @@ int gdial_os_application_start(const char *app_name, const char *payload, const
}
else if (parsed_query["action"] == "togglepower") {
const char *system_key = getenv("SYSTEM_SLEEP_REQUEST_KEY");
if (system_key && parsed_query["key"] != system_key) {
GDIAL_LOGINFO("system app request to toggle the power state, key comparison failed: user provided '%s'", parsed_query["key"].c_str());
if ((NULL == system_key) || (system_key && parsed_query["key"] != system_key)) {
if (NULL == system_key) {
GDIAL_LOGINFO("SYSTEM_SLEEP_REQUEST_KEY is not configured, So ignoring system app request to toggle the power state");
}
else {
Comment thread
yuvaramachandran-gurusamy marked this conversation as resolved.
GDIAL_LOGINFO("system app request to toggle the power state, key comparison failed: user provided '%s'", parsed_query["key"].c_str());
}
GDIAL_LOGTRACE("Exiting ...");
return GDIAL_APP_ERROR_INTERNAL;
}
Expand Down
26 changes: 24 additions & 2 deletions tests/L1Tests/plat/test_gdialCpp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,17 +310,19 @@ TEST_F(GDialCppTest, OsUpdateManufacturerAndModel_AfterInitReturnNone)
TEST_F(GDialCppTest, OsApplicationStart_SystemSleepTriggersPowerOff)
{
ASSERT_TRUE(gdial_cpp_test_init(ctx));
setenv("SYSTEM_SLEEP_REQUEST_KEY", "testkey", 1);
int instance_id = 0;
EXPECT_EQ(gdial_cpp_test_os_application_start("system", "", "action=sleep", "", &instance_id), GDIAL_APP_ERROR_NONE);
EXPECT_EQ(gdial_cpp_test_os_application_start("system", "", "action=sleep&key=testkey", "", &instance_id), GDIAL_APP_ERROR_NONE);
EXPECT_EQ(g_power_cb_calls, 1);
EXPECT_EQ(g_last_power_state, "STANDBY");
}

TEST_F(GDialCppTest, OsApplicationStart_SystemTogglePowerTriggersToggle)
{
ASSERT_TRUE(gdial_cpp_test_init(ctx));
setenv("SYSTEM_SLEEP_REQUEST_KEY", "testkey", 1);
int instance_id = 0;
EXPECT_EQ(gdial_cpp_test_os_application_start("system", "", "action=togglepower", "", &instance_id), GDIAL_APP_ERROR_NONE);
EXPECT_EQ(gdial_cpp_test_os_application_start("system", "", "action=togglepower&key=testkey", "", &instance_id), GDIAL_APP_ERROR_NONE);
EXPECT_EQ(g_power_cb_calls, 1);
EXPECT_EQ(g_last_power_state, "TOGGLE");
}
Expand All @@ -332,6 +334,26 @@ TEST_F(GDialCppTest, OsApplicationState_SystemReturnsHide)
EXPECT_EQ(state, GDIAL_APP_STATE_HIDE);
}

TEST_F(GDialCppTest, OsApplicationStart_SystemSleepWithNullKeyReturnsInternal)
{
ASSERT_TRUE(gdial_cpp_test_init(ctx));
/* SYSTEM_SLEEP_REQUEST_KEY is unset (NULL) — request must be rejected. */
int instance_id = 0;
EXPECT_EQ(gdial_cpp_test_os_application_start("system", "", "action=sleep", "", &instance_id),
GDIAL_APP_ERROR_INTERNAL);
EXPECT_EQ(g_power_cb_calls, 0);
}

TEST_F(GDialCppTest, OsApplicationStart_SystemTogglePowerWithNullKeyReturnsInternal)
{
ASSERT_TRUE(gdial_cpp_test_init(ctx));
/* SYSTEM_SLEEP_REQUEST_KEY is unset (NULL) — request must be rejected. */
int instance_id = 0;
EXPECT_EQ(gdial_cpp_test_os_application_start("system", "", "action=togglepower", "", &instance_id),
GDIAL_APP_ERROR_INTERNAL);
EXPECT_EQ(g_power_cb_calls, 0);
}

TEST_F(GDialCppTest, OsApplicationStart_SystemSleepWithWrongKeyReturnsInternal)
{
ASSERT_TRUE(gdial_cpp_test_init(ctx));
Expand Down
Loading