Compare commits

..
11 Commits
Author SHA1 Message Date
Sparkle-Bot ac2def288c Update Package management files for version 2.9.6 2026-08-16 23:18:38 +00:00
Zorg de8eb17d17 Update CHANGELOG for 2.9.6 2026-08-16 15:52:51 -07:00
Zorg f6bc73a38c Harden safety of installer moving the download archive 2026-08-16 15:29:48 -07:00
Zorg 51245ef5b9 Reject package based installs when signing validation failed (#2895)
Package updates require EdDSA signing, therefore there is no code signing mechanism to fallback on.
2026-08-16 15:29:48 -07:00
Zorg c34faaed4c Don't copy progress tool for root user (#2897)
This way we don't have to create cache directories under a different user to launch the progress tool. Longer term I want to never copy the tool.
2026-08-15 09:37:58 -07:00
Sparkle-Bot 79bc9e8729 Update Package management files for version 2.9.5 2026-07-29 15:13:39 +00:00
Zorg be4882f1ff Update CHANGELOG for 2.9.5 2026-07-29 08:06:17 -07:00
Zorg 77669eabe8 Harden patching delta file against symbolic link at destination path (#2891) 2026-07-29 08:03:59 -07:00
Sparkle-Bot b6496a74a0 Update Package management files for version 2.9.4 2026-07-02 03:38:14 +00:00
Zorg 4ba9745eca Update CHANGELOG for version 2.9.4 2026-07-01 20:33:39 -07:00
Zorg 1ec540d537 Use activateIgnoringOtherApps: again for backgrounded apps (#2890) 2026-07-01 20:33:09 -07:00
25 changed files with 413 additions and 123 deletions

No files matched your search

+48 -6
View File
@@ -481,9 +481,21 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
return;
}
// Try to resolve the download URL from symlinks
SUFileManager *fileManager = [[SUFileManager alloc] init];
NSError *resolveError = nil;
NSURL *resolvedDownloadURL = [fileManager resolveSymlinksInURL:downloadURL isDirectory:NO error:&resolveError];
if (resolvedDownloadURL == nil) {
SULogError(resolveError);
// Try to fallback onto regular downloadURL if resolving fails
// Later file operations are performed safely even if the URL doesn't have symlinks resolved.
resolvedDownloadURL = downloadURL;
}
// Validate the download URL before moving it
{
NSArray<NSString *> *downloadURLPathComponents = downloadURL.URLByResolvingSymlinksInPath.pathComponents;
NSArray<NSString *> *downloadURLPathComponents = resolvedDownloadURL.pathComponents;
if (downloadURLPathComponents == nil) {
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to retrieve path components from download URL" }]];
@@ -546,12 +558,42 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
// This prevents eg: if a bug exists in the updater that removes files we are trying to install
// When this tool is ran as root, we are moving it into a directory that only root will have access to
NSURL *downloadDestinationURL = [[NSURL fileURLWithPath:cacheInstallationPath] URLByAppendingPathComponent:downloadName];
NSURL *cacheInstallationURL = [NSURL fileURLWithPath:cacheInstallationPath isDirectory:YES];
NSError *moveError = nil;
if (![[[SUFileManager alloc] init] moveItemAtURL:downloadURL toURL:downloadDestinationURL error:&moveError]) {
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to move download archive to new location", NSUnderlyingErrorKey: moveError }]];
return;
NSError *resolvedCacheInstallationError = nil;
NSURL *resolvedCacheInstallationURL = [fileManager resolveSymlinksInURL:cacheInstallationURL isDirectory:YES error:&resolvedCacheInstallationError];
if (resolvedCacheInstallationURL == nil) {
// Fallback to original cache installation URL if resolving fails
SULogError(resolvedCacheInstallationError);
resolvedCacheInstallationURL = cacheInstallationURL;
}
NSURL *downloadDestinationURL = [resolvedCacheInstallationURL URLByAppendingPathComponent:downloadName isDirectory:NO];
BOOL fallbackToFileCopy;
if (@available(macOS 11, *)) {
NSError *renameError = nil;
if (![fileManager renameItemAtResolvedSymlinkURL:resolvedDownloadURL toResolvedSymlinkURL:downloadDestinationURL error:&renameError]) {
SULog(SULogLevelError, @"Error: failed to rename '%@' to '%@'. Falling back to copy operation.", resolvedDownloadURL.path, downloadDestinationURL.path);
SULogError(renameError);
fallbackToFileCopy = YES;
} else {
fallbackToFileCopy = NO;
}
} else {
fallbackToFileCopy = YES;
}
if (fallbackToFileCopy) {
// The client will be responsible for cleaning up the download.
// We will not risk removing it here if rename failed. Copying the file is safer.
NSError *copyError = nil;
if (![fileManager copyItemAtURL:resolvedDownloadURL toURL:downloadDestinationURL error:&copyError]) {
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to copy download archive to new location", NSUnderlyingErrorKey: copyError }]];
return;
}
}
// Make sure the downloaded archive we moved over is a regular file and not a symbolic link placed by an attacker
+1
View File
@@ -20,6 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_CLONE_LOOKUP 4
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_TOO_MANY_FILES 5
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_LINK_TOO_LONG 6
#define SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_ITEM_INDEX 7
/*
Modern container format for binary delta archives.
+6 -1
View File
@@ -458,7 +458,12 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
if (commands == SPUDeltaItemCommandEndMarker) {
break;
}
if (currentItemIndex >= relativeFilePaths.count) {
_error = [NSError errorWithDomain:SPARKLE_DELTA_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_ARCHIVE_ERROR_CODE_BAD_ITEM_INDEX userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Item index %llu is past relative path table bounds of length %lu", currentItemIndex, (unsigned long)relativeFilePaths.count] }];
break;
}
// Check if we need to decode additional data
uint16_t decodedMode = 0;
uint64_t decodedDataLength = 0;
+13 -3
View File
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <stdlib.h>
#import <sys/stat.h>
#include <unistd.h>
#include "AppKitPrevention.h"
@@ -229,8 +230,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
}
}
// Don't use -[NSFileManager fileExistsAtPath:] because it will follow symbolic links
BOOL fileExisted = verbose && [fileManager attributesOfItemAtPath:destinationFilePath error:nil];
BOOL fileExisted = verbose && fileExists(destinationFilePath);
BOOL removedFile = NO;
// Files that have no property set that we check for will get ignored
@@ -320,8 +320,18 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
// applyBinaryDeltaToFile() normally preserves file permissions on the file it's replacing.
// However this is not possible if the destination file we're patching is not writable.
// We also need to preserve permissions for clones except when we'll be changing permissions later anyway.
BOOL destinationFileIsWritable;
{
const char *destinationFileSystemRepresentation = destinationFilePath.fileSystemRepresentation;
struct stat destinationFileInfo;
destinationFileIsWritable =
(lstat(destinationFileSystemRepresentation, &destinationFileInfo) == 0 &&
!S_ISLNK(destinationFileInfo.st_mode) &&
access(destinationFileSystemRepresentation, W_OK) == 0);
}
BOOL needsToCopyFilePermissions;
if (![fileManager isWritableFileAtPath:destinationFilePath]) {
if (!destinationFileIsWritable) {
// Remove the file non-writable we're patching that may cause issues
[fileManager removeItemAtPath:destinationFilePath error:NULL];
+1
View File
@@ -70,6 +70,7 @@ NSString *displayHashFromRawHash(const unsigned char *hash);
void getRawHashFromDisplayHash(unsigned char *hash, NSString *hexHash);
extern NSString *hashOfTreeWithVersion(NSString *path, uint16_t majorVersion);
extern NSString *hashOfTree(NSString *path);
BOOL fileExists(NSString *path);
extern BOOL removeTree(NSString *path);
extern BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest);
extern BOOL modifyPermissions(NSString *path, mode_t desiredPermissions);
+10 -4
View File
@@ -453,14 +453,20 @@ extern NSString *hashOfTree(NSString *path)
return hashOfTreeWithVersion(path, SUBinaryDeltaMajorVersionLatest);
}
BOOL fileExists(NSString *path)
{
// Don't use fileExistsForPath: because it will try to follow symbolic links
struct stat fileInfo;
return lstat(path.fileSystemRepresentation, &fileInfo) == 0;
}
BOOL removeTree(NSString *path)
{
NSFileManager *fileManager = [NSFileManager defaultManager];
// Don't use fileExistsForPath: because it will try to follow symbolic links
if (![fileManager attributesOfItemAtPath:path error:nil]) {
if (!fileExists(path)) {
return YES;
}
return [fileManager removeItemAtPath:path error:nil];
return [NSFileManager.defaultManager removeItemAtPath:path error:nil];
}
BOOL copyTree(NSFileManager *fileManager, NSString *source, NSString *dest)
+14
View File
@@ -1,3 +1,17 @@
# 2.9.6
* Harden safety of installer moving the download archive (#2898) (Zorg, Joshua Rogers)
* Don't copy progress tool for root user (#2897) (Zorg, Joshua Rogers)
* Reject package based installs when signing validation failed (#2895) (Zorg)
# 2.9.5
* Harden patching delta file against symbolic link at destination path (#2891) (Zorg, Arpit Jain)
# 2.9.4
* Fix backgrounded apps sometimes not bringing windows from user initiated actions in active focus (#2890) (Zorg, wojciech-kulik)
# 2.9.3
* Fix updating not working the first time if the app's bundle ID ends with ".app" (#2882) (Zorg)
+1 -1
View File
@@ -1 +1 @@
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
+2 -2
View File
@@ -99,12 +99,12 @@ SPARKLE_ICON_NAME = AppIcon
// These variables must have a space after the '=' too
SPARKLE_VERSION_MAJOR = 2
SPARKLE_VERSION_MINOR = 9
SPARKLE_VERSION_PATCH = 3
SPARKLE_VERSION_PATCH = 6
// This should be in SemVer format or empty, ie. "-beta.1"
// These variables must have a space after the '=' too
SPARKLE_VERSION_SUFFIX =
CURRENT_PROJECT_VERSION = 2058
CURRENT_PROJECT_VERSION = 2061
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
ALWAYS_SEARCH_USER_PATHS = NO
+35 -44
View File
@@ -32,7 +32,7 @@
@implementation SUInstallerLauncher
- (BOOL)submitProgressToolAtPath:(NSString *)progressToolPath withHostBundle:(NSBundle *)hostBundle inSystemDomainForInstaller:(BOOL)inSystemDomainForInstaller SPU_OBJC_DIRECT
- (BOOL)submitProgressToolAtPath:(NSString *)progressToolPath withHostBundle:(NSBundle *)hostBundle inSystemDomainForInstaller:(BOOL)inSystemDomainForInstaller copiedApplication:(BOOL)copiedApplication SPU_OBJC_DIRECT
{
SUFileManager *fileManager = [[SUFileManager alloc] init];
@@ -53,7 +53,7 @@
NSString *hostBundleIdentifier = hostBundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
NSArray<NSString *> *arguments = @[executablePath, hostBundlePath, @(inSystemDomainForInstaller).stringValue];
NSArray<NSString *> *arguments = @[executablePath, hostBundlePath, @(inSystemDomainForInstaller).stringValue, @(copiedApplication).stringValue];
// The progress tool can only be ran as the logged in user, not as root
CFStringRef domain = kSMDomainUserLaunchd;
@@ -506,8 +506,6 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
NSString *userName;
NSString *homeDirectory;
uid_t uid = 0;
gid_t gid = 0;
if (!rootUser) {
// Normal path
homeDirectory = NSHomeDirectory();
@@ -518,7 +516,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
} else {
// As the root user we need to obtain the user name and home directory reflecting
// the user's console session.
CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, &uid, &gid);
CFStringRef userNameRef = SCDynamicStoreCopyConsoleUser(NULL, NULL, NULL);
if (userNameRef == NULL) {
SULog(SULogLevelError, @"Failed to retrieve user name from the console user");
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
@@ -539,55 +537,48 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
// We can't compare the signature of this framework/XPC service (depending how it's run) to the host bundle because
// they could be different (eg: take a look at sparkle-cli). We also can't easily tell if the signature of the service/framework is the same as the bundle it's inside.
// The service/framework also need not even be signed in the first place. We'll just assume for now the original bundle hasn't been tampered with
NSString *cachePath = rootUser ?
[SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier userName:userName] :
[SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier];
NSString *rootLauncherCachePath = [cachePath stringByAppendingPathComponent:@"Launcher"];
[SPULocalCacheDirectory removeOldItemsInDirectory:rootLauncherCachePath];
NSDictionary<NSFileAttributeKey, id> *fileAttributes = rootUser ?
@{NSFileOwnerAccountID: @(uid), NSFileGroupOwnerAccountID: @(gid)} :
nil;
NSString *launcherCachePath = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootLauncherCachePath intermediateDirectoryFileAttributes:fileAttributes];
if (launcherCachePath == nil) {
SULog(SULogLevelError, @"Failed to create cache directory for progress tool in %@", rootLauncherCachePath);
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
return;
}
SUFileManager *fileManager = [[SUFileManager alloc] init];
if (rootUser) {
// Ensure the console user has ownership of the launcher cache directory
// Otherwise the updater may not launch and not be able to clean up itself
NSError *changeOwnerAndGroupError = nil;
if (![fileManager changeOwnerAndGroupOfItemAtURL:[NSURL fileURLWithPath:launcherCachePath] ownerID:uid groupID:gid error:&changeOwnerAndGroupError]) {
SULog(SULogLevelError, @"Failed to change owner and group for launcher cache directory: %@", changeOwnerAndGroupError);
// Don't create cache directories or copy the progress tool app outside of the bundle for root user,
// because the app will not start if it's contained inside directories owned by root,
// and un-doing that opens up potential security issues.
// Eventually we will also want to not copy the tool app in the !rootUser case, minimizing risk
// by not making that change yet.
BOOL copyProgressTool = !rootUser;
NSString *progressToolPath;
if (copyProgressTool) {
NSString *cachePath = [SPULocalCacheDirectory cachePathForBundleIdentifier:hostBundleIdentifier];
NSString *rootLauncherCachePath = [cachePath stringByAppendingPathComponent:@"Launcher"];
[SPULocalCacheDirectory removeOldItemsInDirectory:rootLauncherCachePath];
NSString *launcherCachePath = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootLauncherCachePath];
if (launcherCachePath == nil) {
SULog(SULogLevelError, @"Failed to create cache directory for progress tool in %@", rootLauncherCachePath);
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
return;
}
}
NSString *progressToolPath = [launcherCachePath stringByAppendingPathComponent:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app"];
NSError *copyError = nil;
// SUFileManager is more reliable for copying files around
if (![fileManager copyItemAtURL:[NSURL fileURLWithPath:progressToolResourcePath] toURL:[NSURL fileURLWithPath:progressToolPath] error:&copyError]) {
SULog(SULogLevelError, @"Failed to copy progress tool to cache: %@", copyError);
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
return;
progressToolPath = [launcherCachePath stringByAppendingPathComponent:@""SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app"];
NSError *copyError = nil;
// SUFileManager is more reliable for copying files around
SUFileManager *fileManager = [[SUFileManager alloc] init];
if (![fileManager copyItemAtURL:[NSURL fileURLWithPath:progressToolResourcePath] toURL:[NSURL fileURLWithPath:progressToolPath] error:&copyError]) {
SULog(SULogLevelError, @"Failed to copy progress tool to cache: %@", copyError);
completionHandler(SUInstallerLauncherFailure, inSystemDomain);
return;
}
} else {
progressToolPath = progressToolResourcePath;
}
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:mainBundle.bundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
BOOL submittedProgressTool = NO;
if (installerStatus == SUInstallerLauncherSuccess) {
submittedProgressTool = [self submitProgressToolAtPath:progressToolPath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain];
submittedProgressTool = [self submitProgressToolAtPath:progressToolPath withHostBundle:hostBundle inSystemDomainForInstaller:inSystemDomain copiedApplication:copyProgressTool];
if (!submittedProgressTool) {
SULog(SULogLevelError, @"Failed to submit progress tool job");
+3 -3
View File
@@ -2,10 +2,10 @@
import PackageDescription
// Version is technically not required here, SPM doesn't check
let version = "2.9.3"
let version = "2.9.6"
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
let tag = "2.9.3"
let checksum = "3a5d7fd698acc39c122e75764ed3614b472b284cc483f32ae7006d86c513370c"
let tag = "2.9.6"
let checksum = "8d5fb41d960b43f4a68aa14126bf62b098544ec8d191cdcc73eb14e63a8e7606"
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
let package = Package(
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "2.9.3"
s.version = "2.9.6"
s.summary = "A software update framework for macOS"
s.description = "Sparkle is an easy-to-use software update framework for macOS."
s.homepage = "https://sparkle-project.org"
+4
View File
@@ -229,6 +229,7 @@
725CB9571C7120410064365A /* SPUUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9561C7120410064365A /* SPUUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 725CB9581C7121830064365A /* SPUStandardUserDriver.h */; settings = {ATTRIBUTES = (Public, ); }; };
725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725CB9591C7121830064365A /* SPUStandardUserDriver.m */; };
725EA4B23027D2AF0041BFA6 /* test-package-update.xml in Resources */ = {isa = PBXBuildFile; fileRef = 725EA4B13027D2AF0041BFA6 /* test-package-update.xml */; };
725EE480277BF13B00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
725EE482277BF44A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
725EE483277C767A00D820CE /* SPUXarDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */; };
@@ -1187,6 +1188,7 @@
725CB9581C7121830064365A /* SPUStandardUserDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUserDriver.h; sourceTree = "<group>"; };
725CB9591C7121830064365A /* SPUStandardUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUserDriver.m; sourceTree = "<group>"; };
725DED72263D10C400E7FA8F /* SUAppcast+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUAppcast+Private.h"; sourceTree = "<group>"; };
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "test-package-update.xml"; sourceTree = "<group>"; };
725EE47E277BF13A00D820CE /* SPUXarDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUXarDeltaArchive.h; path = Autoupdate/SPUXarDeltaArchive.h; sourceTree = SOURCE_ROOT; };
725EE47F277BF13B00D820CE /* SPUXarDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUXarDeltaArchive.m; path = Autoupdate/SPUXarDeltaArchive.m; sourceTree = SOURCE_ROOT; };
725EE481277BF17A00D820CE /* SPUDeltaArchiveProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUDeltaArchiveProtocol.h; path = Autoupdate/SPUDeltaArchiveProtocol.h; sourceTree = SOURCE_ROOT; };
@@ -1845,6 +1847,7 @@
5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */,
729F7EAB27366353004592DC /* test-links.xml */,
723AD12E29922B5F006BB02F /* test-dangerous-link.xml */,
725EA4B13027D2AF0041BFA6 /* test-package-update.xml */,
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
);
@@ -3138,6 +3141,7 @@
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */,
723AD12F29922B5F006BB02F /* test-dangerous-link.xml in Resources */,
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */,
725EA4B23027D2AF0041BFA6 /* test-package-update.xml in Resources */,
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */,
+22 -17
View File
@@ -62,13 +62,14 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
BOOL _submittedLauncherJob;
BOOL _willTerminate;
BOOL _applicationInitiallyAlive;
BOOL _copiedApplication;
}
- (instancetype)initWithApplication:(NSApplication *)application arguments:(NSArray<NSString *> *)arguments delegate:(id<InstallerProgressDelegate>)delegate
{
self = [super init];
if (self != nil) {
if (arguments.count != 3) {
if (arguments.count != 4) {
SULog(SULogLevelError, @"Error: Invalid number of arguments supplied: %@", arguments);
[self cleanupAndExitWithStatus:EXIT_FAILURE error:nil];
}
@@ -114,7 +115,9 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
_application = application;
_delegate = delegate;
[delegate loadLocalizationStringsFromHost:host];
BOOL copiedApplication = arguments[3].boolValue;
[delegate loadLocalizationStringsFromHost:host copiedApplication:copiedApplication];
_copiedApplication = copiedApplication;
_connection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SPUInstallerAgentProtocol)];
_connection.exportedObject = self;
@@ -193,21 +196,23 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
[_statusInfo invalidate];
[_connection invalidate];
// Remove the agent bundle; it is assumed this bundle is in a temporary/cache/support directory
NSError *theError = nil;
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
if (![[NSFileManager defaultManager] removeItemAtPath:bundlePath error:&theError]) {
SULog(SULogLevelError, @"Couldn't remove agent bundle: %@.", theError);
} else {
// There should be nothing else in the parent temporary directory given to us,
// so let us try to remove it. Note rmdir() will fail if there are unexpectably other
// items present
NSString *parentDirectory = bundlePath.stringByDeletingLastPathComponent;
const char *fileSystemRepresentation = parentDirectory.fileSystemRepresentation;
if (fileSystemRepresentation != NULL) {
if (rmdir(fileSystemRepresentation) != 0) {
SULog(SULogLevelError, @"Failed to remove parent agent bundle directory: %@: %d", parentDirectory, errno);
if (_copiedApplication) {
// Remove the agent bundle; it is assumed this bundle is in a temporary/cache/support directory
NSError *theError = nil;
NSString *bundlePath = [[NSBundle mainBundle] bundlePath];
if (![[NSFileManager defaultManager] removeItemAtPath:bundlePath error:&theError]) {
SULog(SULogLevelError, @"Couldn't remove agent bundle: %@.", theError);
} else {
// There should be nothing else in the parent temporary directory given to us,
// so let us try to remove it. Note rmdir() will fail if there are unexpectably other
// items present
NSString *parentDirectory = bundlePath.stringByDeletingLastPathComponent;
const char *fileSystemRepresentation = parentDirectory.fileSystemRepresentation;
if (fileSystemRepresentation != NULL) {
if (rmdir(fileSystemRepresentation) != 0) {
SULog(SULogLevelError, @"Failed to remove parent agent bundle directory: %@: %d", parentDirectory, errno);
}
}
}
}
+1 -1
View File
@@ -14,7 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
@protocol InstallerProgressDelegate <NSObject>
- (void)loadLocalizationStringsFromHost:(SUHost *)host;
- (void)loadLocalizationStringsFromHost:(SUHost *)host copiedApplication:(BOOL)copiedApplication;
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host;
- (void)installerProgressShouldStop;
+15 -2
View File
@@ -20,7 +20,12 @@
NSString *_installingUpdateTitle;
}
- (void)loadLocalizationStringsFromHost:(SUHost *)host
- (void)createStatusControllerWithHost:(SUHost *)host SPU_OBJC_DIRECT
{
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
}
- (void)loadLocalizationStringsFromHost:(SUHost *)host copiedApplication:(BOOL)copiedApplication
{
// Try to retrieve localization strings from the old bundle if possible
// We won't display these strings until installerProgressShouldDisplayWithHost:
@@ -90,11 +95,19 @@
#endif
_installingUpdateTitle = installingUpdateTitle;
// Initialize status controller immediately if app isn't copied, before the app may be swapped/removed
// This gaurantees we will be able to load the nib
if (!copiedApplication) {
[self createStatusControllerWithHost:host];
}
}
- (void)installerProgressShouldDisplayWithHost:(SUHost *)host
{
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
if (_statusController == nil) {
[self createStatusControllerWithHost:host];
}
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
-5
View File
@@ -21,10 +21,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPULocalCacheDirectory : NSObject
// and then create a unique temporary directory inside it (using +createUniqueDirectoryInDirectory:)
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier;
// Variant of cachePathForBundleIdentifier: that specifies a userName to create the cache path for
// Only use this when running from as root
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier userName:(NSString *)userName;
// Remove old files inside a directory
// A caller may want to invoke this on a directory they own rather than remove and re-create an entire directory
// This does nothing if the supplied directory does not exist yet
@@ -33,7 +29,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPULocalCacheDirectory : NSObject
// Create a unique directory inside a parent directory
// The parent directory doesn't have to exist yet. If it doesn't exist, intermediate directories will be created.
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory;
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory intermediateDirectoryFileAttributes:(nullable NSDictionary<NSFileAttributeKey, id> *)attributes;
@end
+2 -20
View File
@@ -44,19 +44,6 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
return [self _cachePathForCacheDirectory:cacheURL bundleIdentifier:bundleIdentifier];
}
+ (NSString *)cachePathForBundleIdentifier:(NSString *)bundleIdentifier userName:(NSString *)userName
{
NSString *homeDirectory = NSHomeDirectoryForUser(userName);
assert(homeDirectory != nil);
NSURL *homeDirectoryURL = [NSURL fileURLWithPath:homeDirectory isDirectory:YES];
NSURL *cacheURL = [[homeDirectoryURL URLByAppendingPathComponent:@"Library" isDirectory:YES] URLByAppendingPathComponent:@"Caches" isDirectory:YES];
assert(cacheURL != nil);
return [self _cachePathForCacheDirectory:cacheURL bundleIdentifier:bundleIdentifier];
}
+ (void)removeOldItemsInDirectory:(NSString *)directory
{
NSMutableArray<NSString *> *filePathsToRemove = [NSMutableArray array];
@@ -86,11 +73,11 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
}
}
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory intermediateDirectoryFileAttributes:(NSDictionary<NSFileAttributeKey, id> *)intermediateDirectoryFileAttributes
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
{
NSFileManager *fileManager = [NSFileManager defaultManager];
NSError *createError = nil;
if (![fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:intermediateDirectoryFileAttributes error:&createError]) {
if (![fileManager createDirectoryAtPath:directory withIntermediateDirectories:YES attributes:nil error:&createError]) {
SULog(SULogLevelError, @"Failed to create directory with intermediate components at %@ with error %@", directory, createError);
return nil;
}
@@ -107,9 +94,4 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
return nil;
}
+ (NSString * _Nullable)createUniqueDirectoryInDirectory:(NSString *)directory
{
return [self createUniqueDirectoryInDirectory:directory intermediateDirectoryFileAttributes:nil];
}
@end
+4 -5
View File
@@ -128,11 +128,10 @@
- (void)_activateApplication SPU_OBJC_DIRECT
{
if (@available(macOS 14, *)) {
[NSApp activate];
} else {
[NSApp activateIgnoringOtherApps:YES];
}
// -[NSApp activate] does not always work reliably from backgrounded apps when the user initiates checks for updates
// from e.g. a menu bar. The OS should grant active focus to the appliation, but it is inconsistent (last tested on 26.5.1).
// For now we will prefer the deprecated more reliant API
[NSApp activateIgnoringOtherApps:YES];
}
- (void)showUpdatePermissionRequest:(SPUUpdatePermissionRequest *)request reply:(void (^)(SUUpdatePermissionResponse *))reply
+7
View File
@@ -773,6 +773,13 @@ static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSSt
chosenInstallationType = SPUInstallationTypeApplication;
#endif
if (signingValidationStatus == SPUAppcastSigningValidationStatusFailed && ![chosenInstallationType isEqualToString:SPUInstallationTypeApplication]) {
if (error != NULL) {
*error = @"Package based install update is rejected because signing validation on feed failed";
}
return nil;
}
_installationType = [chosenInstallationType copy];
NSString *enclosureDeltaSparkleExecutableSize = [enclosure objectForKey:SUAppcastAttributeDeltaFromSparkleExecutableSize];
+24
View File
@@ -58,6 +58,30 @@ SUFileManagerDefinitionAttribute
*/
- (BOOL)moveItemAtURL:(NSURL *)sourceURL toURL:(NSURL *)destinationURL error:(NSError **)error;
/**
* Renames an item from a source to a destination assuming source and destination URLs have symbolic links resolved.
* @param sourceURL A URL pointing to the item to rename. The item at this URL must exist.
* @param destinationURL A URL pointing to the destination the item will be moved at.
* @param error if an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
* @return YES if the time was renamed successfully, otherwise NO along with a pouplated error object.
*
* sourceURL and destinationURL must reside on the same volume otherwise this operation will fail.
* If any symbolic links are encountered in these paths during path resolution, this operation will fail.
*/
- (BOOL)renameItemAtResolvedSymlinkURL:(NSURL *)sourceURL toResolvedSymlinkURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error API_AVAILABLE(macosx(11.0));
/**
* Returns a URL by resolving links in path.
* @param url A URL pointing to a real file to resolve symlinks in path.
* @param isDirectory Indicates if the URL is a directory.
* @param error if an error occurs, upon returns contains an NSError object that describes the problem. If you are not interested in possible errors, you may pass in NULL.
* @return A URL that is resolved and has no symlinks in its path.
*
* This method is suitable to resolving a URL before passing it to -renameItemAtResolvedSymlinkURL:toResolvedSymlinkURL:error:
* -[NSURL URLByResolvingSymlinksInPath] does not resolve symlinks for file paths starting with /private/ hence the need for this method.
*/
- (NSURL * _Nullable)resolveSymlinksInURL:(NSURL *)url isDirectory:(BOOL)isDirectory error:(NSError * __autoreleasing *)error;
/**
* Swaps an original item with a new item atomically.
* @param originalItemURL A URL pointing to the original item to replace. The item at this URL must exist.
+111 -3
View File
@@ -225,7 +225,28 @@ SPU_OBJC_DIRECT
return [_fileManager moveItemAtURL:sourceURL toURL:destinationURL error:error];
}
- (BOOL)swapItemAtURL:(NSURL *)originalItemURL withItemAtURL:(NSURL *)newItemURL error:(NSError * __autoreleasing *)error
- (NSURL * _Nullable)resolveSymlinksInURL:(NSURL *)url isDirectory:(BOOL)isDirectory error:(NSError * __autoreleasing *)error
{
char path[PATH_MAX] = {0};
if (![url.path getFileSystemRepresentation:path maxLength:sizeof(path)]) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to retrieve file system representation before resolving symlinks in %@", url.path] }];
}
return nil;
}
char resolvedPath[PATH_MAX] = {0};
if (realpath(path, resolvedPath) == NULL) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to resolve symlinks in %@", url.path] }];
}
return nil;
}
return [[NSURL alloc] initFileURLWithFileSystemRepresentation:resolvedPath isDirectory:isDirectory relativeToURL:nil];
}
static BOOL renameFile(NSURL *originalItemURL, NSURL *newItemURL, unsigned int renameFlags, NSError * __autoreleasing *error)
{
char originalPath[PATH_MAX] = {0};
if (![originalItemURL.path getFileSystemRepresentation:originalPath maxLength:sizeof(originalPath)]) {
@@ -243,10 +264,10 @@ SPU_OBJC_DIRECT
return NO;
}
int status = renamex_np(newPath, originalPath, RENAME_SWAP);
int status = renamex_np(originalPath, newPath, renameFlags);
if (status != 0) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to replace %@ with %@.", originalItemURL.lastPathComponent, newItemURL.lastPathComponent] }];
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to renamex_np %@ with %@.", originalItemURL.lastPathComponent, newItemURL.lastPathComponent] }];
}
return NO;
}
@@ -254,6 +275,93 @@ SPU_OBJC_DIRECT
return YES;
}
- (BOOL)renameItemAtResolvedSymlinkURL:(NSURL *)sourceURL toResolvedSymlinkURL:(NSURL *)destinationURL error:(NSError *__autoreleasing *)error
{
if (@available(macOS 13, *)) {
// RENAME_NOFOLLOW_ANY option requires macOS 13+
return renameFile(sourceURL, destinationURL, RENAME_NOFOLLOW_ANY, error);
}
// The old path for renaming the file will involve opening file descriptors to parent directories
// and using renameat() without following any symlinks
NSURL *sourceParentDirectoryURL = sourceURL.URLByDeletingLastPathComponent;
char sourceParentDirectoryPath[PATH_MAX] = {0};
if (![sourceParentDirectoryURL getFileSystemRepresentation:sourceParentDirectoryPath maxLength:sizeof(sourceParentDirectoryPath)]) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Source item parent directory %@ to rename cannot be represented as a valid file name", sourceParentDirectoryURL.lastPathComponent] }];
}
return NO;
}
char sourceLastPathComponentPath[PATH_MAX] = {0};
if (![sourceURL.lastPathComponent getFileSystemRepresentation:sourceLastPathComponentPath maxLength:sizeof(sourceLastPathComponentPath)]) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Source item last path component %@ to rename cannot be represented as a valid file name", sourceURL.lastPathComponent] }];
}
return NO;
}
char destinationParentDirectoryPath[PATH_MAX] = {0};
NSURL *destinationParentDirectoryURL = destinationURL.URLByDeletingLastPathComponent;
if (![destinationParentDirectoryURL getFileSystemRepresentation:destinationParentDirectoryPath maxLength:sizeof(destinationParentDirectoryPath)]) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Destination item parent directory %@ to rename cannot be represented as a valid file name", destinationParentDirectoryURL.lastPathComponent] }];
}
return NO;
}
char destinationLastPathComponentPath[PATH_MAX] = {0};
if (![destinationURL.lastPathComponent getFileSystemRepresentation:destinationLastPathComponentPath maxLength:sizeof(destinationLastPathComponentPath)]) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadInvalidFileNameError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Destination item last path component %@ to rename cannot be represented as a valid file name", destinationURL.lastPathComponent] }];
}
return NO;
}
// sourceURL and destinationURL is required to have symlinks already resolved so we will use O_NOFOLLOW_ANY to open the parent directories without following symlinks in any of intermediate directories
int sourceParentDirectoryFileDescriptor = open(sourceParentDirectoryPath, O_RDONLY | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW_ANY);
if (sourceParentDirectoryFileDescriptor == -1) {
if (error != nil) {
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to open file descriptor to %@", sourceParentDirectoryURL.path.lastPathComponent] }];
}
return NO;
}
int destinationParentDirectoryFileDescriptor = open(destinationParentDirectoryPath, O_RDONLY | O_DIRECTORY | O_CLOEXEC | O_NOFOLLOW_ANY);
if (destinationParentDirectoryFileDescriptor == -1) {
if (error != nil) {
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to open file descriptor to %@", destinationParentDirectoryURL.path.lastPathComponent] }];
}
close(sourceParentDirectoryFileDescriptor);
return NO;
}
BOOL success = (renameat(sourceParentDirectoryFileDescriptor, sourceLastPathComponentPath, destinationParentDirectoryFileDescriptor, destinationLastPathComponentPath) == 0);
if (!success) {
if (error != nil) {
*error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to rename '%@' to '%@'", sourceURL.path, destinationURL.path] }];
}
}
if (sourceParentDirectoryFileDescriptor != -1) {
close(sourceParentDirectoryFileDescriptor);
}
if (destinationParentDirectoryFileDescriptor != -1) {
close(destinationParentDirectoryFileDescriptor);
}
return success;
}
- (BOOL)swapItemAtURL:(NSURL *)originalItemURL withItemAtURL:(NSURL *)newItemURL error:(NSError * __autoreleasing *)error
{
return renameFile(originalItemURL, newItemURL, RENAME_SWAP, error);
}
- (BOOL)changeOwnerAndGroupOfItemAtURL:(NSURL *)targetURL ownerID:(uid_t)ownerID groupID:(gid_t)groupID error:(NSError * __autoreleasing *)error
{
char path[PATH_MAX] = {0};
+18
View File
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
<channel>
<title>For unit test only</title>
<item>
<title>Version 2.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
<sparkle:version>2.0</sparkle:version>
<enclosure url="https://sparkle-project.org/release-2.0.pkg" sparkle:installationType="package" length="1346234" />
</item>
<item>
<title>Version 1.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
<sparkle:version>1.0</sparkle:version>
<enclosure url="https://sparkle-project.org/release-1.0.zip" length="1346234" />
</item>
</channel>
</rss>
+57
View File
@@ -8,6 +8,25 @@
import XCTest
private let packageInstallationAppcastXML = """
<?xml version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
<channel>
<title>For unit test only</title>
<item>
<title>Version 2.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
<enclosure url="https://sparkle-project.org/release-2.0.pkg" sparkle:version="2.0" sparkle:installationType="package" length="1346234" />
</item>
<item>
<title>Version 1.0</title>
<pubDate>Sat, 26 Jul 2014 15:20:12 +0000</pubDate>
<enclosure url="https://sparkle-project.org/release-1.0.zip" sparkle:version="1.0" length="1346234" />
</item>
</channel>
</rss>
"""
class SUAppcastTest: XCTestCase {
func testParseAppcast() {
@@ -1163,4 +1182,42 @@ class SUAppcastTest: XCTestCase {
XCTFail("Appcast creation should have passed when encountering dangerous link of one item")
}
}
func testPackageInstallAllowedWithSkippedSigningValidation() {
let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "test-package-update", ofType: "xml")!
let testData = NSData(contentsOfFile: testFile)!
do {
let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .skipped)
XCTAssertEqual(appcast.items.count, 2)
XCTAssertEqual(appcast.items[0].installationType, SPUInstallationTypeGuidedPackage)
XCTAssertEqual(appcast.items[1].installationType, SPUInstallationTypeApplication)
} catch let err as NSError {
NSLog("Unexpected error: %@", err)
XCTFail("Appcast creation should have passed when signing validation is skipped")
}
}
func testPackageInstallRejectedWithFailedSigningValidation() {
let testFile = Bundle(for: SUAppcastTest.self).path(forResource: "test-package-update", ofType: "xml")!
let testData = NSData(contentsOfFile: testFile)!
do {
let stateResolver = SPUAppcastItemStateResolver(hostVersion: "1.0", applicationVersionComparator: SUStandardVersionComparator.default, standardVersionComparator: SUStandardVersionComparator.default)
let appcast = try SUAppcast(xmlData: testData as Data, relativeTo: nil, stateResolver: stateResolver, signingValidationStatus: .failed)
// The package-based item should be rejected because signing validation on the feed failed;
// only the application-based item should remain
XCTAssertEqual(appcast.items.count, 1)
XCTAssertEqual(appcast.items[0].installationType, SPUInstallationTypeApplication)
XCTAssertEqual(appcast.items[0].versionString, "1.0")
} catch let err as NSError {
NSLog("Unexpected error: %@", err)
XCTFail("Appcast creation should have passed, dropping only the rejected package item")
}
}
}
+13 -5
View File
@@ -343,11 +343,19 @@ int bspatch(int argc,const char * const argv[])
}
epf = NULL;
/* Write the new file */
f = fopen(argv[2], "w");
if (f == NULL) {
warn("failed to write new file: %s", argv[2]);
goto cleanup;
/* Write the new file without following symlinks at the destination path */
{
int newfd = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC | O_NOFOLLOW, 0644);
if (newfd < 0) {
warn("failed to open new file: %s", argv[2]);
goto cleanup;
}
f = fdopen(newfd, "w");
if (f == NULL) {
warn("failed to write new file: %s", argv[2]);
close(newfd);
goto cleanup;
}
}
if (fwrite(newp, 1, (size_t)newsize, f) < (size_t)newsize) {