Merge pull request #2006 from LuxoftAKutsan/fix/filter_invalid_parametres_and_rpcs

Fix/filter invalid parametres and rpcs

6 files changed, 1837 insertions, 1 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 a31e955d99..2ab6ade03b 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
@@ -180,6 +180,372 @@ bool IsValidEnum(ModuleType val);
 const char* EnumToJsonString(ModuleType val);
 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.
+ */
+enum FunctionID {
+  /**
+   * @brief RESERVED.
+   */
+  RESERVED = 0,
+
+  /**
+   * @brief RegisterAppInterfaceID.
+   */
+  RegisterAppInterfaceID = 1,
+
+  /**
+   * @brief UnregisterAppInterfaceID.
+   */
+  UnregisterAppInterfaceID = 2,
+
+  /**
+   * @brief SetGlobalPropertiesID.
+   */
+  SetGlobalPropertiesID = 3,
+
+  /**
+   * @brief ResetGlobalPropertiesID.
+   */
+  ResetGlobalPropertiesID = 4,
+
+  /**
+   * @brief AddCommandID.
+   */
+  AddCommandID = 5,
+
+  /**
+   * @brief DeleteCommandID.
+   */
+  DeleteCommandID = 6,
+
+  /**
+   * @brief AddSubMenuID.
+   */
+  AddSubMenuID = 7,
+
+  /**
+   * @brief DeleteSubMenuID.
+   */
+  DeleteSubMenuID = 8,
+
+  /**
+   * @brief CreateInteractionChoiceSetID.
+   */
+  CreateInteractionChoiceSetID = 9,
+
+  /**
+   * @brief PerformInteractionID.
+   */
+  PerformInteractionID = 10,
+
+  /**
+   * @brief DeleteInteractionChoiceSetID.
+   */
+  DeleteInteractionChoiceSetID = 11,
+
+  /**
+   * @brief AlertID.
+   */
+  AlertID = 12,
+
+  /**
+   * @brief ShowID.
+   */
+  ShowID = 13,
+
+  /**
+   * @brief SpeakID.
+   */
+  SpeakID = 14,
+
+  /**
+   * @brief SetMediaClockTimerID.
+   */
+  SetMediaClockTimerID = 15,
+
+  /**
+   * @brief PerformAudioPassThruID.
+   */
+  PerformAudioPassThruID = 16,
+
+  /**
+   * @brief EndAudioPassThruID.
+   */
+  EndAudioPassThruID = 17,
+
+  /**
+   * @brief SubscribeButtonID.
+   */
+  SubscribeButtonID = 18,
+
+  /**
+   * @brief UnsubscribeButtonID.
+   */
+  UnsubscribeButtonID = 19,
+
+  /**
+   * @brief SubscribeVehicleDataID.
+   */
+  SubscribeVehicleDataID = 20,
+
+  /**
+   * @brief UnsubscribeVehicleDataID.
+   */
+  UnsubscribeVehicleDataID = 21,
+
+  /**
+   * @brief GetVehicleDataID.
+   */
+  GetVehicleDataID = 22,
+
+  /**
+   * @brief ReadDIDID.
+   */
+  ReadDIDID = 23,
+
+  /**
+   * @brief GetDTCsID.
+   */
+  GetDTCsID = 24,
+
+  /**
+   * @brief ScrollableMessageID.
+   */
+  ScrollableMessageID = 25,
+
+  /**
+   * @brief SliderID.
+   */
+  SliderID = 26,
+
+  /**
+   * @brief ShowConstantTBTID.
+   */
+  ShowConstantTBTID = 27,
+
+  /**
+   * @brief AlertManeuverID.
+   */
+  AlertManeuverID = 28,
+
+  /**
+   * @brief UpdateTurnListID.
+   */
+  UpdateTurnListID = 29,
+
+  /**
+   * @brief ChangeRegistrationID.
+   */
+  ChangeRegistrationID = 30,
+
+  /**
+   * @brief GenericResponseID.
+   */
+  GenericResponseID = 31,
+
+  /**
+   * @brief PutFileID.
+   */
+  PutFileID = 32,
+
+  /**
+   * @brief DeleteFileID.
+   */
+  DeleteFileID = 33,
+
+  /**
+   * @brief ListFilesID.
+   */
+  ListFilesID = 34,
+
+  /**
+   * @brief SetAppIconID.
+   */
+  SetAppIconID = 35,
+
+  /**
+   * @brief SetDisplayLayoutID.
+   */
+  SetDisplayLayoutID = 36,
+
+  /**
+   * @brief DiagnosticMessageID.
+   */
+  DiagnosticMessageID = 37,
+
+  /**
+   * @brief SystemRequestID.
+   */
+  SystemRequestID = 38,
+
+  /**
+   * @brief SendLocationID.
+   */
+  SendLocationID = 39,
+
+  /**
+   * @brief DialNumberID.
+   */
+  DialNumberID = 40,
+
+  /**
+   * @brief ButtonPressID.
+   */
+  ButtonPressID = 41,
+
+  /**
+   * @brief GetInteriorVehicleDataID.
+   */
+  GetInteriorVehicleDataID = 43,
+
+  /**
+   * @brief SetInteriorVehicleDataID.
+   */
+  SetInteriorVehicleDataID = 44,
+
+  /**
+   * @brief GetWayPointsID.
+   */
+  GetWayPointsID = 45,
+
+  /**
+   * @brief SubscribeWayPointsID.
+   */
+  SubscribeWayPointsID = 46,
+
+  /**
+   * @brief UnsubscribeWayPointsID.
+   */
+  UnsubscribeWayPointsID = 47,
+
+  /**
+   * @brief GetSystemCapabilityID.
+   */
+  GetSystemCapabilityID = 48,
+
+  /**
+   * @brief SendHapticDataID.
+   */
+  SendHapticDataID = 49,
+
+  /**
+   * @brief OnHMIStatusID.
+   */
+  OnHMIStatusID = 32768,
+
+  /**
+   * @brief OnAppInterfaceUnregisteredID.
+   */
+  OnAppInterfaceUnregisteredID = 32769,
+
+  /**
+   * @brief OnButtonEventID.
+   */
+  OnButtonEventID = 32770,
+
+  /**
+   * @brief OnButtonPressID.
+   */
+  OnButtonPressID = 32771,
+
+  /**
+   * @brief OnVehicleDataID.
+   */
+  OnVehicleDataID = 32772,
+
+  /**
+   * @brief OnCommandID.
+   */
+  OnCommandID = 32773,
+
+  /**
+   * @brief OnTBTClientStateID.
+   */
+  OnTBTClientStateID = 32774,
+
+  /**
+   * @brief OnDriverDistractionID.
+   */
+  OnDriverDistractionID = 32775,
+
+  /**
+   * @brief OnPermissionsChangeID.
+   */
+  OnPermissionsChangeID = 32776,
+
+  /**
+   * @brief OnAudioPassThruID.
+   */
+  OnAudioPassThruID = 32777,
+
+  /**
+   * @brief OnLanguageChangeID.
+   */
+  OnLanguageChangeID = 32778,
+
+  /**
+   * @brief OnKeyboardInputID.
+   */
+  OnKeyboardInputID = 32779,
+
+  /**
+   * @brief OnTouchEventID.
+   */
+  OnTouchEventID = 32780,
+
+  /**
+   * @brief OnSystemRequestID.
+   */
+  OnSystemRequestID = 32781,
+
+  /**
+   * @brief OnHashChangeID.
+   */
+  OnHashChangeID = 32782,
+
+  /**
+   * @brief OnInteriorVehicleDataID.
+   */
+  OnInteriorVehicleDataID = 32783,
+
+  /**
+   * @brief OnWayPointChangeID.
+   */
+  OnWayPointChangeID = 32784,
+
+  /**
+   * @brief OnRCStatusID.
+   */
+  OnRCStatusID = 32785,
+
+  /**
+   * @brief EncodedSyncPDataID.
+   */
+  EncodedSyncPDataID = 65536,
+
+  /**
+   * @brief SyncPDataID.
+   */
+  SyncPDataID = 65537,
+
+  /**
+   * @brief OnEncodedSyncPDataID.
+   */
+  OnEncodedSyncPDataID = 98304,
+
+  /**
+   * @brief OnSyncPDataID.
+   */
+  OnSyncPDataID = 98305
+};
+bool IsValidEnum(FunctionID val);
+const char* EnumToJsonString(FunctionID val);
+bool EnumFromJsonString(const std::string& literal, FunctionID* result);
+
 extern const std::string kDefaultApp;
 extern const std::string kPreDataConsentApp;
 extern const std::string kDeviceApp;
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 e2b0d6524f..9dffaf52e3 100644
--- a/src/components/policy/policy_external/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_external/src/policy_manager_impl.cc
@@ -271,6 +271,51 @@ std::string PolicyManagerImpl::GetLockScreenIconUrl() const {
   return cache_->GetLockScreenIconUrl();
 }
 
