Auto decode parameters by default

Author: HerikLyma

CPPWebFramework/cwf/httpparser.h

@@ -12,6 +12,7 @@
 #include <QVector>
 #include <QByteArray>
 #include <QNetworkCookie>
+#include "urlencoder.h"
 #include "cppwebframework_global.h"
 
 CWF_BEGIN_NAMESPACE
@@ -91,7 +92,10 @@ class CPPWEBFRAMEWORKSHARED_EXPORT HttpParser
      * @param const QByteArray &name : Parameter name.
      * @return QByteArray : Parameter value.
      */
-    inline QByteArray getParameter(const QByteArray &name) const noexcept { return parameters.value(name); }
+    inline QByteArray getParameter(const QByteArray &name, bool urlDecode = true, bool replacePlusForSpace = true) const noexcept
+    {
+        return urlDecode ? URLEncoder::paramDecode(parameters.value(name), replacePlusForSpace).toUtf8() : parameters.value(name);
+    }
     /**
      * @brief Returns all parameters with a specific name.
      * @param const QByteArray &name : Parameter name.

CPPWebFramework/cwf/request.cpp

@@ -27,12 +27,12 @@ Request::~Request() noexcept
     delete requestDispatcher;
 }
 
-void Request::fillQObject(QObject *object)
+void Request::fillQObject(QObject *object, bool urlDecode, bool replacePlusForSpace)
 {
-    fillQObject(object, httpParser->getParameters());
+    fillQObject(object, httpParser->getParameters(), urlDecode, replacePlusForSpace);
 }
 
-void Request::fillQObject(QObject *object, const QMap<QByteArray, QByteArray> &parameters)
+void Request::fillQObject(QObject *object, const QMap<QByteArray, QByteArray> &parameters, bool urlDecode, bool replacePlusForSpace)
 {
     MetaClassParser meta(object);
 
@@ -50,10 +50,12 @@ void Request::fillQObject(QObject *object, const QMap<QByteArray, QByteArray> &p
 
             if(parameterType == CSTL::SUPPORTED_TYPES::QSTRING)
             {
+                value = URLEncoder::paramDecode(value.toLatin1(), replacePlusForSpace);
                 QMetaObject::invokeMethod(object, method.toStdString().data(), Q_ARG(QString, value));
             }
             else if(parameterType == CSTL::SUPPORTED_TYPES::STD_STRING)
             {
+                value = URLEncoder::paramDecode(value.toLatin1(), replacePlusForSpace);
                 QMetaObject::invokeMethod(object, method.toStdString().data(), Q_ARG(std::string, value.toStdString()));
             }
             else if(parameterType == CSTL::SUPPORTED_TYPES::BOOL)

CPPWebFramework/cwf/request.h

@@ -14,12 +14,14 @@
 #include <QJsonObject>
 #include <QJsonDocument>
 #include "httpparser.h"
+#include "urlencoder.h"
 #include "session.h"
 #include "filemanager.h"
 #include "configuration.h"
 #include "requestdispatcher.h"
 #include "cppwebframework_global.h"
 
+
 CWF_BEGIN_NAMESPACE
 /**
  * @brief The Request class holds all information about a http request.
@@ -133,7 +135,10 @@ class CPPWEBFRAMEWORKSHARED_EXPORT Request
      * @param decode : If true, decode the parameter.
      * @return QByteArray
      */
-    QByteArray getParameter(const QByteArray &name) const noexcept { return httpParser->getParameter(name); }
+    QByteArray getParameter(const QByteArray &name, bool urlDecode = true, bool replacePlusForSpace = true) const noexcept
+    {
+        return httpParser->getParameter(name, urlDecode, replacePlusForSpace);
+    }
     /**
      * @brief This method returns the parameters from a request given an specific name.
      * @param name : This is a reference to a QByteArray.     
@@ -330,9 +335,11 @@ class CPPWEBFRAMEWORKSHARED_EXPORT Request
      * }
      * @endcode
      */
-    void fillQObject(QObject *object);
+    void fillQObject(QObject *object, bool urlDecode = true, bool replacePlusForSpace = true);
 
-    void fillQObject(QObject *object, const QMap<QByteArray, QByteArray> &parameters);
+    void fillQObject(QObject *object,
+                     const QMap<QByteArray, QByteArray> &parameters,
+                     bool urlDecode = true, bool replacePlusForSpace = true);
 };
 
 CWF_END_NAMESPACE

CPPWebFramework/cwf/urlencoder.cpp

@@ -9,11 +9,14 @@
 
 CWF_BEGIN_NAMESPACE
 
-QString URLEncoder::decode(const QByteArray &url)
+QString URLEncoder::decode(QByteArray url, bool replacePlusForSpace)
 {
+    if(replacePlusForSpace)
+        url = url.replace("+", " ");
     QUrl copy(url);
     copy.setQuery(copy.query(QUrl::FullyDecoded), QUrl::DecodedMode);
 
+
     return copy.toString();
 }
 
@@ -29,8 +32,10 @@ QString URLEncoder::paramEncode(const QByteArray &param)
     return url.toEncoded().remove(0, 3);
 }
 
-QString URLEncoder::paramDecode(const QByteArray &param)
+QString URLEncoder::paramDecode(QByteArray param, bool replacePlusForSpace)
 {
+    if(replacePlusForSpace)
+        param = param.replace("+", " ");
     QUrl url("?p=" + param);
     url.setQuery(url.query(QUrl::FullyDecoded), QUrl::DecodedMode);
 

CPPWebFramework/cwf/urlencoder.h

@@ -24,7 +24,7 @@ class CPPWEBFRAMEWORKSHARED_EXPORT URLEncoder
      * @param url
      * @return
      */
-    static QString decode(const QByteArray &url);
+    static QString decode(QByteArray url, bool replacePlusForSpace = true);
     /**
      * @brief encode
      * @param url
@@ -42,7 +42,7 @@ class CPPWEBFRAMEWORKSHARED_EXPORT URLEncoder
      * @param param
      * @return
      */
-    static QString paramDecode(const QByteArray &param);
+    static QString paramDecode(QByteArray param, bool replacePlusForSpace = true);
 };
 
 CWF_END_NAMESPACE