File permission transfer

Protocol.h

@@ -307,7 +307,7 @@ class Protocol {
   /// 1 byte for cmd, 2 bytes for file-name length, Max size of filename, 5
   /// variants(seq-id, data-size, offset, file-size, permission), 1 byte for
   /// flag, 10 bytes prev seq-id
-  static constexpr int64_t kMaxHeader = 1 + 2 + PATH_MAX + 5 * 10 + 2 + 1 + 10;
+  static constexpr int64_t kMaxHeader = 1 + 2 + PATH_MAX + 5 * 10 + 1 + 10;
   /// min number of bytes that must be send to unblock receiver
   static constexpr int64_t kMinBufLength = 256;
   /// max size of done command encoding(1 byte for cmd, 1 for status, 10 for

build/travis_osx.sh

@@ -17,6 +17,7 @@ export PATH=/usr/local/opt/openssl/bin:$CMAKE_BIN_DIR:$HOME/bin:$PATH
 export LD_LIBRARY_PATH=/usr/local/opt/openssl/lib:$HOME/lib:$LD_LIBRARY_PATH
 export OPENSSL_ROOT_DIR=/usr/local/opt/openssl
 export CMAKE_PREFIX_PATH=$HOME
+export WDT_TEST_PERMISSION=0
 openssl version -a
 wget https://www.cmake.org/files/v3.6/$CMAKE_BASE.tar.gz
 tar xfz $CMAKE_BASE.tar.gz

test/FileReaderTest.cpp

@@ -50,6 +50,18 @@ class RandomFile {
   int64_t getSize() const {
     return fileSize_;
   }
+  int32_t getPermission() {
+    if (permission_ == -1) {
+      struct stat fileStat;
+      if (stat(fileName_.c_str(), &fileStat) != 0) {
+        WLOG(ERROR) << "Error when calling stat()";
+        return -1;
+      }
+      permission_ = fileStat.st_mode & (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU |
+                                        S_IRWXG | S_IRWXO);
+    }
+    return permission_;
+  }
   const string& getFileName() const {
     return fileName_;
   }
@@ -65,6 +77,7 @@ class RandomFile {
 
  private:
   int64_t fileSize_{-1};
+  int32_t permission_{-1};
   string fileName_;
   SourceMetaData* metaData_{nullptr};
 };
@@ -98,6 +111,10 @@ void testReadSize(int64_t fileSize, ByteSource& byteSource) {
   EXPECT_EQ(totalSizeRead, fileSize);
 }
 
+void testReadPermission(int32_t permission, ByteSource& byteSource) {
+  EXPECT_EQ(permission, byteSource.getMetaData().permission);
+}
+
 void testFileRead(const WdtOptions& options, int64_t fileSize,
                   bool directReads) {
   RandomFile file(fileSize);
@@ -158,6 +175,7 @@ TEST(FileByteSource, FILEINFO_ODIRECT) {
   ThreadCtx threadCtx(options, true);
   auto byteSource = Q.getNextSource(&threadCtx, code);
   testReadSize(sizeToRead, *byteSource);
+  testReadPermission(file.getPermission(), *byteSource);
 }
 
 TEST(FileByteSource, MULTIPLEFILES_ODIRECT) {
@@ -191,6 +209,7 @@ TEST(FileByteSource, MULTIPLEFILES_ODIRECT) {
       break;
     }
     testReadSize(sizeToRead, *byteSource);
+    testReadPermission(randFiles[fileNumber].getPermission(), *byteSource);
     ++fileNumber;
   }
   EXPECT_EQ(fileNumber, numFiles);
@@ -219,13 +238,16 @@ TEST(FileByteSource, MULTIPLEFILES_REGULAR) {
   Q.setFileInfo(files);
   Q.buildQueueSynchronously();
   ErrorCode code;
+  int fileNumber = 0;
   ThreadCtx threadCtx(options, true);
   while (true) {
     auto byteSource = Q.getNextSource(&threadCtx, code);
     if (!byteSource) {
       break;
     }
     testReadSize(sizeToRead, *byteSource);
+    testReadPermission(randFiles[fileNumber].getPermission(), *byteSource);
+    ++fileNumber;
   }
 }
 }

test/wdt_e2e_simple_test.sh

@@ -49,6 +49,15 @@ if [ -z "$WDT_TEST_SYMLINKS" ] ; then
 fi
 echo "WDT_TEST_SYMLINKS=$WDT_TEST_SYMLINKS"
 
+# Set WDT_TEST_PERMISSION:
+# to 1 : check if permissions match
+# to 0 : when "find -printf %m" does not work, i.e. on Mac
+if [ -z "$WDT_TEST_PERMISSION" ] ; then
+  WDT_TEST_PERMISSION=1
+  umask 0
+fi
+echo "WDT_TEST_PERMISSION=$WDT_TEST_PERMISSION"
+
 # Verbose / to debug failure:
 #WDTBIN="_bin/wdt/wdt -minloglevel 0 -v 99"
 # Normal:
@@ -96,6 +105,10 @@ do
                  -directory="$DIR/src" -filename="$base.$i" -gen_size_mb="$size"
     done
 done
+
+if [ $WDT_TEST_PERMISSION -eq 1 ]; then
+  chmod 01777 $DIR/src/inp.0009765625.1
+fi
 echo "done with setup"
 
 if [ $WDT_TEST_SYMLINKS -eq 1 ]; then
@@ -137,7 +150,7 @@ if [ $DO_VERIFY -eq 1 ] ; then
     echo "Should be no diff"
     (cd $DIR; diff -u src.md5s dst.md5s)
     STATUS=$?
-    if [ $STATUS -eq 0 ] ; then
+    if [ $STATUS -eq 0 ] && [ $WDT_TEST_PERMISSION -eq 1 ]; then
       (cd $DIR/src ; ( find . -type f -printf %f%m\\n | sort ) > ../src.perm )
       (cd $DIR/dst ; ( find . -type f -printf %f%m\\n | sort ) > ../dst.perm )