Synchronize changes from 1.6 master branch [ci skip]

a3f6d01 Re-introduce "Read file from path - #3490 appendum (#3620)"

Author: github-actions[bot]

Client/mods/deathmatch/logic/CScriptFile.cpp

@@ -158,7 +158,8 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
     DoResourceFileCheck();
 
     // If read size is large, limit it to how many bytes can be read (avoid memory problems with over allocation)
-    if (ulSize > 10000)
+    // large : >10KB
+    if (ulSize > 10240)
     {
         long lCurrentPos = m_pFile->FTell();
         m_pFile->FSeek(0, SEEK_END);
@@ -177,7 +178,18 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
         return -2;
     }
 
-    return m_pFile->FRead(outBuffer.data(), ulSize);
+    auto bytesRead = m_pFile->FRead(outBuffer.data(), ulSize);
+
+    // EOF reached?
+    // Cant check for error as binary interface
+    // is pure virtual class with no definitions
+    // available (CNetServer)
+    if (m_pFile->FEof())
+    {
+        // if so, truncate the data to the amount of bytes read
+        outBuffer.resize(bytesRead + 1);
+    }
+    return bytesRead;
 }
 
 long CScriptFile::Write(unsigned long ulSize, const char* pData)

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -1268,6 +1268,11 @@ void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisRe
     // No operation on the client
 }
 
+std::pair<bool, std::string> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept
+{
+    return {true, ""};
+}
+
 //
 // Set error if pThisResource does not have permission to modify every resource in resourceList
 //
@@ -1276,6 +1281,11 @@ void CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisR
     // No operation on the client
 }
 
+std::pair<bool, std::string> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept
+{
+    return {true, ""};
+}
+
 //
 // Set error if resource file access is blocked due to reasons
 //
@@ -1284,3 +1294,8 @@ void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pTh
 {
     // No operation on the client
 }
+
+std::pair<bool, std::string> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath, bool* pbReadOnly) noexcept
+{
+    return {true, ""};
+}

Client/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -590,9 +590,13 @@ void ReadPregFlags(CScriptArgReader& argStream, pcrecpp::RE_Options& pOptions);
 // Resource access helpers
 //
 void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource);
+std::pair<bool, std::string> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept;
 void CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisResource, std::initializer_list<CResource*> resourceList);
-void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
+std::pair<bool, std::string> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept;
+    void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
                                      bool* pbReadOnly = nullptr);
+std::pair<bool, std::string> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
+                                                             bool* pbReadOnly = nullptr) noexcept;
 
 //
 // Other misc helpers

Server/mods/deathmatch/logic/CScriptFile.cpp

@@ -178,7 +178,8 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
         return -1;
 
     // If read size is large, limit it to how many bytes can be read (avoid memory problems with over allocation)
-    if (ulSize > 10000)
+    // large : >10KB
+    if (ulSize > 10240)
     {
         long lCurrentPos = ftell(m_pFile);
         fseek(m_pFile, 0, SEEK_END);
@@ -197,7 +198,15 @@ long CScriptFile::Read(unsigned long ulSize, SString& outBuffer)
         return -2;
     }
 
-    return fread(outBuffer.data(), 1, ulSize, m_pFile);
+    auto bytesRead = fread(outBuffer.data(), 1, ulSize, m_pFile);
+
+    // EOF reached or error was thrown?
+    if (feof(m_pFile) || ferror(m_pFile))
+    {
+        // if so, truncate the data to the amount of bytes read
+        outBuffer.resize(bytesRead + 1);
+    }
+    return bytesRead;
 }
 
 long CScriptFile::Write(unsigned long ulSize, const char* pData)

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.cpp

@@ -746,6 +746,17 @@ void CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisRe
             "Access denied");
 }
 
+std::pair<bool, SString> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept
+{
+    if (GetResourceModifyScope(pThisResource, pOtherResource) != eResourceModifyScope::NONE)
+        return {true, ""};
+
+    SString str("ModifyOtherObjects in ACL denied resource %s to access %s",
+        pThisResource->GetName().c_str(), pOtherResource->GetName().c_str()
+    );
+    return {false, str};
+}
+
 //
 // Set error if pThisResource does not have permission to modify every resource in resourceList
 //
