fix for invalid utf8 strings (included third party utf8 lib)

Author: MichaEiler

timers.cpp

@@ -8,17 +8,17 @@ void TimersResponder::reply(std::ostream& out, cxxtools::http::Request& request,
      showTimers(out, request, reply);
   } else if ( request.method() == "DELETE" ) {
      deleteTimer(out, request, reply);
-  } else if ( request.method() == "POST" ) {
+  } else if ( request.method() == "POST" || request.method() == "PUT" ) {
      createTimer(out, request, reply);
   } else {
-    reply.httpReturn(501, "Only GET, DELETE and POST methods are supported.");
+    reply.httpReturn(501, "Only GET, DELETE, POST and PUT methods are supported.");
   }
 }
 
 void TimersResponder::createTimer(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)
 {
-  esyslog("restulfapi: /%s/", request.bodyStr().c_str());
-
+  esyslog("restfulapi: /%s/", (const char*)request.bodyStr().c_str());
+/*
   cxxtools::QueryParams q;
   if ( request.method() != "POST" &&  request.method() != "PUT" ) {
     reply.httpReturn(501, "ONly POST and PUT methods are supported.");
@@ -88,7 +88,7 @@ void TimersResponder::createTimer(std::ostream& out, cxxtools::http::Request& re
            esyslog("restfulapi: successfully added timer");
         }
      }
-  }
+  }*/
 }
 
 void TimersResponder::deleteTimer(std::ostream& out, cxxtools::http::Request& request, cxxtools::http::Reply& reply)

tools.cpp

@@ -9,7 +9,9 @@ std::string UTF8Encode(cxxtools::String str)
 cxxtools::String UTF8Decode(std::string str)
 {
   static cxxtools::Utf8Codec utf8;
-  return utf8.decode(str);
+  std::string temp;
+  utf8::replace_invalid(str.begin(), str.end(), back_inserter(temp));
+  return utf8.decode(temp);
 }
 
 void write(std::ostream* out, std::string str)
@@ -45,18 +47,14 @@ std::string encodeToXml( const std::string &sSrc )
              case '\'': sRet << "&apos;"; break;
 
              default:
-              /*if ( c<32 || c>127 )
-              {
-                   sRet << "&#" << (unsigned int)c << ";";
-              }
-              else
-              {*/
                    sRet << c;
-              //}
          }
     }
 
-    return sRet.str();
+    std::string res = sRet.str();
+    std::string converted;
+    utf8::replace_invalid(res.begin(), res.end(), back_inserter(converted));
+    return converted;
 }
 
 std::string getRestParams(std::string service, std::string url)

tools.h

@@ -5,6 +5,7 @@
 #include <vector>
 #include <cxxtools/string.h>
 #include <cxxtools/utf8codec.h>
+#include "utf8_checked.h"
 
 // General Helper Methods
 cxxtools::String UTF8Decode(std::string str);