+/**
+ * @brief FilterInvalidFunctions filter functions that are absent in schema
+ * @param rpcs list of functions to filter
+ */
+void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
+  policy_table::Rpc valid_rpcs;
+  for (const auto& rpc : rpcs) {
+    const std::string& rpc_name = rpc.first;
+    policy_table::FunctionID function_id;
+    if (policy_table::EnumFromJsonString(rpc_name, &function_id)) {
+      valid_rpcs.insert(rpc);
+    }
+  }
+  rpcs.swap(valid_rpcs);
+}
+
+/**
+ * @brief FilterInvalidParameters filter parameters that not present in schema
+ * @param rpc_parameters parameters to filter
+ */
+void FilterInvalidParameters(policy_table::RpcParameters& rpc_parameters) {
+  policy_table::Parameters valid_params;
+  for (auto& param : *(rpc_parameters.parameters)) {
+    if (param.is_valid()) {
+      valid_params.push_back(param);
+    }
+  }
+  rpc_parameters.parameters->swap(valid_params);
+}
+
+/**
+ * @brief FilterPolicyTable filter values that not present in schema
+ * @param pt policy table to filter
+ */
+void FilterPolicyTable(policy_table::PolicyTable& pt) {
+  for (auto& group : pt.functional_groupings) {
+    policy_table::Rpc& rpcs = group.second.rpcs;
+    FilterInvalidFunctions(rpcs);
+
+    for (auto& func : rpcs) {
+      FilterInvalidParameters(func.second);
+    }
+  }
+}
+
 bool PolicyManagerImpl::LoadPT(const std::string& file,
                                const BinaryMessage& pt_content) {
   LOG4CXX_INFO(logger_, "LoadPT of size " << pt_content.size());
@@ -287,7 +332,7 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
   }
 
   file_system::DeleteFile(file);
-
+  FilterPolicyTable(pt_update->policy_table);
   if (!IsPTValid(pt_update, policy_table::PT_UPDATE)) {
     wrong_ptu_update_received_ = true;
     update_status_manager_.OnWrongUpdateReceived();
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 31a6fc86e6..5152cc38ef 100644
--- a/src/components/policy/policy_external/src/policy_table/enums.cc
+++ b/src/components/policy/policy_external/src/policy_table/enums.cc
@@ -833,6 +833,364 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result) {
   }
 }
 
+bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
+  if ("RESERVE" == literal) {
+    *result = RESERVED;
+    return true;
+  }
+
+  if ("RegisterAppInterface" == literal) {
+    *result = RegisterAppInterfaceID;
+    return true;
+  }
+
+  if ("UnregisterAppInterface" == literal) {
+    *result = UnregisterAppInterfaceID;
+    return true;
+  }
+
+  if ("SetGlobalProperties" == literal) {
+    *result = SetGlobalPropertiesID;
+    return true;
+  }
+
+  if ("ResetGlobalProperties" == literal) {
+    *result = ResetGlobalPropertiesID;
+    return true;
+  }
+
+  if ("AddCommand" == literal) {
+    *result = AddCommandID;
+    return true;
+  }
+
+  if ("DeleteCommand" == literal) {
+    *result = DeleteCommandID;
+    return true;
+  }
+
+  if ("AddSubMenu" == literal) {
+    *result = AddSubMenuID;
+    return true;
+  }
+
+  if ("DeleteSubMenu" == literal) {
+    *result = DeleteSubMenuID;
+    return true;
+  }
+
+  if ("CreateInteractionChoiceSet" == literal) {
+    *result = CreateInteractionChoiceSetID;
+    return true;
+  }
+
+  if ("PerformInteraction" == literal) {
+    *result = PerformInteractionID;
+    return true;
+  }
+
+  if ("DeleteInteractionChoiceSet" == literal) {
+    *result = DeleteInteractionChoiceSetID;
+    return true;
+  }
+
+  if ("Alert" == literal) {
+    *result = AlertID;
+    return true;
+  }
+
+  if ("Show" == literal) {
+    *result = ShowID;
+    return true;
+  }
+
+  if ("Speak" == literal) {
+    *result = SpeakID;
+    return true;
+  }
+
+  if ("SetMediaClockTimer" == literal) {
+    *result = SetMediaClockTimerID;
+    return true;
+  }
+
+  if ("PerformAudioPassThru" == literal) {
+    *result = PerformAudioPassThruID;
+    return true;
+  }
+
+  if ("EndAudioPassThru" == literal) {
+    *result = EndAudioPassThruID;
+    return true;
+  }
+
+  if ("SubscribeButton" == literal) {
+    *result = SubscribeButtonID;
+    return true;
+  }
+
+  if ("UnsubscribeButton" == literal) {
+    *result = UnsubscribeButtonID;
+    return true;
+  }
+
+  if ("SubscribeVehicleData" == literal) {
+    *result = SubscribeVehicleDataID;
+    return true;
+  }
+
+  if ("UnsubscribeVehicleData" == literal) {
+    *result = UnsubscribeVehicleDataID;
+    return true;
+  }
+
+  if ("GetVehicleData" == literal) {
+    *result = GetVehicleDataID;
+    return true;
+  }
+
+  if ("ReadD" == literal) {
+    *result = ReadDIDID;
+    return true;
+  }
+
+  if ("GetDTCs" == literal) {
+    *result = GetDTCsID;
+    return true;
+  }
+
+  if ("ScrollableMessage" == literal) {
+    *result = ScrollableMessageID;
+    return true;
+  }
+
+  if ("Slider" == literal) {
+    *result = SliderID;
+    return true;
+  }
+
+  if ("ShowConstantTBT" == literal) {
+    *result = ShowConstantTBTID;
+    return true;
+  }
+
+  if ("AlertManeuver" == literal) {
+    *result = AlertManeuverID;
+    return true;
+  }
+
+  if ("UpdateTurnList" == literal) {
+    *result = UpdateTurnListID;
+    return true;
+  }
+
+  if ("ChangeRegistration" == literal) {
+    *result = ChangeRegistrationID;
+    return true;
+  }
+
+  if ("GenericResponse" == literal) {
+    *result = GenericResponseID;
+    return true;
+  }
+
+  if ("PutFile" == literal) {
+    *result = PutFileID;
+    return true;
+  }
+
+  if ("DeleteFile" == literal) {
+    *result = DeleteFileID;
+    return true;
+  }
+
+  if ("ListFiles" == literal) {
+    *result = ListFilesID;
+    return true;
+  }
+
+  if ("SetAppIcon" == literal) {
+    *result = SetAppIconID;
+    return true;
+  }
+
+  if ("SetDisplayLayout" == literal) {
+    *result = SetDisplayLayoutID;
+    return true;
+  }
+
+  if ("DiagnosticMessage" == literal) {
+    *result = DiagnosticMessageID;
+    return true;
+  }
+
+  if ("SystemRequest" == literal) {
+    *result = SystemRequestID;
+    return true;
+  }
+
+  if ("SendLocation" == literal) {
+    *result = SendLocationID;
+    return true;
+  }
+
+  if ("DialNumber" == literal) {
+    *result = DialNumberID;
+    return true;
+  }
+
+  if ("ButtonPress" == literal) {
+    *result = ButtonPressID;
+    return true;
+  }
+
+  if ("GetInteriorVehicleData" == literal) {
+    *result = GetInteriorVehicleDataID;
+    return true;
+  }
+
+  if ("SetInteriorVehicleData" == literal) {
+    *result = SetInteriorVehicleDataID;
+    return true;
+  }
+
+  if ("GetWayPoints" == literal) {
+    *result = GetWayPointsID;
+    return true;
+  }
+
+  if ("SubscribeWayPoints" == literal) {
+    *result = SubscribeWayPointsID;
+    return true;
+  }
+
+  if ("UnsubscribeWayPoints" == literal) {
+    *result = UnsubscribeWayPointsID;
+    return true;
+  }
+
+  if ("GetSystemCapability" == literal) {
+    *result = GetSystemCapabilityID;
+    return true;
+  }
+
+  if ("SendHapticData" == literal) {
+    *result = SendHapticDataID;
+    return true;
+  }
+
+  if ("OnHMIStatus" == literal) {
+    *result = OnHMIStatusID;
+    return true;
+  }
+
+  if ("OnAppInterfaceUnregistered" == literal) {
+    *result = OnAppInterfaceUnregisteredID;
+    return true;
+  }
+
+  if ("OnButtonEvent" == literal) {
+    *result = OnButtonEventID;
+    return true;
+  }
+
+  if ("OnButtonPress" == literal) {
+    *result = OnButtonPressID;
+    return true;
+  }
+
+  if ("OnVehicleData" == literal) {
+    *result = OnVehicleDataID;
+    return true;
+  }
+
+  if ("OnCommand" == literal) {
+    *result = OnCommandID;
+    return true;
+  }
+
+  if ("OnTBTClientState" == literal) {
+    *result = OnTBTClientStateID;
+    return true;
+  }
+
+  if ("OnDriverDistraction" == literal) {
+    *result = OnDriverDistractionID;
+    return true;
+  }
+
+  if ("OnPermissionsChange" == literal) {
+    *result = OnPermissionsChangeID;
+    return true;
+  }
+
+  if ("OnAudioPassThru" == literal) {
+    *result = OnAudioPassThruID;
+    return true;
+  }
+
+  if ("OnLanguageChange" == literal) {
+    *result = OnLanguageChangeID;
+    return true;
+  }
+
+  if ("OnKeyboardInput" == literal) {
+    *result = OnKeyboardInputID;
+    return true;
+  }
+
+  if ("OnTouchEvent" == literal) {
+    *result = OnTouchEventID;
+    return true;
+  }
+
+  if ("OnSystemRequest" == literal) {
+    *result = OnSystemRequestID;
+    return true;
+  }
+
+  if ("OnHashChange" == literal) {
+    *result = OnHashChangeID;
+    return true;
+  }
+
+  if ("OnInteriorVehicleData" == literal) {
+    *result = OnInteriorVehicleDataID;
+    return true;
+  }
+
+  if ("OnWayPointChange" == literal) {
+    *result = OnWayPointChangeID;
+    return true;
+  }
+
+  if ("OnRCStatus" == literal) {
+    *result = OnRCStatusID;
+    return true;
+  }
+
+  if ("EncodedSyncPData" == literal) {
+    *result = EncodedSyncPDataID;
+    return true;
+  }
+
+  if ("SyncPData" == literal) {
+    *result = SyncPDataID;
+    return true;
+  }
+
+  if ("OnEncodedSyncPData" == literal) {
+    *result = OnEncodedSyncPDataID;
+    return true;
+  }
+
+  if ("OnSyncPData" == literal) {
+    *result = OnSyncPDataID;
+    return true;
+  }
+  return false;
+};
+
 const std::string kDefaultApp = "default";
 const std::string kPreDataConsentApp = "pre_DataConsent";
 const std::string kDeviceApp = "device";
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 b2acf77ec1..4fda36cbe7 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
@@ -166,6 +166,371 @@ bool IsValidEnum(ModuleType val);
 const char* EnumToJsonString(ModuleType val);
 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.
