Merge pull request #416 from treefrogframework/vitevue

Vite vue.js module

Author: treefrogframework

.github/workflows/actions.yml

@@ -364,7 +364,7 @@ jobs:
         vs-version: '[17,18)'  # 17.xx
         msbuild-architecture: x64
     - name: Install Qt
-      uses: jurplel/install-qt-action@v4
+      uses: jurplel/install-qt-action@v4.1.1
       with:
         version:      6.8.0
         host:         windows
@@ -414,7 +414,7 @@ jobs:
     steps:
     - uses: actions/checkout@main
     - name: Install Qt
-      uses: jurplel/install-qt-action@v4
+      uses: jurplel/install-qt-action@v4.1.1
       with:
         version:      6.8.0
         host:         windows
@@ -466,7 +466,7 @@ jobs:
     steps:
     - uses: actions/checkout@main
     - name: Install Qt
-      uses: jurplel/install-qt-action@v4
+      uses: jurplel/install-qt-action@v4.1.1
       with:
         version:      6.5.2
         host:         windows

configure.bat

@@ -1,7 +1,7 @@
 @echo off
 @setlocal
 
-set VERSION=2.10.1
+set VERSION=2.11.0
 set TFDIR=C:\TreeFrog\%VERSION%
 set MONBOC_VERSION=1.26.2
 set LZ4_VERSION=1.9.4

defaults/development.ini

@@ -7,8 +7,8 @@
 ## Template system section
 ##
 
-# Specify the template system of view, ERB or Otama.
-TemplateSystem=ERB
+# Template system of view.
+TemplateSystem=$TemplateSystem$
 
 
 ##

installer/create_installer.bat

@@ -7,7 +7,7 @@
 :: 10行目、28行目、39行目を編集
 
 
-set VERSION=2.10.1
+set VERSION=2.11.0
 set QTBASE=C:\Qt
 set TFDIR=C:\TreeFrog\%VERSION%
 

installer/treefrog-setup/treefrog-setup/AssemblyInfo.cpp

@@ -31,7 +31,7 @@ using namespace System::Security::Permissions;
 // すべての値を指定するか、下のように '*' を使ってリビジョンおよびビルド番号を
 // 既定値にすることができます:
 
-[assembly:AssemblyVersionAttribute("2.10.1")];
+[assembly:AssemblyVersionAttribute("2.11.0")];
 
 [assembly:ComVisible(false)];
 

src/corelib.pro

@@ -412,6 +412,7 @@ linux-* {
   SOURCES += tthreadapplicationserver_linux.cpp
   SOURCES += tredisdriver_linux.cpp
   SOURCES += tmemcacheddriver_linux.cpp
+  SOURCES += tsharedmemory_linux.cpp
 }
 
 # For Mac
@@ -420,6 +421,7 @@ macx {
   SOURCES += tthreadapplicationserver_qt.cpp
   SOURCES += tredisdriver_qt.cpp
   SOURCES += tmemcacheddriver_qt.cpp
+  SOURCES += tsharedmemory_macx.cpp
 }
 
 # For UNIX

src/tabstractcontroller.h

@@ -23,6 +23,10 @@ class T_CORE_EXPORT TAbstractController : public QObject {
     virtual const TSession &session() const;
     virtual QString getRenderingData(const QString &templateName, const QVariantMap &vars = QVariantMap());
     virtual QByteArray authenticityToken() const { return QByteArray(); }
+    virtual QVariantMap flashVariants() const { return QVariantMap(); }
+    virtual QVariant flashVariant(const QString &) const { return QVariant(); }
+    virtual QJsonObject flashVariantsJson() const { return QJsonObject(); }
+    virtual QJsonObject flashVariantJson(const QString &) const { return QJsonObject(); }
     virtual void setFlash(const QString &name, const QVariant &value);
     void exportVariant(const QString &name, const QVariant &value, bool overwrite = true);
     virtual bool isUserLoggedIn() const;

src/tactioncontext.cpp

@@ -155,10 +155,8 @@ void TActionContext::execute(THttpRequest &request)
                     tSystemDebug("Re-generate session ID: {}", (const char*)_currController->session().sessionId.data());
                 }
 
-                if (EnableCsrfProtectionModuleFlag && _currController->csrfProtectionEnabled()) {
-                    // Sets CSRF protection information
-                    TActionController::setCsrfProtectionInto(_currController->session());
-                }
+                // Sets CSRF protection information
+                TActionController::setCsrfProtectionInto(_currController->session());
             }
 
             // Database Transaction

src/tactioncontroller.cpp

@@ -31,7 +31,8 @@
 #include <TWebApplication>
 #include <QStringEncoder>
 
