Merge pull request #2627 from JackLivio/update_to_filter_invalid_parametres_and_rpcs

Update to filter invalid parametres and rpcs

9 files changed, 258 insertions, 35 deletions

diff --git a/src/components/policy/policy_external/include/policy/policy_table/enums.h b/src/components/policy/policy_external/include/policy/policy_table/enums.h
index 2ab6ade03b..34864c5602 100644
--- a/src/components/policy/policy_external/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_external/include/policy/policy_table/enums.h
@@ -44,6 +44,7 @@ enum Priority {
   P_VOICECOM,
   P_COMMUNICATION,
   P_NORMAL,
+  P_PROJECTION,
   P_NONE,
 };
 
@@ -184,7 +185,7 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result);
  * @brief Enumeration FunctionID.
  *
  * Enumeration linking function names with function IDs in AppLink protocol.
- *Assumes enumeration starts at value 0.
+ * Assumes enumeration starts at value 0.
  */
 enum FunctionID {
   /**
diff --git a/src/components/policy/policy_external/src/policy_manager_impl.cc b/src/components/policy/policy_external/src/policy_manager_impl.cc
index 9dffaf52e3..e93eea3969 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -288,12 +288,22 @@ void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
 }
 
 /**
- * @brief FilterInvalidParameters filter parameters that not present in schema
+ * @brief FilterInvalidRPCParameters filter parameters that not present in
+ * schema
  * @param rpc_parameters parameters to filter
  */
-void FilterInvalidParameters(policy_table::RpcParameters& rpc_parameters) {
+void FilterInvalidRPCParameters(policy_table::RpcParameters& rpc_parameters) {
+  policy_table::HmiLevels valid_hmi_levels;
+  for (const auto& hmi_level : rpc_parameters.hmi_levels) {
+    if (hmi_level.is_valid()) {
+      valid_hmi_levels.push_back(hmi_level);
+    }
+  }
+  rpc_parameters.hmi_levels.swap(valid_hmi_levels);
+
   policy_table::Parameters valid_params;
-  for (auto& param : *(rpc_parameters.parameters)) {
+  const policy_table::Parameters& params = *(rpc_parameters.parameters);
+  for (const auto& param : params) {
     if (param.is_valid()) {
       valid_params.push_back(param);
     }
@@ -302,16 +312,109 @@ void FilterInvalidParameters(policy_table::RpcParameters& rpc_parameters) {
 }
 
 /**
+ * @brief FilterInvalidPriorityValues filter notification priorities that are
+ * not present in schema
+ * @param notifications priorities to filter
+ */
+void FilterInvalidPriorityValues(
+    policy_table::NumberOfNotificationsPerMinute& notifications) {
+  policy_table::NumberOfNotificationsPerMinute valid_notifications;
+  for (const auto& notification : notifications) {
+    policy_table::Priority priority;
+    if (policy_table::EnumFromJsonString(notification.first, &priority)) {
+      valid_notifications.insert(notification);
+    }
+  }
+  notifications.swap(valid_notifications);
+}
+
+/**
+ * @brief FilterInvalidApplicationParameters filter app params that are not
+ * present in schema
+ * @param app_params object of app policy params to filter
+ */
+void FilterInvalidApplicationParameters(
+    policy_table::ApplicationParams& app_params) {
+  // Filter AppHMIType array
+  policy_table::AppHMITypes valid_app_hmi_types;
+  const policy_table::AppHMITypes& app_hmi_types = *(app_params.AppHMIType);
+  for (const auto& app_hmi_type : app_hmi_types) {
+    if (app_hmi_type.is_valid()) {
+      valid_app_hmi_types.push_back(app_hmi_type);
+    }
+  }
+  app_params.AppHMIType->swap(valid_app_hmi_types);
+
+  // Filter RquestTypes array
+  policy_table::RequestTypes valid_request_types;
+  const policy_table::RequestTypes& request_types = *(app_params.RequestType);
+  for (const auto& request_type : request_types) {
+    if (request_type.is_valid()) {
+      valid_request_types.push_back(request_type);
+    }
+  }
+  if (valid_request_types.empty() && !request_types.empty()) {
+    // An empty RequestType array will allow all request types. No valid
+    // parameters are in the filtered array, so assign an uninitialized value to
+    // for array to be "omitted"
+    *(app_params.RequestType) = policy_table::RequestTypes();
+  } else {
+    app_params.RequestType->swap(valid_request_types);
+  }
+
+  // Filter moduleType array
+  policy_table::ModuleTypes valid_module_types;
+  const policy_table::ModuleTypes& module_types = *(app_params.moduleType);
+  for (const auto& module_type : module_types) {
+    if (module_type.is_valid()) {
+      valid_module_types.push_back(module_type);
+    }
+  }
+  if (valid_module_types.empty() && !module_types.empty()) {
+    // An empty moduleType array will allow all request types. No valid
+    // parameters are in the filtered array, so assign an uninitialized value to
+    // for array to be "omitted"
+    *(app_params.moduleType) = policy_table::ModuleTypes();
+  } else {
+    app_params.moduleType->swap(valid_module_types);
+  }
+
+  // Filter default_hmi
+  if (!app_params.default_hmi.is_valid()) {
+    app_params.default_hmi = policy_table::HmiLevel();
+  }
+
+  // Filter priority
+  if (!app_params.priority.is_valid()) {
+    app_params.priority = policy_table::Priority();
+  }
+}
+
+/**
  * @brief FilterPolicyTable filter values that not present in schema
  * @param pt policy table to filter
  */
 void FilterPolicyTable(policy_table::PolicyTable& pt) {
+  policy_table::ModuleConfig& module_config = pt.module_config;
+  if (module_config.is_initialized() &&
+      module_config.notifications_per_minute_by_priority.is_initialized()) {
+    FilterInvalidPriorityValues(
+        module_config.notifications_per_minute_by_priority);
+  }
+
+  if (pt.app_policies_section.is_initialized()) {
+    policy_table::ApplicationPolicies& apps = pt.app_policies_section.apps;
+    for (auto& app_policy : apps) {
+      FilterInvalidApplicationParameters(app_policy.second);
+    }
+  }
+
   for (auto& group : pt.functional_groupings) {
     policy_table::Rpc& rpcs = group.second.rpcs;
     FilterInvalidFunctions(rpcs);
 
     for (auto& func : rpcs) {
-      FilterInvalidParameters(func.second);
+      FilterInvalidRPCParameters(func.second);
     }
   }
 }
diff --git a/src/components/policy/policy_external/src/policy_table/enums.cc b/src/components/policy/policy_external/src/policy_table/enums.cc
index 5152cc38ef..6410cb79de 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -14,6 +14,8 @@ bool IsValidEnum(Priority val) {
       return true;
     case P_NORMAL:
       return true;
+    case P_PROJECTION:
+      return true;
     case P_NONE:
       return true;
     default:
@@ -32,6 +34,8 @@ const char* EnumToJsonString(Priority val) {
       return "COMMUNICATION";
     case P_NORMAL:
       return "NORMAL";
+    case P_PROJECTION:
+      return "PROJECTION";
     case P_NONE:
       return "NONE";
     default:
@@ -54,6 +58,9 @@ bool EnumFromJsonString(const std::string& literal, Priority* result) {
   } else if ("NORMAL" == literal) {
     *result = P_NORMAL;
     return true;
+  } else if ("PROJECTION" == literal) {
+    *result = P_PROJECTION;
+    return true;
   } else if ("NONE" == literal) {
     *result = P_NONE;
     return true;
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
index dd9b43d53c..93d4e19751 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_ptu_test.cc
@@ -113,27 +113,27 @@ TEST_F(PolicyManagerImplTest2, GetNotificationsNumberAfterPTUpdate) {
   EXPECT_TRUE(policy_manager_->LoadPT(kFilePtUpdateJson, msg));
   EXPECT_FALSE(policy_manager_->GetCache()->IsPTPreloaded());
 
-  std::string priority = "emergency";
+  std::string priority = "EMERGENCY";
   uint32_t notif_number = policy_manager_->GetNotificationsNumber(priority);
   EXPECT_EQ(1u, notif_number);
 
-  priority = "navigation";
+  priority = "NAVIGATION";
   notif_number = policy_manager_->GetNotificationsNumber(priority);
   EXPECT_EQ(2u, notif_number);
 
-  priority = "emergency";
+  priority = "EMERGENCY";
   notif_number = policy_manager_->GetNotificationsNumber(priority);
   EXPECT_EQ(1u, notif_number);
 
-  priority = "VOICECOMM";
+  priority = "VOICECOM";
   notif_number = policy_manager_->GetNotificationsNumber(priority);
   EXPECT_EQ(3u, notif_number);
 
-  priority = "normal";
+  priority = "NORMAL";
   notif_number = policy_manager_->GetNotificationsNumber(priority);
   EXPECT_EQ(5u, notif_number);
 
-  priority = "none";
+  priority = "NONE";
   notif_number = policy_manager_->GetNotificationsNumber(priority);
   EXPECT_EQ(6u, notif_number);
 }
diff --git a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
index 86b7cdc9ef..13efa39805 100644
--- a/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
+++ b/src/components/policy/policy_external/test/policy_manager_impl_test_base.cc
@@ -105,12 +105,12 @@ Json::Value createPTforLoad() {
       "}"
       "},"
       "\"notifications_per_minute_by_priority\": {"
-      "\"emergency\": 1,"
-      "\"navigation\": 2,"
-      "\"VOICECOMM\": 3,"
-      "\"communication\": 4,"
-      "\"normal\": 5,"
-      "\"none\": 6"
+      "\"EMERGENCY\": 1,"
+      "\"NAVIGATION\": 2,"
+      "\"VOICECOM\": 3,"
+      "\"COMMUNICATION\": 4,"
+      "\"NORMAL\": 5,"
+      "\"NONE\": 6"
       "},"
       "\"vehicle_make\" : \"MakeT\","
       "\"vehicle_model\" : \"ModelT\","
diff --git a/src/components/policy/policy_regular/include/policy/policy_table/enums.h b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
index 4fda36cbe7..1f10db9f6f 100644
--- a/src/components/policy/policy_regular/include/policy/policy_table/enums.h
+++ b/src/components/policy/policy_regular/include/policy/policy_table/enums.h
@@ -44,6 +44,7 @@ enum Priority {
   P_VOICECOM,
   P_COMMUNICATION,
   P_NORMAL,
+  P_PROJECTION,
   P_NONE,
 };
 
@@ -169,7 +170,8 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result);
 /**
  * @brief Enumeration FunctionID.
  *
- * Enumeration linking function names with function IDs in AppLink protocol. Assumes enumeration starts at value 0.
+ * Enumeration linking function names with function IDs in AppLink protocol.
+ * Assumes enumeration starts at value 0.
  */
 enum FunctionID {
   /**
diff --git a/src/components/policy/policy_regular/src/policy_manager_impl.cc b/src/components/policy/policy_regular/src/policy_manager_impl.cc
index 8c70437bfc..a4e21a023c 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -144,7 +144,7 @@ void PolicyManagerImpl::CheckTriggers() {
 }
 
 /**
- * @brief FilterInvalidFunctions filter functions that are not present in schema
+ * @brief FilterInvalidFunctions filter functions that are absent in schema
  * @param rpcs list of functions to filter
  */
 void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
@@ -160,12 +160,22 @@ void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
 }
 
 /**
- * @brief FilterInvalidParameters filter parameters that not present in schema
+ * @brief FilterInvalidRPCParameters filter parameters that not present in
+ * schema
  * @param rpc_parameters parameters to filter
  */
-void FilterInvalidParameters(policy_table::RpcParameters& rpc_parameters) {
+void FilterInvalidRPCParameters(policy_table::RpcParameters& rpc_parameters) {
+  policy_table::HmiLevels valid_hmi_levels;
+  for (const auto& hmi_level : rpc_parameters.hmi_levels) {
+    if (hmi_level.is_valid()) {
+      valid_hmi_levels.push_back(hmi_level);
+    }
+  }
+  rpc_parameters.hmi_levels.swap(valid_hmi_levels);
+
   policy_table::Parameters valid_params;
-  for (auto& param : *(rpc_parameters.parameters)) {
+  const policy_table::Parameters& params = *(rpc_parameters.parameters);
+  for (const auto& param : params) {
     if (param.is_valid()) {
       valid_params.push_back(param);
     }
@@ -174,16 +184,109 @@ void FilterInvalidParameters(policy_table::RpcParameters& rpc_parameters) {
 }
 
 /**
+ * @brief FilterInvalidPriorityValues filter notification priorities that are
+ * not present in schema
+ * @param notifications priorities to filter
+ */
+void FilterInvalidPriorityValues(
+    policy_table::NumberOfNotificationsPerMinute& notifications) {
+  policy_table::NumberOfNotificationsPerMinute valid_notifications;
+  for (const auto& notification : notifications) {
+    policy_table::Priority priority;
+    if (policy_table::EnumFromJsonString(notification.first, &priority)) {
+      valid_notifications.insert(notification);
+    }
+  }
+  notifications.swap(valid_notifications);
+}
+
+/**
+ * @brief FilterInvalidApplicationParameters filter app params that are not
+ * present in schema
+ * @param app_params object of app policy params to filter
+ */
+void FilterInvalidApplicationParameters(
+    policy_table::ApplicationParams& app_params) {
+  // Filter AppHMIType array
+  policy_table::AppHMITypes valid_app_hmi_types;
+  const policy_table::AppHMITypes& app_hmi_types = *(app_params.AppHMIType);
+  for (const auto& app_hmi_type : app_hmi_types) {
+    if (app_hmi_type.is_valid()) {
+      valid_app_hmi_types.push_back(app_hmi_type);
+    }
+  }
+  app_params.AppHMIType->swap(valid_app_hmi_types);
+
+  // Filter RquestTypes array
+  policy_table::RequestTypes valid_request_types;
+  const policy_table::RequestTypes& request_types = *(app_params.RequestType);
+  for (const auto& request_type : request_types) {
+    if (request_type.is_valid()) {
+      valid_request_types.push_back(request_type);
+    }
+  }
+  if (valid_request_types.empty() && !request_types.empty()) {
+    // An empty RequestType array will allow all request types. No valid
+    // parameters are in the filtered array, so assign an uninitialized value to
+    // for array to be "omitted"
+    *(app_params.RequestType) = policy_table::RequestTypes();
+  } else {
+    app_params.RequestType->swap(valid_request_types);
+  }
+
+  // Filter moduleType array
+  policy_table::ModuleTypes valid_module_types;
+  const policy_table::ModuleTypes& module_types = *(app_params.moduleType);
+  for (const auto& module_type : module_types) {
+    if (module_type.is_valid()) {
+      valid_module_types.push_back(module_type);
+    }
+  }
+  if (valid_module_types.empty() && !module_types.empty()) {
+    // An empty moduleType array will allow all request types. No valid
+    // parameters are in the filtered array, so assign an uninitialized value to
+    // for array to be "omitted"
+    *(app_params.moduleType) = policy_table::ModuleTypes();
+  } else {
+    app_params.moduleType->swap(valid_module_types);
+  }
+
+  // Filter default_hmi
+  if (!app_params.default_hmi.is_valid()) {
+    app_params.default_hmi = policy_table::HmiLevel();
+  }
+
+  // Filter priority
+  if (!app_params.priority.is_valid()) {
+    app_params.priority = policy_table::Priority();
+  }
+}
+
+/**
  * @brief FilterPolicyTable filter values that not present in schema
  * @param pt policy table to filter
  */
 void FilterPolicyTable(policy_table::PolicyTable& pt) {
+  policy_table::ModuleConfig& module_config = pt.module_config;
+  if (module_config.is_initialized() &&
+      module_config.notifications_per_minute_by_priority.is_initialized()) {
+    FilterInvalidPriorityValues(
+        module_config.notifications_per_minute_by_priority);
+  }
+
+  if (pt.app_policies_section.is_initialized()) {
+    policy_table::ApplicationPolicies& apps = pt.app_policies_section.apps;
+    for (auto& app_policy : apps) {
+      FilterInvalidApplicationParameters(app_policy.second);
+    }
+  }
+
   for (auto& group : pt.functional_groupings) {
     policy_table::Rpc& rpcs = group.second.rpcs;
     FilterInvalidFunctions(rpcs);
 
     for (auto& func : rpcs) {
-      FilterInvalidParameters(func.second);
+      FilterInvalidRPCParameters(func.second);
     }
   }
 }
diff --git a/src/components/policy/policy_regular/src/policy_table/enums.cc b/src/components/policy/policy_regular/src/policy_table/enums.cc
index 6f914807c5..ec92d064da 100644
--- a/src/components/policy/policy_regular/src/policy_table/enums.cc
+++ b/src/components/policy/policy_regular/src/policy_table/enums.cc
@@ -15,6 +15,8 @@ bool IsValidEnum(Priority val) {
       return true;
     case P_NORMAL:
       return true;
+    case P_PROJECTION:
+      return true;
     case P_NONE:
       return true;
     default:
@@ -33,6 +35,8 @@ const char* EnumToJsonString(Priority val) {
       return "COMMUNICATION";
     case P_NORMAL:
       return "NORMAL";
+    case P_PROJECTION:
+      return "PROJECTION";
     case P_NONE:
       return "NONE";
     default:
@@ -55,6 +59,9 @@ bool EnumFromJsonString(const std::string& literal, Priority* result) {
   } else if ("NORMAL" == literal) {
     *result = P_NORMAL;
     return true;
+  } else if ("PROJECTION" == literal) {
+    *result = P_PROJECTION;
+    return true;
   } else if ("NONE" == literal) {
     *result = P_NONE;
     return true;
diff --git a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
index 9f73f60d28..ff054b3cc4 100644
--- a/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
+++ b/src/components/policy/policy_regular/test/policy_manager_impl_test.cc
@@ -383,12 +383,12 @@ Json::Value CreatePTforLoad() {
       "}"
       "},"
       "\"notifications_per_minute_by_priority\": {"
-      "\"emergency\": 1,"
-      "\"navigation\": 2,"
-      "\"VOICECOMM\": 3,"
-      "\"communication\": 4,"
-      "\"normal\": 5,"
-      "\"none\": 6"
+      "\"EMERGENCY\": 1,"
+      "\"NAVIGATION\": 2,"
+      "\"VOICECOM\": 3,"
+      "\"COMMUNICATION\": 4,"
+      "\"NORMAL\": 5,"
+      "\"NONE\": 6"
       "},"
       "\"vehicle_make\" : \"MakeT\","
       "\"vehicle_model\" : \"ModelT\","
@@ -481,27 +481,27 @@ TEST_F(PolicyManagerImplTest2, GetNotificationsNumberAfterPTUpdate) {
   EXPECT_CALL(listener, OnUpdateStatusChanged(_));
   EXPECT_TRUE(manager->LoadPT("file_pt_update.json", msg));
 
-  std::string priority = "emergency";
+  std::string priority = "EMERGENCY";
   uint32_t notif_number = manager->GetNotificationsNumber(priority);
   EXPECT_EQ(1u, notif_number);
 
-  priority = "navigation";
+  priority = "NAVIGATION";
   notif_number = manager->GetNotificationsNumber(priority);
   EXPECT_EQ(2u, notif_number);
 
-  priority = "emergency";
+  priority = "EMERGENCY";
   notif_number = manager->GetNotificationsNumber(priority);
   EXPECT_EQ(1u, notif_number);
 
-  priority = "VOICECOMM";
+  priority = "VOICECOM";
   notif_number = manager->GetNotificationsNumber(priority);
   EXPECT_EQ(3u, notif_number);
 
-  priority = "normal";
+  priority = "NORMAL";
   notif_number = manager->GetNotificationsNumber(priority);
   EXPECT_EQ(5u, notif_number);
 
-  priority = "none";
+  priority = "NONE";
   notif_number = manager->GetNotificationsNumber(priority);
   EXPECT_EQ(6u, notif_number);
 }