+ */
+enum FunctionID {
+  /**
+   * @brief RESERVED.
+   */
+  RESERVED = 0,
+
+  /**
+   * @brief RegisterAppInterfaceID.
+   */
+  RegisterAppInterfaceID = 1,
+
+  /**
+   * @brief UnregisterAppInterfaceID.
+   */
+  UnregisterAppInterfaceID = 2,
+
+  /**
+   * @brief SetGlobalPropertiesID.
+   */
+  SetGlobalPropertiesID = 3,
+
+  /**
+   * @brief ResetGlobalPropertiesID.
+   */
+  ResetGlobalPropertiesID = 4,
+
+  /**
+   * @brief AddCommandID.
+   */
+  AddCommandID = 5,
+
+  /**
+   * @brief DeleteCommandID.
+   */
+  DeleteCommandID = 6,
+
+  /**
+   * @brief AddSubMenuID.
+   */
+  AddSubMenuID = 7,
+
+  /**
+   * @brief DeleteSubMenuID.
+   */
+  DeleteSubMenuID = 8,
+
+  /**
+   * @brief CreateInteractionChoiceSetID.
+   */
+  CreateInteractionChoiceSetID = 9,
+
+  /**
+   * @brief PerformInteractionID.
+   */
+  PerformInteractionID = 10,
+
+  /**
+   * @brief DeleteInteractionChoiceSetID.
+   */
+  DeleteInteractionChoiceSetID = 11,
+
+  /**
+   * @brief AlertID.
+   */
+  AlertID = 12,
+
+  /**
+   * @brief ShowID.
+   */
+  ShowID = 13,
+
+  /**
+   * @brief SpeakID.
+   */
+  SpeakID = 14,
+
+  /**
+   * @brief SetMediaClockTimerID.
+   */
+  SetMediaClockTimerID = 15,
+
+  /**
+   * @brief PerformAudioPassThruID.
+   */
+  PerformAudioPassThruID = 16,
+
+  /**
+   * @brief EndAudioPassThruID.
+   */
+  EndAudioPassThruID = 17,
+
+  /**
+   * @brief SubscribeButtonID.
+   */
+  SubscribeButtonID = 18,
+
+  /**
+   * @brief UnsubscribeButtonID.
+   */
+  UnsubscribeButtonID = 19,
+
+  /**
+   * @brief SubscribeVehicleDataID.
+   */
+  SubscribeVehicleDataID = 20,
+
+  /**
+   * @brief UnsubscribeVehicleDataID.
+   */
+  UnsubscribeVehicleDataID = 21,
+
+  /**
+   * @brief GetVehicleDataID.
+   */
+  GetVehicleDataID = 22,
+
+  /**
+   * @brief ReadDIDID.
+   */
+  ReadDIDID = 23,
+
+  /**
+   * @brief GetDTCsID.
+   */
+  GetDTCsID = 24,
+
+  /**
+   * @brief ScrollableMessageID.
+   */
+  ScrollableMessageID = 25,
+
+  /**
+   * @brief SliderID.
+   */
+  SliderID = 26,
+
+  /**
+   * @brief ShowConstantTBTID.
+   */
+  ShowConstantTBTID = 27,
+
+  /**
+   * @brief AlertManeuverID.
+   */
+  AlertManeuverID = 28,
+
+  /**
+   * @brief UpdateTurnListID.
+   */
+  UpdateTurnListID = 29,
+
+  /**
+   * @brief ChangeRegistrationID.
+   */
+  ChangeRegistrationID = 30,
+
+  /**
+   * @brief GenericResponseID.
+   */
+  GenericResponseID = 31,
+
+  /**
+   * @brief PutFileID.
+   */
+  PutFileID = 32,
+
+  /**
+   * @brief DeleteFileID.
+   */
+  DeleteFileID = 33,
+
+  /**
+   * @brief ListFilesID.
+   */
+  ListFilesID = 34,
+
+  /**
+   * @brief SetAppIconID.
+   */
+  SetAppIconID = 35,
+
+  /**
+   * @brief SetDisplayLayoutID.
+   */
+  SetDisplayLayoutID = 36,
+
+  /**
+   * @brief DiagnosticMessageID.
+   */
+  DiagnosticMessageID = 37,
+
+  /**
+   * @brief SystemRequestID.
+   */
+  SystemRequestID = 38,
+
+  /**
+   * @brief SendLocationID.
+   */
+  SendLocationID = 39,
+
+  /**
+   * @brief DialNumberID.
+   */
+  DialNumberID = 40,
+
+  /**
+   * @brief ButtonPressID.
+   */
+  ButtonPressID = 41,
+
+  /**
+   * @brief GetInteriorVehicleDataID.
+   */
+  GetInteriorVehicleDataID = 43,
+
+  /**
+   * @brief SetInteriorVehicleDataID.
+   */
+  SetInteriorVehicleDataID = 44,
+
+  /**
+   * @brief GetWayPointsID.
+   */
+  GetWayPointsID = 45,
+
+  /**
+   * @brief SubscribeWayPointsID.
+   */
+  SubscribeWayPointsID = 46,
+
+  /**
+   * @brief UnsubscribeWayPointsID.
+   */
+  UnsubscribeWayPointsID = 47,
+
+  /**
+   * @brief GetSystemCapabilityID.
+   */
+  GetSystemCapabilityID = 48,
+
+  /**
+   * @brief SendHapticDataID.
+   */
+  SendHapticDataID = 49,
+
+  /**
+   * @brief OnHMIStatusID.
+   */
+  OnHMIStatusID = 32768,
+
+  /**
+   * @brief OnAppInterfaceUnregisteredID.
+   */
+  OnAppInterfaceUnregisteredID = 32769,
+
+  /**
+   * @brief OnButtonEventID.
+   */
+  OnButtonEventID = 32770,
+
+  /**
+   * @brief OnButtonPressID.
+   */
+  OnButtonPressID = 32771,
+
+  /**
+   * @brief OnVehicleDataID.
+   */
+  OnVehicleDataID = 32772,
+
+  /**
+   * @brief OnCommandID.
+   */
+  OnCommandID = 32773,
+
+  /**
+   * @brief OnTBTClientStateID.
+   */
+  OnTBTClientStateID = 32774,
+
+  /**
+   * @brief OnDriverDistractionID.
+   */
+  OnDriverDistractionID = 32775,
+
+  /**
+   * @brief OnPermissionsChangeID.
+   */
+  OnPermissionsChangeID = 32776,
+
+  /**
+   * @brief OnAudioPassThruID.
+   */
+  OnAudioPassThruID = 32777,
+
+  /**
+   * @brief OnLanguageChangeID.
+   */
+  OnLanguageChangeID = 32778,
+
+  /**
+   * @brief OnKeyboardInputID.
+   */
+  OnKeyboardInputID = 32779,
+
+  /**
+   * @brief OnTouchEventID.
+   */
+  OnTouchEventID = 32780,
+
+  /**
+   * @brief OnSystemRequestID.
+   */
+  OnSystemRequestID = 32781,
+
+  /**
+   * @brief OnHashChangeID.
+   */
+  OnHashChangeID = 32782,
+
+  /**
+   * @brief OnInteriorVehicleDataID.
+   */
+  OnInteriorVehicleDataID = 32783,
+
+  /**
+   * @brief OnWayPointChangeID.
+   */
+  OnWayPointChangeID = 32784,
+
+  /**
+   * @brief OnRCStatusID.
+   */
+  OnRCStatusID = 32785,
+
+  /**
+   * @brief EncodedSyncPDataID.
+   */
+  EncodedSyncPDataID = 65536,
+
+  /**
+   * @brief SyncPDataID.
+   */
+  SyncPDataID = 65537,
+
+  /**
+   * @brief OnEncodedSyncPDataID.
+   */
+  OnEncodedSyncPDataID = 98304,
+
+  /**
+   * @brief OnSyncPDataID.
+   */
+  OnSyncPDataID = 98305
+};
+bool IsValidEnum(FunctionID val);
+const char* EnumToJsonString(FunctionID val);
+bool EnumFromJsonString(const std::string& literal, FunctionID* result);
+
 extern const std::string kDefaultApp;
 extern const std::string kPreDataConsentApp;
 extern const std::string kDeviceApp;
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 f4b6f0ae03..8c70437bfc 100644
--- a/src/components/policy/policy_regular/src/policy_manager_impl.cc
+++ b/src/components/policy/policy_regular/src/policy_manager_impl.cc
@@ -143,6 +143,51 @@ void PolicyManagerImpl::CheckTriggers() {
   }
 }
 
