PskSerializationUtils: change deserialize to take in range

Summary: Do not require the caller to pass in a `std::string` to deserialize. Take in the buffer as a view type, which allows more flexibility for the caller. Reviewed By: zalecodez Differential Revision: D64780788 fbshipit-source-id: 7bd710c981b6dbb4dd7f4d495f8fc3c8bc570d9e
facebookincubator · Oct 24, 2024 · 3774bcc · 3774bcc
1 parent dc9019c
commit 3774bcc
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/fizz/client/PskSerializationUtils.cpp b/fizz/client/PskSerializationUtils.cpp
@@ -112,8 +112,8 @@ std::string serializePsk(
 
 fizz::client::CachedPsk deserializePsk(
     const CertificateSerialization& serializer,
-    const std::string& str) {
-  auto buf = IOBuf::wrapBuffer(str.data(), str.length());
+    folly::ByteRange serializedPsk) {
+  auto buf = IOBuf::wrapBuffer(serializedPsk.data(), serializedPsk.size());
   io::Cursor cursor(buf.get());
   fizz::client::CachedPsk psk;
   psk.type = fizz::PskType::Resumption;

diff --git a/fizz/client/PskSerializationUtils.h b/fizz/client/PskSerializationUtils.h
@@ -12,6 +12,6 @@ std::string serializePsk(
     const fizz::client::CachedPsk& psk);
 fizz::client::CachedPsk deserializePsk(
     const CertificateSerialization& serializer,
-    const std::string& str);
+    folly::ByteRange psk);
 } // namespace client
 } // namespace fizz
