test: add tar.gz test to tar unit test

Author: ingve

test/CMakeLists.txt

@@ -168,6 +168,10 @@ set(OS_SOURCES
 
 set(MOD_OBJECTS
   ${INCLUDEOS_ROOT}/mod/http-parser/http_parser.c
+  ${INCLUDEOS_ROOT}/mod/uzlib/src/adler32.c
+  ${INCLUDEOS_ROOT}/mod/uzlib/src/crc32.c
+  ${INCLUDEOS_ROOT}/mod/uzlib/src/tinflate.c
+  ${INCLUDEOS_ROOT}/mod/uzlib/src/tinfgzip.c
 )
 
 if(COVERAGE)
@@ -221,6 +225,8 @@ add_custom_command(
   COMMAND ${CMAKE_COMMAND} -E tar cf ${CMAKE_CURRENT_BINARY_DIR}/test-single.tar ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
   COMMAND ${CMAKE_COMMAND} -E tar cf ${CMAKE_CURRENT_BINARY_DIR}/test-multiple.tar ${CMAKE_CURRENT_SOURCE_DIR}/*.py
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt ${CMAKE_CURRENT_BINARY_DIR}/test-invalid.tar
+  COMMAND ${CMAKE_COMMAND} -E tar czf ${CMAKE_CURRENT_BINARY_DIR}/test.tar.gz ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
+  COMMAND ${CMAKE_COMMAND} -E tar cf ${CMAKE_CURRENT_BINARY_DIR}/test-tar-gz-inside.tar ${CMAKE_CURRENT_BINARY_DIR}/test.tar.gz
 )
 
 add_custom_target(

test/util/unit/tar_test.cpp

@@ -33,20 +33,23 @@ CASE("Reading single entry tar file")
   EXPECT_NOT(fd == -1);
   const uint8_t *mem = (const uint8_t *)mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
   tar::Tar tar = r.read_uncompressed(mem, size);
+  EXPECT(tar.num_elements() == 1);
   auto names = tar.element_names();
   EXPECT(names.size() == 1);
   const auto& elements = tar.elements();
   EXPECT(elements.size() == 1);
   const auto& e = elements.at(0);
   EXPECT_NOT(e.is_dir());
   EXPECT(e.typeflag_is_set());
+  EXPECT(e.typeflag() == REGTYPE); // regular file
   EXPECT_NOT(e.is_empty());
   EXPECT(e.is_ustar());
   EXPECT_NOT(e.is_tar_gz());
   EXPECT(e.num_content_blocks() > 0);
   EXPECT(e.size() > 0);
   const auto& name = e.name();
   EXPECT(name.find("CMakeLists.txt") != std::string::npos);
+  EXPECT_NO_THROW(auto& only_element = tar.element("../CMakeLists.txt"));
   EXPECT_THROWS_AS(auto& missing_element = tar.element("not_there.txt"), tar::Tar_exception);
   close(fd);
 }
@@ -84,3 +87,25 @@ CASE("Reading invalid tar file")
   EXPECT_THROWS_AS(tar::Tar tar = r.read_uncompressed(mem, size), tar::Tar_exception);
   close(fd);
 }
+
+CASE("Reading tar.gz inside tar file")
+{
+  tar::Reader r;
+  struct stat st;
+  int res = stat("test-tar-gz-inside.tar", &st);
+  EXPECT(res != -1);
+  size_t size = st.st_size;
+  int fd = open("test-tar-gz-inside.tar", O_RDONLY);
+  EXPECT_NOT(fd == -1);
+  const uint8_t *mem = (const uint8_t *)mmap(0, size, PROT_READ, MAP_PRIVATE, fd, 0);
+  tar::Tar tar = r.read_uncompressed(mem, size);
+  EXPECT(tar.num_elements() == 1);
+  const auto& e = tar.elements().at(0);
+  EXPECT(e.is_tar_gz());
+  EXPECT(e.name().find(".tar.gz") != std::string::npos);
+  tar::Tar inner_tar = r.decompress(e);
+  EXPECT(inner_tar.num_elements() == 1);
+  const auto& inner_e = inner_tar.elements().at(0);
+  EXPECT(inner_e.name().find(".tar.gz") == std::string::npos);
+  close(fd);
+}