+/**
+ * @brief FilterInvalidFunctions filter functions that are not present in schema
+ * @param rpcs list of functions to filter
+ */
+void FilterInvalidFunctions(policy_table::Rpc& rpcs) {
+  policy_table::Rpc valid_rpcs;
+  for (const auto& rpc : rpcs) {
+    const std::string& rpc_name = rpc.first;
+    policy_table::FunctionID function_id;
+    if (policy_table::EnumFromJsonString(rpc_name, &function_id)) {
+      valid_rpcs.insert(rpc);
+    }
+  }
+  rpcs.swap(valid_rpcs);
+}
+
+/**
+ * @brief FilterInvalidParameters filter parameters that not present in schema
+ * @param rpc_parameters parameters to filter
+ */
+void FilterInvalidParameters(policy_table::RpcParameters& rpc_parameters) {
+  policy_table::Parameters valid_params;
+  for (auto& param : *(rpc_parameters.parameters)) {
+    if (param.is_valid()) {
+      valid_params.push_back(param);
+    }
+  }
+  rpc_parameters.parameters->swap(valid_params);
+}
+
+/**
+ * @brief FilterPolicyTable filter values that not present in schema
+ * @param pt policy table to filter
+ */
+void FilterPolicyTable(policy_table::PolicyTable& pt) {
+  for (auto& group : pt.functional_groupings) {
+    policy_table::Rpc& rpcs = group.second.rpcs;
+    FilterInvalidFunctions(rpcs);
+
+    for (auto& func : rpcs) {
+      FilterInvalidParameters(func.second);
+    }
+  }
+}
+
 bool PolicyManagerImpl::LoadPT(const std::string& file,
                                const BinaryMessage& pt_content) {
   LOG4CXX_INFO(logger_, "LoadPT of size " << pt_content.size());
@@ -168,6 +213,7 @@ bool PolicyManagerImpl::LoadPT(const std::string& file,
 
   file_system::DeleteFile(file);
 
+  FilterPolicyTable(pt_update->policy_table);
   if (!IsPTValid(pt_update, policy_table::PT_UPDATE)) {
     wrong_ptu_update_received_ = true;
     update_status_manager_.OnWrongUpdateReceived();
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 138d866174..6f914807c5 100644
--- a/src/components/policy/policy_regular/src/policy_table/enums.cc
+++ b/src/components/policy/policy_regular/src/policy_table/enums.cc
@@ -702,6 +702,662 @@ bool EnumFromJsonString(const std::string& literal, ModuleType* result) {
   return false;
 }
 
+bool IsValidEnum(FunctionID val) {
+  switch (val) {
+    case RESERVED:
+      return true;
+    case RegisterAppInterfaceID:
+      return true;
+    case UnregisterAppInterfaceID:
+      return true;
+    case SetGlobalPropertiesID:
+      return true;
+    case ResetGlobalPropertiesID:
+      return true;
+    case AddCommandID:
+      return true;
+    case DeleteCommandID:
+      return true;
+    case AddSubMenuID:
+      return true;
+    case DeleteSubMenuID:
+      return true;
+    case CreateInteractionChoiceSetID:
+      return true;
+    case PerformInteractionID:
+      return true;
+    case DeleteInteractionChoiceSetID:
+      return true;
+    case AlertID:
+      return true;
+    case ShowID:
+      return true;
+    case SpeakID:
+      return true;
+    case SetMediaClockTimerID:
+      return true;
+    case PerformAudioPassThruID:
+      return true;
+    case EndAudioPassThruID:
+      return true;
+    case SubscribeButtonID:
+      return true;
+    case UnsubscribeButtonID:
+      return true;
+    case SubscribeVehicleDataID:
+      return true;
+    case UnsubscribeVehicleDataID:
+      return true;
+    case GetVehicleDataID:
+      return true;
+    case ReadDIDID:
+      return true;
+    case GetDTCsID:
+      return true;
+    case ScrollableMessageID:
+      return true;
+    case SliderID:
+      return true;
+    case ShowConstantTBTID:
+      return true;
+    case AlertManeuverID:
+      return true;
+    case UpdateTurnListID:
+      return true;
+    case ChangeRegistrationID:
+      return true;
+    case GenericResponseID:
+      return true;
+    case PutFileID:
+      return true;
+    case DeleteFileID:
+      return true;
+    case ListFilesID:
+      return true;
+    case SetAppIconID:
+      return true;
+    case SetDisplayLayoutID:
+      return true;
+    case DiagnosticMessageID:
+      return true;
+    case SystemRequestID:
+      return true;
+    case SendLocationID:
+      return true;
+    case DialNumberID:
+      return true;
+    case ButtonPressID:
+      return true;
+    case GetInteriorVehicleDataID:
+      return true;
+    case SetInteriorVehicleDataID:
+      return true;
+    case GetWayPointsID:
+      return true;
+    case SubscribeWayPointsID:
+      return true;
+    case UnsubscribeWayPointsID:
+      return true;
+    case GetSystemCapabilityID:
+      return true;
+    case SendHapticDataID:
+      return true;
+    case OnHMIStatusID:
+      return true;
+    case OnAppInterfaceUnregisteredID:
+      return true;
+    case OnButtonEventID:
+      return true;
+    case OnButtonPressID:
+      return true;
+    case OnVehicleDataID:
+      return true;
+    case OnCommandID:
+      return true;
+    case OnTBTClientStateID:
+      return true;
+    case OnDriverDistractionID:
+      return true;
+    case OnPermissionsChangeID:
+      return true;
+    case OnAudioPassThruID:
+      return true;
+    case OnLanguageChangeID:
+      return true;
+    case OnKeyboardInputID:
+      return true;
+    case OnTouchEventID:
+      return true;
+    case OnSystemRequestID:
+      return true;
+    case OnHashChangeID:
+      return true;
+    case OnInteriorVehicleDataID:
+      return true;
+    case OnWayPointChangeID:
+      return true;
+    case OnRCStatusID:
+      return true;
+    case EncodedSyncPDataID:
+      return true;
+    case SyncPDataID:
+      return true;
+    case OnEncodedSyncPDataID:
+      return true;
+    case OnSyncPDataID:
+      return true;
+    default:
+      return false;
+  }
+};
+
+const char* EnumToJsonString(FunctionID val) {
+  switch (val) {
+    case RESERVED:
+      return "RESERVE";
+    case RegisterAppInterfaceID:
+      return "RegisterAppInterface";
+    case UnregisterAppInterfaceID:
+      return "UnregisterAppInterface";
+    case SetGlobalPropertiesID:
+      return "SetGlobalProperties";
+    case ResetGlobalPropertiesID:
+      return "ResetGlobalProperties";
+    case AddCommandID:
+      return "AddCommand";
+    case DeleteCommandID:
+      return "DeleteCommand";
+    case AddSubMenuID:
+      return "AddSubMenu";
+    case DeleteSubMenuID:
+      return "DeleteSubMenu";
+    case CreateInteractionChoiceSetID:
+      return "CreateInteractionChoiceSet";
+    case PerformInteractionID:
+      return "PerformInteraction";
+    case DeleteInteractionChoiceSetID:
+      return "DeleteInteractionChoiceSet";
+    case AlertID:
+      return "Alert";
+    case ShowID:
+      return "Show";
+    case SpeakID:
+      return "Speak";
+    case SetMediaClockTimerID:
+      return "SetMediaClockTimer";
+    case PerformAudioPassThruID:
+      return "PerformAudioPassThru";
+    case EndAudioPassThruID:
+      return "EndAudioPassThru";
+    case SubscribeButtonID:
+      return "SubscribeButton";
+    case UnsubscribeButtonID:
+      return "UnsubscribeButton";
+    case SubscribeVehicleDataID:
+      return "SubscribeVehicleData";
+    case UnsubscribeVehicleDataID:
+      return "UnsubscribeVehicleData";
+    case GetVehicleDataID:
+      return "GetVehicleData";
+    case ReadDIDID:
+      return "ReadD";
+    case GetDTCsID:
+      return "GetDTCs";
+    case ScrollableMessageID:
+      return "ScrollableMessage";
+    case SliderID:
+      return "Slider";
+    case ShowConstantTBTID:
+      return "ShowConstantTBT";
+    case AlertManeuverID:
+      return "AlertManeuver";
+    case UpdateTurnListID:
+      return "UpdateTurnList";
+    case ChangeRegistrationID:
+      return "ChangeRegistration";
+    case GenericResponseID:
+      return "GenericResponse";
+    case PutFileID:
+      return "PutFile";
+    case DeleteFileID:
+      return "DeleteFile";
+    case ListFilesID:
+      return "ListFiles";
+    case SetAppIconID:
+      return "SetAppIcon";
+    case SetDisplayLayoutID:
+      return "SetDisplayLayout";
+    case DiagnosticMessageID:
+      return "DiagnosticMessage";
+    case SystemRequestID:
+      return "SystemRequest";
+    case SendLocationID:
+      return "SendLocation";
+    case DialNumberID:
+      return "DialNumber";
+    case ButtonPressID:
+      return "ButtonPress";
+    case GetInteriorVehicleDataID:
+      return "GetInteriorVehicleData";
+    case SetInteriorVehicleDataID:
+      return "SetInteriorVehicleData";
+    case GetWayPointsID:
+      return "GetWayPoints";
+    case SubscribeWayPointsID:
+      return "SubscribeWayPoints";
+    case UnsubscribeWayPointsID:
+      return "UnsubscribeWayPoints";
+    case GetSystemCapabilityID:
+      return "GetSystemCapability";
+    case SendHapticDataID:
+      return "SendHapticData";
+    case OnHMIStatusID:
+      return "OnHMIStatus";
+    case OnAppInterfaceUnregisteredID:
+      return "OnAppInterfaceUnregistered";
+    case OnButtonEventID:
+      return "OnButtonEvent";
+    case OnButtonPressID:
+      return "OnButtonPress";
+    case OnVehicleDataID:
+      return "OnVehicleData";
+    case OnCommandID:
+      return "OnCommand";
+    case OnTBTClientStateID:
+      return "OnTBTClientState";
+    case OnDriverDistractionID:
+      return "OnDriverDistraction";
+    case OnPermissionsChangeID:
+      return "OnPermissionsChange";
+    case OnAudioPassThruID:
+      return "OnAudioPassThru";
+    case OnLanguageChangeID:
+      return "OnLanguageChange";
+    case OnKeyboardInputID:
+      return "OnKeyboardInput";
+    case OnTouchEventID:
+      return "OnTouchEvent";
+    case OnSystemRequestID:
+      return "OnSystemRequest";
+    case OnHashChangeID:
+      return "OnHashChange";
+    case OnInteriorVehicleDataID:
+      return "OnInteriorVehicleData";
+    case OnWayPointChangeID:
+      return "OnWayPointChange";
+    case OnRCStatusID:
+      return "OnRCStatus";
+    case EncodedSyncPDataID:
+      return "EncodedSyncPData";
+    case SyncPDataID:
+      return "SyncPData";
+    case OnEncodedSyncPDataID:
+      return "OnEncodedSyncPData";
+    case OnSyncPDataID:
+      return "OnSyncPData";
+    default:
+      return "";
+  }
+};
+
+bool EnumFromJsonString(const std::string& literal, FunctionID* result) {
+  if ("RESERVE" == literal) {
+    *result = RESERVED;
+    return true;
+  }
+
+  if ("RegisterAppInterface" == literal) {
+    *result = RegisterAppInterfaceID;
+    return true;
+  }
+
+  if ("UnregisterAppInterface" == literal) {
+    *result = UnregisterAppInterfaceID;
+    return true;
+  }
+
+  if ("SetGlobalProperties" == literal) {
+    *result = SetGlobalPropertiesID;
+    return true;
+  }
+
+  if ("ResetGlobalProperties" == literal) {
+    *result = ResetGlobalPropertiesID;
+    return true;
+  }
+
+  if ("AddCommand" == literal) {
+    *result = AddCommandID;
+    return true;
+  }
+
+  if ("DeleteCommand" == literal) {
+    *result = DeleteCommandID;
+    return true;
+  }
+
+  if ("AddSubMenu" == literal) {
+    *result = AddSubMenuID;
+    return true;
+  }
+
+  if ("DeleteSubMenu" == literal) {
+    *result = DeleteSubMenuID;
+    return true;
+  }
+
+  if ("CreateInteractionChoiceSet" == literal) {
+    *result = CreateInteractionChoiceSetID;
+    return true;
+  }
+
+  if ("PerformInteraction" == literal) {
+    *result = PerformInteractionID;
+    return true;
+  }
+
+  if ("DeleteInteractionChoiceSet" == literal) {
+    *result = DeleteInteractionChoiceSetID;
+    return true;
+  }
+
+  if ("Alert" == literal) {
+    *result = AlertID;
+    return true;
+  }
+
+  if ("Show" == literal) {
+    *result = ShowID;
+    return true;
+  }
+
+  if ("Speak" == literal) {
+    *result = SpeakID;
+    return true;
+  }
+
+  if ("SetMediaClockTimer" == literal) {
+    *result = SetMediaClockTimerID;
+    return true;
+  }
+
+  if ("PerformAudioPassThru" == literal) {
+    *result = PerformAudioPassThruID;
+    return true;
+  }
+
+  if ("EndAudioPassThru" == literal) {
+    *result = EndAudioPassThruID;
+    return true;
+  }
+
+  if ("SubscribeButton" == literal) {
+    *result = SubscribeButtonID;
+    return true;
+  }
+
+  if ("UnsubscribeButton" == literal) {
+    *result = UnsubscribeButtonID;
+    return true;
+  }
+
+  if ("SubscribeVehicleData" == literal) {
+    *result = SubscribeVehicleDataID;
+    return true;
+  }
+
+  if ("UnsubscribeVehicleData" == literal) {
+    *result = UnsubscribeVehicleDataID;
+    return true;
+  }
+
+  if ("GetVehicleData" == literal) {
+    *result = GetVehicleDataID;
+    return true;
+  }
+
+  if ("ReadD" == literal) {
+    *result = ReadDIDID;
+    return true;
+  }
+
+  if ("GetDTCs" == literal) {
+    *result = GetDTCsID;
+    return true;
+  }
+
+  if ("ScrollableMessage" == literal) {
+    *result = ScrollableMessageID;
+    return true;
+  }
+
+  if ("Slider" == literal) {
+    *result = SliderID;
+    return true;
+  }
+
+  if ("ShowConstantTBT" == literal) {
+    *result = ShowConstantTBTID;
+    return true;
+  }
+
+  if ("AlertManeuver" == literal) {
+    *result = AlertManeuverID;
+    return true;
+  }
+
+  if ("UpdateTurnList" == literal) {
+    *result = UpdateTurnListID;
+    return true;
+  }
+
+  if ("ChangeRegistration" == literal) {
+    *result = ChangeRegistrationID;
+    return true;
+  }
+
+  if ("GenericResponse" == literal) {
+    *result = GenericResponseID;
+    return true;
+  }
+
+  if ("PutFile" == literal) {
+    *result = PutFileID;
+    return true;
+  }
+
+  if ("DeleteFile" == literal) {
+    *result = DeleteFileID;
+    return true;
+  }
+
+  if ("ListFiles" == literal) {
+    *result = ListFilesID;
+    return true;
+  }
+
+  if ("SetAppIcon" == literal) {
+    *result = SetAppIconID;
+    return true;
+  }
+
+  if ("SetDisplayLayout" == literal) {
+    *result = SetDisplayLayoutID;
+    return true;
+  }
+
+  if ("DiagnosticMessage" == literal) {
+    *result = DiagnosticMessageID;
+    return true;
+  }
+
+  if ("SystemRequest" == literal) {
+    *result = SystemRequestID;
+    return true;
+  }
+
+  if ("SendLocation" == literal) {
+    *result = SendLocationID;
+    return true;
+  }
+
+  if ("DialNumber" == literal) {
+    *result = DialNumberID;
+    return true;
+  }
+
+  if ("ButtonPress" == literal) {
+    *result = ButtonPressID;
+    return true;
+  }
+
+  if ("GetInteriorVehicleData" == literal) {
+    *result = GetInteriorVehicleDataID;
+    return true;
+  }
+
+  if ("SetInteriorVehicleData" == literal) {
+    *result = SetInteriorVehicleDataID;
+    return true;
+  }
+
+  if ("GetWayPoints" == literal) {
+    *result = GetWayPointsID;
+    return true;
+  }
+
+  if ("SubscribeWayPoints" == literal) {
+    *result = SubscribeWayPointsID;
+    return true;
+  }
+
+  if ("UnsubscribeWayPoints" == literal) {
+    *result = UnsubscribeWayPointsID;
+    return true;
+  }
+
+  if ("GetSystemCapability" == literal) {
+    *result = GetSystemCapabilityID;
+    return true;
+  }
+
+  if ("SendHapticData" == literal) {
+    *result = SendHapticDataID;
+    return true;
+  }
+
+  if ("OnHMIStatus" == literal) {
+    *result = OnHMIStatusID;
+    return true;
+  }
+
+  if ("OnAppInterfaceUnregistered" == literal) {
+    *result = OnAppInterfaceUnregisteredID;
+    return true;
+  }
+
+  if ("OnButtonEvent" == literal) {
+    *result = OnButtonEventID;
+    return true;
+  }
+
+  if ("OnButtonPress" == literal) {
+    *result = OnButtonPressID;
+    return true;
+  }
+
+  if ("OnVehicleData" == literal) {
+    *result = OnVehicleDataID;
+    return true;
+  }
+
+  if ("OnCommand" == literal) {
+    *result = OnCommandID;
+    return true;
+  }
+
+  if ("OnTBTClientState" == literal) {
+    *result = OnTBTClientStateID;
+    return true;
+  }
+
+  if ("OnDriverDistraction" == literal) {
+    *result = OnDriverDistractionID;
+    return true;
+  }
+
+  if ("OnPermissionsChange" == literal) {
+    *result = OnPermissionsChangeID;
+    return true;
+  }
+
+  if ("OnAudioPassThru" == literal) {
+    *result = OnAudioPassThruID;
+    return true;
+  }
+
+  if ("OnLanguageChange" == literal) {
+    *result = OnLanguageChangeID;
+    return true;
+  }
+
+  if ("OnKeyboardInput" == literal) {
+    *result = OnKeyboardInputID;
+    return true;
+  }
+
+  if ("OnTouchEvent" == literal) {
+    *result = OnTouchEventID;
+    return true;
+  }
+
+  if ("OnSystemRequest" == literal) {
+    *result = OnSystemRequestID;
+    return true;
+  }
+
+  if ("OnHashChange" == literal) {
+    *result = OnHashChangeID;
+    return true;
+  }
+
+  if ("OnInteriorVehicleData" == literal) {
+    *result = OnInteriorVehicleDataID;
+    return true;
+  }
+
+  if ("OnWayPointChange" == literal) {
+    *result = OnWayPointChangeID;
+    return true;
+  }
+
+  if ("OnRCStatus" == literal) {
+    *result = OnRCStatusID;
+    return true;
+  }
+
+  if ("EncodedSyncPData" == literal) {
+    *result = EncodedSyncPDataID;
+    return true;
+  }
+
+  if ("SyncPData" == literal) {
+    *result = SyncPDataID;
+    return true;
+  }
+
+  if ("OnEncodedSyncPData" == literal) {
+    *result = OnEncodedSyncPDataID;
+    return true;
+  }
+
+  if ("OnSyncPData" == literal) {
+    *result = OnSyncPDataID;
+    return true;
+  }
+  return false;
+};
+
 const std::string kDefaultApp = "default";
 const std::string kPreDataConsentApp = "pre_DataConsent";
 const std::string kDeviceApp = "device";