react-native-windows 0.72.23 → 0.72.25

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.72.23</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.72.25</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>72</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>23</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>25</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>bc51446e195caa1fadab02ff142a5c137fdf2426</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>21a119eff71ffc407a118a2f68ed1c7696843328</ReactNativeWindowsCommitId>
   </PropertyGroup>
 </Project>

package/Shared/BaseScriptStoreImpl.cpp

@@ -4,6 +4,7 @@
 #include "pch.h"
 
 #include "BaseScriptStoreImpl.h"
+#include "Hasher.h"
 #include "MemoryMappedBuffer.h"
 
 #include <CppRuntimeOptions.h>
@@ -92,6 +93,7 @@ struct PreparedScriptPrefix {
   jsi::ScriptVersion_t scriptVersion;
   jsi::JSRuntimeVersion_t runtimeVersion;
   uint64_t sizeInBytes;
+  std::uint8_t hash[32];
 };
 
 struct PreparedScriptSuffix {
@@ -269,6 +271,24 @@ std::shared_ptr<const jsi::Buffer> BasePreparedScriptStoreImpl::tryGetPreparedSc
     return nullptr;
   }
 
+  std::optional<std::vector<std::uint8_t>> hashBuffer = Microsoft::ReactNative::GetSHA256Hash(
+      reinterpret_cast<const std::uint8_t *>(buffer->data()) + sizeof(PreparedScriptPrefix),
+      static_cast<size_t>(prefix->sizeInBytes));
+  if (!hashBuffer) {
+    // Hashing failed.
+    return nullptr;
+  }
+
+  if (hashBuffer.value().size() < sizeof(prefix->hash)) {
+    // Unexpected hash size.
+    return nullptr;
+  }
+
+  if (memcmp(hashBuffer.value().data(), prefix->hash, sizeof(prefix->hash)) != 0) {
+    // Hash doesn't match. Store is possibly corrupted. It is safer to bail out.
+    return nullptr;
+  }
+
   const PreparedScriptSuffix *suffix = reinterpret_cast<const PreparedScriptSuffix *>(
       buffer->data() + sizeof(PreparedScriptPrefix) + prefix->sizeInBytes);
   if (strncmp(suffix->eof, PERSIST_EOF, sizeof(suffix->eof)) != 0) {
@@ -297,6 +317,15 @@ void BasePreparedScriptStoreImpl::persistPreparedScript(
   prefix->runtimeVersion = runtimeMetadata.version;
   prefix->sizeInBytes = preparedScript->size();
 
+  std::optional<std::vector<std::uint8_t>> hashBuffer =
+      Microsoft::ReactNative::GetSHA256Hash(preparedScript->data(), preparedScript->size());
+  if (!hashBuffer) {
+    // Hashing failed.
+    std::terminate();
+  }
+
+  memcpy_s(prefix->hash, sizeof(prefix->hash), hashBuffer.value().data(), hashBuffer.value().size());
+
   memcpy_s(
       newBuffer->data() + sizeof(PreparedScriptPrefix),
       newBuffer->size() - sizeof(PreparedScriptPrefix),

package/Shared/Hasher.cpp

@@ -0,0 +1,64 @@
+#include "pch.h"
+#include "Hasher.h"
+
+#ifndef NT_SUCCESS
+#define NT_SUCCESS(Status) ((NTSTATUS)(Status) >= 0)
+#endif // NT_SUCCESS
+
+#define CheckNTSuccess(s)      \
+  do {                         \
+    NTSTATUS status = (s);     \
+    if (!NT_SUCCESS(status)) { \
+      throw status;            \
+    }                          \
+  } while (false)
+
+namespace Microsoft::ReactNative {
+
+std::optional<std::vector<std::uint8_t>> GetSHA256Hash(const void *pb, size_t cb) {
+  try {
+    SHA256Hasher hasher;
+    hasher.HashData(pb, cb);
+    return hasher.GetHashValue();
+  } catch (...) {
+    return std::nullopt;
+  }
+}
+
+SHA256Hasher::SHA256Hasher() {
+  CheckNTSuccess(BCryptOpenAlgorithmProvider(&m_hAlg, BCRYPT_SHA256_ALGORITHM, NULL, 0));
+
+  DWORD cbObject;
+  DWORD cbData;
+  CheckNTSuccess(BCryptGetProperty(m_hAlg, BCRYPT_OBJECT_LENGTH, (PBYTE)&cbObject, sizeof(DWORD), &cbData, 0));
+
+  m_hashObject.resize(cbObject);
+  CheckNTSuccess(
+      BCryptCreateHash(m_hAlg, &m_hHash, m_hashObject.data(), static_cast<ULONG>(m_hashObject.size()), NULL, 0, 0));
+}
+
+SHA256Hasher::~SHA256Hasher() {
+  BCryptDestroyHash(m_hHash);
+  BCryptCloseAlgorithmProvider(m_hAlg, 0);
+}
+
+void SHA256Hasher::HashData(const void *pb, size_t cb) {
+  if (cb > LONG_MAX) {
+    // Input too large
+    throw E_INVALIDARG;
+  }
+
+  CheckNTSuccess(BCryptHashData(m_hHash, (PBYTE)pb, (DWORD)cb, 0));
+}
+
+std::vector<std::uint8_t> SHA256Hasher::GetHashValue() {
+  DWORD hashLength;
+  DWORD cbData;
+  CheckNTSuccess(BCryptGetProperty(m_hAlg, BCRYPT_HASH_LENGTH, (PBYTE)&hashLength, sizeof(DWORD), &cbData, 0));
+
+  std::vector<uint8_t> hashValue(hashLength, 0);
+  CheckNTSuccess(BCryptFinishHash(m_hHash, &hashValue[0], static_cast<ULONG>(hashValue.size()), 0));
+
+  return hashValue;
+}
+} // namespace Microsoft::ReactNative

package/Shared/Hasher.h

@@ -0,0 +1,24 @@
+#include <bcrypt.h>
+#include <optional>
+#include <vector>
+
+namespace Microsoft::ReactNative {
+std::optional<std::vector<std::uint8_t>> GetSHA256Hash(const void *pb, size_t cb);
+
+class SHA256Hasher {
+ public:
+  SHA256Hasher();
+  ~SHA256Hasher();
+
+  SHA256Hasher(const SHA256Hasher &) = delete;
+  SHA256Hasher &operator=(const SHA256Hasher &) = delete;
+
+  std::vector<std::uint8_t> GetHashValue();
+  void HashData(const void *pb, size_t cb);
+
+ private:
+  BCRYPT_ALG_HANDLE m_hAlg;
+  BCRYPT_HASH_HANDLE m_hHash;
+  std::vector<std::uint8_t> m_hashObject;
+};
+} // namespace Microsoft::ReactNative

package/Shared/Shared.vcxitems

@@ -153,6 +153,7 @@
     <ClCompile Include="$(MSBuildThisFileDirectory)DevSupportManager.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutor.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)Executors\WebSocketJSExecutorFactory.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hasher.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)HermesRuntimeHolder.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)HermesSamplingProfiler.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)InspectorPackagerConnection.cpp" />

package/Shared/Shared.vcxitems.filters

@@ -264,6 +264,7 @@
       <Filter>Hermes</Filter>
     </ClCompile>
     <ClCompile Include="$(NodeApiJsiDir)src\ApiLoaders\HermesApi.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hasher.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)JSI\V8RuntimeHolder.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)SafeLoadLibrary.cpp" />
     <ClCompile Include="$(MSBuildThisFileDirectory)V8JSIRuntimeHolder.cpp" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.72.23",
+  "version": "0.72.25",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "11.3.7",
     "@react-native-community/cli-platform-android": "11.3.7",
     "@react-native-community/cli-platform-ios": "11.3.7",
-    "@react-native-windows/cli": "0.72.4",
+    "@react-native-windows/cli": "0.72.5",
     "@react-native/assets": "1.0.0",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.7",