Compare commits

..
33 Commits
Author SHA1 Message Date
b7debdbd5c Update Hungarian localization (#2958)
Co-authored-by: Torma Zsolt <243981888+tormazs@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-19 20:33:12 -08:00
Sparkle-Bot ee647c7bb7 Update Package management files for version 2.11.0-beta.1 2026-11-16 20:27:23 -08:00
Zorg ae7ee0900c Update CHANGELOG for 2.11.0 2026-11-16 20:27:12 -08:00
Zorg 5e23d45a9b Wait for additional time for installation to complete on shutdown (#2946)
This is meant to increase the success of downloaded updates from finishing installing on system shutdown. The updater progress app needs to use dispatch source for observing when the PID dies because LaunchServices may no longer be available at this point.

Before an update is superceded we will need to send a skip/cancel message to expedite the termination of the helpers.
2026-11-15 15:34:14 -08:00
Zorg 3df8c96fcb Add <sparkle:bundleIdentifier> on appcast for signed feeds (#2954) 2026-11-15 15:17:39 -08:00
Zorg b390cd147f Avoid using host bundle filename for finding bundle to update (#2953)
The user can rename the host bundle filename so it's not reliable and gives a false sense of reliability. We keep matching against the name of the bundle derived from the Info.plist and the bundle identifier.
2026-11-14 16:32:12 -08:00
Niklas Wenzel 4b20aee135 Activate app if update check is initiated from NSStatusItem (#2950) 2026-11-11 20:23:59 -08:00
1024jp 95533f1811 Update Japanese localization (#2948)
- Add missing translations.
- Refine existing translations to make them sound more like macOS.
2026-11-10 19:58:34 -08:00
Zorg 637f5d0726 Update pull request template to include localizations / update script (#2949) 2026-11-08 21:10:30 -08:00
Zorg f1dccde44b Update CI runners to use Xcode 27.2 as default runner (#2947) 2026-11-08 07:52:03 -08:00
RoomWithOutRoof 14fdbf28dc Fix typos in comments and documentation (#2945) 2026-11-01 17:09:43 -08:00
Sparkle-Bot 0c8c6f2757 Update Package management files for version 2.10.1 2026-10-25 07:38:14 -07:00
Zorg b690361fbc Update CHANGELOG for 2.10.1 2026-10-25 07:38:14 -07:00
Zorg 76583dcf69 Trim whitespace/newline characters from <sparkle:releaseNotesLink> (#2944)
This fixes a regression introduced in Sparkle 2.9 when signed feeds were added. In our documentation we have suggested surrounding the release notes URL with newline/whitespace for pretty-print formatting reasons. However now that this bug surfaced, the documentation will be updated to remove the extraneous whitespace. Many developers generating appcasts programmatically or with generate_appcast will not run into this issue.
2026-10-24 12:34:21 -07:00
Zorg 19688c1a0a Fix update being installed before app terminates if it's located in NFC unicode encoded path (#2943)
Normalize the path on both sides (NSRunningApplication and path on disk) consistently using URLByResolvingSymlinksInPath.
2026-10-23 20:35:28 -07:00
Sebastian Livoni 915f33a5bd Complete Danish translation (#2940) 2026-10-22 21:53:09 -07:00
Zorg 29285a5e80 Fix update alert checkbox position in RTL languages (#2936)
This is for the automatically download/install updates button.
2026-10-18 19:59:13 -07:00
ZorgandAnderson4366 e970b939dd Modernize update permission prompt (#2935)
* Changed Update Permission Prompt to resemble Tahoe Alert

* Simplified layout code and cleaned up the xib for Interface Builder

* Fixed checkbox alignment in right to left languages

---------

Co-authored-by: Anderson4366 <neo.volkmann@icloud.com>
2026-10-18 19:57:52 -07:00
Zorg b41aa91142 Unarchive disk images using diskutil (#2930)
This change adopts using diskutil for dmg extraction on macOS 27.2+ where hdiutil has been deprecated.
2026-10-10 18:29:43 -07:00
Zorg e95f42b156 Download and install newer update while prior one is in flight (#2928)
The update cycle is refactored and simplified. Notably we remove a suite of classes (automatic, probe, UI scheduled, UI initiated, core, basic, more..) and collapse them into a single update driver. If the update driver is started in automatic mode, it can escalate into UI mode without ending the cycle (previously we would end the cycle and flag that the next cycle had to be started in a UI mode carrying the previous update). SPUUpdater doesn't do installer progress queries anymore and thus these have been reduced.

Even if a prior update has been downloaded before, the updater uses the regular scheduled check interval and the update driver is responsible for determining whether or not the impatient update interval has elapsed. Every update check checks if a newer superseded update is available and if it should replace any updates that have been previously been downloaded or started installing.

The two conditions we do not check for superseded updates is if the installer is ran in the system domain (requiring authorization), and updating other bundles from an external updater (to not conflict with apps self-updating themselves).

This change adds a UI test to test a superseded update is downloaded and began to install automatically.

Fixes #2469. Previous attempt was in #2908 but I decided that was hacking the current architecture too much and exposing issues making it hard to implement this functionality correctly. Used AI for much of this refactoring, reviewing, and code implementation.
2026-10-03 21:16:37 -07:00
Andrii Selivanov fb45c17efe Add missing "Install on Quit" localizations for uk, ru, fr, es, pt-PT. (#2931) 2026-10-03 12:23:44 -07:00
Tiffany Fung fd34238cbb Add and update translations for Chinese (Hong Kong) (zh-HK) (#2926) 2026-09-18 21:38:51 -07:00
Leo Camus ad06a46ec8 Drop stale sparkle:format when generate_appcast embeds HTML release notes (#2927)
When an existing item's description is rewritten with HTML release notes,
the sparkle:format attribute from a previous plain-text or markdown
description was kept, so Sparkle kept rendering the new HTML as that format.
2026-09-18 21:00:27 -07:00
Leo Camus 7a8baa664b Skip en and Base when recording Sparkle locales in generate_appcast (#2925)
The guard compared the directory name (e.g. "en.lproj") against "en" and
"Base", so it never matched and both locales were recorded in
sparkle:deltaFromSparkleLocales, taking up slots of the 7 sampled locales.
Compare the locale name after dropping the .lproj extension instead.
2026-09-16 20:41:23 -07:00
Leo Camus 07db2480ad Fix appcast child elements being ignored when the Sparkle namespace uses a custom prefix (#2923)
The children of <sparkle:informationalUpdate> and <sparkle:tags> were matched
against their qualified name instead of being resolved through the Sparkle
namespace URI, unlike every other element in the parser.
2026-09-15 20:26:26 -07:00
Zorg efc9a22635 Handle stored dates that are in the future (#2914)
This is a correctness fix for system profile submission checking, periodic cache cleanup, and failed signed feed expiration check.
2026-09-14 20:48:10 -07:00
Sparkle-Bot 5fddc926a3 Update Package management files for version 2.10.0 2026-09-13 16:57:15 -07:00
Zorg 363e84a708 Update CHANGELOG for 2.10.0 with new changes 2026-09-13 16:57:15 -07:00
Zorg 7c41198f44 Fix unused appcast length fallback if server reports no content size (#2922)
Potentially this could result in an indeterminate progress bar even though the appcast specifies the length of the download.
2026-09-13 15:44:35 -07:00
Leo Camus 7565a07922 Fix reading release notes content length from appcast (#2921) 2026-09-13 08:13:54 -07:00
Zorg 2be877fd1f Remove old compile time availability guards (#2920) 2026-09-12 20:55:57 -07:00
Zorg beb5a35007 Reduce quick transition change when checking for updates (#2919)
If the user initiated update check performs fast enough, we won't show the check for updates progress status window, and transition right away to the new update / update not found / update error occurred windows.
2026-09-12 20:28:10 -07:00
Zorg f3ae7afb68 Cache and validate feed data downloaded in the background (#2910) 2026-09-12 10:38:54 -07:00
75 changed files with 2659 additions and 2868 deletions

No files matched your search

+1
View File
@@ -6,6 +6,7 @@ Fixes # (issue)
- [ ] My change requires a documentation update on [Sparkle's website repository](https://github.com/sparkle-project/sparkle-project.github.io)
- [ ] My change requires changes to generate_appcast, generate_keys, or sign_update
- [ ] My change updates localizations and I ran Configurations/generate_progress_tool_localizations.py if a string I updated has a comment to run it.
- [ ] My change was generated/assisted using AI and if so was reviewed by me in whole (explain in detail in the summary)
## Testing
+7 -7
View File
@@ -10,17 +10,17 @@ jobs:
build:
strategy:
matrix:
xcode: ['xcode26.6', 'xcode27.0']
xcode: ['xcode27.2', 'xcode26.6']
include:
- xcode: 'xcode27.0'
xcode-path: '/Applications/Xcode_27.0.app/Contents/Developer'
upload-dist: false
run-analyzer: false
- xcode: 'xcode27.2'
xcode-path: '/Applications/Xcode_27.2.app/Contents/Developer'
upload-dist: true
run-analyzer: true
image: 'xcode-27'
- xcode: 'xcode26.6'
xcode-path: '/Applications/Xcode_26.6.app/Contents/Developer'
upload-dist: true
run-analyzer: true
upload-dist: false
run-analyzer: false
image: 'macos-26'
name: Build and Test Sparkle
+2 -2
View File
@@ -2,7 +2,7 @@ name: "Create Draft Release"
env:
BUILDDIR: "build"
DEVELOPER_DIR: "/Applications/Xcode_26.6.app/Contents/Developer"
DEVELOPER_DIR: "/Applications/Xcode_27.2.app/Contents/Developer"
on:
workflow_dispatch:
@@ -29,7 +29,7 @@ concurrency:
jobs:
release:
name: "Publish binaries for release"
runs-on: macos-26
runs-on: xcode-27
steps:
- name: "Checkout sources"
+2
View File
@@ -17,6 +17,8 @@ SPU_OBJC_DIRECT_MEMBERS @interface AppInstaller : NSObject
- (void)start;
- (void)handleTerminationRequest;
- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn));
@end
+34 -2
View File
@@ -45,6 +45,10 @@
*/
static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
// This is slightly longer than SUTerminationRequestTargetWaitDelay in the installer progress app
// to give extra time to allow receiving the termination message and finishing installation
static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 2.0;
@interface AppInstaller () <NSXPCListenerDelegate, SUInstallerCommunicationProtocol, AgentConnectionDelegate>
@end
@@ -103,6 +107,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
BOOL _performedStage3Installation;
BOOL _targetTerminated;
BOOL _receivedTerminationRequest;
}
- (instancetype)initWithHostBundleIdentifier:(NSString *)hostBundleIdentifier homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName
@@ -247,8 +252,15 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
[_communicator handleMessageWithIdentifier:SPUExtractionStarted data:[NSData data]];
NSString *archivePath = [_updateDirectoryPath stringByAppendingPathComponent:_downloadName];
id<SUUnarchiverProtocol> unarchiver = [SUUnarchiver unarchiverForPath:archivePath extractionDirectory:_extractionDirectory updatingHostBundlePath:_host.bundlePath decryptionPassword:_decryptionPassword expectingInstallationType:_installationType];
NSString *extractionMountDirectory;
if ([SUUnarchiver canUseExtractionMountDirectory:archivePath]) {
extractionMountDirectory = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:_updateDirectoryPath];
} else {
extractionMountDirectory = nil;
}
id<SUUnarchiverProtocol> unarchiver = [SUUnarchiver unarchiverForPath:archivePath extractionDirectory:_extractionDirectory extractionMountDirectory:extractionMountDirectory updatingHostBundlePath:_host.bundlePath decryptionPassword:_decryptionPassword expectingInstallationType:_installationType];
NSError *prevalidationError = nil;
BOOL success = NO;
@@ -375,6 +387,26 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
}
}
- (void)handleTerminationRequest
{
// When we receive a termination quit request do not clean up the update directory
// to reduce risk of removing something in the directory while the installer thread tries to install/swap
// an update bundle from there
if (_performedStage1Installation) {
if (!_receivedTerminationRequest) {
_receivedTerminationRequest = YES;
// Give grace period before doing forceful exit,
// which may give some time to finish an app update installation.
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUTerminationRequestTargetWaitDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
exit(SIGTERM);
});
}
} else {
exit(SIGTERM);
}
}
- (void)agentConnectionDidInvalidate
{
if (!_finishedValidation || !_agentInitiatedConnection || !_targetTerminated) {
-2
View File
@@ -73,8 +73,6 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUDeltaArchiveItem : NSObject
// For reading, file items cannot be extracted out of order.
@protocol SPUDeltaArchiveProtocol <NSObject>
@property (nonatomic, readonly, class) BOOL maySupportSafeExtraction;
// If non-nil, there was an error with reading or writing data from the archive
@property (nonatomic, readonly, nullable) NSError *error;
-5
View File
@@ -52,11 +52,6 @@ typedef struct
@synthesize error = _error;
+ (BOOL)maySupportSafeExtraction
{
return YES;
}
- (instancetype)initWithPatchFileForWriting:(NSString *)patchFile
{
self = [super init];
-16
View File
@@ -17,17 +17,9 @@
#include "AppKitPrevention.h"
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 120000
#define HAS_XAR_GET_SAFE_PATH 1
#else
#define HAS_XAR_GET_SAFE_PATH 0
#endif
#if HAS_XAR_GET_SAFE_PATH
// This is preferred over xar_get_path (which is deprecated) when it's available
// Don't use OS availability for this API
extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
#endif
// Xar attribute keys
#define BINARY_DELTA_ATTRIBUTES_KEY "binary-delta-attributes"
@@ -92,12 +84,6 @@ extern char *xar_get_safe_path(xar_file_t f) __attribute__((weak_import));
}
}
// This indicates if safe extraction is available at compile time (SDK), but not if it's available at runtime.
+ (BOOL)maySupportSafeExtraction
{
return HAS_XAR_GET_SAFE_PATH;
}
- (nullable SPUDeltaArchiveHeader *)readHeader
{
NSString *patchFile = _patchFile;
@@ -323,7 +309,6 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
xar_iter_t iter = xar_iter_new();
for (xar_file_t file = xar_file_first(_x, iter); file; file = xar_file_next(iter)) {
char *pathCString;
#if HAS_XAR_GET_SAFE_PATH
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
if (xar_get_safe_path != NULL) {
@@ -331,7 +316,6 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
}
#pragma clang diagnostic pop
else
#endif
{
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+1 -1
View File
@@ -72,7 +72,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
// Reject patches that did not generate valid hierarchical xar container paths
// These will not succeed to patch using recent versions of BinaryDelta
if ([[archive class] maySupportSafeExtraction] && majorDiffVersion == SUBinaryDeltaMajorVersion2 && minorDiffVersion < 3) {
if (majorDiffVersion == SUBinaryDeltaMajorVersion2 && minorDiffVersion < 3) {
if (error != NULL) {
*error = [NSError errorWithDomain:NSCocoaErrorDomain code:NSFileReadCorruptFileError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"This patch version (%u.%u) is too old and potentially unsafe to apply. Please re-generate the patch using the latest version of BinaryDelta or generate_appcast. New version %u.%u patches will still be compatible with older versions of Sparkle.", majorDiffVersion, minorDiffVersion, majorDiffVersion, latestMinorVersionForMajorVersion(majorDiffVersion)] }];
}
+1 -1
View File
@@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUDiskImageUnarchiver : NSObject <SUUnarchiverProtocol>
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory decryptionPassword:(nullable NSString *)decryptionPassword;
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory decryptionPassword:(nullable NSString *)decryptionPassword;
+ (BOOL)canUnarchivePath:(NSString *)path;
+103 -29
View File
@@ -22,8 +22,10 @@
NSString *_archivePath;
NSString *_decryptionPassword;
NSString *_extractionDirectory;
NSString *_extractionMountDirectory;
SUUnarchiverNotifier *_notifier;
double _currentExtractionProgress;
double _fileProgressIncrement;
}
@@ -38,13 +40,14 @@
return NO;
}
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory decryptionPassword:(nullable NSString *)decryptionPassword
- (instancetype)initWithArchivePath:(NSString *)archivePath extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory decryptionPassword:(nullable NSString *)decryptionPassword
{
self = [super init];
if (self != nil) {
_archivePath = [archivePath copy];
_decryptionPassword = [decryptionPassword copy];
_extractionDirectory = [extractionDirectory copy];
_extractionMountDirectory = [extractionMountDirectory copy];
}
return self;
}
@@ -86,18 +89,30 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
{
@autoreleasepool {
BOOL mountedSuccessfully = NO;
// Only use modern diskutil extraction over hdiutil if extraction mount directory has been specified
BOOL useModernDiskUtilImplementation = (_extractionMountDirectory != nil);
// get a unique mount point path
NSString *mountPoint = nil;
NSFileManager *manager;
NSString *mountPoint;
NSError *error = nil;
NSArray *contents = nil;
do {
NSString *uuidString = [[NSUUID UUID] UUIDString];
mountPoint = [@"/Volumes" stringByAppendingPathComponent:uuidString];
if (useModernDiskUtilImplementation) {
mountPoint = _extractionMountDirectory;
} else {
do {
NSString *uuidString = [[NSUUID UUID] UUIDString];
mountPoint = [@"/Volumes" stringByAppendingPathComponent:uuidString];
}
// Note: this check does not follow symbolic links, which is what we want
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
}
if (mountPoint == nil) {
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{ NSLocalizedDescriptionKey:@"Extraction failed because mountPoint failed to be created"}];
[notifier notifyFailureWithError:error];
return;
}
// Note: this check does not follow symbolic links, which is what we want
while ([[NSURL fileURLWithPath:mountPoint] checkResourceIsReachableAndReturnError:NULL]);
NSMutableData *inputData = [NSMutableData data];
@@ -110,22 +125,34 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
[inputData appendData:decryptionPasswordData];
}
// From the hdiutil docs:
// read a null-terminated passphrase from standard input
//
// Add the null terminator
[inputData appendBytes:"\0" length:1];
if (useModernDiskUtilImplementation) {
// Unlike hdiutil, diskutil's --stdinpassphrase expects the passphrase to be
// newline-terminated rather than null-terminated
[inputData appendBytes:"\n" length:1];
} else {
// From the hdiutil docs:
// read a null-terminated passphrase from standard input
//
// Add the null terminator
[inputData appendBytes:"\0" length:1];
}
// Append prompt data for license agreements
[inputData appendBytes:"yes\n" length:4];
}
// Finder doesn't verify disk images anymore beyond the code signing signature (if available)
// Opt out of the old CRC checksum checks
// Also always pass -stdinpass so we gracefully handle password protected disk images even if we aren't expecting them
NSArray *arguments = @[@"attach", _archivePath, @"-mountpoint", mountPoint, @"-noverify", @"-nobrowse", @"-noautoopen", @"-stdinpass"];
// Always pass -stdinpass / --stdinpassphrase so we gracefully handle password protected disk images even if we aren't expecting them
NSArray<NSString *> *arguments;
if (useModernDiskUtilImplementation) {
arguments = @[@"image", @"attach", _archivePath, @"--mountPoint", mountPoint, @"--nobrowse", @"--stdinpassphrase"];
} else {
// Finder doesn't verify disk images anymore beyond the code signing signature (if available)
// Opt out of the old CRC checksum checks
arguments = @[@"attach", _archivePath, @"-mountpoint", mountPoint, @"-noverify", @"-nobrowse", @"-noautoopen", @"-stdinpass"];
}
NSData *output = nil;
NSData *errorOutput = nil;
NSInteger taskResult = -1;
NSURL *mountPointURL = [NSURL fileURLWithPath:mountPoint isDirectory:YES];
@@ -133,30 +160,61 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
NSMutableArray<NSString *> *itemsToExtract = [NSMutableArray array];
NSUInteger totalFileExtractionCount = 0;
NSFileManager *manager = nil;
NSArray *contents = nil;
BOOL success = YES;
{
NSTask *task = [[NSTask alloc] init];
task.launchPath = @"/usr/bin/hdiutil";
task.currentDirectoryPath = @"/";
if (useModernDiskUtilImplementation) {
task.executableURL = [NSURL fileURLWithPath:@"/usr/sbin/diskutil" isDirectory:NO];
} else {
task.executableURL = [NSURL fileURLWithPath:@"/usr/bin/hdiutil" isDirectory:NO];
task.currentDirectoryPath = @"/";
}
task.arguments = arguments;
NSPipe *inputPipe = [NSPipe pipe];
NSPipe *outputPipe = [NSPipe pipe];
NSPipe *errorPipe = [NSPipe pipe];
task.standardInput = inputPipe;
task.standardOutput = outputPipe;
task.standardError = errorPipe;
dispatch_queue_t captureQueue = dispatch_queue_create("org.sparkle-project.sparkle.dmg-output", DISPATCH_QUEUE_SERIAL);
NSFileHandle *fileStdHandle = outputPipe.fileHandleForReading;
NSMutableData *currentOutput = [NSMutableData data];
fileStdHandle.readabilityHandler = ^(NSFileHandle *file) {
[currentOutput appendData:file.availableData];
NSData *availableData = file.availableData;
dispatch_sync(captureQueue, ^{
[currentOutput appendData:availableData];
});
};
NSFileHandle *fileErrHandle = errorPipe.fileHandleForReading;
NSMutableData *currentErrorOutput = [NSMutableData data];
fileErrHandle.readabilityHandler = ^(NSFileHandle *file) {
NSData *availableData = file.availableData;
dispatch_sync(captureQueue, ^{
[currentErrorOutput appendData:availableData];
});
};
__block NSData *capturedOutput = nil;
__block NSData *capturedErrorOutput = nil;
dispatch_semaphore_t terminationSemaphore = dispatch_semaphore_create(0);
task.terminationHandler = ^(NSTask *__unused terminatingTask) {
fileStdHandle.readabilityHandler = nil;
fileErrHandle.readabilityHandler = nil;
dispatch_semaphore_signal(terminationSemaphore);
};
@@ -172,16 +230,24 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
[inputPipe.fileHandleForWriting closeFile];
dispatch_semaphore_wait(terminationSemaphore, DISPATCH_TIME_FOREVER);
output = [currentOutput copy];
dispatch_sync(captureQueue, ^{
capturedOutput = [currentOutput copy];
capturedErrorOutput = [currentErrorOutput copy];
});
output = capturedOutput;
errorOutput = capturedErrorOutput;
taskResult = task.terminationStatus;
}
if (taskResult != 0) {
NSString *resultStr = output ? [[NSString alloc] initWithData:output encoding:NSUTF8StringEncoding] : nil;
SULog(SULogLevelError, @"hdiutil failed with code: %ld data: <<%@>>", (long)taskResult, resultStr);
NSString *errorStr = errorOutput ? [[NSString alloc] initWithData:errorOutput encoding:NSUTF8StringEncoding] : nil;
SULog(SULogLevelError, @"%@ failed with code: %ld data: <<%@>> error: <<%@>>", (useModernDiskUtilImplementation ? @"diskutil" : @"hdiutil"), (long)taskResult, resultStr, errorStr);
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed due to hdiutil returning %ld status: %@", (long)taskResult, resultStr]}];
error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUUnarchivingError userInfo:@{NSLocalizedDescriptionKey:[NSString stringWithFormat:@"Extraction failed due to %@ returning %ld status: %@", useModernDiskUtilImplementation ? @"diskutil" : @"hdiutil", (long)taskResult, resultStr]}];
goto reportError;
}
@@ -284,16 +350,24 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
finally:
if (mountedSuccessfully) {
NSTask *task = [[NSTask alloc] init];
task.launchPath = @"/usr/bin/hdiutil";
task.arguments = @[@"detach", mountPoint, @"-force"];
if (useModernDiskUtilImplementation) {
task.launchPath = @"/usr/sbin/diskutil";
task.arguments = @[@"eject", @"force", mountPoint];
} else {
task.launchPath = @"/usr/bin/hdiutil";
task.arguments = @[@"detach", mountPoint, @"-force"];
}
task.standardOutput = [NSPipe pipe];
task.standardError = [NSPipe pipe];
NSError *launchCleanupError = nil;
if (![task launchAndReturnError:&launchCleanupError]) {
SULog(SULogLevelError, @"Failed to unmount %@", mountPoint);
SULog(SULogLevelError, @"%@ failed to unmount %@", (useModernDiskUtilImplementation ? @"diskutil" : @"hdiutil"), mountPoint);
SULog(SULogLevelError, @"Error: %@", launchCleanupError);
} else if (waitForCleanup) {
} else if (waitForCleanup || !success) {
// On the failure path the caller may immediately remove the directory the mount point lives in,
// so don't report failure until the volume is actually gone
[task waitUntilExit];
}
} else {
+5 -1
View File
@@ -14,7 +14,11 @@ NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUUnarchiver : NSObject
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType;
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType;
// Returns YES if unarchiving path can take advantage of an extraction mount directory being provided to -unarchiverForPath:extractionDirectory:extractionMountDirectory:updatingHostBundlePath:decryptionPassword:expectingInstallationType:
// Callers should provide an extraction mount directory when this returns YES
+ (BOOL)canUseExtractionMountDirectory:(NSString *)path;
@end
+17 -2
View File
@@ -18,13 +18,28 @@
@implementation SUUnarchiver
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType
+ (BOOL)canUseExtractionMountDirectory:(NSString *)path
{
if (![SUDiskImageUnarchiver canUnarchivePath:path]) {
return NO;
}
// By providing a directory for mounting, this lets the disk image unarchiver use diskutil over hdiutil
// diskutil extraction works well across all dmgs only on macOS 27.2+
if (@available(macOS 27.2, *)) {
return YES;
} else {
return NO;
}
}
+ (nullable id <SUUnarchiverProtocol>)unarchiverForPath:(NSString *)path extractionDirectory:(NSString *)extractionDirectory extractionMountDirectory:(nullable NSString *)extractionMountDirectory updatingHostBundlePath:(nullable NSString *)hostPath decryptionPassword:(nullable NSString *)decryptionPassword expectingInstallationType:(NSString *)installationType
{
if ([SUPipedUnarchiver canUnarchivePath:path]) {
return [[SUPipedUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory];
}
else if ([SUDiskImageUnarchiver canUnarchivePath:path]) {
return [[SUDiskImageUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory decryptionPassword:decryptionPassword];
return [[SUDiskImageUnarchiver alloc] initWithArchivePath:path extractionDirectory:extractionDirectory extractionMountDirectory:extractionMountDirectory decryptionPassword:decryptionPassword];
}
else if ([SUBinaryDeltaUnarchiver canUnarchivePath:path]) {
assert(hostPath != nil);
+1 -5
View File
@@ -28,11 +28,7 @@ int main(int __unused argc, const char __unused *argv[])
dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
dispatch_source_set_event_handler(sigtermSource, ^{
// Don't clear the update directory because the installer may be in middle of installing an update
// We still need to set an event handler for receiving SIGTERM though, otherwise our job may not terminate
// (This is also recommended from the developer documentation).
// Simply exit with SIGTERM if we receive this signal
exit(SIGTERM);
[appInstaller handleTerminationRequest];
});
dispatch_resume(sigtermSource);
+1 -1
View File
@@ -169,7 +169,7 @@ GCC_WARN_UNUSED_PARAMETER = YES
GCC_WARN_UNUSED_VARIABLE = YES
// Turn on all warnings, then disable a few which are almost impossible to avoid
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-direct-ivar-access -Wno-declaration-after-statement -Wno-gnu-conditional-omitted-operand -Wno-switch-default -Wno-missing-include-dirs -Werror=undef
WARNING_CFLAGS = -Wall -Weverything -Wno-unused-macros -Wno-gnu-statement-expression -Wno-auto-import -Wno-gnu-zero-variadic-macro-arguments -Wno-format-non-iso -Wno-pre-c11-compat -Wno-direct-ivar-access -Wno-declaration-after-statement -Wno-gnu-conditional-omitted-operand -Wno-switch-default -Wno-missing-include-dirs -Werror=undef
// Prevents spurious warnings based on dependency scan considering Sparkle itself a dependency
DIAGNOSE_MISSING_TARGET_DEPENDENCIES = NO
+13 -77
View File
@@ -169,8 +169,6 @@
72266A8B29464CEA00645376 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
72266A8C29464D0200645376 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
7229E1B61C97C91100CB50D0 /* SPUUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */; };
7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */; };
7229E1BA1C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */; };
7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */; };
7229E1BE1C98EFF200CB50D0 /* SPUDownloadDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */; };
722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */ = {isa = PBXBuildFile; fileRef = 722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -303,7 +301,6 @@
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
7267E5F91D3D92DA00D1BF90 /* Autoupdate in Copy Tools */ = {isa = PBXBuildFile; fileRef = 72B398D21D3D879300EE297F /* Autoupdate */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5A41D3D8A8A00D1BF90 /* StatusInfo.m */; };
7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */; };
7269E494264798200088C213 /* SPUSkippedUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 7269E492264798200088C213 /* SPUSkippedUpdate.h */; };
7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
@@ -360,6 +357,8 @@
729F7EB0273F1840004592DC /* SPUUserAgent+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */; };
729F7ECE27409077004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip in Resources */ = {isa = PBXBuildFile; fileRef = 729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */; };
72A1C2631CD6849C004CD282 /* SUUpdatePermissionPrompt.h in Headers */ = {isa = PBXBuildFile; fileRef = 612DCBAD0D488BC60015DBEA /* SUUpdatePermissionPrompt.h */; };
72A1C982305EC3E10009ECA3 /* SPUReleaseNotesDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A1C981305EC3E10009ECA3 /* SPUReleaseNotesDriver.m */; };
72A1C983305EC3E10009ECA3 /* SPUReleaseNotesDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A1C980305EC3E10009ECA3 /* SPUReleaseNotesDriver.h */; };
72A450531C69A68900D67EEA /* SUUpdatePermissionResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */; settings = {ATTRIBUTES = (Public, ); }; };
72A450541C69A68900D67EEA /* SUUpdatePermissionResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = 72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */; };
72A4A2401BB6567D00E7820D /* SUFileManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */; };
@@ -375,24 +374,10 @@
72AEB1D929A1CB510033883E /* SPUNoUpdateFoundInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 72AEB1D729A1CB510033883E /* SPUNoUpdateFoundInfo.m */; };
72B3DEC91E23472200457642 /* SPUDownloadedUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */; };
72B3DECA1E23472200457642 /* SPUDownloadedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */; };
72B3DECD1E23479000457642 /* SPUInformationalUpdate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */; };
72B3DECF1E23479000457642 /* SPUInformationalUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */; };
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767C81C9B707000A07552 /* SUAppcastDriver.h */; };
72B767CB1C9B707000A07552 /* SUAppcastDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767C91C9B707000A07552 /* SUAppcastDriver.m */; };
72B767CE1C9B924900A07552 /* SPUInstallerDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */; };
72B767CF1C9B924900A07552 /* SPUInstallerDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */; };
72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */; };
72B767D31C9C7B9300A07552 /* SPUProbingUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */; };
72B767D61C9C8B5C00A07552 /* SPUBasicUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */; };
72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */; };
72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */; };
72B767DB1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */; };
72B767DE1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */; };
72B767DF1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */; };
72B767E21C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */; };
72B767E31C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */; };
72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */ = {isa = PBXBuildFile; fileRef = 72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */; };
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */; };
72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */; };
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
@@ -435,6 +420,7 @@
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */; };
72EB87EA1CB8798800C37F42 /* ShowInstallerProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */; };
72EB87EB1CB8859100C37F42 /* Updater.app in Copy Tools */ = {isa = PBXBuildFile; fileRef = 721C24451CB753E6005440CB /* Updater.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
72EBE788305E4E3200AB3A73 /* SPUUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72EBE787305E4E3200AB3A73 /* SPUUpdateDriver.m */; };
72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
72EE17FC26D1CC9D00C58B19 /* SPUInstallationType.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */; settings = {ATTRIBUTES = (Private, ); }; };
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */ = {isa = PBXBuildFile; fileRef = 72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1082,8 +1068,6 @@
722589B51E0A24B9005EA0B9 /* Security.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Security.md; sourceTree = "<group>"; };
722589B61E0A24C6005EA0B9 /* Design Practices.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = "Design Practices.md"; sourceTree = "<group>"; };
7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdateDriver.h; sourceTree = "<group>"; };
7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUScheduledUpdateDriver.h; sourceTree = "<group>"; };
7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUScheduledUpdateDriver.m; sourceTree = "<group>"; };
7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadDriver.h; sourceTree = "<group>"; };
7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadDriver.m; sourceTree = "<group>"; };
722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUGentleUserDriverReminders.h; sourceTree = "<group>"; };
@@ -1246,7 +1230,6 @@
7267E5DD1D3D8F5A00D1BF90 /* SUStatusInfoProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUStatusInfoProtocol.h; path = Autoupdate/SUStatusInfoProtocol.h; sourceTree = SOURCE_ROOT; };
7267E5E31D3D90AA00D1BF90 /* SUFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUFileManager.h; sourceTree = "<group>"; };
7267E5E41D3D90AA00D1BF90 /* SUFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUFileManager.m; sourceTree = "<group>"; };
7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUResumableUpdate.h; sourceTree = "<group>"; };
7269E492264798200088C213 /* SPUSkippedUpdate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUSkippedUpdate.h; sourceTree = "<group>"; };
7269E493264798200088C213 /* SPUSkippedUpdate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUSkippedUpdate.m; sourceTree = "<group>"; };
7269E4992648F7C00088C213 /* SPUUserUpdateState.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUUserUpdateState.m; sourceTree = "<group>"; };
@@ -1304,6 +1287,8 @@
729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUserAgent+Private.h"; sourceTree = "<group>"; };
729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "SPUUserAgent+Private.m"; sourceTree = "<group>"; };
729F7ECD27409076004592DC /* SparkleTestCodeSignApp_bad_extraneous.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_extraneous.zip; sourceTree = "<group>"; };
72A1C980305EC3E10009ECA3 /* SPUReleaseNotesDriver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUReleaseNotesDriver.h; sourceTree = "<group>"; };
72A1C981305EC3E10009ECA3 /* SPUReleaseNotesDriver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUReleaseNotesDriver.m; sourceTree = "<group>"; };
72A40F082956120D007C7DD5 /* ConfigFrameworkRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigFrameworkRelease.xcconfig; sourceTree = "<group>"; };
72A450511C69A68900D67EEA /* SUUpdatePermissionResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUUpdatePermissionResponse.h; sourceTree = "<group>"; };
72A450521C69A68900D67EEA /* SUUpdatePermissionResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUUpdatePermissionResponse.m; sourceTree = "<group>"; };
@@ -1324,24 +1309,10 @@
72B398D21D3D879300EE297F /* Autoupdate */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Autoupdate; sourceTree = BUILT_PRODUCTS_DIR; };
72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadedUpdate.h; sourceTree = "<group>"; };
72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadedUpdate.m; sourceTree = "<group>"; };
72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUInformationalUpdate.h; sourceTree = "<group>"; };
72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUInformationalUpdate.m; sourceTree = "<group>"; };
72B767C81C9B707000A07552 /* SUAppcastDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUAppcastDriver.h; sourceTree = "<group>"; };
72B767C91C9B707000A07552 /* SUAppcastDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUAppcastDriver.m; sourceTree = "<group>"; };
72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUInstallerDriver.h; sourceTree = "<group>"; };
72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUInstallerDriver.m; sourceTree = "<group>"; };
72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUProbingUpdateDriver.h; sourceTree = "<group>"; };
72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUProbingUpdateDriver.m; sourceTree = "<group>"; };
72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUBasicUpdateDriver.h; sourceTree = "<group>"; };
72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUBasicUpdateDriver.m; sourceTree = "<group>"; };
72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUIBasedUpdateDriver.h; sourceTree = "<group>"; };
72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUIBasedUpdateDriver.m; sourceTree = "<group>"; };
72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUserInitiatedUpdateDriver.h; sourceTree = "<group>"; };
72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUserInitiatedUpdateDriver.m; sourceTree = "<group>"; };
72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUCoreBasedUpdateDriver.h; sourceTree = "<group>"; };
72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUCoreBasedUpdateDriver.m; sourceTree = "<group>"; };
72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAutomaticUpdateDriver.h; sourceTree = "<group>"; };
72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUAutomaticUpdateDriver.m; sourceTree = "<group>"; };
72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs.dmg; sourceTree = "<group>"; };
72C4E01F30340BE400DAF61C /* SPUInstallerProgressLocalizedStrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallerProgressLocalizedStrings.h; sourceTree = "<group>"; };
72C4E02030340C2B00DAF61C /* generate_progress_tool_localizations.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = generate_progress_tool_localizations.py; sourceTree = "<group>"; };
@@ -1385,6 +1356,7 @@
72EB735E29BE981300FBCEE7 /* DevSignedApp.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = DevSignedApp.zip; sourceTree = "<group>"; };
72EB736029BEB36100FBCEE7 /* DevSignedAppVersion2.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = DevSignedAppVersion2.zip; sourceTree = "<group>"; };
72EB87E91CB8798800C37F42 /* ShowInstallerProgress.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ShowInstallerProgress.m; path = Sparkle/InstallerProgress/ShowInstallerProgress.m; sourceTree = SOURCE_ROOT; };
72EBE787305E4E3200AB3A73 /* SPUUpdateDriver.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUUpdateDriver.m; sourceTree = "<group>"; };
72EE17FA26D1CBC000C58B19 /* SUInstallerLauncher+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SUInstallerLauncher+Private.h"; sourceTree = "<group>"; };
72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUUpdateCheck.h; sourceTree = "<group>"; };
72EF30BA2675CF38008CE987 /* SPUAppcastItemStateResolver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUAppcastItemStateResolver.h; sourceTree = "<group>"; };
@@ -2096,26 +2068,20 @@
61CFB2C20E38496B007A1735 /* Drivers */ = {
isa = PBXGroup;
children = (
72B767E81C9D114F00A07552 /* Update Drivers */,
72B767D41C9C8B5C00A07552 /* SPUBasicUpdateDriver.h */,
72B767D51C9C8B5C00A07552 /* SPUBasicUpdateDriver.m */,
72B767E01C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h */,
72B767E11C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m */,
7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */,
72EBE787305E4E3200AB3A73 /* SPUUpdateDriver.m */,
7229E1BB1C98EFF200CB50D0 /* SPUDownloadDriver.h */,
7229E1BC1C98EFF200CB50D0 /* SPUDownloadDriver.m */,
7267E5FB1D3DD1B700D1BF90 /* SPUResumableUpdate.h */,
72B3DEC71E23472200457642 /* SPUDownloadedUpdate.h */,
72B3DEC81E23472200457642 /* SPUDownloadedUpdate.m */,
72B3DECB1E23479000457642 /* SPUInformationalUpdate.h */,
72B3DECC1E23479000457642 /* SPUInformationalUpdate.m */,
72B767CC1C9B924900A07552 /* SPUInstallerDriver.h */,
72B767CD1C9B924900A07552 /* SPUInstallerDriver.m */,
728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */,
728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */,
72B767D81C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h */,
72B767D91C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m */,
72B767C81C9B707000A07552 /* SUAppcastDriver.h */,
72B767C91C9B707000A07552 /* SUAppcastDriver.m */,
72A1C980305EC3E10009ECA3 /* SPUReleaseNotesDriver.h */,
72A1C981305EC3E10009ECA3 /* SPUReleaseNotesDriver.m */,
);
name = Drivers;
sourceTree = "<group>";
@@ -2329,22 +2295,6 @@
path = Autoupdate;
sourceTree = "<group>";
};
72B767E81C9D114F00A07552 /* Update Drivers */ = {
isa = PBXGroup;
children = (
7229E1B51C97C91100CB50D0 /* SPUUpdateDriver.h */,
72B767E41C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h */,
72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */,
72B767D01C9C7B9300A07552 /* SPUProbingUpdateDriver.h */,
72B767D11C9C7B9300A07552 /* SPUProbingUpdateDriver.m */,
7229E1B71C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h */,
7229E1B81C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m */,
72B767DC1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h */,
72B767DD1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m */,
);
name = "Update Drivers";
sourceTree = "<group>";
};
72D9549F1CBB415C006F28BD /* sparkle-cli */ = {
isa = PBXGroup;
children = (
@@ -2510,14 +2460,10 @@
buildActionMask = 2147483647;
files = (
61299B3609CB04E000B7442F /* Sparkle.h in Headers */,
72B767E61C9CFD7200A07552 /* SPUAutomaticUpdateDriver.h in Headers */,
72B767D61C9C8B5C00A07552 /* SPUBasicUpdateDriver.h in Headers */,
72B767E21C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.h in Headers */,
72F9EC441D5E9ED8004AC8B6 /* SPUDownloadData.h in Headers */,
72EF30C12675CF38008CE987 /* SPUAppcastItemState.h in Headers */,
72AEB1D429A1A74E0033883E /* SPUStandardVersionDisplay.h in Headers */,
7229E1BD1C98EFF200CB50D0 /* SPUDownloadDriver.h in Headers */,
7267E5FD1D3DD1B700D1BF90 /* SPUResumableUpdate.h in Headers */,
7267E5B61D3D8AEE00D1BF90 /* SPUInstallationInfo.h in Headers */,
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */,
72EE181926DAE70900C58B19 /* SPUUpdateCheck.h in Headers */,
@@ -2529,8 +2475,6 @@
728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */,
7286EE5F28CEC84900163C1D /* SUTextViewReleaseNotesView.h in Headers */,
723C8A541E2D60DB00C14942 /* SUTouchBarButtonGroup.h in Headers */,
72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */,
7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */,
726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */,
7246E0A31C83B685003B4E75 /* SPUStandardUpdaterController.h in Headers */,
725CB95A1C7121830064365A /* SPUStandardUserDriver.h in Headers */,
@@ -2545,9 +2489,9 @@
72C56E0C2EFDFB850005A484 /* SPUExtractSignedFeed.h in Headers */,
61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */,
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */,
72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */,
7229E1B61C97C91100CB50D0 /* SPUUpdateDriver.h in Headers */,
72DBA37D1D60CC34002594A8 /* SPUUpdatePermissionRequest.h in Headers */,
72A1C983305EC3E10009ECA3 /* SPUReleaseNotesDriver.h in Headers */,
61B5F8ED09C4CE3C00B25A18 /* SPUUpdater.h in Headers */,
720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */,
72F9EC481D5EA904004AC8B6 /* SPUUpdaterDelegate.h in Headers */,
@@ -2557,7 +2501,6 @@
723ABFC4259D4CB300BDB4FA /* SUWKWebView.h in Headers */,
72AEB1D829A1CB510033883E /* SPUNoUpdateFoundInfo.h in Headers */,
725CB9571C7120410064365A /* SPUUserDriver.h in Headers */,
72B767DE1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.h in Headers */,
72F94F581CC44DE1002DEE68 /* SPUXPCServiceInfo.h in Headers */,
61B5FC0D09C4FC8200B25A18 /* SUAppcast.h in Headers */,
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */,
@@ -2573,7 +2516,6 @@
55C14F06136EF6DB00649790 /* SULog.h in Headers */,
EA1E286E22B665F0004AA304 /* SUSignatures.h in Headers */,
723ABF1B259D055E00BDB4FA /* SUReleaseNotesView.h in Headers */,
72B3DECD1E23479000457642 /* SPUInformationalUpdate.h in Headers */,
726F2CE51BC9C33D001971A4 /* SUOperatingSystem.h in Headers */,
61A225A40D1C4AC000430CCD /* SUStandardVersionComparator.h in Headers */,
6196CFF909C72148000DC222 /* SUStatusController.h in Headers */,
@@ -3613,9 +3555,6 @@
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */,
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */,
723ABF31259D062F00BDB4FA /* SULegacyWebView.m in Sources */,
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */,
72B767D71C9C8B5C00A07552 /* SPUBasicUpdateDriver.m in Sources */,
72B767E31C9CE90A00A07552 /* SPUCoreBasedUpdateDriver.m in Sources */,
72F9EC451D5E9ED8004AC8B6 /* SPUDownloadData.m in Sources */,
723ABFC5259D4CB300BDB4FA /* SUWKWebView.m in Sources */,
7229E1BE1C98EFF200CB50D0 /* SPUDownloadDriver.m in Sources */,
@@ -3626,15 +3565,12 @@
72EF30BF2675CF38008CE987 /* SPUAppcastItemState.m in Sources */,
721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */,
7267E5B21D3D8AD500D1BF90 /* SPUMessageTypes.m in Sources */,
72B3DECF1E23479000457642 /* SPUInformationalUpdate.m in Sources */,
72EBE788305E4E3200AB3A73 /* SPUUpdateDriver.m in Sources */,
728337A71C9E6FF40085AA99 /* SPUProbeInstallStatus.m in Sources */,
72B767D31C9C7B9300A07552 /* SPUProbingUpdateDriver.m in Sources */,
7229E1BA1C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.m in Sources */,
726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */,
7246E0A41C83B685003B4E75 /* SPUStandardUpdaterController.m in Sources */,
725CB95B1C7121830064365A /* SPUStandardUserDriver.m in Sources */,
723C8A551E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */,
72B767DB1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.m in Sources */,
72DBA37E1D60CC34002594A8 /* SPUUpdatePermissionRequest.m in Sources */,
72EF30C02675CF38008CE987 /* SPUAppcastItemStateResolver.m in Sources */,
61B5F8EE09C4CE3C00B25A18 /* SPUUpdater.m in Sources */,
@@ -3643,8 +3579,8 @@
726E078E1CA891E9001A286B /* SPUUpdaterSettings.m in Sources */,
721D588F25BE59F900D23BEA /* SUPhasedUpdateGroupInfo.m in Sources */,
72F9EC401D5E823F004AC8B6 /* SPUUpdaterTimer.m in Sources */,
72B767DF1C9CDB9700A07552 /* SPUUserInitiatedUpdateDriver.m in Sources */,
72F94F591CC44DE1002DEE68 /* SPUXPCServiceInfo.m in Sources */,
72A1C982305EC3E10009ECA3 /* SPUReleaseNotesDriver.m in Sources */,
61B5FBB709C4FAFF00B25A18 /* SUAppcast.m in Sources */,
72B767CB1C9B707000A07552 /* SUAppcastDriver.m in Sources */,
61B5FC6F09C51F4900B25A18 /* SUAppcastItem.m in Sources */,
@@ -58,6 +58,11 @@
value = "DELTA_AND_MARKDOWN"
isEnabled = "NO">
</EnvironmentVariable>
<EnvironmentVariable
key = "TEST_MODE"
value = "SUPERSEDE"
isEnabled = "NO">
</EnvironmentVariable>
</EnvironmentVariables>
<MetalAPIValidationSettings
isEnabled = "No">
@@ -18,6 +18,8 @@ SPU_OBJC_DIRECT_MEMBERS @interface InstallerProgressAppController : NSObject <NS
- (void)run;
- (void)handleTerminationRequest;
- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn));
@end
+95 -12
View File
@@ -28,11 +28,9 @@
*/
static const NSTimeInterval SUTerminationTimeDelay = 0.3;
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 140000
@interface NSApplication (ActivationAPIs)
- (void)activate;
@end
#endif
// This is slightly shorter than SUTerminationRequestTargetWaitDelay in Autoupdate
// to give Autoupdate extra time to allow receiving the termination message and finishing installation
static const NSTimeInterval SUTerminationRequestTargetWaitDelay = 1.5;
@interface InstallerProgressAppController () <NSApplicationDelegate, SPUInstallerAgentProtocol>
@end
@@ -53,6 +51,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
__weak id<InstallerProgressDelegate> _delegate;
void (^_terminationCompletionHandler)(void);
dispatch_source_t _targetProcessExitSource;
BOOL _connected;
BOOL _repliedToRegistration;
@@ -61,6 +60,8 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
BOOL _submittedLauncherJob;
BOOL _willTerminate;
BOOL _applicationInitiallyAlive;
BOOL _receivedTerminationRequest;
BOOL _targetProcessExited;
}
- (instancetype)initWithApplication:(NSApplication *)application arguments:(NSArray<NSString *> *)arguments delegate:(id<InstallerProgressDelegate>)delegate
@@ -178,6 +179,39 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
[self startConnection];
}
- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)__unused sender
{
[self handleTerminationRequest];
return NSTerminateLater;
}
- (void)handleTerminationRequest
{
// Check if we're going to terminate anyway
if (_receivedTerminationRequest) {
return;
}
// If Autoupdate installer is listening for termination completion,
// we will delay termination for a bit to allow us some time to observe
// the targetted app's termination, otherwise we will exit immediately
if (_terminationCompletionHandler == nil) {
[self cleanupAndExitWithStatus:SIGTERM error:nil];
}
_receivedTerminationRequest = YES;
if (_targetProcessExited) {
[self notifyTargetTermination];
}
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUTerminationRequestTargetWaitDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
[self cleanupAndExitWithStatus:SIGTERM error:nil];
});
}
- (void)cleanupAndExitWithStatus:(int)status error:(NSError * _Nullable)error __attribute__((noreturn))
{
if (error != nil) {
@@ -321,17 +355,49 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
NSString *isTerminatedKeyPath = NSStringFromSelector(@selector(isTerminated));
if ([keyPath isEqualToString:isTerminatedKeyPath]) {
if (_targetRunningApplication.terminated && _terminationCompletionHandler != nil) {
_terminationCompletionHandler();
[_targetRunningApplication removeObserver:self forKeyPath:isTerminatedKeyPath];
_terminationCompletionHandler = nil;
_targetRunningApplication = nil;
[self notifyTargetTermination];
}
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
}
- (void)notifyTargetTermination SPU_OBJC_DIRECT
{
if (_terminationCompletionHandler == nil) {
return;
}
_terminationCompletionHandler();
_terminationCompletionHandler = nil;
[_targetRunningApplication removeObserver:self forKeyPath:NSStringFromSelector(@selector(isTerminated))];
_targetRunningApplication = nil;
if (_targetProcessExitSource != nil) {
dispatch_source_cancel(_targetProcessExitSource);
_targetProcessExitSource = nil;
}
}
- (void)targetProcessDidExit SPU_OBJC_DIRECT
{
if (_targetProcessExited) {
return;
}
_targetProcessExited = YES;
if (_targetProcessExitSource != nil) {
dispatch_source_cancel(_targetProcessExitSource);
_targetProcessExitSource = nil;
}
if (_receivedTerminationRequest && _terminationCompletionHandler != nil) {
[self notifyTargetTermination];
}
}
- (void)listenForTerminationWithCompletion:(void (^)(void))completionHandler
{
dispatch_async(dispatch_get_main_queue(), ^{
@@ -348,6 +414,23 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
self->_terminationCompletionHandler = [completionHandler copy];
[self->_targetRunningApplication addObserver:self forKeyPath:NSStringFromSelector(@selector(isTerminated)) options:NSKeyValueObservingOptionNew context:NULL];
pid_t targetProcessIdentifier = self->_targetRunningApplication.processIdentifier;
if (targetProcessIdentifier > 0) {
dispatch_source_t targetProcessExitSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_PROC, (uintptr_t)targetProcessIdentifier, DISPATCH_PROC_EXIT, dispatch_get_main_queue());
if (targetProcessExitSource != nil) {
self->_targetProcessExitSource = targetProcessExitSource;
dispatch_source_set_event_handler(targetProcessExitSource, ^{
[self targetProcessDidExit];
});
dispatch_resume(targetProcessExitSource);
if (kill(targetProcessIdentifier, 0) != 0 && errno == ESRCH) {
[self targetProcessDidExit];
}
}
}
}
} else {
SULog(SULogLevelError, @"Error: -listenForTerminationWithCompletion: called in unexpected state");
@@ -387,7 +470,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
- (void)relaunchApplication
{
dispatch_async(dispatch_get_main_queue(), ^{
if (!self->_willTerminate && self->_applicationBundle != nil && self->_applicationInitiallyAlive) {
if (!self->_willTerminate && !self->_receivedTerminationRequest && self->_applicationBundle != nil && self->_applicationInitiallyAlive) {
NSString *pathToRelaunch;
if (self->_normalizedPath != nil) {
pathToRelaunch = self->_normalizedPath;
@@ -423,7 +506,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
- (void)showProgress
{
dispatch_async(dispatch_get_main_queue(), ^{
if (!self->_willTerminate) {
if (!self->_willTerminate && !self->_receivedTerminationRequest) {
// Activate ourselves otherwise we will probably be in the background
// See comments in -[SPUStandardUserDriver _activateApplication] for why -activate is not used
[self->_application activateIgnoringOtherApps:YES];
@@ -75,6 +75,7 @@ static NSDictionary<NSString *, NSDictionary<NSString *, NSString *> *> *const S
},
@"hu": @{
@"Cancel Update": @"Frissítés megszakítása",
@"Installing update…": @"Frissítés telepítése…",
@"Updating %@": @"%@ frissítése",
},
@"is": @{
+1 -1
View File
@@ -27,7 +27,7 @@ int main(int __unused argc, const char __unused *argv[])
dispatch_source_t sigtermSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_SIGNAL, SIGTERM, 0, dispatch_get_main_queue());
dispatch_source_set_event_handler(sigtermSource, ^{
[appController cleanupAndExitWithStatus:SIGTERM error:nil];
[appController handleTerminationRequest];
});
dispatch_resume(sigtermSource);
+1 -1
View File
@@ -149,7 +149,7 @@
return NO;
}
// An error occured
// An error occurred
SULog(SULogLevelError, @"Error: failed to detect if process is running under rosetta with error: %d", errno);
return YES;
}
+1 -1
View File
@@ -17,7 +17,7 @@ typedef NS_ENUM(NSInteger, SPUAppcastSigningValidationStatus)
SPUAppcastSigningValidationStatusSkipped = 0,
/**
The appcast is signed and validation has passed succesfully.
The appcast is signed and validation has passed successfully.
*/
SPUAppcastSigningValidationStatusSucceeded,
-23
View File
@@ -1,23 +0,0 @@
//
// SPUAutomaticUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUpdaterDelegate, SPUUserDriver;
SPU_OBJC_DIRECT_MEMBERS @interface SPUAutomaticUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
-155
View File
@@ -1,155 +0,0 @@
//
// SPUAutomaticUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUAutomaticUpdateDriver.h"
#import "SPUUpdateDriver.h"
#import "SUHost.h"
#import "SPUUpdaterDelegate.h"
#import "SPUCoreBasedUpdateDriver.h"
#import "SULog.h"
#import "SUAppcastItem.h"
#import "SPUUserDriver.h"
#import "SUErrors.h"
#include "AppKitPrevention.h"
@interface SPUAutomaticUpdateDriver () <SPUCoreBasedUpdateDriverDelegate>
@end
@implementation SPUAutomaticUpdateDriver
{
SPUCoreBasedUpdateDriver *_coreDriver;
SUAppcastItem* _updateItem;
__weak id _updater;
__weak id<SPUUserDriver> _userDriver;
__weak id _updaterDelegate;
BOOL _installerDidFinishPreparation;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_updater = updater;
// The user driver is only used for a termination callback
_userDriver = userDriver;
_updaterDelegate = updaterDelegate;
_coreDriver = [[SPUCoreBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updateCheck:SPUUpdateCheckUpdatesInBackground updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_coreDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler
{
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_coreDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
[_coreDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES requiresSilentInstall:YES];
}
- (void)resumeInstallingUpdate
{
// Nothing really to do here.. this shouldn't be called.
SULog(SULogLevelError, @"Error: resumeInstallingUpdate: called on SPUAutomaticUpdateDriver");
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)__unused resumableUpdate
{
// Nothing really to do here.. this shouldn't be called.
SULog(SULogLevelError, @"Error: resumeDownloadedUpdate: called on SPUAutomaticUpdateDriver");
}
// Note: critical updates can be downloaded automatically first before needing user attention
static BOOL SPUUpdateRequiresUserAttentionBeforeDownloading(SUAppcastItem *updateItem)
{
return (updateItem.isInformationOnlyUpdate || updateItem.majorUpgrade || updateItem.signingValidationStatus == SPUAppcastSigningValidationStatusFailed);
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
_updateItem = updateItem;
if (SPUUpdateRequiresUserAttentionBeforeDownloading(updateItem)) {
[_coreDriver deferInformationalUpdate:updateItem secondaryUpdate:secondaryUpdateItem];
[self abortUpdate];
} else {
[_coreDriver downloadUpdateFromAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem inBackground:YES];
}
}
- (BOOL)showingUpdate
{
return NO;
}
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
{
_installerDidFinishPreparation = YES;
if (!willInstallImmediately) {
BOOL installationHandledByDelegate = NO;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationBlock:)]) {
__weak __typeof__(self) weakSelf = self;
installationHandledByDelegate = [updaterDelegate updater:_updater willInstallUpdateOnQuit:_updateItem immediateInstallationBlock:^{
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_coreDriver finishInstallationWithResponse:SPUUserUpdateChoiceInstall displayingUserInterface:NO];
}
});
}];
}
if (!installationHandledByDelegate) {
// We are done and can safely abort now
// The installer tool will keep the installation alive
[self abortUpdate];
}
}
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(NSError *)error
{
// It should not be necessary to include properties from SPUUpdateRequiresUserAttentionBeforeDownloading() because _installerDidFinishPreparation should be NO in those cases,
// but we'll include the check anyway
BOOL showNextUpdateImmediately = (error == nil || error.code == SUInstallationAuthorizeLaterError) && (!_installerDidFinishPreparation || _updateItem.criticalUpdate || SPUUpdateRequiresUserAttentionBeforeDownloading(_updateItem));
[_coreDriver abortUpdateAndShowNextUpdateImmediately:showNextUpdateImmediately error:error];
}
@end
-46
View File
@@ -1,46 +0,0 @@
//
// SPUBasicUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
#import "SPUUpdateCheck.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost, SUAppcastItem;
@protocol SPUUpdaterDelegate;
@protocol SPUBasicUpdateDriverDelegate <NSObject>
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem systemDomain:(NSNumber * _Nullable)systemDomain;
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
@optional
- (void)basicDriverDidFinishLoadingAppcast;
@end
SPU_OBJC_DIRECT_MEMBERS @interface SPUBasicUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SPUBasicUpdateDriverDelegate>)delegate;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldSignalShowingUpdate resumableUpdate:(id<SPUResumableUpdate> _Nullable)resumableUpdate error:(nullable NSError *)error;
@end
NS_ASSUME_NONNULL_END
-292
View File
@@ -1,292 +0,0 @@
//
// SPUBasicUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUBasicUpdateDriver.h"
#import "SUAppcastDriver.h"
#import "SPUUpdaterDelegate.h"
#import "SUErrors.h"
#import "SULocalizations.h"
#import "SUHost.h"
#import "SUAppcastItem.h"
#import "SPUProbeInstallStatus.h"
#import "SPUInstallationInfo.h"
#import "SPUResumableUpdate.h"
#import "SPUAppcastItemState.h"
#import "SUAppcastItem+Private.h"
#import "SPUInstallationType.h"
#import "SUVersionDisplayProtocol.h"
#import "SPUStandardVersionDisplay.h"
#import "SPUNoUpdateFoundInfo.h"
#include "AppKitPrevention.h"
@interface SPUBasicUpdateDriver () <SUAppcastDriverDelegate>
@end
@implementation SPUBasicUpdateDriver
{
SUAppcastDriver *_appcastDriver;
SUHost *_host;
SPUUpdateDriverCompletion _completionBlock;
SPUUpdateCheck _updateCheck;
__weak id _updater;
__weak id <SPUUpdaterDelegate> _updaterDelegate;
__weak id<SPUBasicUpdateDriverDelegate> _delegate;
BOOL _aborted;
}
- (instancetype)initWithHost:(SUHost *)host updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate delegate:(id <SPUBasicUpdateDriverDelegate>)delegate
{
self = [super init];
if (self != nil) {
_host = host;
_updateCheck = updateCheck;
_updater = updater;
_updaterDelegate = updaterDelegate;
_delegate = delegate;
_appcastDriver = [[SUAppcastDriver alloc] initWithHost:host updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
_completionBlock = [completionBlock copy];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
{
if ([_host isRunningOnReadOnlyVolume]) {
NSString *hostName = _host.name;
id<SPUBasicUpdateDriverDelegate> delegate = _delegate;
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
if ([_host isRunningTranslocated]) {
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningTranslocated userInfo:@{ NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Quit %1$@, move it into your Applications folder, relaunch it from there and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated if it’s running from the location it was downloaded to.", SPARKLE_TABLE, sparkleBundle, nil), hostName], }]];
} else {
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SURunningFromDiskImageError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ can’t be updated because it was opened from a read-only or a temporary location.", SPARKLE_TABLE, sparkleBundle, nil), hostName], NSLocalizedRecoverySuggestionErrorKey: [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again.", SPARKLE_TABLE, sparkleBundle, nil), hostName] }]];
}
} else {
[_appcastDriver loadAppcastFromURL:appcastURL userAgent:userAgent httpHeaders:httpHeaders inBackground:background];
}
}
- (void)notifyResumableUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain SPU_OBJC_DIRECT
{
if (updateItem == nil) {
[_delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUResumeAppcastError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"Failed to resume installing update.", SPARKLE_TABLE, SUSparkleBundle(), nil) }]];
} else {
// Kind of lying, but triggering the notification so drivers can know when to stop showing initial fetching progress
[self notifyFinishLoadingAppcast];
SUAppcastItem *nonNullUpdateItem = updateItem;
[self notifyFoundValidUpdateWithAppcastItem:nonNullUpdateItem secondaryAppcastItem:secondaryUpdateItem systemDomain:systemDomain resuming:YES];
}
}
- (void)resumeInstallingUpdate
{
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerUpdateItemForHostBundleIdentifier:hostBundleIdentifier completion:^(SPUInstallationInfo * _Nullable installationInfo) {
dispatch_async(dispatch_get_main_queue(), ^{
[self notifyResumableUpdateItem:installationInfo.appcastItem secondaryUpdateItem:nil systemDomain:@(installationInfo.systemDomain)];
});
}];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[self notifyResumableUpdateItem:resumableUpdate.updateItem secondaryUpdateItem:resumableUpdate.secondaryUpdateItem systemDomain:nil];
}
- (void)didFailToFetchAppcastWithError:(NSError *)error
{
if (!_aborted) {
[_delegate basicDriverIsRequestingAbortUpdateWithError:error];
}
}
- (void)notifyFinishLoadingAppcast SPU_OBJC_DIRECT
{
id<SPUBasicUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)]) {
[delegate basicDriverDidFinishLoadingAppcast];
}
}
- (void)didFinishLoadingAppcast:(SUAppcast *)appcast
{
if (!_aborted) {
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector((updater:didFinishLoadingAppcast:))]) {
[updaterDelegate updater:_updater didFinishLoadingAppcast:appcast];
}
[self notifyFinishLoadingAppcast];
}
}
- (void)notifyFoundValidUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain resuming:(BOOL)resuming SPU_OBJC_DIRECT
{
if (!_aborted) {
id<SPUBasicUpdateDriverDelegate> delegate = _delegate;
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
id updater = _updater;
if (!resuming) {
// Give the delegate a chance to bail
NSError *shouldNotProceedError = nil;
if ([updaterDelegate respondsToSelector:@selector(updater:shouldProceedWithUpdate:updateCheck:error:)] && ![updaterDelegate updater:updater shouldProceedWithUpdate:updateItem updateCheck:_updateCheck error:&shouldNotProceedError]) {
[delegate basicDriverIsRequestingAbortUpdateWithError:shouldNotProceedError];
return;
}
}
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFindValidUpdateNotification
object:updater
userInfo:@{ SUUpdaterAppcastItemNotificationKey: updateItem }];
if ([updaterDelegate respondsToSelector:@selector((updater:didFindValidUpdate:))]) {
[updaterDelegate updater:updater didFindValidUpdate:updateItem];
}
[delegate basicDriverDidFindUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem systemDomain:systemDomain];
}
}
- (void)didFindValidUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem
{
[self notifyFoundValidUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryAppcastItem systemDomain:nil resuming:NO];
}
- (void)didNotFindUpdateWithLatestAppcastItem:(nullable SUAppcastItem *)latestAppcastItem hostToLatestAppcastItemComparisonResult:(NSComparisonResult)hostToLatestAppcastItemComparisonResult background:(BOOL)background
{
if (!_aborted) {
NSString *localizedDescription;
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#else
NSBundle *sparkleBundle = nil;
#endif
SPUNoUpdateFoundReason reason;
if (latestAppcastItem != nil) {
switch (hostToLatestAppcastItemComparisonResult) {
case NSOrderedDescending:
// This means the user is a 'newer than latest' version. give a slight hint to the user instead of wrongly claiming this version is identical to the latest feed version.
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonOnNewerThanLatestVersion;
break;
case NSOrderedSame:
// No new update is available and we're on the latest
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonOnLatestVersion;
break;
case NSOrderedAscending:
// A new update is available but cannot be installed
// More detailed recovery suggestions are in SPUNoUpdateFoundRecoverySuggestion()
if (!latestAppcastItem.arm64HardwareRequirementIsOK) {
localizedDescription = SULocalizedStringFromTableInBundle(@"Your Mac is too old", SPARKLE_TABLE, sparkleBundle, nil);
reason = SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64;
} else if (!latestAppcastItem.minimumOperatingSystemVersionIsOK) {
localizedDescription = SULocalizedStringFromTableInBundle(@"Your macOS version is too old", SPARKLE_TABLE, sparkleBundle, nil);
reason = SPUNoUpdateFoundReasonSystemIsTooOld;
} else if (!latestAppcastItem.maximumOperatingSystemVersionIsOK) {
localizedDescription = SULocalizedStringFromTableInBundle(@"Your macOS version is too new", SPARKLE_TABLE, sparkleBundle, nil);
reason = SPUNoUpdateFoundReasonSystemIsTooNew;
} else {
// We shouldn't realistically get here
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonUnknown;
}
break;
}
} else {
// When no updates are found in the appcast
// We will need to assume the user is up to date if the feed doesn't have any applicable update items
// There could be update items on channels the updater is not subscribed to for example. But we can't tell the user about them.
// There could also only be update items available for other platforms or none at all.
localizedDescription = SULocalizedStringFromTableInBundle(@"You’re up to date!", SPARKLE_TABLE, sparkleBundle, "Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates.");
reason = SPUNoUpdateFoundReasonOnLatestVersion;
}
// We use the standard version displayer here to construct a reason string,
// but it's possible for the user driver to override this before displaying if they wish
id<SUVersionDisplay> versionDisplayer = [SPUStandardVersionDisplay standardVersionDisplay];
NSString *recoverySuggestion = SPUNoUpdateFoundRecoverySuggestion(reason, latestAppcastItem, _host, versionDisplayer, sparkleBundle);
NSString *recoveryOption = SULocalizedStringFromTableInBundle(@"OK", SPARKLE_TABLE, sparkleBundle, nil);
NSMutableDictionary *userInfo =
[NSMutableDictionary dictionaryWithDictionary:@{
NSLocalizedDescriptionKey: localizedDescription,
NSLocalizedRecoverySuggestionErrorKey: recoverySuggestion,
NSLocalizedRecoveryOptionsErrorKey: @[recoveryOption],
SPUNoUpdateFoundReasonKey: @(reason),
SPUNoUpdateFoundUserInitiatedKey: @(!background),
}];
if (latestAppcastItem != nil) {
userInfo[SPULatestAppcastItemFoundKey] = latestAppcastItem;
}
NSError *notFoundError =
[NSError
errorWithDomain:SUSparkleErrorDomain
code:SUNoUpdateError
userInfo:[userInfo copy]];
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
id updater = _updater;
if (updater != nil) {
if ([updaterDelegate respondsToSelector:@selector((updaterDidNotFindUpdate:error:))]) {
[updaterDelegate updaterDidNotFindUpdate:updater error:notFoundError];
} else if ([updaterDelegate respondsToSelector:@selector((updaterDidNotFindUpdate:))]) {
[updaterDelegate updaterDidNotFindUpdate:updater];
}
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidNotFindUpdateNotification object:updater userInfo:userInfo];
}
[_delegate basicDriverIsRequestingAbortUpdateWithError:notFoundError];
}
}
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately resumableUpdate:(id<SPUResumableUpdate> _Nullable)resumableUpdate error:(nullable NSError *)error
{
_aborted = YES;
[_appcastDriver cleanup:^{
if (self->_completionBlock != nil) {
self->_completionBlock(shouldShowUpdateImmediately, resumableUpdate, error);
self->_completionBlock = nil;
}
}];
}
@end
-77
View File
@@ -1,77 +0,0 @@
//
// SPUCoreBasedUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
#import "SPUUserUpdateState.h"
#import "SPUUpdateCheck.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost, SUAppcastItem;
@protocol SPUUpdaterDelegate;
@protocol SPUCoreBasedUpdateDriverDelegate <NSObject>
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem;
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately;
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
@optional
- (void)basicDriverDidFinishLoadingAppcast;
- (void)downloadDriverWillBeginDownload;
- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength;
- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length;
- (void)coreDriverDidStartExtractingUpdate;
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated;
- (void)installerDidExtractUpdateWithProgress:(double)progress;
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement;
@end
SPU_OBJC_DIRECT_MEMBERS @interface SPUCoreBasedUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUCoreBasedUpdateDriverDelegate>)delegate;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background requiresSilentInstall:(BOOL)silentInstall;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
- (void)downloadUpdateFromAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem inBackground:(BOOL)background;
- (void)deferInformationalUpdate:(SUAppcastItem *)updateItem secondaryUpdate:(SUAppcastItem * _Nullable)secondaryUpdateItem;
- (void)extractDownloadedUpdate;
- (void)clearDownloadedUpdate;
- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)installUpdateStatus displayingUserInterface:(BOOL)displayingUserInterface;
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately error:(nullable NSError *)error;
@end
NS_ASSUME_NONNULL_END
-402
View File
@@ -1,402 +0,0 @@
//
// SPUCoreBasedUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUCoreBasedUpdateDriver.h"
#import "SUHost.h"
#import "SPUUpdaterDelegate.h"
#import "SPUBasicUpdateDriver.h"
#import "SPUInstallerDriver.h"
#import "SPUDownloadDriver.h"
#import "SULog.h"
#import "SULog+NSError.h"
#import "SUErrors.h"
#import "SPUResumableUpdate.h"
#import "SPUDownloadedUpdate.h"
#import "SPUInformationalUpdate.h"
#import "SUAppcastItem.h"
#import "SULocalizations.h"
#import "SPUInstallationType.h"
#import "SUPhasedUpdateGroupInfo.h"
#include "AppKitPrevention.h"
@interface SPUCoreBasedUpdateDriver () <SPUBasicUpdateDriverDelegate, SPUDownloadDriverDelegate, SPUInstallerDriverDelegate>
@end
@implementation SPUCoreBasedUpdateDriver
{
SPUBasicUpdateDriver *_basicDriver;
SPUDownloadDriver *_downloadDriver;
SPUInstallerDriver *_installerDriver;
SUAppcastItem *_updateItem;
SUAppcastItem * _Nullable _secondaryUpdateItem;
id<SPUResumableUpdate> _resumableUpdate;
SPUDownloadedUpdate *_downloadedUpdateForRemoval;
SUHost *_host;
NSString *_userAgent;
NSDictionary * _Nullable _httpHeaders;
__weak id _updater; // if we didn't have legacy support, I'd remove this..
__weak id <SPUUpdaterDelegate> _updaterDelegate;
__weak id<SPUCoreBasedUpdateDriverDelegate> _delegate;
BOOL _resumingInstallingUpdate;
BOOL _silentInstall;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updateCheck:(SPUUpdateCheck)updateCheck updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUCoreBasedUpdateDriverDelegate>)delegate
{
self = [super init];
if (self != nil) {
_delegate = delegate;
NSString *bundleIdentifier = host.bundle.bundleIdentifier;
assert(bundleIdentifier != nil);
_basicDriver = [[SPUBasicUpdateDriver alloc] initWithHost:host updateCheck:updateCheck updater:updater updaterDelegate:updaterDelegate delegate:self];
_installerDriver = [[SPUInstallerDriver alloc] initWithHost:host applicationBundle:applicationBundle updater:updater updaterDelegate:updaterDelegate delegate:self];
_host = host;
_updater = updater;
_updaterDelegate = updaterDelegate;
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_basicDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_installerDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background requiresSilentInstall:(BOOL)silentInstall
{
_userAgent = [userAgent copy];
_httpHeaders = httpHeaders;
_silentInstall = silentInstall;
[_basicDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:background];
}
- (void)resumeInstallingUpdate
{
_resumingInstallingUpdate = YES;
_silentInstall = NO;
[_basicDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
_resumableUpdate = resumableUpdate;
_silentInstall = NO;
[_basicDriver resumeUpdate:resumableUpdate];
}
- (void)basicDriverDidFinishLoadingAppcast
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)]) {
[delegate basicDriverDidFinishLoadingAppcast];
}
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem systemDomain:(NSNumber * _Nullable)systemDomain
{
_updateItem = updateItem;
_secondaryUpdateItem = secondaryUpdateItem;
if (_resumingInstallingUpdate) {
assert(systemDomain != nil);
[_installerDriver resumeInstallingUpdateWithUpdateItem:updateItem systemDomain:systemDomain.boolValue];
}
[_delegate basicDriverDidFindUpdateWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem];
}
- (void)downloadUpdateFromAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem inBackground:(BOOL)background SPU_OBJC_DIRECT
{
_downloadDriver = [[SPUDownloadDriver alloc] initWithUpdateItem:updateItem secondaryUpdateItem:secondaryUpdateItem host:_host userAgent:_userAgent httpHeaders:_httpHeaders inBackground:background delegate:self];
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector((updater:willDownloadUpdate:withRequest:))]) {
[updaterDelegate updater:updater willDownloadUpdate:updateItem withRequest:_downloadDriver.request];
}
[_downloadDriver downloadFile];
}
- (void)downloadDriverWillBeginDownload
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(downloadDriverWillBeginDownload)]) {
[delegate downloadDriverWillBeginDownload];
}
}
- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(downloadDriverDidReceiveExpectedContentLength:)]) {
[delegate downloadDriverDidReceiveExpectedContentLength:expectedContentLength];
}
}
- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(downloadDriverDidReceiveDataOfLength:)]) {
[delegate downloadDriverDidReceiveDataOfLength:length];
}
}
- (void)downloadDriverDidDownloadUpdate:(SPUDownloadedUpdate *)downloadedUpdate
{
// Use a new update group for our next downloaded update
// We could restrict this to when the appcast was downloaded in the background,
// but it shouldn't matter.
if (downloadedUpdate.updateItem.phasedRolloutInterval != nil) {
[SUPhasedUpdateGroupInfo setNewUpdateGroupIdentifierForHost:_host];
}
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:didDownloadUpdate:)]) {
[updaterDelegate updater:updater didDownloadUpdate:_updateItem];
}
_resumableUpdate = downloadedUpdate;
[self extractUpdate:downloadedUpdate];
}
- (void)deferInformationalUpdate:(SUAppcastItem *)updateItem secondaryUpdate:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
_resumableUpdate = [[SPUInformationalUpdate alloc] initWithAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem];
}
- (void)extractDownloadedUpdate
{
id<SPUResumableUpdate> resumableUpdate = _resumableUpdate;
assert(resumableUpdate != nil && [resumableUpdate isKindOfClass:[SPUDownloadedUpdate class]]);
[self extractUpdate:(SPUDownloadedUpdate *)resumableUpdate];
}
- (void)clearDownloadedUpdate
{
id<NSObject> downloadedUpdateObject = (_resumableUpdate != nil) ? _resumableUpdate : _downloadedUpdateForRemoval;
if (downloadedUpdateObject == nil) {
SULog(SULogLevelError, @"Warning: clearDownloadedUpdate called but no downloaded update is tracked");
return;
}
if ([downloadedUpdateObject isKindOfClass:[SPUDownloadedUpdate class]]) {
if (_downloadDriver == nil) {
_downloadDriver = [[SPUDownloadDriver alloc] initWithHost:_host];
}
SPUDownloadedUpdate *downloadedUpdate = (SPUDownloadedUpdate *)downloadedUpdateObject;
[_downloadDriver removeDownloadedUpdate:downloadedUpdate];
}
// Clear any type of resumable update
_resumableUpdate = nil;
}
- (void)extractUpdate:(SPUDownloadedUpdate *)downloadedUpdate SPU_OBJC_DIRECT
{
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:willExtractUpdate:)]) {
[updaterDelegate updater:updater willExtractUpdate:_updateItem];
}
// Now we have to extract the downloaded archive.
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(coreDriverDidStartExtractingUpdate)]) {
[delegate coreDriverDidStartExtractingUpdate];
}
[_installerDriver extractDownloadedUpdate:downloadedUpdate silently:_silentInstall completion:^(NSError * _Nullable error) {
if (error != nil) {
if (error.code != SUInstallationAuthorizeLaterError) {
[self clearDownloadedUpdate];
}
[self->_delegate coreDriverIsRequestingAbortUpdateWithError:error];
} else {
// If the installer started properly, we can't use the downloaded update archive anymore
// Especially if the installer fails later and we try resuming the update with a missing archive file
// We must clear the download after the installer begins using it however (in -installerDidStartInstalling)
self->_downloadedUpdateForRemoval = downloadedUpdate;
self->_resumableUpdate = nil;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:didExtractUpdate:)]) {
[updaterDelegate updater:updater didExtractUpdate:self->_updateItem];
}
}
}];
}
- (void)downloadDriverDidFailToDownloadFileWithError:(NSError *)error
{
if ([_updateItem isDeltaUpdate]) {
SULog(SULogLevelError, @"Failed to download delta update. Falling back to regular update...");
SULogError(error);
[self fallBackAndDownloadRegularUpdate];
} else {
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector((updater:failedToDownloadUpdate:error:))]) {
NSError *errorToReport = [error.userInfo objectForKey:NSUnderlyingErrorKey];
if (errorToReport == nil) {
errorToReport = error;
}
[updaterDelegate updater:updater failedToDownloadUpdate:_updateItem error:errorToReport];
}
[_delegate coreDriverIsRequestingAbortUpdateWithError:error];
}
}
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(installerDidStartInstallingWithApplicationTerminated:)]) {
[delegate installerDidStartInstallingWithApplicationTerminated:applicationTerminated];
}
}
- (void)installerDidStartExtracting
{
// The installer has moved the archive and no longer needs the download directory
[self clearDownloadedUpdate];
}
- (void)installerDidExtractUpdateWithProgress:(double)progress
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(installerDidExtractUpdateWithProgress:)]) {
[delegate installerDidExtractUpdateWithProgress:progress];
}
}
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
{
[_delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately];
}
- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)response displayingUserInterface:(BOOL)displayingUserInterface
{
switch (response) {
case SPUUserUpdateChoiceDismiss:
[_delegate coreDriverIsRequestingAbortUpdateWithError:nil];
break;
case SPUUserUpdateChoiceSkip:
[_installerDriver cancelUpdate];
break;
case SPUUserUpdateChoiceInstall:
[_installerDriver installWithToolAndRelaunch:YES displayingUserInterface:displayingUserInterface];
break;
}
}
- (void)installerWillFinishInstallationAndRelaunch:(BOOL)relaunch
{
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil) {
if ([updaterDelegate respondsToSelector:@selector((updater:willInstallUpdate:))]) {
[updaterDelegate updater:updater willInstallUpdate:_updateItem];
}
if (relaunch) {
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterWillRestartNotification object:updater];
if ([updaterDelegate respondsToSelector:@selector((updaterWillRelaunchApplication:))]) {
[updaterDelegate updaterWillRelaunchApplication:updater];
}
}
}
}
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement
{
id<SPUCoreBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(installerDidFinishInstallationAndRelaunched:acknowledgement:)]) {
[delegate installerDidFinishInstallationAndRelaunched:relaunched acknowledgement:acknowledgement];
} else {
acknowledgement();
}
}
- (void)installerIsRequestingAbortInstallWithError:(nullable NSError *)error
{
[_delegate coreDriverIsRequestingAbortUpdateWithError:error];
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
// A delegate may want to handle this type of error specially
[_delegate basicDriverIsRequestingAbortUpdateWithError:error];
}
- (void)fallBackAndDownloadRegularUpdate SPU_OBJC_DIRECT
{
SUAppcastItem *secondaryUpdateItem = _secondaryUpdateItem;
assert(secondaryUpdateItem != nil);
BOOL backgroundDownload = _downloadDriver.inBackground;
// Fall back to the non-delta update. Note that we don't want to trigger another update was found event.
_updateItem = secondaryUpdateItem;
_secondaryUpdateItem = nil;
[self downloadUpdateFromAppcastItem:secondaryUpdateItem secondaryAppcastItem:nil inBackground:backgroundDownload];
}
- (void)installerDidFailToApplyDeltaUpdate
{
[self clearDownloadedUpdate];
[self fallBackAndDownloadRegularUpdate];
}
- (void)abortUpdateAndShowNextUpdateImmediately:(BOOL)shouldShowUpdateImmediately error:(nullable NSError *)error
{
[_installerDriver abortInstall];
void (^basicDriverAbort)(void) = ^{
id<SPUResumableUpdate> resumableUpdate = (error == nil || error.code == SUInstallationAuthorizeLaterError) ? self->_resumableUpdate : nil;
[self->_basicDriver abortUpdateAndShowNextUpdateImmediately:shouldShowUpdateImmediately resumableUpdate:resumableUpdate error:error];
};
if (_downloadDriver != nil) {
[_downloadDriver cleanup:^{
basicDriverAbort();
}];
} else {
basicDriverAbort();
}
}
@end
+1 -1
View File
@@ -39,7 +39,7 @@ SPU_OBJC_DIRECT_MEMBERS
#endif
@interface SPUDownloadDriver : NSObject
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate;
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background cachePolicy:(NSURLRequestCachePolicy)cachePolicy delegate:(id<SPUDownloadDriverDelegate>)delegate;
- (instancetype)initWithUpdateItem:(SUAppcastItem *)updateItem secondaryUpdateItem:(SUAppcastItem * _Nullable)secondaryUpdateItem host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate;
+3 -7
View File
@@ -114,7 +114,7 @@
return self;
}
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background delegate:(id<SPUDownloadDriverDelegate>)delegate
- (instancetype)initWithRequestURL:(NSURL *)requestURL host:(SUHost *)host userAgent:(NSString * _Nullable)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background cachePolicy:(NSURLRequestCachePolicy)cachePolicy delegate:(id<SPUDownloadDriverDelegate>)delegate
{
self = [self initWithHost:host];
if (self != nil) {
@@ -122,11 +122,7 @@
_inBackground = background;
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:requestURL];
// Note the cachePolicy has no effect on persistent downloads on disk (i.e downloading update archives)
// It impacts temporary in-memory downloads such as appcast feeds and release notes.
// For now we don't use caching, but with more testing/experimenting that could change
// (e.g. not downloading same feed unmodified from previous request).
request.cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
request.cachePolicy = cachePolicy;
if (userAgent != nil) {
[request setValue:(NSString * _Nonnull)userAgent forHTTPHeaderField:@"User-Agent"];
@@ -151,7 +147,7 @@
NSURL *updateFileURL = updateItem.fileURL;
assert(updateFileURL != nil);
self = [self initWithRequestURL:updateFileURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:background delegate:delegate];
self = [self initWithRequestURL:updateFileURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:background cachePolicy:NSURLRequestReloadIgnoringLocalCacheData delegate:delegate];
if (self != nil) {
_updateItem = updateItem;
_secondaryUpdateItem = secondaryUpdateItem;
+6 -2
View File
@@ -7,14 +7,18 @@
//
#import <Foundation/Foundation.h>
#import "SPUResumableUpdate.h"
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SPUDownloadedUpdate : NSObject <SPUResumableUpdate>
@class SUAppcastItem;
SPU_OBJC_DIRECT_MEMBERS @interface SPUDownloadedUpdate : NSObject
- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryItem downloadBookmarkData:(NSData *)downloadBookmarkData downloadToken:(NSString *)downloadToken;
@property (nonatomic, readonly) SUAppcastItem *updateItem;
@property (nonatomic, readonly, nullable) SUAppcastItem *secondaryUpdateItem;
@property (nonatomic, readonly) NSData *downloadBookmarkData;
@property (nonatomic, readonly) NSString *downloadToken;
-2
View File
@@ -13,8 +13,6 @@
@implementation SPUDownloadedUpdate
// If we ever enable auto-synthesize in the future, we'll still need this synthesize
// because the property is declared in a protocol
@synthesize updateItem = _updateItem;
@synthesize secondaryUpdateItem = _secondaryUpdateItem;
-20
View File
@@ -1,20 +0,0 @@
//
// SPUInformationalUpdate.h
// Sparkle
//
// Created by Mayur Pawashe on 1/8/17.
// Copyright © 2017 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUResumableUpdate.h"
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SPUInformationalUpdate : NSObject <SPUResumableUpdate>
- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem;
@end
NS_ASSUME_NONNULL_END
-31
View File
@@ -1,31 +0,0 @@
//
// SPUInformationalUpdate.m
// Sparkle
//
// Created by Mayur Pawashe on 1/8/17.
// Copyright © 2017 Sparkle Project. All rights reserved.
//
#import "SPUInformationalUpdate.h"
#include "AppKitPrevention.h"
@implementation SPUInformationalUpdate
// If we ever enable auto-synthesize in the future, we'll still need this synthesize
// because the property is declared in a protocol
@synthesize updateItem = _updateItem;
@synthesize secondaryUpdateItem = _secondaryUpdateItem;
- (instancetype)initWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
self = [super init];
if (self != nil) {
_updateItem = updateItem;
_secondaryUpdateItem = secondaryUpdateItem;
}
return self;
}
@end
+2
View File
@@ -33,6 +33,8 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUInstallerDriver : NSObject
- (void)resumeInstallingUpdateWithUpdateItem:(SUAppcastItem *)updateItem systemDomain:(BOOL)systemDomain;
- (void)cancelSupersededInstallerBeforeLaunching;
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)extractDownloadedUpdate:(SPUDownloadedUpdate *)downloadedUpdate silently:(BOOL)silently completion:(void (^)(NSError * _Nullable))completionHandler;
+82 -34
View File
@@ -32,6 +32,7 @@
#include "AppKitPrevention.h"
#define FIRST_INSTALLER_MESSAGE_TIMEOUT 7ull
#define CANCEL_SUPERSEDED_INSTALLER_TIMEOUT 3ull
#if SPARKLE_BUILD_LEGACY_SUUPDATER
@interface NSObject (PrivateDelegateMethods)
@@ -62,11 +63,11 @@
SPUInstallerMessageType _currentStage;
NSUInteger _extractionAttempts;
BOOL _postponedOnce;
BOOL _relaunch;
BOOL _systemDomain;
BOOL _aborted;
BOOL _notifiedDelegateInstallationWillFinish;
BOOL _cancelSupersededInstaller;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater updaterDelegate:(id<SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id<SPUInstallerDriverDelegate>)delegate
@@ -148,26 +149,38 @@
[_delegate installerIsRequestingAbortInstallWithError:installerError];
}
- (id<SUInstallerConnectionProtocol>)createInstallerConnectionAndGetServiceName:(NSString * __autoreleasing *)outServiceName SPU_OBJC_DIRECT
{
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
id<SUInstallerConnectionProtocol> installerConnection;
#if INSTALLER_CONNECTION_XPC_SERVICE_EMBEDDED
if (SPUXPCServiceIsEnabled(SUEnableInstallerConnectionServiceKey)) {
installerConnection = [[SUXPCInstallerConnection alloc] initWithDelegate:self];
} else
#endif
{
installerConnection = [[SUInstallerConnection alloc] initWithDelegate:self remote:NO];
}
if (outServiceName != NULL) {
*outServiceName = SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier);
}
return installerConnection;
}
- (void)setUpConnection SPU_OBJC_DIRECT
{
if (_installerConnection != nil) {
return;
}
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
NSString *serviceName = nil;
_installerConnection = [self createInstallerConnectionAndGetServiceName:&serviceName];
BOOL usingInstallerService;
#if INSTALLER_CONNECTION_XPC_SERVICE_EMBEDDED
if (SPUXPCServiceIsEnabled(SUEnableInstallerConnectionServiceKey)) {
_installerConnection = [[SUXPCInstallerConnection alloc] initWithDelegate:self];
usingInstallerService = YES;
} else
#endif
{
_installerConnection = [[SUInstallerConnection alloc] initWithDelegate:self remote:NO];
usingInstallerService = NO;
}
// Check if we're using remote SUXPCInstallerConnection for diagnostic purposes
BOOL usingInstallerService = ![(id<NSObject>)_installerConnection isKindOfClass:SUInstallerConnection.class];
__weak __typeof__(self) weakSelf = self;
[_installerConnection setInvalidationHandler:^{
@@ -196,7 +209,6 @@
});
}];
NSString *serviceName = SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier);
NSString *installationType = _updateItem.installationType;
assert(installationType != nil);
@@ -212,7 +224,15 @@
_currentStage = SPUInstallerNotStarted;
if (_installerConnection == nil) {
[self launchAutoUpdateSilently:silently completion:completionHandler];
if (_cancelSupersededInstaller) {
_cancelSupersededInstaller = NO;
[self cancelSupersededInstallerWithCompletion:^{
[self launchAutoUpdateSilently:silently completion:completionHandler];
}];
} else {
[self launchAutoUpdateSilently:silently completion:completionHandler];
}
} else {
// The Install tool is already alive; just send out installation input data again
[self sendInstallationData];
@@ -226,6 +246,35 @@
_systemDomain = systemDomain;
}
- (void)cancelSupersededInstallerBeforeLaunching
{
_cancelSupersededInstaller = YES;
}
- (void)cancelSupersededInstallerWithCompletion:(void (^)(void))completionHandler SPU_OBJC_DIRECT
{
NSString *serviceName = nil;
id<SUInstallerConnectionProtocol> installerConnection = [self createInstallerConnectionAndGetServiceName:&serviceName];
__block BOOL completed = NO;
void (^completeCancellation)(void) = ^{
if (!completed) {
completed = YES;
[installerConnection invalidate];
completionHandler();
}
};
[installerConnection setInvalidationHandler:^{
dispatch_async(dispatch_get_main_queue(), completeCancellation);
}];
[installerConnection setServiceName:serviceName systemDomain:_systemDomain];
[installerConnection handleMessageWithIdentifier:SPUCancelInstallation data:[NSData data]];
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(CANCEL_SUPERSEDED_INSTALLER_TIMEOUT * NSEC_PER_SEC)), dispatch_get_main_queue(), completeCancellation);
}
- (void)sendInstallationData SPU_OBJC_DIRECT
{
NSString *pathToRelaunch = _applicationBundle.bundlePath;
@@ -487,8 +536,8 @@
// Send a probe/ping to the status service, which should boost/prioritize its startup
if (hostBundleIdentifier != nil) {
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL stausServiceIsRunning) {
if (!stausServiceIsRunning) {
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL statusServiceIsRunning) {
if (!statusServiceIsRunning) {
SULog(SULogLevelError, @"Error: failed to probe status service for %@ from the framework", hostBundleIdentifier);
}
}];
@@ -510,30 +559,29 @@
{
assert(_updateItem);
id<SPUInstallerDriverDelegate> delegate = _delegate;
if (![self mayUpdateAndRestart])
{
[delegate installerIsRequestingAbortInstallWithError:nil];
[_delegate installerIsRequestingAbortInstallWithError:nil];
return;
}
// Give the host app an opportunity to postpone the install and relaunch.
if (!_postponedOnce)
{
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvokingBlock:)]) {
_postponedOnce = YES;
__weak __typeof__(self) weakSelf = self;
if ([updaterDelegate updater:updater shouldPostponeRelaunchForUpdate:_updateItem untilInvokingBlock:^{
[weakSelf installWithToolAndRelaunch:relaunch displayingUserInterface:showUI];
}]) {
return;
}
id updater = _updater;
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
if (updater != nil && [updaterDelegate respondsToSelector:@selector(updater:shouldPostponeRelaunchForUpdate:untilInvokingBlock:)]) {
__weak __typeof__(self) weakSelf = self;
if ([updaterDelegate updater:updater shouldPostponeRelaunchForUpdate:_updateItem untilInvokingBlock:^{
[weakSelf _installWithToolAndRelaunch:relaunch displayingUserInterface:showUI];
}]) {
return;
}
}
[self _installWithToolAndRelaunch:relaunch displayingUserInterface:showUI];
}
- (void)_installWithToolAndRelaunch:(BOOL)relaunch displayingUserInterface:(BOOL)showUI SPU_OBJC_DIRECT
{
if (_updateWillInstallHandler != NULL) {
_updateWillInstallHandler();
}
@@ -550,7 +598,7 @@
// Avoid re-notifying the delegate twice
if (!_notifiedDelegateInstallationWillFinish) {
_notifiedDelegateInstallationWillFinish = YES;
[delegate installerWillFinishInstallationAndRelaunch:relaunch];
[_delegate installerWillFinishInstallationAndRelaunch:relaunch];
}
uint8_t response[2] = {(uint8_t)relaunch, (uint8_t)showUI};
+21 -18
View File
@@ -58,28 +58,31 @@ static NSTimeInterval OLD_ITEM_DELETION_INTERVAL = 86400 * 10; // 10 days
{
NSMutableArray<NSString *> *filePathsToRemove = [NSMutableArray array];
NSFileManager *fileManager = [NSFileManager defaultManager];
if ([fileManager fileExistsAtPath:directory]) {
NSDirectoryEnumerator *directoryEnumerator = [fileManager enumeratorAtPath:directory];
NSDate *currentDate = [NSDate date];
for (NSString *filename in directoryEnumerator)
{
NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:[directory stringByAppendingPathComponent:filename] error:NULL];
if (fileAttributes != nil)
{
NSDate *lastModificationDate = [fileAttributes objectForKey:NSFileModificationDate];
if ([currentDate timeIntervalSinceDate:lastModificationDate] >= OLD_ITEM_DELETION_INTERVAL)
{
[filePathsToRemove addObject:[directory stringByAppendingPathComponent:filename]];
NSDirectoryEnumerator *directoryEnumerator = [fileManager enumeratorAtPath:directory];
NSDate *currentDate = [NSDate date];
for (NSString *filename in directoryEnumerator) {
NSString *filePath = [directory stringByAppendingPathComponent:filename];
NSDictionary<NSString *, id> *fileAttributes = [fileManager attributesOfItemAtPath:filePath error:NULL];
if (fileAttributes != nil) {
NSDate *lastModificationDate = [fileAttributes objectForKey:NSFileModificationDate];
NSTimeInterval timeIntervalSinceLastModificationDate = [currentDate timeIntervalSinceDate:lastModificationDate];
if (timeIntervalSinceLastModificationDate >= OLD_ITEM_DELETION_INTERVAL) {
[filePathsToRemove addObject:[directory stringByAppendingPathComponent:filename]];
} else if (timeIntervalSinceLastModificationDate < 0) {
// Reset the modification date if it's far out in the future
NSError *resetModificationDateError = nil;
if (![fileManager setAttributes:@{NSFileModificationDate: currentDate} ofItemAtPath:filePath error:&resetModificationDateError]) {
SULog(SULogLevelError, @"Failed to reset modification date of file modified in future: %@", resetModificationDateError.localizedDescription);
}
}
[directoryEnumerator skipDescendants];
}
for (NSString *filename in filePathsToRemove)
{
[fileManager removeItemAtPath:filename error:NULL];
}
[directoryEnumerator skipDescendants];
}
for (NSString *filename in filePathsToRemove) {
[fileManager removeItemAtPath:filename error:NULL];
}
}
-23
View File
@@ -1,23 +0,0 @@
//
// SPUProbingUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUpdaterDelegate;
SPU_OBJC_DIRECT_MEMBERS @interface SPUProbingUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
-90
View File
@@ -1,90 +0,0 @@
//
// SPUProbingUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUProbingUpdateDriver.h"
#import "SPUBasicUpdateDriver.h"
#include "AppKitPrevention.h"
@interface SPUProbingUpdateDriver () <SPUBasicUpdateDriverDelegate>
@end
@implementation SPUProbingUpdateDriver
{
SPUBasicUpdateDriver *_basicDriver;
id<SPUResumableUpdate> _resumableUpdate;
}
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_basicDriver = [[SPUBasicUpdateDriver alloc] initWithHost:host updateCheck:SPUUpdateCheckUpdateInformation updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_basicDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))updateShownHandler
{
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
[_basicDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES];
}
- (void)resumeInstallingUpdate
{
[_basicDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
_resumableUpdate = resumableUpdate;
[_basicDriver resumeUpdate:resumableUpdate];
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)__unused appcastItem secondaryAppcastItem:(SUAppcastItem * _Nullable)__unused secondaryAppcastItem systemDomain:(NSNumber * _Nullable)__unused systemDomain
{
// Stop as soon as we have an answer
[self abortUpdate];
}
- (BOOL)showingUpdate
{
return NO;
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(nullable NSError *)error
{
[_basicDriver abortUpdateAndShowNextUpdateImmediately:NO resumableUpdate:_resumableUpdate error:error];
}
@end
+27
View File
@@ -0,0 +1,27 @@
//
// SPUReleaseNotesDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUDownloadDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost, SUSignatures, SPUDownloadData;
// Downloads and (if required) verifies release notes data for a found update
SPU_OBJC_DIRECT_MEMBERS @interface SPUReleaseNotesDriver : NSObject <SPUDownloadDriverDelegate>
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler;
- (void)startDownload;
- (void)cleanup:(void (^)(void))cleanupHandler;
@end
NS_ASSUME_NONNULL_END
+121
View File
@@ -0,0 +1,121 @@
//
// SPUReleaseNotesDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUReleaseNotesDriver.h"
#import "SUHost.h"
#import "SUErrors.h"
#import "SPUDownloadData.h"
#import "SPUDownloadDataPrivate.h"
#import "SPUExtractSignedFeed.h"
#import "SUSignatures.h"
#import "SUSignatureVerifier.h"
#import "SPUVerifierInformation.h"
#import "SULocalizations.h"
#include "AppKitPrevention.h"
@implementation SPUReleaseNotesDriver
{
SPUDownloadDriver *_downloadDriver;
SUHost *_host;
SUSignatures *_signatures;
void (^_completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable);
uint64_t _contentLength;
}
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler
{
self = [super init];
if (self != nil) {
_host = host;
_signatures = signatures;
_contentLength = contentLength;
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:releaseNotesURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:NO cachePolicy:NSURLRequestReloadIgnoringLocalCacheData delegate:self];
_completionHandler = [completionHandler copy];
} else {
assert(false);
}
return self;
}
- (void)startDownload
{
[_downloadDriver downloadFile];
}
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadDataToValidate
{
if (_completionHandler != nil) {
SPUDownloadData *downloadDataToPassToUserDriver;
// Strip out any sign warning comment prefix for markdown data so that user drivers
// will not have to deal with parsing them (if their markdown parsers don't handle decoding HTML)
NSString *MIMEType = downloadDataToValidate.MIMEType;
NSString *pathExtension = _downloadDriver.request.URL.pathExtension;
if ([MIMEType isEqualToString:@"text/markdown"] || [MIMEType isEqualToString:@"text/x-markdown"] ||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame || [pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame) {
NSData *contentData = SPUExtractReleaseNotesContent(downloadDataToValidate.data);
if (contentData.length != downloadDataToValidate.data.length) {
downloadDataToPassToUserDriver = [[SPUDownloadData alloc] initWithData:contentData URL:downloadDataToValidate.URL textEncodingName:downloadDataToValidate.textEncodingName MIMEType:downloadDataToValidate.MIMEType];
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
if (_host.requiresSignedAppcast) {
SUSignatureVerifier *signatureVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:_host.publicKeys];
SPUVerifierInformation *verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:nil expectedContentLength:_contentLength];
verifierInformation.actualContentLength = downloadDataToValidate.data.length;
NSError *verifierError = nil;
if (![signatureVerifier verifyData:downloadDataToValidate.data signatures:_signatures fileKind:@"release notes" verifierInformation:verifierInformation error:&verifierError]) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"The release notes is improperly signed and could not be validated. Please contact the app developer for more information.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (verifierError != nil) {
[userInfo setObject:verifierError forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
_completionHandler = nil;
}
}
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
{
if (_completionHandler != nil) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while downloading the release notes.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (error != nil) {
[userInfo setObject:error forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
_completionHandler = nil;
}
}
- (void)cleanup:(void (^)(void))cleanupHandler
{
_completionHandler = nil;
[_downloadDriver cleanup:cleanupHandler];
}
@end
-22
View File
@@ -1,22 +0,0 @@
//
// SPUResumableUpdate.h
// Sparkle
//
// Created by Mayur Pawashe on 7/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@class SUAppcastItem;
@protocol SPUResumableUpdate <NSObject>
@property (nonatomic, readonly) SUAppcastItem *updateItem;
@property (nonatomic, readonly, nullable) SUAppcastItem *secondaryUpdateItem;
@end
NS_ASSUME_NONNULL_END
-24
View File
@@ -1,24 +0,0 @@
//
// SPUScheduledUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/15/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
#import "SPUUIBasedUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUserDriver, SPUUpdaterDelegate;
SPU_OBJC_DIRECT_MEMBERS @interface SPUScheduledUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
-109
View File
@@ -1,109 +0,0 @@
//
// SPUScheduledUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/15/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUScheduledUpdateDriver.h"
#import "SUHost.h"
#import "SUErrors.h"
#import "SPUUpdaterDelegate.h"
#import "SPUUserDriver.h"
#include "AppKitPrevention.h"
@interface SPUScheduledUpdateDriver() <SPUUIBasedUpdateDriverDelegate>
@end
@implementation SPUScheduledUpdateDriver
{
SPUUIBasedUpdateDriver *_uiDriver;
void (^_updateDidShowHandler)(void);
BOOL _showedUpdate;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_uiDriver = [[SPUUIBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updater:updater userDriver:userDriver userInitiated:NO updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_uiDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))handler
{
_updateDidShowHandler = [handler copy];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_uiDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
[_uiDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:YES];
}
- (void)resumeInstallingUpdate
{
[_uiDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[_uiDriver resumeUpdate:resumableUpdate];
}
- (void)uiDriverDidShowUpdate
{
_showedUpdate = YES;
if (_updateDidShowHandler != nil) {
_updateDidShowHandler();
}
}
- (BOOL)showingUpdate
{
return _showedUpdate;
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *) error
{
[self abortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *) error
{
[self abortUpdateWithError:error];
}
- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(nullable NSError *)error
{
[_uiDriver abortUpdateWithError:error showErrorToUser:_showedUpdate];
}
@end
+28 -8
View File
@@ -35,11 +35,8 @@
#import <AppKit/AppKit.h>
#if __MAC_OS_X_VERSION_MAX_ALLOWED < 140000
@interface NSApplication (ActivationAPIs)
- (void)activate;
@end
#endif
// Delay before we need to show the checking for updates progress window when user initiates an update check
static const NSTimeInterval SUShowCheckingForUpdatesTimeDelay = 0.3;
@interface SPUStandardUserDriver () <SPUGentleUserDriverReminders>
@@ -63,6 +60,7 @@
id<NSObject> _applicationBecameActiveAfterUpdateAlertBecameKeyObserver;
NSValue *_updateAlertWindowFrameValue;
SUStatusController *_checkingController;
dispatch_block_t _showCheckingControllerWindowDelayBlock;
SUUpdateAlert *_activeUpdateAlert;
SPUUpdaterSettings *_updaterSettings;
@@ -129,7 +127,7 @@
- (void)_activateApplication SPU_OBJC_DIRECT
{
// -[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).
// from e.g. a menu bar. The OS should grant active focus to the application, but it is inconsistent (last tested on 26.5.1).
// For now we will prefer the deprecated more reliant API
[NSApp activateIgnoringOtherApps:YES];
}
@@ -476,6 +474,7 @@
[_statusController showWindow:nil];
mayNeedToActivateApp = YES;
} else if (_checkingController != nil) {
[self cancelShowCheckingControllerWindowDelayBlock];
[_checkingController showWindow:nil];
mayNeedToActivateApp = YES;
} else if (_retryTerminatingApplication != nil) {
@@ -556,13 +555,34 @@
[self _activateApplication];
}
[_checkingController showWindow:self];
// Don't show checking for updates window immediately
// Only show it if the check is taking a noticeable amount of time.
// This reduces the chance of a very sudden/quick transition between
// checking for updates and showing the next UI.
__weak __typeof__(self) weakSelf = self;
_showCheckingControllerWindowDelayBlock = dispatch_block_create_with_qos_class((dispatch_block_flags_t)0, QOS_CLASS_USER_INITIATED, 0, ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_checkingController showWindow:strongSelf];
}
});
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(SUShowCheckingForUpdatesTimeDelay * NSEC_PER_SEC)), dispatch_get_main_queue(), _showCheckingControllerWindowDelayBlock);
}
- (void)cancelShowCheckingControllerWindowDelayBlock SPU_OBJC_DIRECT
{
if (_showCheckingControllerWindowDelayBlock != nil) {
dispatch_cancel(_showCheckingControllerWindowDelayBlock);
_showCheckingControllerWindowDelayBlock = nil;
}
}
- (void)closeCheckingWindow SPU_OBJC_DIRECT
{
if (_checkingController != nil)
{
[self cancelShowCheckingControllerWindowDelayBlock];
[_checkingController close];
_checkingController = nil;
_cancellation = nil;
@@ -596,7 +616,7 @@
// Ideally we should use -[NSAlert alertWithError:] however
// unfortunately Sparkle may return error messages with descriptions that contain
// recovery suggestions. So we will check if an explicit recovery suggestion exists,
// and set the mesage and informative text appropriately.
// and set the message and informative text appropriately.
// In the future we should audit potential error messages and make them consistent.
NSAlert *alert = [[NSAlert alloc] init];
NSString *recoverySuggestion = [error localizedRecoverySuggestion];
-48
View File
@@ -1,48 +0,0 @@
//
// SPUUIBasedUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@protocol SPUUIBasedUpdateDriverDelegate <NSObject>
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
@optional
- (void)uiDriverDidShowUpdate;
- (void)basicDriverDidFinishLoadingAppcast;
@end
@class SUHost;
@protocol SPUUserDriver, SPUUpdaterDelegate;
SPU_OBJC_DIRECT_MEMBERS @interface SPUUIBasedUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver userInitiated:(BOOL)userInitiated updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUUIBasedUpdateDriverDelegate>)delegate;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
- (void)abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showedUserProgress;
@end
NS_ASSUME_NONNULL_END
-507
View File
@@ -1,507 +0,0 @@
//
// SPUUIBasedUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUUIBasedUpdateDriver.h"
#import "SPUCoreBasedUpdateDriver.h"
#import "SPUUserDriver.h"
#import "SUHost.h"
#import "SUConstants.h"
#import "SPUUpdaterDelegate.h"
#import "SUAppcastItem.h"
#import "SUErrors.h"
#import "SPUDownloadData.h"
#import "SPUDownloadDataPrivate.h"
#import "SPUExtractSignedFeed.h"
#import "SPUResumableUpdate.h"
#import "SPUDownloadDriver.h"
#import "SPUSkippedUpdate.h"
#import "SPUUserUpdateState+Private.h"
#import "SUAppcastItem+Private.h"
#import "SUSignatures.h"
#import "SUSignatureVerifier.h"
#import "SPUVerifierInformation.h"
#import "SULocalizations.h"
#include "AppKitPrevention.h"
// Private class for downloading release notes
@interface SPUReleaseNotesDriver: NSObject <SPUDownloadDriverDelegate>
@end
@implementation SPUReleaseNotesDriver
{
SPUDownloadDriver *_downloadDriver;
SUHost *_host;
SUSignatures *_signatures;
void (^_completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable);
uint64_t _contentLength;
}
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL contentLength:(uint64_t)contentLength signatures:(SUSignatures * _Nullable)signatures httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
{
self = [super init];
if (self != nil) {
_host = host;
_signatures = signatures;
_contentLength = contentLength;
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:releaseNotesURL host:host userAgent:userAgent httpHeaders:httpHeaders inBackground:NO delegate:self];
_completionHandler = [completionHandler copy];
} else {
assert(false);
}
return self;
}
- (void)startDownload SPU_OBJC_DIRECT
{
[_downloadDriver downloadFile];
}
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadDataToValidate
{
if (_completionHandler != nil) {
SPUDownloadData *downloadDataToPassToUserDriver;
// Strip out any sign warning comment prefix for markdown data so that user drivers
// will not have to deal with parsing them (if their markdown parsers don't handle decoding HTML)
NSString *MIMEType = downloadDataToValidate.MIMEType;
NSString *pathExtension = _downloadDriver.request.URL.pathExtension;
if ([MIMEType isEqualToString:@"text/markdown"] || [MIMEType isEqualToString:@"text/x-markdown"] ||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame || [pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame) {
NSData *contentData = SPUExtractReleaseNotesContent(downloadDataToValidate.data);
if (contentData.length != downloadDataToValidate.data.length) {
downloadDataToPassToUserDriver = [[SPUDownloadData alloc] initWithData:contentData URL:downloadDataToValidate.URL textEncodingName:downloadDataToValidate.textEncodingName MIMEType:downloadDataToValidate.MIMEType];
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
} else {
downloadDataToPassToUserDriver = downloadDataToValidate;
}
if (_host.requiresSignedAppcast) {
SUSignatureVerifier *signatureVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:_host.publicKeys];
SPUVerifierInformation *verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:nil expectedContentLength:_contentLength];
verifierInformation.actualContentLength = downloadDataToValidate.data.length;
NSError *verifierError = nil;
if (![signatureVerifier verifyData:downloadDataToValidate.data signatures:_signatures fileKind:@"release notes" verifierInformation:verifierInformation error:&verifierError]) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"The release notes is improperly signed and could not be validated. Please contact the app developer for more information.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (verifierError != nil) {
[userInfo setObject:verifierError forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
} else {
_completionHandler(downloadDataToPassToUserDriver, nil);
}
_completionHandler = nil;
}
}
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
{
if (_completionHandler != nil) {
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:@{NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while downloading the release notes.", SPARKLE_TABLE, SUSparkleBundle(), nil)}];
if (error != nil) {
[userInfo setObject:error forKey:NSUnderlyingErrorKey];
}
_completionHandler(nil, [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]);
_completionHandler = nil;
}
}
- (void)cleanup:(void (^)(void))cleanupHandler SPU_OBJC_DIRECT
{
_completionHandler = nil;
[_downloadDriver cleanup:cleanupHandler];
}
@end
@interface SPUUIBasedUpdateDriver() <SPUCoreBasedUpdateDriverDelegate>
@end
@implementation SPUUIBasedUpdateDriver
{
SPUCoreBasedUpdateDriver *_coreDriver;
SUHost *_host;
id<SPUUserDriver> _userDriver;
SPUReleaseNotesDriver *_releaseNotesDriver;
NSDictionary *_httpHeaders;
NSString *_userAgent;
__weak id _updater;
__weak id<SPUUpdaterDelegate> _updaterDelegate;
__weak id<SPUUIBasedUpdateDriverDelegate> _delegate;
BOOL _userInitiated;
BOOL _resumingInstallingUpdate;
BOOL _resumingDownloadedInfoOrUpdate;
}
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver userInitiated:(BOOL)userInitiated updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(id<SPUUIBasedUpdateDriverDelegate>)delegate
{
self = [super init];
if (self != nil) {
_userDriver = userDriver;
_delegate = delegate;
_updater = updater;
_userInitiated = userInitiated;
_updaterDelegate = updaterDelegate;
_host = host;
SPUUpdateCheck updateCheck = userInitiated ? SPUUpdateCheckUpdates : SPUUpdateCheckUpdatesInBackground;
_coreDriver = [[SPUCoreBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updateCheck:updateCheck updater:updater updaterDelegate:updaterDelegate delegate:self];
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_coreDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_coreDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)_clearSkippedUpdatesIfUserInitiated SPU_OBJC_DIRECT
{
if (_userInitiated) {
[SPUSkippedUpdate clearSkippedUpdateForHost:_host];
}
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
{
_httpHeaders = httpHeaders;
_userAgent = userAgent;
[self _clearSkippedUpdatesIfUserInitiated];
[_coreDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:background requiresSilentInstall:NO];
}
- (void)resumeInstallingUpdate
{
[self _clearSkippedUpdatesIfUserInitiated];
_resumingInstallingUpdate = YES;
[_coreDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[self _clearSkippedUpdatesIfUserInitiated];
_resumingDownloadedInfoOrUpdate = YES;
[_coreDriver resumeUpdate:resumableUpdate];
}
- (void)basicDriverDidFinishLoadingAppcast
{
id<SPUUIBasedUpdateDriverDelegate> delegate = _delegate;
if ([delegate respondsToSelector:@selector(basicDriverDidFinishLoadingAppcast)]) {
[delegate basicDriverDidFinishLoadingAppcast];
}
}
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryUpdateItem
{
id <SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
id<SPUUIBasedUpdateDriverDelegate> delegate = _delegate;
SPUUserUpdateStage stage;
// Major upgrades and information only updates are not downloaded automatically, as well as feeds that failed signing validation
if (_resumingDownloadedInfoOrUpdate && !updateItem.majorUpgrade && !updateItem.informationOnlyUpdate && updateItem.signingValidationStatus != SPUAppcastSigningValidationStatusFailed) {
stage = SPUUserUpdateStageDownloaded;
} else if (_resumingInstallingUpdate) {
stage = SPUUserUpdateStageInstalling;
} else {
stage = SPUUserUpdateStageNotDownloaded;
}
SPUUserUpdateState *state = [[SPUUserUpdateState alloc] initWithStage:stage userInitiated:_userInitiated];
[_userDriver showUpdateFoundWithAppcastItem:updateItem state:state reply:^(SPUUserUpdateChoice userChoice) {
dispatch_async(dispatch_get_main_queue(), ^{
// Rule out invalid choices
SPUUserUpdateChoice validatedChoice;
if (updateItem.isInformationOnlyUpdate && userChoice == SPUUserUpdateChoiceInstall) {
validatedChoice = SPUUserUpdateChoiceDismiss;
} else {
validatedChoice = userChoice;
}
id updater = self->_updater;
if (updater != nil) {
if ([updaterDelegate respondsToSelector:@selector(updater:userDidMakeChoice:forUpdate:state:)]) {
[updaterDelegate updater:updater userDidMakeChoice:validatedChoice forUpdate:updateItem state:state];
} else if (validatedChoice == SPUUserUpdateChoiceSkip && [updaterDelegate respondsToSelector:@selector(updater:userDidSkipThisVersion:)]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[updaterDelegate updater:updater userDidSkipThisVersion:updateItem];
#pragma clang diagnostic pop
}
}
switch (validatedChoice) {
case SPUUserUpdateChoiceInstall: {
switch (stage) {
case SPUUserUpdateStageDownloaded:
[self->_coreDriver extractDownloadedUpdate];
break;
case SPUUserUpdateStageInstalling:
[self->_coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES];
break;
case SPUUserUpdateStageNotDownloaded:
[self->_coreDriver downloadUpdateFromAppcastItem:updateItem secondaryAppcastItem:secondaryUpdateItem inBackground:NO];
break;
}
break;
}
case SPUUserUpdateChoiceSkip: {
[SPUSkippedUpdate skipUpdate:updateItem host:self->_host];
switch (stage) {
case SPUUserUpdateStageDownloaded:
case SPUUserUpdateStageNotDownloaded:
// Informational and major updates can be resumed too, so make sure we check
// self->_resumingDownloadedInfoOrUpdate instead of the stage we pass to user driver
if (self->_resumingDownloadedInfoOrUpdate) {
[self->_coreDriver clearDownloadedUpdate];
}
[delegate uiDriverIsRequestingAbortUpdateWithError:nil];
break;
case SPUUserUpdateStageInstalling:
[self->_coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES];
break;
}
break;
}
case SPUUserUpdateChoiceDismiss: {
switch (stage) {
case SPUUserUpdateStageDownloaded:
case SPUUserUpdateStageNotDownloaded: {
[self->_delegate uiDriverIsRequestingAbortUpdateWithError:nil];
break;
}
case SPUUserUpdateStageInstalling: {
[self->_coreDriver finishInstallationWithResponse:validatedChoice displayingUserInterface:YES];
break;
}
}
break;
}
}
});
}];
if ([delegate respondsToSelector:@selector(uiDriverDidShowUpdate)]) {
[delegate uiDriverDidShowUpdate];
}
if (updateItem.releaseNotesURL != nil && (![updaterDelegate respondsToSelector:@selector(updater:shouldDownloadReleaseNotesForUpdate:)] || [updaterDelegate updater:_updater shouldDownloadReleaseNotesForUpdate:updateItem])) {
__weak __typeof__(self) weakSelf = self;
_releaseNotesDriver = [[SPUReleaseNotesDriver alloc] initWithReleaseNotesURL:updateItem.releaseNotesURL contentLength:updateItem.releaseNotesContentLength signatures:updateItem.releaseNotesSignatures httpHeaders:_httpHeaders userAgent:_userAgent host:_host completionHandler:^(SPUDownloadData * _Nullable downloadData, NSError * _Nullable error) {
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
id <SPUUserDriver> userDriver = strongSelf->_userDriver;
if (downloadData != nil) {
[userDriver showUpdateReleaseNotesWithDownloadData:(SPUDownloadData * _Nonnull)downloadData];
} else {
[userDriver showUpdateReleaseNotesFailedToDownloadWithError:(NSError * _Nonnull)error];
}
}
}];
[_releaseNotesDriver startDownload];
}
}
- (void)downloadDriverWillBeginDownload
{
void (^cancelDownload)(void) = ^{
dispatch_async(dispatch_get_main_queue(), ^{
id<SPUUpdaterDelegate> updaterDelegate = self->_updaterDelegate;
if ([updaterDelegate respondsToSelector:@selector((userDidCancelDownload:))]) {
[updaterDelegate userDidCancelDownload:self->_updater];
}
[self->_delegate uiDriverIsRequestingAbortUpdateWithError:nil];
});
};
[_userDriver showDownloadInitiatedWithCancellation:cancelDownload];
}
- (void)downloadDriverDidReceiveExpectedContentLength:(uint64_t)expectedContentLength
{
[_userDriver showDownloadDidReceiveExpectedContentLength:expectedContentLength];
}
- (void)downloadDriverDidReceiveDataOfLength:(uint64_t)length
{
[_userDriver showDownloadDidReceiveDataOfLength:length];
}
- (void)coreDriverDidStartExtractingUpdate
{
[_userDriver showDownloadDidStartExtractingUpdate];
}
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated
{
if ([_userDriver respondsToSelector:@selector(showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication:)]) {
__weak __typeof__(self) weakSelf = self;
[_userDriver showInstallingUpdateWithApplicationTerminated:applicationTerminated retryTerminatingApplication:^{
if (!applicationTerminated) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_coreDriver finishInstallationWithResponse:SPUUserUpdateChoiceInstall displayingUserInterface:YES];
}
});
}
}];
} else if ([_userDriver respondsToSelector:@selector(showInstallingUpdateWithApplicationTerminated:)]) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_userDriver showInstallingUpdateWithApplicationTerminated:applicationTerminated];
#pragma clang diagnostic pop
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([_userDriver respondsToSelector:@selector(showInstallingUpdate)]) {
[_userDriver showInstallingUpdate];
}
if (!applicationTerminated) {
if ([_userDriver respondsToSelector:@selector(showSendingTerminationSignal)]) {
[_userDriver showSendingTerminationSignal];
}
}
#pragma clang diagnostic pop
}
}
- (void)installerDidExtractUpdateWithProgress:(double)progress
{
[_userDriver showExtractionReceivedProgress:progress];
}
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
{
if (!willInstallImmediately) {
[_userDriver showReadyToInstallAndRelaunch:^(SPUUserUpdateChoice choice) {
dispatch_async(dispatch_get_main_queue(), ^{
[self->_coreDriver finishInstallationWithResponse:choice displayingUserInterface:YES];
});
}];
}
}
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunched acknowledgement:(void(^)(void))acknowledgement
{
if ([_userDriver respondsToSelector:@selector(showUpdateInstalledAndRelaunched:acknowledgement:)]) {
[_userDriver showUpdateInstalledAndRelaunched:relaunched acknowledgement:acknowledgement];
} else {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_userDriver showUpdateInstallationDidFinishWithAcknowledgement:acknowledgement];
#pragma clang diagnostic pop
}
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
// A delegate may want to handle this type of error specially
[_delegate basicDriverIsRequestingAbortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(NSError *)error
{
// A delegate may want to handle this type of error specially
[_delegate coreDriverIsRequestingAbortUpdateWithError:error];
}
- (void)_abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showErrorToUser SPU_OBJC_DIRECT
{
void (^abortUpdate)(void) = ^{
if (showErrorToUser) {
[self->_userDriver dismissUpdateInstallation];
}
[self->_coreDriver abortUpdateAndShowNextUpdateImmediately:NO error:error];
};
if (error != nil && showErrorToUser) {
NSError *nonNullError = error;
if (error.code == SUNoUpdateError) {
if ([_userDriver respondsToSelector:@selector(showUpdateNotFoundWithError:acknowledgement:)]) {
[_userDriver showUpdateNotFoundWithError:(NSError * _Nonnull)error acknowledgement:^{
dispatch_async(dispatch_get_main_queue(), ^{
abortUpdate();
});
}];
} else if ([_userDriver respondsToSelector:@selector(showUpdateNotFoundWithAcknowledgement:)]) {
// Eventually we should remove this fallback once clients adopt -showUpdateNotFoundWithError:acknowledgement:
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
[_userDriver showUpdateNotFoundWithAcknowledgement:^{
#pragma clang diagnostic pop
dispatch_async(dispatch_get_main_queue(), ^{
abortUpdate();
});
}];
}
} else if (error.code == SUInstallationCanceledError || error.code == SUInstallationAuthorizeLaterError) {
abortUpdate();
} else {
[_userDriver showUpdaterError:nonNullError acknowledgement:^{
dispatch_async(dispatch_get_main_queue(), ^{
abortUpdate();
});
}];
}
} else {
abortUpdate();
}
}
- (void)abortUpdateWithError:(nullable NSError *)error showErrorToUser:(BOOL)showErrorToUser
{
if (_releaseNotesDriver != nil) {
[_releaseNotesDriver cleanup:^{
[self _abortUpdateWithError:error showErrorToUser:showErrorToUser];
}];
} else {
[self _abortUpdateWithError:error showErrorToUser:showErrorToUser];
}
}
@end
+40 -17
View File
@@ -6,18 +6,43 @@
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
@protocol SPUResumableUpdate;
@class SPUDownloadedUpdate;
@class SUHost;
@protocol SPUUserDriver, SPUUpdaterDelegate;
typedef void (^SPUUpdateDriverCompletion)(BOOL shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable resumableUpdate, NSError * _Nullable error);
// The driver's cycle has ended. resumableLocalUpdate reflects the local state (a downloaded-but-not-installed
// update) that should be passed back in on the next cycle, if any.
typedef void (^SPUUpdateDriverCompletion)(BOOL shouldResetImpatientCheckDate, SPUDownloadedUpdate * _Nullable resumableLocalUpdate, NSError * _Nullable error);
// This protocol describes an update driver that drives updates
// An update driver may have multiple levels of other controller components (eg: basic update driver, core based update driver, ui based update driver, appcast driver, etc)
// The update driver and the components the driver has communicates via parameter passing and delegation..
// The old Sparkle architecture communicated via subclassing and method overriding, but this lead to bugs due to high coupling, and complexity of not being aware of methods being executed.
// The newer architecture is still complex but should be more reliable to maintain and extend.
@protocol SPUUpdateDriver <NSObject>
typedef NS_ENUM(NSUInteger, SPUUpdateDriverInstallMode) {
// The driver only probes for update information and never shows anything or downloads/installs
// (eg: -checkForUpdateInformation)
SPUUpdateDriverInstallModeNone,
// The driver may silently download and stage/install an update without asking first.
// If an update needs the user's attention before proceeding (eg: it's a major upgrade,
// informational-only, critical, or requires authorization), the driver escalates to
// SPUUpdateDriverInstallModeShowingUI in the same cycle rather than proceeding silently.
SPUUpdateDriverInstallModeAutomatic,
// The driver presents UI via the user driver and asks before downloading/installing.
SPUUpdateDriverInstallModeShowingUI,
};
// This class drives an update check cycle: querying the appcast, downloading, extracting,
// installing, and presenting UI as needed, according to its install mode.
SPU_OBJC_DIRECT_MEMBERS @interface SPUUpdateDriver : NSObject
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(nullable id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate userInitiated:(BOOL)userInitiated installMode:(SPUUpdateDriverInstallMode)installMode;
// Only meaningful for a driver constructed with SPUUpdateDriverInstallModeAutomatic.
// Must be set (along with impatientUpdateCheckInterval) before starting a check.
@property (nonatomic, copy) NSDate *lastImpatientCheckedDate;
@property (nonatomic) NSTimeInterval impatientUpdateCheckInterval;
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock;
@@ -25,19 +50,17 @@ typedef void (^SPUUpdateDriverCompletion)(BOOL shouldShowUpdateImmediately, id<S
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler;
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders;
- (void)resumeInstallingUpdate;
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate;
// Checks for updates, resuming resumableLocalUpdate (a downloaded-but-not-installed update) if one
// was passed back from a prior cycle's completion handler. The driver also probes on its own for an
// update that an external installer job (eg: from another instance of the updater)
// may already be staging or installing; if it finds one, that global state
// takes priority over resumableLocalUpdate.
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(nullable NSDictionary *)httpHeaders resumingLocalUpdate:(nullable SPUDownloadedUpdate *)resumableLocalUpdate;
@property (nonatomic, readonly) BOOL showingUpdate;
// A likely implementation of -abortUpdate is invoking -abortUpdateWithError: by passing nil
- (void)abortUpdate;
// This should be invoked on the update driver to finish the update driver's work
- (void)abortUpdateWithError:(NSError * _Nullable)error;
- (void)abortUpdateWithError:(nullable NSError *)error;
@end
+1052
View File
File diff suppressed because it is too large. Load diff
+122 -184
View File
@@ -19,18 +19,12 @@
#import "SULog+NSError.h"
#import "SUCodeSigningVerifier.h"
#import "SUSystemProfiler.h"
#import "SPUScheduledUpdateDriver.h"
#import "SPUProbingUpdateDriver.h"
#import "SPUUserInitiatedUpdateDriver.h"
#import "SPUAutomaticUpdateDriver.h"
#import "SPUProbeInstallStatus.h"
#import "SUAppcastItem.h"
#import "SPUInstallationInfo.h"
#import "SUErrors.h"
#import "SPUXPCServiceInfo.h"
#import "SPUUpdaterCycle.h"
#import "SPUUpdaterTimer.h"
#import "SPUResumableUpdate.h"
#import "SPUDownloadedUpdate.h"
#import "SUSignatures.h"
#import "SPUUserAgent+Private.h"
#import "SPUGentleUserDriverReminders.h"
@@ -56,7 +50,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
@implementation SPUUpdater
{
id<SPUUserDriver> _userDriver;
id <SPUUpdateDriver> _driver;
SPUUpdateDriver *_driver;
SUHost *_host;
SUHost *_mainBundleHost;
NSBundle *_applicationBundle;
@@ -64,8 +58,9 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
SPUUpdaterSettings *_updaterSettings;
SPUUpdaterCycle *_updaterCycle;
SPUUpdaterTimer *_updaterTimer;
id<SPUResumableUpdate> _resumableUpdate;
SPUDownloadedUpdate *_resumableLocalUpdate;
NSDate *_updateLastCheckedDate;
NSDate *_updateLastImpatientCheckedDate;
NSURL *_lastCheckedFeedURL;
NSSet<NSString *> * _lastAllowedChannels;
@@ -106,6 +101,10 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
_delegate = delegate;
// Initialized to the current date instead of nil so the first update check runs
// correctly if there's a installation in progress by another external updater
_updateLastImpatientCheckedDate = [NSDate date];
NSBundle *mainBundle = [NSBundle mainBundle];
_updatingMainBundle = [hostBundle isEqualTo:mainBundle];
@@ -528,87 +527,58 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
if (firingImmediately) {
[self _checkForUpdatesInBackground];
} else {
// This may not return the same update check interval as the developer has configured
// Notably it may differ when we have an update that has been already downloaded and needs to resume,
// as well as if that update is marked critical or not
void (^retrieveNextUpdateCheckInterval)(void (^)(NSTimeInterval)) = ^(void (^completionHandler)(NSTimeInterval)) {
NSString *hostBundleIdentifier = self->_host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerUpdateItemForHostBundleIdentifier:hostBundleIdentifier completion:^(SPUInstallationInfo * _Nullable installationInfo) {
dispatch_async(dispatch_get_main_queue(), ^{
NSTimeInterval regularCheckInterval = [self updateCheckInterval];
NSTimeInterval impatientCheckInterval = [self->_updaterSettings impatientUpdateCheckInterval];
if (installationInfo == nil) {
// Proceed as normal if there's no resumable updates
completionHandler(regularCheckInterval);
} else {
if ([installationInfo.appcastItem isCriticalUpdate] || [installationInfo.appcastItem isInformationOnlyUpdate]) {
completionHandler(MIN(regularCheckInterval, impatientCheckInterval));
} else {
completionHandler(MAX(regularCheckInterval, impatientCheckInterval));
}
}
});
}];
};
self.canCheckForUpdates = NO;
self.sessionInProgress = YES;
retrieveNextUpdateCheckInterval(^(NSTimeInterval updateCheckInterval) {
[self setCanCheckForUpdates:YES];
[self setSessionInProgress:NO];
// This callback is asynchronous, so the timer may be set. Invalidate to make sure it isn't.
[self->_updaterTimer invalidate];
NSTimeInterval intervalSinceCheck;
if (usingCurrentDate) {
// How long has it been since last we checked for an update?
NSDate *lastCheckDate = [self lastUpdateCheckDate];
if (!lastCheckDate) { lastCheckDate = [NSDate distantPast]; }
intervalSinceCheck = [[NSDate date] timeIntervalSinceDate:lastCheckDate];
if (intervalSinceCheck < 0) {
// Last update check date is in the future and bogus, so reset it to current date
[self updateLastUpdateCheckDate];
intervalSinceCheck = 0;
}
} else {
NSTimeInterval checkInterval = [self updateCheckInterval];
// This callback is asynchronous, so the timer may be set. Invalidate to make sure it isn't.
[_updaterTimer invalidate];
NSTimeInterval intervalSinceCheck;
if (usingCurrentDate) {
// How long has it been since last we checked for an update?
NSDate *lastCheckDate = [self lastUpdateCheckDate];
if (!lastCheckDate) {
lastCheckDate = [NSDate distantPast];
}
intervalSinceCheck = [[NSDate date] timeIntervalSinceDate:lastCheckDate];
if (intervalSinceCheck < 0) {
// Last update check date is in the future and bogus, so reset it to current date
[self updateLastUpdateCheckDate];
intervalSinceCheck = 0;
}
NSTimeInterval minimumUpdateCheckInterval = self->_updaterSettings.minimumUpdateCheckInterval;
// Now we want to figure out how long until we check again.
if (updateCheckInterval < minimumUpdateCheckInterval)
updateCheckInterval = minimumUpdateCheckInterval;
if (intervalSinceCheck < updateCheckInterval) {
NSTimeInterval delayUntilCheck = (updateCheckInterval - intervalSinceCheck); // It hasn't been long enough.
if ([delegate respondsToSelector:@selector(updater:willScheduleUpdateCheckAfterDelay:)]) {
[delegate updater:self willScheduleUpdateCheckAfterDelay:delayUntilCheck];
}
if ([self->_userDriver respondsToSelector:@selector(logGentleScheduledUpdateReminderWarningIfNeeded)]) {
[(id<SPUGentleUserDriverReminders>)self->_userDriver logGentleScheduledUpdateReminderWarningIfNeeded];
}
uint64_t leewayUpdateCheckInterval = self->_updaterSettings.leewayUpdateCheckInterval;
[self->_updaterTimer startAndFireAfterDelay:delayUntilCheck leewayUpdateCheckInterval:leewayUpdateCheckInterval];
} else {
// We're overdue! Run one now.
[self _checkForUpdatesInBackground];
} else {
intervalSinceCheck = 0;
}
NSTimeInterval minimumUpdateCheckInterval = self->_updaterSettings.minimumUpdateCheckInterval;
// Now we want to figure out how long until we check again.
if (checkInterval < minimumUpdateCheckInterval)
checkInterval = minimumUpdateCheckInterval;
if (intervalSinceCheck < checkInterval) {
NSTimeInterval delayUntilCheck = (checkInterval - intervalSinceCheck); // It hasn't been long enough.
if ([delegate respondsToSelector:@selector(updater:willScheduleUpdateCheckAfterDelay:)]) {
[delegate updater:self willScheduleUpdateCheckAfterDelay:delayUntilCheck];
}
});
if ([_userDriver respondsToSelector:@selector(logGentleScheduledUpdateReminderWarningIfNeeded)]) {
[(id<SPUGentleUserDriverReminders>)_userDriver logGentleScheduledUpdateReminderWarningIfNeeded];
}
uint64_t leewayUpdateCheckInterval = _updaterSettings.leewayUpdateCheckInterval;
[_updaterTimer startAndFireAfterDelay:delayUntilCheck leewayUpdateCheckInterval:leewayUpdateCheckInterval];
} else {
// We're overdue! Run one now.
[self _checkForUpdatesInBackground];
}
}
}
- (void)updaterTimerDidFire
{
// User can perform a checkForUpdates check around the same time the timer is ready to fire
if (!_sessionInProgress)
{
if (!_sessionInProgress) {
[self _checkForUpdatesInBackground];
}
}
@@ -617,42 +587,24 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
{
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:NO];
// We don't want the probe check to act on the driver if the updater is going near death
__weak __typeof__(self) weakSelf = self;
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
assert(hostBundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL installerIsRunning) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf == nil) {
return;
}
id<SPUUpdaterDelegate> delegate = strongSelf->_delegate;
id <SPUUpdateDriver> updateDriver;
if (!installerIsRunning && [strongSelf automaticallyDownloadsUpdates] && strongSelf->_resumableUpdate == nil) {
updateDriver =
[[SPUAutomaticUpdateDriver alloc]
initWithHost:strongSelf->_host
applicationBundle:strongSelf->_applicationBundle
updater:strongSelf
userDriver:strongSelf->_userDriver
updaterDelegate:delegate];
} else {
updateDriver =
[[SPUScheduledUpdateDriver alloc]
initWithHost:strongSelf->_host
applicationBundle:strongSelf->_applicationBundle
updater:strongSelf
userDriver:strongSelf->_userDriver
updaterDelegate:delegate];
}
[strongSelf checkForUpdatesWithDriver:updateDriver updateCheck:SPUUpdateCheckUpdatesInBackground installerInProgress:installerIsRunning];
});
}];
id<SPUUpdaterDelegate> delegate = _delegate;
SPUUpdateDriverInstallMode installMode = [self automaticallyDownloadsUpdates] ? SPUUpdateDriverInstallModeAutomatic : SPUUpdateDriverInstallModeShowingUI;
SPUUpdateDriver *updateDriver = [[SPUUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:_userDriver updaterDelegate:delegate userInitiated:NO installMode:installMode];
if (installMode == SPUUpdateDriverInstallModeAutomatic) {
if ([_updateLastImpatientCheckedDate timeIntervalSinceNow] > 0) {
// Last impatient checked date is bogus (in the future), reset it
_updateLastImpatientCheckedDate = [NSDate date];
}
updateDriver.impatientUpdateCheckInterval = _updaterSettings.impatientUpdateCheckInterval;
updateDriver.lastImpatientCheckedDate = _updateLastImpatientCheckedDate;
}
[self checkForUpdatesWithDriver:updateDriver updateCheck:SPUUpdateCheckUpdatesInBackground];
}
// This is the developer-facing checkForUpdatesInBackground
@@ -735,20 +687,9 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:NO];
id <SPUUpdateDriver> theUpdateDriver = [[SPUUserInitiatedUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:_userDriver updaterDelegate:_delegate];
NSString *bundleIdentifier = _host.bundle.bundleIdentifier;
assert(bundleIdentifier != nil);
__weak __typeof__(self) weakSelf = self;
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:bundleIdentifier completion:^(BOOL installerInProgress) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf checkForUpdatesWithDriver:theUpdateDriver updateCheck:SPUUpdateCheckUpdates installerInProgress:installerInProgress];
}
});
}];
SPUUpdateDriver *theUpdateDriver = [[SPUUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:_userDriver updaterDelegate:_delegate userInitiated:YES installMode:SPUUpdateDriverInstallModeShowingUI];
[self checkForUpdatesWithDriver:theUpdateDriver updateCheck:SPUUpdateCheckUpdates];
}
- (void)checkForUpdateInformation
@@ -764,36 +705,27 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
return;
}
__weak __typeof__(self) weakSelf = self;
if (!_startedUpdater) {
SULog(SULogLevelError, @"Error: checkForUpdateInformation - updater hasn't been started yet. Please call -startUpdater: first");
return;
}
if (_sessionInProgress) {
SULog(SULogLevelError, @"Error: -checkForUpdateInformation called but .sessionInProgress == YES");
return;
}
[self setSessionInProgress:YES];
[self setCanCheckForUpdates:NO];
NSString *bundleIdentifier = _host.bundle.bundleIdentifier;
assert(bundleIdentifier != nil);
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:bundleIdentifier completion:^(BOOL installerInProgress) {
dispatch_async(dispatch_get_main_queue(), ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf checkForUpdatesWithDriver:[[SPUProbingUpdateDriver alloc] initWithHost:strongSelf->_host updater:strongSelf updaterDelegate:strongSelf->_delegate] updateCheck:SPUUpdateCheckUpdateInformation installerInProgress:installerInProgress];
}
});
}];
SPUUpdateDriver *probingDriver = [[SPUUpdateDriver alloc] initWithHost:_host applicationBundle:_applicationBundle updater:self userDriver:nil updaterDelegate:_delegate userInitiated:NO installMode:SPUUpdateDriverInstallModeNone];
[self checkForUpdatesWithDriver:probingDriver updateCheck:SPUUpdateCheckUpdateInformation];
}
- (void)checkForUpdatesWithDriver:(id <SPUUpdateDriver> )d updateCheck:(SPUUpdateCheck)updateCheck installerInProgress:(BOOL)installerInProgress SPU_OBJC_DIRECT
- (void)checkForUpdatesWithDriver:(SPUUpdateDriver *)d updateCheck:(SPUUpdateCheck)updateCheck SPU_OBJC_DIRECT
{
if (_driver != nil) {
SULog(SULogLevelError, @"Error: checkForUpdatesWithDriver:updateCheck:installerInProgress: called when _driver != nil");
SULog(SULogLevelError, @"Error: checkForUpdatesWithDriver:updateCheck: called when _driver != nil");
return;
}
@@ -804,30 +736,29 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
_driver = d;
assert(_driver != nil);
void (^notifyDelegateOfDriverCompletion)(NSError * _Nullable, BOOL) = ^(NSError * _Nullable error, BOOL shouldShowUpdateImmediately) {
void (^notifyDelegateOfDriverCompletion)(NSError * _Nullable) = ^(NSError * _Nullable error) {
id<SPUUpdaterDelegate> delegate = self->_delegate;
if (error != nil) {
if (error.code != SUNoUpdateError && error.code != SUInstallationCanceledError && error.code != SUInstallationAuthorizeLaterError) { // Let's not bother logging this.
if (error.code != SUNoUpdateError && error.code != SUInstallationCanceledError) { // Let's not bother logging this.
SULogError(error);
}
// Notify host app that update driver has aborted if a non-recoverable error occurs
if (error.code != SUInstallationAuthorizeLaterError && [delegate respondsToSelector:@selector((updater:didAbortWithError:))]) {
if ([delegate respondsToSelector:@selector((updater:didAbortWithError:))]) {
[delegate updater:self didAbortWithError:(NSError * _Nonnull)error];
}
}
// Notify host app that update driver has finished
// As long as we're not going to immediately kick off a new check
if (!shouldShowUpdateImmediately && [delegate respondsToSelector:@selector((updater:didFinishUpdateCycleForUpdateCheck:error:))]) {
if ([delegate respondsToSelector:@selector((updater:didFinishUpdateCycleForUpdateCheck:error:))]) {
[delegate updater:self didFinishUpdateCycleForUpdateCheck:updateCheck error:error];
}
};
void (^abortUpdateDriver)(NSError * _Nullable , BOOL) = ^(NSError * _Nullable abortError, BOOL shouldScheduleNextUpdateCheck) {
__weak __typeof__(self) weakSelf = self;
[self->_driver setCompletionHandler:^(BOOL __unused shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable __unused resumableUpdate, NSError * _Nullable error) {
[self->_driver setCompletionHandler:^(BOOL __unused shouldResetImpatientCheckDate, SPUDownloadedUpdate * _Nullable __unused resumableLocalUpdate, NSError * _Nullable error) {
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
strongSelf->_driver = nil;
@@ -837,7 +768,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
strongSelf.sessionInProgress = NO;
strongSelf.canCheckForUpdates = YES;
notifyDelegateOfDriverCompletion(error, NO);
notifyDelegateOfDriverCompletion(error);
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
if (!strongSelf->_sessionInProgress) {
@@ -863,7 +794,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
([delegate respondsToSelector:@selector((updaterMayCheckForUpdates:))] && ![delegate updaterMayCheckForUpdates:self]))
#pragma clang diagnostic pop
{
abortUpdateDriver(mayCheckForUpdatesError, YES);
abortUpdateDriver((mayCheckForUpdatesError != nil) ? mayCheckForUpdatesError : [NSError errorWithDomain:SUSparkleErrorDomain code:SUUpdateCheckDeclinedError userInfo:nil], YES);
return;
}
@@ -879,27 +810,34 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
// Run our update driver and schedule next update check on its completion
__weak __typeof__(self) weakSelf = self;
[_driver setCompletionHandler:^(BOOL shouldShowUpdateImmediately, id<SPUResumableUpdate> _Nullable resumableUpdate, NSError * _Nullable error) {
[_driver setCompletionHandler:^(BOOL shouldResetImpatientCheckDate, SPUDownloadedUpdate * _Nullable resumableLocalUpdate, NSError * _Nullable error) {
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
strongSelf->_resumableUpdate = resumableUpdate;
strongSelf->_driver = nil;
strongSelf->_resumableLocalUpdate = resumableLocalUpdate;
[strongSelf updateLastUpdateCheckDate];
// Track the last downloaded date locally the first time the automatic update driver
// downloads an update in the background. This is later used for the impatient update check.
if (shouldResetImpatientCheckDate) {
strongSelf->_updateLastImpatientCheckedDate = [strongSelf lastUpdateCheckDate];
}
strongSelf->_driver = nil;
[strongSelf setSessionInProgress:NO];
[strongSelf setCanCheckForUpdates:YES];
if (!strongSelf->_updatingMainBundle && error == nil && !shouldShowUpdateImmediately && resumableUpdate == nil) {
if (!strongSelf->_updatingMainBundle && error == nil && resumableLocalUpdate == nil) {
// If we're not updating the main bundle, a potentially new installed bundle may have different info
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateSettingsNeedsSynchronizationNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: strongSelf->_host.bundlePath}];
}
notifyDelegateOfDriverCompletion(error, shouldShowUpdateImmediately);
notifyDelegateOfDriverCompletion(error);
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
if (!strongSelf->_sessionInProgress) {
[strongSelf scheduleNextUpdateCheckFiringImmediately:shouldShowUpdateImmediately usingCurrentDate:NO];
[strongSelf scheduleNextUpdateCheckFiringImmediately:NO usingCurrentDate:NO];
}
}
}];
@@ -914,25 +852,18 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
[weakSelf updateLastUpdateCheckDate];
}];
if (installerInProgress) {
// Resume an update that has already begun installing in the background
[_driver resumeInstallingUpdate];
} else if (_resumableUpdate != nil) {
// Resume an update or info that has already been downloaded
[_driver resumeUpdate:(id<SPUResumableUpdate> _Nonnull)_resumableUpdate];
// Check that the parameterized feed URL is valid
NSURL *theFeedURL = [self parameterizedFeedURL];
if (theFeedURL == nil) {
// I think this is really unlikely to occur but better be safe
// We will not schedule a next update check if the feed URL cannot be formed
SULog(SULogLevelError, @"Error: failed to retrieve feed URL for bundle");
abortUpdateDriver([NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: @"Sparkle cannot form a valid feed URL." }], NO);
} else {
// Check that the parameterized feed URL is valid
NSURL *theFeedURL = [self parameterizedFeedURL];
if (theFeedURL == nil) {
// I think this is really unlikely to occur but better be safe
// We will not schedule a next update check if the feed URL cannot be formed
SULog(SULogLevelError, @"Error: failed to retrieve feed URL for bundle");
abortUpdateDriver([NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidFeedURLError userInfo:@{ NSLocalizedDescriptionKey: @"Sparkle cannot form a valid feed URL." }], NO);
} else {
// Check for new updates
[_driver checkForUpdatesAtAppcastURL:theFeedURL withUserAgent:_userAgentString httpHeaders:_httpHeaders];
}
// The driver probes on its own for an update an external installer job may already be
// staging or installing; otherwise it resumes _resumableLocalUpdate, if any
[_driver checkForUpdatesAtAppcastURL:theFeedURL withUserAgent:_userAgentString httpHeaders:_httpHeaders resumingLocalUpdate:_resumableLocalUpdate];
}
}
@@ -1262,14 +1193,21 @@ static NSString *escapeURLComponent(NSString *str) {
BOOL sendingSystemProfile = [self sendsSystemProfile];
// Let's only send the system profiling information once per week at most, so we normalize daily-checkers vs. biweekly-checkers and the such.
NSDate *currentDate = [NSDate date];
if (sendingSystemProfile) {
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey ofClass:NSDate.class];
if (!lastSubmitDate) {
lastSubmitDate = [NSDate distantPast];
}
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
NSTimeInterval timeSinceLastSubmission = [lastSubmitDate timeIntervalSinceNow] * -1;
if (timeSinceLastSubmission < oneWeek) {
NSTimeInterval timeSinceLastSubmission = [currentDate timeIntervalSinceDate:lastSubmitDate];
if (timeSinceLastSubmission < 0) {
// Ignore dates far out in the future
sendingSystemProfile = NO;
[_host setObject:currentDate forUserDefaultsKey:SULastProfileSubmitDateKey];
} else if (timeSinceLastSubmission < oneWeek) {
sendingSystemProfile = NO;
}
}
@@ -1285,7 +1223,7 @@ static NSString *escapeURLComponent(NSString *str) {
if (sendingSystemProfile)
{
parameters = [parameters arrayByAddingObjectsFromArray:[self systemProfileArray]];
[_host setObject:[NSDate date] forUserDefaultsKey:SULastProfileSubmitDateKey];
[_host setObject:currentDate forUserDefaultsKey:SULastProfileSubmitDateKey];
}
if ([parameters count] == 0) { return baseFeedURL; }
@@ -1369,7 +1307,7 @@ static NSString *escapeURLComponent(NSString *str) {
// Abort any on-going updates
// A driver could be retained by another object (eg: a timer),
// so not aborting could mean it stays alive longer than we'd want
[_driver abortUpdate];
[_driver abortUpdateWithError:nil];
_driver = nil;
}
+1 -1
View File
@@ -186,7 +186,7 @@ NS_SWIFT_UI_ACTOR @protocol SPUUpdaterDelegate <NSObject>
- `SPULatestAppcastItemFoundKey`: if available, this may provide the latest `SUAppcastItem` that was found. This will be @c nil if it's unavailable.
- `SPUNoUpdateFoundReasonKey`: This will provide the `SPUNoUpdateFoundReason`.
For example the reason could be because the latest version in the feed requires a newer OS version or could be because the user is already on the latest version.
- `SPUNoUpdateFoundUserInitiatedKey`: A boolean that indicates if a new update was not found when the user intitiated an update check manually.
- `SPUNoUpdateFoundUserInitiatedKey`: A boolean that indicates if a new update was not found when the user initiated an update check manually.
@param updater The updater instance.
@param error An error containing information on why a new valid update was not found
+1 -1
View File
@@ -79,7 +79,7 @@ SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUUpdaterSettings : NSObject
* The impatient update check interval.
*
* If an update has already been downloaded automatically in the background, Sparkle may not notify users of the update immediately,
* and tries to install the update siliently on quit without notifying the user.
* and tries to install the update silently on quit without notifying the user.
*
* Sparkle uses this long impatient update check interval to decide when to notify the user of the update if they haven't quit the app for a long time.
* By default this check interval is set to 604800 seconds (which is 1 week). This interval must be bigger than the `updateCheckInterval`.
+8 -1
View File
@@ -17,6 +17,8 @@
dispatch_source_t _source;
__weak id<SPUUpdaterTimerDelegate> _delegate;
NSUInteger _timerGeneration;
}
- (instancetype)initWithDelegate:(id<SPUUpdaterTimerDelegate>)delegate
@@ -37,11 +39,15 @@
dispatch_time_t timeToFire = dispatch_walltime(NULL, (int64_t)(delay * NSEC_PER_SEC));
dispatch_source_set_timer(_source, timeToFire, DISPATCH_TIME_FOREVER, leewayUpdateCheckInterval * NSEC_PER_SEC);
_timerGeneration++;
NSUInteger currentTimerGeneration = _timerGeneration;
__weak __typeof__(self) weakSelf = self;
dispatch_source_set_event_handler(_source, ^{
__typeof__(self) strongSelf = weakSelf;
if (strongSelf != nil) {
[strongSelf->_delegate updaterTimerDidFire];
if (strongSelf->_timerGeneration == currentTimerGeneration) {
[strongSelf->_delegate updaterTimerDidFire];
}
}
});
@@ -53,6 +59,7 @@
if (_source != nil) {
dispatch_source_cancel(_source);
_source = nil;
_timerGeneration++;
}
}
+1 -1
View File
@@ -291,7 +291,7 @@ SU_EXPORT NS_SWIFT_UI_ACTOR @protocol SPUUserDriver <NSObject>
- (void)showUpdateInstallationDidFinishWithAcknowledgement:(void (^)(void))acknowledgement __deprecated_msg("Implement -showUpdateInstalledAndRelaunched:acknowledgement: instead");
- (void)dismissUserInitiatedUpdateCheck __deprecated_msg("Transition to new UI appropriately when a new update is shown, when no update is found, or when an update error occurs.");
- (void)dismissUserInitiatedUpdateCheck __deprecated_msg("Transition to new UI appropriately when a new update is shown, when no update is found, or when an update error occurs. This method is no longer called.");
- (void)showInstallingUpdate __deprecated_msg("Implement -showInstallingUpdateWithApplicationTerminated:retryTerminatingApplication: instead.");
-23
View File
@@ -1,23 +0,0 @@
//
// SPUUserInitiatedUpdateDriver.h
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import <Foundation/Foundation.h>
#import "SPUUpdateDriver.h"
NS_ASSUME_NONNULL_BEGIN
@class SUHost;
@protocol SPUUpdaterDelegate, SPUUserDriver;
SPU_OBJC_DIRECT_MEMBERS @interface SPUUserInitiatedUpdateDriver : NSObject <SPUUpdateDriver>
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate;
@end
NS_ASSUME_NONNULL_END
-149
View File
@@ -1,149 +0,0 @@
//
// SPUUserInitiatedUpdateDriver.m
// Sparkle
//
// Created by Mayur Pawashe on 3/18/16.
// Copyright © 2016 Sparkle Project. All rights reserved.
//
#import "SPUUserInitiatedUpdateDriver.h"
#import "SPUUIBasedUpdateDriver.h"
#import "SPUUserDriver.h"
#include "AppKitPrevention.h"
@interface SPUUserInitiatedUpdateDriver () <SPUUIBasedUpdateDriverDelegate>
@end
@implementation SPUUserInitiatedUpdateDriver
{
SPUUIBasedUpdateDriver *_uiDriver;
id<SPUUserDriver> _userDriver;
void (^_updateDidShowHandler)(void);
BOOL _showingUserInitiatedProgress;
BOOL _showingUpdate;
BOOL _aborted;
}
@synthesize showingUpdate = _showingUpdate;
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
{
self = [super init];
if (self != nil) {
_uiDriver = [[SPUUIBasedUpdateDriver alloc] initWithHost:host applicationBundle:applicationBundle updater:updater userDriver:userDriver userInitiated:YES updaterDelegate:updaterDelegate delegate:self];
_userDriver = userDriver;
}
return self;
}
- (void)setCompletionHandler:(SPUUpdateDriverCompletion)completionBlock
{
[_uiDriver setCompletionHandler:completionBlock];
}
- (void)setUpdateShownHandler:(void (^)(void))handler
{
_updateDidShowHandler = [handler copy];
}
- (void)setUpdateWillInstallHandler:(void (^)(void))updateWillInstallHandler
{
[_uiDriver setUpdateWillInstallHandler:updateWillInstallHandler];
}
- (void)checkForUpdatesAtAppcastURL:(NSURL *)appcastURL withUserAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders
{
_showingUserInitiatedProgress = YES;
if (_updateDidShowHandler != nil) {
_updateDidShowHandler();
_updateDidShowHandler = nil;
}
[_userDriver showUserInitiatedUpdateCheckWithCancellation:^{
dispatch_async(dispatch_get_main_queue(), ^{
if (self->_showingUserInitiatedProgress) {
[self abortUpdate];
}
});
}];
[_uiDriver checkForUpdatesAtAppcastURL:appcastURL withUserAgent:userAgent httpHeaders:httpHeaders inBackground:NO];
}
- (void)resumeInstallingUpdate
{
[_uiDriver resumeInstallingUpdate];
}
- (void)resumeUpdate:(id<SPUResumableUpdate>)resumableUpdate
{
[_uiDriver resumeUpdate:resumableUpdate];
}
- (void)uiDriverDidShowUpdate
{
// When a new update check has not been initiated and an update has been resumed,
// update the driver to indicate we are showing an update to the user
_showingUpdate = YES;
if (_updateDidShowHandler != nil) {
_updateDidShowHandler();
_updateDidShowHandler = nil;
}
}
- (void)basicDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)uiDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error
{
[self abortUpdateWithError:error];
}
- (void)basicDriverDidFinishLoadingAppcast
{
if (_showingUserInitiatedProgress) {
_showingUserInitiatedProgress = NO;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([_userDriver respondsToSelector:@selector(dismissUserInitiatedUpdateCheck)]) {
[_userDriver dismissUserInitiatedUpdateCheck];
}
#pragma clang diagnostic pop
}
}
- (void)abortUpdate
{
[self abortUpdateWithError:nil];
}
- (void)abortUpdateWithError:(nullable NSError *)error
{
if (_showingUserInitiatedProgress) {
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
if ([_userDriver respondsToSelector:@selector(dismissUserInitiatedUpdateCheck)]) {
[_userDriver dismissUserInitiatedUpdateCheck];
}
#pragma clang diagnostic pop
_showingUserInitiatedProgress = NO;
}
_aborted = YES;
[_uiDriver abortUpdateWithError:error showErrorToUser:YES];
}
@end
+1 -1
View File
@@ -33,7 +33,7 @@ SUAppcastDriverDefinitionAttribute
- (instancetype)initWithHost:(SUHost *)host updater:(id)updater updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate delegate:(nullable id <SUAppcastDriverDelegate>)delegate;
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background;
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background resumingUpdate:(BOOL)resumingUpdate;
- (void)cleanup:(void (^)(void))completionHandler;
+55 -18
View File
@@ -35,8 +35,10 @@
#include "AppKitPrevention.h"
#define SUInitialFailedFeedSigningValidationDateKey @"SUInitialFailedFeedSigningValidationDate"
#define SUFeedLastCacheBypassCheckTimeKey @"SUFeedLastCacheBypassCheckTime"
#define DEFAULT_APPCAST_FAILURE_EXPIRATION_INTERVAL 1728000 // 20 days
#define CACHE_BYPASS_CHECK_INTERVAL 1814400 // 3 weeks
@interface SUAppcastDriver () <SPUDownloadDriverDelegate>
@end
@@ -63,7 +65,7 @@
return self;
}
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background resumingUpdate:(BOOL)resumingUpdate
{
assert(NSThread.isMainThread);
@@ -73,13 +75,53 @@
}
requestHTTPHeaders[@"Accept"] = @"application/rss+xml,*/*;q=0.1";
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:appcastURL host:_host userAgent:userAgent httpHeaders:requestHTTPHeaders inBackground:background delegate:self];
NSURLRequestCachePolicy cachePolicy;
if ([_host boolForInfoDictionaryKey:SUDisableFeedCacheValidationKey]) {
// The developer disabled feed cache validation
cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
} else if (resumingUpdate) {
// We already have an update downloaded or installing that we can fall back to resuming,
// so we will risk always respecting the cache
cachePolicy = NSURLRequestReloadRevalidatingCacheData;
} else if (!background) {
// Always fetch the freshest feed when the user explicitly asks us to check
cachePolicy = NSURLRequestReloadIgnoringLocalCacheData;
} else {
// With NSURLRequestReloadRevalidatingCacheData, ETag / If-Modified-Since can be used so that
// a previously cached file can be used if it hasn't changed on the server.
// However we have a bypass check interval periodically to force ignoring the cache data if
// something happens to go wrong.
SUHost *hostForCacheBypassCheckTime = _host;
NSString *cacheBypassCheckTimeKey = [SUHost mainBundleUserDefaultsKey:SUFeedLastCacheBypassCheckTimeKey forHost:&hostForCacheBypassCheckTime];
NSDate *lastCacheBypassCheckDate = [hostForCacheBypassCheckTime objectForUserDefaultsKey:cacheBypassCheckTimeKey ofClass:NSDate.class];
BOOL needsCacheBypass;
if (lastCacheBypassCheckDate == nil) {
needsCacheBypass = YES;
} else {
NSTimeInterval intervalSinceLastCacheBypassCheck = [[NSDate date] timeIntervalSinceDate:lastCacheBypassCheckDate];
needsCacheBypass = (intervalSinceLastCacheBypassCheck < 0 || intervalSinceLastCacheBypassCheck >= CACHE_BYPASS_CHECK_INTERVAL);
}
cachePolicy = needsCacheBypass ? NSURLRequestReloadIgnoringLocalCacheData : NSURLRequestReloadRevalidatingCacheData;
}
_downloadDriver = [[SPUDownloadDriver alloc] initWithRequestURL:appcastURL host:_host userAgent:userAgent httpHeaders:requestHTTPHeaders inBackground:background cachePolicy:cachePolicy delegate:self];
[_downloadDriver downloadFile];
}
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
{
if (_downloadDriver.request.cachePolicy == NSURLRequestReloadIgnoringLocalCacheData) {
// Reset the cache bypass any time the feed has been downloaded successfully
SUHost *hostForCacheBypassCheckTime = _host;
NSString *cacheBypassCheckTimeKey = [SUHost mainBundleUserDefaultsKey:SUFeedLastCacheBypassCheckTimeKey forHost:&hostForCacheBypassCheckTime];
[hostForCacheBypassCheckTime setObject:[NSDate date] forUserDefaultsKey:cacheBypassCheckTimeKey];
}
SPUAppcastItemStateResolver *stateResolver = [[SPUAppcastItemStateResolver alloc] initWithHostVersion:_host.version applicationVersionComparator:[self versionComparator] standardVersionComparator:[SUStandardVersionComparator defaultComparator]];
NSData *downloadedAppcastData = downloadData.data;
@@ -113,21 +155,8 @@
// If a significant period of time passes with verification still failing, we may operate in a 'safe' mode as fallback
// and allow an app to be updated through key rotation
// If main bundle and host bundle differ, use the main bundle (updater) with a host bundle identifier to record the validation failure date
// This ensures external updaters record this date separately from an app updating itself.
SUHost *hostForFailedSigningValidationDate;
NSString *initialFailedFeedSigningValidationDateKey;
NSBundle *mainBundle = NSBundle.mainBundle;
if ([mainBundle isEqual:_host.bundle]) {
hostForFailedSigningValidationDate = _host;
initialFailedFeedSigningValidationDateKey = SUInitialFailedFeedSigningValidationDateKey;
} else {
hostForFailedSigningValidationDate = [[SUHost alloc] initWithBundle:mainBundle];
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
initialFailedFeedSigningValidationDateKey = (hostBundleIdentifier != nil) ? [SUInitialFailedFeedSigningValidationDateKey"_" stringByAppendingString:hostBundleIdentifier] : nil;
}
SUHost *hostForFailedSigningValidationDate = _host;
NSString *initialFailedFeedSigningValidationDateKey = [SUHost mainBundleUserDefaultsKey:SUInitialFailedFeedSigningValidationDateKey forHost:&hostForFailedSigningValidationDate];
NSError *verifyAppcastDataInnerError = nil;
if (![signatureVerifier verifyData:verifiedAppcastData signatures:signatures fileKind:@"appcast" verifierInformation:verifierInformation error:&verifyAppcastDataInnerError]) {
@@ -148,7 +177,15 @@
[hostForFailedSigningValidationDate setObject:currentDate forUserDefaultsKey:initialFailedFeedSigningValidationDateKey];
canRecoverFromSigningValidationFailure = NO;
} else {
canRecoverFromSigningValidationFailure = ([currentDate timeIntervalSinceDate:firstFailedSigningValidationDate] >= failureExpirationInterval);
NSTimeInterval timeIntervalSinceFirstFailedValidationDate = [currentDate timeIntervalSinceDate:firstFailedSigningValidationDate];
if (timeIntervalSinceFirstFailedValidationDate < 0) {
// Record first signing validation date if stored date is far out in future
[hostForFailedSigningValidationDate setObject:currentDate forUserDefaultsKey:initialFailedFeedSigningValidationDateKey];
canRecoverFromSigningValidationFailure = NO;
} else {
canRecoverFromSigningValidationFailure = (timeIntervalSinceFirstFailedValidationDate >= failureExpirationInterval);
}
}
}
+1
View File
@@ -49,6 +49,7 @@ extern NSString *const SUPublicEDKeyKey;
extern NSString *const SURequireSignedFeedKey;
extern NSString *const SURequireFeedBundleIdentifierKey;
extern NSString *const SUVerifyUpdateBeforeExtractionKey;
extern NSString *const SUDisableFeedCacheValidationKey;
extern NSString *const SUAutomaticallyUpdateKey;
extern NSString *const SUAllowsAutomaticUpdatesKey;
extern NSString *const SUEnableAutomaticChecksKey;
+1
View File
@@ -36,6 +36,7 @@ NSString *const SUPublicEDKeyKey = @"SUPublicEDKey";
NSString *const SURequireSignedFeedKey = @"SURequireSignedFeed";
NSString *const SURequireFeedBundleIdentifierKey = @"SURequireFeedBundleIdentifier";
NSString *const SUVerifyUpdateBeforeExtractionKey = @"SUVerifyUpdateBeforeExtraction";
NSString *const SUDisableFeedCacheValidationKey = @"SUDisableFeedCacheValidation";
NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate";
NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates";
NSString *const SUEnableSystemProfilingKey = @"SUEnableSystemProfiling";
+1
View File
@@ -45,6 +45,7 @@ typedef NS_ENUM(OSStatus, SUError) {
SURunningTranslocated = 1005,
SUWebKitTerminationError = 1006,
SUReleaseNotesError = 1007,
SUUpdateCheckDeclinedError = 1008,
// Download phase errors.
SUTemporaryDirectoryError = 2000,
+4
View File
@@ -22,6 +22,10 @@ SUHostDefinitionAttribute
@property (nonatomic, readonly) NSBundle *bundle;
// Returns the user defaults key and host used for storing a user default that is keyed based on the
// main bundle updating the host (which may differ if an external updater is updating another bundle)
+ (NSString *)mainBundleUserDefaultsKey:(NSString *)key forHost:(SUHost * _Nonnull __autoreleasing * _Nonnull)outHost;
- (instancetype)initWithBundle:(NSBundle *)aBundle;
- (instancetype)init NS_UNAVAILABLE;
+22
View File
@@ -38,6 +38,28 @@ static void *SUHostObservableContext = &SUHostObservableContext;
@synthesize bundle = _bundle;
+ (NSString *)mainBundleUserDefaultsKey:(NSString *)key forHost:(SUHost * _Nonnull __autoreleasing * _Nonnull)outHost
{
SUHost *host = *outHost;
SUHost *storageHost;
NSString *userDefaultsKey;
if (host->_isMainBundle) {
storageHost = host;
userDefaultsKey = key;
} else {
NSBundle *mainBundle = NSBundle.mainBundle;
storageHost = [[SUHost alloc] initWithBundle:mainBundle];
NSString *hostBundleIdentifier = host.bundle.bundleIdentifier;
userDefaultsKey = (hostBundleIdentifier != nil) ? [NSString stringWithFormat:@"%@_%@", key, hostBundleIdentifier] : key;
}
*outHost = storageHost;
return userDefaultsKey;
}
- (instancetype)initWithBundle:(NSBundle *)aBundle
{
if ((self = [super init]))
+1 -1
View File
@@ -213,7 +213,7 @@ static void processMarkdownFragmentAttributedString(NSAttributedString *fragment
}
case NSPresentationIntentKindBlockQuote: {
// Advance text that wraps to next line by this divider width
// Multiple levels of block quotes will be advanced mulitiple times
// Multiple levels of block quotes will be advanced multiple times
// Special rendering via text attachments or decorations is not done because
// it's complex and may have tradeoffs
+6
View File
@@ -426,6 +426,12 @@ typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
_installButton.title = SULocalizedStringFromTableInBundle(@"Install Update", SPARKLE_TABLE, sparkleBundle, @"");
_automaticallyInstallUpdatesButton.title = SULocalizedStringFromTableInBundle(@"Automatically download and install updates in the future", SPARKLE_TABLE, sparkleBundle, @"");
// Fix to make sure buttons are on right side in RTL languages like Hebrew and Arabic
// We do same modification in SUUpdatePermissionPrompt
_automaticallyInstallUpdatesButton.userInterfaceLayoutDirection = _stackView.userInterfaceLayoutDirection;
_automaticallyInstallUpdatesButton.imagePosition = NSImageLeading;
_automaticallyInstallUpdatesButton.alignment = NSTextAlignmentNatural;
if (@available(macOS 26, *)) {
_skipButton.controlSize = NSControlSizeLarge;
_laterButton.controlSize = NSControlSizeLarge;
+50 -10
View File
@@ -20,6 +20,8 @@
static NSString *const SUUpdatePermissionPromptTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdatePermissionPrompt";
static const CGFloat SUUpdatePermissionPromptGroupElementSpacing = 12.0;
@interface SUUpdatePermissionPrompt () <NSTouchBarDelegate>
// These properties are used for bindings
@@ -35,9 +37,12 @@ static NSString *const SUUpdatePermissionPromptTouchBarIdentifier = @"" SPARKLE_
IBOutlet NSStackView *_stackView;
IBOutlet NSView *_promptView;
IBOutlet NSImageView *_applicationIconImageView;
IBOutlet NSLayoutConstraint *_applicationIconLeadingLayoutConstraint;
IBOutlet NSView *_moreInfoView;
IBOutlet NSView *_placeholderView;
IBOutlet NSView *_responseView;
IBOutlet NSStackView *_responseButtonsStackView;
IBOutlet NSView *_infoChoiceView;
IBOutlet NSView *_automaticallyDownloadUpdatesView;
IBOutlet NSButton *_cancelButton;
@@ -88,28 +93,63 @@ static NSString *const SUUpdatePermissionPromptTouchBarIdentifier = @"" SPARKLE_
- (void)windowDidLoad
{
[self.window center];
NSWindow *window = self.window;
window.movableByWindowBackground = YES;
_infoChoiceView.hidden = ![self shouldAskAboutProfile];
_automaticallyDownloadUpdatesView.hidden = ![self allowsAutomaticUpdates];
[_stackView addArrangedSubview:_promptView];
[_stackView addArrangedSubview:_automaticallyDownloadUpdatesView];
[_stackView addArrangedSubview:_infoChoiceView];
[_stackView addArrangedSubview:_placeholderView];
[_stackView addArrangedSubview:_moreInfoView];
[_stackView addArrangedSubview:_responseView];
// The disclosed profile info is kept outside of the stack view in the nib, otherwise it would
// cover the rest of the dialog in Interface Builder. Insert it above the response buttons.
NSUInteger disclosureIndex = [_stackView.arrangedSubviews indexOfObject:_responseView];
if (disclosureIndex != NSNotFound) {
[_stackView insertArrangedSubview:_placeholderView atIndex:(NSInteger)disclosureIndex];
[_stackView insertArrangedSubview:_moreInfoView atIndex:(NSInteger)disclosureIndex + 1];
}
for (NSView *disclosedView in @[_placeholderView, _moreInfoView]) {
[disclosedView.widthAnchor constraintEqualToAnchor:_stackView.widthAnchor].active = YES;
}
// Give the question and the choices below it better grouping
[_stackView setCustomSpacing:SUUpdatePermissionPromptGroupElementSpacing afterView:_promptView];
#if SPARKLE_COPY_LOCALIZATIONS
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
// Keep hidden window title for accessibility
window.title = SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil);
window.titleVisibility = NSWindowTitleHidden;
// Fix to make sure buttons are on right side, aligned correctly, and pointing correct direction
// in RTL languages like Hebrew and Arabic
for (NSButton *checkbox in @[_automaticallyDownloadAndInstallUpdatesButton, _includeAnonymousSystemProfileButton]) {
checkbox.userInterfaceLayoutDirection = _stackView.userInterfaceLayoutDirection;
checkbox.imagePosition = NSImageLeading;
checkbox.alignment = NSTextAlignmentNatural;
}
_anonymousInfoDisclosureButton.userInterfaceLayoutDirection = _stackView.userInterfaceLayoutDirection;
_cancelButton.controlSize = NSControlSizeLarge;
_checkButton.controlSize = NSControlSizeLarge;
if (@available(macOS 26, *)) {
} else {
// Alerts center their icon before macOS 26
_applicationIconLeadingLayoutConstraint.active = NO;
[_applicationIconImageView.centerXAnchor constraintEqualToAnchor:_promptView.centerXAnchor].active = YES;
}
_checkButton.title = SULocalizedStringFromTableInBundle(@"Check Automatically", SPARKLE_TABLE, sparkleBundle, nil);
_cancelButton.title = SULocalizedStringFromTableInBundle(@"Don’t Check", SPARKLE_TABLE, sparkleBundle, nil);
_checkForUpdatesAutomaticallyTextField.stringValue = SULocalizedStringFromTableInBundle(@"Check for updates automatically?", SPARKLE_TABLE, sparkleBundle, nil);
_includeAnonymousSystemProfileButton.title = SULocalizedStringFromTableInBundle(@"Include anonymous system profile", SPARKLE_TABLE, sparkleBundle, nil);
_automaticallyDownloadAndInstallUpdatesButton.title = SULocalizedStringFromTableInBundle(@"Automatically download and install updates", SPARKLE_TABLE, sparkleBundle, nil);
_anonymousSystemProfileDisclosureInformation.stringValue = SULocalizedStringFromTableInBundle(@"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:", SPARKLE_TABLE, sparkleBundle, nil);
[window center];
}
- (BOOL)tableView:(NSTableView *) __unused tableView shouldSelectRow:(NSInteger) __unused row { return NO; }
+242 -272
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23727" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="25406" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23727"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="25406"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -10,6 +10,8 @@
<connections>
<outlet property="_anonymousInfoDisclosureButton" destination="JW6-0z-Ud3" id="grm-Uj-KJs"/>
<outlet property="_anonymousSystemProfileDisclosureInformation" destination="46" id="Ctt-KG-z3I"/>
<outlet property="_applicationIconImageView" destination="NBn-FN-XAx" id="Bqt-3M-Vzp"/>
<outlet property="_applicationIconLeadingLayoutConstraint" destination="Xku-5M-xMC" id="Ldj-8R-Wmq"/>
<outlet property="_automaticallyDownloadAndInstallUpdatesButton" destination="BId-kb-eYW" id="FLp-cT-Pth"/>
<outlet property="_automaticallyDownloadUpdatesView" destination="37T-Ef-DtX" id="Ojd-zE-6Kd"/>
<outlet property="_cancelButton" destination="cFC-wV-H3j" id="B1o-H0-cr1"/>
@@ -21,6 +23,7 @@
<outlet property="_placeholderHeightLayoutConstraint" destination="yis-HR-OIe" id="npL-hg-wRq"/>
<outlet property="_placeholderView" destination="AGr-V0-0al" id="UnQ-rl-QSS"/>
<outlet property="_promptView" destination="Yrl-Dt-Qvb" id="qbO-fw-1YD"/>
<outlet property="_responseButtonsStackView" destination="Rbs-4k-Wq2" id="XdV-Ih-bvk"/>
<outlet property="_responseView" destination="0CP-x7-YFK" id="AcW-Md-hSP"/>
<outlet property="_stackView" destination="qNw-uD-4Bg" id="EIt-kn-pJ0"/>
<outlet property="window" destination="5" id="126"/>
@@ -28,21 +31,211 @@
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="5" userLabel="Profile Info">
<windowStyleMask key="styleMask" titled="YES"/>
<window allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" titlebarAppearsTransparent="YES" id="5" userLabel="Update Permission Prompt">
<windowStyleMask key="styleMask" titled="YES" fullSizeContentView="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="83" y="492" width="488" height="379"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
<rect key="contentRect" x="83" y="492" width="296" height="262"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="923"/>
<view key="contentView" id="6">
<rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
<rect key="frame" x="0.0" y="0.0" width="296" height="278"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qNw-uD-4Bg">
<rect key="frame" x="0.0" y="0.0" width="437" height="379"/>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="qNw-uD-4Bg">
<rect key="frame" x="0.0" y="0.0" width="296" height="278"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Yrl-Dt-Qvb" userLabel="Prompt View">
<rect key="frame" x="0.0" y="136" width="296" height="142"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="NBn-FN-XAx" userLabel="Program icon">
<rect key="frame" x="20" y="58" width="64" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="64" id="KbC-i0-ZyN"/>
<constraint firstAttribute="width" secondItem="NBn-FN-XAx" secondAttribute="height" multiplier="1:1" id="Osy-kb-JTR"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="clc-hq-1NY"/>
<connections>
<binding destination="-2" name="value" keyPath="icon" id="JD9-MU-vwB"/>
</connections>
</imageView>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="260" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8" userLabel="Title text field">
<rect key="frame" x="18" y="26" width="260" height="16"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Check for updates automatically?" id="gmh-T4-BO0">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField focusRingType="none" verticalHuggingPriority="999" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="260" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia" userLabel="Description text field">
<rect key="frame" x="18" y="0.0" width="260" height="16"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" title="DO NOT LOCALIZE" id="cfa-j0-Ya4">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="promptDescription" id="dvR-Lp-2jl"/>
</connections>
</textField>
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="tgW-Jp-Aia" secondAttribute="trailing" constant="20" symbolic="YES" id="Fwc-c2-DDZ"/>
<constraint firstAttribute="trailing" secondItem="IgD-Pj-pc8" secondAttribute="trailing" constant="20" symbolic="YES" id="HXU-lh-GWa"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="top" secondItem="NBn-FN-XAx" secondAttribute="bottom" constant="16" id="Jbz-hb-8QF"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="20" symbolic="YES" id="Wl8-N0-skJ"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="20" symbolic="YES" id="Xku-5M-xMC"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="20" symbolic="YES" id="fad-TA-xIj"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="top" secondItem="IgD-Pj-pc8" secondAttribute="bottom" constant="10" id="nN4-jN-Fdn"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="leading" secondItem="IgD-Pj-pc8" secondAttribute="leading" id="s7w-Aw-JQY"/>
<constraint firstAttribute="bottom" secondItem="tgW-Jp-Aia" secondAttribute="bottom" id="uS1-FX-kSX"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="37T-Ef-DtX" userLabel="Automatic Download View">
<rect key="frame" x="0.0" y="114" width="296" height="14"/>
<subviews>
<button focusRingType="none" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kb-eYW" userLabel="Automatically Download Updates Button">
<rect key="frame" x="20" y="0.0" width="245" height="14"/>
<buttonCell key="cell" type="check" title="Automatically download and install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" focusRingType="none" inset="2" id="AUc-33-qGN">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="automaticallyDownloadUpdates" id="5Me-7t-mMu"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="BId-kb-eYW" firstAttribute="leading" secondItem="37T-Ef-DtX" secondAttribute="leading" constant="20" symbolic="YES" id="MnW-AM-QzP"/>
<constraint firstAttribute="bottom" secondItem="BId-kb-eYW" secondAttribute="bottom" id="QXK-90-kUJ"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="BId-kb-eYW" secondAttribute="trailing" constant="20" symbolic="YES" id="Vk3-CH-cXd"/>
<constraint firstItem="BId-kb-eYW" firstAttribute="top" secondItem="37T-Ef-DtX" secondAttribute="top" id="YrX-aL-LAq"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ov1-yV-Uol" userLabel="Anonymous Info View">
<rect key="frame" x="0.0" y="92" width="296" height="14"/>
<subviews>
<button focusRingType="none" verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="a90-Iq-FgS" userLabel="Include Anonymous System Profile Button">
<rect key="frame" x="20" y="0.0" width="197" height="14"/>
<buttonCell key="cell" type="check" title="Include anonymous system profile" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="gz7-LM-gNf">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<connections>
<binding destination="-2" name="value" keyPath="shouldSendProfile" id="HPm-tg-NCZ">
<dictionary key="options">
<integer key="NSNullPlaceholder" value="1"/>
<bool key="NSValidatesImmediately" value="YES"/>
</dictionary>
</binding>
</connections>
</button>
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JW6-0z-Ud3" userLabel="Anonymous Info Disclosure Button">
<rect key="frame" x="221" y="-1" width="16" height="16"/>
<buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="overlaps" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="yd4-Id-v7q">
<behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
<constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
</constraints>
<connections>
<action selector="toggleMoreInfo:" target="-2" id="AqY-Mp-X0q"/>
<binding destination="-2" name="hidden" keyPath="shouldAskAboutProfile" id="IJh-ox-Lrn">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="JW6-0z-Ud3" firstAttribute="leading" secondItem="a90-Iq-FgS" secondAttribute="trailing" constant="4" id="6Y1-s7-g6r"/>
<constraint firstItem="JW6-0z-Ud3" firstAttribute="centerY" secondItem="a90-Iq-FgS" secondAttribute="centerY" id="BNJ-xV-faQ"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="leading" secondItem="ov1-yV-Uol" secondAttribute="leading" constant="20" symbolic="YES" id="ILg-Qu-R6M"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="top" secondItem="ov1-yV-Uol" secondAttribute="top" id="Mh6-5L-xqM"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="JW6-0z-Ud3" secondAttribute="trailing" constant="20" symbolic="YES" id="U4G-Eh-HPu"/>
<constraint firstAttribute="bottom" secondItem="a90-Iq-FgS" secondAttribute="bottom" id="qij-uH-6Yl"/>
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="0CP-x7-YFK" userLabel="Response View">
<rect key="frame" x="0.0" y="0.0" width="296" height="84"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Rbs-4k-Wq2" userLabel="Response Buttons View">
<rect key="frame" x="16" y="16" width="264" height="56"/>
<subviews>
<button tag="1" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
<rect key="frame" x="0.0" y="32" width="264" height="24"/>
<buttonCell key="cell" type="push" title="Check Automatically" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="OhZ-1K-DmA">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
</buttonCell>
<connections>
<action selector="finishPrompt:" target="-2" id="sms-z7-2Ij"/>
</connections>
</button>
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-wV-H3j">
<rect key="frame" x="0.0" y="0.0" width="264" height="24"/>
<buttonCell key="cell" type="push" title="Don’t Check" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="cCJ-V0-aTi">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<connections>
<action selector="finishPrompt:" target="-2" id="QJG-fs-Y9u"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="sMh-ha-r7R" firstAttribute="width" secondItem="Rbs-4k-Wq2" secondAttribute="width" id="Wjn-5Q-8Rt"/>
<constraint firstItem="cFC-wV-H3j" firstAttribute="width" secondItem="Rbs-4k-Wq2" secondAttribute="width" id="Xdp-6L-3Kv"/>
</constraints>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="Rbs-4k-Wq2" secondAttribute="bottom" constant="16" id="B76-mf-2m9"/>
<constraint firstItem="Rbs-4k-Wq2" firstAttribute="top" secondItem="0CP-x7-YFK" secondAttribute="top" constant="12" id="Fyr-gv-3TM"/>
<constraint firstAttribute="trailing" secondItem="Rbs-4k-Wq2" secondAttribute="trailing" constant="16" id="PWc-tb-dWV"/>
<constraint firstItem="Rbs-4k-Wq2" firstAttribute="leading" secondItem="0CP-x7-YFK" secondAttribute="leading" constant="16" id="l3J-Va-WaM"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstAttribute="width" constant="437" id="gcK-Q4-n9c"/>
<constraint firstAttribute="trailing" secondItem="0CP-x7-YFK" secondAttribute="trailing" id="Bnq-4X-Lsd"/>
<constraint firstAttribute="trailing" secondItem="37T-Ef-DtX" secondAttribute="trailing" id="Hcd-Yv-5Rt"/>
<constraint firstItem="37T-Ef-DtX" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Nnu-9x-Sc3"/>
<constraint firstAttribute="trailing" secondItem="Yrl-Dt-Qvb" secondAttribute="trailing" id="Ptu-1S-Kdj"/>
<constraint firstItem="ov1-yV-Uol" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Rjc-8T-Uwq"/>
<constraint firstItem="Yrl-Dt-Qvb" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Vzq-cB-2Rn"/>
<constraint firstAttribute="trailing" secondItem="ov1-yV-Uol" secondAttribute="trailing" id="Wsk-3D-Gzv"/>
<constraint firstItem="0CP-x7-YFK" firstAttribute="leading" secondItem="qNw-uD-4Bg" secondAttribute="leading" id="Ykt-3J-Fpm"/>
<constraint firstAttribute="width" constant="296" id="gcK-Q4-n9c"/>
</constraints>
<visibilityPriorities>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
<integer value="1000"/>
</visibilityPriorities>
<customSpacing>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
<real value="3.4028234663852886e+38"/>
</customSpacing>
</stackView>
</subviews>
<constraints>
@@ -54,89 +247,19 @@
</view>
<point key="canvasLocation" x="264" y="181"/>
</window>
<arrayController editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" id="24" userLabel="Array Controller">
<declaredKeys>
<string>visibleKey</string>
<string>visibleValue</string>
<string>displayValue</string>
<string>displayKey</string>
</declaredKeys>
<connections>
<binding destination="-2" name="contentArray" keyPath="systemProfileInformationArray" id="25"/>
</connections>
</arrayController>
<userDefaultsController id="49" userLabel="User Defaults Controller">
<declaredKeys>
<string>SUIncludeProfile</string>
<string>SUSendProfileInfo</string>
</declaredKeys>
</userDefaultsController>
<view id="Yrl-Dt-Qvb" userLabel="Prompt View">
<rect key="frame" x="0.0" y="0.0" width="437" height="78"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="IgD-Pj-pc8">
<rect key="frame" x="104" y="42" width="315" height="16"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="16" id="J49-m7-iIa"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="Check for updates automatically?" id="gmh-T4-BO0">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tgW-Jp-Aia">
<rect key="frame" x="104" y="0.0" width="315" height="34"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="34" id="HfG-Lg-91D"/>
<constraint firstAttribute="width" constant="311" id="lNZ-C1-ceR"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" title="DO NOT LOCALIZE" id="cfa-j0-Ya4">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
<binding destination="-2" name="value" keyPath="promptDescription" id="dvR-Lp-2jl"/>
</connections>
</textField>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="NBn-FN-XAx">
<rect key="frame" x="23" y="-4" width="64" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="64" id="KbC-i0-ZyN"/>
<constraint firstAttribute="height" constant="64" id="Osy-kb-JTR"/>
</constraints>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" animates="YES" imageScaling="axesIndependently" image="NSApplicationIcon" id="clc-hq-1NY"/>
<connections>
<binding destination="-2" name="value" keyPath="icon" id="JD9-MU-vwB"/>
</connections>
</imageView>
</subviews>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGr-V0-0al" userLabel="Placeholder View">
<rect key="frame" x="0.0" y="0.0" width="360" height="193"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="tgW-Jp-Aia" secondAttribute="trailing" constant="20" symbolic="YES" id="Fwc-c2-DDZ"/>
<constraint firstAttribute="trailing" secondItem="IgD-Pj-pc8" secondAttribute="trailing" constant="20" symbolic="YES" id="HXU-lh-GWa"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="20" symbolic="YES" id="Wl8-N0-skJ"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="leading" secondItem="Yrl-Dt-Qvb" secondAttribute="leading" constant="23" id="Xku-5M-xMC"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="leading" secondItem="NBn-FN-XAx" secondAttribute="trailing" constant="19" id="fPB-MW-Oc2"/>
<constraint firstItem="NBn-FN-XAx" firstAttribute="top" secondItem="Yrl-Dt-Qvb" secondAttribute="top" constant="18" id="fad-TA-xIj"/>
<constraint firstItem="tgW-Jp-Aia" firstAttribute="top" secondItem="IgD-Pj-pc8" secondAttribute="bottom" constant="8" id="nN4-jN-Fdn"/>
<constraint firstItem="IgD-Pj-pc8" firstAttribute="leading" secondItem="NBn-FN-XAx" secondAttribute="trailing" constant="19" id="s7w-Aw-JQY"/>
<constraint firstAttribute="bottom" secondItem="tgW-Jp-Aia" secondAttribute="bottom" id="uS1-FX-kSX"/>
<constraint firstAttribute="height" constant="193" id="yis-HR-OIe"/>
</constraints>
<point key="canvasLocation" x="-241" y="-37"/>
</view>
<customView hidden="YES" id="39" userLabel="MoreInfoView">
<rect key="frame" x="0.0" y="0.0" width="434" height="205"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<point key="canvasLocation" x="-643" y="495"/>
</customView>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="39" userLabel="More Info View">
<rect key="frame" x="0.0" y="0.0" width="360" height="193"/>
<subviews>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="SystemProfileInfo">
<rect key="frame" x="104" y="123" width="312" height="70"/>
<constraints>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="70" id="Csk-S6-dh4"/>
<constraint firstAttribute="width" constant="308" id="iAG-SY-yVp"/>
</constraints>
<textFieldCell key="cell" sendsActionOnEndEditing="YES" id="183">
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="260" translatesAutoresizingMaskIntoConstraints="NO" id="46" userLabel="System Profile Info">
<rect key="frame" x="18" y="123" width="324" height="70"/>
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" id="183">
<font key="font" metaFont="smallSystem"/>
<string key="title">Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.
@@ -145,20 +268,20 @@ This is the information that would be sent:</string>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<scrollView autohidesScrollers="YES" horizontalLineScroll="16" horizontalPageScroll="0.0" verticalLineScroll="16" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40" userLabel="ScrollView">
<rect key="frame" x="103" y="0.0" width="314" height="115"/>
<scrollView autohidesScrollers="YES" horizontalLineScroll="18" horizontalPageScroll="0.0" verticalLineScroll="18" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="40" userLabel="ScrollView">
<rect key="frame" x="20" y="0.0" width="320" height="115"/>
<clipView key="contentView" id="sbp-rk-wxX">
<rect key="frame" x="1" y="1" width="312" height="113"/>
<rect key="frame" x="1" y="1" width="318" height="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="14" id="41">
<rect key="frame" x="0.0" y="0.0" width="312" height="113"/>
<tableView focusRingType="none" verticalHuggingPriority="750" allowsExpansionToolTips="YES" alternatingRowBackgroundColors="YES" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="16" id="41">
<rect key="frame" x="0.0" y="0.0" width="318" height="113"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<size key="intercellSpacing" width="3" height="2"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
<tableColumns>
<tableColumn editable="NO" width="128" minWidth="40" maxWidth="1000" id="42">
<tableColumn editable="NO" width="125" minWidth="40" maxWidth="1000" id="42">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -173,7 +296,7 @@ This is the information that would be sent:</string>
<binding destination="24" name="value" keyPath="arrangedObjects.displayKey" id="174"/>
</connections>
</tableColumn>
<tableColumn editable="NO" width="137" minWidth="40" maxWidth="1000" id="44">
<tableColumn editable="NO" width="126" minWidth="40" maxWidth="1000" id="44">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" white="0.33333298560000002" alpha="1" colorSpace="calibratedWhite"/>
@@ -209,186 +332,33 @@ This is the information that would be sent:</string>
</scrollView>
</subviews>
<constraints>
<constraint firstItem="46" firstAttribute="top" secondItem="39" secondAttribute="top" constant="12" id="0rj-EA-SIj"/>
<constraint firstItem="40" firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="3" id="5Ze-wu-AsK"/>
<constraint firstItem="40" firstAttribute="leading" secondItem="46" secondAttribute="leading" constant="-3" id="Qg9-kp-Lzl"/>
<constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="106" id="TMg-61-Tbj"/>
<constraint firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="20" id="fYg-If-EVL"/>
<constraint firstItem="46" firstAttribute="top" secondItem="39" secondAttribute="top" id="0rj-EA-SIj"/>
<constraint firstAttribute="trailing" secondItem="40" secondAttribute="trailing" constant="20" symbolic="YES" id="5Ze-wu-AsK"/>
<constraint firstItem="40" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="20" symbolic="YES" id="Qg9-kp-Lzl"/>
<constraint firstItem="46" firstAttribute="leading" secondItem="39" secondAttribute="leading" constant="20" symbolic="YES" id="TMg-61-Tbj"/>
<constraint firstAttribute="trailing" secondItem="46" secondAttribute="trailing" constant="20" symbolic="YES" id="fYg-If-EVL"/>
<constraint firstAttribute="bottom" secondItem="40" secondAttribute="bottom" id="o4Y-3j-NmQ"/>
<constraint firstItem="40" firstAttribute="top" secondItem="46" secondAttribute="bottom" constant="8" symbolic="YES" id="seb-Gl-jtw"/>
</constraints>
<point key="canvasLocation" x="-621" y="194"/>
</customView>
<customView id="0CP-x7-YFK" userLabel="Response View">
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="ilj-QP-33p" userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="437" height="55"/>
<subviews>
<button tag="1" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sMh-ha-r7R">
<rect key="frame" x="260" y="13" width="164" height="32"/>
<buttonCell key="cell" type="push" title="Check Automatically" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" tag="1" inset="2" id="OhZ-1K-DmA">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
DQ
</string>
</buttonCell>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="150" id="gon-Nu-M8r"/>
</constraints>
<connections>
<action selector="finishPrompt:" target="-2" id="sms-z7-2Ij"/>
</connections>
</button>
<button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cFC-wV-H3j">
<rect key="frame" x="145" y="13" width="115" height="32"/>
<buttonCell key="cell" type="push" title="Don’t Check" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="cCJ-V0-aTi">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
<string key="keyEquivalent" base64-UTF8="YES">
Gw
</string>
</buttonCell>
<constraints>
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="101" id="Fta-eR-U3P"/>
</constraints>
<connections>
<action selector="finishPrompt:" target="-2" id="QJG-fs-Y9u"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="cFC-wV-H3j" secondAttribute="bottom" constant="20" id="B76-mf-2m9"/>
<constraint firstItem="cFC-wV-H3j" firstAttribute="top" secondItem="ilj-QP-33p" secondAttribute="top" constant="15" id="Fyr-gv-3TM"/>
<constraint firstItem="sMh-ha-r7R" firstAttribute="leading" secondItem="cFC-wV-H3j" secondAttribute="trailing" constant="14" id="Gse-h5-ctH"/>
<constraint firstAttribute="width" constant="437" id="KXc-Kv-G8j"/>
<constraint firstAttribute="trailing" secondItem="sMh-ha-r7R" secondAttribute="trailing" constant="20" symbolic="YES" id="PWc-tb-dWV"/>
<constraint firstItem="sMh-ha-r7R" firstAttribute="centerY" secondItem="cFC-wV-H3j" secondAttribute="centerY" id="dmL-eu-rzf"/>
<constraint firstItem="cFC-wV-H3j" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="ilj-QP-33p" secondAttribute="leading" constant="20" symbolic="YES" id="l3J-Va-WaM"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstItem="ilj-QP-33p" firstAttribute="top" secondItem="0CP-x7-YFK" secondAttribute="top" id="5In-8H-mUY"/>
<constraint firstAttribute="bottom" secondItem="ilj-QP-33p" secondAttribute="bottom" id="XNF-yO-yBl"/>
<constraint firstItem="ilj-QP-33p" firstAttribute="leading" secondItem="0CP-x7-YFK" secondAttribute="leading" id="d3g-7o-f52"/>
<constraint firstAttribute="trailing" secondItem="ilj-QP-33p" secondAttribute="trailing" id="jzr-jk-sQQ"/>
</constraints>
<point key="canvasLocation" x="-291" y="554"/>
</customView>
<customView id="ov1-yV-Uol" userLabel="Anonymous Info View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="a0k-dW-Jhx" userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<subviews>
<button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="a90-Iq-FgS" userLabel="IncludeInfoButton">
<rect key="frame" x="104" y="-1" width="200" height="16"/>
<buttonCell key="cell" type="check" title="Include anonymous system profile" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" state="on" focusRingType="none" inset="2" id="gz7-LM-gNf">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="14" id="STF-87-eYy"/>
</constraints>
<connections>
<binding destination="-2" name="value" keyPath="shouldSendProfile" id="HPm-tg-NCZ">
<dictionary key="options">
<integer key="NSNullPlaceholder" value="1"/>
<bool key="NSValidatesImmediately" value="YES"/>
</dictionary>
</binding>
</connections>
</button>
<button focusRingType="none" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JW6-0z-Ud3">
<rect key="frame" x="85" y="-1" width="16" height="16"/>
<buttonCell key="cell" type="disclosureTriangle" bezelStyle="disclosure" imagePosition="overlaps" alignment="center" borderStyle="border" focusRingType="none" imageScaling="proportionallyDown" inset="2" id="yd4-Id-v7q">
<behavior key="behavior" pushIn="YES" changeBackground="YES" changeGray="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="16" id="HMA-GI-C0a"/>
<constraint firstAttribute="width" constant="16" id="Qxo-Ga-nVP"/>
</constraints>
<connections>
<action selector="toggleMoreInfo:" target="-2" id="AqY-Mp-X0q"/>
<binding destination="-2" name="hidden" keyPath="shouldAskAboutProfile" id="IJh-ox-Lrn">
<dictionary key="options">
<string key="NSValueTransformerName">NSNegateBoolean</string>
</dictionary>
</binding>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="JW6-0z-Ud3" firstAttribute="leading" secondItem="a0k-dW-Jhx" secondAttribute="leading" constant="85" id="6Y1-s7-g6r"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="centerY" secondItem="JW6-0z-Ud3" secondAttribute="centerY" id="BNJ-xV-faQ"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="leading" secondItem="a0k-dW-Jhx" secondAttribute="leading" constant="105" id="ILg-Qu-R6M"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="top" secondItem="a0k-dW-Jhx" secondAttribute="top" constant="6" id="Mh6-5L-xqM"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="a90-Iq-FgS" secondAttribute="trailing" constant="20" id="U4G-Eh-HPu"/>
<constraint firstItem="a90-Iq-FgS" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="JW6-0z-Ud3" secondAttribute="trailing" constant="4" id="axA-s0-uGg"/>
<constraint firstAttribute="width" constant="437" id="iUc-Zs-h9S"/>
<constraint firstAttribute="bottom" secondItem="a90-Iq-FgS" secondAttribute="bottom" id="qij-uH-6Yl"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstItem="a0k-dW-Jhx" firstAttribute="leading" secondItem="ov1-yV-Uol" secondAttribute="leading" id="dE2-R0-ENa"/>
<constraint firstItem="a0k-dW-Jhx" firstAttribute="top" secondItem="ov1-yV-Uol" secondAttribute="top" id="ibf-cg-DNR"/>
<constraint firstAttribute="trailing" secondItem="a0k-dW-Jhx" secondAttribute="trailing" id="rAn-bJ-Mp6"/>
<constraint firstAttribute="bottom" secondItem="a0k-dW-Jhx" secondAttribute="bottom" id="xw5-bj-VOd"/>
</constraints>
<point key="canvasLocation" x="-135.5" y="242.5"/>
</customView>
<customView id="37T-Ef-DtX" userLabel="Automatic Download View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="MEW-2n-kJE" userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="437" height="20"/>
<subviews>
<button focusRingType="none" translatesAutoresizingMaskIntoConstraints="NO" id="BId-kb-eYW" userLabel="automaticallyDownloadUpdatesButton">
<rect key="frame" x="104" y="-1" width="248" height="16"/>
<buttonCell key="cell" type="check" title="Automatically download and install updates" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" focusRingType="none" inset="2" id="AUc-33-qGN">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
</buttonCell>
<constraints>
<constraint firstAttribute="height" constant="14" id="kJy-g7-0Un"/>
</constraints>
<connections>
<binding destination="-2" name="value" keyPath="automaticallyDownloadUpdates" id="5Me-7t-mMu"/>
</connections>
</button>
</subviews>
<constraints>
<constraint firstItem="BId-kb-eYW" firstAttribute="leading" secondItem="MEW-2n-kJE" secondAttribute="leading" constant="105" id="MnW-AM-QzP"/>
<constraint firstAttribute="bottom" secondItem="BId-kb-eYW" secondAttribute="bottom" id="QXK-90-kUJ"/>
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="BId-kb-eYW" secondAttribute="trailing" constant="20" id="Vk3-CH-cXd"/>
<constraint firstItem="BId-kb-eYW" firstAttribute="top" secondItem="MEW-2n-kJE" secondAttribute="top" constant="6" id="YrX-aL-LAq"/>
<constraint firstAttribute="width" constant="437" id="n4W-Z4-w9i"/>
</constraints>
</customView>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="MEW-2n-kJE" secondAttribute="bottom" id="4iq-ZN-n9x"/>
<constraint firstItem="MEW-2n-kJE" firstAttribute="top" secondItem="37T-Ef-DtX" secondAttribute="top" id="FCe-KY-rHW"/>
<constraint firstItem="MEW-2n-kJE" firstAttribute="leading" secondItem="37T-Ef-DtX" secondAttribute="leading" id="dsv-fP-ffg"/>
<constraint firstAttribute="trailing" secondItem="MEW-2n-kJE" secondAttribute="trailing" id="puT-Df-xgH"/>
</constraints>
<point key="canvasLocation" x="-136" y="181"/>
</customView>
<customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="AGr-V0-0al" userLabel="Placeholder View">
<rect key="frame" x="0.0" y="0.0" width="437" height="205"/>
<constraints>
<constraint firstAttribute="width" constant="437" id="4p7-cJ-U8Z"/>
<constraint firstAttribute="height" constant="205" id="yis-HR-OIe"/>
</constraints>
<point key="canvasLocation" x="-643" y="495"/>
</customView>
<arrayController editable="NO" preservesSelection="NO" selectsInsertedObjects="NO" avoidsEmptySelection="NO" id="24" userLabel="Array Controller">
<declaredKeys>
<string>visibleKey</string>
<string>visibleValue</string>
<string>displayValue</string>
<string>displayKey</string>
</declaredKeys>
<connections>
<binding destination="-2" name="contentArray" keyPath="systemProfileInformationArray" id="25"/>
</connections>
</arrayController>
<userDefaultsController id="49" userLabel="User Defaults Controller">
<declaredKeys>
<string>SUIncludeProfile</string>
<string>SUSendProfileInfo</string>
</declaredKeys>
</userDefaultsController>
</objects>
<resources>
<image name="NSApplicationIcon" width="32" height="32"/>
+172 -22
View File
@@ -1,38 +1,92 @@
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "Az új verzió letöltődött, és használatra kész: %1$@ %2$@. Ez egy fontos frissítés. Szeretné most telepíteni, és újraindítani az appot?";
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "Az új verzió letöltődött, és használatra kész: %1$@ %2$@. Szeretné most telepíteni, és újraindítani az appot?";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available." = "A %1$@ %2$@ a jelenleg elérhető legfrissebb verzió.";
"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@." = "Elérhető egy új verzió: %1$@ %2$@. A Macen futó macOS azonban túl új ehhez a frissítéshez. A frissítés legfeljebb ezt a verziót támogatja: macOS %3$@.";
/* No comment provided by engineer. */
"%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required." = "Elérhető egy új verzió: %1$@ %2$@. A Macen futó macOS azonban túl régi a telepítéséhez. Legalább ez a verzió szükséges: macOS %3$@.";
/* Mac is too old and update requires Apple silicon Mac */
"%1$@ %2$@ is available but this update requires a new Apple silicon Mac." = "Elérhető egy új verzió: %1$@ %2$@. Ehhez a frissítéshez azonban újabb, Apple-chipet tartalmazó Mac szükséges.";
/* No comment provided by engineer. */
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "A(z) %1$@ nem frissíthető, ha onnan fut, ahová letöltötte.";
/* No comment provided by engineer. */
"%1$@ can’t be updated because it was opened from a read-only or a temporary location." = "A(z) %1$@ nem frissíthető, mert csak olvasható vagy ideiglenes helyről nyitotta meg.";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available." = "Jelenleg ez a legújabb elérhető verzió: %1$@ %2$@.";
/* No comment provided by engineer. */
"%@ %@ is currently the newest version available.\n(You are currently running version %@.)" = "Jelenleg ez a legújabb elérhető verzió: %1$@ %2$@.\n(A telepített verzió: %3$@.)";
/* Description text for SUUpdateAlert when the critical update is downloadable. */
"%@ %@ is now available—you have %@. This is an important update; would you like to download it now?" = "Elérhető egy új verzió: %1$@ %2$@. A telepített verzió: %3$@. Ez egy fontos frissítés. Szeretné most letölteni?";
/* Description text for SUUpdateAlert when the update is downloadable. */
"%@ %@ is now available—you have %@. Would you like to download it now?" = "Elérhető egy új verzió: %1$@ %2$@. A telepített verzió: %3$@. Szeretné most letölteni?";
/* Description text for SUUpdateAlert when the update informational with no download. */
"%@ %@ is now available—you have %@. Would you like to learn more about this update on the web?" = "Elérhető egy új verzió: %1$@ %2$@. A telepített verzió: %3$@. Szeretne többet megtudni erről a frissítésről a weben?";
/* The download progress in a unit of bytes, e.g. 100 KB */
"%@ downloaded" = "%@ letöltve";
/* No comment provided by engineer. */
"%@ is now updated to version %@!" = "A frissítés sikerült: %1$@ %2$@!";
/* No comment provided by engineer. */
"%@ is now updated!" = "A frissítés sikerült: %@!";
/* The download progress in units of bytes, e.g. 100 KB of 1,0 MB */
"%@ of %@" = "%1$@ / %2$@";
/* Description text for SUUpdateAlert when the critical update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! This is an important update; would you like to install it and relaunch %1$@ now?" = "A %1$@ %2$@ verziója letöltődött és készen áll a telepítésre! Ez egy fontos frissítés; szeretné most telepíteni, majd újraindítani a %1$@ alkalmazást?";
/* Description text for SUUpdateAlert when the update has already been downloaded and ready to install. */
"%1$@ %2$@ has been downloaded and is ready to use! Would you like to install it and relaunch %1$@ now?" = "A %1$@ %2$@ verziója letöltődött és készen áll a telepítésre! Szeretné most telepíteni, majd újraindítani a %1$@ alkalmazást?";
/* No comment provided by engineer. */
"A new version of %@ is available!" = "%@: elérhető egy új verzió!";
/* No comment provided by engineer. */
"A new version of %@ is available!" = "A %@ egy újabb verziója elérhető!";
"A new version of %@ is ready to install!" = "%@: egy új verzió készen áll a telepítésre!";
/* No comment provided by engineer. */
"A new version of %@ is ready to install!" = "A %@ egy újabb verziója készen áll a telepítésre!";
"An error occurred in retrieving update information. Please try again later." = "Hiba történt a frissítési adatok lekérésekor. Próbálja újra később.";
/* No comment provided by engineer. */
"An error occurred in retrieving update information. Please try again later." = "Hiba történt a frissítések lekérdezésekor. Kérjük, próbálja újra később.";
"An error occurred while connecting to the installer. Please try again later." = "Hiba történt a telepítőhöz való csatlakozáskor. Próbálja újra később.";
/* No comment provided by engineer. */
"An error occurred while downloading the update. Please try again later." = "Hiba történt a frissítés letöltése közben. Kérjük, próbálja újra később.";
"An error occurred while downloading the update. Please try again later." = "Hiba történt a frissítés letöltésekor. Próbálja újra később.";
/* No comment provided by engineer. */
"An error occurred while extracting the archive. Please try again later." = "Hiba történt a frissítés kicsomagolása közben. Kérjük, próbálja újra később.";
"An error occurred while downloading the release notes." = "Hiba történt a kiadási megjegyzések letöltésekor.";
/* No comment provided by engineer. */
"An error occurred while extracting the archive. Please try again later." = "Hiba történt az archívum kibontásakor. Próbálja újra később.";
/* No comment provided by engineer. */
"An error occurred while launching the installer. Please try again later." = "Hiba történt a telepítő elindításakor. Próbálja újra később.";
/* No comment provided by engineer. */
"An error occurred while parsing the update feed." = "Hiba történt az elérhető frissítések beolvasásakor.";
/* No comment provided by engineer. */
"An important update to %@ is ready to install" = "A %@ egy fontos frissítése készen áll a telepítésre";
"An error occurred while running the updater. Please try again later." = "Hiba történt a frissítőprogram futtatásakor. Próbálja újra később.";
/* No comment provided by engineer. */
"An error occurred while starting the installer. Please try again later." = "Hiba történt a telepítő indításakor. Próbálja újra később.";
/* No comment provided by engineer. */
"An important update to %@ is ready to install" = "%@: egy fontos frissítés készen áll a telepítésre";
/* No comment provided by engineer. */
"Application Name" = "App neve";
/* No comment provided by engineer. */
"Application Version" = "App verziója";
/* No comment provided by engineer. */
"Cancel" = "Mégsem";
@@ -40,56 +94,152 @@
/* Run generate_progress_tool_localizations.py after updating. */
"Cancel Update" = "Frissítés megszakítása";
/* No comment provided by engineer. */
"Checking for updates…" = "Frissítések keresése…";
/* No comment provided by engineer. */
"CPU is 64-Bit?" = "64 bites processzor?";
/* No comment provided by engineer. */
"CPU Speed (MHz)" = "Processzor sebessége (MHz)";
/* No comment provided by engineer. */
"CPU Subtype" = "Processzor altípusa";
/* No comment provided by engineer. */
"CPU Type" = "Processzor típusa";
/* Take care not to overflow the status window. */
"Downloading update…" = "Frissítés letöltése…";
/* Take care not to overflow the status window. */
"Extracting update…" = "Frissítés kibontása…";
/* No comment provided by engineer. */
"Failed to resume installing update." = "Nem sikerült folytatni a frissítés telepítését.";
/* No comment provided by engineer. */
"Install and Relaunch" = "Telepítés és újraindítás";
/* Alternate title for 'Remind Me Later' button when downloaded updates can be resumed */
"Install on Quit" = "Telepítés kilépéskor";
/* Run generate_progress_tool_localizations.py after updating. */
"Installing update…" = "Frissítés telepítése…";
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
"Learn More…" = "Bővebben…";
/* No comment provided by engineer. */
"Mac Model" = "Mac-modell";
/* No comment provided by engineer. */
"Memory (MB)" = "Memória (MB)";
/* No comment provided by engineer. */
"No" = "Nem";
/* No comment provided by engineer. */
"Number of CPUs" = "Processzorok száma";
/* No comment provided by engineer. */
"OK" = "OK";
/* No comment provided by engineer. */
"Ready to Install" = "A telepítő készen áll";
"OS Version" = "Rendszerverzió";
/* No comment provided by engineer. */
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Szeretné, hogy a %1$@ ellenőrizze az elérhető frissítéseket induláskor? Ha nem, a frissítések keresését kézzel is elindíthatja a %1$@ menüből.";
"Preferred Language" = "Előnyben részesített nyelv";
/* No comment provided by engineer. */
"Quit %1$@, move it into your Applications folder, relaunch it from there and try again." = "Lépjen ki a(z) %1$@ appból, helyezze át az Alkalmazások mappába, indítsa újra onnan, majd próbálja újra.";
/* No comment provided by engineer. */
"Ready to Install" = "Telepítésre kész";
/* No comment provided by engineer. */
"Should %1$@ automatically check for updates? You can always check for updates manually from the %1$@ menu." = "Keresse a(z) %1$@ automatikusan a frissítéseket? A frissítések keresését bármikor kézzel is elindíthatja a(z) %1$@ menüből.";
/* No comment provided by engineer. */
"The installation failed due to not having permission to write the new update." = "A telepítés nem sikerült, mert nincs írási engedély az új frissítéshez.";
/* No comment provided by engineer. */
"The updater failed to start. Please verify you have the latest version of %@ and contact the app developer if the issue still persists. Check the Console logs for more information." = "Nem sikerült elindítani a frissítőprogramot. Ellenőrizze, hogy a(z) %@ legújabb verziója van-e telepítve, és ha a probléma továbbra is fennáll, lépjen kapcsolatba az app fejlesztőjével. További információ a Konzol naplóiban található.";
/* No comment provided by engineer. */
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "A frissítés aláírása hibás, ezért nem ellenőrizhető. Próbálja újra később, vagy lépjen kapcsolatba az app fejlesztőjével.";
/* No comment provided by engineer. */
"The update feed is improperly signed and could not be validated. Please try again later or contact the app developer." = "A frissítési hírcsatorna aláírása hibás, ezért nem ellenőrizhető. Próbálja újra később, vagy lépjen kapcsolatba az app fejlesztőjével.";
/* No comment provided by engineer. */
"The release notes is improperly signed and could not be validated. Please contact the app developer for more information." = "A kiadási megjegyzések aláírása hibás, ezért nem ellenőrizhetők. További információért lépjen kapcsolatba az app fejlesztőjével.";
/* No comment provided by engineer. */
"Unable to Check For Updates" = "A frissítések nem kereshetők";
/* No comment provided by engineer. */
"Update Error!" = "Frissítési hiba!";
/* No comment provided by engineer. */
"Update Installed" = "Frissítés telepítve";
/* Run generate_progress_tool_localizations.py after updating. */
"Updating %@" = "%@ frissítése";
/* No comment provided by engineer. */
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "Mozgassa a %1$@ alkalmazást az Alkalmazások mappába, indítsa újra onnan, majd próbálja újra a frissítést.";
"Use Finder to copy %1$@ to the Applications folder, relaunch it from there, and try again." = "A Finderrel másolja a(z) %1$@ appot az Alkalmazások mappába, indítsa újra onnan, majd próbálja újra.";
/* No comment provided by engineer. */
"Version History" = "Verzióelőzmények";
/* No comment provided by engineer. */
"Yes" = "Igen";
/* No comment provided by engineer. */
"You may need to allow modifications from %1$@ in System Settings under Privacy & Security and App Management to install future updates." = "Előfordulhat, hogy a későbbi frissítések telepítéséhez engedélyeznie kell a(z) %1$@ számára az appok módosítását a Rendszerbeállítások Adatvédelem és biztonság > Appfelügyelet részében.";
/* No comment provided by engineer. */
"Your macOS version is too new" = "A Macen futó macOS túl új";
/* No comment provided by engineer. */
"Your macOS version is too old" = "A Macen futó macOS túl régi";
/* Mac is too old and update requires newer hardware */
"Your Mac is too old" = "Ez a Mac túl régi";
/* Status message shown when the user checks for updates but is already current or the feed doesn't contain any updates. */
"You’re up to date!" = "A legújabb verziót használja!";
/* Software Update title/label */
"Software Update" = "Szoftverfrissítés";
/* Remind Me Later choice for update alert */
"Remind Me Later" = "Emlékeztessen később";
"Remind Me Later" = "Emlékeztetés később";
/* Skip This Version choice for update alert */
"Skip This Version" = "Verzió kihagyása";
/* Install Update choice for update alert */
"Install Update" = "Telepítés";
"Install Update" = "Frissítés telepítése";
/* Automatically download and install updates in the future option for update alert */
"Automatically download and install updates in the future" = "A jövőben automatikusan töltse le és telepítse a frissítéseket";
"Automatically download and install updates in the future" = "Frissítések automatikus letöltése és telepítése a jövőben";
/* Check for updates automatically response for update permission dialog */
"Check Automatically" = "Automatikus keresés";
/* Don't check for updates automatically response for update permission dialog */
"Don’t Check" = "Manuális keresés";
"Don’t Check" = "Keresés mellőzése";
/* Title question for update permission dialog */
"Check for updates automatically?" = "Keresse automatikusan a frissítéseket?";
/* Include anonymous system profile choice for update permission dialog */
"Include anonymous system profile" = "Anonim rendszerinformáció küldése";
"Include anonymous system profile" = "Névtelen rendszerprofil küldése";
/* Automatically download and install updates choice for update permission dialog */
"Automatically download and install updates" = "Automatically download and install updates";
"Automatically download and install updates" = "Frissítések automatikus letöltése és telepítése";
/* Anonymous system profile information disclosure for update permission dialog */
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:";
"Anonymous system profile information is used to help us plan future development work. Please contact us if you have any questions about this.\n\nThis is the information that would be sent:" = "A névtelen rendszerprofil a későbbi fejlesztések megtervezésében segít. Ha kérdése van ezzel kapcsolatban, lépjen kapcsolatba velünk.\n\nEzeket az adatokat küldené el az app:";
+181 -44
View File
@@ -24,6 +24,8 @@
SUUpdateSettingsWindowController *_updateSettingsWindowController;
SUTestWebServer *_webServer;
NSString *_testMode;
BOOL _supersedeFoundInitialUpdate;
}
- (void)applicationDidFinishLaunching:(NSNotification * __unused)notification
@@ -43,7 +45,7 @@
// Check if we are already up to date
NSString *mainBundleVersion = (NSString *)[mainBundle objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey];
if (([mainBundleVersion hasPrefix:@"2."] && [testMode isEqualToString:@"REGULAR"]) || (([mainBundleVersion isEqualToString:@"2.1"] || [mainBundleVersion isEqualToString:@"2.2"]) && [testMode isEqualToString:@"DELTA_AND_MARKDOWN"]) || ([mainBundleVersion isEqualToString:@"2.2"] && [testMode isEqualToString:@"AUTOMATIC"])) {
if (([mainBundleVersion hasPrefix:@"2."] && [testMode isEqualToString:@"REGULAR"]) || (([mainBundleVersion isEqualToString:@"2.1"] || [mainBundleVersion isEqualToString:@"2.2"]) && [testMode isEqualToString:@"DELTA_AND_MARKDOWN"]) || ([mainBundleVersion isEqualToString:@"2.2"] && [testMode isEqualToString:@"AUTOMATIC"]) || ([mainBundleVersion isEqualToString:@"3.1"] && [testMode isEqualToString:@"SUPERSEDE"])) {
NSAlert *alreadyUpdatedAlert = [[NSAlert alloc] init];
alreadyUpdatedAlert.messageText = @"Update succeeded!";
alreadyUpdatedAlert.informativeText = @"This is the updated version of Sparkle Test App.\n\nDelete and rebuild the app to test updates again.";
@@ -52,9 +54,12 @@
[[NSApplication sharedApplication] terminate:nil];
}
#if SPARKLE_BUILD_UI_BITS
// Detect as early as possible if the shift key is held down
BOOL shiftKeyHeldDown = ([NSEvent modifierFlags] & NSEventModifierFlagShift) != 0;
BOOL shiftKeyHeldDown;
#if SPARKLE_BUILD_UI_BITS
shiftKeyHeldDown = ([NSEvent modifierFlags] & NSEventModifierFlagShift) != 0;
#else
shiftKeyHeldDown = NO;
#endif
NSFileManager *fileManager = [NSFileManager defaultManager];
@@ -70,7 +75,7 @@
NSString *bundleIdentifier = mainBundle.bundleIdentifier;
assert(bundleIdentifier != nil);
// Create a directory that'll be used for our web server listing
NSURL *serverDirectoryURL = [[cacheDirectoryURL URLByAppendingPathComponent:bundleIdentifier] URLByAppendingPathComponent:@"ServerData"];
if ([serverDirectoryURL checkResourceIsReachableAndReturnError:nil]) {
@@ -114,6 +119,9 @@
finalUpdatedVersion = @"2.1";
} else if ([testMode isEqualToString:@"AUTOMATIC"]) {
finalUpdatedVersion = @"2.2";
} else if ([testMode isEqualToString:@"SUPERSEDE"]) {
// This is the initial version which will later be superseded by 3.1
finalUpdatedVersion = @"3.0";
} else {
assert(false);
}
@@ -175,10 +183,10 @@
// Don't ever do this at home, kids (seriously)
// (that is, including the private key inside of your application)
const unsigned char self_sign_demo_only_insecure_hack[64] = {200, 238, 135, 84, 10, 189, 3, 193, 61, 208, 203, 30, 133, 47, 12, 22, 19, 52, 252, 99, 110, 205, 209, 94, 215, 144, 201, 70, 27, 162, 163, 108, 0, 164, 68, 184, 226, 93, 121, 199, 172, 17, 26, 64, 89, 68, 232, 41, 2, 26, 245, 175, 158, 165, 42, 55, 5, 97, 8, 243, 251, 164, 93, 9};
static const unsigned char self_sign_demo_only_insecure_hack[64] = {200, 238, 135, 84, 10, 189, 3, 193, 61, 208, 203, 30, 133, 47, 12, 22, 19, 52, 252, 99, 110, 205, 209, 94, 215, 144, 201, 70, 27, 162, 163, 108, 0, 164, 68, 184, 226, 93, 121, 199, 172, 17, 26, 64, 89, 68, 232, 41, 2, 26, 245, 175, 158, 165, 42, 55, 5, 97, 8, 243, 251, 164, 93, 9};
// in normal app this goes to Info.plist
const unsigned char public_key[32] = {121, 17, 79, 45, 155, 141, 51, 169, 188, 110, 91, 102, 182, 147, 215, 225, 252, 202, 110, 231, 200, 215, 62, 171, 40, 145, 237, 128, 130, 44, 150, 89};
unsigned char signature[64];
static const unsigned char public_key[32] = {121, 17, 79, 45, 155, 141, 51, 169, 188, 110, 91, 102, 182, 147, 215, 225, 252, 202, 110, 231, 200, 215, 62, 171, 40, 145, 237, 128, 130, 44, 150, 89};
unsigned char signature[64] = {0};
if ([testMode isEqualToString:@"DELTA_AND_MARKDOWN"]) {
NSError *deltaCreationError = nil;
@@ -232,6 +240,121 @@
NSLog(@"Failed to write updated appcast with error %@", writeAppcastError);
abort();
}
} else if ([testMode isEqualToString:@"SUPERSEDE"]) {
// Create the archive for the initial ("3.0") update from the bundle we already copied
// and signed above
NSString *zipName = @"Sparkle_Test_App.zip";
NSTask *dittoTask = [[NSTask alloc] init];
dittoTask.launchPath = @"/usr/bin/ditto";
dittoTask.arguments = @[@"-c", @"-k", @"--sequesterRsrc", @"--keepParent", (NSString *)destinationBundleURL.lastPathComponent, zipName];
dittoTask.currentDirectoryPath = serverDirectoryPath;
[dittoTask launch];
[dittoTask waitUntilExit];
assert(dittoTask.terminationStatus == 0);
[fileManager removeItemAtURL:destinationBundleURL error:NULL];
NSURL *archiveURL = [serverDirectoryURL URLByAppendingPathComponent:zipName];
NSData *archive = [NSData dataWithContentsOfURL:archiveURL];
assert(archive != nil);
ed25519_sign(signature, (const unsigned char *)archive.bytes, archive.length, public_key, self_sign_demo_only_insecure_hack);
NSString *signatureString = [[NSData dataWithBytes:signature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
NSError *fileAttributesError = nil;
NSString *archiveURLPath = archiveURL.path;
assert(archiveURLPath != nil);
NSDictionary *archiveFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:archiveURLPath error:&fileAttributesError];
if (archiveFileAttributes == nil) {
NSLog(@"Failed to retrieve file attributes from archive with error %@", fileAttributesError);
abort();
}
NSUInteger numberOfSupercede1LengthReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_SUPERCEDE1_ARCHIVE_LENGTH" withString:[NSString stringWithFormat:@"%llu", archiveFileAttributes.fileSize] options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfSupercede1LengthReplacements == 1);
NSUInteger numberOfSupercede1SignatureReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_SUPERCEDE1_EDDSA_SIGNATURE" withString:signatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfSupercede1SignatureReplacements == 1);
// Build a second copy of the bundle for the superseding ("3.1") update
NSURL *supersedingDestinationBundleURL = [serverDirectoryURL URLByAppendingPathComponent:@"Superseding.app"];
NSError *copySupersedingBundleError = nil;
if (![fileManager copyItemAtURL:bundleURL toURL:supersedingDestinationBundleURL error:&copySupersedingBundleError]) {
NSLog(@"Failed to copy bundle for superseding update with error %@", copySupersedingBundleError);
abort();
}
NSURL *supersedingInfoURL = [[supersedingDestinationBundleURL URLByAppendingPathComponent:@"Contents"] URLByAppendingPathComponent:@"Info.plist"];
NSMutableDictionary *supersedingInfoDictionary = [[NSMutableDictionary alloc] initWithContentsOfURL:supersedingInfoURL];
[supersedingInfoDictionary setObject:@"3.1" forKey:(__bridge NSString *)kCFBundleVersionKey];
[supersedingInfoDictionary setObject:@"3.1" forKey:@"CFBundleShortVersionString"];
BOOL wroteSupersedingInfoFile = [supersedingInfoDictionary writeToURL:supersedingInfoURL atomically:NO];
assert(wroteSupersedingInfoFile);
[self signApplicationIfRequiredAtPath:supersedingDestinationBundleURL.path completion:^{
dispatch_async(dispatch_get_main_queue(), ^{
NSString *supersedingZipName = @"Sparkle_Test_App_Superseding.zip";
NSTask *supersedingDittoTask = [[NSTask alloc] init];
supersedingDittoTask.launchPath = @"/usr/bin/ditto";
supersedingDittoTask.arguments = @[@"-c", @"-k", @"--sequesterRsrc", @"--keepParent", (NSString *)supersedingDestinationBundleURL.lastPathComponent, supersedingZipName];
supersedingDittoTask.currentDirectoryPath = serverDirectoryPath;
[supersedingDittoTask launch];
[supersedingDittoTask waitUntilExit];
assert(supersedingDittoTask.terminationStatus == 0);
[fileManager removeItemAtURL:supersedingDestinationBundleURL error:NULL];
NSURL *supersedingArchiveURL = [serverDirectoryURL URLByAppendingPathComponent:supersedingZipName];
NSData *supersedingArchive = [NSData dataWithContentsOfURL:supersedingArchiveURL];
assert(supersedingArchive != nil);
unsigned char supersedingSignature[64] = {0};
ed25519_sign(supersedingSignature, (const unsigned char *)supersedingArchive.bytes, supersedingArchive.length, public_key, self_sign_demo_only_insecure_hack);
NSString *supersedingSignatureString = [[NSData dataWithBytes:supersedingSignature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
NSError *supersedingFileAttributesError = nil;
NSString *supersedingArchiveURLPath = supersedingArchiveURL.path;
assert(supersedingArchiveURLPath != nil);
NSDictionary *supersedingArchiveFileAttributes = [[NSFileManager defaultManager] attributesOfItemAtPath:supersedingArchiveURLPath error:&supersedingFileAttributesError];
if (supersedingArchiveFileAttributes == nil) {
NSLog(@"Failed to retrieve file attributes from superseding archive with error %@", supersedingFileAttributesError);
abort();
}
NSUInteger numberOfSupercede2LengthReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_SUPERCEDE2_ARCHIVE_LENGTH" withString:[NSString stringWithFormat:@"%llu", supersedingArchiveFileAttributes.fileSize] options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfSupercede2LengthReplacements == 1);
NSUInteger numberOfSupercede2SignatureReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_SUPERCEDE2_EDDSA_SIGNATURE" withString:supersedingSignatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfSupercede2SignatureReplacements == 1);
NSRange feedSignaturesPrefixRange = [appcastContents rangeOfString:@"<!-- sparkle-signatures:\n" options:(NSStringCompareOptions)(NSLiteralSearch | NSBackwardsSearch)];
assert(feedSignaturesPrefixRange.location != NSNotFound);
unsigned char feedSignature[64] = {0};
ed25519_sign(feedSignature, (const unsigned char *)appcastContents.UTF8String, feedSignaturesPrefixRange.location, public_key, self_sign_demo_only_insecure_hack);
NSString *feedSignatureString = [[NSData dataWithBytes:feedSignature length:64] base64EncodedStringWithOptions:(NSDataBase64EncodingOptions)0];
NSUInteger numberOfFeedSignatureReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_EDDSA_FEED_SIGNATURE" withString:feedSignatureString options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfFeedSignatureReplacements == 1);
NSUInteger numberOfFeedLengthReplacements = [appcastContents replaceOccurrencesOfString:@"$INSERT_FEED_LENGTH" withString:@(feedSignaturesPrefixRange.location).stringValue options:NSLiteralSearch range:NSMakeRange(0, appcastContents.length)];
assert(numberOfFeedLengthReplacements == 1);
NSError *writeAppcastError = nil;
if (![appcastContents writeToURL:appcastDestinationURL atomically:NO encoding:NSUTF8StringEncoding error:&writeAppcastError]) {
NSLog(@"Failed to write updated appcast with error %@", writeAppcastError);
abort();
}
[self startServerAndUpdaterAtDirectoryPath:serverDirectoryPath shiftKeyHeldDown:shiftKeyHeldDown];
});
}];
return;
} else {
// Create the archive for our update
NSString *zipName = @"Sparkle_Test_App.zip";
@@ -289,55 +412,60 @@
}
[fileManager removeItemAtURL:destinationBundleURL error:NULL];
// Finally start the server
SUTestWebServer *webServer = [[SUTestWebServer alloc] initWithPort:1337 workingDirectory:serverDirectoryPath];
if (!webServer) {
NSLog(@"Failed to create the web server");
abort();
}
self->_webServer = webServer;
[webServer startWithReadyHandler:^{
dispatch_async(dispatch_get_main_queue(), ^{
// Set up updater and the updater settings window
self->_updateSettingsWindowController = [[SUUpdateSettingsWindowController alloc] init];
[self startServerAndUpdaterAtDirectoryPath:serverDirectoryPath shiftKeyHeldDown:shiftKeyHeldDown];
});
}];
}
NSWindow *settingsWindow = self->_updateSettingsWindowController.window;
- (void)startServerAndUpdaterAtDirectoryPath:(NSString *)serverDirectoryPath shiftKeyHeldDown:(BOOL)shiftKeyHeldDown SPU_OBJC_DIRECT
{
// Finally start the server
SUTestWebServer *webServer = [[SUTestWebServer alloc] initWithPort:1337 workingDirectory:serverDirectoryPath];
if (!webServer) {
NSLog(@"Failed to create the web server");
abort();
}
_webServer = webServer;
NSBundle *hostBundle = [NSBundle mainBundle];
NSBundle *applicationBundle = hostBundle;
[webServer startWithReadyHandler:^{
dispatch_async(dispatch_get_main_queue(), ^{
// Set up updater and the updater settings window
self->_updateSettingsWindowController = [[SUUpdateSettingsWindowController alloc] init];
id<SPUUserDriver> userDriver;
NSWindow *settingsWindow = self->_updateSettingsWindowController.window;
NSBundle *hostBundle = [NSBundle mainBundle];
NSBundle *applicationBundle = hostBundle;
id<SPUUserDriver> userDriver;
#if SPARKLE_BUILD_UI_BITS
if (shiftKeyHeldDown) {
userDriver = [[SUPopUpTitlebarUserDriver alloc] initWithWindow:settingsWindow];
} else {
userDriver = [[SPUStandardUserDriver alloc] initWithHostBundle:hostBundle delegate:nil];
}
if (shiftKeyHeldDown) {
userDriver = [[SUPopUpTitlebarUserDriver alloc] initWithWindow:settingsWindow];
} else {
userDriver = [[SPUStandardUserDriver alloc] initWithHostBundle:hostBundle delegate:nil];
}
#else
userDriver = [[SUPopUpTitlebarUserDriver alloc] initWithWindow:settingsWindow];
userDriver = [[SUPopUpTitlebarUserDriver alloc] initWithWindow:settingsWindow];
#endif
SPUUpdater *updater = [[SPUUpdater alloc] initWithHostBundle:hostBundle applicationBundle:applicationBundle userDriver:userDriver delegate:self];
SPUUpdater *updater = [[SPUUpdater alloc] initWithHostBundle:hostBundle applicationBundle:applicationBundle userDriver:userDriver delegate:self];
self->_updater = updater;
self->_updateSettingsWindowController.updater = updater;
self->_updater = updater;
self->_updateSettingsWindowController.updater = updater;
NSError *updaterError = nil;
if (![updater startUpdater:&updaterError]) {
NSLog(@"Failed to start updater with error: %@", updaterError);
NSError *updaterError = nil;
if (![updater startUpdater:&updaterError]) {
NSLog(@"Failed to start updater with error: %@", updaterError);
NSAlert *alert = [[NSAlert alloc] init];
alert.messageText = @"Updater Error";
alert.informativeText = @"The Updater failed to start. For detailed error information, check the Console.app log.";
[alert addButtonWithTitle:@"OK"];
[alert runModal];
}
NSAlert *alert = [[NSAlert alloc] init];
alert.messageText = @"Updater Error";
alert.informativeText = @"The Updater failed to start. For detailed error information, check the Console.app log.";
[alert addButtonWithTitle:@"OK"];
[alert runModal];
}
[self->_updateSettingsWindowController showWindow:nil];
});
}];
[self->_updateSettingsWindowController showWindow:nil];
});
}];
}
@@ -348,11 +476,20 @@
return [NSSet setWithObject:@"delta"];
} else if ([_testMode isEqualToString:@"AUTOMATIC"]) {
return [NSSet setWithObject:@"automatic"];
} else if ([_testMode isEqualToString:@"SUPERSEDE"]) {
return [NSSet setWithObject:(_supersedeFoundInitialUpdate ? @"supercede2" : @"supercede1")];
} else {
return [NSSet set];
}
}
- (void)updater:(SPUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)item
{
if ([_testMode isEqualToString:@"SUPERSEDE"] && [item.versionString isEqualToString:@"3.0"]) {
_supersedeFoundInitialUpdate = YES;
}
}
- (void)signApplicationIfRequiredAtPath:(NSString *)applicationPath completion:(void (^)(void))completionBlock SPU_OBJC_DIRECT
{
// This is unfortunately necessary for testing sandboxing
+28
View File
@@ -8,6 +8,34 @@ IMPORTANT: This file must be re-signed if modifications are made to this file! T
<description>Most recent changes with links to updates.</description>
<language>en</language>
<sparkle:bundleIdentifier>org.sparkle-project.SparkleTestApp</sparkle:bundleIdentifier>
<item>
<title>Version 3.1</title>
<sparkle:version>3.1</sparkle:version>
<link>https://sparkle-project.org</link>
<sparkle:channel>supercede2</sparkle:channel>
<description>
<![CDATA[
<p>Superseding update.</p>
]]>
</description>
<pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
<enclosure url="http://localhost:1337/Sparkle_Test_App_Superseding.zip" length="$INSERT_SUPERCEDE2_ARCHIVE_LENGTH" type="application/octet-stream" sparkle:edSignature="$INSERT_SUPERCEDE2_EDDSA_SIGNATURE" />
</item>
<item>
<title>Version 3.0</title>
<sparkle:version>3.0</sparkle:version>
<link>https://sparkle-project.org</link>
<sparkle:channel>supercede1</sparkle:channel>
<description>
<![CDATA[
<p>Initial update, expected to be superseded before it's installed.</p>
]]>
</description>
<pubDate>Sat, 26 Jul 2014 15:20:11 +0000</pubDate>
<enclosure url="http://localhost:1337/Sparkle_Test_App.zip" length="$INSERT_SUPERCEDE1_ARCHIVE_LENGTH" type="application/octet-stream" sparkle:edSignature="$INSERT_SUPERCEDE1_EDDSA_SIGNATURE" />
</item>
<item>
<title>Version 2.2</title>
<sparkle:version>2.2</sparkle:version>
+27 -11
View File
@@ -14,6 +14,17 @@ class SUUnarchiverTest: XCTestCase
let appName = resourceName
let archiveResourceURL = Bundle(for: type(of: self)).url(forResource: appName, withExtension: archiveExtension)!
// When an extraction mount directory is supported, test both providing one and not providing one,
// so that the disk image unarchiver's diskutil and hdiutil code paths are both exercised
let extractionMountDirectoryOptions = SUUnarchiver.canUseExtractionMountDirectory(archiveResourceURL.path) ? [true, false] : [false]
for providingExtractionMountDirectory in extractionMountDirectoryOptions {
self.unarchiveTestAppWithExtension(archiveExtension, archiveResourceURL: archiveResourceURL, password: password, providingExtractionMountDirectory: providingExtractionMountDirectory, expectingInstallationType: installationType, expectingSuccess: expectingSuccess, extractedAppName: extractedAppName)
}
}
// swiftlint:disable function_parameter_count
func unarchiveTestAppWithExtension(_ archiveExtension: String, archiveResourceURL: URL, password: String?, providingExtractionMountDirectory: Bool, expectingInstallationType installationType: String, expectingSuccess: Bool, extractedAppName: String) {
let fileManager = FileManager.default
// Do not remove this temporary directory
@@ -21,11 +32,11 @@ class SUUnarchiverTest: XCTestCase
// after *both* our unarchive success and failure calls below finish (they both have async completion blocks inside their implementation)
let tempDirectoryURL = try! fileManager.url(for: .itemReplacementDirectory, in: .userDomainMask, appropriateFor: URL(fileURLWithPath: NSHomeDirectory()), create: true)
let unarchivedSuccessExpectation = super.expectation(description: "Unarchived Success (format: \(archiveExtension))")
let unarchivedFailureExpectation = super.expectation(description: "Unarchived Failure (format: \(archiveExtension))")
let unarchivedSuccessExpectation = super.expectation(description: "Unarchived Success (format: \(archiveExtension), mount directory: \(providingExtractionMountDirectory))")
let unarchivedFailureExpectation = super.expectation(description: "Unarchived Failure (format: \(archiveExtension), mount directory: \(providingExtractionMountDirectory))")
self.unarchiveTestAppWithExtension(archiveExtension, appName: appName, tempDirectoryURL: tempDirectoryURL, archiveResourceURL: archiveResourceURL, password: password, expectingInstallationType: installationType, expectingSuccess: expectingSuccess, testExpectation: unarchivedSuccessExpectation)
self.unarchiveNonExistentFileTestFailureAppWithExtension(archiveExtension, tempDirectoryURL: tempDirectoryURL, password: password, expectingInstallationType: installationType, testExpectation: unarchivedFailureExpectation)
self.unarchiveTestAppWithExtension(archiveExtension, tempDirectoryURL: tempDirectoryURL, archiveResourceURL: archiveResourceURL, password: password, providingExtractionMountDirectory: providingExtractionMountDirectory, expectingInstallationType: installationType, expectingSuccess: expectingSuccess, testExpectation: unarchivedSuccessExpectation)
self.unarchiveNonExistentFileTestFailureAppWithExtension(archiveExtension, tempDirectoryURL: tempDirectoryURL, password: password, providingExtractionMountDirectory: providingExtractionMountDirectory, expectingInstallationType: installationType, testExpectation: unarchivedFailureExpectation)
super.waitForExpectations(timeout: 30.0, handler: nil)
@@ -43,10 +54,13 @@ class SUUnarchiverTest: XCTestCase
}
}
func unarchiveNonExistentFileTestFailureAppWithExtension(_ archiveExtension: String, tempDirectoryURL: URL, password: String?, expectingInstallationType installationType: String, testExpectation: XCTestExpectation) {
func unarchiveNonExistentFileTestFailureAppWithExtension(_ archiveExtension: String, tempDirectoryURL: URL, password: String?, providingExtractionMountDirectory: Bool, expectingInstallationType installationType: String, testExpectation: XCTestExpectation) {
let tempArchiveURL = tempDirectoryURL.deletingLastPathComponent().appendingPathComponent("error-invalid").appendingPathExtension(archiveExtension)
let unarchiver = SUUnarchiver.unarchiver(forPath: tempArchiveURL.path, extractionDirectory: tempDirectoryURL.path, updatingHostBundlePath: nil, decryptionPassword: password, expectingInstallationType: installationType)!
// The disk image unarchiver will create and remove this directory automatically
let extractionMountDirectory: String? = providingExtractionMountDirectory ? URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(ProcessInfo.processInfo.globallyUniqueString).path : nil
let unarchiver = SUUnarchiver.unarchiver(forPath: tempArchiveURL.path, extractionDirectory: tempDirectoryURL.path, extractionMountDirectory: extractionMountDirectory, updatingHostBundlePath: nil, decryptionPassword: password, expectingInstallationType: installationType)!
unarchiver.unarchive(completionBlock: {(error: Error?) -> Void in
XCTAssertNotNil(error)
@@ -54,10 +68,12 @@ class SUUnarchiverTest: XCTestCase
}, progressBlock: nil, waitForCleanup: true)
}
// swiftlint:disable function_parameter_count
func unarchiveTestAppWithExtension(_ archiveExtension: String, appName: String, tempDirectoryURL: URL, archiveResourceURL: URL, password: String?, expectingInstallationType installationType: String, expectingSuccess: Bool, testExpectation: XCTestExpectation) {
let unarchiver = SUUnarchiver.unarchiver(forPath: archiveResourceURL.path, extractionDirectory: tempDirectoryURL.path, updatingHostBundlePath: nil, decryptionPassword: password, expectingInstallationType: installationType)!
func unarchiveTestAppWithExtension(_ archiveExtension: String, tempDirectoryURL: URL, archiveResourceURL: URL, password: String?, providingExtractionMountDirectory: Bool, expectingInstallationType installationType: String, expectingSuccess: Bool, testExpectation: XCTestExpectation) {
// The disk image unarchiver will create and remove this directory automatically
let extractionMountDirectory: String? = providingExtractionMountDirectory ? URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(ProcessInfo.processInfo.globallyUniqueString).path : nil
let unarchiver = SUUnarchiver.unarchiver(forPath: archiveResourceURL.path, extractionDirectory: tempDirectoryURL.path, extractionMountDirectory: extractionMountDirectory, updatingHostBundlePath: nil, decryptionPassword: password, expectingInstallationType: installationType)!
unarchiver.unarchive(completionBlock: {(error: Error?) -> Void in
if expectingSuccess {
+45
View File
@@ -114,4 +114,49 @@ class SUTestApplicationTest: XCTestCase
func test3AutomaticUpdate() {
runTestApplication(testMode: "AUTOMATIC", automatic: true, expectedFinalVersion: "2.2", launchSleep: 75, extractSleep: 30)
}
// Tests that "3.0" will be downloaded in first automatic update downloading check,
// then it will be superceded by "3.1" in the next update automatic downloading check
func test4UpdateSuperseded() {
let app = XCUIApplication()
app.launchArguments = [
"-SUHasLaunchedBefore",
"YES",
"-SUEnableAutomaticChecks",
"YES",
"-SUAutomaticallyUpdate",
"YES",
"-SUScheduledCheckInterval",
"60"
]
app.launchEnvironment = ["TEST_MODE": "SUPERSEDE"]
app.launch()
XCTAssertFalse(app.dialogs["alert"].staticTexts["Update succeeded!"].exists, "Update is already installed; please do a clean build")
let initialRunningApplication = runningTestApplication()
let bundleURL = initialRunningApplication.bundleURL!
// Give enough time to set up the web server and install both 3.0 and 3.1 updates
sleep(150)
// Quit without ever checking manually. The superseding "3.1" update should already be prepared
// and ready to install on quit
app.terminate()
// Wait for the new updated app to be installed
sleep(5)
// Validate update has been installed
XCTAssertTrue(initialRunningApplication.isTerminated)
let infoCFDictionary = CFBundleCopyInfoDictionaryInDirectory(bundleURL as CFURL)
let infoDictionary = infoCFDictionary! as Dictionary
let updatedVersion = infoDictionary[kCFBundleVersionKey] as! String
XCTAssertEqual(updatedVersion, "3.1", "Should have installed the superseding update, not the one abandoned mid-install")
sleep(10)
}
}
+8 -5
View File
@@ -7,12 +7,15 @@ import Foundation
func unarchive(itemPath: URL, archiveDestDir: URL, callback: @escaping (Error?) -> Void) {
let fileManager = FileManager.default
let tempDir = archiveDestDir.appendingPathExtension("tmp")
let tempExtractionDir = archiveDestDir.appendingPathExtension("tmp")
_ = try? fileManager.removeItem(at: tempDir)
_ = try? fileManager.createDirectory(at: tempDir, withIntermediateDirectories: true, attributes: [:])
_ = try? fileManager.removeItem(at: tempExtractionDir)
_ = try? fileManager.createDirectory(at: tempExtractionDir, withIntermediateDirectories: true, attributes: [:])
// The disk image unarchiver will create and remove this directory automatically
let extractionMountDirectory: String? = SUUnarchiver.canUseExtractionMountDirectory(itemPath.path) ? URL(fileURLWithPath: NSTemporaryDirectory(), isDirectory: true).appendingPathComponent(ProcessInfo.processInfo.globallyUniqueString).path : nil
if let unarchiver = SUUnarchiver.unarchiver(forPath: itemPath.path, extractionDirectory: tempDir.path, updatingHostBundlePath: nil, decryptionPassword: nil, expectingInstallationType: SPUInstallationTypeApplication) {
if let unarchiver = SUUnarchiver.unarchiver(forPath: itemPath.path, extractionDirectory: tempExtractionDir.path, extractionMountDirectory: extractionMountDirectory, updatingHostBundlePath: nil, decryptionPassword: nil, expectingInstallationType: SPUInstallationTypeApplication) {
unarchiver.unarchive(completionBlock: { (error: Error?) in
if error != nil {
callback(error)
@@ -20,7 +23,7 @@ func unarchive(itemPath: URL, archiveDestDir: URL, callback: @escaping (Error?)
}
do {
try fileManager.moveItem(at: tempDir, to: archiveDestDir)
try fileManager.moveItem(at: tempExtractionDir, to: archiveDestDir)
callback(nil)
} catch {
callback(error)
+4
View File
@@ -259,6 +259,10 @@ struct GenerateAppcast: ParsableCommand {
// terminate the process, when extracting archives
signal(SIGPIPE, SIG_IGN)
// This satisfies unarchiving disk images in interactive sessions without diskutil (macOS 27.2+)
// making it require the user to enter a response for images that have license agreements
setenv("PAGER", "true", 1)
// Extract the keys
let privateDSAKey : SecKey?
#if GENERATE_APPCAST_BUILD_LEGACY_DSA_SUPPORT