Config Update and PIN POST Method

sunshine/confighttp.cpp

@@ -170,10 +170,12 @@ void saveApp(resp_https_t response, req_https_t request) {
     pt::read_json(SUNSHINE_ASSETS_DIR "/" APPS_JSON, fileTree);
     auto &apps_node = fileTree.get_child("apps"s);
     int index       = inputTree.get<int>("index");
-    BOOST_LOG(info) << inputTree.get_child("prep-cmd").empty();
     if(inputTree.get_child("prep-cmd").empty())
       inputTree.erase("prep-cmd");
     
+    if(inputTree.get_child("detached").empty())
+      inputTree.erase("detached");
+    
     inputTree.erase("index");
     if(index == -1) {
       apps_node.push_back(std::make_pair("", inputTree));
@@ -372,6 +374,34 @@ void savePassword(resp_https_t response, req_https_t request) {
   }
 }
 
+void savePin(resp_https_t response, req_https_t request){
+  if(!authenticate(response, request)) return;
+  
+  std::stringstream ss;
+  ss << request->content.rdbuf();
+  
+  pt::ptree inputTree,outputTree;
+  
+  auto g = util::fail_guard([&]() {
+    std::ostringstream data;
+    pt::write_json(data, outputTree);
+    response->write(data.str());
+  });
+  
+  try {
+    //TODO: Input Validation
+    pt::read_json(ss, inputTree);
+    std::string pin = inputTree.get<std::string>("pin");
+    outputTree.put("status",nvhttp::pin(pin));
+  }
+  catch(std::exception &e) {
+    BOOST_LOG(warning) << e.what();
+    outputTree.put("status", false);
+    outputTree.put("error", e.what());
+    return;
+  }
+}
+
 void start(std::shared_ptr<safe::signal_t> shutdown_event) {
   auto ctx = std::make_shared<boost::asio::ssl::context>(boost::asio::ssl::context::tls);
   ctx->use_certificate_chain_file(config::nvhttp.cert);
@@ -384,7 +414,7 @@ void start(std::shared_ptr<safe::signal_t> shutdown_event) {
   server.resource["^/clients$"]["GET"]              = getClientsPage;
   server.resource["^/config$"]["GET"]               = getConfigPage;
   server.resource["^/password$"]["GET"]             = getPasswordPage;
-  server.resource["^/pin/([0-9]+)$"]["GET"]         = nvhttp::pin<SimpleWeb::HTTPS>;
+  server.resource["^/api/pin"]["POST"]              = savePin;
   server.resource["^/api/apps$"]["GET"]             = getApps;
   server.resource["^/api/apps$"]["POST"]            = saveApp;
   server.resource["^/api/config$"]["GET"]           = getConfig;

sunshine/nvhttp.cpp

@@ -420,6 +420,36 @@ void pair(std::shared_ptr<safe::queue_t<crypto::x509_t>> &add_cert, std::shared_
   response->write(data.str());
 }
 
+bool pin(std::string pin){
+  pt::ptree tree;
+  if(map_id_sess.empty()) {
+    return false;
+  }
+
+  auto &sess = std::begin(map_id_sess)->second;
+  getservercert(sess, tree, pin);
+
+  // response to the request for pin
+  std::ostringstream data;
+  pt::write_xml(data, tree);
+
+  auto &async_response = sess.async_insert_pin.response;
+  if(async_response.has_left() && async_response.left()) {
+    async_response.left()->write(data.str());
+  }
+  else if(async_response.has_right() && async_response.right()) {
+    async_response.right()->write(data.str());
+  }
+  else {
+    return false;
+  }
+
+  // reset async_response
+  async_response = std::decay_t<decltype(async_response.left())>();
+  // response to the current request
+  return true;
+}
+
 template<class T>
 void pin(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response, std::shared_ptr<typename SimpleWeb::ServerBase<T>::Request> request) {
   print_req<T>(request);
@@ -434,38 +464,12 @@ void pin(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response,
     return;
   }
 
-  pt::ptree tree;
-
-  if(map_id_sess.empty()) {
+  bool pinResponse = pin(request->path_match[1]);
+  if(pinResponse){
+    response->write(SimpleWeb::StatusCode::success_ok);
+  } else {
     response->write(SimpleWeb::StatusCode::client_error_im_a_teapot);
-
-    return;
   }
-
-  auto &sess = std::begin(map_id_sess)->second;
-  getservercert(sess, tree, request->path_match[1]);
-
-  // response to the request for pin
-  std::ostringstream data;
-  pt::write_xml(data, tree);
-
-  auto &async_response = sess.async_insert_pin.response;
-  if(async_response.has_left() && async_response.left()) {
-    async_response.left()->write(data.str());
-  }
-  else if(async_response.has_right() && async_response.right()) {
-    async_response.right()->write(data.str());
-  }
-  else {
-    response->write(SimpleWeb::StatusCode::client_error_im_a_teapot);
-
-    return;
-  }
-
-  // reset async_response
-  async_response = std::decay_t<decltype(async_response.left())>();
-  // response to the current request
-  response->write(SimpleWeb::StatusCode::success_ok);
 }
 
 template<class T>

sunshine/nvhttp.h

@@ -17,8 +17,7 @@
 
 namespace nvhttp {
 void start(std::shared_ptr<safe::signal_t> shutdown_event);
-template<class T>
-void pin(std::shared_ptr<typename SimpleWeb::ServerBase<T>::Response> response, std::shared_ptr<typename SimpleWeb::ServerBase<T>::Request> request);
+bool pin(std::string pin);
 } // namespace nvhttp
 
 #endif //SUNSHINE_NVHTTP_H