diff --git a/fizz/client/test/PskSerializationTest.cpp b/fizz/client/test/PskSerializationTest.cpp
@@ -50,7 +50,8 @@ TEST_F(PskSerializationTest, TestDeserializationCompatibility) {
       "0007536f6d6550736b0010726573756d7074696f6e7365637265740304130101001d02683211111111000001912edab3a60000000066b3ee4c000003653082036130820249a003020102020900c3420836ac1ca26f300d06092a864886f70d01010b0500304b310b3009060355040613025553310b300906035504080c024e593111300f06035504070c084e657720596f726b310d300b060355040b0c0446697a7a310d300b06035504030c0446697a7a301e170d3136313232393036323431385a170d3431303832303036323431385a304b310b3009060355040613025553310b300906035504080c024e593111300f06035504070c084e657720596f726b310d300b060355040b0c0446697a7a310d300b06035504030c0446697a7a30820122300d06092a864886f70d01010105000382010f003082010a0282010100c564999066687e557e86734a655b8252bd1e39e758b45204535ea60113cfdca3ea1c5adc117b9d039ff8ea1a2881f49bd9662a11a09e96d6371a23c6f963dd8610c48b98788489af2fe83f89353b2cb988866931e212b3018c74d76d35d87c72ee9bc4249cba4bbc047098f403136c585a3c4b2b087cee51c39ec24c7a25c7071bb82b1faba09c6b73c4d2073d51767629a4c936ea61f2058f0dd8a8f00bb9627629bc8632d105ede9e505007f21b8d4413942be5c79e0fbfcc0217400b462445bfaf1fef2835169b49f364a9485173c874248c0933baaa3f9416fca977448de0f5d6ffa0d425e1a2ddb5c5aa5f5717ccaccba66085e1cab2f80f0e54a438ee50203010001a348304630090603551d1304023000300b0603551d0f0404030205e0302c0603551d1104253023820a2a2e66697a7a2e636f6d820866697a7a2e636f6d820b6578616d706c652e6e6574300d06092a864886f70d01010b050003820101008a48bf0c71489acb196f08af3e0fa4a2e878a7ad2c25b71d856bacc17c9c62cac25cde58b6b406940deb7f03b832ceb1a1995f43ac86c3ac3c273d156b9bf1576ee69035cee0cb4b4dda2f61780c1332bcabc39aa6b4f89b23f92b88934e78a05d50e23bf1f551342419b1d457c7679520f9ff032d662f2cc37a1bd3fa618ce810d9f9f3da1afff2476160e82629add8807cd11d64e3b808bc675e5b80a794d1f58d83b5fe6af5c951cdae976439a6f622d744c9c753c3cce2fd038646115ebe3711fa9e9cf8d2abdbf3928aff7e2dfbdb68596f771924286af79abb1bd848330752e24874e5940fb24bcf10cf1712461cd279283f6ef2fec6c593c5c1a0d70d000004b3308204af30820297a00302010202021000300d06092a864886f70d01010b0500301a310b3009060355040613025553310b300906035504080c0243413020170d3137303930313231303535325a180f32313137303830383231303535325a3063310b3009060355040613025553310b300906035504080c024341310d300b060355040b0c0446697a7a3114301206035504030c0b46697a7a20436c69656e743122302006092a864886f70d010901161366697a7a636c69656e744066697a7a2e636f6d30820122300d06092a864886f70d01010105000382010f003082010a0282010100cd4e11b945374235fdacc78269560f5f51bc21390692f456d456e8e4ff48ae6c3fb8e7979d3285b49de1fabfa8980eb4edaab29877e3935b83b71c07d8623554421871ed6efaa61288b75f594390d736b969b786853fcf25238d560d3699a68c666c528b92fb7fff71e41e417c879c82eacdfbb5b7f3510dca9d3a6a483709202d3484cbd7e02ef303a1e30a00275a8a720ae11de486e6a3aa7b6730be471fcb53da866a79b10b5e6c8fb555a2d7496d974b88bfe7da0cee37d602cd99656d8462b4f7cf4ab76c488bf4e573423ba6bf97e2f64251ecfa25fd0de9d0c0f8ffc4cf03a78415ff4560fa20b85e9fd912af37bbaa0a32211fdafaefd35a50141c650203010001a381b33081b030090603551d1304023000301106096086480186f84201010404030205a0302106096086480186f842010d04141612436c69656e74204365727469666963617465301d0603551d0e041604144fd33780c836b63319a9c1ab0f4c0fe8269a4903301f0603551d230418301680141f1aa5f942e80856ba9a0bd74434cb32b17e5e19300e0603551d0f0101ff0404030205e0301d0603551d250416301406082b0601050507030206082b06010505070304300d06092a864886f70d01010b05000382020100704671d2974c542864e59db7f5d1dc1ded2c90cfa28f5a9c573ec3efc2b4d31408e4f5fc82dd0ed8e45d0f7e53a7339203906dc533524505f6c7cf2766817fde5acef539d715c7d7d08fc8b7361f9f421dd514183d42889f07fc41f59236fab01217d7b3af618623e3ba93d6eb3664ce39c3ceb384b66498390871d33203d66136d40393fa16184d50e98576093efc4523647bc46a35eed7ac320987d64e1b27d8a97b83b1d184f267749c200292a5a37b41de1e459325391d34b4a9e833695e6332520f308dc3af8f775334e12daaa4c01f1f30ccbf58942b144cba2d1c65e956132fd97f8630a42c5d3055515ad66858fac78a305e644af257b7d79020a6c206853a859462e96ecedd0a6e93ba9b9f27a66863880bc5cc0f0faf753d0ce78ea0b8e63e198be2b163ca6db085496dc2bd91b70121bfd3ec79d01c2388bd351014f3e1493d1f461a6c88e19a2713ce9fa1edf2549fdc0d6f4be4df0f8139732a236735ded87edaa37b020786b85fcb538904d41d0545350aa23ec12b04e5f5c9baf5bb0445717fae230895b5cc518b9a2d319348169ba5be6c1be75ed1369ad60166f45f8458a8fa13356fce1a4e36d6723405ce51862e3ee913bddc1ae43d8d071c39e07bb2c1e40ed6ca76c6f207551930ee4e7889ed9e31233ebf60cc4433c17e042433ab57ffd9d9e549f120224d8076c5b5bdead821f73ac70aab5755dd00000000000001912eda8c96";
 
   auto psk = fizz::client::deserializePsk(
-      fizz::openssl::certificateSerializer(), folly::unhexlify(kSerializedPSK));
+      fizz::openssl::certificateSerializer(),
+      folly::ByteRange(folly::unhexlify(kSerializedPSK)));
   EXPECT_EQ(psk.psk, "SomePsk");
   EXPECT_EQ(psk.secret, "resumptionsecret");
   EXPECT_EQ(psk.type, PskType::Resumption);
