diff options
author | Alex Kutsan <akutsan@luxoft.com> | 2017-01-18 09:43:01 +0200 |
---|---|---|
committer | Alex Kutsan <akutsan@luxoft.com> | 2017-01-18 09:43:01 +0200 |
commit | 44263b5e41770bd1f7d156dff71112e02fe68c18 (patch) | |
tree | 94df1f4c0264d9b69dc002661290f37d9c5accca /src/components/application_manager/include/application_manager/commands | |
parent | 0d9c2776edbb0b50bbf878c563cb80df398986ed (diff) | |
parent | e325c8bc87099c5743ac54e22ac0c649991b6b45 (diff) | |
download | sdl_core-44263b5e41770bd1f7d156dff71112e02fe68c18.tar.gz |
Change policies path and fix params method usage
Diffstat (limited to 'src/components/application_manager/include/application_manager/commands')
5 files changed, 148 insertions, 15 deletions
diff --git a/src/components/application_manager/include/application_manager/commands/command_impl.h b/src/components/application_manager/include/application_manager/commands/command_impl.h index 439b1756ef..66456dfdb1 100644 --- a/src/components/application_manager/include/application_manager/commands/command_impl.h +++ b/src/components/application_manager/include/application_manager/commands/command_impl.h @@ -46,9 +46,9 @@ namespace application_manager { * table */ struct CommandParametersPermissions { - std::vector<std::string> allowed_params; - std::vector<std::string> disallowed_params; - std::vector<std::string> undefined_params; + RPCParams allowed_params; + RPCParams disallowed_params; + RPCParams undefined_params; }; namespace commands { diff --git a/src/components/application_manager/include/application_manager/commands/hmi/decrypt_certificate_request.h b/src/components/application_manager/include/application_manager/commands/hmi/decrypt_certificate_request.h new file mode 100644 index 0000000000..8688698883 --- /dev/null +++ b/src/components/application_manager/include/application_manager/commands/hmi/decrypt_certificate_request.h @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2016, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ + +#include "application_manager/commands/hmi/request_to_hmi.h" + +namespace application_manager { + +namespace commands { + +/** + * @brief DecryptCertificateRequest command class + **/ +class DecryptCertificateRequest : public RequestToHMI { + public: + /** + * @brief DecryptCertificateRequest class constructor + * + * @param message Incoming SmartObject message + **/ + DecryptCertificateRequest(const MessageSharedPtr& message, + ApplicationManager& application_manager); + + /** + * @brief Execute command + **/ + void Run() OVERRIDE; + + private: + DISALLOW_COPY_AND_ASSIGN(DecryptCertificateRequest); +}; + +} // namespace commands + +} // namespace application_manager + +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_REQUEST_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/decrypt_certificate_response.h b/src/components/application_manager/include/application_manager/commands/hmi/decrypt_certificate_response.h new file mode 100644 index 0000000000..45c2258489 --- /dev/null +++ b/src/components/application_manager/include/application_manager/commands/hmi/decrypt_certificate_response.h @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2016, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ +#define SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ + +#include "application_manager/commands/hmi/response_from_hmi.h" + +namespace application_manager { + +namespace commands { + +/** + * @brief DecryptCertificateResponse command class + **/ +class DecryptCertificateResponse : public ResponseFromHMI { + public: + /** + * @brief DecryptCertificateResponse class constructor + * + * @param message Incoming SmartObject message + **/ + DecryptCertificateResponse(const MessageSharedPtr& message, + ApplicationManager& application_manager); + + /** + * @brief DecryptCertificateResponse class destructor + **/ + virtual ~DecryptCertificateResponse(); + + /** + * @brief Execute command + **/ + virtual void Run(); + + private: + DISALLOW_COPY_AND_ASSIGN(DecryptCertificateResponse); +}; + +} // namespace commands + +} // namespace application_manager + +#endif // SRC_COMPONENTS_APPLICATION_MANAGER_INCLUDE_APPLICATION_MANAGER_COMMANDS_HMI_DECRYPT_CERTIFICATE_RESPONSE_H_ diff --git a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h index 41160f2ae7..53c15d3a1e 100644 --- a/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h +++ b/src/components/application_manager/include/application_manager/commands/hmi/get_urls.h @@ -63,13 +63,13 @@ class GetUrls : public RequestFromHMI { void Run() OVERRIDE; private: -#ifdef EXTENDED_POLICY +#if defined(PROPRIETARY_MODE) || defined(EXTERNAL_PROPRIETARY_MODE) /** * @brief Processes URLs collecting for policy service * @param endpoints Endpoints section of policy table */ void ProcessPolicyServiceURLs(const policy::EndpointUrls& endpoints); -#endif +#endif // PROPRIETARY_MODE || EXTERNAL_PROPRIETARY_MODE /** * @brief Process URLs collecting for service @@ -83,14 +83,6 @@ class GetUrls : public RequestFromHMI { */ void SendResponseToHMI(hmi_apis::Common_Result::eType result); - /** - * @brief fills structure for sending to HMI with default urls - * @param urls structure for filling - * @param endpoints Endpoints section of policy table - */ - void FillSODefaultUrls(smart_objects::SmartObject& urls, - const policy::EndpointUrls& endpoints); - DISALLOW_COPY_AND_ASSIGN(GetUrls); }; diff --git a/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h b/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h index 143b076033..2d2da06a1c 100644 --- a/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h +++ b/src/components/application_manager/include/application_manager/commands/mobile/on_system_request_notification.h @@ -67,14 +67,14 @@ class OnSystemRequestNotification : public CommandNotificationImpl { void Run() OVERRIDE; private: -#ifdef EXTENDED_POLICY +#ifdef PROPRIETARY_MODE /** * @brief Adds HTTP header to message * @param message Message */ void AddHeader(BinaryMessage& message) const; size_t ParsePTString(std::string& pt_string) const; -#endif +#endif // PROPRIETARY_MODE DISALLOW_COPY_AND_ASSIGN(OnSystemRequestNotification); }; |