@@ -787,6 +798,46 @@ void CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisR
         SString("ModifyOtherObjects in ACL denied resource %s to access %s", pThisResource->GetName().c_str(), ssResourceNames.str().c_str()), "Access denied");
 }
 
+std::pair<bool, SString> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept
+{
+    // std::unordered_set only allows unique values and resourceList can contain duplicates
+    std::unordered_set<CResource*> setNoPermissionResources;
+
+    for (const auto& pOtherResource : resourceList)
+    {
+        eResourceModifyScope modifyScope = GetResourceModifyScope(pThisResource, pOtherResource);
+
+        if (modifyScope == eResourceModifyScope::SINGLE_RESOURCE)
+            continue;
+
+        if (modifyScope == eResourceModifyScope::EVERY_RESOURCE)
+            return {true, ""};
+
+        setNoPermissionResources.emplace(pOtherResource);
+    }
+
+    if (setNoPermissionResources.empty())
+        return {true, ""};
+
+    std::stringstream ssResourceNames;
+    std::size_t       remainingElements = setNoPermissionResources.size();
+
+    for (const auto& pResource : setNoPermissionResources)
+    {
+        ssResourceNames << pResource->GetName();
+
+        if (remainingElements > 1)
+            ssResourceNames << ", ";
+
+        --remainingElements;
+    }
+
+    SString str("ModifyOtherObjects in ACL denied resource %s to access %s",
+        pThisResource->GetName().c_str(), ssResourceNames.str().c_str()
+    );
+    return {false, str};
+}
+
 //
 // Set error if resource file access is blocked due to reasons
 //
@@ -813,3 +864,28 @@ void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pTh
             SString("Database credentials protection denied resource %s to access %s", *pThisResource->GetName(), *pOtherResource->GetName()), "Access denied");
     }
 }
+
+std::pair<bool, SString> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath, bool* pbReadOnly) noexcept
+{
+    if (!g_pGame->GetConfig()->IsDatabaseCredentialsProtectionEnabled())
+        return {true, ""};
+
+    // Is other resource different and requested access denied
+    if (pThisResource == pOtherResource)
+        return {true, ""};
+
+    if (!pOtherResource->IsFileDbConnectMysqlProtected(strAbsPath, pbReadOnly ? *pbReadOnly : false))
+        return {true, ""};
+
+    // No access - See if we can change to readonly
+    if (pbReadOnly && !(*pbReadOnly) && !pOtherResource->IsFileDbConnectMysqlProtected(strAbsPath, true)) {
+        // Yes readonly access
+        *pbReadOnly = true;
+        return {true, ""};
+    }
+
+    SString str("Database credentials protection denied resource %s to access %s",
+        *pThisResource->GetName(), *pOtherResource->GetName()
+    );
+    return {false, str};
+}

Server/mods/deathmatch/logic/lua/CLuaFunctionParseHelpers.h

@@ -403,9 +403,12 @@ enum class eResourceModifyScope
 
 eResourceModifyScope GetResourceModifyScope(CResource* pThisResource, CResource* pOtherResource);
 void                 CheckCanModifyOtherResource(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource);
-void                 CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisResource, std::initializer_list<CResource*> resourceList);
+std::pair<bool, SString> CheckCanModifyOtherResource(CResource* pThisResource, CResource* pOtherResource) noexcept;
+void                     CheckCanModifyOtherResources(CScriptArgReader& argStream, CResource* pThisResource, std::initializer_list<CResource*> resourceList);
+std::pair<bool, SString> CheckCanModifyOtherResources(CResource* pThisResource, std::initializer_list<CResource*> resourceList) noexcept;
 void CheckCanAccessOtherResourceFile(CScriptArgReader& argStream, CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath,
                                      bool* pbReadOnly = nullptr);
+std::pair<bool, SString> CheckCanAccessOtherResourceFile(CResource* pThisResource, CResource* pOtherResource, const SString& strAbsPath, bool* pbReadOnly = nullptr) noexcept;
 
 //
 // Other misc helpers