@@ -96,7 +97,8 @@ TEST_F(PskSerializationTest, TestSerializationWithMock) {
       }));
   std::string serializedPsk = fizz::client::serializePsk(mockSerializer, psk);
   EXPECT_TRUE(serializedPsk.find("serialized: ") != std::string::npos);
-  auto psk2 = fizz::client::deserializePsk(mockSerializer, serializedPsk);
+  auto psk2 = fizz::client::deserializePsk(
+      mockSerializer, folly::ByteRange(serializedPsk));
   EXPECT_NE(psk2.clientCert, nullptr);
   EXPECT_NE(psk2.serverCert, nullptr);
 
@@ -120,7 +122,8 @@ TEST_F(PskSerializationTest, TestSerializationThatFails) {
   // When serialization fails, then we expect that deserialize is not called
   EXPECT_CALL(mockSerializer, deserialize(_)).Times(0);
   std::string serializedPsk = fizz::client::serializePsk(mockSerializer, psk);
-  auto psk2 = fizz::client::deserializePsk(mockSerializer, serializedPsk);
+  auto psk2 = fizz::client::deserializePsk(
+      mockSerializer, folly::ByteRange(serializedPsk));
   EXPECT_EQ(psk2.clientCert, nullptr);
   EXPECT_EQ(psk2.serverCert, nullptr);
 }
@@ -143,7 +146,8 @@ TEST_F(PskSerializationTest, TestDeserializationThatFails) {
       .InSequence(s)
       .WillOnce(Throw(std::runtime_error("failed deserialization")));
   std::string serializedPsk = fizz::client::serializePsk(mockSerializer, psk);
-  auto psk2 = fizz::client::deserializePsk(mockSerializer, serializedPsk);
+  auto psk2 = fizz::client::deserializePsk(
+      mockSerializer, folly::ByteRange(serializedPsk));
   EXPECT_EQ(psk2.clientCert, nullptr);
   EXPECT_EQ(psk2.serverCert, nullptr);
 }
@@ -154,7 +158,7 @@ TEST_F(PskSerializationTest, TestSerialization) {
       fizz::client::serializePsk(fizz::openssl::certificateSerializer(), psk);
   EXPECT_FALSE(serializedPsk.empty());
   auto psk2 = fizz::client::deserializePsk(
-      fizz::openssl::certificateSerializer(), serializedPsk);
+      fizz::openssl::certificateSerializer(), folly::ByteRange(serializedPsk));
   EXPECT_EQ(psk.psk, psk2.psk);
   EXPECT_EQ(psk.secret, psk2.secret);
   EXPECT_EQ(psk.type, psk2.type);
@@ -190,7 +194,7 @@ TEST_F(PskSerializationTest, TestTimestampOverflow) {
       "0007536f6d6550736b0010726573756d7074696f6e7365637265740304130101001d026832111111117fffffffffffffff7fffffffffffffff0000000000000000000000017fffffffffffffff";
   auto psk = fizz::client::deserializePsk(
       fizz::openssl::certificateSerializer(),
-      folly::unhexlify(kValidPskWithBadTimestamps));
+      folly::ByteRange(folly::unhexlify(kValidPskWithBadTimestamps)));
 
   EXPECT_GT(psk.ticketIssueTime.time_since_epoch().count(), 0);
   EXPECT_GT(psk.ticketExpirationTime.time_since_epoch().count(), 0);
@@ -205,7 +209,8 @@ TEST_F(PskSerializationTest, TestInvalidSerializationThrows) {
   serializedPsk.insert(10, "HI!");
   ASSERT_ANY_THROW({
     fizz::client::deserializePsk(
-        fizz::openssl::certificateSerializer(), serializedPsk);
+        fizz::openssl::certificateSerializer(),
+        folly::ByteRange(serializedPsk));
   });
 }
 

diff --git a/fizz/tool/FizzClientCommand.cpp b/fizz/tool/FizzClientCommand.cpp
@@ -490,7 +490,8 @@ class BasicPersistentPskCache : public BasicPskCache {
     readFile(loadFile_.c_str(), serializedPsk);
     try {
       return deserializePsk(
-          fizz::openssl::certificateSerializer(), serializedPsk);
+          fizz::openssl::certificateSerializer(),
+          folly::ByteRange(serializedPsk));
     } catch (const std::exception& e) {
       LOG(ERROR) << "Error deserializing: " << loadFile_ << "\n" << e.what();
       throw;