Fix NUL-byte truncation bug in Tf::strcmp

Author: treefrogframework

src/tactioncontroller.cpp

@@ -269,7 +269,7 @@ bool TActionController::verifyRequest(const THttpRequest &request) const
     }
 
     tSystemDebug("postAuthToken: {}", (const char*)postAuthToken.data());
-    bool res = Tf::strcmp(postAuthToken, authenticityToken());
+    bool res = (postAuthToken == authenticityToken());
     if (res) {
         tSystemDebug("Verified authenticity token : {}", request.header().path().data());
     }

src/test/cmp/cmp.cpp

@@ -49,8 +49,6 @@ private slots:
     void benchStrcmp2();
     void benchComparison1();
     void benchComparison2();
-    void benchTfcmp1();
-    void benchTfcmp2();
     void benchQStringCmp1();
     void benchQStringCmp2();
 };
@@ -128,26 +126,6 @@ void TestCmp::benchComparison2()
     Q_UNUSED(b);
 }
 
-void TestCmp::benchTfcmp1()
-{
-    bool b = false;
-    QBENCHMARK {
-        b |= Tf::strcmp(str1, str2);
-        b |= Tf::strcmp(str2, str1);
-    }
-    Q_UNUSED(b);
-}
-
-void TestCmp::benchTfcmp2()
-{
-    bool b = false;
-    QBENCHMARK {
-        b |= Tf::strcmp(str1, str3);
-        b |= Tf::strcmp(str3, str1);
-    }
-    Q_UNUSED(b);
-}
-
 void TestCmp::benchQStringCmp1()
 {
     bool b = false;

src/tglobal.h

@@ -334,19 +334,13 @@ inline const TAbstractController *constCurrentController() { return currentContr
 T_CORE_EXPORT TDatabaseContext *currentDatabaseContext();
 T_CORE_EXPORT TSqlDatabase &currentSqlDatabase(int id) noexcept;
 T_CORE_EXPORT QMap<QByteArray, std::function<QObject *()>> *objectFactories() noexcept;
-//T_CORE_EXPORT std::map<QByteArray, std::function<QObject *()>> *objectFactories() noexcept;
 
 // LZ4 lossless compression algorithm
 T_CORE_EXPORT QByteArray lz4Compress(const char *data, int nbytes, int compressionLevel = 1) noexcept;
 T_CORE_EXPORT QByteArray lz4Compress(const QByteArray &data, int compressionLevel = 1) noexcept;
 T_CORE_EXPORT QByteArray lz4Uncompress(const char *data, int nbytes) noexcept;
 T_CORE_EXPORT QByteArray lz4Uncompress(const QByteArray &data) noexcept;
 
-inline bool strcmp(const QByteArray &str1, const QByteArray &str2)
-{
-    return str1.length() == str2.length() && !std::strncmp(str1.data(), str2.data(), str1.length());
-}
-
 // Scope-Exit Function Class
 template<typename Func>
 class ScopeExitFunction {

src/tsessioncookiestore.cpp

@@ -80,7 +80,7 @@ TSession TSessionCookieStore::find(const QByteArray &id)
             QByteArray ba = QByteArray::fromBase64(data);
             QByteArray digest = QMessageAuthenticationCode::hash(ba, sessionSecret(), QCryptographicHash::Sha3_256);
 
-            if (!Tf::strcmp(digest, QByteArray::fromBase64(dgstr))) {
+            if (digest != QByteArray::fromBase64(dgstr)) {
                 tSystemWarn("Recieved a tampered cookie or that of other web application.");
                 //throw SecurityException("Tampered with cookie", __FILE__, __LINE__);
                 return session;

src/tsqlobject.cpp

@@ -133,9 +133,9 @@ bool TSqlObject::create()
         const char *propName = metaObject()->property(i).name();
         QByteArray prop = QByteArray(propName).toLower();
 
-        if (Tf::strcmp(prop, CreatedAt) || Tf::strcmp(prop, UpdatedAt) || Tf::strcmp(prop, ModifiedAt)) {
+        if (prop == CreatedAt || prop == UpdatedAt || prop == ModifiedAt) {
             setProperty(propName, QDateTime::currentDateTime());
-        } else if (Tf::strcmp(prop, LockRevision)) {
+        } else if (prop == LockRevision) {
             // Sets the default value of 'revision' property
             setProperty(propName, 1);  // 1 : default value
         } else {
@@ -233,11 +233,11 @@ bool TSqlObject::update()
         const char *propName = metaObject()->property(i).name();
         QByteArray prop = QByteArray(propName).toLower();
 
-        if (!updflag && (Tf::strcmp(prop, UpdatedAt) || Tf::strcmp(prop, ModifiedAt))) {
+        if (!updflag && (prop == UpdatedAt || prop == ModifiedAt)) {
             setProperty(propName, QDateTime::currentDateTime());
             updflag = true;
 
-        } else if (revIndex < 0 && Tf::strcmp(prop, LockRevision)) {
+        } else if (revIndex < 0 && prop == LockRevision) {
             bool ok;
             int oldRevision = property(propName).toInt(&ok);
 
@@ -337,9 +337,9 @@ bool TSqlObject::save()
         const char *propName = metaObject()->property(i).name();
         QByteArray prop = QByteArray(propName).toLower();
 
-        if (Tf::strcmp(prop, CreatedAt) || Tf::strcmp(prop, UpdatedAt) || Tf::strcmp(prop, ModifiedAt)) {
+        if (prop == CreatedAt || prop == UpdatedAt || prop == ModifiedAt) {
             setProperty(propName, QDateTime::currentDateTime());
-        } else if (Tf::strcmp(prop, LockRevision)) {
+        } else if (prop == LockRevision) {
             // Sets the default value of 'revision' property
             setProperty(propName, 1);  // 1 : default value
             lockrev = LockRevision;
@@ -418,7 +418,7 @@ bool TSqlObject::remove()
         const char *propName = metaObject()->property(i).name();
         QByteArray prop = QByteArray(propName).toLower();
 
-        if (Tf::strcmp(prop, LockRevision)) {
+        if (prop == LockRevision) {
             bool ok;
             int revision = property(propName).toInt(&ok);
 

src/tsqlormapper.h

@@ -583,7 +583,7 @@ int TSqlORMapper<T>::updateAll(const TCriteria &cri, const QMap<int, QVariant> &
     for (int i = obj.metaObject()->propertyOffset(); i < obj.metaObject()->propertyCount(); ++i) {
         const char *propName = obj.metaObject()->property(i).name();
         QByteArray prop = QByteArray(propName).toLower();
-        if (Tf::strcmp(prop, UpdatedAt) || Tf::strcmp(prop, ModifiedAt)) {
+        if (prop == UpdatedAt || prop == ModifiedAt) {
             upd += TSqlQuery::escapeIdentifier(QLatin1String(propName), QSqlDriver::FieldName, db.driver());
             upd += QLatin1Char('=');
             upd += TSqlQuery::formatValue(QDateTime::currentDateTime(), datetimeMetaType, db);