summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjacobkeeler <jacob.keeler@livioradio.com>2020-12-02 13:43:42 -0500
committerjacobkeeler <jacob.keeler@livioradio.com>2020-12-02 13:43:42 -0500
commit26ca4e31a31d89c6c28a47f1252237b029e62c6a (patch)
tree47c5e8d9f4b023bebc83ca66ab9b879395470bf1
parent1cd41269dc11cb8ea5fbe6c4ad44fa8a43ef7e30 (diff)
downloadsdl_core-26ca4e31a31d89c6c28a47f1252237b029e62c6a.tar.gz
Handle omitted parameter permissions properly in OnVehicleData notification
-rw-r--r--src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc26
1 files changed, 17 insertions, 9 deletions
diff --git a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
index 1799d7068c..cfa638de95 100644
--- a/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
+++ b/src/components/application_manager/rpc_plugins/vehicle_info_plugin/src/commands/mobile/on_vehicle_data_notification.cc
@@ -112,15 +112,23 @@ void OnVehicleDataNotification::Run() {
mobile_api::FunctionID::OnVehicleDataID),
appSO[idx].enumerate(),
&params_permissions);
-
- for (const auto& param : appSO[idx].enumerate()) {
- const auto& allowed_params = params_permissions.allowed_params;
- auto param_allowed = allowed_params.find(param);
- if (allowed_params.end() == param_allowed) {
- SDL_LOG_DEBUG("Param " << param << " is not allowed by policy for app "
- << notify_apps[idx]->app_id()
- << ". It will be ignored.");
- appSO[idx].erase(param);
+ if (parameters_permissions_.allowed_params.empty() &&
+ parameters_permissions_.disallowed_params.empty() &&
+ parameters_permissions_.undefined_params.empty()) {
+ SDL_LOG_DEBUG(
+ "No parameter permissions provided, all params are allowed");
+ }
+ else {
+ for (const auto& param : appSO[idx].enumerate()) {
+ const auto& allowed_params = params_permissions.allowed_params;
+ auto param_allowed = allowed_params.find(param);
+ if (allowed_params.end() == param_allowed) {
+ SDL_LOG_DEBUG("Param " << param
+ << " is not allowed by policy for app "
+ << notify_apps[idx]->app_id()
+ << ". It will be ignored.");
+ appSO[idx].erase(param);
+ }
}
}