Merge pull request #242 from boschresearch/feature/remove-json-signing

Remove JSON signing feature
eclipse · Nov 22, 2021 · 38edbfe · 38edbfe
2 parents 5547726 + c05dff0
commit 38edbfe
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 372 deletions.
diff --git a/README.md b/README.md
@@ -16,7 +16,6 @@ See [Supported Protocol](doc/protocol/README.md) for a detailled overview.
  - Websocket interface, TLS-secured or plain
  - [Experimental REST interface](doc/rest-api.md), TLS-secured or plain
  - [Fine-grained authorisation](doc/jwt.md) based on JSON Webtokens (RFC 7519)
- - Optional [JSON signing](doc/json-signing.md) of messages
  - Built-in MQTT publisher
  - [Python viss client](./kuksa_viss_client) to interactively explore and modify the VISS data points and data structure
  - Multiple [example apps](./kuksa_apps) in different programming languages to communicate with different frameworks 

diff --git a/doc/json-signing.md b/doc/json-signing.md
diff --git a/include/SigningHandler.hpp b/include/SigningHandler.hpp
diff --git a/include/VssCommandProcessor.hpp b/include/VssCommandProcessor.hpp
@@ -38,9 +38,6 @@ class VssCommandProcessor : public IVssCommandProcessor {
   std::shared_ptr<IAuthenticator> tokenValidator;
   std::shared_ptr<IAccessChecker> accessValidator_;
   VSSRequestValidator *requestValidator;
-#ifdef JSON_SIGNING_ON
-  std::shared_ptr<SigningHandler> signer;
-#endif
 
   std::string processUpdateMetaData(kuksa::kuksaChannel& channel, jsoncons::json& request);
   std::string processAuthorizeWithPermManager(kuksa::kuksaChannel &channel, const std::string & request_id,

diff --git a/include/interface/ISigningHandler.hpp b/include/interface/ISigningHandler.hpp
diff --git a/include/visconf.hpp b/include/visconf.hpp
@@ -20,6 +20,5 @@
 #define MAX_SIGNALS 2000
 #define MAX_TREENODES 1024
 #define MAX_PARENT_BRANCHES 10
-//#define JSON_SIGNING_ON
 
 #endif
diff --git a/src/SigningHandler.cpp b/src/SigningHandler.cpp
diff --git a/src/VssCommandProcessor.cpp b/src/VssCommandProcessor.cpp
@@ -33,9 +33,6 @@
 #include "ISubscriptionHandler.hpp"
 #include <boost/algorithm/string.hpp>
 
-#ifdef JSON_SIGNING_ON
-#include "SigningHandler.hpp"
-#endif
 
 using namespace std;
 
@@ -51,18 +48,11 @@ VssCommandProcessor::VssCommandProcessor(
   subHandler = subhandler;
   accessValidator_ = accC;
   requestValidator = new VSSRequestValidator(logger);
-#ifdef JSON_SIGNING_ON
-  // TODO: add signer as dependency
-  signer = std::make_shared<SigningHandler>();
-#endif
 }
 
 VssCommandProcessor::~VssCommandProcessor() {
   accessValidator_.reset();
   delete requestValidator;
-#ifdef JSON_SIGNING_ON
-  signer.reset();
-#endif
 }
 
 
@@ -339,27 +329,15 @@ string VssCommandProcessor::processQuery(const string &req_json,
 
     if (action == "get") {
         response = processGet2(channel, root);
-#ifdef JSON_SIGNING_ON
-        response = signer->sign(response);
-#endif  
     }
     else if (action == "set") {
         response = processSet2(channel, root);
-#ifdef JSON_SIGNING_ON
-        response = signer->sign(response);
-#endif
     }
     else if (action == "getMetaData") {
         response = processGetMetaData(root);
-#ifdef JSON_SIGNING_ON
-        response = signer->sign(response);
-#endif
     }
     else if (action == "updateMetaData") {
         response = processUpdateMetaData(channel, root);
-#ifdef JSON_SIGNING_ON
-        response = signer->sign(response);
-#endif
     }
     else if (action == "authorize") {
       string token = root["tokens"].as<string>();