Add power/reset button mask checks for RequestedHostTransition
To fully honor button masking, the RequestedHostTransition interface
now checks the button mask state prior to actually initiating the
requested transition. This will make it so the IPMI and Redfish
commands will not be able to subvert the masked buttons.
Tested: disable front panel buttons (ipmitool raw 0 0x0a 0xf0)
and then attempt to reset and power cycle with ipmi
ipmitool chassis power reset
ipmitool chassis power cycle
ipmitool chassis power off
Host power stays on and uninterrupted.
Change-Id: Iff66788122e26cd466482bf4a4c3ac443ca4c1ee
Signed-off-by: Vernon Mauery <vernon.mauery@linux.intel.com>
diff --git a/power-control-x86/src/power_control.cpp b/power-control-x86/src/power_control.cpp
index 32f0a5b..2222735 100644
--- a/power-control-x86/src/power_control.cpp
+++ b/power-control-x86/src/power_control.cpp
@@ -2588,38 +2588,94 @@
hostIface = hostServer.add_interface("/xyz/openbmc_project/state/host0",
"xyz.openbmc_project.State.Host");
+ // Interface for IPMI/Redfish initiated host state transitions
hostIface->register_property(
"RequestedHostTransition",
std::string("xyz.openbmc_project.State.Host.Transition.Off"),
[](const std::string& requested, std::string& resp) {
if (requested == "xyz.openbmc_project.State.Host.Transition.Off")
{
- sendPowerControlEvent(Event::gracefulPowerOffRequest);
- addRestartCause(RestartCause::command);
+ // if power button is masked, ignore this
+ if (!powerButtonMask)
+ {
+ sendPowerControlEvent(Event::gracefulPowerOffRequest);
+ addRestartCause(RestartCause::command);
+ }
+ else
+ {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "Power Button Masked.");
+ throw std::invalid_argument("Transition Request Masked");
+ return 0;
+ }
}
else if (requested ==
"xyz.openbmc_project.State.Host.Transition.On")
{
- sendPowerControlEvent(Event::powerOnRequest);
- addRestartCause(RestartCause::command);
+ // if power button is masked, ignore this
+ if (!powerButtonMask)
+ {
+ sendPowerControlEvent(Event::powerOnRequest);
+ addRestartCause(RestartCause::command);
+ }
+ else
+ {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "Power Button Masked.");
+ throw std::invalid_argument("Transition Request Masked");
+ return 0;
+ }
}
else if (requested ==
"xyz.openbmc_project.State.Host.Transition.Reboot")
{
- sendPowerControlEvent(Event::powerCycleRequest);
- addRestartCause(RestartCause::command);
+ // if power button is masked, ignore this
+ if (!powerButtonMask)
+ {
+ sendPowerControlEvent(Event::powerCycleRequest);
+ addRestartCause(RestartCause::command);
+ }
+ else
+ {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "Power Button Masked.");
+ throw std::invalid_argument("Transition Request Masked");
+ return 0;
+ }
}
else if (requested == "xyz.openbmc_project.State.Host.Transition."
"GracefulWarmReboot")
{
- sendPowerControlEvent(Event::gracefulPowerCycleRequest);
- addRestartCause(RestartCause::command);
+ // if reset button is masked, ignore this
+ if (!resetButtonMask)
+ {
+ sendPowerControlEvent(Event::gracefulPowerCycleRequest);
+ addRestartCause(RestartCause::command);
+ }
+ else
+ {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "Reset Button Masked.");
+ throw std::invalid_argument("Transition Request Masked");
+ return 0;
+ }
}
else if (requested == "xyz.openbmc_project.State.Host.Transition."
"ForceWarmReboot")
{
- sendPowerControlEvent(Event::resetRequest);
- addRestartCause(RestartCause::command);
+ // if reset button is masked, ignore this
+ if (!resetButtonMask)
+ {
+ sendPowerControlEvent(Event::resetRequest);
+ addRestartCause(RestartCause::command);
+ }
+ else
+ {
+ phosphor::logging::log<phosphor::logging::level::INFO>(
+ "Reset Button Masked.");
+ throw std::invalid_argument("Transition Request Masked");
+ return 0;
+ }
}
else
{