Skip to content

Validate APCB Token before applying PATCH #59

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
ankitaprasad2206 wants to merge 1 commit into
base: integ_sp8
Choose a base branch
from
Open

Validate APCB Token before applying PATCH #59

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
96 changes: 81 additions & 15 deletions redfish-core/lib/rde.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ using RDEVariantType = std::variant<std::vector<std::string>, std::string,
using RDEPropertiesMap = std::vector<std::pair<std::string, RDEVariantType>>;
using ObjectPath = sdbusplus::message::object_path;
using DbusVariantType = std::variant<std::string, uint16_t, int64_t, bool>;
using APCBDataTableValueType = std::variant<int64_t, std::string>;
using APCBDataTableEntryType =
std::map<std::string, APCBDataTableValueType>;
using APCBDataTableType = std::map<std::string, APCBDataTableEntryType>;

constexpr const char* procSchemaName = "Processors";
constexpr const char* networkSchemaName = "NetworkAdapter";
Expand All @@ -47,6 +51,12 @@ constexpr const char* rdeSignalInterface =
constexpr const char* rdeManagerPath = "/xyz/openbmc_project/RDE/Manager";
constexpr const char* rdeManagerInterface = "xyz.openbmc_project.RDE.Manager";
constexpr const char* rdeOperationMethod = "StartRedfishOperation";
constexpr const char* rdeCacheManagerPath = "/xyz/openbmc_project/RDE/CacheManager";
constexpr const char* rdeCacheManagerInterface =
"xyz.openbmc_project.RDE.CacheManager";
constexpr const char* rdeApcbDataTableProperty = "APCBDataTable";
constexpr const char* socConfigurationTokenSubUri =
"Oem/AMD/SocConfiguration/Token";
constexpr const char* rdeOperationTypeRead =
"xyz.openbmc_project.RDE.Common.OperationType.READ";
constexpr const char* rdeOperationTypePatch =
Expand Down Expand Up @@ -306,6 +316,30 @@ inline void rdeCreateTask(task::Payload&& payload,
task->payload.emplace(std::move(payload));
}

inline bool validateSocConfigurationPatchTokenKeys(
crow::Response& response, const nlohmann::json& jsonPayload,
const APCBDataTableType& apcbDataTable)
{
const nlohmann::json::object_t* requestObject =
jsonPayload.get_ptr<const nlohmann::json::object_t*>();
if (requestObject == nullptr || requestObject->empty())
{
messages::propertyValueIncorrect(response, "RequestBody", jsonPayload);
return false;
}

for (const auto& [key, value] : *requestObject)
{
if (key.empty() || apcbDataTable.find(key) == apcbDataTable.end())
{
messages::propertyValueIncorrect(response, key, value);
return false;
}
}

return true;
}

/**
* @class RDEServiceHandler
* @brief Handles Redfish Device Enablement (RDE) service requests.
Expand Down Expand Up @@ -1069,29 +1103,61 @@ class RDEServiceHandler : public std::enable_shared_from_this<RDEServiceHandler>
return;
}

std::string rdePayload = jsonPayload.dump();
// Begin async method call
crow::connections::systemBus->async_method_call(
[self](const boost::system::error_code ec,
const sdbusplus::message_t&, const ObjectPath& objPath) {
auto startPatchOperation = [self](std::string&& rdePayload) {
crow::connections::systemBus->async_method_call(
[self](const boost::system::error_code ec,
const sdbusplus::message_t&, const ObjectPath& objPath) {
if (ec)
{
BMCWEB_LOG_ERROR("RDE: operationGet failed: {}",
ec.message());
messages::internalError(self->asyncResp->res);
return;
}

BMCWEB_LOG_INFO("RDE: task created at {}",
static_cast<const std::string&>(objPath));

task::Payload payload(self->request);
rdeCreateTask(std::move(payload), objPath,
self->resourceData);
},
pldmService, rdeManagerPath, rdeManagerInterface,
rdeOperationMethod, self->nextOperationId(),
rdeOperationTypePatch, self->subUri, self->deviceUUID,
self->deviceEID, std::move(rdePayload), rdePayloadFormatInline,
rdeEncodingFormatJSON, self->schema);
};

if (self->subUri != socConfigurationTokenSubUri)
{
startPatchOperation(jsonPayload.dump());
return;
}

dbus::utility::getProperty<APCBDataTableType>(
pldmService, rdeCacheManagerPath, rdeCacheManagerInterface,
rdeApcbDataTableProperty,
[self, jsonPayload = std::move(jsonPayload),
startPatchOperation = std::move(startPatchOperation)](
const boost::system::error_code& ec,
const APCBDataTableType& apcbDataTable) mutable {
if (ec)
{
BMCWEB_LOG_ERROR("RDE: operationGet failed: {}",
BMCWEB_LOG_ERROR("RDE: APCBDataTable query failed: {}",
ec.message());
messages::internalError(self->asyncResp->res);
return;
}

BMCWEB_LOG_INFO("RDE: task created at {}",
static_cast<const std::string&>(objPath));
if (!validateSocConfigurationPatchTokenKeys(
self->asyncResp->res, jsonPayload, apcbDataTable))
{
return;
}

task::Payload payload(self->request);
rdeCreateTask(std::move(payload), objPath, self->resourceData);
},
pldmService, rdeManagerPath, rdeManagerInterface,
rdeOperationMethod, self->nextOperationId(), rdeOperationTypePatch,
self->subUri, self->deviceUUID, self->deviceEID, rdePayload,
rdePayloadFormatInline, rdeEncodingFormatJSON, self->schema);
startPatchOperation(jsonPayload.dump());
});
}

/**
Expand Down