TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Check illegal characters from the file and parent folder name

Browse Source 
PiperOrigin-RevId: 634941778
This commit is contained in:
Eiden Kim
2024-05-17 18:46:26 -07:00
committed by Copybara-Service
parent 4ff7c1511c
commit b224f8660c
5 changed files with 72 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
connections/implementation/offline_frames_validator.cc
-9
View File
@@ -406,13 +406,6 @@ Exception EnsureValidOfflineFrame(
.payload_transfer()
.payload_header()
.has_file_name()) {
if (offline_frame.v1()
.payload_transfer()
.payload_header()
.file_name()
.empty()) {
return {Exception::kIllegalCharacters};
}
if (CheckForIllegalCharacters(offline_frame.v1()
.payload_transfer()
.payload_header()
@@ -421,8 +414,6 @@ Exception EnsureValidOfflineFrame(
kIllegalFileNamePatternsSize)) {
return {Exception::kIllegalCharacters};
}
} else { // Filename is empty.
return {Exception::kIllegalCharacters};
}
if (offline_frame.v1()
.payload_transfer()
connections/implementation/offline_frames_validator.h
+1 -2
View File
@@ -28,8 +28,7 @@ namespace parser {
constexpr absl::string_view kIllegalFileNamePatterns[] = {":", "/", "\\"};
constexpr absl::string_view kIllegalParentFolderPatterns[] = {":", "../",
"..\\"};
constexpr absl::string_view kIllegalParentFolderPatterns[] = {":", ".."};
const size_t kIllegalFileNamePatternsSize =
sizeof(kIllegalFileNamePatterns) / sizeof(*kIllegalFileNamePatterns);
connections/implementation/offline_frames_validator_test.cc
+52 -63
View File
@@ -22,7 +22,6 @@
#include "connections/implementation/offline_frames.h"
#include "connections/implementation/proto/offline_wire_formats.pb.h"
#include "internal/platform/byte_array.h"
#include "internal/platform/logging.h"
namespace nearby {
namespace connections {
@@ -247,7 +246,7 @@ TEST(OfflineFramesValidatorTest,
// Sending files larger than 2gb was previously broken (see cl/372382338).
// This tests a file larger than int max.
header.set_total_size(3e10);
header.set_file_name("file_name.jpg");
header.set_file_name(std::string());
header.set_parent_folder(std::string());
chunk.set_body("payload data");
chunk.set_offset(150);
@@ -288,6 +287,31 @@ TEST(OfflineFramesValidatorTest, ValidatesAsOkTypeFileWithLegalFilePath) {
ASSERT_TRUE(ret_value.Ok());
}
TEST(OfflineFramesValidatorTest, ValidatesAsFailedTypeFileWithIllegalFilePath) {
PayloadTransferFrame::PayloadHeader header;
PayloadTransferFrame::PayloadChunk chunk;
header.set_id(12345);
header.set_type(PayloadTransferFrame::PayloadHeader::FILE);
// Sending files larger than 2gb was previously broken (see cl/372382338).
// This tests a file larger than int max.
header.set_total_size(3e10);
header.set_file_name(
std::string("earth_85MB_test (1): (3) (4) (8) (1) (2) (2) (1).jpg"));
header.set_parent_folder(std::string());
chunk.set_body("payload data");
chunk.set_offset(150);
chunk.set_flags(1);
OfflineFrame offline_frame;
ByteArray bytes = ForDataPayloadTransfer(header, chunk);
offline_frame.ParseFromString(std::string(bytes));
auto ret_value = EnsureValidOfflineFrame(offline_frame);
ASSERT_TRUE(ret_value.value == Exception::kIllegalCharacters);
}
TEST(OfflineFramesValidatorTest, ValidatesAsOkTypeFileWithLegalParentFolder) {
PayloadTransferFrame::PayloadHeader header;
PayloadTransferFrame::PayloadChunk chunk;
@@ -296,7 +320,7 @@ TEST(OfflineFramesValidatorTest, ValidatesAsOkTypeFileWithLegalParentFolder) {
// Sending files larger than 2gb was previously broken (see cl/372382338).
// This tests a file larger than int max.
header.set_total_size(3e10);
header.set_file_name("test_file.txt");
header.set_file_name("");
header.set_parent_folder(std::string(
std::string("earth_85MB_test (1) (3) (4) (8) (1) (2) (2) (1).jpg")));
chunk.set_body("payload data");
@@ -313,6 +337,31 @@ TEST(OfflineFramesValidatorTest, ValidatesAsOkTypeFileWithLegalParentFolder) {
ASSERT_TRUE(ret_value.Ok());
}
TEST(OfflineFramesValidatorTest,
ValidatesAsFailedTypeFileWithIllegalParentFolder) {
PayloadTransferFrame::PayloadHeader header;
PayloadTransferFrame::PayloadChunk chunk;
header.set_id(12345);
header.set_type(PayloadTransferFrame::PayloadHeader::FILE);
// Sending files larger than 2gb was previously broken (see cl/372382338).
// This tests a file larger than int max.
header.set_total_size(3e10);
header.set_file_name("");
header.set_parent_folder(std::string(
std::string("earth_85MB_test (1): (3) (4) (8) (1) (2) (2) (1).jpg")));
chunk.set_body("payload data");
chunk.set_offset(150);
chunk.set_flags(1);
OfflineFrame offline_frame;
ByteArray bytes = ForDataPayloadTransfer(header, chunk);
offline_frame.ParseFromString(std::string(bytes));
auto ret_value = EnsureValidOfflineFrame(offline_frame);
ASSERT_TRUE(ret_value.value == Exception::kIllegalCharacters);
}
TEST(OfflineFramesValidatorTest, ValidatesAsFailWithNullPayloadTransferFrame) {
PayloadTransferFrame::PayloadHeader header;
PayloadTransferFrame::PayloadChunk chunk;
@@ -667,66 +716,6 @@ TEST(OfflineFramesValidatorTest,
ASSERT_FALSE(ret_value.Ok());
}
struct FileNameParentFolderTestData {
std::string test_title;
std::string file_name;
std::string parent_folder;
std::string expected;
};
using FileNameParentFolderValidationTest =
testing::TestWithParam<FileNameParentFolderTestData>;
TEST_P(FileNameParentFolderValidationTest, CheckIllegalFileNameWithParam) {
NEARBY_LOGS(INFO) << "Running FileNameParentFolderValidationTest_"
<< GetParam().test_title;
PayloadTransferFrame::PayloadHeader header;
PayloadTransferFrame::PayloadChunk chunk;
header.set_id(12345);
header.set_type(PayloadTransferFrame::PayloadHeader::FILE);
// Sending files larger than 2gb was previously broken (see cl/372382338).
// This tests a file larger than int max.
header.set_total_size(3e10);
header.set_file_name(GetParam().file_name);
header.set_parent_folder(GetParam().parent_folder);
chunk.set_body("payload data");
chunk.set_offset(150);
chunk.set_flags(1);
OfflineFrame offline_frame;
ByteArray bytes = ForDataPayloadTransfer(header, chunk);
offline_frame.ParseFromString(std::string(bytes));
auto ret_value = EnsureValidOfflineFrame(offline_frame);
if (GetParam().expected == "exception") {
ASSERT_TRUE(ret_value.value == Exception::kIllegalCharacters);
} else {
ASSERT_TRUE(ret_value.Ok());
}
}
INSTANTIATE_TEST_SUITE_P(
FileNameParentFolderTestInitiation, // This name is only used for
// instantiation
FileNameParentFolderValidationTest, // This is the name of your
// parameterized test
testing::ValuesIn<FileNameParentFolderTestData>({
{"CheckLegalFileName", "file_name.jpg", "", "no exception"},
{"CheckEmptyFileName", "", "", "exception"},
{"CheckIllegalFileNameColon", "file_name:.jpg", "", "exception"},
{"CheckIllegalFileNameSlash", "file_name/.jpg", "", "exception"},
{"CheckIllegalFileNameBackSlash", "file_name\\.jpg", "", "exception"},
{"CheckLegalParentFolder", "file_name.txt", "parent_/folder",
"no exception"},
{"CheckIllegalParentFolderColon", "file_name.jpg", "parent:/folder",
"exception"},
{"CheckIllegalParentFolderDoubleDotSlash", "file_name.txt",
"parent../folder", "exception"},
{"CheckIllegalParentFolderDoubleDotBackSlash", "file_name.txt",
"parent..\\folder", "exception"},
}));
} // namespace
} // namespace parser
} // namespace connections