-const QString FLASH_VARS_SESSION_KEY("_flashVariants");
+const QString QUEUED_FLASH_SESSION_KEY("_flashVariants");
+const QString FLASH_VARS_SESSION_KEY("_activeFlash");
 const QString LOGIN_USER_NAME_KEY("_loginUserName");
 const QByteArray DEFAULT_CONTENT_TYPE("text/html");
 
@@ -207,7 +208,11 @@ void TActionController::setCsrfProtectionInto(TSession &session)
 {
     if (TSessionManager::instance().storeType() == QLatin1String("cookie")) {
         QString key = TSessionManager::instance().csrfProtectionKey();
-        session.insert(key, TSessionManager::instance().generateId());  // it's just a random value
+        QByteArray val = session.value(key).toByteArray();
+
+        if (val.isEmpty()) {
+            session.insert(key, TSessionManager::instance().generateId());  // it's just a random value
+        }
     }
 }
 
@@ -248,6 +253,7 @@ QString TActionController::loginUserNameKey()
 bool TActionController::verifyRequest(const THttpRequest &request) const
 {
     if (!csrfProtectionEnabled()) {
+        tSystemWarn("Skipped verifying authenticity token : {}", request.header().path().data());
         return true;
     }
 
@@ -263,7 +269,11 @@ bool TActionController::verifyRequest(const THttpRequest &request) const
     }
 
     tSystemDebug("postAuthToken: {}", (const char*)postAuthToken.data());
-    return Tf::strcmp(postAuthToken, authenticityToken());
+    bool res = Tf::strcmp(postAuthToken, authenticityToken());
+    if (res) {
+        tSystemDebug("Verified authenticity token : {}", request.header().path().data());
+    }
+    return res;
 }
 
 /*!
@@ -595,7 +605,7 @@ void TActionController::redirect(const QUrl &url, int statusCode)
     // Enable flash-variants
     QVariant var;
     var.setValue(_flashVars);
-    _sessionStore.insert(FLASH_VARS_SESSION_KEY, var);
+    _sessionStore.insert(QUEUED_FLASH_SESSION_KEY, var);
 }
 
 /*!
@@ -655,12 +665,39 @@ bool TActionController::sendData(const QByteArray &data, const QByteArray &conte
 */
 void TActionController::exportAllFlashVariants()
 {
-    QVariant var = _sessionStore.take(FLASH_VARS_SESSION_KEY);
+    _sessionStore.remove(FLASH_VARS_SESSION_KEY);
+
+    QVariant var = _sessionStore.take(QUEUED_FLASH_SESSION_KEY);
     if (!var.isNull()) {
         exportVariants(var.toMap());
+        _sessionStore.insert(FLASH_VARS_SESSION_KEY, var);
     }
 }
 
+
+QVariantMap TActionController::flashVariants() const
+{
+    return _sessionStore.value(FLASH_VARS_SESSION_KEY).toMap();
+}
+
+
+QVariant TActionController::flashVariant(const QString &key) const
+{
+    return _sessionStore.value(FLASH_VARS_SESSION_KEY).toMap().value(key);
+}
+
+
+QJsonObject TActionController::flashVariantsJson() const
+{
+    return QJsonObject::fromVariantMap(flashVariants());
+}
+
+
+QJsonObject TActionController::flashVariantJson(const QString &key) const
+{
+    return QJsonObject::fromVariantMap(flashVariant(key).toMap());
+}
+
 /*!
   Validates the access of the user \a user. Returns true if the user
   access is allowed by rule; otherwise returns false.

src/tactioncontroller.h

@@ -37,7 +37,11 @@ class T_CORE_EXPORT TActionController : public TAbstractController, public TActi
     virtual QStringList exceptionActionsOfCsrfProtection() const { return QStringList(); }
     virtual bool transactionEnabled() const { return true; }
     QByteArray authenticityToken() const override;
-    QString flash(const QString &name) const;
+    QVariantMap flashVariants() const override;
+    QVariant flashVariant(const QString &key) const override;
+    QJsonObject flashVariantsJson() const override;
+    QJsonObject flashVariantJson(const QString &key) const override;
+    //QString flash(const QString &name) const;
     QHostAddress clientAddress() const;
     virtual bool isUserLoggedIn() const override;
     virtual QString identityKeyOfLoginUser() const;
@@ -199,10 +203,10 @@ inline void TActionController::setStatusCode(int code)
     _statCode = code;
 }
 
-inline QString TActionController::flash(const QString &name) const
-{
-    return _flashVars.value(name).toString();
-}
+// inline QString TActionController::flash(const QString &name) const
+// {
+//     return _flashVars.value(name).toString();
+// }
 
 inline QByteArray TActionController::contentType() const
 {