Resolve symbolic links in readContentsAtPath

thebaselab · Dec 11, 2023 · 68d4728 · 68d4728
1 parent 2649dc1
commit 68d4728
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/NMSSH/NMSFTP.m b/NMSSH/NMSFTP.m
@@ -273,6 +273,15 @@ - (BOOL)readContentsAtPath:(NSString *)path toStream:(NSOutputStream *)outputStr
         NMSSHLogWarn(@"contentsAtPath:progress: failed to get file attributes");
         return NO;
     }
+
+    if ([file isSymbolicLink]) {
+        NSString *linkPath = [self resolveSymbolicLinkAtPath:path];
+        if (!linkPath) {
+            NMSSHLogWarn(@"contentsAtPath:progress: failed to resolve symbolic link");
+            return NO;
+        }
+        return [self readContentsAtPath:linkPath toStream:outputStream progress:progress];
+    }
 
     if ([outputStream streamStatus] == NSStreamStatusNotOpen) {
         [outputStream open];

diff --git a/NMSSH/NMSFTPFile.h b/NMSSH/NMSFTPFile.h
@@ -15,6 +15,9 @@
 /** Property that declares whether the file is a directory or a regular file */
 @property (nonatomic, readonly) BOOL isDirectory;
 
+/** Property that declares whether the file is a symbolic link */
+@property (nonatomic, readonly) BOOL isSymbolicLink;
+
 /** Returns the last modification date of the file */
 @property (nonatomic, nullable, readonly) NSDate *modificationDate;
 

diff --git a/NMSSH/NMSFTPFile.m b/NMSSH/NMSFTPFile.m
@@ -4,6 +4,7 @@
 @interface NMSFTPFile ()
 @property (nonatomic, strong) NSString *filename;
 @property (nonatomic, readwrite) BOOL isDirectory;
+@property (nonatomic, readwrite) BOOL isSymbolicLink;
 @property (nonatomic, strong) NSDate *modificationDate;
 @property (nonatomic, strong) NSDate *lastAccess;
 @property (nonatomic, strong) NSNumber *fileSize;
@@ -35,6 +36,7 @@ - (void)populateValuesFromSFTPAttributes:(LIBSSH2_SFTP_ATTRIBUTES)fileAttributes
     [self setOwnerGroupID:fileAttributes.gid];
     [self setPermissions:[self convertPermissionToSymbolicNotation:fileAttributes.permissions]];
     [self setIsDirectory:LIBSSH2_SFTP_S_ISDIR(fileAttributes.permissions)];
+    [self setIsSymbolicLink:LIBSSH2_SFTP_S_ISLNK(fileAttributes.permissions)];
     [self setFlags:fileAttributes.flags];
 }
 
@@ -164,6 +166,7 @@ - (id)copyWithZone:(NSZone *)zone {
         object.fileSize = [self.fileSize copyWithZone:zone];
         object.permissions = [self.permissions copyWithZone:zone];
         object.isDirectory = self.isDirectory;
+        object.isSymbolicLink = self.isSymbolicLink;
         object.ownerUserID = self.ownerUserID;
         object.ownerGroupID = self.ownerGroupID;
         object.flags = self.flags;