Version 0.2.1

* Switch to SSToolkit MD5 implementation
* Fix warning in MD5 implementation

Changelog.markdown

@@ -1,12 +1,20 @@
 # SSZipArchive Changelog
 
+### Version 0.2.1
+
+[Released May 9, 2012](https://github.com/samsoffes/sskeychain/tree/0.2.1)
+
+* Support for symbolic links — [@jparishy](http://github.com/jparishy)
+* Fix several warnings
+
 ### Version 0.2.0
 
 [Released May 7, 2012](https://github.com/samsoffes/sskeychain/tree/0.2.0)
 
-* Add unzipping delegate
+* Add unzipping delegate — [@uppfinnarn](http://github.com/uppfinnarn)
 * Fix unzipping with passwords
-* Fix modified at dates
+* Fix modified at dates — [@brantsears](http://github.com/brantsears)
+* Fix truncated files. Ignore the zip headers and unzip until there is no more file. — [@jparishy](http://github.com/jparishy)
 
 ### Version 0.1.2
 

Readme.markdown

@@ -8,12 +8,15 @@ SSZipArchive is a simple utility class for zipping and unzipping files. Features
 * Appending to zip files
 * Zipping files
 * Zipping NSData with a filename
+* Works in ARC and non-ARC projects
 
 ## Adding to your project
 
 1. Add `SSZipArchive.h`, `SSZipArchive.m`, and `minizip` to your project.
 2. Add the `libz` library to your target
 
+You don't need to do anything regarding ARC. SSZipArchive will detect if you're not using ARC and add the required memory management code.
+
 ## Usage
 
 ``` objective-c

SSZipArchive.m

@@ -105,11 +105,36 @@
 			[delegate zipArchiveWillUnzipFileAtIndex:currentFileNumber totalFiles:(NSInteger)globalInfo.number_entry
 										 archivePath:path fileInfo:fileInfo];
 		}
-		
+        
 		char *filename = (char *)malloc(fileInfo.size_filename + 1);
 		unzGetCurrentFileInfo(zip, &fileInfo, filename, fileInfo.size_filename + 1, NULL, 0, NULL, 0);
 		filename[fileInfo.size_filename] = '\0';
-		
+        
+        //
+        // NOTE
+        // I used the ZIP spec from here:
+        // http://www.pkware.com/documents/casestudies/APPNOTE.TXT
+        //
+        // ...to deduce this method of detecting whether the file in the ZIP is a symbolic link.
+        // If it is, it is listed as a directory but has an uncompressed data size greater than
+        // zero (real directories have it equal to 0) and the included, uncompressed data is the
+        // symbolic link path.
+        //
+        
+        const uLong ZipDirectoryVersion = 10;
+        const uLong ZipCompressionMethodStore = 0;
+        
+        BOOL fileIsSymbolicLink = NO;
+        
+        if((fileInfo.version_needed == ZipDirectoryVersion) && // Is it a directory?
+           (fileInfo.compression_method == ZipCompressionMethodStore) && // Is it compressed?
+           (fileInfo.compressed_size > 0)) // Is there any data there?
+        {
+            fileIsSymbolicLink = YES;
+        }
+        
+        //NSLog(@"\"%s\" is symbolic link? %@", filename, fileIsSymbolicLink ? @"Yes." : @"No.");
+           
 		// Check if it contains directory
 		NSString *strPath = [NSString stringWithCString:filename encoding:NSUTF8StringEncoding];
 		BOOL isDirectory = NO;
@@ -137,41 +162,72 @@
             NSLog(@"[SSZipArchive] Error: %@", err.localizedDescription);
         }
 
-        [directoriesModificationDates addObject: [NSDictionary dictionaryWithObjectsAndKeys:fullPath, @"path", modDate, @"modDate", nil]];
+        if(!fileIsSymbolicLink)
+            [directoriesModificationDates addObject: [NSDictionary dictionaryWithObjectsAndKeys:fullPath, @"path", modDate, @"modDate", nil]];
 
         if ([fileManager fileExistsAtPath:fullPath] && !isDirectory && !overwrite) {
 			unzCloseCurrentFile(zip);
 			ret = unzGoToNextFile(zip);
 			continue;
 		}
-		
-		FILE *fp = fopen((const char*)[fullPath UTF8String], "wb");
-		while (fp) {
-			int readBytes = unzReadCurrentFile(zip, buffer, 4096);
+        
+		if(!fileIsSymbolicLink)
+        {
+            FILE *fp = fopen((const char*)[fullPath UTF8String], "wb");
+            while (fp) {
+                int readBytes = unzReadCurrentFile(zip, buffer, 4096);
 
-			if (readBytes > 0) {
-				fwrite(buffer, readBytes, 1, fp );
-			} else {
-				break;
-			}
-		}
-		
-		if (fp) {
-			fclose(fp);
-			
-			// Set the original datetime property
-			if (fileInfo.dosDate != 0) {
-				NSDate *orgDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
-				NSDictionary *attr = [NSDictionary dictionaryWithObject:orgDate forKey:NSFileModificationDate];
-				
-				if (attr) {
-					if ([fileManager setAttributes:attr ofItemAtPath:fullPath error:nil] == NO) {
-						// Can't set attributes 
-						NSLog(@"[SSZipArchive] Failed to set attributes");
-					}
-				}
-			}
-		}
+                if (readBytes > 0) {
+                    fwrite(buffer, readBytes, 1, fp );
+                } else {
+                    break;
+                }
+            }
+            
+            if (fp) {
+                fclose(fp);
+                
+                // Set the original datetime property
+                if (fileInfo.dosDate != 0) {
+                    NSDate *orgDate = [[self class] _dateWithMSDOSFormat:(UInt32)fileInfo.dosDate];
+                    NSDictionary *attr = [NSDictionary dictionaryWithObject:orgDate forKey:NSFileModificationDate];
+                    
+                    if (attr) {
+                        if ([fileManager setAttributes:attr ofItemAtPath:fullPath error:nil] == NO) {
+                            // Can't set attributes 
+                            NSLog(@"[SSZipArchive] Failed to set attributes");
+                        }
+                    }
+                }
+            }
+        }
+        else
+        {
+            // Get the path for the symbolic link
+            
+            NSURL* symlinkURL = [NSURL fileURLWithPath:fullPath];
+            NSMutableString* destinationPath = [NSMutableString string];
+            
+            int bytesRead = 0;
+            while((bytesRead = unzReadCurrentFile(zip, buffer, 4096)) > 0)
+            {
+                buffer[bytesRead] = 0;
+                [destinationPath appendString:[NSString stringWithUTF8String:(const char*)buffer]];
+            }
+            
+            //NSLog(@"Symlinking to: %@", destinationPath);
+            
+            NSURL* destinationURL = [NSURL fileURLWithPath:destinationPath];
+            
+            // Create the symbolic link
+            NSError* symlinkError = nil;
+            [fileManager createSymbolicLinkAtURL:symlinkURL withDestinationURL:destinationURL error:&symlinkError];
+            
+            if(symlinkError != nil)
+            {
+                NSLog(@"Failed to create symbolic link at \"%@\" to \"%@\". Error: %@", symlinkURL.absoluteString, destinationURL.absoluteString, symlinkError.localizedDescription);
+            }
+        }
 		
 		unzCloseCurrentFile( zip );
 		ret = unzGoToNextFile( zip );
@@ -301,7 +357,7 @@
     if (!data) {
 		return NO;
     }
-    zip_fileinfo zipInfo = {0};
+    zip_fileinfo zipInfo = {{0,0,0,0,0,0},0,0,0};
     [self zipInfo:&zipInfo setDate:[NSDate date]];
 
 	zipOpenNewFileInZip(_zip, [filename UTF8String], &zipInfo, NULL, 0, NULL, 0, NULL, Z_DEFLATED, Z_DEFAULT_COMPRESSION);

Tests/SSZipArchive.xcodeproj/project.pbxproj

@@ -18,6 +18,8 @@
 		B215FB6B143AD576003AC546 /* zip.c in Sources */ = {isa = PBXBuildFile; fileRef = B215FB55143AD460003AC546 /* zip.c */; };
 		B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B215FB6C143AD6FF003AC546 /* TestArchive.zip */; };
 		B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */ = {isa = PBXBuildFile; fileRef = B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */; };
+		C5AE4E64155A12760045F3ED /* IncorrectHeaders.zip in Resources */ = {isa = PBXBuildFile; fileRef = C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */; };
+		C5AE4E6D155A8B010045F3ED /* SymbolicLink.zip in Resources */ = {isa = PBXBuildFile; fileRef = C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -40,6 +42,8 @@
 		B215FB64143AD527003AC546 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		B215FB6C143AD6FF003AC546 /* TestArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestArchive.zip; sourceTree = "<group>"; };
 		B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = TestPasswordArchive.zip; sourceTree = "<group>"; };
+		C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = IncorrectHeaders.zip; sourceTree = "<group>"; };
+		C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SymbolicLink.zip; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -116,8 +120,10 @@
 			children = (
 				B215FB61143AD514003AC546 /* SSZipArchiveTests.m */,
 				B215FB5F143AD514003AC546 /* SSZipArchiveTests-Info.plist */,
+				C5AE4E63155A12760045F3ED /* IncorrectHeaders.zip */,
 				B215FB6C143AD6FF003AC546 /* TestArchive.zip */,
 				B23FCC7E1558F1B70026375C /* TestPasswordArchive.zip */,
+				C5AE4E6C155A8B010045F3ED /* SymbolicLink.zip */,
 			);
 			name = SSZipArchiveTests;
 			sourceTree = "<group>";
@@ -176,6 +182,8 @@
 			files = (
 				B215FB6D143AD6FF003AC546 /* TestArchive.zip in Resources */,
 				B23FCC7F1558F1B70026375C /* TestPasswordArchive.zip in Resources */,
+				C5AE4E64155A12760045F3ED /* IncorrectHeaders.zip in Resources */,
+				C5AE4E6D155A8B010045F3ED /* SymbolicLink.zip in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

Tests/SSZipArchiveTests.m

@@ -8,11 +8,14 @@
 
 #import "SSZipArchive.h"
 #import <SenTestingKit/SenTestingKit.h>
+#import <CommonCrypto/CommonDigest.h>
 
 @interface SSZipArchiveTests : SenTestCase <SSZipArchiveDelegate>
 
 - (NSString *)_cachesPath:(NSString *)directory;
 
+- (NSString *)_calculateMD5Digest:(NSData *)data;
+
 @end
 
 @implementation SSZipArchiveTests
@@ -66,6 +69,38 @@
 	STAssertTrue([fileManager fileExistsAtPath:testPath], @"LICENSE unzipped");
 }
 
+- (void)testUnzippingTruncatedFileFix {
+    NSString* zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"IncorrectHeaders" ofType:@"zip"];
+    NSString* outputPath = [self _cachesPath:@"IncorrectHeaders"];
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
+    
+    NSString* intendedReadmeTxtMD5 = @"31ac96301302eb388070c827447290b5";
+    
+    NSString* filePath = [outputPath stringByAppendingPathComponent:@"IncorrectHeaders/Readme.txt"];
+    NSData* data = [NSData dataWithContentsOfFile:filePath];
+    
+    NSString* actualReadmeTxtMD5 = [self _calculateMD5Digest:data];
+    STAssertTrue([actualReadmeTxtMD5 isEqualToString:intendedReadmeTxtMD5], @"Readme.txt MD5 digest should match original.");
+}
+
+- (void)testUnzippingWithSymlinkedFileInside {
+    
+    NSString* zipPath = [[NSBundle bundleForClass:[self class]] pathForResource:@"SymbolicLink" ofType:@"zip"];
+    NSString* outputPath = [self _cachesPath:@"SymbolicLink"];
+    
+    [SSZipArchive unzipFileAtPath:zipPath toDestination:outputPath delegate:self];
+    
+    NSString* testSymlink = [outputPath stringByAppendingPathComponent:@"SymbolicLink/GitHub.app"];
+    
+    NSError* error = nil;
+    NSString* symlinkPath = [[NSFileManager defaultManager] destinationOfSymbolicLinkAtPath:testSymlink error:&error];
+    
+    bool symbolicLinkPersists = ((symlinkPath != nil) && [symlinkPath isEqualToString:@"/Applications/GitHub.app"]) && (error == nil);
+    
+    STAssertTrue(symbolicLinkPersists, @"Symbolic links should persist from the original archive to the outputted files.");
+}
+
 
 // Commented out to avoid checking in several gig file into the repository. Simply add a file named
 // `LargeArchive.zip` to the project and uncomment out these lines to test.
@@ -117,4 +152,16 @@
 	return path;
 }
 
+
+// Taken from https://github.com/samsoffes/sstoolkit/blob/master/SSToolkit/NSData+SSToolkitAdditions.m
+- (NSString *)_calculateMD5Digest:(NSData *)data {
+	unsigned char digest[CC_MD5_DIGEST_LENGTH], i;
+	CC_MD5(data.bytes, (unsigned int)data.length, digest);
+	NSMutableString *ms = [NSMutableString string];
+	for (i = 0; i < CC_MD5_DIGEST_LENGTH; i++) {
+		[ms appendFormat: @"%02x", (int)(digest[i])];
+	}
+	return [ms copy];
+}
+
 @end

minizip/unzip.c

@@ -1629,7 +1629,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method,
     if (password != NULL)
     {
         int i;
-        s->pcrc_32_tab = get_crc_table();
+        s->pcrc_32_tab = (const unsigned long*)get_crc_table();
         init_keys(password,s->keys,s->pcrc_32_tab);
         if (ZSEEK64(s->z_filefunc, s->filestream,
                   s->pfile_in_zip_read->pos_in_zipfile +
@@ -1718,10 +1718,24 @@ extern int ZEXPORT unzReadCurrentFile  (unzFile file, voidp buf, unsigned len)
 
     pfile_in_zip_read_info->stream.avail_out = (uInt)len;
 
+    // NOTE:
+    // This bit of code seems to try to set the amount of space in the output buffer based on the
+    // value stored in the headers stored in the .zip file. However, if those values are incorrect
+    // it may result in a loss of data when uncompresssing that file. The compressed data is still
+    // legit and will deflate without knowing the uncompressed code so this tidbit is unnecessary and
+    // may cause issues for some .zip files.
+    //
+    // It's removed in here to fix those issues.
+    //
+    // See: https://github.com/samsoffes/ssziparchive/issues/16
+    //
+    
+    /*
     if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
         (!(pfile_in_zip_read_info->raw)))
         pfile_in_zip_read_info->stream.avail_out =
             (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+     */
 
     if ((len>pfile_in_zip_read_info->rest_read_compressed+
            pfile_in_zip_read_info->stream.avail_in) &&

minizip/zip.c

@@ -1250,7 +1250,7 @@ extern int ZEXPORT zipOpenNewFileInZip4_64 (zipFile file, const char* filename,
         unsigned char bufHead[RAND_HEAD_LEN];
         unsigned int sizeHead;
         zi->ci.encrypt = 1;
-        zi->ci.pcrc_32_tab = get_crc_table();
+        zi->ci.pcrc_32_tab = (const unsigned long*)get_crc_table();
         /*init_keys(password,zi->ci.keys,zi->ci.pcrc_32_tab);*/
 
         sizeHead=crypthead(password,bufHead,RAND_HEAD_LEN,zi->ci.keys,zi->ci.pcrc_32_tab,crcForCrypting);