react-native-windows 0.71.19 → 0.71.20

package/Microsoft.ReactNative.Managed/packages.lock.json

@@ -24,11 +24,6 @@
           "Microsoft.SourceLink.Common": "1.0.0"
         }
       },
-      "boost": {
-        "type": "Transitive",
-        "resolved": "1.76.0",
-        "contentHash": "p+w3YvNdXL8Cu9Fzrmexssu0tZbWxuf6ywsQqHjDlKFE5ojXHof1HIyMC3zDLfLnh80dIeFcEUAuR2Asg/XHRA=="
-      },
       "Microsoft.Build.Tasks.Git": {
         "type": "Transitive",
         "resolved": "1.0.0",
@@ -58,36 +53,21 @@
       "Microsoft.NETCore.Platforms": {
         "type": "Transitive",
         "resolved": "2.1.0",
-        "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
+        "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
       },
       "Microsoft.SourceLink.Common": {
         "type": "Transitive",
         "resolved": "1.0.0",
         "contentHash": "G8DuQY8/DK5NN+3jm5wcMcd9QYD90UV7MiLmdljSJixi3U/vNaeBKmmXUqI4DJCOeWizIUEh4ALhSt58mR+5eg=="
       },
-      "Microsoft.UI.Xaml": {
-        "type": "Transitive",
-        "resolved": "2.7.0",
-        "contentHash": "dB4im13tfmMgL/V3Ei+3kD2rUF+/lTxAmR4gjJ45l577eljHfdo/KUrxpq/3I1Vp6e5GCDG1evDaEGuDxypLMg=="
-      },
-      "Microsoft.Windows.SDK.BuildTools": {
-        "type": "Transitive",
-        "resolved": "10.0.22000.194",
-        "contentHash": "4L0P3zqut466SIqT3VBeLTNUQTxCBDOrTRymRuROCRJKazcK7ibLz9yAO1nKWRt50ttCj39oAa2Iuz9ZTDmLlg=="
-      },
       "NETStandard.Library": {
         "type": "Transitive",
         "resolved": "2.0.3",
-        "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
+        "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
         "dependencies": {
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
-      "ReactNative.Hermes.Windows": {
-        "type": "Transitive",
-        "resolved": "0.71.1",
-        "contentHash": "q38h/Gkw8d0pfUqIhRCd1j/XLhpQY4Hm7kSQthZUzetEST34acbR883/Eh+DKt4FVz9a0lh5kiAfP7piO768SA=="
-      },
       "runtime.win10-arm.Microsoft.Net.Native.Compiler": {
         "type": "Transitive",
         "resolved": "2.2.7-rel-27913-00",
@@ -164,7 +144,6 @@
       "folly": {
         "type": "Project",
         "dependencies": {
-          "boost": "[1.76.0, )",
           "fmt": "[1.0.0, )"
         }
       },
@@ -173,18 +152,13 @@
         "dependencies": {
           "Common": "[1.0.0, )",
           "Folly": "[1.0.0, )",
-          "Microsoft.UI.Xaml": "[2.7.0, )",
-          "Microsoft.Windows.SDK.BuildTools": "[10.0.22000.194, )",
-          "ReactCommon": "[1.0.0, )",
-          "ReactNative.Hermes.Windows": "[0.71.1, )",
-          "boost": "[1.76.0, )"
+          "ReactCommon": "[1.0.0, )"
         }
       },
       "reactcommon": {
         "type": "Project",
         "dependencies": {
-          "Folly": "[1.0.0, )",
-          "boost": "[1.76.0, )"
+          "Folly": "[1.0.0, )"
         }
       }
     },

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,11 +10,11 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.71.19</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.71.20</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>71</ReactNativeWindowsMinor>
-    <ReactNativeWindowsPatch>19</ReactNativeWindowsPatch>
+    <ReactNativeWindowsPatch>20</ReactNativeWindowsPatch>
     <ReactNativeWindowsCanary>false</ReactNativeWindowsCanary>
-    <ReactNativeWindowsCommitId>569d9409c69e4dabf28ac52a6b7956df6690564f</ReactNativeWindowsCommitId>
+    <ReactNativeWindowsCommitId>fbe998224a24862ab7ac61ba86a817c89476fdfa</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 {
@@ -197,40 +199,40 @@ std::string BasePreparedScriptStoreImpl::getPreparedScriptFileName(
   // Essentially, we are trying to construct,
   // prep_<source_url>_<runtime_id>_<preparation_tag>.cache
 
-  std::string prparedScriptFileName("prep_");
+  std::string preparedScriptFileName("prep_");
 
   const std::string &scriptUrl = scriptSignature.url;
 
   // As a crude heuristic we choose the last 64 characters of the source url.
   constexpr int MAXLENGTH = 64;
-  prparedScriptFileName.append(
+  preparedScriptFileName.append(
       scriptUrl.begin() + ((scriptUrl.size() < MAXLENGTH) ? 0 : (scriptUrl.size() - MAXLENGTH)), scriptUrl.end());
 
   // Make a valid file name.
-  std::replace(prparedScriptFileName.begin(), prparedScriptFileName.end(), '\\', '_');
-  std::replace(prparedScriptFileName.begin(), prparedScriptFileName.end(), '/', '_');
-  std::replace(prparedScriptFileName.begin(), prparedScriptFileName.end(), ':', '_');
-  std::replace(prparedScriptFileName.begin(), prparedScriptFileName.end(), '.', '_');
+  std::replace(preparedScriptFileName.begin(), preparedScriptFileName.end(), '\\', '_');
+  std::replace(preparedScriptFileName.begin(), preparedScriptFileName.end(), '/', '_');
+  std::replace(preparedScriptFileName.begin(), preparedScriptFileName.end(), ':', '_');
+  std::replace(preparedScriptFileName.begin(), preparedScriptFileName.end(), '.', '_');
 
   if (runtimeSignature.runtimeName.empty()) {
     std::terminate();
   }
 
-  prparedScriptFileName.append("_");
-  prparedScriptFileName.append(runtimeSignature.runtimeName);
+  preparedScriptFileName.append("_");
+  preparedScriptFileName.append(runtimeSignature.runtimeName);
 
   if (prepareTag) {
-    prparedScriptFileName.append("_");
-    prparedScriptFileName.append(prepareTag);
+    preparedScriptFileName.append("_");
+    preparedScriptFileName.append(prepareTag);
   }
 
-  // TODO :: Need to constuct a hash. ref:
+  // TODO :: Need to construct a hash. ref:
   // https://en.wikipedia.org/wiki/Base64#Filenames
 
   // extension
-  prparedScriptFileName.append(".cache");
+  preparedScriptFileName.append(".cache");
 
-  return prparedScriptFileName;
+  return preparedScriptFileName;
 }
 
 std::shared_ptr<const jsi::Buffer> BasePreparedScriptStoreImpl::tryGetPreparedScript(
@@ -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

@@ -25,6 +25,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)HermesShim.cpp" />

package/Shared/Shared.vcxitems.filters

@@ -156,6 +156,7 @@
       <Filter>Source Files\Modules</Filter>
     </ClCompile>
     <ClCompile Include="$(ReactNativeWindowsDir)Microsoft.ReactNative\Utils\ImageUtils.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)Hasher.cpp" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Source Files">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.71.19",
+  "version": "0.71.20",
   "license": "MIT",
   "repository": {
     "type": "git",