Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e641adb419 | ||
|
|
52e9c64b48 | ||
|
|
88a0edc38d | ||
|
|
787d844be3 | ||
|
|
6460d63f3e | ||
|
|
ca426e4b2d | ||
|
|
cb2dea4178 | ||
|
|
736b331dd6 | ||
|
|
d3ae95f76f | ||
|
|
b4f427b747 | ||
|
|
5e527f9a11 | ||
|
|
4cda0dc428 | ||
|
|
7761e65c78 | ||
|
|
2c60bb2825 | ||
|
|
f28aacfd89 | ||
|
|
04a15cbc28 | ||
|
|
0516f07b7c | ||
|
|
82d7da9326 | ||
|
|
5d9649e29b | ||
|
|
15f7dd5690 | ||
|
|
8c2ff583a0 | ||
|
|
8ed643c901 | ||
|
|
a5401bbf3f | ||
|
|
fc7350329e | ||
|
|
3dfee03f5c | ||
|
|
b83c87c033 | ||
|
|
d9180f7d7f | ||
|
|
9faabd7c69 | ||
|
|
ccd1e7a2be | ||
|
|
956385b5aa | ||
|
|
f80d06325c | ||
|
|
0843eee299 | ||
|
|
70b82ce304 | ||
|
|
ee39041587 | ||
|
|
c8cc30f0a7 | ||
|
|
557218237f | ||
|
|
927adb667f | ||
|
|
cbfa447282 | ||
|
|
687ef39706 | ||
|
|
2767b01d68 | ||
|
|
3c83ebb5cf | ||
|
|
68d664f13b | ||
|
|
6e065ba0ea | ||
|
|
b685fedc5c | ||
|
|
9a1d2a19d3 | ||
|
|
f800572421 | ||
|
|
f37e511c31 | ||
|
|
65898f2dc6 | ||
|
|
65bff871e2 | ||
|
|
488fd7d8bd | ||
|
|
86d11fd407 | ||
|
|
167db6f80c | ||
|
|
f1ecf8e445 | ||
|
|
ba41d1b7b1 | ||
|
|
f52d989151 | ||
|
|
ee00f4f63c | ||
|
|
4dac8e3ce8 | ||
|
|
4d7ad5613b | ||
|
|
366e8a0bf9 | ||
|
|
1603296a50 | ||
|
|
fa4176fdb6 | ||
|
|
782e2bf5d7 | ||
|
|
97bea2fcd4 | ||
|
|
b4a1b46fe1 | ||
|
|
8702e2dd11 | ||
|
|
d491aafeb7 | ||
|
|
2cfb1e6fe2 | ||
|
|
0c0317c09a | ||
|
|
43b3b03886 | ||
|
|
21e34394d0 | ||
|
|
e67dcb0fd2 | ||
|
|
5f9ee13796 | ||
|
|
eadcc179d0 | ||
|
|
f3dc1a4b9c | ||
|
|
4274e096fe | ||
|
|
341c8b2c17 | ||
|
|
8e30a08291 | ||
|
|
fea50c33c8 | ||
|
|
afc4179c0d | ||
|
|
f3cd2b9ff9 | ||
|
|
3b39b400e1 | ||
|
|
1dec7ddce9 | ||
|
|
3e3d573d08 | ||
|
|
057702e757 | ||
|
|
997778dd2d | ||
|
|
16819179a0 |
No files matched your search
@@ -17,6 +17,8 @@ Please use Console.app and search for Sparkle.
|
||||
Please try troubleshooting steps:
|
||||
https://github.com/sparkle-project/Sparkle#troubleshooting
|
||||
|
||||
For security sensitive issues, please file them at https://github.com/sparkle-project/Sparkle/security
|
||||
|
||||
-->
|
||||
|
||||
## Summary
|
||||
|
||||
@@ -10,18 +10,18 @@ jobs:
|
||||
build:
|
||||
strategy:
|
||||
matrix:
|
||||
xcode: ['xcode16.1', 'xcode15.4']
|
||||
xcode: ['xcode26.2', 'xcode16.4']
|
||||
include:
|
||||
- xcode: 'xcode15.4'
|
||||
xcode-path: '/Applications/Xcode_15.4.app/Contents/Developer'
|
||||
- xcode: 'xcode16.4'
|
||||
xcode-path: '/Applications/Xcode_16.4.app/Contents/Developer'
|
||||
upload-dist: false
|
||||
run-analyzer: false
|
||||
macos: 'macos-14'
|
||||
- xcode: 'xcode16.1'
|
||||
xcode-path: '/Applications/Xcode_16.1.app'
|
||||
macos: 'macos-15'
|
||||
- xcode: 'xcode26.2'
|
||||
xcode-path: '/Applications/Xcode_26.2.app/Contents/Developer'
|
||||
upload-dist: true
|
||||
run-analyzer: true
|
||||
macos: 'macos-15'
|
||||
macos: 'macos-26'
|
||||
|
||||
name: Build and Test Sparkle
|
||||
runs-on: ${{ matrix.macos }}
|
||||
@@ -70,16 +70,20 @@ jobs:
|
||||
DEVELOPER_DIR: ${{ matrix.xcode-path }}
|
||||
run: |
|
||||
if grep -q "warning:" analyze_output.txt; then
|
||||
echo '::set-output name=analyzestatus::0'
|
||||
echo "analyzestatus=0" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo '::set-output name=analyzestatus::1'
|
||||
echo "analyzestatus=1" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Extract Analyzed Warnings
|
||||
if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
|
||||
id: warnings
|
||||
run: |
|
||||
echo ::set-output name=content::$(cat analyze_output.txt)
|
||||
{
|
||||
echo 'content<<EOF'
|
||||
cat analyze_output.txt
|
||||
echo 'EOF'
|
||||
} >> $GITHUB_OUTPUT
|
||||
|
||||
- name: Post Analyzed Warnings
|
||||
if: ${{ success() && matrix.run-analyzer && github.event_name == 'pull_request' && steps.findwarnings.outputs.analyzestatus == '0' }}
|
||||
@@ -98,7 +102,9 @@ jobs:
|
||||
uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: build-logs
|
||||
path: build/Logs
|
||||
path: |
|
||||
build/Logs
|
||||
~/Library/Logs/DiagnosticReports
|
||||
- name: Upload Distribution
|
||||
if: ${{ success() && matrix.upload-dist }}
|
||||
uses: actions/upload-artifact@v4
|
||||
|
||||
@@ -2,7 +2,7 @@ name: "Create Draft Release"
|
||||
|
||||
env:
|
||||
BUILDDIR: "build"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_16.1.app/Contents/Developer"
|
||||
DEVELOPER_DIR: "/Applications/Xcode_26.2.app/Contents/Developer"
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
@@ -29,7 +29,7 @@ concurrency:
|
||||
jobs:
|
||||
release:
|
||||
name: "Publish binaries for release"
|
||||
runs-on: macos-15
|
||||
runs-on: macos-26
|
||||
|
||||
steps:
|
||||
- name: "Checkout sources"
|
||||
|
||||
@@ -10,6 +10,8 @@
|
||||
#import "SPUMessageTypes.h"
|
||||
#import "SPUInstallerAgentProtocol.h"
|
||||
#import "SUInstallerAgentInitiationProtocol.h"
|
||||
#import "SUCodeSigningVerifier.h"
|
||||
#import "SULog.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -52,7 +54,7 @@
|
||||
_delegate = nil;
|
||||
|
||||
[_activeConnection invalidate];
|
||||
_activeConnection = nil;
|
||||
// Don't need to set _activeConnection to nil, we don't expect new connections
|
||||
|
||||
[_xpcListener invalidate];
|
||||
_xpcListener = nil;
|
||||
@@ -61,10 +63,29 @@
|
||||
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
|
||||
{
|
||||
if (_activeConnection != nil) {
|
||||
SULog(SULogLevelError, @"Error: Rejecting new connection for agent due already having an active connection");
|
||||
|
||||
[newConnection invalidate];
|
||||
return NO;
|
||||
}
|
||||
|
||||
// Hardening but not critical for security
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (validationStatus) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
break;
|
||||
case SUValidateConnectionStatusSetNoRequirementSuccess:
|
||||
break;
|
||||
case SUValidateConnectionStatusAPIFailure:
|
||||
case SUValidateConnectionStatusCodeSigningRequirementFailure:
|
||||
case SUValidateConectionNoSupportedValidationMethodFailure:
|
||||
SULog(SULogLevelError, @"Error: Rejecting new connection for agent due to failing validation of XPC connection with status %lu and error: %@", validationStatus, validationError.localizedDescription);
|
||||
|
||||
[newConnection invalidate];
|
||||
return NO;
|
||||
}
|
||||
|
||||
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerAgentInitiationProtocol)];
|
||||
newConnection.exportedObject = self;
|
||||
|
||||
@@ -91,9 +112,8 @@
|
||||
});
|
||||
};
|
||||
|
||||
[newConnection resume];
|
||||
|
||||
_agent = newConnection.remoteObjectProxy;
|
||||
[newConnection resume];
|
||||
|
||||
return YES;
|
||||
}
|
||||
@@ -106,7 +126,9 @@
|
||||
[self->_delegate agentConnectionDidInitiate];
|
||||
});
|
||||
|
||||
acknowledgement();
|
||||
if (acknowledgement != NULL) {
|
||||
acknowledgement();
|
||||
}
|
||||
}
|
||||
|
||||
- (void)connectionWillInvalidateWithError:(NSError *)error
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
#import "SPULocalCacheDirectory.h"
|
||||
#import "SPUVerifierInformation.h"
|
||||
#import "SUConstants.h"
|
||||
#import "SUCodeSigningVerifier.h"
|
||||
#import <os/lock.h>
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
@@ -49,7 +51,10 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
@implementation AppInstaller
|
||||
{
|
||||
NSXPCListener* _xpcListener;
|
||||
// Must be synchronized with _newConnectionLock
|
||||
// Set from new connection handler, and also set/read from main thread
|
||||
NSXPCConnection *_activeConnection;
|
||||
|
||||
id<SUInstallerCommunicationProtocol> _communicator;
|
||||
AgentConnection *_agentConnection;
|
||||
|
||||
@@ -72,6 +77,14 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
dispatch_queue_t _installerQueue;
|
||||
|
||||
os_unfair_lock _newConnectionLock;
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
// Must be synchronized with _newConnectionLock
|
||||
// Set from new connection handler, read from main thread
|
||||
BOOL _connectionCodeSigningValidationSkipped;
|
||||
#endif
|
||||
|
||||
BOOL _shouldRelaunch;
|
||||
BOOL _shouldShowUI;
|
||||
|
||||
@@ -82,7 +95,9 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
BOOL _finishedValidation;
|
||||
BOOL _agentInitiatedConnection;
|
||||
|
||||
// Setting _performedStage1Installation on main thread must be synchronzied with reading it from new connection handler
|
||||
BOOL _performedStage1Installation;
|
||||
|
||||
BOOL _performedStage2Installation;
|
||||
BOOL _performedStage3Installation;
|
||||
|
||||
@@ -95,6 +110,8 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
return nil;
|
||||
}
|
||||
|
||||
_newConnectionLock = OS_UNFAIR_LOCK_INIT;
|
||||
|
||||
_hostBundleIdentifier = [hostBundleIdentifier copy];
|
||||
|
||||
_homeDirectory = [homeDirectory copy];
|
||||
@@ -110,13 +127,59 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection
|
||||
{
|
||||
if (_activeConnection != nil) {
|
||||
SULog(SULogLevelDefault, @"Rejecting multiple connections...");
|
||||
[newConnection invalidate];
|
||||
return NO;
|
||||
os_unfair_lock_lock(&_newConnectionLock);
|
||||
{
|
||||
if (_activeConnection != nil) {
|
||||
os_unfair_lock_unlock(&_newConnectionLock);
|
||||
|
||||
SULog(SULogLevelError, @"Error: Rejecting multiple XPC connections for installer...");
|
||||
|
||||
[newConnection invalidate];
|
||||
return NO;
|
||||
}
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
BOOL connectionCodeSigningValidationSkipped = NO;
|
||||
#endif
|
||||
|
||||
// It's safe to allow any connections once stage 1 installation is complete
|
||||
// This is to allow general updaters to resume the installation.
|
||||
if (!_performedStage1Installation) {
|
||||
BOOL passesValidation;
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus status = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (status) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
passesValidation = YES;
|
||||
break;
|
||||
case SUValidateConnectionStatusSetNoRequirementSuccess:
|
||||
passesValidation = YES;
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
connectionCodeSigningValidationSkipped = YES;
|
||||
#endif
|
||||
break;
|
||||
case SUValidateConnectionStatusAPIFailure:
|
||||
case SUValidateConnectionStatusCodeSigningRequirementFailure:
|
||||
case SUValidateConectionNoSupportedValidationMethodFailure:
|
||||
passesValidation = NO;
|
||||
break;
|
||||
}
|
||||
|
||||
if (!passesValidation) {
|
||||
os_unfair_lock_unlock(&_newConnectionLock);
|
||||
|
||||
SULog(SULogLevelError, @"Error: Rejecting new connection for installer due to failing validation of XPC connection with status %lu and error: %@", status, validationError.localizedDescription);
|
||||
[newConnection invalidate];
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
_connectionCodeSigningValidationSkipped = connectionCodeSigningValidationSkipped;
|
||||
#endif
|
||||
_activeConnection = newConnection;
|
||||
}
|
||||
|
||||
_activeConnection = newConnection;
|
||||
os_unfair_lock_unlock(&_newConnectionLock);
|
||||
|
||||
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol)];
|
||||
newConnection.exportedObject = self;
|
||||
@@ -128,7 +191,11 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
__typeof__(self) strongSelf = weakSelf;
|
||||
if (strongSelf != nil) {
|
||||
[strongSelf->_activeConnection invalidate];
|
||||
os_unfair_lock_lock(&strongSelf->_newConnectionLock);
|
||||
NSXPCConnection *activeConnection = strongSelf->_activeConnection;
|
||||
os_unfair_lock_unlock(&strongSelf->_newConnectionLock);
|
||||
|
||||
[activeConnection invalidate];
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -141,14 +208,19 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
[strongSelf cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Invalidation on remote port being called, and installation is not close enough to completion!" }]];
|
||||
}
|
||||
strongSelf->_communicator = nil;
|
||||
|
||||
os_unfair_lock_lock(&strongSelf->_newConnectionLock);
|
||||
strongSelf->_activeConnection = nil;
|
||||
os_unfair_lock_unlock(&strongSelf->_newConnectionLock);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
[newConnection resume];
|
||||
|
||||
_communicator = newConnection.remoteObjectProxy;
|
||||
// _communicator is used only on main thread
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
self->_communicator = newConnection.remoteObjectProxy;
|
||||
[newConnection resume];
|
||||
});
|
||||
|
||||
return YES;
|
||||
}
|
||||
@@ -360,7 +432,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
// Do not rely on eg: self->_updateDirectoryPath != nil because we may set it to nil again if an early stage fails (i.e, archive extraction)
|
||||
self->_receivedInstallationData = YES;
|
||||
|
||||
SPUInstallationInputData *installationData = (SPUInstallationInputData *)SPUUnarchiveRootObjectSecurely(data, [SPUInstallationInputData class]);
|
||||
SPUInstallationInputData *installationData = (data != nil) ? (SPUInstallationInputData *)SPUUnarchiveRootObjectSecurely(data, [SPUInstallationInputData class]) : nil;
|
||||
if (installationData == nil) {
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to unarchive input installation data" }]];
|
||||
return;
|
||||
@@ -525,9 +597,9 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
[self extractAndInstallUpdate];
|
||||
});
|
||||
} else if (identifier == SPUSentUpdateAppcastItemData) {
|
||||
SUAppcastItem *updateItem = (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, [SUAppcastItem class]);
|
||||
SUAppcastItem *updateItem = (data != nil) ? (SUAppcastItem *)SPUUnarchiveRootObjectSecurely(data, [SUAppcastItem class]) : nil;
|
||||
if (updateItem != nil) {
|
||||
SPUInstallationInfo *installationInfo = [[SPUInstallationInfo alloc] initWithAppcastItem:updateItem canSilentlyInstall:[_installer canInstallSilently]];
|
||||
SPUInstallationInfo *installationInfo = [[SPUInstallationInfo alloc] initWithAppcastItem:updateItem];
|
||||
|
||||
NSData *archivedData = SPUArchiveRootObjectSecurely(installationInfo);
|
||||
if (archivedData != nil) {
|
||||
@@ -540,7 +612,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
uint8_t showsUI = *((const uint8_t *)data.bytes + 1);
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
// This flag has an impact on interactive type installations and showing UI progress during non-interactive installations
|
||||
// This flag has an impact on showing UI progress during installations
|
||||
self->_shouldShowUI = (BOOL)showsUI;
|
||||
// Don't test if the application was alive initially, leave that to the progress agent if we decide to relaunch
|
||||
self->_shouldRelaunch = (BOOL)relaunch;
|
||||
@@ -578,9 +650,17 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
_installerQueue = dispatch_queue_create("org.sparkle-project.sparkle.installer", queuePriority);
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
os_unfair_lock_lock(&_newConnectionLock);
|
||||
BOOL connectionCodeSigningValidationSkipped = self->_connectionCodeSigningValidationSkipped;
|
||||
os_unfair_lock_unlock(&_newConnectionLock);
|
||||
#else
|
||||
BOOL connectionCodeSigningValidationSkipped = NO;
|
||||
#endif
|
||||
|
||||
dispatch_async(_installerQueue, ^{
|
||||
NSError *installerError = nil;
|
||||
id <SUInstallerProtocol> installer = [SUInstaller installerForHost:self->_host expectedInstallationType:self->_installationType updateDirectory:self->_extractionDirectory homeDirectory:self->_homeDirectory userName:self->_userName error:&installerError];
|
||||
id <SUInstallerProtocol> installer = [SUInstaller installerForHost:self->_host expectedInstallationType:self->_installationType updateDirectory:self->_extractionDirectory connectionCodeSigningValidationSkipped:connectionCodeSigningValidationSkipped homeDirectory:self->_homeDirectory userName:self->_userName error:&installerError];
|
||||
|
||||
if (installer == nil) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
@@ -599,19 +679,19 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
return;
|
||||
}
|
||||
|
||||
uint8_t canPerformSilentInstall = (uint8_t)[installer canInstallSilently];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
self->_installer = installer;
|
||||
|
||||
uint8_t sendInformation[] = {canPerformSilentInstall, (uint8_t)self->_targetTerminated};
|
||||
os_unfair_lock_lock(&self->_newConnectionLock);
|
||||
self->_performedStage1Installation = YES;
|
||||
os_unfair_lock_unlock(&self->_newConnectionLock);
|
||||
|
||||
NSData *sendData = [NSData dataWithBytes:sendInformation length:sizeof(sendInformation)];
|
||||
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
|
||||
|
||||
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
|
||||
|
||||
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage1 data:sendData];
|
||||
|
||||
self->_performedStage1Installation = YES;
|
||||
|
||||
if (self->_targetTerminated) {
|
||||
// Stage 2 can still be run before we finish installation
|
||||
// if the updater requests for it before the app is terminated
|
||||
@@ -623,37 +703,27 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
- (void)performStage2Installation SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL canPerformSecondStage = _shouldShowUI || [_installer canInstallSilently];
|
||||
if (canPerformSecondStage) {
|
||||
_performedStage2Installation = YES;
|
||||
_performedStage2Installation = YES;
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
|
||||
|
||||
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
|
||||
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage2 data:sendData];
|
||||
|
||||
// Don't check if the target is already terminated, leave that to the progress agent
|
||||
// We could be slightly off if there were multiple instances running
|
||||
[self->_agentConnection.agent sendTerminationSignal];
|
||||
});
|
||||
} else {
|
||||
_installer = nil;
|
||||
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
|
||||
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage2 data:sendData];
|
||||
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self cleanupAndExitWithStatus:EXIT_FAILURE error:[NSError errorWithDomain:SUSparkleErrorDomain code:SPUInstallerError userInfo:@{ NSLocalizedDescriptionKey: @"Error: Failed to resume installer on stage 2 because installation cannot be installed silently" }]];
|
||||
});
|
||||
}
|
||||
// Don't check if the target is already terminated, leave that to the progress agent
|
||||
// We could be slightly off if there were multiple instances running
|
||||
[self->_agentConnection.agent sendTerminationSignal];
|
||||
});
|
||||
}
|
||||
|
||||
- (void)finishInstallationAfterHostTermination SPU_OBJC_DIRECT
|
||||
{
|
||||
assert(self->_targetTerminated);
|
||||
|
||||
// Show our installer progress UI tool if only after a certain amount of time passes,
|
||||
// and if our installer is silent (i.e, doesn't show progress on its own)
|
||||
// Show our installer progress UI tool if only after a certain amount of time passes
|
||||
__block BOOL shouldShowUIProgress = YES;
|
||||
if (self->_shouldShowUI && [self->_installer canInstallSilently]) {
|
||||
if (self->_shouldShowUI) {
|
||||
// Ask the updater if it is still alive
|
||||
// If they are, we will receive a pong response back
|
||||
// Reset if we received a pong just to be on the safe side
|
||||
@@ -728,9 +798,15 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
|
||||
|
||||
// It's nice to tell the other end we're invalidating
|
||||
|
||||
[_activeConnection invalidate];
|
||||
os_unfair_lock_lock(&_newConnectionLock);
|
||||
|
||||
NSXPCConnection *activeConnection = _activeConnection;
|
||||
_activeConnection = nil;
|
||||
|
||||
os_unfair_lock_unlock(&_newConnectionLock);
|
||||
|
||||
[activeConnection invalidate];
|
||||
|
||||
[_xpcListener invalidate];
|
||||
_xpcListener = nil;
|
||||
|
||||
|
||||
@@ -14,10 +14,9 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SPUInstallationInfo : NSObject <NSSecureCoding>
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall;
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem;
|
||||
|
||||
@property (nonatomic, readonly) SUAppcastItem *appcastItem;
|
||||
@property (nonatomic, readonly) BOOL canSilentlyInstall;
|
||||
|
||||
@property (nonatomic) BOOL systemDomain;
|
||||
|
||||
|
||||
@@ -19,23 +19,21 @@ static NSString *SUSystemDomainKey = @"SUSystemDomain";
|
||||
@implementation SPUInstallationInfo
|
||||
|
||||
@synthesize appcastItem = _appcastItem;
|
||||
@synthesize canSilentlyInstall = _canSilentlyInstall;
|
||||
@synthesize systemDomain = _systemDomain;
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall systemDomain:(BOOL)systemDomain
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem systemDomain:(BOOL)systemDomain
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_appcastItem = appcastItem;
|
||||
_canSilentlyInstall = canSilentlyInstall;
|
||||
_systemDomain = systemDomain;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem canSilentlyInstall:(BOOL)canSilentlyInstall
|
||||
- (instancetype)initWithAppcastItem:(SUAppcastItem *)appcastItem
|
||||
{
|
||||
return [self initWithAppcastItem:appcastItem canSilentlyInstall:canSilentlyInstall systemDomain:NO];
|
||||
return [self initWithAppcastItem:appcastItem systemDomain:NO];
|
||||
}
|
||||
|
||||
- (nullable instancetype)initWithCoder:(NSCoder *)decoder
|
||||
@@ -45,16 +43,18 @@ static NSString *SUSystemDomainKey = @"SUSystemDomain";
|
||||
return nil;
|
||||
}
|
||||
|
||||
BOOL canSilentlyInstall = [decoder decodeBoolForKey:SUCanSilentlyInstallKey];
|
||||
BOOL systemDomain = [decoder decodeBoolForKey:SUSystemDomainKey];
|
||||
return [self initWithAppcastItem:appcastItem canSilentlyInstall:canSilentlyInstall systemDomain:systemDomain];
|
||||
return [self initWithAppcastItem:appcastItem systemDomain:systemDomain];
|
||||
}
|
||||
|
||||
- (void)encodeWithCoder:(NSCoder *)coder
|
||||
{
|
||||
[coder encodeObject:_appcastItem forKey:SUAppcastItemKey];
|
||||
[coder encodeBool:_canSilentlyInstall forKey:SUCanSilentlyInstallKey];
|
||||
[coder encodeBool:_systemDomain forKey:SUSystemDomainKey];
|
||||
|
||||
// Installation types can always be silently installed for newer versions of Sparkle
|
||||
// Still encode this key to maintain backwards compatibility with older Sparkle clients
|
||||
[coder encodeBool:YES forKey:SUCanSilentlyInstallKey];
|
||||
}
|
||||
|
||||
+ (BOOL)supportsSecureCoding
|
||||
|
||||
@@ -113,11 +113,11 @@ uint16_t latestMinorVersionForMajorVersion(SUBinaryDeltaMajorVersion majorVersio
|
||||
case SUBinaryDeltaMajorVersion1:
|
||||
return 2;
|
||||
case SUBinaryDeltaMajorVersion2:
|
||||
return 4;
|
||||
return 5;
|
||||
case SUBinaryDeltaMajorVersion3:
|
||||
return 1;
|
||||
return 3;
|
||||
case SUBinaryDeltaMajorVersion4:
|
||||
return 0;
|
||||
return 2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -345,7 +345,12 @@ static NSString *cloneableRelativePath(NSDictionary<NSString *, NSData *> *after
|
||||
if (oldCloneInfo == nil) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
// The old file must have the same type as the new one
|
||||
if ([(NSNumber *)oldCloneInfo[INFO_TYPE_KEY] unsignedShortValue] != FTS_F) {
|
||||
continue;
|
||||
}
|
||||
|
||||
NSNumber *newPermissions = newInfo[INFO_PERMISSIONS_KEY];
|
||||
if (outNewPermissions != NULL) {
|
||||
*outNewPermissions = newPermissions;
|
||||
|
||||
@@ -19,6 +19,14 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
#define SUCodeSigningVerifierDefinitionAttribute __attribute__((objc_runtime_name("SUTestCodeSigningVerifier")))
|
||||
#endif
|
||||
|
||||
typedef NS_ENUM(NSUInteger, SUValidateConnectionStatus) {
|
||||
SUValidateConnectionStatusSetCodeSigningRequirementSuccess = 0,
|
||||
SUValidateConnectionStatusSetNoRequirementSuccess,
|
||||
SUValidateConnectionStatusAPIFailure,
|
||||
SUValidateConnectionStatusCodeSigningRequirementFailure,
|
||||
SUValidateConectionNoSupportedValidationMethodFailure,
|
||||
};
|
||||
|
||||
SUCodeSigningVerifierDefinitionAttribute
|
||||
@interface SUCodeSigningVerifier : NSObject
|
||||
|
||||
@@ -34,6 +42,9 @@ SUCodeSigningVerifierDefinitionAttribute
|
||||
+ (BOOL)bundleAtURLIsCodeSigned:(NSURL *)bundleURL;
|
||||
|
||||
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url;
|
||||
+ (NSString * _Nullable)teamIdentifierFromMainExecutable;
|
||||
|
||||
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection error:(NSError * __autoreleasing *)error;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -15,6 +15,12 @@
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@interface NSXPCConnection (Private)
|
||||
|
||||
@property (nonatomic, readonly) audit_token_t auditToken;
|
||||
|
||||
@end
|
||||
|
||||
@implementation SUCodeSigningVerifier
|
||||
|
||||
+ (BOOL)codeSignatureIsValidAtBundleURL:(NSURL *)newBundleURL andMatchesSignatureAtBundleURL:(NSURL *)oldBundleURL error:(NSError * __autoreleasing *)error
|
||||
@@ -263,7 +269,7 @@ static id valueOrNSNull(id value) {
|
||||
return (result == 0);
|
||||
}
|
||||
|
||||
static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef staticCode)
|
||||
static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode)
|
||||
{
|
||||
CFDictionaryRef cfSigningInformation = NULL;
|
||||
OSStatus copySigningInfoCode = SecCodeCopySigningInformation(staticCode, kSecCSSigningInformation,
|
||||
@@ -284,12 +290,12 @@ static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef stat
|
||||
{
|
||||
SecStaticCodeRef staticCode = NULL;
|
||||
OSStatus staticCodeResult = SecStaticCodeCreateWithPath((__bridge CFURLRef)url, kSecCSDefaultFlags, &staticCode);
|
||||
if (staticCodeResult != noErr) {
|
||||
if (staticCodeResult != errSecSuccess) {
|
||||
SULog(SULogLevelError, @"Failed to get static code for retrieving team identifier: %d", staticCodeResult);
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSString *teamIdentifier = SUTeamIdentifierFromStaticCode(staticCode);
|
||||
NSString *teamIdentifier = SUTeamIdentifierFromCode(staticCode);
|
||||
|
||||
if (staticCode != NULL) {
|
||||
CFRelease(staticCode);
|
||||
@@ -298,6 +304,22 @@ static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef stat
|
||||
return teamIdentifier;
|
||||
}
|
||||
|
||||
+ (NSString * _Nullable)teamIdentifierFromMainExecutable
|
||||
{
|
||||
SecCodeRef code = NULL;
|
||||
OSStatus result = SecCodeCopySelf(kSecCSDefaultFlags, &code);
|
||||
if (result != errSecSuccess) {
|
||||
SULog(SULogLevelError, @"Failed to get code for retrieving team identifier of main executable: %d", result);
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSString *teamIdentifier = SUTeamIdentifierFromCode(code);
|
||||
|
||||
CFRelease(code);
|
||||
|
||||
return teamIdentifier;
|
||||
}
|
||||
|
||||
+ (BOOL)codeSignatureIsValidAtDownloadURL:(NSURL *)downloadURL andMatchesDeveloperIDTeamFromOldBundleURL:(NSURL *)oldBundleURL error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
NSString *teamIdentifier = nil;
|
||||
@@ -323,7 +345,7 @@ static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef stat
|
||||
goto finally;
|
||||
}
|
||||
|
||||
teamIdentifier = SUTeamIdentifierFromStaticCode(oldStaticCode);
|
||||
teamIdentifier = SUTeamIdentifierFromCode(oldStaticCode);
|
||||
if (teamIdentifier == nil) {
|
||||
resultError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"%@. The team identifier could not be retrieved from the original app: %@", commonErrorMessage, oldBundleURL.path] }];
|
||||
|
||||
@@ -337,7 +359,7 @@ static NSString * _Nullable SUTeamIdentifierFromStaticCode(SecStaticCodeRef stat
|
||||
// LeafIsDeveloperIDApp = certificate leaf[field.1.2.840.113635.100.6.1.13]
|
||||
// DeveloperIDTeamID = certificate leaf[subject.OU]
|
||||
// https://developer.apple.com/documentation/technotes/tn3127-inside-code-signing-requirements#Xcode-designated-requirement-for-Developer-ID-code
|
||||
requirementString = [NSString stringWithFormat:@"anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13] and certificate leaf[subject.OU] = %@", teamIdentifier];
|
||||
requirementString = [NSString stringWithFormat:@"anchor apple generic and certificate 1[field.1.2.840.113635.100.6.2.6] and certificate leaf[field.1.2.840.113635.100.6.1.13] and certificate leaf[subject.OU] = \"%@\"", teamIdentifier];
|
||||
|
||||
result = SecRequirementCreateWithString((__bridge CFStringRef)requirementString, kSecCSDefaultFlags, &requirement);
|
||||
if (result != errSecSuccess) {
|
||||
@@ -421,4 +443,86 @@ finally:
|
||||
return (resultError == nil);
|
||||
}
|
||||
|
||||
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
// Check if code signing requirement is required
|
||||
NSString *hostTeamIdentifier = [self teamIdentifierFromMainExecutable];
|
||||
if (hostTeamIdentifier == nil) {
|
||||
return SUValidateConnectionStatusSetNoRequirementSuccess;
|
||||
}
|
||||
|
||||
// Build the default team ID signing requirement
|
||||
NSString *codeSigningRequirement = [NSString stringWithFormat:@"(anchor apple generic and certificate leaf[subject.OU] = \"%@\")", hostTeamIdentifier];
|
||||
|
||||
if (@available(macOS 13.0, *)) {
|
||||
[connection setCodeSigningRequirement:codeSigningRequirement];
|
||||
|
||||
return SUValidateConnectionStatusSetCodeSigningRequirementSuccess;
|
||||
}
|
||||
|
||||
// Fall back to audit token on older OS's
|
||||
if ([connection respondsToSelector:@selector(auditToken)]) {
|
||||
audit_token_t auditToken = [connection auditToken];
|
||||
NSData *auditTokenData = [NSData dataWithBytes:&auditToken length:sizeof(auditToken)];
|
||||
|
||||
NSDictionary *attributes = @{
|
||||
(NSString *)kSecGuestAttributeAudit: auditTokenData
|
||||
};
|
||||
|
||||
SecCodeRef code = NULL;
|
||||
OSStatus result = SecCodeCopyGuestWithAttributes(NULL, (__bridge CFDictionaryRef _Nullable)(attributes), kSecCSDefaultFlags, &code);
|
||||
if (result != errSecSuccess) {
|
||||
CFRelease(code);
|
||||
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because SecCodeCopyGuestWithAttributes() failed with error %d", result] }];
|
||||
}
|
||||
|
||||
return SUValidateConnectionStatusAPIFailure;
|
||||
}
|
||||
|
||||
// Check if the client is code signed with our signing requirement
|
||||
|
||||
SecRequirementRef requirement = NULL;
|
||||
result = SecRequirementCreateWithString((__bridge CFStringRef)codeSigningRequirement, kSecCSDefaultFlags, &requirement);
|
||||
|
||||
if (result != errSecSuccess) {
|
||||
CFRelease(code);
|
||||
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because SecRequirementCreateWithString() failed with error %d", result] }];
|
||||
}
|
||||
|
||||
return SUValidateConnectionStatusAPIFailure;
|
||||
}
|
||||
|
||||
CFErrorRef cfError = NULL;
|
||||
// This is not a static code, so we don't pass kSecCSCheckAllArchitectures
|
||||
result = SecCodeCheckValidityWithErrors(code, kSecCSDefaultFlags, requirement, &cfError);
|
||||
|
||||
CFRelease(requirement);
|
||||
requirement = NULL;
|
||||
|
||||
if (result != errSecSuccess) {
|
||||
NSError *cfBridgedError = (NSError *)CFBridgingRelease(cfError);
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInsufficientSigningError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"The client connection could not be validated because validating the code signature failed with error %d (%@). Does the app meet the designated requirement: %@", result, cfBridgedError.localizedDescription, codeSigningRequirement] }];
|
||||
}
|
||||
|
||||
[self logSigningInfoForCode:code label:@"Client"];
|
||||
|
||||
CFRelease(code);
|
||||
|
||||
return SUValidateConnectionStatusCodeSigningRequirementFailure;
|
||||
}
|
||||
|
||||
CFRelease(code);
|
||||
|
||||
return SUValidateConnectionStatusSetCodeSigningRequirementSuccess;
|
||||
}
|
||||
|
||||
// Not much we can do if auditToken is not supported. This code should not be reached though.
|
||||
return SUValidateConectionNoSupportedValidationMethodFailure;
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -82,11 +82,6 @@
|
||||
{
|
||||
}
|
||||
|
||||
- (BOOL)canInstallSilently
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -15,7 +15,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUInstaller : NSObject
|
||||
|
||||
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError **)error;
|
||||
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory connectionCodeSigningValidationSkipped:(BOOL)connectionCodeSigningValidationSkipped homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError **)error;
|
||||
|
||||
+ (nullable NSString *)installSourcePathInUpdateFolder:(NSString *)inUpdateFolder forHost:(SUHost *)host
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
#import "SUInstaller.h"
|
||||
#import "SUPlainInstaller.h"
|
||||
#import "SUPackageInstaller.h"
|
||||
#import "SUGuidedPackageInstaller.h"
|
||||
#import "SUHost.h"
|
||||
#import "SUConstants.h"
|
||||
@@ -123,7 +122,7 @@
|
||||
|
||||
if (isPackage) {
|
||||
// Guided (or now "normal") installs used to be opt-in (i.e, Sparkle would detect foo.sparkle_guided.pkg or foo.sparkle_guided.mpkg),
|
||||
// but to get an interactive (or "unguided") install, the developer now must opt-out of guided installations.
|
||||
// Interactive installs are no longer supported, so isGuided = NO will later turn into an error
|
||||
|
||||
// foo.app -> foo.sparkle_interactive.pkg or foo.sparkle_interactive.mpkg
|
||||
if ([[[newAppDownloadPath stringByDeletingPathExtension] pathExtension] isEqualToString:@"sparkle_interactive"]) {
|
||||
@@ -150,7 +149,7 @@
|
||||
return newAppDownloadPath;
|
||||
}
|
||||
|
||||
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError * __autoreleasing *)error
|
||||
+ (nullable id<SUInstallerProtocol>)installerForHost:(SUHost *)host expectedInstallationType:(NSString *)expectedInstallationType updateDirectory:(NSString *)updateDirectory connectionCodeSigningValidationSkipped:(BOOL)connectionCodeSigningValidationSkipped homeDirectory:(NSString *)homeDirectory userName:(NSString *)userName error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
BOOL isPackage = NO;
|
||||
@@ -170,6 +169,83 @@
|
||||
return nil;
|
||||
}
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
if (isPackage && connectionCodeSigningValidationSkipped) {
|
||||
// Package updates cannot update arbitrary bundles if code signing validation on the connection was skipped
|
||||
// (This means our helper is not code signed with an Apple issued certificate).
|
||||
// In this case, the main executable must be owned by root and the host must contain our installer tool
|
||||
|
||||
NSString *installerExecutablePath = NSBundle.mainBundle.executableURL.URLByResolvingSymlinksInPath.path;
|
||||
if (installerExecutablePath == nil) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"The "@SPARKLE_RELAUNCH_TOOL_NAME" executable path failed to be retrieved, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSString *hostBundlePath = host.bundle.bundleURL.URLByResolvingSymlinksInPath.path;
|
||||
if (hostBundlePath == nil) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"The host bundle path to update to be retrieved, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSError *attributesError = nil;
|
||||
NSDictionary<NSFileAttributeKey, id> *fileAttributes = [NSFileManager.defaultManager attributesOfItemAtPath:installerExecutablePath error:&attributesError];
|
||||
|
||||
if (fileAttributes == nil) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"File attributes failed to be retrieved from the "@SPARKLE_RELAUNCH_TOOL_NAME" executable, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSNumber *installerOwnerID = fileAttributes[NSFileOwnerAccountID];
|
||||
if (installerOwnerID == nil) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: @"File owner ID failed to be retrieved from the "@SPARKLE_RELAUNCH_TOOL_NAME" executable, which is an internal error that shouldn't happen. Please try to update using a production build of your app." }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
// Check our helper is owned by root
|
||||
if (![installerOwnerID isEqual:@(0)]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Due to security, updating apps with package installers is disabled when '%@' is not signed with the same Team ID as your app, and "@SPARKLE_RELAUNCH_TOOL_NAME" is not owned by root (this specific case) or not residing in '%@'. Please either test an exported & production build of your app, or for development, code sign your app and Sparkle's embedded helpers with the same team: https://sparkle-project.org/documentation/sandboxing#code-signing", installerExecutablePath, hostBundlePath] }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSArray<NSString *> *installerExecutablePathComponents = installerExecutablePath.pathComponents;
|
||||
NSArray<NSString *> *hostBundlePathComponents = hostBundlePath.pathComponents;
|
||||
|
||||
if (installerExecutablePathComponents.count <= hostBundlePathComponents.count) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Due to security, updating apps with package installers is disabled when '%@' is not signed with the same Team ID as your app, and "@SPARKLE_RELAUNCH_TOOL_NAME" is not owned by root or not residing in '%@' (this specific case). Please either test an exported & production build of your app, or for development, code sign your app and Sparkle's embedded helpers with the same team: https://sparkle-project.org/documentation/sandboxing#code-signing", installerExecutablePath, hostBundlePath] }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
|
||||
// Check out helper resides inside the host app to be updated
|
||||
if (![[installerExecutablePathComponents subarrayWithRange:NSMakeRange(0, hostBundlePathComponents.count)] isEqualToArray:hostBundlePathComponents]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingUpdateError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Due to security, updating apps with package installers is disabled when '%@' is not signed with the same Team ID as your app, and "@SPARKLE_RELAUNCH_TOOL_NAME" is not owned by root or not residing in '%@' (this specific case). Please either test an exported & production build of your app, or for development, code sign your app and Sparkle's embedded helpers with the same team: https://sparkle-project.org/documentation/sandboxing#code-signing", installerExecutablePath, hostBundlePath] }];
|
||||
}
|
||||
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
#else
|
||||
(void)connectionCodeSigningValidationSkipped;
|
||||
#endif
|
||||
|
||||
// Make sure we find the type of installer that we were expecting to find
|
||||
// We shouldn't implicitly trust the installation type fed into here from the appcast because the installation type helps us determine
|
||||
// ahead of time whether or not this installer tool should be ran as root or not
|
||||
@@ -184,12 +260,8 @@
|
||||
installer = [[SUGuidedPackageInstaller alloc] initWithPackagePath:newDownloadPath homeDirectory:homeDirectory userName:userName];
|
||||
}
|
||||
} else if (isPackage) {
|
||||
if (![expectedInstallationType isEqualToString:SPUInstallationTypeInteractivePackage]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Found package installer but '%@=%@' was probably missing in the appcast item enclosure", SUAppcastAttributeInstallationType, SPUInstallationTypeInteractivePackage] }];
|
||||
}
|
||||
} else {
|
||||
installer = [[SUPackageInstaller alloc] initWithPackagePath:newDownloadPath];
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Found interactive package installer (with 'sparkle_interactive' in the filename) but these are no longer supported. Please remove 'sparkle_interactive' from the filename." }];
|
||||
}
|
||||
} else
|
||||
#endif
|
||||
|
||||
@@ -28,11 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
// Should be able to be called from any thread
|
||||
- (void)performCleanup;
|
||||
|
||||
// Indicates whether or not this installer can install the update silently in the background, without hindering the user
|
||||
// If this returns NO, then the installation can fail if the user did not directly request for the install to occur.
|
||||
// Should be thread safe
|
||||
- (BOOL)canInstallSilently;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,23 +0,0 @@
|
||||
//
|
||||
// SUPackageInstaller.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Andy Matuschak on 4/10/08.
|
||||
// Copyright 2008 Andy Matuschak. All rights reserved.
|
||||
//
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SUInstallerProtocol.h"
|
||||
|
||||
// This is the deprecated package installation type, aka the "interactive" package installer
|
||||
// For a more supported package installation, see SUGuidedPackageInstaller
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUPackageInstaller : NSObject <SUInstallerProtocol>
|
||||
|
||||
- (instancetype)initWithPackagePath:(NSString *)packagePath;
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -1,81 +0,0 @@
|
||||
//
|
||||
// SUPackageInstaller.m
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Andy Matuschak on 4/10/08.
|
||||
// Copyright 2008 Andy Matuschak. All rights reserved.
|
||||
//
|
||||
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
|
||||
#import "SUPackageInstaller.h"
|
||||
#import "SUConstants.h"
|
||||
#import "SUErrors.h"
|
||||
#import "SULog.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@implementation SUPackageInstaller
|
||||
{
|
||||
NSString *_packagePath;
|
||||
}
|
||||
|
||||
static NSString *SUOpenUtilityPath = @"/usr/bin/open";
|
||||
|
||||
- (instancetype)initWithPackagePath:(NSString *)packagePath
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_packagePath = [packagePath copy];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)performInitialInstallation:(NSError * __autoreleasing *)error
|
||||
{
|
||||
if (![[NSFileManager defaultManager] fileExistsAtPath:SUOpenUtilityPath]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUMissingInstallerToolError userInfo:@{ NSLocalizedDescriptionKey: @"Couldn't find Apple's installer tool!" }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (BOOL)performFinalInstallationProgressBlock:(nullable void(^)(double))__unused cb error:(NSError *__autoreleasing*)error
|
||||
{
|
||||
// Run installer using the "open" command to ensure it is launched in front of current application.
|
||||
// -W = wait until the app has quit.
|
||||
// -n = Open another instance if already open.
|
||||
// -b = app bundle identifier
|
||||
NSArray *args = @[@"-W", @"-n", @"-b", @"com.apple.installer", _packagePath];
|
||||
|
||||
// Known bug: if the installation fails or is canceled, Sparkle goes ahead and restarts, thinking everything is fine.
|
||||
@try {
|
||||
NSTask *installer = [NSTask launchedTaskWithLaunchPath:SUOpenUtilityPath arguments:args];
|
||||
[installer waitUntilExit];
|
||||
}
|
||||
@catch (NSException *exception) {
|
||||
SULog(SULogLevelError, @"Error: Failed to launch package installer: %@", exception);
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey: @"Package installer failed to launch." }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
- (void)performCleanup
|
||||
{
|
||||
}
|
||||
|
||||
- (BOOL)canInstallSilently
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
#endif
|
||||
@@ -328,7 +328,7 @@
|
||||
|
||||
NSBundle *bundle = [NSBundle bundleWithPath:_bundlePath];
|
||||
SUHost *updateHost = [[SUHost alloc] initWithBundle:bundle];
|
||||
NSString *updateVersion = [updateHost objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey];
|
||||
NSString *updateVersion = [updateHost objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey ofClass:NSString.class];
|
||||
|
||||
id<SUVersionComparison> comparator = [[SUStandardVersionComparator alloc] init];
|
||||
if (!updateVersion || [comparator compareVersion:hostVersion toVersion:updateVersion] == NSOrderedDescending) {
|
||||
@@ -353,22 +353,16 @@
|
||||
// If the update has a custom update security policy, the same team ID policy may not apply,
|
||||
// so in that case we will also skip performing an atomic swap
|
||||
|
||||
NSURL *mainExecutableURL = NSBundle.mainBundle.executableURL;
|
||||
if (mainExecutableURL == nil) {
|
||||
// This shouldn't happen
|
||||
updateHasCustomUpdateSecurityPolicy = updateHost.hasUpdateSecurityPolicy;
|
||||
if (updateHasCustomUpdateSecurityPolicy) {
|
||||
// We don't handle working around a custom update security policy
|
||||
_canPerformSafeAtomicSwap = NO;
|
||||
} else {
|
||||
updateHasCustomUpdateSecurityPolicy = updateHost.hasUpdateSecurityPolicy;
|
||||
if (updateHasCustomUpdateSecurityPolicy) {
|
||||
// We don't handle working around a custom update security policy
|
||||
_canPerformSafeAtomicSwap = NO;
|
||||
} else {
|
||||
NSString *installerTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:mainExecutableURL];
|
||||
NSString *bundleTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:bundle.bundleURL];
|
||||
|
||||
// If bundleTeamIdentifier is nil, then the update isn't code signed so atomic swap is okay
|
||||
_canPerformSafeAtomicSwap = (bundleTeamIdentifier == nil || (installerTeamIdentifier != nil && [installerTeamIdentifier isEqualToString:bundleTeamIdentifier]));
|
||||
}
|
||||
NSString *installerTeamIdentifier = [SUCodeSigningVerifier teamIdentifierFromMainExecutable];
|
||||
NSString *bundleTeamIdentifier = [SUCodeSigningVerifier teamIdentifierAtURL:bundle.bundleURL];
|
||||
|
||||
// If bundleTeamIdentifier is nil, then the update isn't code signed so atomic swap is okay
|
||||
_canPerformSafeAtomicSwap = (bundleTeamIdentifier == nil || (installerTeamIdentifier != nil && [installerTeamIdentifier isEqualToString:bundleTeamIdentifier]));
|
||||
}
|
||||
} else {
|
||||
_canPerformSafeAtomicSwap = YES;
|
||||
@@ -412,9 +406,4 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)canInstallSilently
|
||||
{
|
||||
return YES;
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -24,14 +24,19 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUSignatureVerifier : NSObject
|
||||
|
||||
// Helper for verifying downloaded updates
|
||||
+ (BOOL)validatePath:(NSString *)path withSignatures:(SUSignatures *)signatures withPublicKeys:(SUPublicKeys *)pkeys verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error;
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithPublicKeys:(SUPublicKeys *)pkeys;
|
||||
|
||||
// Used for verifying downloaded updates
|
||||
- (BOOL)verifyFileAtPath:(NSString *)path signatures:(SUSignatures *)signatures verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error;
|
||||
|
||||
// Used for verifying non-update data (like release notes)
|
||||
- (BOOL)verifyData:(NSData *)data signatures:(SUSignatures *)signatures fileKind:(NSString *)fileKind verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -34,14 +34,6 @@
|
||||
+ (BOOL)validatePath:(NSString *)path withSignatures:(SUSignatures *)signatures withPublicKeys:(SUPublicKeys *)pkeys verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
SUSignatureVerifier *verifier = [(SUSignatureVerifier *)[self alloc] initWithPublicKeys:pkeys];
|
||||
|
||||
if (verifier == nil) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Failed to create SUSignatureVerifier instance" }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return [verifier verifyFileAtPath:path signatures:signatures verifierInformation:verifierInformation error:error];
|
||||
}
|
||||
|
||||
@@ -94,16 +86,45 @@
|
||||
|
||||
- (BOOL)verifyFileAtPath:(NSString *)path signatures:(SUSignatures *)signatures verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
if (!path || !path.length) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"Path passed to verify has zero length and is not valid" }];
|
||||
// Data is used only in the case where ed25519 signature is present
|
||||
NSData *data;
|
||||
if (signatures.ed25519SignatureStatus != SUSigningInputStatusPresent) {
|
||||
data = nil;
|
||||
} else {
|
||||
NSError *dataError = nil;
|
||||
data = [NSData dataWithContentsOfFile:path options:NSDataReadingMappedIfSafe error:&dataError];
|
||||
|
||||
if (data == nil || data.length == 0) {
|
||||
SULog(SULogLevelError, @"Failed to load file %@: %@", path, dataError);
|
||||
|
||||
if (error != NULL) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"Failed to load file: %@", path];
|
||||
if (dataError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = dataError;
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:[userInfo copy]];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
return [self verifyData:data signatures:signatures fileKind:@"update" fromPath:path verifierInformation:verifierInformation error:error];
|
||||
}
|
||||
|
||||
- (BOOL)verifyData:(NSData *)data signatures:(SUSignatures *)signatures fileKind:(NSString *)fileKind verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
return [self verifyData:data signatures:signatures fileKind:fileKind fromPath:nil verifierInformation:verifierInformation error:error];
|
||||
}
|
||||
|
||||
// Note the path must be provided for verifying update archives
|
||||
- (BOOL)verifyData:(NSData * _Nullable)data signatures:(SUSignatures *)signatures fileKind:(NSString *)fileKind fromPath:(NSString * _Nullable)path verifierInformation:(SPUVerifierInformation * _Nullable)verifierInformation error:(NSError * __autoreleasing *)error SPU_OBJC_DIRECT
|
||||
{
|
||||
if (!signatures) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"No signatures given to verifyFileAtPath" }];
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"No signatures given to verify data for %@", fileKind] }];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
@@ -111,12 +132,12 @@
|
||||
switch (_pubKeys.ed25519PubKeyStatus) {
|
||||
case SUSigningInputStatusAbsent:
|
||||
if (signatures.ed25519SignatureStatus != SUSigningInputStatusAbsent) {
|
||||
SULog(SULogLevelDefault, @"The update has an EdDSA signature, but it won't be used, because the old app doesn't have an EdDSA public key");
|
||||
SULog(SULogLevelDefault, @"The %@ has an EdDSA signature, but it won't be used, because the old app doesn't have an EdDSA public key", fileKind);
|
||||
}
|
||||
break;
|
||||
case SUSigningInputStatusInvalid:
|
||||
if (signatures.ed25519SignatureStatus != SUSigningInputStatusAbsent) {
|
||||
NSString *message = @"The update has an EdDSA signature, but the app has an invalid EdDSA public key, so the update will automatically be rejected.";
|
||||
NSString *message = [NSString stringWithFormat:@"The %@ has an EdDSA signature, but the app has an invalid EdDSA public key, so the %@ will automatically be rejected.", fileKind, fileKind];
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
if (error != NULL) {
|
||||
@@ -125,12 +146,12 @@
|
||||
|
||||
return NO;
|
||||
}
|
||||
SULog(SULogLevelDefault, @"The app has an invalid EdDSA public key, but there is no EdDSA signature in the update. Falling back to DSA.");
|
||||
SULog(SULogLevelDefault, @"The app has an invalid EdDSA public key, but there is no EdDSA signature in the %@. Falling back to DSA.", fileKind);
|
||||
break;
|
||||
case SUSigningInputStatusPresent:
|
||||
switch (signatures.ed25519SignatureStatus) {
|
||||
case SUSigningInputStatusAbsent: {
|
||||
NSString *message = @"The app has an EdDSA public key, but there is no EdDSA signature in the update, so the update will be rejected.";
|
||||
NSString *message = [NSString stringWithFormat:@"The app has an EdDSA public key, but there is no EdDSA signature in the %@, so the %@ will be rejected.", fileKind, fileKind];
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
if (error != NULL) {
|
||||
@@ -140,7 +161,7 @@
|
||||
return NO;
|
||||
}
|
||||
case SUSigningInputStatusInvalid: {
|
||||
NSString *message = @"The update has an EdDSA signature, but it's invalid, so the update will automatically be rejected.";
|
||||
NSString *message = [NSString stringWithFormat:@"The %@ has an EdDSA signature, but it's invalid, so the %@ will automatically be rejected.", fileKind, fileKind];
|
||||
|
||||
SULog(SULogLevelError, @"%@", message);
|
||||
|
||||
@@ -150,25 +171,9 @@
|
||||
return NO;
|
||||
}
|
||||
case SUSigningInputStatusPresent: {
|
||||
NSError *dataError = nil;
|
||||
NSData *data = [NSData dataWithContentsOfFile:path options:NSDataReadingMappedAlways error:&dataError];
|
||||
if (!data || !data.length) {
|
||||
SULog(SULogLevelError, @"Failed to load file %@: %@", path, dataError);
|
||||
|
||||
if (error != NULL) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionary];
|
||||
userInfo[NSLocalizedDescriptionKey] = [NSString stringWithFormat:@"Failed to load file: %@", path];
|
||||
if (dataError != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = dataError;
|
||||
}
|
||||
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:[userInfo copy]];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
assert(data != nil);
|
||||
if (ed25519_verify(signatures.ed25519Signature, data.bytes, data.length, _pubKeys.ed25519PubKey)) {
|
||||
SULog(SULogLevelDefault, @"OK: EdDSA signature is correct");
|
||||
SULog(SULogLevelDefault, @"OK: EdDSA signature is correct for %@", fileKind);
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
// No need to check DSA when EdDSA verification succeeded, unless a DSA signature is provided and it's
|
||||
// erroneously invalid
|
||||
@@ -178,34 +183,38 @@
|
||||
return YES;
|
||||
}
|
||||
} else {
|
||||
NSMutableString *message = [NSMutableString stringWithString:@"EdDSA signature does not match. Data of the update file being checked is different than data that has been signed, or the public key and the private key are not from the same set."];
|
||||
NSMutableString *message = [NSMutableString stringWithFormat:@"EdDSA signature does not match. Data of the %@ being checked is different than data that has been signed, or the public key and the private key are not from the same set.", fileKind];
|
||||
|
||||
// Elaborate on the error message if we have more information about the download archive
|
||||
// If there is verifierInformation it must be for a downloaded update (rather than feed or release notes)
|
||||
if (verifierInformation != nil) {
|
||||
BOOL reportedDiscrepancy = NO;
|
||||
|
||||
NSString *downloadedFileDescription = (path != nil) ? [NSString stringWithFormat:@"%@ (%@)", fileKind, path.lastPathComponent] : fileKind;
|
||||
|
||||
if (verifierInformation.expectedContentLength > 0 && verifierInformation.actualContentLength > 0) {
|
||||
if (verifierInformation.expectedContentLength != verifierInformation.actualContentLength) {
|
||||
[message appendFormat:@" The downloaded update (%@) is likely different than the signed archive because the expected content length from the appcast item (%llu bytes) differs from the downloaded archive length (%llu bytes).", path.lastPathComponent, verifierInformation.expectedContentLength, verifierInformation.actualContentLength];
|
||||
[message appendFormat:@" The downloaded %@ is likely different than the signed file because the expected content length from the appcast item (%llu bytes) differs from the downloaded file length (%llu bytes).", downloadedFileDescription, verifierInformation.expectedContentLength, verifierInformation.actualContentLength];
|
||||
reportedDiscrepancy = YES;
|
||||
}
|
||||
}
|
||||
|
||||
NSString *actualVersion = verifierInformation.actualVersion;
|
||||
if (actualVersion != nil && ![verifierInformation.expectedVersion isEqualToString:actualVersion]) {
|
||||
[message appendFormat:@" The downloaded update (%@) also has a CFBundleVersion (%@) which differs from the %@ in the appcast item (%@).", path.lastPathComponent, actualVersion, SUAppcastAttributeVersion, verifierInformation.expectedVersion];
|
||||
[message appendFormat:@" The downloaded %@ also has a CFBundleVersion (%@) which differs from the %@ in the appcast item (%@).", downloadedFileDescription, actualVersion, SUAppcastAttributeVersion, verifierInformation.expectedVersion];
|
||||
reportedDiscrepancy = YES;
|
||||
}
|
||||
|
||||
if (!reportedDiscrepancy && verifierInformation.expectedContentLength > 0) {
|
||||
[message appendFormat:@" The downloaded update (%@) is likely not signed correctly because the archive has the expected content length (%llu bytes)%@ which matches the appcast item.", path.lastPathComponent, verifierInformation.actualContentLength, (actualVersion == nil ? @"" : [NSString stringWithFormat:@" and CFBundleVersion (%@)", actualVersion])];
|
||||
[message appendFormat:@" The downloaded %@ is likely not signed correctly because the file has the expected content length (%llu bytes)%@ which matches the appcast item.", downloadedFileDescription, verifierInformation.actualContentLength, (actualVersion == nil ? @"" : [NSString stringWithFormat:@" and CFBundleVersion (%@)", actualVersion])];
|
||||
}
|
||||
}
|
||||
|
||||
SULog(SULogLevelError, @"%@", [message copy]);
|
||||
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
|
||||
// Legacy DSA verification is only applicable if archive file path is provided
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent && path != nil) {
|
||||
SULog(SULogLevelDefault, @"DSA signature won't be checked, because EdDSA verification has already failed");
|
||||
}
|
||||
#endif
|
||||
@@ -222,14 +231,15 @@
|
||||
}
|
||||
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
// Legacy DSA verification is only for downloaded updates
|
||||
switch (_pubKeys.dsaPubKeyStatus) {
|
||||
case SUSigningInputStatusAbsent:
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent && path != nil) {
|
||||
SULog(SULogLevelDefault, @"The update has a DSA signature, but it can't be used, because the old app doesn't have a DSA public key");
|
||||
}
|
||||
break;
|
||||
case SUSigningInputStatusInvalid:
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent) {
|
||||
if (signatures.dsaSignatureStatus != SUSigningInputStatusAbsent && path != nil) {
|
||||
// We will have already logged an error for this failure when the public key was read in, so just do an informational log here.
|
||||
NSString *message = @"The update has a DSA signature, but the app has an invalid DSA public key, so the update will automatically be rejected.";
|
||||
|
||||
@@ -260,7 +270,7 @@
|
||||
return NO;
|
||||
}
|
||||
case SUSigningInputStatusPresent: {
|
||||
NSInputStream *dataInputStream = [NSInputStream inputStreamWithFileAtPath:path];
|
||||
NSInputStream *dataInputStream = (path != nil) ? [NSInputStream inputStreamWithFileAtPath:(NSString * _Nonnull)path] : nil;
|
||||
return [self verifyDSASignatureOfStream:dataInputStream dsaSignature:signatures.dsaSignature error:error];
|
||||
}
|
||||
}
|
||||
@@ -283,7 +293,7 @@
|
||||
|
||||
if (error != NULL) {
|
||||
// Use generic failure
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: @"EdDSA and DSA verification for the update has failed" }];
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUValidationError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"EdDSA and DSA verification for the %@ has failed", fileKind] }];
|
||||
}
|
||||
|
||||
return NO;
|
||||
|
||||
@@ -1,3 +1,58 @@
|
||||
# 2.9.0
|
||||
|
||||
* Add basic markdown support for release notes (requires macOS 12+) including [customizing its presentation](https://sparkle-project.org/documentation/publishing#adapting-markdown-or-plain-text-release-notes) (#2810, #2817) (Zorg)
|
||||
* Add support for [signing and verifying appcast feeds](https://sparkle-project.org/documentation#signing-feeds-optional) (#2822, #2828) (Zorg)
|
||||
* Add [sparkle:hardwareRequirements](https://sparkle-project.org/documentation/publishing#minimum-system-version-requirements) for enforcing an Apple silicon (arm64) requirement (#2797) (Zorg)
|
||||
* Add [sparkle:minimumUpdateVersion](https://sparkle-project.org/documentation/publishing/#upgrading-to-newer-features) for specifying a minimum version an app needs to be on before upgrading (#2811) (Zorg)
|
||||
* Add API annotations for Swift concurrency (#2827) (Zorg)
|
||||
* Validate Obj-C class when reading objects from user defaults / Info plists (#2782) (Zorg)
|
||||
* Download temporary files in-memory using NSURLSessionDataTask (#2825) (Zorg)
|
||||
* Allow [impatient update check interval](https://sparkle-project.org/documentation/customization/) to be configured for updates that are downloaded automatically (#2799) (Zorg)
|
||||
* Add `allowsAutomaticUpdates` property to determine if automatic downloading/installing of updates option should be enabled (#2809) (Zorg)
|
||||
* Add Vietnamese translation (#2816) (TranPhuong319)
|
||||
* Add missing nn language to Installer progress Info.plist (#2818) (Zorg)
|
||||
* Find non-canonical Sparkle.framework locations in generate_appcast when creating delta updates to determine compatibility (#2833) (Zorg)
|
||||
* Make Debug builds of Sparkle use same time interval settings as Release (#2805) (Zorg)
|
||||
* Remove sparkle-cli from the binary distribution (#2826) (Zorg)
|
||||
|
||||
# 2.8.1
|
||||
|
||||
* Enforce RunAtLoad to reduce potential timeout issue when launching updater task (#2795) (Zorg)
|
||||
* Add missing executable bit permission warnings on connection failure (#2792) (Zorg)
|
||||
* Add missing localizations to zh-CN & zh-TW (#2789, #2791) (Francis Feng)
|
||||
* Add documentation note for delegates being weakly referenced (#2802) (Zorg)
|
||||
* Include app name in startUpdater: failure in SPUStandardUpdaterController (#2780) (Zorg)
|
||||
|
||||
# 2.8.0
|
||||
|
||||
* UI modernization and macOS Tahoe support
|
||||
* Modernize update alert and release notes UI (#2737) (Zorg, Noah Nuebling, Cykelero, Daniel Jalkut, Peter Nowell)
|
||||
* Update retrieving app icon to work better in Tahoe (#2742) (Zorg)
|
||||
* Improve retrieval of main app icon for authorization dialog (#2743) (Zorg)
|
||||
* Delta updates
|
||||
* Improve bsdiff performance by preventing excessive iterations when processing similar data blocks (#2693) (Will Fairclough)
|
||||
* Fix an issue while searching a cloneable file for delta updates (#2748, #2753) (Vincent Bénony, Zorg)
|
||||
* Add support for relative URLs for delta updates (#2741) (jj)
|
||||
* Localization
|
||||
* Set STRINGS_FILE_OUTPUT_ENCODING build setting to "binary" (#2712) (Nicolas Kick)
|
||||
* Move all localizations to main Sparkle.strings (#2760) (Zorg)
|
||||
* Synchronize updater settings with user defaults to fix out-of-sync UI state (#2728) (Zorg)
|
||||
* Document and better enforce main thread only requirement for using Sparkle methods (#2746, #2754, #2768)) (Sebastien Marchand, Zorg)
|
||||
* Make -[SPUUserDriver showUpdateInFocus] optional (#2717) (Zorg)
|
||||
* Add private module map for framework (#2722) (Zorg)
|
||||
* Workaround a corner case in which the bundle path of a running application contains Contents/MacOS/Executable (#2726, #2747) (Jeremy Huddleston Sequoia, Zorg)
|
||||
* Disable false dependency scan analysis warnings when building Sparkle from source (#2762) (Daniel Jalkut)
|
||||
* Refactor the logic for avoiding re-sending the system profile more frequently than once a week (#2720) (Daniel Jalkut)
|
||||
* Remove deprecated interactive package installer type (#2767) (Zorg)
|
||||
|
||||
# 2.7.3
|
||||
|
||||
* Double quote team identifiers in requirement strings to fix crash if Team ID starts with number (#2766) (Zorg)
|
||||
|
||||
# 2.7.2
|
||||
|
||||
* Harden policy on what operations clients are allowed to take (#2763) (Zorg)
|
||||
|
||||
# 2.7.1
|
||||
|
||||
* Fix typo in NN localisation (#2694) (Sjur N Moshagen)
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz"}
|
||||
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
|
||||
@@ -93,13 +93,13 @@ SPARKLE_ICON_NAME = AppIcon
|
||||
// If you change any of these version details, you must increase CURRENT_PROJECT_VERSION
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_MAJOR = 2
|
||||
SPARKLE_VERSION_MINOR = 7
|
||||
SPARKLE_VERSION_PATCH = 1
|
||||
SPARKLE_VERSION_MINOR = 9
|
||||
SPARKLE_VERSION_PATCH = 0
|
||||
|
||||
// This should be in SemVer format or empty, ie. "-beta.1"
|
||||
// These variables must have a space after the '=' too
|
||||
SPARKLE_VERSION_SUFFIX =
|
||||
CURRENT_PROJECT_VERSION = 2045
|
||||
SPARKLE_VERSION_SUFFIX = -beta.1
|
||||
CURRENT_PROJECT_VERSION = 2051
|
||||
|
||||
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
|
||||
ALWAYS_SEARCH_USER_PATHS = NO
|
||||
@@ -165,3 +165,6 @@ 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
|
||||
|
||||
// Prevents spurious warnings based on dependency scan considering Sparkle itself a dependency
|
||||
DIAGNOSE_MISSING_TARGET_DEPENDENCIES = NO
|
||||
@@ -18,8 +18,12 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) BUILDING_SPARKLE=1
|
||||
SKIP_INSTALL = YES
|
||||
DEFINES_MODULE = YES
|
||||
PRODUCT_BUNDLE_IDENTIFIER = ${SPARKLE_BUNDLE_IDENTIFIER}
|
||||
STRINGS_FILE_OUTPUT_ENCODING = binary
|
||||
|
||||
// As long as we don't ourselves depend upon any Frameworks that are incompatible
|
||||
// with Application Extensions, then we should allow frameworks that require
|
||||
// compatibility to be able to link with us.
|
||||
APPLICATION_EXTENSION_API_ONLY = YES
|
||||
|
||||
ENABLE_MODULE_VERIFIER = YES
|
||||
MODULEMAP_PRIVATE_FILE = Sparkle/Sparkle.private.modulemap
|
||||
@@ -7,6 +7,7 @@ import os, sys
|
||||
|
||||
hit_first_changelog_note = False
|
||||
with open("CHANGELOG", "r") as changelog_file:
|
||||
sys.stdout.write("Changes:\n\n")
|
||||
for line in changelog_file:
|
||||
if line.startswith("#"):
|
||||
if hit_first_changelog_note:
|
||||
|
||||
@@ -16,7 +16,6 @@ function verify_code_signatures() {
|
||||
find "${verification_directory}" -name "Sparkle.framework" -type d -exec codesign --verify -vvv --deep {} \;
|
||||
|
||||
if [ "$check_aux_apps" = true ] ; then
|
||||
codesign --verify -vvv --deep "${verification_directory}/sparkle.app"
|
||||
codesign --verify -vvv --deep "${verification_directory}/Sparkle Test App.app"
|
||||
fi
|
||||
codesign --verify -vvv --deep "${verification_directory}/bin/BinaryDelta"
|
||||
@@ -42,7 +41,6 @@ if [ "$ACTION" = "" ] ; then
|
||||
cp "$CONFIGURATION_BUILD_DIR/generate_keys" "$CONFIGURATION_BUILD_DIR/staging/bin"
|
||||
cp "$CONFIGURATION_BUILD_DIR/sign_update" "$CONFIGURATION_BUILD_DIR/staging/bin"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app" "$CONFIGURATION_BUILD_DIR/staging"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app" "$CONFIGURATION_BUILD_DIR/staging"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework" "$CONFIGURATION_BUILD_DIR/staging"
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.xcframework" "$CONFIGURATION_BUILD_DIR/staging-spm"
|
||||
|
||||
@@ -61,8 +59,6 @@ if [ "$ACTION" = "" ] ; then
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle Test App.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/sparkle.app.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Sparkle.framework.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
cp -R "$CONFIGURATION_BUILD_DIR/Autoupdate.dSYM" "$CONFIGURATION_BUILD_DIR/staging/Symbols"
|
||||
|
||||
@@ -19,7 +19,6 @@ The launcher then looks for the installer and agent application. If we are insid
|
||||
|
||||
The installer is first submitted. If it requires root privileges, it will ask for an admin user name and password. How it determines if root privileges are necessary is based on:
|
||||
|
||||
* If the installation type from the appcast is an interactive package based installer, then no root privileges are necessary because the package installer will ask for them. Note this type of installation is deprecated however.
|
||||
* If the installation type from the appcast is a guided or regular package based installer, then root privileges are necessary because the system installer utility has to run as root.
|
||||
* Otherwise the installation type is a normal application update, and root privileges are only needed if write permission or changing the owner is currently insufficient.
|
||||
|
||||
@@ -69,17 +68,16 @@ When the installer gets the process identifier, it begins the installation. At t
|
||||
|
||||
### Starting the Installation
|
||||
|
||||
The installer figures out what kind of installer to use (regular, guided pkg, interactive pkg) based on the type of file inside the archive. If the type of file doesn't match the expected installation type from the input installation data, then the installer aborts causing the updater to abort as well.
|
||||
The installer figures out what kind of installer to use (regular, guided pkg) based on the type of file inside the archive. If the type of file doesn't match the expected installation type from the input installation data, then the installer aborts causing the updater to abort as well.
|
||||
|
||||
Once the type of installer is found, the first stage of installation is performed:
|
||||
|
||||
* Regular application installer 1st stage: Makes sure this update is not a downgrade and do all initial installation work if possible (such as clearing quarantine, changing owner/group, updating modification date, invoking GateKeeper scan). This initial work is not done if the bundle has to transfer to another volume; in this case, this work will be done in a later stage.
|
||||
* Guided Package installer 1st stage: Does nothing.
|
||||
* Interactive Package installer (deprecated) 1st stage: Makes sure /usr/bin/open utility is available.
|
||||
|
||||
If the first stage fails, the installer aborts causing the updater to abort the update.
|
||||
|
||||
Otherwise a `SPUInstallationFinishedStage1` message is sent back to the updater along with some data. This data includes whether the application bundle to relaunch is currently terminated, and whether the installation at later stages can be performed silently (that is, with no user interaction allowed). If we reach here, only the interactive package installer can't be performed silently.
|
||||
Otherwise a `SPUInstallationFinishedStage1` message is sent back to the updater along with some data. This data includes whether the application bundle to relaunch is currently terminated, and whether the installation at later stages can be performed silently (that is, with no user interaction allowed). If we reach here, only the interactive package installer can't be performed silently (however interactive pkg installer is no longer supported).
|
||||
|
||||
The installer then listens and waits for the target application to relaunch terminates. If it is already terminated, then it resumes to stage 2 and 3 of the installation immediately on the assumption that the installer does not have permission to show UI interaction to the user. Thus if the installer has to show user interaction here and hasn't received an OK from the updater (it won't if the target application is already terminated), the install will fail. If the target is already terminated, the installer will also assume that the target should not be relaunched after installation.
|
||||
|
||||
@@ -99,7 +97,7 @@ Afterwards the resumed update driver then allows the user driver to decide wheth
|
||||
### Continue to Installation
|
||||
If the user driver decides to install the update, it sends a `SPUResumeInstallationToStage2` message to the installer and supplies whether the update should be relaunched, and whether user interface can be displayed. The user driver specifies that the user interface can be displayed as long as the updater delegate allows interaction. If the updater's delegate handles immediate installation in the automatic based update driver, UI cannot be displayed there too.
|
||||
|
||||
The installer receives `SPUResumeInstallationToStage2` and reads whether it should relaunch the target application and whether it can show UI (thus be allowed to show user interaction). The installer then resumes to stage 2 of the installation if it has not been performed already (that is if the target app already terminated). Note if the installer doesn't receive this message before the target application terminates, then the installer will not relaunch or show UI and resume stage 2 & 3 by itself. Again not displaying UI is only an issue for interactive based package installers which are deprecated.
|
||||
The installer receives `SPUResumeInstallationToStage2` and reads whether it should relaunch the target application and whether it can show UI (thus be allowed to show user interaction). The installer then resumes to stage 2 of the installation if it has not been performed already (that is if the target app already terminated). Note if the installer doesn't receive this message before the target application terminates, then the installer will not relaunch or show UI and resume stage 2 & 3 by itself. Again not displaying UI is only an issue for interactive based package installers which are no longer supported.
|
||||
|
||||
If the 2nd stage succeeds, the installer sends a `SPUInstallationFinishedStage2` message back to the updater, including if the target application has already terminated at this time. If the target application has not already been terminated, the installer sends a request to the progress agent to *terminate* the application. By *terminate*, we mean sending an Apple quit event, allowing the application or user to possibly cancel or delay termination.
|
||||
|
||||
@@ -109,7 +107,7 @@ In the case termination of the application is delayed or canceled, the user driv
|
||||
|
||||
### Showing Progress
|
||||
|
||||
When the target application is terminated, if the updater allowed the installer to show UI progress and the installation type doesn't show progress on its own (only interactive package installer shows progress on its own), then the installer sends a `SPUUpdaterAlivePing` message to the updater. If the updater is still alive by now and receives the message, the updater will then send back a `SPUUpdaterAlivePong` message. This lets the installer know that the updater is still active after the target application is terminated, and whether the installer should later be responsible for displaying updater progress or not if a short time passes by, and the installation is still not finished. If the updater is still not alive, then the installer should be responsible for showing progress if otherwise allowed.
|
||||
When the target application is terminated, if the updater allowed the installer to show UI progress and the installation type doesn't show progress on its own (only interactive package installer shows progress on its own, but these are no longer supported), then the installer sends a `SPUUpdaterAlivePing` message to the updater. If the updater is still alive by now and receives the message, the updater will then send back a `SPUUpdaterAlivePong` message. This lets the installer know that the updater is still active after the target application is terminated, and whether the installer should later be responsible for displaying updater progress or not if a short time passes by, and the installation is still not finished. If the updater is still not alive, then the installer should be responsible for showing progress if otherwise allowed.
|
||||
|
||||
If the installer decides to show progress, it sends a message to the progress agent to show progress UI. Under most circumstances, the installation will finish faster than this point is reached however (exceptions may be guided package installers and updates over a remote network mount). If the connection to the updater is still connected after this short time passes (eg: like with sparkle-cli), then it's the updater's job to show progress instead.
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@ Sparkle 2.0 puts a huge emphasis on splitting Sparkle into several components to
|
||||
* Progress Agent (Application; AppKit permitted)
|
||||
* Installer (Agent and Daemon safe)
|
||||
|
||||
These achieve privilege separation, because at least theoretically, they can all be placed into different processes from one another, although in practice the user driver and updater framework will likely be in the same process.
|
||||
These achieve privilege separation, because at least theoretically, they can all be placed into different processes from one another (except for the user driver & updater scheduler).
|
||||
|
||||
For XPC Services, it's significant to understand they can be used independent of sandboxing (although I wouldn't recommend this personally). Besides privilege separation, they also have an impact on fault tolerance and termination.
|
||||
For XPC Services, it's significant to understand they can be used independent of sandboxing (but this is strongly discouraged). Besides privilege separation, they also have an impact on fault tolerance and termination.
|
||||
|
||||
We have code that detects whether or not XPC services are available and enabled by the main application bundle. This is simpler and more efficient than attempting to create a connection and wait for a timeout. We don't have *any* checks for seeing if the "current process" is sandboxed; doing so is a rather broken behavior. The XPC Services are important, not the sandboxing.
|
||||
We have code that detects whether or not XPC services are available and enabled by the main application bundle. This is simpler and more efficient than attempting to create a connection and wait for a timeout. We don't have *any* checks for seeing if the "current process" is sandboxed; doing so is a rather brittle. The XPC Services are important, not the sandboxing.
|
||||
|
||||
I said above that XPC services are looked up in the main bundle. One may think this assumption doesn't hold for helpers or plug-ins inside applications. My response to that is they probably don't need the services, and they probably shouldn't be injecting Sparkle inside the host application anyway due to unintended conflicts and other consequences. A more appropriate approach may be to bundle a separate tool such as the sparkle command line utility.
|
||||
|
||||
@@ -33,3 +33,6 @@ For sending Obj-C objects across the wire, we use `SPUSecureCoding` because Coco
|
||||
The installer handles extraction, validation, and installation of the update. This was the main reason why other sandboxed-capable forks were rejected from being secure. The point to be stressed anyway is that these all need to be done in the same process; they can't be handed off by some other process. This is also why removing references to `AuthorizationExecuteWithPrivileges` is crucial as well.
|
||||
|
||||
Note that the installer does *not* handle downloading. That is handled by the updater framework. This is ideal because downloading can be done without disrupting the user, allowing it to be done silently without presenting an authorization dialog. The downloading portion of code can also be stuck into a XPC service with just an entitlement for allowing incoming connections. This also means for secure installations the installer cannot know (or trust) what protocol the update was downloaded from (i.e: http vs https). A good installer will not care, which is why applying updates without a EdDSA signature/key is now deprecated (reminder that Apple's code signature checks are not intended for complete integrity).
|
||||
|
||||
The XPC Services and Autoupdate, if code signed, also check if the clients are code signed with the same team ID and may reject connections or reject policies if this is not the case. This is a "backup" check because we still do not want endpoints to open up and allow arbitrary operations across different levels of security boundaries, even if apps are not code signed.
|
||||
|
||||
|
Before Width: | Height: | Size: 3.2 MiB |
@@ -29,11 +29,10 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
|
||||
@implementation SPUDownloader
|
||||
{
|
||||
NSURLSessionDownloadTask *_download;
|
||||
NSURLSessionTask *_sessionTask;
|
||||
NSURLSession *_downloadSession;
|
||||
NSString *_bundleIdentifier;
|
||||
NSString *_desiredFilename;
|
||||
NSString *_downloadFilename;
|
||||
|
||||
// Delegate is intentionally strongly referenced; see header
|
||||
id <SPUDownloaderDelegate> _delegate;
|
||||
@@ -55,12 +54,51 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
|
||||
- (void)startDownloadWithRequest:(NSURLRequest *)request SPU_OBJC_DIRECT
|
||||
{
|
||||
if (request == nil) {
|
||||
NSString *message = @"The download request must not be nil";
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Prevent any unwanted URL schemes (e.g. file://)
|
||||
NSString *scheme = request.URL.scheme;
|
||||
if (scheme == nil) {
|
||||
NSString *message = @"The download request scheme must not be nil";
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if ([scheme caseInsensitiveCompare:@"http"] != NSOrderedSame && [scheme caseInsensitiveCompare:@"https"] != NSOrderedSame) {
|
||||
NSString *message = [NSString stringWithFormat:@"The download request URL must use http or https (%@)", request.URL];
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
_downloadSession = [NSURLSession
|
||||
sessionWithConfiguration:[NSURLSessionConfiguration defaultSessionConfiguration]
|
||||
delegate:self
|
||||
delegateQueue:[NSOperationQueue mainQueue]];
|
||||
_download = [_downloadSession downloadTaskWithRequest:request];
|
||||
[_download resume];
|
||||
|
||||
switch (_mode) {
|
||||
case SPUDownloadModePersistent:
|
||||
_sessionTask = [_downloadSession downloadTaskWithRequest:request];
|
||||
break;
|
||||
case SPUDownloadModeTemporary: {
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
_sessionTask = [_downloadSession dataTaskWithRequest:request completionHandler:^(NSData * _Nullable data, NSURLResponse * _Nullable response, NSError * _Nullable error) {
|
||||
[weakSelf temporaryDownloadDidFinishWithData:data response:response error:error];
|
||||
}];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
[_sessionTask resume];
|
||||
}
|
||||
|
||||
// Don't implement dealloc - make the client call cleanup, which is the only way to remove the reference cycle from the delegate anyway
|
||||
@@ -68,7 +106,7 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
- (void)startPersistentDownloadWithRequest:(NSURLRequest *)request bundleIdentifier:(NSString *)bundleIdentifier desiredFilename:(NSString *)desiredFilename
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (self->_download == nil && self->_delegate != nil) {
|
||||
if (self->_sessionTask == nil && self->_delegate != nil) {
|
||||
// Prevent service from automatically terminating while downloading the update asynchronously without any reply blocks
|
||||
[[NSProcessInfo processInfo] disableAutomaticTermination:SUDownloadingReason];
|
||||
self->_disabledAutomaticTermination = YES;
|
||||
@@ -85,7 +123,7 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
- (void)startTemporaryDownloadWithRequest:(NSURLRequest *)request
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (self->_download == nil && self->_delegate != nil) {
|
||||
if (self->_sessionTask == nil && self->_delegate != nil) {
|
||||
// Prevent service from automatically terminating while downloading the update asynchronously without any reply blocks
|
||||
[[NSProcessInfo processInfo] disableAutomaticTermination:SUDownloadingReason];
|
||||
self->_disabledAutomaticTermination = YES;
|
||||
@@ -117,12 +155,14 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
// The downloader instance that creates this temp directory isn't necessarily the same as the one
|
||||
// that clears it (eg upon skipping an already downloaded update), so we can't just preserve it here too
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:bundleIdentifier];
|
||||
if (rootPersistentDownloadCachePath != nil) {
|
||||
NSString *sanitizedDownloadToken = downloadToken.lastPathComponent;
|
||||
NSString *tempDir = [rootPersistentDownloadCachePath stringByAppendingPathComponent:sanitizedDownloadToken];
|
||||
|
||||
[[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL];
|
||||
if (bundleIdentifier != nil && downloadToken != nil) {
|
||||
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:bundleIdentifier];
|
||||
if (rootPersistentDownloadCachePath != nil) {
|
||||
NSString *sanitizedDownloadToken = downloadToken.lastPathComponent;
|
||||
NSString *tempDir = [rootPersistentDownloadCachePath stringByAppendingPathComponent:sanitizedDownloadToken];
|
||||
|
||||
[[NSFileManager defaultManager] removeItemAtPath:tempDir error:NULL];
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -130,17 +170,11 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
- (void)_cleanup SPU_OBJC_DIRECT
|
||||
{
|
||||
[self enableAutomaticTermination];
|
||||
[_download cancel];
|
||||
[_sessionTask cancel];
|
||||
[_downloadSession finishTasksAndInvalidate];
|
||||
_download = nil;
|
||||
_sessionTask = nil;
|
||||
_downloadSession = nil;
|
||||
_delegate = nil;
|
||||
|
||||
if (_mode == SPUDownloadModeTemporary && _downloadFilename != nil)
|
||||
{
|
||||
[[NSFileManager defaultManager] removeItemAtPath:_downloadFilename error:NULL];
|
||||
_downloadFilename = nil;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)cleanup:(void (^)(void))completionHandler
|
||||
@@ -148,80 +182,125 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self _cleanup];
|
||||
|
||||
completionHandler();
|
||||
if (completionHandler != NULL) {
|
||||
completionHandler();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable response, NSURL *url, id<SPUDownloaderDelegate> delegate)
|
||||
{
|
||||
NSInteger statusCode = [response isKindOfClass:[NSHTTPURLResponse class]] ? ((NSHTTPURLResponse *)response).statusCode : 200;
|
||||
|
||||
if ((statusCode < 200) || (statusCode >= 400))
|
||||
{
|
||||
NSString *message = [NSString stringWithFormat:@"A network error occurred while downloading %@. %@ (%ld)", url.absoluteString, [NSHTTPURLResponse localizedStringForStatusCode:statusCode], (long)statusCode];
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
[delegate downloaderDidFailWithError:error];
|
||||
|
||||
return false;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)temporaryDownloadDidFinishWithData:(NSData * _Nullable)data response:(NSURLResponse * _Nullable)response error:(NSError * _Nullable)error SPU_OBJC_DIRECT
|
||||
{
|
||||
if (!SPUValidateStatusCodeAndFailIfInvalid(response, _sessionTask.originalRequest.URL, _delegate)) {
|
||||
return;
|
||||
}
|
||||
|
||||
SPUDownloadData *downloadData = nil;
|
||||
if (data != nil) {
|
||||
NSURL *responseURL = response.URL;
|
||||
if (responseURL == nil) {
|
||||
responseURL = _sessionTask.currentRequest.URL;
|
||||
}
|
||||
if (responseURL == nil) {
|
||||
responseURL = _sessionTask.originalRequest.URL;
|
||||
}
|
||||
assert(responseURL != nil);
|
||||
|
||||
downloadData = [[SPUDownloadData alloc] initWithData:(NSData * _Nonnull)data URL:responseURL textEncodingName:response.textEncodingName MIMEType:response.MIMEType];
|
||||
}
|
||||
|
||||
_sessionTask = nil;
|
||||
|
||||
if (downloadData != nil) {
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:downloadData];
|
||||
} else {
|
||||
NSMutableDictionary *userInfo = [@{NSLocalizedDescriptionKey: @"Failed to download temporary data."} mutableCopy];
|
||||
|
||||
if (error != nil) {
|
||||
userInfo[NSUnderlyingErrorKey] = error;
|
||||
}
|
||||
|
||||
[_delegate downloaderDidFailWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo]];
|
||||
}
|
||||
|
||||
[self _cleanup];
|
||||
}
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
|
||||
{
|
||||
NSInteger statusCode = [downloadTask.response isKindOfClass:[NSHTTPURLResponse class]] ? ((NSHTTPURLResponse *)downloadTask.response).statusCode : 200;
|
||||
if ((statusCode < 200) || (statusCode >= 400))
|
||||
{
|
||||
NSString *message = [NSString stringWithFormat:@"A network error occurred while downloading %@. %@ (%ld)", downloadTask.originalRequest.URL.absoluteString, [NSHTTPURLResponse localizedStringForStatusCode:statusCode], (long)statusCode];
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: message }];
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
if (!SPUValidateStatusCodeAndFailIfInvalid(downloadTask.response, downloadTask.originalRequest.URL, _delegate)) {
|
||||
return;
|
||||
}
|
||||
else if (_mode == SPUDownloadModeTemporary)
|
||||
{
|
||||
_downloadFilename = location.path;
|
||||
[self downloadDidFinish]; // file is already in a system temp dir
|
||||
}
|
||||
else
|
||||
{
|
||||
// Remove our old caches path so we don't start accumulating files in there
|
||||
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:_bundleIdentifier];
|
||||
|
||||
// Remove our old caches path so we don't start accumulating files in there
|
||||
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:_bundleIdentifier];
|
||||
|
||||
[SPULocalCacheDirectory removeOldItemsInDirectory:rootPersistentDownloadCachePath];
|
||||
[SPULocalCacheDirectory removeOldItemsInDirectory:rootPersistentDownloadCachePath];
|
||||
|
||||
NSString *tempDir = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootPersistentDownloadCachePath];
|
||||
if (tempDir == nil)
|
||||
{
|
||||
// Okay, something's really broken with this user's file structure.
|
||||
[_sessionTask cancel];
|
||||
_sessionTask = nil;
|
||||
|
||||
NSString *tempDir = [SPULocalCacheDirectory createUniqueDirectoryInDirectory:rootPersistentDownloadCachePath];
|
||||
if (tempDir == nil)
|
||||
{
|
||||
// Okay, something's really broken with this user's file structure.
|
||||
[_download cancel];
|
||||
_download = nil;
|
||||
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a temporary directory for the update download at %@.", tempDir] }];
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a temporary directory for the update download at %@.", tempDir] }];
|
||||
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
} else {
|
||||
NSString *downloadFileName = _desiredFilename;
|
||||
NSString *downloadFileNameDirectory = [tempDir stringByAppendingPathComponent:downloadFileName];
|
||||
|
||||
NSError *createError = nil;
|
||||
if (![[NSFileManager defaultManager] createDirectoryAtPath:downloadFileNameDirectory withIntermediateDirectories:NO attributes:nil error:&createError]) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a download file name %@ directory inside temporary directory for the update download at %@.", downloadFileName, downloadFileNameDirectory] }];
|
||||
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
} else {
|
||||
NSString *downloadFileName = _desiredFilename;
|
||||
NSString *downloadFileNameDirectory = [tempDir stringByAppendingPathComponent:downloadFileName];
|
||||
|
||||
NSError *createError = nil;
|
||||
if (![[NSFileManager defaultManager] createDirectoryAtPath:downloadFileNameDirectory withIntermediateDirectories:NO attributes:nil error:&createError]) {
|
||||
NSError *error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUTemporaryDirectoryError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Can't make a download file name %@ directory inside temporary directory for the update download at %@.", downloadFileName, downloadFileNameDirectory] }];
|
||||
NSString *name = _sessionTask.response.suggestedFilename;
|
||||
if (!name) {
|
||||
name = location.lastPathComponent; // This likely contains nothing useful to identify the file (e.g. CFNetworkDownload_87LVIz.tmp)
|
||||
}
|
||||
NSString *toPath = [downloadFileNameDirectory stringByAppendingPathComponent:name];
|
||||
NSString *fromPath = location.path; // suppress moveItemAtPath: non-null warning
|
||||
NSError *error = nil;
|
||||
if ([[NSFileManager defaultManager] moveItemAtPath:fromPath toPath:toPath error:&error]) {
|
||||
// Create a bookmark for the download
|
||||
// Don't pass any options (we don't want a persistent security scoped bookmark)
|
||||
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
} else {
|
||||
NSString *name = _download.response.suggestedFilename;
|
||||
if (!name) {
|
||||
name = location.lastPathComponent; // This likely contains nothing useful to identify the file (e.g. CFNetworkDownload_87LVIz.tmp)
|
||||
}
|
||||
NSString *toPath = [downloadFileNameDirectory stringByAppendingPathComponent:name];
|
||||
NSString *fromPath = location.path; // suppress moveItemAtPath: non-null warning
|
||||
NSError *error = nil;
|
||||
if ([[NSFileManager defaultManager] moveItemAtPath:fromPath toPath:toPath error:&error]) {
|
||||
_downloadFilename = toPath;
|
||||
|
||||
// Create a bookmark for the download
|
||||
// Don't pass any options (we don't want a persistent security scoped bookmark)
|
||||
|
||||
NSURL *downloadURL = [NSURL fileURLWithPath:toPath isDirectory:NO];
|
||||
|
||||
NSError *bookmarkError = nil;
|
||||
NSData *bookmarkData = [downloadURL bookmarkDataWithOptions:0 includingResourceValuesForKeys:@[] relativeToURL:nil error:&bookmarkError];
|
||||
if (bookmarkData == nil) {
|
||||
[_delegate downloaderDidFailWithError:bookmarkError];
|
||||
} else {
|
||||
// The download token may be provided later to the downloader for removing a download
|
||||
// and its temporary directory
|
||||
NSString *downloadToken = tempDir.lastPathComponent;
|
||||
[_delegate downloaderDidSetDownloadBookmarkData:bookmarkData downloadToken:downloadToken];
|
||||
[self downloadDidFinish];
|
||||
}
|
||||
NSURL *downloadURL = [NSURL fileURLWithPath:toPath isDirectory:NO];
|
||||
|
||||
NSError *bookmarkError = nil;
|
||||
NSData *bookmarkData = [downloadURL bookmarkDataWithOptions:0 includingResourceValuesForKeys:@[] relativeToURL:nil error:&bookmarkError];
|
||||
if (bookmarkData == nil) {
|
||||
[_delegate downloaderDidFailWithError:bookmarkError];
|
||||
} else {
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
// The download token may be provided later to the downloader for removing a download
|
||||
// and its temporary directory
|
||||
NSString *downloadToken = tempDir.lastPathComponent;
|
||||
[_delegate downloaderDidSetDownloadBookmarkData:bookmarkData downloadToken:downloadToken];
|
||||
|
||||
_sessionTask = nil;
|
||||
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:nil];
|
||||
}
|
||||
} else {
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -229,67 +308,26 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)__unused downloadTask didWriteData:(int64_t)bytesWritten totalBytesWritten:(int64_t)__unused totalBytesWritten totalBytesExpectedToWrite:(int64_t)totalBytesExpectedToWrite
|
||||
{
|
||||
|
||||
if (_mode == SPUDownloadModePersistent && totalBytesExpectedToWrite > 0 && !_receivedExpectedBytes) {
|
||||
if (_mode != SPUDownloadModePersistent) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (totalBytesExpectedToWrite > 0 && !_receivedExpectedBytes) {
|
||||
_receivedExpectedBytes = YES;
|
||||
[_delegate downloaderDidReceiveExpectedContentLength:totalBytesExpectedToWrite];
|
||||
}
|
||||
|
||||
if (_mode == SPUDownloadModePersistent && bytesWritten >= 0) {
|
||||
if (bytesWritten >= 0) {
|
||||
[_delegate downloaderDidReceiveDataOfLength:(uint64_t)bytesWritten];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)downloadDidFinish SPU_OBJC_DIRECT
|
||||
{
|
||||
assert(_downloadFilename != nil);
|
||||
|
||||
SPUDownloadData *downloadData = nil;
|
||||
if (_mode == SPUDownloadModeTemporary) {
|
||||
NSData *data = [NSData dataWithContentsOfFile:_downloadFilename];
|
||||
if (data != nil) {
|
||||
NSURLResponse *response = _download.response;
|
||||
|
||||
NSURL *responseURL = response.URL;
|
||||
if (responseURL == nil) {
|
||||
responseURL = _download.currentRequest.URL;
|
||||
}
|
||||
if (responseURL == nil) {
|
||||
responseURL = _download.originalRequest.URL;
|
||||
}
|
||||
assert(responseURL != nil);
|
||||
|
||||
downloadData = [[SPUDownloadData alloc] initWithData:data URL:responseURL textEncodingName:response.textEncodingName MIMEType:response.MIMEType];
|
||||
}
|
||||
}
|
||||
|
||||
_download = nil;
|
||||
|
||||
switch (_mode) {
|
||||
case SPUDownloadModeTemporary:
|
||||
if (downloadData != nil) {
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:downloadData];
|
||||
} else {
|
||||
[_delegate downloaderDidFailWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to read temporary downloaded data from %@", _downloadFilename]}]];
|
||||
}
|
||||
|
||||
[self _cleanup];
|
||||
break;
|
||||
case SPUDownloadModePersistent:
|
||||
[_delegate downloaderDidFinishWithTemporaryDownloadData:nil];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
- (void)URLSession:(NSURLSession *)__unused session task:(NSURLSessionTask *)__unused task didCompleteWithError:(NSError *)error
|
||||
{
|
||||
_download = nil;
|
||||
_sessionTask = nil;
|
||||
if (error != nil) {
|
||||
[_delegate downloaderDidFailWithError:error];
|
||||
}
|
||||
}
|
||||
|
||||
// NSURLDownload has a [download:shouldDecodeSourceDataOfMIMEType:] to determine if the data should be decoded.
|
||||
// This does not exist for NSURLSessionDownloadTask and appears unnecessary. Data tasks will decode data, but not download tasks.
|
||||
|
||||
@end
|
||||
@@ -9,6 +9,8 @@
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SPUDownloader.h"
|
||||
#import "SPUDownloaderDelegate.h"
|
||||
#import "SULog.h"
|
||||
#import "SUCodeSigningVerifier.h"
|
||||
|
||||
@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
|
||||
@end
|
||||
@@ -18,6 +20,29 @@
|
||||
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
|
||||
// This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
|
||||
|
||||
// Validate connection of clients to avoid any client from using the service.
|
||||
// Ideally we would also prevent clients connecting that have an outgoing network connection enabled,
|
||||
// but this is not easy to enforce.
|
||||
// This is a policy, not a security critical enforcement.
|
||||
{
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (validationStatus) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
break;
|
||||
case SUValidateConnectionStatusSetNoRequirementSuccess:
|
||||
break;
|
||||
case SUValidateConnectionStatusAPIFailure:
|
||||
case SUValidateConnectionStatusCodeSigningRequirementFailure:
|
||||
case SUValidateConectionNoSupportedValidationMethodFailure:
|
||||
SULog(SULogLevelError, @"Error: Downloader XPC Service is rejecting new connection due to failing validation of XPC connection with status %lu and error: %@", validationStatus, validationError.localizedDescription);
|
||||
|
||||
[newConnection invalidate];
|
||||
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
// Configure the connection.
|
||||
// First, set the interface that the exported object implements.
|
||||
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SPUDownloaderProtocol)];
|
||||
|
||||
@@ -11,17 +11,24 @@
|
||||
#import "SUFileManager.h"
|
||||
#import "SULog.h"
|
||||
#import "SPUMessageTypes.h"
|
||||
#import "SUBundleIcon.h"
|
||||
#import "SPULocalCacheDirectory.h"
|
||||
#import "SPUInstallationType.h"
|
||||
#import "SUHost.h"
|
||||
#import <ImageIO/ImageIO.h>
|
||||
#import <ServiceManagement/ServiceManagement.h>
|
||||
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
|
||||
#import <SystemConfiguration/SystemConfiguration.h>
|
||||
|
||||
// We only fetch bundle icon for Installer Launcher XPC Service
|
||||
#if defined(BUILDING_SPARKLE_SOURCES_EXTERNALLY) && BUILDING_SPARKLE_SOURCES_EXTERNALLY
|
||||
#define FETCH_BUNDLE_ICON_FOR_AUTH 1
|
||||
#else
|
||||
#define FETCH_BUNDLE_ICON_FOR_AUTH 0
|
||||
#endif
|
||||
|
||||
#if FETCH_BUNDLE_ICON_FOR_AUTH
|
||||
#import <AppKit/AppKit.h>
|
||||
#else
|
||||
#include "AppKitPrevention.h"
|
||||
#endif
|
||||
|
||||
@implementation SUInstallerLauncher
|
||||
|
||||
@@ -79,8 +86,7 @@
|
||||
jobDictionary[@"Label"] = label;
|
||||
jobDictionary[@"ProgramArguments"] = arguments;
|
||||
jobDictionary[@"EnableTransactions"] = @NO;
|
||||
jobDictionary[@"KeepAlive"] = @{@"SuccessfulExit" : @NO};
|
||||
jobDictionary[@"RunAtLoad"] = @NO;
|
||||
jobDictionary[@"RunAtLoad"] = @YES;
|
||||
jobDictionary[@"Nice"] = @0;
|
||||
jobDictionary[@"ProcessType"] = @"Interactive";
|
||||
jobDictionary[@"LaunchOnlyOnce"] = @YES;
|
||||
@@ -106,10 +112,8 @@
|
||||
return (submittedJob == true);
|
||||
}
|
||||
|
||||
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory authorizationPrompt:(NSString *)authorizationPrompt inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser SPU_OBJC_DIRECT
|
||||
- (SUInstallerLauncherStatus)submitInstallerAtPath:(NSString *)installerPath withHostBundle:(NSBundle *)hostBundle iconBundlePath:(NSString *)iconBundlePath updaterIdentifier:(NSString *)updaterIdentifier userName:(NSString *)userName homeDirectory:(NSString *)homeDirectory mainBundleName:(NSString *)mainBundleName inSystemDomain:(BOOL)systemDomain rootUser:(BOOL)rootUser SPU_OBJC_DIRECT
|
||||
{
|
||||
SUFileManager *fileManager = [[SUFileManager alloc] init];
|
||||
|
||||
// No need to release the quarantine for this utility
|
||||
// In fact, we shouldn't because the tool may be located at a path we should not be writing too.
|
||||
|
||||
@@ -140,14 +144,25 @@
|
||||
// Using this right rather than using something like kSMRightModifySystemDaemons allows us to present a better worded prompt
|
||||
// Note the right name is cached, so if we want to change the authorization
|
||||
// prompt, we may need to change the right name. I have found no good way around this :|
|
||||
|
||||
SUHost *host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
NSString *hostName = host.name;
|
||||
|
||||
// Figure out the authorization prompt and right name
|
||||
// We create the authorization prompt here so that a bad client cannot pass in a completely arbitrary prompt message
|
||||
// We also forgo localization for this prompt at the moment because with the right name being cached, updating localizations will be undesirable.
|
||||
// Furthermore, we can avoid adding localization files to the Installer XPC Service (if that one is being used).
|
||||
NSString *sparkleAuthTag = @"sparkle2-auth"; // this needs to change if auth wording changes
|
||||
NSString *rightNameString;
|
||||
NSString *authorizationPrompt;
|
||||
if ([hostBundleIdentifier isEqualToString:updaterIdentifier]) {
|
||||
// Application bundle is likely updating itself
|
||||
rightNameString = [NSString stringWithFormat:@"%@.%@", hostBundleIdentifier, sparkleAuthTag];
|
||||
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update.", hostName];
|
||||
} else {
|
||||
// Updater is likely updating a bundle that is not itself
|
||||
rightNameString = [NSString stringWithFormat:@"%@.%@.%@", updaterIdentifier, hostBundleIdentifier, sparkleAuthTag];
|
||||
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update %2$@.", mainBundleName, hostName];
|
||||
}
|
||||
|
||||
const char *rightName = rightNameString.UTF8String;
|
||||
@@ -164,81 +179,68 @@
|
||||
AuthorizationRights rights = { .count = 1, .items = &right };
|
||||
|
||||
AuthorizationFlags flags = (AuthorizationFlags)(kAuthorizationFlagExtendRights | kAuthorizationFlagInteractionAllowed);
|
||||
|
||||
AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
|
||||
AuthorizationEnvironment authorizationEnvironment = {.count = 0, .items = NULL};
|
||||
|
||||
// Find a 32x32 image representation of the icon, and write out a PNG version of it to a temporary location
|
||||
// Then use the icon (if one is available) for the authorization prompt
|
||||
// NSImage is not used because it relies on AppKit
|
||||
NSURL *tempIconDestinationURL = nil;
|
||||
NSURL *iconURL = [SUBundleIcon iconURLForHost:[[SUHost alloc] initWithBundle:hostBundle]];
|
||||
if (iconURL != nil) {
|
||||
CGImageSourceRef imageSource = CGImageSourceCreateWithURL((CFURLRef)iconURL, (CFDictionaryRef)@{});
|
||||
if (imageSource != NULL) {
|
||||
size_t imageCount = CGImageSourceGetCount(imageSource);
|
||||
for (size_t imageIndex = 0; imageIndex < imageCount; imageIndex++) {
|
||||
CFDictionaryRef cfProperties = CGImageSourceCopyPropertiesAtIndex(imageSource, imageIndex, (CFDictionaryRef)@{});
|
||||
NSDictionary *properties = CFBridgingRelease(cfProperties);
|
||||
#if FETCH_BUNDLE_ICON_FOR_AUTH
|
||||
NSString *tempIconDestinationPath = nil;
|
||||
AuthorizationItem iconAuthorizationItem = {.name = kAuthorizationEnvironmentIcon, .valueLength = 0, .value = NULL, .flags = 0};
|
||||
char iconPathBuffer[] = "/tmp/XXXXXX.png";
|
||||
|
||||
// If an icon bundle path is specified, write out a representation of the icon's data to a temporary file.
|
||||
// Then use that image data for the authorization prompt
|
||||
if (iconBundlePath != nil) {
|
||||
NSImage *icon = [[NSWorkspace sharedWorkspace] iconForFile:iconBundlePath];
|
||||
|
||||
// Creating a bitmap representation at a specific size is much cheaper than asking for icon's TIFFRepresentation
|
||||
// On older OS's we must create a 32x32 image otherwise it won't be scaled correctly in the dialog
|
||||
// On newer OS's we can use a slightly higher resolution image
|
||||
NSInteger imageDimensions;
|
||||
if (@available(macOS 10.15, *)) {
|
||||
imageDimensions = 64;
|
||||
} else {
|
||||
imageDimensions = 32;
|
||||
}
|
||||
|
||||
NSBitmapImageRep *iconBitmapRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:NULL pixelsWide:imageDimensions pixelsHigh:imageDimensions bitsPerSample:8 samplesPerPixel:4 hasAlpha:YES isPlanar:NO colorSpaceName:NSCalibratedRGBColorSpace bytesPerRow:0 bitsPerPixel:0];
|
||||
|
||||
[NSGraphicsContext saveGraphicsState];
|
||||
|
||||
NSGraphicsContext.currentContext = [NSGraphicsContext graphicsContextWithBitmapImageRep:iconBitmapRep];
|
||||
[icon drawInRect:NSMakeRect(0, 0, imageDimensions, imageDimensions)];
|
||||
|
||||
[NSGraphicsContext restoreGraphicsState];
|
||||
|
||||
NSData *pngData = [iconBitmapRep representationUsingType:NSBitmapImageFileTypePNG properties:@{}];
|
||||
|
||||
if (pngData != nil) {
|
||||
// Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
|
||||
// a) no spaces in the path (SU/NSFileManager fails here)
|
||||
// b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here) only apply to older systems (eg: macOS 10.8)
|
||||
// The file also needs to be placed in a system readable place such as /tmp
|
||||
// See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
|
||||
int tempIconFile = mkstemps(iconPathBuffer, strlen(".png"));
|
||||
if (tempIconFile == -1) {
|
||||
SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
|
||||
} else {
|
||||
close(tempIconFile);
|
||||
|
||||
NSNumber *pixelWidth = properties[(const NSString *)kCGImagePropertyPixelWidth];
|
||||
NSNumber *pixelHeight = properties[(const NSString *)kCGImagePropertyPixelHeight];
|
||||
tempIconDestinationPath = [[NSFileManager defaultManager] stringWithFileSystemRepresentation:iconPathBuffer length:strlen(iconPathBuffer)];
|
||||
|
||||
// If we don't find a 32x32 image representation, then we don't provide an icon
|
||||
// Don't try to make up with it by eg: converting an image representation to this size
|
||||
// The app developer should be providing the icon representation.
|
||||
// The authorization API may not take other size dimensions.
|
||||
NSNumber *targetDimension = @32;
|
||||
if ([pixelWidth isKindOfClass:[NSNumber class]] && [pixelHeight isKindOfClass:[NSNumber class]] && [pixelWidth isEqualToNumber:targetDimension] && [pixelHeight isEqualToNumber:targetDimension]) {
|
||||
|
||||
// Use /tmp rather than NSTemporaryDirectory() or SUFileManager's temp directory function because we want:
|
||||
// a) no spaces in the path (SU/NSFileManager fails here)
|
||||
// b) short file path that does not exceed a small threshold (NSTemporaryDirectory() fails here)
|
||||
// These limitations only apply to older systems (eg: macOS 10.8)
|
||||
// The file also needs to be placed in a system readable place such as /tmp
|
||||
// See https://github.com/sparkle-project/Sparkle/issues/347#issuecomment-149523848 for more info
|
||||
char pathBuffer[] = "/tmp/XXXXXX.png";
|
||||
int tempIconFile = mkstemps(pathBuffer, strlen(".png"));
|
||||
if (tempIconFile == -1) {
|
||||
SULog(SULogLevelError, @"Failed to open temp icon from path buffer with error: %d", errno);
|
||||
if (tempIconDestinationPath != nil) {
|
||||
if (![pngData writeToFile:tempIconDestinationPath atomically:NO]) {
|
||||
SULog(SULogLevelError, @"Failed to write icon image data to %@", tempIconDestinationPath);
|
||||
} else {
|
||||
close(tempIconFile);
|
||||
iconAuthorizationItem.valueLength = strlen(iconPathBuffer);
|
||||
iconAuthorizationItem.value = iconPathBuffer;
|
||||
|
||||
NSString *path = [[NSString alloc] initWithUTF8String:pathBuffer];
|
||||
tempIconDestinationURL = [NSURL fileURLWithPath:path];
|
||||
|
||||
CGImageDestinationRef imageDestination = NULL;
|
||||
if (@available(macOS 11, *)) {
|
||||
CFStringRef uti = (__bridge CFStringRef)[UTTypePNG identifier];
|
||||
imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, uti, 1, NULL);
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
|
||||
else
|
||||
{
|
||||
imageDestination = CGImageDestinationCreateWithURL((CFURLRef)tempIconDestinationURL, kUTTypePNG, 1, NULL);
|
||||
}
|
||||
#endif
|
||||
if (imageDestination != NULL) {
|
||||
CGImageDestinationAddImageFromSource(imageDestination, imageSource, imageIndex, (CFDictionaryRef)@{});
|
||||
if (CGImageDestinationFinalize(imageDestination)) {
|
||||
iconAuthorizationItem.valueLength = strlen(pathBuffer);
|
||||
iconAuthorizationItem.value = pathBuffer;
|
||||
|
||||
authorizationEnvironment.count = 1;
|
||||
authorizationEnvironment.items = &iconAuthorizationItem;
|
||||
}
|
||||
|
||||
CFRelease(imageDestination);
|
||||
}
|
||||
authorizationEnvironment.count = 1;
|
||||
authorizationEnvironment.items = &iconAuthorizationItem;
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
CFRelease(imageSource);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
// This should prompt up the authorization dialog if necessary
|
||||
OSStatus copyStatus = AuthorizationCopyRights(auth, &rights, &authorizationEnvironment, flags, NULL);
|
||||
@@ -252,9 +254,11 @@
|
||||
}
|
||||
}
|
||||
|
||||
if (tempIconDestinationURL != nil) {
|
||||
[fileManager removeItemAtURL:tempIconDestinationURL error:NULL];
|
||||
#if FETCH_BUNDLE_ICON_FOR_AUTH
|
||||
if (tempIconDestinationPath != nil) {
|
||||
[[NSFileManager defaultManager] removeItemAtPath:tempIconDestinationPath error:NULL];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
Boolean submittedJob = false;
|
||||
@@ -279,7 +283,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary *jobDictionary = @{@"Label" : label, @"ProgramArguments" : arguments, @"EnableTransactions" : @NO, @"KeepAlive" : @{@"SuccessfulExit" : @NO}, @"RunAtLoad" : @NO, @"Nice" : @0, @"ProcessType": @"Interactive", @"LaunchOnlyOnce": @YES, @"MachServices" : @{SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES, SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES}};
|
||||
NSDictionary *jobDictionary = @{@"Label" : label, @"ProgramArguments" : arguments, @"EnableTransactions" : @NO, @"RunAtLoad" : @YES, @"Nice" : @0, @"ProcessType": @"Interactive", @"LaunchOnlyOnce": @YES, @"MachServices" : @{SPUInstallerServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES, SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) : @YES}};
|
||||
|
||||
CFErrorRef submitError = NULL;
|
||||
#pragma clang diagnostic push
|
||||
@@ -388,8 +392,6 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
if ([installationType isEqualToString:SPUInstallationTypeGuidedPackage]) {
|
||||
return YES;
|
||||
} else if ([installationType isEqualToString:SPUInstallationTypeInteractivePackage]) {
|
||||
return NO;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
@@ -402,10 +404,56 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
}
|
||||
}
|
||||
|
||||
// Note: do not pass untrusted information such as paths to the installer and progress agent tools, when we can find them ourselves here
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
|
||||
// Note: do not pass information which can we compute ourselves here, such as paths to the installer and progress agent tools
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath mainBundlePath:(NSString *)mainBundlePath installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler
|
||||
{
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
if (completionHandler == NULL) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve completionHandler (nil)");
|
||||
return;
|
||||
}
|
||||
|
||||
if (hostBundlePath == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve hostBundlePath (nil)");
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mainBundlePath == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve mainBundlePath (nil)");
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
return;
|
||||
}
|
||||
|
||||
NSBundle *mainBundle = [NSBundle bundleWithPath:mainBundlePath];
|
||||
if (mainBundle == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve mainBundle from path: %@", mainBundlePath);
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
return;
|
||||
}
|
||||
|
||||
SUHost *mainBundleHost = [[SUHost alloc] initWithBundle:mainBundle];
|
||||
|
||||
// We use SUHost.name property, so an application
|
||||
// or Sparkle helper application can override its name with SUBundleName key
|
||||
NSString *mainBundleName = mainBundleHost.name;
|
||||
|
||||
// This updaterIdentifier is just used for authorization prompt
|
||||
NSString *updaterIdentifier;
|
||||
NSString *mainBundleIdentifier = mainBundle.bundleIdentifier;
|
||||
if (mainBundleIdentifier != nil) {
|
||||
updaterIdentifier = mainBundleIdentifier;
|
||||
} else {
|
||||
// Should be unlikely
|
||||
updaterIdentifier = mainBundleHost.name;
|
||||
}
|
||||
|
||||
if (installationType == nil) {
|
||||
SULog(SULogLevelError, @"Error: Failed to retrieve installationType (nil)");
|
||||
completionHandler(SUInstallerLauncherFailure, NO);
|
||||
return;
|
||||
}
|
||||
|
||||
// We could do a sort of preflight Authorization test instead of testing if we are running as root,
|
||||
// but I think this is not necessarily a better approach. We have to chown() the launcher cache directory later on,
|
||||
// and that is not necessarily related to a preflight test. It's more related to being ran under a root / different user from the active GUI session
|
||||
@@ -535,7 +583,7 @@ static BOOL SPUUsesSystemDomainForBundlePath(NSString *path, BOOL rootUser
|
||||
return;
|
||||
}
|
||||
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory authorizationPrompt:authorizationPrompt inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
SUInstallerLauncherStatus installerStatus = [self submitInstallerAtPath:installerPath withHostBundle:hostBundle iconBundlePath:mainBundle.bundlePath updaterIdentifier:updaterIdentifier userName:userName homeDirectory:homeDirectory mainBundleName:mainBundleName inSystemDomain:inSystemDomain rootUser:rootUser];
|
||||
|
||||
BOOL submittedProgressTool = NO;
|
||||
if (installerStatus == SUInstallerLauncherSuccess) {
|
||||
|
||||
@@ -11,6 +11,6 @@
|
||||
|
||||
@protocol SUInstallerLauncherProtocol
|
||||
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath updaterIdentifier:(NSString *)updaterBundleIdentifier authorizationPrompt:(NSString *)authorizationPrompt installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
|
||||
- (void)launchInstallerWithHostBundlePath:(NSString *)hostBundlePath mainBundlePath:(NSString *)mainBundlePath installationType:(NSString *)installationType allowingDriverInteraction:(BOOL)allowingDriverInteraction completion:(void (^)(SUInstallerLauncherStatus, BOOL))completionHandler;
|
||||
|
||||
@end
|
||||
@@ -8,6 +8,8 @@
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
#import "SUInstallerLauncher.h"
|
||||
#import "SULog.h"
|
||||
#import "SUCodeSigningVerifier.h"
|
||||
|
||||
@interface ServiceDelegate : NSObject <NSXPCListenerDelegate>
|
||||
@end
|
||||
@@ -17,6 +19,27 @@
|
||||
- (BOOL)listener:(NSXPCListener *)__unused listener shouldAcceptNewConnection:(NSXPCConnection *)newConnection {
|
||||
// This method is where the NSXPCListener configures, accepts, and resumes a new incoming NSXPCConnection.
|
||||
|
||||
// Validate connection of clients to avoid any client from using the service.
|
||||
// This is a policy, not a security critical enforcement.
|
||||
{
|
||||
NSError *validationError = nil;
|
||||
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
|
||||
switch (validationStatus) {
|
||||
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
|
||||
break;
|
||||
case SUValidateConnectionStatusSetNoRequirementSuccess:
|
||||
break;
|
||||
case SUValidateConnectionStatusAPIFailure:
|
||||
case SUValidateConnectionStatusCodeSigningRequirementFailure:
|
||||
case SUValidateConectionNoSupportedValidationMethodFailure:
|
||||
SULog(SULogLevelError, @"Error: Installer XPC Service is rejecting new connection due to failing validation of XPC connection with status %lu and error: %@", validationStatus, validationError.localizedDescription);
|
||||
|
||||
[newConnection invalidate];
|
||||
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
// Configure the connection.
|
||||
// First, set the interface that the exported object implements.
|
||||
newConnection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerLauncherProtocol)];
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
import PackageDescription
|
||||
|
||||
// Version is technically not required here, SPM doesn't check
|
||||
let version = "2.7.1"
|
||||
let version = "2.9.0-beta.1"
|
||||
// Tag is required to point towards the right asset. SPM requires the tag to follow semantic versioning to be able to resolve it.
|
||||
let tag = "2.7.1"
|
||||
let checksum = "3b9d424d79b1f3453cc44d23c3b0105bdff1298f5321aad8722f98b9149d5e95"
|
||||
let tag = "2.9.0-beta.1"
|
||||
let checksum = "e64db73fa9e36cc4cae8b6c2cf53d0aa91743236dbe08e6ae5eb9064500603a9"
|
||||
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
|
||||
|
||||
let package = Package(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
# Sparkle 2   [](https://github.com/Carthage/Carthage) [](https://cocoapods.org/pods/Sparkle)
|
||||
# Sparkle 2 [](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml)  [](https://github.com/Carthage/Carthage) [](https://cocoapods.org/pods/Sparkle)
|
||||
|
||||
Secure and reliable software update framework for macOS.
|
||||
|
||||
<img src="Resources/Screenshot.png" width="732" alt="Sparkle shows familiar update window with release notes">
|
||||
<img src="Resources/Screenshot2.png" width="732" alt="Sparkle shows familiar update window with release notes">
|
||||
|
||||
Sparkle 2 adds support for application sandboxing, custom user interfaces, updating external bundles, and a more modern architecture which includes faster and more reliable installs.
|
||||
|
||||
|
||||
|
After Width: | Height: | Size: 176 KiB |
|
After Width: | Height: | Size: 30 KiB |
@@ -0,0 +1,64 @@
|
||||
{
|
||||
"fill" : {
|
||||
"automatic-gradient" : "srgb:1.00000,1.00000,1.00000,1.00000"
|
||||
},
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"fill-specializations" : [
|
||||
{
|
||||
"value" : {
|
||||
"solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
|
||||
}
|
||||
},
|
||||
{
|
||||
"appearance" : "dark",
|
||||
"value" : {
|
||||
"solid" : "extended-srgb:0.00000,0.47843,1.00000,1.00000"
|
||||
}
|
||||
}
|
||||
],
|
||||
"glass" : true,
|
||||
"hidden" : false,
|
||||
"image-name" : "sparkles.png",
|
||||
"name" : "sparkles",
|
||||
"position" : {
|
||||
"scale" : 1.15,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"glass" : true,
|
||||
"hidden" : false,
|
||||
"image-name" : "circular_arrow.png",
|
||||
"name" : "circular_arrow",
|
||||
"position" : {
|
||||
"scale" : 1.25,
|
||||
"translation-in-points" : [
|
||||
0,
|
||||
0
|
||||
]
|
||||
}
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.5
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : true,
|
||||
"value" : 0.5
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 381 KiB |
|
Before Width: | Height: | Size: 125 KiB |
@@ -1,11 +1,11 @@
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "Sparkle"
|
||||
s.version = "2.7.1"
|
||||
s.version = "2.9.0-beta.1"
|
||||
s.summary = "A software update framework for macOS"
|
||||
s.description = "Sparkle is an easy-to-use software update framework for macOS."
|
||||
s.homepage = "https://sparkle-project.org"
|
||||
s.documentation_url = "https://sparkle-project.org/documentation/"
|
||||
s.screenshot = "https://sparkle-project.org/images/screenshot-noshadow@2x.png"
|
||||
s.screenshot = "https://sparkle-project.org/images/screenshot-noshadow2.png"
|
||||
s.license = {
|
||||
:type => 'MIT',
|
||||
:file => 'LICENSE'
|
||||
|
||||
@@ -37,7 +37,6 @@
|
||||
/* End PBXAggregateTarget section */
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
1420DF50196247F900203BB0 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1420DF4F196247F900203BB0 /* Images.xcassets */; };
|
||||
142E0E0019A6954400E4312B /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||
142E0E0219A6A14700E4312B /* Sparkle.framework in Copy Files */ = {isa = PBXBuildFile; fileRef = 8DC2EF5B0486A6940098B216 /* Sparkle.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
|
||||
142E0E0919A83AAC00E4312B /* SUBinaryDeltaTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */; };
|
||||
@@ -106,10 +105,8 @@
|
||||
61EF67560E25B58D00F754E0 /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
|
||||
61EF67590E25C5B400F754E0 /* SUHost.h in Headers */ = {isa = PBXBuildFile; fileRef = 61EF67580E25C5B400F754E0 /* SUHost.h */; };
|
||||
654F352529B1548700B10EEB /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
|
||||
654F352729B154AE00B10EEB /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 654F352629B154AE00B10EEB /* ImageIO.framework */; };
|
||||
654F352829B154B500B10EEB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 55C14F31136EFC2400649790 /* SystemConfiguration.framework */; };
|
||||
654F352929B154BB00B10EEB /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 724BB3B51D35AAC3005D534A /* ServiceManagement.framework */; };
|
||||
654F352C29B154E900B10EEB /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
|
||||
654F352D29B1551000B10EEB /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721BC20A1D17A5AD002BC71E /* CoreServices.framework */; };
|
||||
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */ = {isa = PBXBuildFile; fileRef = 7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */; };
|
||||
72045CE026FEE535004F96E5 /* Downloader.xpc in Copy XPC Services */ = {isa = PBXBuildFile; fileRef = 726E07EF1CAF37BD001A286B /* Downloader.xpc */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
|
||||
@@ -120,7 +117,6 @@
|
||||
7205C4411E13049400E370AE /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4401E13049400E370AE /* main.swift */; };
|
||||
7205C44C1E1304CE00E370AE /* Appcast.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4471E1304CE00E370AE /* Appcast.swift */; };
|
||||
7205C44D1E1304CE00E370AE /* ArchiveItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4481E1304CE00E370AE /* ArchiveItem.swift */; };
|
||||
7205C44E1E1304CE00E370AE /* Signatures.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C4491E1304CE00E370AE /* Signatures.swift */; };
|
||||
7205C44F1E1304CE00E370AE /* FeedXML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C44A1E1304CE00E370AE /* FeedXML.swift */; };
|
||||
7205C4501E1304CE00E370AE /* Unarchive.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7205C44B1E1304CE00E370AE /* Unarchive.swift */; };
|
||||
7205C4561E13060D00E370AE /* SUStandardVersionComparator.m in Sources */ = {isa = PBXBuildFile; fileRef = 61A225A30D1C4AC000430CCD /* SUStandardVersionComparator.m */; };
|
||||
@@ -146,10 +142,6 @@
|
||||
720E217B1D0D00BF003A311C /* SPUUpdaterCycle.h in Headers */ = {isa = PBXBuildFile; fileRef = 720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */; };
|
||||
720E217C1D0D00BF003A311C /* SPUUpdaterCycle.m in Sources */ = {isa = PBXBuildFile; fileRef = 720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */; };
|
||||
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */; };
|
||||
7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */ = {isa = PBXBuildFile; fileRef = 7214B87F1D456A8500CB5CED /* SUBundleIcon.h */; };
|
||||
7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
|
||||
7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
|
||||
7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7214B8801D456A8500CB5CED /* SUBundleIcon.m */; };
|
||||
72162B081C82C9600013C1C5 /* SULocalizations.h in Headers */ = {isa = PBXBuildFile; fileRef = 72162B071C82C9600013C1C5 /* SULocalizations.h */; };
|
||||
721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */ = {isa = PBXBuildFile; fileRef = 721BC20C1D1CDE55002BC71E /* SPULocalCacheDirectory.h */; };
|
||||
721BC20F1D1CDE55002BC71E /* SPULocalCacheDirectory.m in Sources */ = {isa = PBXBuildFile; fileRef = 721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */; };
|
||||
@@ -184,10 +176,10 @@
|
||||
722C9539286EA68C0033908A /* SPUGentleUserDriverReminders.h in Headers */ = {isa = PBXBuildFile; fileRef = 722C9538286EA54A0033908A /* SPUGentleUserDriverReminders.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
722FB7E5260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
|
||||
722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */ = {isa = PBXBuildFile; fileRef = 722FB7E4260EE53F00EB571C /* SUNormalization.m */; };
|
||||
7230BCDE2E22E2BC00B71297 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 7230BCDD2E22E2BC00B71297 /* Images.xcassets */; };
|
||||
72316BD31E0DA8430039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
|
||||
72316BD41E0DB37E0039EFD9 /* SUUnarchiverNotifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */; };
|
||||
723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */; };
|
||||
723ABD6C259A9CBC00BDB4FA /* SUUpdatePermissionPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */; };
|
||||
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723414162EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml */; };
|
||||
723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */; };
|
||||
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 723ABE00259A9E9E00BDB4FA /* MainMenu.xib */; };
|
||||
723ABF1B259D055E00BDB4FA /* SUReleaseNotesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 723ABF1A259D055E00BDB4FA /* SUReleaseNotesView.h */; };
|
||||
@@ -206,6 +198,7 @@
|
||||
723C8A561E2D60DB00C14942 /* SUTouchBarButtonGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 723C8A531E2D60DB00C14942 /* SUTouchBarButtonGroup.m */; };
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */ = {isa = PBXBuildFile; fileRef = 723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */; };
|
||||
7240852E2CA11C1400ED2FCD /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 7240852D2CA11C1400ED2FCD /* libz.tbd */; };
|
||||
7245495C2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h in Headers */ = {isa = PBXBuildFile; fileRef = 7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */; };
|
||||
72464F701E1F31E000FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
72464F7C1E2097F600FB341C /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
72464F7E1E21ED8C00FB341C /* SUHost.m in Sources */ = {isa = PBXBuildFile; fileRef = 61EF67550E25B58D00F754E0 /* SUHost.m */; };
|
||||
@@ -223,6 +216,7 @@
|
||||
724BB3AA1D3347C2005D534A /* SUInstallerStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 724BB3971D333832005D534A /* SUInstallerStatus.m */; };
|
||||
724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
|
||||
724F76F91D6EAD0D00ECD062 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 525A278F133D6AE900FD8D70 /* Cocoa.framework */; };
|
||||
72526BE62EF3349D005791ED /* testappcast_minimumUpdateVersion.xml in Resources */ = {isa = PBXBuildFile; fileRef = 72526BE52EF3349D005791ED /* testappcast_minimumUpdateVersion.xml */; };
|
||||
725453552C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 725453542C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg */; };
|
||||
725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 725602D31C83551C00DAA70E /* SUApplicationInfo.h */; };
|
||||
725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 725602D41C83551C00DAA70E /* SUApplicationInfo.m */; };
|
||||
@@ -248,9 +242,9 @@
|
||||
725F97841C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97831C8AA90000265BE4 /* SUPopUpTitlebarUserDriver.m */; };
|
||||
725F97A51C8B304D00265BE4 /* SUInstallUpdateViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */; };
|
||||
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */; };
|
||||
72666DC62B0B28F4001511B0 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* secret.swift */; };
|
||||
72666DC72B0B28F4001511B0 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* secret.swift */; };
|
||||
72666DC82B0B28F4001511B0 /* secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* secret.swift */; };
|
||||
72666DC62B0B28F4001511B0 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* Secret.swift */; };
|
||||
72666DC72B0B28F4001511B0 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* Secret.swift */; };
|
||||
72666DC82B0B28F4001511B0 /* Secret.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72666DC52B0B28F4001511B0 /* Secret.swift */; };
|
||||
7267E5751D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
|
||||
7267E5761D3D895B00D1BF90 /* SUBinaryDeltaApply.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */; };
|
||||
7267E5771D3D895B00D1BF90 /* SUBinaryDeltaCommon.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5711D3D895B00D1BF90 /* SUBinaryDeltaCommon.m */; };
|
||||
@@ -275,7 +269,6 @@
|
||||
7267E5B81D3D8AEE00D1BF90 /* SPUInstallationInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5B51D3D8AEE00D1BF90 /* SPUInstallationInfo.m */; };
|
||||
7267E5C21D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */; };
|
||||
7267E5C31D3D8B2700D1BF90 /* SUInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */; };
|
||||
7267E5C41D3D8B2700D1BF90 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */; };
|
||||
7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */; };
|
||||
7267E5C91D3D8C4300D1BF90 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 721BC20A1D17A5AD002BC71E /* CoreServices.framework */; };
|
||||
7267E5CA1D3D8C4800D1BF90 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D69BFE84028FC02AAC07 /* Foundation.framework */; };
|
||||
@@ -303,7 +296,6 @@
|
||||
7267E5F11D3D917A00D1BF90 /* SUBinaryDeltaUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E57E1D3D896700D1BF90 /* SUBinaryDeltaUnarchiver.m */; };
|
||||
7267E5F21D3D918000D1BF90 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
|
||||
7267E5F41D3D918B00D1BF90 /* SUGuidedPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */; };
|
||||
7267E5F51D3D918B00D1BF90 /* SUPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */; };
|
||||
7267E5F61D3D919000D1BF90 /* SUDiskImageUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5811D3D89B300D1BF90 /* SUDiskImageUnarchiver.m */; };
|
||||
7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */; };
|
||||
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5831D3D89B300D1BF90 /* SUPipedUnarchiver.m */; };
|
||||
@@ -315,6 +307,7 @@
|
||||
7269E4982648D3460088C213 /* SPUSkippedUpdate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E493264798200088C213 /* SPUSkippedUpdate.m */; };
|
||||
7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */ = {isa = PBXBuildFile; fileRef = 7269E4992648F7C00088C213 /* SPUUserUpdateState.m */; };
|
||||
726B20612CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 726B20602CF4F1D300E6F7DB /* DevSignedAppVersion2.dmg */; };
|
||||
726BA5132E25F60000CE93C3 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0867D6A5FE840307C02AAC07 /* AppKit.framework */; };
|
||||
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */ = {isa = PBXBuildFile; fileRef = 726DF88D1C84277500188804 /* SPUUserUpdateState.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
726E075C1CA3A6D6001A286B /* SPUSecureCoding.h in Headers */ = {isa = PBXBuildFile; fileRef = 726E075A1CA3A6D6001A286B /* SPUSecureCoding.h */; };
|
||||
726E075D1CA3A6D6001A286B /* SPUSecureCoding.m in Sources */ = {isa = PBXBuildFile; fileRef = 726E075B1CA3A6D6001A286B /* SPUSecureCoding.m */; };
|
||||
@@ -347,15 +340,19 @@
|
||||
728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */; };
|
||||
728337A71C9E6FF40085AA99 /* SPUProbeInstallStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */; };
|
||||
728638ED1CAF50CE00783084 /* SUConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 61299A5F09CA6EB100B7442F /* SUConstants.m */; };
|
||||
7286EE5F28CEC84900163C1D /* SUPlainTextReleaseNotesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 7286EE5D28CEC84900163C1D /* SUPlainTextReleaseNotesView.h */; };
|
||||
7286EE6028CEC84900163C1D /* SUPlainTextReleaseNotesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7286EE5E28CEC84900163C1D /* SUPlainTextReleaseNotesView.m */; };
|
||||
7286EE5F28CEC84900163C1D /* SUTextViewReleaseNotesView.h in Headers */ = {isa = PBXBuildFile; fileRef = 7286EE5D28CEC84900163C1D /* SUTextViewReleaseNotesView.h */; };
|
||||
7286EE6028CEC84900163C1D /* SUTextViewReleaseNotesView.m in Sources */ = {isa = PBXBuildFile; fileRef = 7286EE5E28CEC84900163C1D /* SUTextViewReleaseNotesView.m */; };
|
||||
728ED34A277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
728ED34B277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
728ED34C277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
728ED34D277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */ = {isa = PBXBuildFile; fileRef = 728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */; };
|
||||
729051E41DC82AC0003DEA7F /* SUOperatingSystem.m in Sources */ = {isa = PBXBuildFile; fileRef = 726F2CE41BC9C33D001971A4 /* SUOperatingSystem.m */; };
|
||||
7290BF2F2E5A5AFA00D75022 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
|
||||
7290BF302E5A5B0F00D75022 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
|
||||
7290BF312E5A5B2F00D75022 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 61B5F8F609C4CEB300B25A18 /* Security.framework */; };
|
||||
729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */; };
|
||||
729924941DF4A45000DBCDF5 /* SUUpdateValidator.m in Sources */ = {isa = PBXBuildFile; fileRef = 729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */; };
|
||||
729C51282E58015600D7365A /* SUUpdatePermissionPrompt.xib in Resources */ = {isa = PBXBuildFile; fileRef = 729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */; };
|
||||
729F7EAC27366353004592DC /* test-links.xml in Resources */ = {isa = PBXBuildFile; fileRef = 729F7EAB27366353004592DC /* test-links.xml */; };
|
||||
729F7EAF273F1840004592DC /* SPUUserAgent+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = 729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */; settings = {ATTRIBUTES = (Private, ); }; };
|
||||
729F7EB0273F1840004592DC /* SPUUserAgent+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */; };
|
||||
@@ -396,6 +393,22 @@
|
||||
72B767E71C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m in Sources */ = {isa = PBXBuildFile; fileRef = 72B767E51C9CFD7200A07552 /* SPUAutomaticUpdateDriver.m */; };
|
||||
72BC6C3D275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg in Resources */ = {isa = PBXBuildFile; fileRef = 72BC6C3C275027BF0083F14B /* SparkleTestCodeSign_apfs.dmg */; };
|
||||
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */; };
|
||||
72C56E042EFB45B10005A484 /* SUSignatureVerifier.m in Sources */ = {isa = PBXBuildFile; fileRef = 7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */; };
|
||||
72C56E052EFB45BD0005A484 /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
|
||||
72C56E092EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0A2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0B2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0C2EFDFB850005A484 /* SPUExtractSignedFeed.h in Headers */ = {isa = PBXBuildFile; fileRef = 72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */; };
|
||||
72C56E0D2EFE002D0005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E0E2EFEEF8B0005A484 /* SPUExtractSignedFeed.m in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */; };
|
||||
72C56E102EFEF10B0005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E112EFEF10B0005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E122EFEF10B0005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E192F04343D0005A484 /* SPUAppcastSigningValidationStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
72C56E1F2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */; };
|
||||
72C56E202F04B3760005A484 /* Signing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72C56E0F2EFEF10B0005A484 /* Signing.swift */; };
|
||||
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */ = {isa = PBXBuildFile; fileRef = 72C56E212F04C28B0005A484 /* testreleasenotes.html */; };
|
||||
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */ = {isa = PBXBuildFile; fileRef = 72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */; };
|
||||
72D04F3D2B094C8400A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
72D04F3E2B097D4300A6DEAA /* SPUVerifierInformation.m in Sources */ = {isa = PBXBuildFile; fileRef = 72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */; };
|
||||
@@ -451,6 +464,7 @@
|
||||
72F9EC441D5E9ED8004AC8B6 /* SPUDownloadData.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
72F9EC451D5E9ED8004AC8B6 /* SPUDownloadData.m in Sources */ = {isa = PBXBuildFile; fileRef = 72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */; };
|
||||
72F9EC481D5EA904004AC8B6 /* SPUUpdaterDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */; settings = {ATTRIBUTES = (Public, ); }; };
|
||||
72FE54422E56A14100227A91 /* SUUpdateAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 72FE54412E56A14100227A91 /* SUUpdateAlert.xib */; };
|
||||
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */ = {isa = PBXBuildFile; fileRef = C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */; };
|
||||
EA1E281722B645AE004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
|
||||
EA1E281822B645CE004AA304 /* libbsdiff.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E280F22B64522004AA304 /* libbsdiff.a */; };
|
||||
@@ -487,7 +501,6 @@
|
||||
EA1E287022B66621004AA304 /* SUSignatures.m in Sources */ = {isa = PBXBuildFile; fileRef = EA1E286D22B665E8004AA304 /* SUSignatures.m */; };
|
||||
EA1E287922B666EB004AA304 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1E287822B666EB004AA304 /* main.swift */; };
|
||||
EA1E287E22B66705004AA304 /* libed25519.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EA1E282D22B660BE004AA304 /* libed25519.a */; };
|
||||
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */; };
|
||||
F8761EB11ADC5068000C9034 /* SUCodeSigningVerifierTest.m in Sources */ = {isa = PBXBuildFile; fileRef = F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */; };
|
||||
F8761EB31ADC50EB000C9034 /* SparkleTestCodeSignApp.zip in Resources */ = {isa = PBXBuildFile; fileRef = F8761EB21ADC50EB000C9034 /* SparkleTestCodeSignApp.zip */; };
|
||||
FA30773D24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml in Resources */ = {isa = PBXBuildFile; fileRef = FA30773C24CBC295007BA37D /* testlocalizedreleasenotesappcast.xml */; };
|
||||
@@ -733,13 +746,6 @@
|
||||
remoteGlobalIDString = 721C24441CB753E6005440CB;
|
||||
remoteInfo = "Installer Progress";
|
||||
};
|
||||
72DBA3791D5FDE95002594A8 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
|
||||
proxyType = 1;
|
||||
remoteGlobalIDString = 72D9549D1CBB415B006F28BD;
|
||||
remoteInfo = "sparkle-cli";
|
||||
};
|
||||
72EF30B826747E39008CE987 /* PBXContainerItemProxy */ = {
|
||||
isa = PBXContainerItemProxy;
|
||||
containerPortal = 0867D690FE84028FC02AAC07 /* Project object */;
|
||||
@@ -919,10 +925,8 @@
|
||||
/* Begin PBXFileReference section */
|
||||
004A8652192A492B00C9730D /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
0263187214FEBB31005EBF43 /* uk */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
0580A0572C0D3B9200FE836A /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
0867D69BFE84028FC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
|
||||
0867D6A5FE840307C02AAC07 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
|
||||
1420DF4F196247F900203BB0 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
|
||||
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBinaryDeltaTest.m; sourceTree = "<group>"; };
|
||||
14652F7919A93E5F00959E44 /* set-git-version-info.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "set-git-version-info.sh"; sourceTree = "<group>"; };
|
||||
14652F8319A9759F00959E44 /* SUExport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUExport.h; sourceTree = "<group>"; };
|
||||
@@ -948,8 +952,6 @@
|
||||
1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = ReleaseNotesColorStyle.css; sourceTree = "<group>"; };
|
||||
3772FEA813DE0B6B00F79537 /* SUVersionDisplayProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUVersionDisplayProtocol.h; sourceTree = "<group>"; };
|
||||
37A5F28528E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
37A5F28628E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
37A5F28728E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
37A5F28828E9219000891504 /* zh_HK */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_HK; path = zh_HK.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
4607BEA21948443800EF8DA4 /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
525A278F133D6AE900FD8D70 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
|
||||
@@ -1035,7 +1037,6 @@
|
||||
7205C4461E1304C300E370AE /* Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
7205C4471E1304CE00E370AE /* Appcast.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Appcast.swift; sourceTree = "<group>"; };
|
||||
7205C4481E1304CE00E370AE /* ArchiveItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ArchiveItem.swift; sourceTree = "<group>"; };
|
||||
7205C4491E1304CE00E370AE /* Signatures.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Signatures.swift; sourceTree = "<group>"; };
|
||||
7205C44A1E1304CE00E370AE /* FeedXML.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FeedXML.swift; sourceTree = "<group>"; };
|
||||
7205C44B1E1304CE00E370AE /* Unarchive.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Unarchive.swift; sourceTree = "<group>"; };
|
||||
7205C4511E13053500E370AE /* ConfigSwiftDebug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwiftDebug.xcconfig; sourceTree = "<group>"; };
|
||||
@@ -1054,8 +1055,6 @@
|
||||
720E21791D0D00BF003A311C /* SPUUpdaterCycle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterCycle.h; sourceTree = "<group>"; };
|
||||
720E217A1D0D00BF003A311C /* SPUUpdaterCycle.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdaterCycle.m; sourceTree = "<group>"; };
|
||||
7210C7671B9A9A1500EB90AC /* SUUnarchiverTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUUnarchiverTest.swift; sourceTree = "<group>"; };
|
||||
7214B87F1D456A8500CB5CED /* SUBundleIcon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUBundleIcon.h; sourceTree = "<group>"; };
|
||||
7214B8801D456A8500CB5CED /* SUBundleIcon.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUBundleIcon.m; sourceTree = "<group>"; };
|
||||
7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUInstallationType.h; sourceTree = "<group>"; };
|
||||
72162B071C82C9600013C1C5 /* SULocalizations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SULocalizations.h; sourceTree = "<group>"; };
|
||||
721652671D3C8FED00FD13D8 /* SUInstallerLauncherStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SUInstallerLauncherStatus.h; path = InstallerLauncher/SUInstallerLauncherStatus.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1090,71 +1089,13 @@
|
||||
722FB7CA1DD69897001D40CE /* ConfigSwift.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigSwift.xcconfig; sourceTree = "<group>"; };
|
||||
722FB7E3260EE53F00EB571C /* SUNormalization.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUNormalization.h; sourceTree = "<group>"; };
|
||||
722FB7E4260EE53F00EB571C /* SUNormalization.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUNormalization.m; sourceTree = "<group>"; };
|
||||
7230BCDD2E22E2BC00B71297 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };
|
||||
72316BD11E0DA8430039EFD9 /* SUUnarchiverNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUnarchiverNotifier.h; path = Autoupdate/SUUnarchiverNotifier.h; sourceTree = SOURCE_ROOT; };
|
||||
72316BD21E0DA8430039EFD9 /* SUUnarchiverNotifier.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUnarchiverNotifier.m; path = Autoupdate/SUUnarchiverNotifier.m; sourceTree = SOURCE_ROOT; };
|
||||
723414162EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = testappcast_arm64HardwareRequirement.xml; sourceTree = "<group>"; };
|
||||
7235B75E29DFC0120081FE4E /* make-xcframework.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; path = "make-xcframework.sh"; sourceTree = "<group>"; };
|
||||
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Sparkle.private.modulemap; sourceTree = "<group>"; };
|
||||
723ABCD7259A9A9D00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
723ABD37259A9BA500BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdateAlert.xib; sourceTree = "<group>"; };
|
||||
723ABD4C259A9BB900BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD4D259A9BE100BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD4E259A9BEF00BDB4FA /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD4F259A9BFD00BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD50259A9C0200BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD51259A9C0600BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD52259A9C0900BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD53259A9C1000BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD54259A9C1300BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD55259A9C1500BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD56259A9C1E00BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD57259A9C2100BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD58259A9C2400BDB4FA /* he */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = he; path = he.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD59259A9C2C00BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5A259A9C3600BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5B259A9C3900BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5C259A9C3B00BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5D259A9C3D00BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5E259A9C4000BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD5F259A9C4900BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SUUpdateAlert.strings"; sourceTree = "<group>"; };
|
||||
723ABD60259A9C4B00BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SUUpdateAlert.strings"; sourceTree = "<group>"; };
|
||||
723ABD61259A9C5400BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD62259A9C5700BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD63259A9C5900BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD64259A9C5B00BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD65259A9C5D00BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD66259A9C5F00BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD67259A9C6100BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD68259A9C6300BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD69259A9C6600BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
723ABD6B259A9CBB00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/SUUpdatePermissionPrompt.xib; sourceTree = "<group>"; };
|
||||
723ABD80259A9CD600BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD81259A9CDA00BDB4FA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD82259A9CEC00BDB4FA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD83259A9CF000BDB4FA /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = zh_CN.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD84259A9CF400BDB4FA /* zh_TW */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_TW; path = zh_TW.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD85259A9CF800BDB4FA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = da; path = da.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD86259A9CFC00BDB4FA /* nl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nl; path = nl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD87259A9CFF00BDB4FA /* fi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fi; path = fi.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD88259A9D0200BDB4FA /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD89259A9D1800BDB4FA /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD8A259A9D1C00BDB4FA /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD8D259A9D2700BDB4FA /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD8E259A9D2A00BDB4FA /* is */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = is; path = is.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD91259A9D3400BDB4FA /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = it.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD92259A9D3700BDB4FA /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD93259A9D3C00BDB4FA /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD94259A9D3E00BDB4FA /* nb */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nb; path = nb.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD95259A9D4100BDB4FA /* pl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pl; path = pl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD96259A9D4600BDB4FA /* pt-BR */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-BR"; path = "pt-BR.lproj/SUUpdatePermissionPrompt.strings"; sourceTree = "<group>"; };
|
||||
723ABD97259A9D4900BDB4FA /* pt-PT */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "pt-PT"; path = "pt-PT.lproj/SUUpdatePermissionPrompt.strings"; sourceTree = "<group>"; };
|
||||
723ABD98259A9D4C00BDB4FA /* ro */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ro; path = ro.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD99259A9D4F00BDB4FA /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9A259A9D5200BDB4FA /* sk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sk; path = sk.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9B259A9D5500BDB4FA /* sl */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sl; path = sl.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9C259A9D5700BDB4FA /* es */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = es; path = es.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9D259A9D5A00BDB4FA /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9E259A9D5D00BDB4FA /* th */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = th; path = th.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABD9F259A9D6000BDB4FA /* tr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = tr; path = tr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABDA0259A9D6300BDB4FA /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
723ABDDA259A9E8600BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = Base; path = Base.lproj/InfoPlist.strings; sourceTree = "<group>"; };
|
||||
723ABE01259A9E9E00BDB4FA /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
|
||||
723ABE15259A9EB000BDB4FA /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
@@ -1207,6 +1148,7 @@
|
||||
723DFF962B3DFF6E00628E6C /* Package.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Package.swift; sourceTree = "<group>"; };
|
||||
723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = testappcast_channels.xml; sourceTree = "<group>"; };
|
||||
7240852D2CA11C1400ED2FCD /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
|
||||
7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "SPUUpdaterSettings+Debug.h"; sourceTree = "<group>"; };
|
||||
7246E0A11C83B685003B4E75 /* SPUStandardUpdaterController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUStandardUpdaterController.h; sourceTree = "<group>"; };
|
||||
7246E0A21C83B685003B4E75 /* SPUStandardUpdaterController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUStandardUpdaterController.m; sourceTree = "<group>"; };
|
||||
724BB36C1D31D0B7005D534A /* InstallerConnection.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = InstallerConnection.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
@@ -1231,6 +1173,7 @@
|
||||
724BB3A61D33461B005D534A /* SUXPCInstallerStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUXPCInstallerStatus.h; sourceTree = "<group>"; };
|
||||
724BB3A71D33461B005D534A /* SUXPCInstallerStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUXPCInstallerStatus.m; sourceTree = "<group>"; };
|
||||
724BB3B51D35AAC3005D534A /* ServiceManagement.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ServiceManagement.framework; path = System/Library/Frameworks/ServiceManagement.framework; sourceTree = SDKROOT; };
|
||||
72526BE52EF3349D005791ED /* testappcast_minimumUpdateVersion.xml */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = testappcast_minimumUpdateVersion.xml; sourceTree = "<group>"; };
|
||||
725453542C04DB3700362123 /* SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSign_apfs_lzma_aux_files_adhoc.dmg; sourceTree = "<group>"; };
|
||||
725602D31C83551C00DAA70E /* SUApplicationInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUApplicationInfo.h; sourceTree = "<group>"; };
|
||||
725602D41C83551C00DAA70E /* SUApplicationInfo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUApplicationInfo.m; sourceTree = "<group>"; };
|
||||
@@ -1256,7 +1199,7 @@
|
||||
725F97A21C8B304D00265BE4 /* SUInstallUpdateViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUInstallUpdateViewController.h; sourceTree = "<group>"; };
|
||||
725F97A31C8B304D00265BE4 /* SUInstallUpdateViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUInstallUpdateViewController.m; sourceTree = "<group>"; };
|
||||
725F97A41C8B304D00265BE4 /* SUInstallUpdateViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SUInstallUpdateViewController.xib; sourceTree = "<group>"; };
|
||||
72666DC52B0B28F4001511B0 /* secret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = secret.swift; sourceTree = "<group>"; };
|
||||
72666DC52B0B28F4001511B0 /* Secret.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secret.swift; sourceTree = "<group>"; };
|
||||
7267E56E1D3D895B00D1BF90 /* SUBinaryDeltaApply.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaApply.h; path = Autoupdate/SUBinaryDeltaApply.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E56F1D3D895B00D1BF90 /* SUBinaryDeltaApply.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUBinaryDeltaApply.m; path = Autoupdate/SUBinaryDeltaApply.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5701D3D895B00D1BF90 /* SUBinaryDeltaCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUBinaryDeltaCommon.h; path = Autoupdate/SUBinaryDeltaCommon.h; sourceTree = SOURCE_ROOT; };
|
||||
@@ -1294,8 +1237,6 @@
|
||||
7267E5BB1D3D8B2700D1BF90 /* SUGuidedPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUGuidedPackageInstaller.m; path = Autoupdate/SUGuidedPackageInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BC1D3D8B2700D1BF90 /* SUInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUInstaller.h; path = Autoupdate/SUInstaller.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BD1D3D8B2700D1BF90 /* SUInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUInstaller.m; path = Autoupdate/SUInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BE1D3D8B2700D1BF90 /* SUPackageInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPackageInstaller.h; path = Autoupdate/SUPackageInstaller.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPackageInstaller.m; path = Autoupdate/SUPackageInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5C01D3D8B2700D1BF90 /* SUPlainInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUPlainInstaller.h; path = Autoupdate/SUPlainInstaller.h; sourceTree = SOURCE_ROOT; };
|
||||
7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUPlainInstaller.m; path = Autoupdate/SUPlainInstaller.m; sourceTree = SOURCE_ROOT; };
|
||||
7267E5CF1D3D8C8500D1BF90 /* SecurityFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SecurityFoundation.framework; path = System/Library/Frameworks/SecurityFoundation.framework; sourceTree = SDKROOT; };
|
||||
@@ -1344,17 +1285,16 @@
|
||||
728337A41C9E6FF40085AA99 /* SPUProbeInstallStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUProbeInstallStatus.h; sourceTree = "<group>"; };
|
||||
728337A51C9E6FF40085AA99 /* SPUProbeInstallStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUProbeInstallStatus.m; sourceTree = "<group>"; };
|
||||
728638EE1CAF589C00783084 /* ConfigDownloader.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigDownloader.xcconfig; sourceTree = "<group>"; };
|
||||
7286EE5D28CEC84900163C1D /* SUPlainTextReleaseNotesView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUPlainTextReleaseNotesView.h; sourceTree = "<group>"; };
|
||||
7286EE5E28CEC84900163C1D /* SUPlainTextReleaseNotesView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUPlainTextReleaseNotesView.m; sourceTree = "<group>"; };
|
||||
7286EE5D28CEC84900163C1D /* SUTextViewReleaseNotesView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SUTextViewReleaseNotesView.h; sourceTree = "<group>"; };
|
||||
7286EE5E28CEC84900163C1D /* SUTextViewReleaseNotesView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SUTextViewReleaseNotesView.m; sourceTree = "<group>"; };
|
||||
728ED348277DA23400D9238F /* SPUSparkleDeltaArchive.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = SPUSparkleDeltaArchive.h; path = Autoupdate/SPUSparkleDeltaArchive.h; sourceTree = SOURCE_ROOT; };
|
||||
728ED349277DA23400D9238F /* SPUSparkleDeltaArchive.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = SPUSparkleDeltaArchive.m; path = Autoupdate/SPUSparkleDeltaArchive.m; sourceTree = SOURCE_ROOT; };
|
||||
728FBA192BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
728FBA1A2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
728FBA1B2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
728FBA1C2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
729924921DF4A45000DBCDF5 /* SUUpdateValidator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SUUpdateValidator.h; path = Sparkle/SUUpdateValidator.h; sourceTree = SOURCE_ROOT; };
|
||||
729924931DF4A45000DBCDF5 /* SUUpdateValidator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SUUpdateValidator.m; path = Sparkle/SUUpdateValidator.m; sourceTree = SOURCE_ROOT; };
|
||||
729BB3D11D503826007C4276 /* Downloader.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Downloader.entitlements; path = Downloader/Downloader.entitlements; sourceTree = SOURCE_ROOT; };
|
||||
729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SUUpdatePermissionPrompt.xib; sourceTree = "<group>"; };
|
||||
729F10FD1C65A9B500DFCCC5 /* ConfigUITest.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITest.xcconfig; sourceTree = "<group>"; };
|
||||
729F10FE1C65A9B500DFCCC5 /* ConfigUITestCoverage.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = ConfigUITestCoverage.xcconfig; sourceTree = "<group>"; };
|
||||
729F7EAB27366353004592DC /* test-links.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = "test-links.xml"; sourceTree = "<group>"; };
|
||||
@@ -1401,6 +1341,12 @@
|
||||
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>"; };
|
||||
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SUSpotlightImporterTest.swift; sourceTree = "<group>"; };
|
||||
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUExtractSignedFeed.h; sourceTree = "<group>"; };
|
||||
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUExtractSignedFeed.m; sourceTree = "<group>"; };
|
||||
72C56E0F2EFEF10B0005A484 /* Signing.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Signing.swift; sourceTree = "<group>"; };
|
||||
72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUAppcastSigningValidationStatus.h; sourceTree = "<group>"; };
|
||||
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SUFeedSignatureVerifierTest.swift; sourceTree = "<group>"; };
|
||||
72C56E212F04C28B0005A484 /* testreleasenotes.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = testreleasenotes.html; sourceTree = "<group>"; };
|
||||
72CCDEBD27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = SparkleTestCodeSignApp_bad_header.zip; sourceTree = "<group>"; };
|
||||
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUVerifierInformation.h; sourceTree = "<group>"; };
|
||||
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SPUVerifierInformation.m; sourceTree = "<group>"; };
|
||||
@@ -1420,8 +1366,6 @@
|
||||
72D954B71CBB467F006F28BD /* SPUCommandLineUserDriver.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUCommandLineUserDriver.m; sourceTree = "<group>"; };
|
||||
72DBA37B1D60CC34002594A8 /* SPUUpdatePermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUUpdatePermissionRequest.h; sourceTree = "<group>"; };
|
||||
72DBA37C1D60CC34002594A8 /* SPUUpdatePermissionRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUUpdatePermissionRequest.m; sourceTree = "<group>"; };
|
||||
72E1DAB525B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/SUUpdatePermissionPrompt.strings; sourceTree = "<group>"; };
|
||||
72E1DAB625B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
72E1DAB725B3E8AE0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
72E1DACB25B3E8DF0001BA6D /* hr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hr; path = hr.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
72E45CF11B640CDD005C701A /* SUTestApplicationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTestApplicationDelegate.h; sourceTree = "<group>"; };
|
||||
@@ -1456,11 +1400,14 @@
|
||||
72F9EC421D5E9ED8004AC8B6 /* SPUDownloadData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPUDownloadData.h; sourceTree = "<group>"; };
|
||||
72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPUDownloadData.m; sourceTree = "<group>"; };
|
||||
72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SPUUpdaterDelegate.h; sourceTree = "<group>"; };
|
||||
72FE54412E56A14100227A91 /* SUUpdateAlert.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SUUpdateAlert.xib; sourceTree = "<group>"; };
|
||||
8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Sparkle-Info.plist"; sourceTree = "<group>"; };
|
||||
8DC2EF5B0486A6940098B216 /* Sparkle.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Sparkle.framework; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
A5BF4F1B1BC7668B007A052A /* SUTestWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SUTestWebServer.h; sourceTree = "<group>"; };
|
||||
A5BF4F1C1BC7668B007A052A /* SUTestWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUTestWebServer.m; sourceTree = "<group>"; };
|
||||
C23E88591BE7AF890050BB73 /* SparkleTestCodeSignApp.enc.dmg */ = {isa = PBXFileReference; lastKnownFileType = file; path = SparkleTestCodeSignApp.enc.dmg; sourceTree = "<group>"; };
|
||||
E0949FCF2EFC4CFC0039C748 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/MainMenu.strings; sourceTree = "<group>"; };
|
||||
E0949FD02EFC4CFD0039C748 /* vi */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = vi; path = vi.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
EA1E280F22B64522004AA304 /* libbsdiff.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libbsdiff.a; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
EA1E281422B64548004AA304 /* bsdiff-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Debug.xcconfig"; sourceTree = "<group>"; };
|
||||
EA1E281522B64549004AA304 /* bsdiff-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "bsdiff-Release.xcconfig"; sourceTree = "<group>"; };
|
||||
@@ -1498,7 +1445,6 @@
|
||||
EA1E287822B666EB004AA304 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
|
||||
EA1E287F22B667D8004AA304 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
F67C9B7B281410B600740813 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
F67C9B7C281410B600740813 /* hu */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = hu; path = hu.lproj/SUUpdateAlert.strings; sourceTree = "<group>"; };
|
||||
F6D399502814387000A8C0DA /* UniformTypeIdentifiers.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UniformTypeIdentifiers.framework; path = System/Library/Frameworks/UniformTypeIdentifiers.framework; sourceTree = SDKROOT; };
|
||||
F6E11510281410D10003736C /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ar; path = ar.lproj/Sparkle.strings; sourceTree = "<group>"; };
|
||||
F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SUCodeSigningVerifierTest.m; sourceTree = "<group>"; };
|
||||
@@ -1580,7 +1526,6 @@
|
||||
files = (
|
||||
721C245A1CB75756005440CB /* Cocoa.framework in Frameworks */,
|
||||
724BB3B71D35ABA8005D534A /* Security.framework in Frameworks */,
|
||||
F6D399512814387000A8C0DA /* UniformTypeIdentifiers.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1609,11 +1554,10 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
726BA5132E25F60000CE93C3 /* AppKit.framework in Frameworks */,
|
||||
654F352D29B1551000B10EEB /* CoreServices.framework in Frameworks */,
|
||||
654F352C29B154E900B10EEB /* UniformTypeIdentifiers.framework in Frameworks */,
|
||||
654F352929B154BB00B10EEB /* ServiceManagement.framework in Frameworks */,
|
||||
654F352829B154B500B10EEB /* SystemConfiguration.framework in Frameworks */,
|
||||
654F352729B154AE00B10EEB /* ImageIO.framework in Frameworks */,
|
||||
654F352529B1548700B10EEB /* Security.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
@@ -1622,6 +1566,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
7290BF312E5A5B2F00D75022 /* Security.framework in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -1662,6 +1607,7 @@
|
||||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */,
|
||||
725B81FC2781CDC20041746F /* libcompression.tbd in Frameworks */,
|
||||
1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */,
|
||||
);
|
||||
@@ -1779,8 +1725,8 @@
|
||||
8DC2EF5A0486A6940098B216 /* Sparkle-Info.plist */,
|
||||
61AAE8220A321A7F00D8810D /* Sparkle.strings */,
|
||||
55C14BD8136EF00C00649790 /* SUStatus.xib */,
|
||||
723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */,
|
||||
723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */,
|
||||
729C51272E58015600D7365A /* SUUpdatePermissionPrompt.xib */,
|
||||
72FE54412E56A14100227A91 /* SUUpdateAlert.xib */,
|
||||
);
|
||||
name = "Framework Resources";
|
||||
sourceTree = "<group>";
|
||||
@@ -1824,10 +1770,10 @@
|
||||
61C268090E2DB5D000175E6C /* LICENSE */,
|
||||
14732BC11960F3B200593899 /* Makefile */,
|
||||
147D6D9E1B66DC3C006607AB /* CheckLocalizations.swift */,
|
||||
1420DF4F196247F900203BB0 /* Images.xcassets */,
|
||||
14732BBC1960EFB500593899 /* README.markdown */,
|
||||
14732BB91960EEEE00593899 /* SampleAppcast.xml */,
|
||||
1EAA4C8A2132C7BF00604473 /* ReleaseNotesColorStyle.css */,
|
||||
7230BCDD2E22E2BC00B71297 /* Images.xcassets */,
|
||||
);
|
||||
path = Resources;
|
||||
sourceTree = "<group>";
|
||||
@@ -1845,6 +1791,7 @@
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
720767D11E2EB86200F9A850 /* AppKitPrevention.h */,
|
||||
72366CCC2DC2D1FC003CE62B /* Sparkle.private.modulemap */,
|
||||
61299B3909CB055000B7442F /* Appcast Support */,
|
||||
55C14BD5136EEFD000649790 /* Autoupdate */,
|
||||
72F9EBE41D519425004AC8B6 /* Deprecated */,
|
||||
@@ -1886,9 +1833,11 @@
|
||||
5AF6C74E1AEA46D10014A3AB /* test.pkg */,
|
||||
5AD0FA7E1C73F2E2004BCEFF /* testappcast.xml */,
|
||||
723EDC3E26885A8E000BCBA4 /* testappcast_channels.xml */,
|
||||
72526BE52EF3349D005791ED /* testappcast_minimumUpdateVersion.xml */,
|
||||
725B3A81263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml */,
|
||||
720DC50327A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml */,
|
||||
720DC50527A62CDC00DFF3EC /* testappcast_minimumAutoupdateVersionSkipping2.xml */,
|
||||
723414162EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml */,
|
||||
7202DC99269ABD3500737EC4 /* testappcast_phasedRollout.xml */,
|
||||
722545B526805FF80036465C /* testappcast_info_updates.xml */,
|
||||
5F1510A11C96E591006E1629 /* testnamespaces.xml */,
|
||||
@@ -1896,6 +1845,7 @@
|
||||
5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */,
|
||||
729F7EAB27366353004592DC /* test-links.xml */,
|
||||
723AD12E29922B5F006BB02F /* test-dangerous-link.xml */,
|
||||
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
|
||||
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
|
||||
);
|
||||
path = Resources;
|
||||
@@ -1975,6 +1925,7 @@
|
||||
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */,
|
||||
F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */,
|
||||
5AF9DC3B1981DBEE001EA135 /* SUSignatureVerifierTest.m */,
|
||||
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */,
|
||||
72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */,
|
||||
5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */,
|
||||
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */,
|
||||
@@ -1993,6 +1944,7 @@
|
||||
721AB11626C777D900D34A86 /* SPUDownloadDataPrivate.h */,
|
||||
72F9EC431D5E9ED8004AC8B6 /* SPUDownloadData.m */,
|
||||
7214B8851D45AD9A00CB5CED /* SPUInstallationType.h */,
|
||||
72C56E182F04343D0005A484 /* SPUAppcastSigningValidationStatus.h */,
|
||||
61B5FB9409C4F04600B25A18 /* SUAppcast.h */,
|
||||
725DED72263D10C400E7FA8F /* SUAppcast+Private.h */,
|
||||
61B5FB9509C4F04600B25A18 /* SUAppcast.m */,
|
||||
@@ -2044,8 +1996,6 @@
|
||||
722FB7E3260EE53F00EB571C /* SUNormalization.h */,
|
||||
722FB7E4260EE53F00EB571C /* SUNormalization.m */,
|
||||
7267E5B91D3D8B0B00D1BF90 /* SUInstallerProtocol.h */,
|
||||
7267E5BE1D3D8B2700D1BF90 /* SUPackageInstaller.h */,
|
||||
7267E5BF1D3D8B2700D1BF90 /* SUPackageInstaller.m */,
|
||||
7267E5C01D3D8B2700D1BF90 /* SUPlainInstaller.h */,
|
||||
7267E5C11D3D8B2700D1BF90 /* SUPlainInstaller.m */,
|
||||
);
|
||||
@@ -2061,8 +2011,6 @@
|
||||
721BC20D1D1CDE55002BC71E /* SPULocalCacheDirectory.m */,
|
||||
729F7EAD273F1840004592DC /* SPUUserAgent+Private.h */,
|
||||
729F7EAE273F1840004592DC /* SPUUserAgent+Private.m */,
|
||||
7214B87F1D456A8500CB5CED /* SUBundleIcon.h */,
|
||||
7214B8801D456A8500CB5CED /* SUBundleIcon.m */,
|
||||
61299A5B09CA6D4500B7442F /* SUConstants.h */,
|
||||
61299A5F09CA6EB100B7442F /* SUConstants.m */,
|
||||
55E6F33219EC9F6C00005E76 /* SUErrors.h */,
|
||||
@@ -2127,6 +2075,8 @@
|
||||
7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */,
|
||||
7267E59A1D3D8A5A00D1BF90 /* SUSignatureVerifier.h */,
|
||||
7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */,
|
||||
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */,
|
||||
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */,
|
||||
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */,
|
||||
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */,
|
||||
);
|
||||
@@ -2174,6 +2124,7 @@
|
||||
72F9EC471D5EA7D3004AC8B6 /* SPUUpdaterDelegate.h */,
|
||||
72EE181826DAE6E100C58B19 /* SPUUpdateCheck.h */,
|
||||
726E078B1CA891E9001A286B /* SPUUpdaterSettings.h */,
|
||||
7245495B2ECA648000ABA991 /* SPUUpdaterSettings+Debug.h */,
|
||||
726E078C1CA891E9001A286B /* SPUUpdaterSettings.m */,
|
||||
72F9EC3D1D5E823F004AC8B6 /* SPUUpdaterTimer.h */,
|
||||
72F9EC3E1D5E823F004AC8B6 /* SPUUpdaterTimer.m */,
|
||||
@@ -2191,7 +2142,6 @@
|
||||
7205C4481E1304CE00E370AE /* ArchiveItem.swift */,
|
||||
7205C44A1E1304CE00E370AE /* FeedXML.swift */,
|
||||
7205C4401E13049400E370AE /* main.swift */,
|
||||
7205C4491E1304CE00E370AE /* Signatures.swift */,
|
||||
7205C44B1E1304CE00E370AE /* Unarchive.swift */,
|
||||
FA30773E24CBC3E9007BA37D /* URL+Hashing.swift */,
|
||||
);
|
||||
@@ -2237,8 +2187,8 @@
|
||||
723ABFC3259D4CB300BDB4FA /* SUWKWebView.m */,
|
||||
723ABF2E259D062F00BDB4FA /* SULegacyWebView.h */,
|
||||
723ABF2F259D062F00BDB4FA /* SULegacyWebView.m */,
|
||||
7286EE5D28CEC84900163C1D /* SUPlainTextReleaseNotesView.h */,
|
||||
7286EE5E28CEC84900163C1D /* SUPlainTextReleaseNotesView.m */,
|
||||
7286EE5D28CEC84900163C1D /* SUTextViewReleaseNotesView.h */,
|
||||
7286EE5E28CEC84900163C1D /* SUTextViewReleaseNotesView.m */,
|
||||
);
|
||||
name = "Release Notes Views";
|
||||
sourceTree = "<group>";
|
||||
@@ -2296,7 +2246,8 @@
|
||||
72666DC42B0B28D4001511B0 /* common_cli */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
72666DC52B0B28F4001511B0 /* secret.swift */,
|
||||
72666DC52B0B28F4001511B0 /* Secret.swift */,
|
||||
72C56E0F2EFEF10B0005A484 /* Signing.swift */,
|
||||
);
|
||||
path = common_cli;
|
||||
sourceTree = "<group>";
|
||||
@@ -2558,13 +2509,15 @@
|
||||
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 */,
|
||||
72C56E192F04343D0005A484 /* SPUAppcastSigningValidationStatus.h in Headers */,
|
||||
72B767CE1C9B924900A07552 /* SPUInstallerDriver.h in Headers */,
|
||||
723ABF30259D062F00BDB4FA /* SULegacyWebView.h in Headers */,
|
||||
721BC20E1D1CDE55002BC71E /* SPULocalCacheDirectory.h in Headers */,
|
||||
7267E5B11D3D8AD500D1BF90 /* SPUMessageTypes.h in Headers */,
|
||||
728337A61C9E6FF40085AA99 /* SPUProbeInstallStatus.h in Headers */,
|
||||
7286EE5F28CEC84900163C1D /* SUPlainTextReleaseNotesView.h in Headers */,
|
||||
7286EE5F28CEC84900163C1D /* SUTextViewReleaseNotesView.h in Headers */,
|
||||
723C8A541E2D60DB00C14942 /* SUTouchBarButtonGroup.h in Headers */,
|
||||
72B767D21C9C7B9300A07552 /* SPUProbingUpdateDriver.h in Headers */,
|
||||
7229E1B91C97CC4D00CB50D0 /* SPUScheduledUpdateDriver.h in Headers */,
|
||||
@@ -2579,6 +2532,7 @@
|
||||
72EF30BE2675CF38008CE987 /* SPUAppcastItemStateResolver.h in Headers */,
|
||||
72EF30C7267C716A008CE987 /* SUAppcastItem+Private.h in Headers */,
|
||||
72EE17FB26D1CC8800C58B19 /* SUInstallerLauncher+Private.h in Headers */,
|
||||
72C56E0C2EFDFB850005A484 /* SPUExtractSignedFeed.h in Headers */,
|
||||
61299A5C09CA6D4500B7442F /* SUConstants.h in Headers */,
|
||||
726DF88E1C84277600188804 /* SPUUserUpdateState.h in Headers */,
|
||||
72B767DA1C9CD2E400A07552 /* SPUUIBasedUpdateDriver.h in Headers */,
|
||||
@@ -2599,7 +2553,6 @@
|
||||
72B767CA1C9B707000A07552 /* SUAppcastDriver.h in Headers */,
|
||||
61B5FC7009C51F4A00B25A18 /* SUAppcastItem.h in Headers */,
|
||||
725602D51C83551C00DAA70E /* SUApplicationInfo.h in Headers */,
|
||||
7214B8811D456A8500CB5CED /* SUBundleIcon.h in Headers */,
|
||||
55E6F33319EC9F6C00005E76 /* SUErrors.h in Headers */,
|
||||
14652F8419A978C200959E44 /* SUExport.h in Headers */,
|
||||
7267E5E51D3D90AA00D1BF90 /* SUFileManager.h in Headers */,
|
||||
@@ -2641,7 +2594,6 @@
|
||||
buildWorkingDirectory = "";
|
||||
dependencies = (
|
||||
14732BCB1960F73500593899 /* PBXTargetDependency */,
|
||||
72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */,
|
||||
72F94F6B1CC4A0C8002DEE68 /* PBXTargetDependency */,
|
||||
725148E9266D918900247C9C /* PBXTargetDependency */,
|
||||
7218EC352623ED97008FECF3 /* PBXTargetDependency */,
|
||||
@@ -3141,6 +3093,7 @@
|
||||
fa,
|
||||
zh_HK,
|
||||
nn,
|
||||
vi,
|
||||
);
|
||||
mainGroup = 0867D691FE84028FC02AAC07 /* Sparkle */;
|
||||
packageReferences = (
|
||||
@@ -3182,11 +3135,13 @@
|
||||
files = (
|
||||
725B3A82263FBF0C0041AB8E /* testappcast_minimumAutoupdateVersion.xml in Resources */,
|
||||
14958C6E19AEBC950061B14F /* signed-test-file.txt in Resources */,
|
||||
72C56E262F04C28B0005A484 /* testreleasenotes.html in Resources */,
|
||||
723AD12F29922B5F006BB02F /* test-dangerous-link.xml in Resources */,
|
||||
72EB736129BEB36100FBCEE7 /* DevSignedAppVersion2.zip in Resources */,
|
||||
723EDC3F26885A8E000BCBA4 /* testappcast_channels.xml in Resources */,
|
||||
720DC50427A51A6500DFF3EC /* testappcast_minimumAutoupdateVersionSkipping.xml in Resources */,
|
||||
72E6D9712C04DE1A005496E4 /* SparkleTestCodeSign_pkg.dmg in Resources */,
|
||||
72526BE62EF3349D005791ED /* testappcast_minimumUpdateVersion.xml in Resources */,
|
||||
72AC6B2E1B9B218C00F62325 /* SparkleTestCodeSignApp.dmg in Resources */,
|
||||
C23E885B1BE7B24F0050BB73 /* SparkleTestCodeSignApp.enc.dmg in Resources */,
|
||||
72AC6B281B9AAD6700F62325 /* SparkleTestCodeSignApp.tar in Resources */,
|
||||
@@ -3211,6 +3166,7 @@
|
||||
72CCDEBE27421FD500B53718 /* SparkleTestCodeSignApp_bad_header.zip in Resources */,
|
||||
726FC0362C1E787A00177986 /* SparkleTestCodeSignApp.aar in Resources */,
|
||||
722545B626805FF80036465C /* testappcast_info_updates.xml in Resources */,
|
||||
723414172EBFB482009727E0 /* testappcast_arm64HardwareRequirement.xml in Resources */,
|
||||
7202DC9A269ABD3500737EC4 /* testappcast_phasedRollout.xml in Resources */,
|
||||
5F1510A21C96E591006E1629 /* testnamespaces.xml in Resources */,
|
||||
729F7EAC27366353004592DC /* test-links.xml in Resources */,
|
||||
@@ -3221,8 +3177,8 @@
|
||||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
1420DF50196247F900203BB0 /* Images.xcassets in Resources */,
|
||||
723ABDDB259A9E8600BDB4FA /* InfoPlist.strings in Resources */,
|
||||
7230BCDE2E22E2BC00B71297 /* Images.xcassets in Resources */,
|
||||
72E45CFC1B641961005C701A /* sparkletestcast.xml in Resources */,
|
||||
725F97A61C8B304D00265BE4 /* SUInstallUpdateViewController.xib in Resources */,
|
||||
723ABE02259A9E9E00BDB4FA /* MainMenu.xib in Resources */,
|
||||
@@ -3287,9 +3243,9 @@
|
||||
files = (
|
||||
61AAE8280A321A7F00D8810D /* Sparkle.strings in Resources */,
|
||||
1EAA4C8B2132C7BF00604473 /* ReleaseNotesColorStyle.css in Resources */,
|
||||
723ABD38259A9BA500BDB4FA /* SUUpdateAlert.xib in Resources */,
|
||||
72FE54422E56A14100227A91 /* SUUpdateAlert.xib in Resources */,
|
||||
55C14BEF136EF21700649790 /* SUStatus.xib in Resources */,
|
||||
723ABD6C259A9CBC00BDB4FA /* SUUpdatePermissionPrompt.xib in Resources */,
|
||||
729C51282E58015600D7365A /* SUUpdatePermissionPrompt.xib in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3389,6 +3345,8 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E202F04B3760005A484 /* Signing.swift in Sources */,
|
||||
72C56E1F2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift in Sources */,
|
||||
72D04F3E2B097D4300A6DEAA /* SPUVerifierInformation.m in Sources */,
|
||||
72266A8C29464D0200645376 /* SUSignatures.m in Sources */,
|
||||
72266A8B29464CEA00645376 /* SUHost.m in Sources */,
|
||||
@@ -3418,7 +3376,6 @@
|
||||
7267E5EC1D3D912900D1BF90 /* SUInstaller.m in Sources */,
|
||||
5AF6C7541AEA49840014A3AB /* SUInstallerTest.m in Sources */,
|
||||
14652F8219A9746000959E44 /* SULog.m in Sources */,
|
||||
7267E5F51D3D918B00D1BF90 /* SUPackageInstaller.m in Sources */,
|
||||
7267E5F81D3D91A800D1BF90 /* SUPipedUnarchiver.m in Sources */,
|
||||
7267E5F71D3D919600D1BF90 /* SUPlainInstaller.m in Sources */,
|
||||
72BEBFEF1D7287570019146B /* SUSpotlightImporterTest.swift in Sources */,
|
||||
@@ -3427,6 +3384,7 @@
|
||||
7210C7681B9A9A1500EB90AC /* SUUnarchiverTest.swift in Sources */,
|
||||
5AE459001C34118500E3BB47 /* SUUpdaterTest.m in Sources */,
|
||||
5AE459021C34118500E3BB47 /* SUVersionComparisonTest.m in Sources */,
|
||||
72C56E092EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3453,6 +3411,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E0E2EFEEF8B0005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
729743AB279D1BD2009910B2 /* SUCodeSigningVerifier.m in Sources */,
|
||||
725EE489277D39B400D820CE /* SPUDeltaArchive.m in Sources */,
|
||||
725EE48A277D39B400D820CE /* SPUXarDeltaArchive.m in Sources */,
|
||||
@@ -3460,13 +3419,13 @@
|
||||
72464F7C1E2097F600FB341C /* SUOperatingSystem.m in Sources */,
|
||||
7205C44C1E1304CE00E370AE /* Appcast.swift in Sources */,
|
||||
7205C44D1E1304CE00E370AE /* ArchiveItem.swift in Sources */,
|
||||
7205C44E1E1304CE00E370AE /* Signatures.swift in Sources */,
|
||||
7205C44F1E1304CE00E370AE /* FeedXML.swift in Sources */,
|
||||
7205C4411E13049400E370AE /* main.swift in Sources */,
|
||||
728ED34D277DA23400D9238F /* SPUSparkleDeltaArchive.m in Sources */,
|
||||
7205C45F1E13066F00E370AE /* SUBinaryDeltaApply.m in Sources */,
|
||||
7205C4621E1306A600E370AE /* SUBinaryDeltaCommon.m in Sources */,
|
||||
FA30773F24CBC3E9007BA37D /* URL+Hashing.swift in Sources */,
|
||||
72C56E102EFEF10B0005A484 /* Signing.swift in Sources */,
|
||||
7205C4611E13069000E370AE /* SUBinaryDeltaCreate.m in Sources */,
|
||||
7205C45B1E13064C00E370AE /* SUBinaryDeltaUnarchiver.m in Sources */,
|
||||
7205C45D1E13065F00E370AE /* SUConstants.m in Sources */,
|
||||
@@ -3478,7 +3437,7 @@
|
||||
7205C4571E13061F00E370AE /* SUUnarchiver.m in Sources */,
|
||||
7205C4581E13061F00E370AE /* SUUnarchiverNotifier.m in Sources */,
|
||||
7205C4501E1304CE00E370AE /* Unarchive.swift in Sources */,
|
||||
72666DC62B0B28F4001511B0 /* secret.swift in Sources */,
|
||||
72666DC62B0B28F4001511B0 /* Secret.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3500,7 +3459,6 @@
|
||||
5AA89BA623FE276A0094DAB8 /* SUSignatures.m in Sources */,
|
||||
7267E5FA1D3DAC3600D1BF90 /* StatusInfo.m in Sources */,
|
||||
720595EF1D700568000572E8 /* SUApplicationInfo.m in Sources */,
|
||||
7214B8831D456C2400CB5CED /* SUBundleIcon.m in Sources */,
|
||||
722FB7E6260EE53F00EB571C /* SUNormalization.m in Sources */,
|
||||
721C245E1CB757DE005440CB /* SUConstants.m in Sources */,
|
||||
7267E5EB1D3D90C200D1BF90 /* SUFileManager.m in Sources */,
|
||||
@@ -3541,12 +3499,12 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
7290BF302E5A5B0F00D75022 /* SUCodeSigningVerifier.m in Sources */,
|
||||
72464F7E1E21ED8C00FB341C /* SUHost.m in Sources */,
|
||||
726E07B41CAF08D6001A286B /* main.m in Sources */,
|
||||
721D8A7B1D4963190032E472 /* SPULocalCacheDirectory.m in Sources */,
|
||||
7267E5E11D3D901600D1BF90 /* SPUMessageTypes.m in Sources */,
|
||||
5AA89BA523FE27660094DAB8 /* SUSignatures.m in Sources */,
|
||||
7214B8841D456C9500CB5CED /* SUBundleIcon.m in Sources */,
|
||||
726E07BF1CAF0C6C001A286B /* SUConstants.m in Sources */,
|
||||
7267E5E81D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
|
||||
726E07B21CAF08D6001A286B /* SUInstallerLauncher.m in Sources */,
|
||||
@@ -3558,6 +3516,7 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
7290BF2F2E5A5AFA00D75022 /* SUCodeSigningVerifier.m in Sources */,
|
||||
723B5DA71CF7AB0100365F95 /* main.m in Sources */,
|
||||
72E539121D68C3FA0092CE5E /* SPUDownloadData.m in Sources */,
|
||||
723B5DA91CF7AB0100365F95 /* SPUDownloader.m in Sources */,
|
||||
@@ -3612,8 +3571,8 @@
|
||||
7267E5C31D3D8B2700D1BF90 /* SUInstaller.m in Sources */,
|
||||
5A6DD17123FE1FFC000AEF33 /* SUSignatures.m in Sources */,
|
||||
721D5A8525C65D3F00D23BEA /* SUFlatPackageUnarchiver.m in Sources */,
|
||||
72C56E0A2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
7267E5CE1D3D8C7500D1BF90 /* SULog.m in Sources */,
|
||||
7267E5C41D3D8B2700D1BF90 /* SUPackageInstaller.m in Sources */,
|
||||
7267E5871D3D89B300D1BF90 /* SUPipedUnarchiver.m in Sources */,
|
||||
7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */,
|
||||
7267E5D81D3D8D4400D1BF90 /* SUStandardVersionComparator.m in Sources */,
|
||||
@@ -3638,6 +3597,9 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E0B2EFDFB850005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
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 */,
|
||||
@@ -3677,7 +3639,6 @@
|
||||
7269E496264798200088C213 /* SPUSkippedUpdate.m in Sources */,
|
||||
7269E49A2648F7C00088C213 /* SPUUserUpdateState.m in Sources */,
|
||||
725602D61C83551C00DAA70E /* SUApplicationInfo.m in Sources */,
|
||||
7214B8821D456A8500CB5CED /* SUBundleIcon.m in Sources */,
|
||||
72DBA37F1D62C23E002594A8 /* SUCodeSigningVerifier.m in Sources */,
|
||||
61299A6009CA6EB100B7442F /* SUConstants.m in Sources */,
|
||||
7267E5E61D3D90AA00D1BF90 /* SUFileManager.m in Sources */,
|
||||
@@ -3690,7 +3651,7 @@
|
||||
61A225A50D1C4AC000430CCD /* SUStandardVersionComparator.m in Sources */,
|
||||
727F340B2605321D00020E85 /* SULog+NSError.m in Sources */,
|
||||
EA1E287022B66621004AA304 /* SUSignatures.m in Sources */,
|
||||
7286EE6028CEC84900163C1D /* SUPlainTextReleaseNotesView.m in Sources */,
|
||||
7286EE6028CEC84900163C1D /* SUTextViewReleaseNotesView.m in Sources */,
|
||||
6196CFFA09C72149000DC222 /* SUStatusController.m in Sources */,
|
||||
72B3DECA1E23472200457642 /* SPUDownloadedUpdate.m in Sources */,
|
||||
72AEB1D929A1CB510033883E /* SPUNoUpdateFoundInfo.m in Sources */,
|
||||
@@ -3738,8 +3699,9 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E122EFEF10B0005A484 /* Signing.swift in Sources */,
|
||||
EA1E286122B66487004AA304 /* main.swift in Sources */,
|
||||
72666DC72B0B28F4001511B0 /* secret.swift in Sources */,
|
||||
72666DC72B0B28F4001511B0 /* Secret.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3747,8 +3709,10 @@
|
||||
isa = PBXSourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
72C56E0D2EFE002D0005A484 /* SPUExtractSignedFeed.m in Sources */,
|
||||
EA1E287922B666EB004AA304 /* main.swift in Sources */,
|
||||
72666DC82B0B28F4001511B0 /* secret.swift in Sources */,
|
||||
72666DC82B0B28F4001511B0 /* Secret.swift in Sources */,
|
||||
72C56E112EFEF10B0005A484 /* Signing.swift in Sources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
@@ -3925,11 +3889,6 @@
|
||||
target = 721C24441CB753E6005440CB /* Installer Progress */;
|
||||
targetProxy = 72D954B91CBB6E27006F28BD /* PBXContainerItemProxy */;
|
||||
};
|
||||
72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = 72D9549D1CBB415B006F28BD /* sparkle-cli */;
|
||||
targetProxy = 72DBA3791D5FDE95002594A8 /* PBXContainerItemProxy */;
|
||||
};
|
||||
72EF30B926747E39008CE987 /* PBXTargetDependency */ = {
|
||||
isa = PBXTargetDependency;
|
||||
target = 8DC2EF4F0486A6940098B216 /* Sparkle */;
|
||||
@@ -3996,93 +3955,11 @@
|
||||
F6E11510281410D10003736C /* ar */,
|
||||
37A5F28528E9219000891504 /* zh_HK */,
|
||||
728FBA1C2BB5013300651EDF /* nn */,
|
||||
E0949FD02EFC4CFD0039C748 /* vi */,
|
||||
);
|
||||
name = Sparkle.strings;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
723ABD36259A9BA500BDB4FA /* SUUpdateAlert.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
723ABD37259A9BA500BDB4FA /* Base */,
|
||||
723ABD4C259A9BB900BDB4FA /* ar */,
|
||||
723ABD4D259A9BE100BDB4FA /* en */,
|
||||
723ABD4E259A9BEF00BDB4FA /* ca */,
|
||||
723ABD4F259A9BFD00BDB4FA /* zh_CN */,
|
||||
723ABD50259A9C0200BDB4FA /* zh_TW */,
|
||||
723ABD51259A9C0600BDB4FA /* cs */,
|
||||
723ABD52259A9C0900BDB4FA /* da */,
|
||||
723ABD53259A9C1000BDB4FA /* nl */,
|
||||
723ABD54259A9C1300BDB4FA /* fi */,
|
||||
723ABD55259A9C1500BDB4FA /* fr */,
|
||||
723ABD56259A9C1E00BDB4FA /* de */,
|
||||
723ABD57259A9C2100BDB4FA /* el */,
|
||||
723ABD58259A9C2400BDB4FA /* he */,
|
||||
723ABD59259A9C2C00BDB4FA /* is */,
|
||||
723ABD5A259A9C3600BDB4FA /* it */,
|
||||
723ABD5B259A9C3900BDB4FA /* ja */,
|
||||
723ABD5C259A9C3B00BDB4FA /* ko */,
|
||||
723ABD5D259A9C3D00BDB4FA /* nb */,
|
||||
723ABD5E259A9C4000BDB4FA /* pl */,
|
||||
723ABD5F259A9C4900BDB4FA /* pt-BR */,
|
||||
723ABD60259A9C4B00BDB4FA /* pt-PT */,
|
||||
723ABD61259A9C5400BDB4FA /* ro */,
|
||||
723ABD62259A9C5700BDB4FA /* ru */,
|
||||
723ABD63259A9C5900BDB4FA /* sk */,
|
||||
723ABD64259A9C5B00BDB4FA /* sl */,
|
||||
723ABD65259A9C5D00BDB4FA /* es */,
|
||||
723ABD66259A9C5F00BDB4FA /* sv */,
|
||||
723ABD67259A9C6100BDB4FA /* th */,
|
||||
723ABD68259A9C6300BDB4FA /* tr */,
|
||||
723ABD69259A9C6600BDB4FA /* uk */,
|
||||
72E1DAB625B3E8AE0001BA6D /* hr */,
|
||||
F67C9B7C281410B600740813 /* hu */,
|
||||
37A5F28728E9219000891504 /* zh_HK */,
|
||||
728FBA1A2BB5013300651EDF /* nn */,
|
||||
);
|
||||
name = SUUpdateAlert.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
723ABD6A259A9CBB00BDB4FA /* SUUpdatePermissionPrompt.xib */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
723ABD6B259A9CBB00BDB4FA /* Base */,
|
||||
723ABD80259A9CD600BDB4FA /* en */,
|
||||
723ABD81259A9CDA00BDB4FA /* ar */,
|
||||
723ABD82259A9CEC00BDB4FA /* cs */,
|
||||
723ABD83259A9CF000BDB4FA /* zh_CN */,
|
||||
723ABD84259A9CF400BDB4FA /* zh_TW */,
|
||||
723ABD85259A9CF800BDB4FA /* da */,
|
||||
723ABD86259A9CFC00BDB4FA /* nl */,
|
||||
723ABD87259A9CFF00BDB4FA /* fi */,
|
||||
723ABD88259A9D0200BDB4FA /* fr */,
|
||||
723ABD89259A9D1800BDB4FA /* de */,
|
||||
723ABD8A259A9D1C00BDB4FA /* el */,
|
||||
723ABD8D259A9D2700BDB4FA /* hu */,
|
||||
723ABD8E259A9D2A00BDB4FA /* is */,
|
||||
723ABD91259A9D3400BDB4FA /* it */,
|
||||
723ABD92259A9D3700BDB4FA /* ja */,
|
||||
723ABD93259A9D3C00BDB4FA /* ko */,
|
||||
723ABD94259A9D3E00BDB4FA /* nb */,
|
||||
723ABD95259A9D4100BDB4FA /* pl */,
|
||||
723ABD96259A9D4600BDB4FA /* pt-BR */,
|
||||
723ABD97259A9D4900BDB4FA /* pt-PT */,
|
||||
723ABD98259A9D4C00BDB4FA /* ro */,
|
||||
723ABD99259A9D4F00BDB4FA /* ru */,
|
||||
723ABD9A259A9D5200BDB4FA /* sk */,
|
||||
723ABD9B259A9D5500BDB4FA /* sl */,
|
||||
723ABD9C259A9D5700BDB4FA /* es */,
|
||||
723ABD9D259A9D5A00BDB4FA /* sv */,
|
||||
723ABD9E259A9D5D00BDB4FA /* th */,
|
||||
723ABD9F259A9D6000BDB4FA /* tr */,
|
||||
723ABDA0259A9D6300BDB4FA /* uk */,
|
||||
72E1DAB525B3E8AE0001BA6D /* hr */,
|
||||
37A5F28628E9219000891504 /* zh_HK */,
|
||||
728FBA192BB5013300651EDF /* nn */,
|
||||
0580A0572C0D3B9200FE836A /* he */,
|
||||
);
|
||||
name = SUUpdatePermissionPrompt.xib;
|
||||
sourceTree = "<group>";
|
||||
};
|
||||
723ABDD9259A9E8600BDB4FA /* InfoPlist.strings */ = {
|
||||
isa = PBXVariantGroup;
|
||||
children = (
|
||||
@@ -4130,6 +4007,7 @@
|
||||
726FD2CB25F4BE5F00123BC6 /* fa */,
|
||||
37A5F28828E9219000891504 /* zh_HK */,
|
||||
728FBA1B2BB5013300651EDF /* nn */,
|
||||
E0949FCF2EFC4CFC0039C748 /* vi */,
|
||||
);
|
||||
name = MainMenu.xib;
|
||||
sourceTree = "<group>";
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
<EnvironmentVariables>
|
||||
<EnvironmentVariable
|
||||
key = "TEST_MODE"
|
||||
value = "DELTA"
|
||||
value = "DELTA_AND_MARKDOWN"
|
||||
isEnabled = "NO">
|
||||
</EnvironmentVariable>
|
||||
</EnvironmentVariables>
|
||||
|
||||
@@ -1,217 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24093.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="macosx"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24093.7"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<customObject id="-2" userLabel="File's Owner" customClass="SUUpdateAlert">
|
||||
<connections>
|
||||
<outlet property="_automaticallyInstallUpdatesButton" destination="117" id="IBi-aO-qkM"/>
|
||||
<outlet property="_descriptionField" destination="101" id="JkK-Xy-kns"/>
|
||||
<outlet property="_installButton" destination="76" id="GVS-sG-rgG"/>
|
||||
<outlet property="_laterButton" destination="22" id="dk6-u6-yYI"/>
|
||||
<outlet property="_releaseNotesBoxView" destination="89" id="kwH-2g-hlh"/>
|
||||
<outlet property="_releaseNotesContainerView" destination="fKC-QA-GZa" id="j3k-Pl-zNb"/>
|
||||
<outlet property="_skipButton" destination="23" id="PPe-jC-Pvc"/>
|
||||
<outlet property="window" destination="5" id="69"/>
|
||||
</connections>
|
||||
</customObject>
|
||||
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
|
||||
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
|
||||
<window identifier="SUUpdateAlert" title="Software Update" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="" animationBehavior="default" id="5" userLabel="Update Alert (release notes)">
|
||||
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
|
||||
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
|
||||
<windowPositionMask key="initialPositionMask" topStrut="YES" bottomStrut="YES"/>
|
||||
<rect key="contentRect" x="746" y="229" width="620" height="370"/>
|
||||
<rect key="screenRect" x="0.0" y="0.0" width="2560" height="1409"/>
|
||||
<value key="minSize" type="size" width="550" height="150"/>
|
||||
<view key="contentView" id="6">
|
||||
<rect key="frame" x="0.0" y="0.0" width="620" height="370"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="7" userLabel="Program icon">
|
||||
<rect key="frame" x="22" y="286" width="64" height="64"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" secondItem="7" secondAttribute="height" multiplier="1:1" id="7pS-Kw-VGo"/>
|
||||
<constraint firstAttribute="width" priority="800" constant="64" id="QhW-E9-8Br"/>
|
||||
<constraint firstAttribute="height" priority="800" constant="64" id="aXh-vN-k5u"/>
|
||||
</constraints>
|
||||
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyUpOrDown" image="NSApplicationIcon" id="168"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="value" keyPath="applicationIcon" id="9"/>
|
||||
</connections>
|
||||
</imageView>
|
||||
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="10" userLabel="Version text field">
|
||||
<rect key="frame" x="106" y="338" width="494" height="17"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" priority="777" constant="17" id="n8w-DR-XEM"/>
|
||||
</constraints>
|
||||
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" allowsUndo="NO" sendsActionOnEndEditing="YES" usesSingleLineMode="YES" id="169">
|
||||
<font key="font" metaFont="systemBold"/>
|
||||
<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="titleText" id="11"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<textField focusRingType="none" horizontalHuggingPriority="350" verticalHuggingPriority="999" horizontalCompressionResistancePriority="100" verticalCompressionResistancePriority="1000" preferredMaxLayoutWidth="490" translatesAutoresizingMaskIntoConstraints="NO" id="101" userLabel="Question text field">
|
||||
<rect key="frame" x="106" y="316" width="494" height="14"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" priority="300" constant="28" id="H6E-te-Fog"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="KUO-Dw-g6s"/>
|
||||
</constraints>
|
||||
<textFieldCell key="cell" allowsUndo="NO" sendsActionOnEndEditing="YES" id="174">
|
||||
<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="descriptionText" id="103"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<customView translatesAutoresizingMaskIntoConstraints="NO" id="fKC-QA-GZa" userLabel="Container to hide release notes">
|
||||
<rect key="frame" x="108" y="77" width="492" height="231"/>
|
||||
<subviews>
|
||||
<box boxType="oldStyle" borderType="line" titlePosition="noTitle" translatesAutoresizingMaskIntoConstraints="NO" id="89">
|
||||
<rect key="frame" x="0.0" y="0.0" width="492" height="211"/>
|
||||
<view key="contentView" id="hbB-V1-Bf6">
|
||||
<rect key="frame" x="1" y="1" width="490" height="209"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
</view>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="pvn-8k-9Ev"/>
|
||||
</constraints>
|
||||
<font key="titleFont" size="11" name="LucidaGrande"/>
|
||||
<connections>
|
||||
<binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="164">
|
||||
<dictionary key="options">
|
||||
<string key="NSValueTransformerName">NSNegateBoolean</string>
|
||||
</dictionary>
|
||||
</binding>
|
||||
</connections>
|
||||
</box>
|
||||
<textField focusRingType="none" verticalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="17">
|
||||
<rect key="frame" x="-2" y="217" width="88" height="14"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" priority="100" constant="100" id="gkn-FW-9aC"/>
|
||||
</constraints>
|
||||
<textFieldCell key="cell" lineBreakMode="truncatingTail" allowsUndo="NO" sendsActionOnEndEditing="YES" title="Release Notes:" usesSingleLineMode="YES" id="170">
|
||||
<font key="font" metaFont="smallSystemBold"/>
|
||||
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
|
||||
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
|
||||
</textFieldCell>
|
||||
<connections>
|
||||
<binding destination="-2" name="hidden" keyPath="showsReleaseNotes" id="72">
|
||||
<dictionary key="options">
|
||||
<string key="NSValueTransformerName">NSNegateBoolean</string>
|
||||
</dictionary>
|
||||
</binding>
|
||||
</connections>
|
||||
</textField>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="89" firstAttribute="top" secondItem="17" secondAttribute="bottom" constant="6" id="1H8-33-yNF"/>
|
||||
<constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="17" secondAttribute="trailing" constant="408" id="5ym-81-wbN"/>
|
||||
<constraint firstAttribute="trailing" secondItem="89" secondAttribute="trailing" id="Bv8-Jz-SXd"/>
|
||||
<constraint firstAttribute="bottom" secondItem="89" secondAttribute="bottom" id="E4h-VA-0Xt"/>
|
||||
<constraint firstItem="17" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="top" id="P9G-6a-y7j"/>
|
||||
<constraint firstItem="89" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="e5T-q1-kq1"/>
|
||||
<constraint firstItem="17" firstAttribute="leading" secondItem="fKC-QA-GZa" secondAttribute="leading" id="tFH-k0-O7I"/>
|
||||
</constraints>
|
||||
</customView>
|
||||
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="22">
|
||||
<rect key="frame" x="342" y="19" width="126" height="24"/>
|
||||
<buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="171">
|
||||
<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="remindMeLater:" target="-2" id="34"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="23">
|
||||
<rect key="frame" x="109" y="19" width="129" height="24"/>
|
||||
<buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="172">
|
||||
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
|
||||
<font key="font" metaFont="system"/>
|
||||
</buttonCell>
|
||||
<connections>
|
||||
<action selector="skipThisVersion:" target="-2" id="33"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="76">
|
||||
<rect key="frame" x="480" y="19" width="120" height="24"/>
|
||||
<buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="173">
|
||||
<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" priority="222" constant="120" id="N94-uf-6oP"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<action selector="installUpdate:" target="-2" id="77"/>
|
||||
</connections>
|
||||
</button>
|
||||
<button translatesAutoresizingMaskIntoConstraints="NO" id="117">
|
||||
<rect key="frame" x="109" y="55" width="313" height="14"/>
|
||||
<buttonCell key="cell" type="check" title="Automatically download and install updates in the future" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="175">
|
||||
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
|
||||
<font key="font" metaFont="smallSystem"/>
|
||||
</buttonCell>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="lessThanOrEqual" constant="28" id="0AI-ue-a0r"/>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="14" id="yM1-TA-HfP"/>
|
||||
</constraints>
|
||||
<connections>
|
||||
<binding destination="93" name="value" keyPath="values.SUAutomaticallyUpdate" id="135"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="10" firstAttribute="leading" secondItem="7" secondAttribute="trailing" constant="22" id="2ef-4I-Il3"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fKC-QA-GZa" secondAttribute="trailing" constant="20" id="406-Cn-C5d"/>
|
||||
<constraint firstItem="101" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="7XS-9C-U6N"/>
|
||||
<constraint firstItem="23" firstAttribute="top" secondItem="117" secondAttribute="bottom" constant="12" id="CBk-cX-pk2"/>
|
||||
<constraint firstItem="22" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="23" secondAttribute="trailing" constant="12" id="EeC-NR-NYg"/>
|
||||
<constraint firstAttribute="trailing" secondItem="76" secondAttribute="trailing" constant="20" id="GdV-QF-Cdi"/>
|
||||
<constraint firstItem="76" firstAttribute="width" secondItem="22" secondAttribute="width" multiplier="0.8" priority="110" id="I8t-73-gX0"/>
|
||||
<constraint firstItem="117" firstAttribute="top" secondItem="fKC-QA-GZa" secondAttribute="bottom" priority="900" constant="8" id="M7E-UY-nWx"/>
|
||||
<constraint firstItem="fKC-QA-GZa" firstAttribute="top" secondItem="101" secondAttribute="bottom" constant="8" id="Mbz-C0-6Cx"/>
|
||||
<constraint firstItem="117" firstAttribute="leading" secondItem="23" secondAttribute="leading" id="Nm4-V1-7X0"/>
|
||||
<constraint firstItem="23" firstAttribute="leading" secondItem="117" secondAttribute="leading" id="OXY-8u-ljs"/>
|
||||
<constraint firstItem="23" firstAttribute="leading" secondItem="10" secondAttribute="leading" constant="1" id="RRB-n5-xid"/>
|
||||
<constraint firstItem="76" firstAttribute="leading" secondItem="22" secondAttribute="trailing" constant="12" id="VQk-Ut-ggj"/>
|
||||
<constraint firstItem="7" firstAttribute="top" secondItem="6" secondAttribute="top" constant="20" id="alH-AL-5RD"/>
|
||||
<constraint firstItem="22" firstAttribute="baseline" secondItem="23" secondAttribute="baseline" id="ayY-6b-JGg"/>
|
||||
<constraint firstItem="76" firstAttribute="baseline" secondItem="22" secondAttribute="baseline" id="dIR-3Q-wQx"/>
|
||||
<constraint firstAttribute="bottom" secondItem="76" secondAttribute="bottom" constant="19" id="gcR-Kl-Wlq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="101" secondAttribute="trailing" constant="22" id="k7p-HC-x7i"/>
|
||||
<constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="23" secondAttribute="leading" constant="-1" id="nVW-Qt-8JE"/>
|
||||
<constraint firstAttribute="trailing" secondItem="10" secondAttribute="trailing" constant="22" id="oQx-Oc-awc"/>
|
||||
<constraint firstItem="76" firstAttribute="width" secondItem="23" secondAttribute="width" priority="109" id="pLI-z3-P0b"/>
|
||||
<constraint firstItem="fKC-QA-GZa" firstAttribute="leading" secondItem="10" secondAttribute="leading" id="qQ9-OJ-06z"/>
|
||||
<constraint firstItem="101" firstAttribute="top" secondItem="10" secondAttribute="bottom" constant="8" id="r7Q-z5-jkx"/>
|
||||
<constraint firstItem="10" firstAttribute="top" secondItem="6" secondAttribute="top" constant="15" id="rXd-o0-WQQ"/>
|
||||
<constraint firstItem="7" firstAttribute="leading" secondItem="6" secondAttribute="leading" constant="22" id="zSE-lw-Ggj"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="-2" id="50"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="466" y="290"/>
|
||||
</window>
|
||||
<userDefaultsController representsSharedInstance="YES" id="93" userLabel="Shared Defaults"/>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="NSApplicationIcon" width="32" height="32"/>
|
||||
</resources>
|
||||
</document>
|
||||
@@ -10,6 +10,9 @@
|
||||
/* 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." = "%1$@ %2$@ is available but your macOS version is too old to install it. At least macOS %3$@ is required.";
|
||||
|
||||
/* Mac is too old and update requires Apple silicon Mac */
|
||||
"%1$@ %2$@ is available but this update requires a new Apple silicon Mac." = "%1$@ %2$@ is available but this update requires a new Apple silicon Mac.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"%1$@ can’t be updated if it’s running from the location it was downloaded to." = "%1$@ can’t be updated if it’s running from the location it was downloaded to.";
|
||||
|
||||
@@ -58,6 +61,9 @@
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the update. Please try again later." = "An error occurred while downloading the update. Please try again later.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while downloading the release notes." = "An error occurred while downloading the release notes.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"An error occurred while extracting the archive. Please try again later." = "An error occurred while extracting the archive. Please try again later.";
|
||||
|
||||
@@ -121,9 +127,6 @@
|
||||
/* Take care not to overflow the status window. */
|
||||
"Installing update…" = "Installing update…";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Interactive based packages cannot be installed as the root user." = "Interactive based packages cannot be installed as the root user.";
|
||||
|
||||
/* Alternate title for 'Install Update' button when there's no download in RSS feed. */
|
||||
"Learn More…" = "Learn More…";
|
||||
|
||||
@@ -161,11 +164,17 @@
|
||||
"The installation failed due to not having permission to write the new update." = "The installation failed due to not having permission to write the new update.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version." = "The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version.";
|
||||
"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." = "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.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The update is improperly signed and could not be validated. Please try again later or contact the app developer." = "The update is improperly signed and could not be validated. Please try again later or contact the app developer.";
|
||||
|
||||
/* 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." = "The update feed is improperly signed and could not be validated. Please try again later or contact the app developer.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"The release notes is improperly signed and could not be validated. Please contact the app developer for more information." = "The release notes is improperly signed and could not be validated. Please contact the app developer for more information.";
|
||||
|
||||
/* No comment provided by engineer. */
|
||||
"Unable to Check For Updates" = "Unable to Check For Updates";
|
||||
|
||||
@@ -196,5 +205,41 @@
|
||||
/* No comment provided by engineer. */
|
||||
"Your macOS version is too old" = "Your macOS version is too old";
|
||||
|
||||
/* Mac is too old and update requires newer hardware */
|
||||
"Your Mac is too old" = "Your Mac is too old";
|
||||
|
||||
/* 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!" = "You’re up to date!";
|
||||
|
||||
/* Software Update title/label */
|
||||
"Software Update" = "Software Update";
|
||||
|
||||
/* Remind Me Later choice for update alert */
|
||||
"Remind Me Later" = "Remind Me Later";
|
||||
|
||||
/* Skip This Version choice for update alert */
|
||||
"Skip This Version" = "Skip This Version";
|
||||
|
||||
/* Install Update choice for update alert */
|
||||
"Install Update" = "Install Update";
|
||||
|
||||
/* Automatically download and install updates in the future option for update alert */
|
||||
"Automatically download and install updates in the future" = "Automatically download and install updates in the future";
|
||||
|
||||
/* Check for updates automatically response for update permission dialog */
|
||||
"Check Automatically" = "Check Automatically";
|
||||
|
||||
/* Don't check for updates automatically response for update permission dialog */
|
||||
"Don’t Check" = "Don’t Check";
|
||||
|
||||
/* Title question for update permission dialog */
|
||||
"Check for updates automatically?" = "Check for updates automatically?";
|
||||
|
||||
/* Include anonymous system profile choice for update permission dialog */
|
||||
"Include anonymous system profile" = "Include anonymous system profile";
|
||||
|
||||
/* Automatically download and install updates choice for update permission dialog */
|
||||
"Automatically download and install updates" = "Automatically download and install updates";
|
||||
|
||||
/* 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:";
|
||||
@@ -37,7 +37,6 @@
|
||||
<string>da</string>
|
||||
<string>de</string>
|
||||
<string>el</string>
|
||||
<string>en</string>
|
||||
<string>es</string>
|
||||
<string>fa</string>
|
||||
<string>fi</string>
|
||||
@@ -51,6 +50,7 @@
|
||||
<string>ko</string>
|
||||
<string>nb</string>
|
||||
<string>nl</string>
|
||||
<string>nn</string>
|
||||
<string>pl</string>
|
||||
<string>pt-BR</string>
|
||||
<string>pt-PT</string>
|
||||
@@ -62,6 +62,7 @@
|
||||
<string>th</string>
|
||||
<string>tr</string>
|
||||
<string>uk</string>
|
||||
<string>vi</string>
|
||||
<string>zh_CN</string>
|
||||
<string>zh_HK</string>
|
||||
<string>zh_TW</string>
|
||||
|
||||
@@ -230,11 +230,40 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
// We will want to terminate those apps and observe their pids, but we will only do this if we don't find any regular matches
|
||||
NSMutableArray<NSRunningApplication *> *potentialMatchingTranslocatedRunningApplications = [[NSMutableArray alloc] init];
|
||||
|
||||
BOOL needsToHandleImproperBundles;
|
||||
if (@available(macOS 16, *)) {
|
||||
needsToHandleImproperBundles = NO;
|
||||
} else {
|
||||
needsToHandleImproperBundles = YES;
|
||||
}
|
||||
|
||||
for (NSRunningApplication *runningApplication in runningApplications) {
|
||||
// Comparing the URLs hasn't worked well for me in practice, so I'm comparing the file paths instead
|
||||
NSString *candidatePath = runningApplication.bundleURL.URLByResolvingSymlinksInPath.path;
|
||||
if (candidatePath != nil) {
|
||||
NSArray<NSString *> *candidatePathComponents = candidatePath.pathComponents;
|
||||
|
||||
if (needsToHandleImproperBundles) {
|
||||
// Workaround cases where macOS appends Contents/MacOS/<executable> to the bundle path which can happen in corner cases (eg: mishandled bundles or helper executables).
|
||||
// This may happen with app bundles which have wrapper/tramopline executables that spawn the main executable
|
||||
// https://github.com/sparkle-project/Sparkle/issues/2725
|
||||
|
||||
NSUInteger candidatePathComponentsCount = candidatePathComponents.count;
|
||||
// > 3 is fine instead of >= 3 because there should be another parent path component for the bundle
|
||||
if (candidatePathComponentsCount > 3 && [candidatePathComponents[candidatePathComponentsCount - 3] isEqualToString:@"Contents"] && [candidatePathComponents[candidatePathComponentsCount - 2] isEqualToString:@"MacOS"]) {
|
||||
|
||||
// Lastly verify if the bundle is not actually a directory
|
||||
// Note the IO check is the last check for this corner case
|
||||
// This ensures it's not an ordinary helper app that happens to be inside another app bundle.
|
||||
BOOL candidatePathIsDir = YES;
|
||||
if ([[NSFileManager defaultManager] fileExistsAtPath:candidatePath isDirectory:&candidatePathIsDir] && !candidatePathIsDir) {
|
||||
NSMutableArray<NSString *> *trimmedBundlePath = [candidatePathComponents mutableCopy];
|
||||
[trimmedBundlePath removeObjectsInRange:NSMakeRange(candidatePathComponentsCount - 3, 3)];
|
||||
candidatePathComponents = trimmedBundlePath;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ([candidatePathComponents isEqualToArray:bundlePathComponents]) {
|
||||
[matchedRunningApplications addObject:runningApplication];
|
||||
} else if (matchedRunningApplications.count == 0 && candidatePathComponents.count > 0 && bundlePathComponents.count > 0) {
|
||||
@@ -291,7 +320,9 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
NSRunningApplication *firstRunningApplication = runningApplications.firstObject;
|
||||
|
||||
BOOL targetDead = (firstRunningApplication == nil || firstRunningApplication.terminated);
|
||||
reply(targetDead);
|
||||
if (reply != NULL) {
|
||||
reply(targetDead);
|
||||
}
|
||||
|
||||
self->_repliedToRegistration = YES;
|
||||
self->_applicationBundle = applicationBundle;
|
||||
@@ -329,7 +360,9 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
|
||||
#endif
|
||||
if (self->_targetRunningApplication != nil && self->_terminationCompletionHandler == nil) {
|
||||
if (self->_targetRunningApplication.terminated) {
|
||||
completionHandler();
|
||||
if (completionHandler != NULL) {
|
||||
completionHandler();
|
||||
}
|
||||
} else {
|
||||
self->_terminationCompletionHandler = [completionHandler copy];
|
||||
|
||||
|
||||
@@ -96,7 +96,7 @@
|
||||
{
|
||||
_statusController = [[SUStatusController alloc] initWithHost:host windowTitle:_updatingString centerPointValue:nil minimizable:NO closable:NO];
|
||||
|
||||
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO];
|
||||
[_statusController setButtonTitle:_cancelUpdateTitle target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
[_statusController beginActionWithTitle:_installingUpdateTitle maxProgressValue:0 statusText:@""];
|
||||
|
||||
|
||||
@@ -15,13 +15,15 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUAppcastItemState : NSObject
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK;
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumUpdateVersionIsOK:(BOOL)minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:(BOOL)arm64HardwareRequirementIsOK;
|
||||
|
||||
@property (nonatomic, readonly) BOOL majorUpgrade;
|
||||
@property (nonatomic, readonly) BOOL criticalUpdate;
|
||||
@property (nonatomic, readonly) BOOL informationalUpdate;
|
||||
@property (nonatomic, readonly) BOOL minimumUpdateVersionIsOK;
|
||||
@property (nonatomic, readonly) BOOL minimumOperatingSystemVersionIsOK;
|
||||
@property (nonatomic, readonly) BOOL maximumOperatingSystemVersionIsOK;
|
||||
@property (nonatomic, readonly) BOOL arm64HardwareRequirementIsOK;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -14,8 +14,10 @@
|
||||
#define SPUAppcastItemStateMajorUpgradeKey @"SPUAppcastItemStateMajorUpgrade"
|
||||
#define SPUAppcastItemStateCriticalUpdateKey @"SPUAppcastItemStateCriticalUpdate"
|
||||
#define SPUAppcastItemStateInformationalUpdateKey @"SPUAppcastItemStateInformationalUpdate"
|
||||
#define SPUAppcastItemStateUpdateMinimumVersionIsOKKey @"SPUAppcastItemStateMinimumUpdateVersionIsOK"
|
||||
#define SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey @"SPUAppcastItemStateMinimumOperatingSystemVersionIsOK"
|
||||
#define SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey @"SPUAppcastItemStateMaximumOperatingSystemVersionIsOK"
|
||||
#define SPUAppcastItemStateArm64HardwareRequirementIsOKKey @"SPUAppcastItemStateArm64HardwareRequirementIsOK"
|
||||
|
||||
@interface SPUAppcastItemState () <NSSecureCoding>
|
||||
@end
|
||||
@@ -25,18 +27,22 @@
|
||||
@synthesize majorUpgrade = _majorUpgrade;
|
||||
@synthesize criticalUpdate = _criticalUpdate;
|
||||
@synthesize informationalUpdate = _informationalUpdate;
|
||||
@synthesize minimumUpdateVersionIsOK = _minimumUpdateVersionIsOK;
|
||||
@synthesize minimumOperatingSystemVersionIsOK = _minimumOperatingSystemVersionIsOK;
|
||||
@synthesize maximumOperatingSystemVersionIsOK = _maximumOperatingSystemVersionIsOK;
|
||||
@synthesize arm64HardwareRequirementIsOK = _arm64HardwareRequirementIsOK;
|
||||
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK
|
||||
- (instancetype)initWithMajorUpgrade:(BOOL)majorUpgrade criticalUpdate:(BOOL)criticalUpdate informationalUpdate:(BOOL)informationalUpdate minimumUpdateVersionIsOK:(BOOL)minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:(BOOL)minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:(BOOL)maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:(BOOL)arm64HardwareRequirementIsOK
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_majorUpgrade = majorUpgrade;
|
||||
_criticalUpdate = criticalUpdate;
|
||||
_informationalUpdate = informationalUpdate;
|
||||
_minimumUpdateVersionIsOK = minimumUpdateVersionIsOK;
|
||||
_minimumOperatingSystemVersionIsOK = minimumOperatingSystemVersionIsOK;
|
||||
_maximumOperatingSystemVersionIsOK = maximumOperatingSystemVersionIsOK;
|
||||
_arm64HardwareRequirementIsOK = arm64HardwareRequirementIsOK;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
@@ -51,8 +57,10 @@
|
||||
[encoder encodeBool:_majorUpgrade forKey:SPUAppcastItemStateMajorUpgradeKey];
|
||||
[encoder encodeBool:_criticalUpdate forKey:SPUAppcastItemStateCriticalUpdateKey];
|
||||
[encoder encodeBool:_informationalUpdate forKey:SPUAppcastItemStateInformationalUpdateKey];
|
||||
[encoder encodeBool:_minimumUpdateVersionIsOK forKey:SPUAppcastItemStateUpdateMinimumVersionIsOKKey];
|
||||
[encoder encodeBool:_minimumOperatingSystemVersionIsOK forKey:SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey];
|
||||
[encoder encodeBool:_maximumOperatingSystemVersionIsOK forKey:SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey];
|
||||
[encoder encodeBool:_arm64HardwareRequirementIsOK forKey:SPUAppcastItemStateArm64HardwareRequirementIsOKKey];
|
||||
}
|
||||
|
||||
- (instancetype)initWithCoder:(NSCoder *)decoder
|
||||
@@ -60,10 +68,12 @@
|
||||
BOOL majorUpgrade = [decoder decodeBoolForKey:SPUAppcastItemStateMajorUpgradeKey];
|
||||
BOOL criticalUpdate = [decoder decodeBoolForKey:SPUAppcastItemStateCriticalUpdateKey];
|
||||
BOOL informationalUpdate = [decoder decodeBoolForKey:SPUAppcastItemStateInformationalUpdateKey];
|
||||
BOOL minimumUpdateVersionIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateUpdateMinimumVersionIsOKKey];
|
||||
BOOL minimumOperatingSystemVersionIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateMinimumOperatingSystemVersionIsOKKey];
|
||||
BOOL maximumOperatingSystemVersionIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateMaximumOperatingSystemVersionIsOKKey];
|
||||
BOOL arm64HardwareRequirementIsOK = [decoder decodeBoolForKey:SPUAppcastItemStateArm64HardwareRequirementIsOKKey];
|
||||
|
||||
return [self initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK];
|
||||
return [self initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumUpdateVersionIsOK:minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:arm64HardwareRequirementIsOK];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -13,7 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface SPUAppcastItemStateResolver ()
|
||||
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary;
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumUpdateVersion:(NSString * _Nullable)minimumUpdateVersion minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary hardwareRequirements:(NSSet<NSString *> *)hardwareRequirements;
|
||||
|
||||
+ (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator;
|
||||
|
||||
|
||||
@@ -13,7 +13,11 @@
|
||||
#import "SUStandardVersionComparator.h"
|
||||
#import "SUConstants.h"
|
||||
#import "SUOperatingSystem.h"
|
||||
#import "SULog.h"
|
||||
|
||||
#import <TargetConditionals.h>
|
||||
#import <sys/types.h>
|
||||
#import <sys/sysctl.h>
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@@ -35,7 +39,18 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)isMinimumOperatingSystemVersionOK:(NSString * _Nullable)minimumSystemVersion
|
||||
- (BOOL)isMinimumUpdateVersionOK:(NSString * _Nullable)minimumUpdateVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
NSString *hostVersion = _hostVersion;
|
||||
|
||||
BOOL minimumVersionOK = YES;
|
||||
if (minimumUpdateVersion != nil && ![minimumUpdateVersion isEqualToString:@""]) {
|
||||
minimumVersionOK = [_applicationVersionComparator compareVersion:(NSString * _Nonnull)minimumUpdateVersion toVersion:hostVersion] != NSOrderedDescending;
|
||||
}
|
||||
return minimumVersionOK;
|
||||
}
|
||||
|
||||
- (BOOL)isMinimumOperatingSystemVersionOK:(NSString * _Nullable)minimumSystemVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL minimumVersionOK = YES;
|
||||
if (minimumSystemVersion != nil && ![minimumSystemVersion isEqualToString:@""]) {
|
||||
@@ -44,7 +59,7 @@
|
||||
return minimumVersionOK;
|
||||
}
|
||||
|
||||
- (BOOL)isMaximumOperatingSystemVersionOK:(NSString * _Nullable)maximumSystemVersion
|
||||
- (BOOL)isMaximumOperatingSystemVersionOK:(NSString * _Nullable)maximumSystemVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL maximumVersionOK = YES;
|
||||
if (maximumSystemVersion != nil && ![maximumSystemVersion isEqualToString:@""]) {
|
||||
@@ -58,12 +73,12 @@
|
||||
return (minimumAutoupdateVersion.length == 0 || ([versionComparator compareVersion:hostVersion toVersion:(NSString * _Nonnull)minimumAutoupdateVersion] != NSOrderedAscending));
|
||||
}
|
||||
|
||||
- (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion
|
||||
- (BOOL)isMinimumAutoupdateVersionOK:(NSString * _Nullable)minimumAutoupdateVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
return [[self class] isMinimumAutoupdateVersionOK:minimumAutoupdateVersion hostVersion:_hostVersion versionComparator:_applicationVersionComparator];
|
||||
}
|
||||
|
||||
- (BOOL)isCriticalUpdateWithCriticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary
|
||||
- (BOOL)isCriticalUpdateWithCriticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary SPU_OBJC_DIRECT
|
||||
{
|
||||
// Check if any critical update info is provided
|
||||
if (criticalUpdateDictionary == nil) {
|
||||
@@ -80,7 +95,7 @@
|
||||
return ([_applicationVersionComparator compareVersion:_hostVersion toVersion:criticalVersion] == NSOrderedAscending);
|
||||
}
|
||||
|
||||
- (BOOL)isInformationalUpdateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions
|
||||
- (BOOL)isInformationalUpdateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions SPU_OBJC_DIRECT
|
||||
{
|
||||
if (informationalUpdateVersions == nil) {
|
||||
return NO;
|
||||
@@ -109,10 +124,48 @@
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary
|
||||
- (BOOL)isArm64HardwareRequirementOK:(NSSet<NSString *> *)hardwareRequirements minimumSystemVersion:(NSString *_Nullable )minimumSystemVersion SPU_OBJC_DIRECT
|
||||
{
|
||||
#if TARGET_CPU_X86_64
|
||||
// macOS 27+ will no longer support Intel Macs
|
||||
BOOL hasARM64Requirement;
|
||||
if (minimumSystemVersion.length > 0 && [_standardVersionComparator compareVersion:(NSString * _Nonnull)minimumSystemVersion toVersion:@"27.0"] != NSOrderedAscending) {
|
||||
hasARM64Requirement = YES;
|
||||
} else {
|
||||
hasARM64Requirement = [hardwareRequirements containsObject:SUAppcastElementHardwareRequirementARM64];
|
||||
}
|
||||
|
||||
if (!hasARM64Requirement) {
|
||||
return YES;
|
||||
}
|
||||
|
||||
// If the process is run under Rosetta, then the hardware is compatible
|
||||
// https://developer.apple.com/documentation/apple-silicon/about-the-rosetta-translation-environment
|
||||
int translatedResult = 0;
|
||||
size_t translatedResultSize = sizeof(translatedResult);
|
||||
if (sysctlbyname("sysctl.proc_translated", &translatedResult, &translatedResultSize, NULL, 0) == -1) {
|
||||
if (errno == ENOENT) {
|
||||
// Native x86_64 process
|
||||
return NO;
|
||||
}
|
||||
|
||||
// An error occured
|
||||
SULog(SULogLevelError, @"Error: failed to detect if process is running under rosetta with error: %d", errno);
|
||||
return YES;
|
||||
}
|
||||
|
||||
return (translatedResult == 1);
|
||||
#else
|
||||
return YES;
|
||||
#endif
|
||||
}
|
||||
|
||||
- (SPUAppcastItemState *)resolveStateWithInformationalUpdateVersions:(NSSet<NSString *> * _Nullable)informationalUpdateVersions minimumUpdateVersion:(NSString * _Nullable)minimumUpdateVersion minimumOperatingSystemVersion:(NSString * _Nullable)minimumOperatingSystemVersion maximumOperatingSystemVersion:(NSString * _Nullable)maximumOperatingSystemVersion minimumAutoupdateVersion:(NSString * _Nullable)minimumAutoupdateVersion criticalUpdateDictionary:(NSDictionary * _Nullable)criticalUpdateDictionary hardwareRequirements:(NSSet<NSString *> *)hardwareRequirements
|
||||
{
|
||||
BOOL informationalUpdate = [self isInformationalUpdateWithInformationalUpdateVersions:informationalUpdateVersions];
|
||||
|
||||
BOOL minimumUpdateVersionIsOK = [self isMinimumUpdateVersionOK:minimumUpdateVersion];
|
||||
|
||||
BOOL minimumOperatingSystemVersionIsOK = [self isMinimumOperatingSystemVersionOK:minimumOperatingSystemVersion];
|
||||
|
||||
BOOL maximumOperatingSystemVersionIsOK = [self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion];;
|
||||
@@ -121,7 +174,9 @@
|
||||
|
||||
BOOL criticalUpdate = [self isCriticalUpdateWithCriticalUpdateDictionary:criticalUpdateDictionary];
|
||||
|
||||
return [[SPUAppcastItemState alloc] initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK];
|
||||
BOOL arm64HardwareRequirementIsOK = [self isArm64HardwareRequirementOK:hardwareRequirements minimumSystemVersion:minimumOperatingSystemVersion];
|
||||
|
||||
return [[SPUAppcastItemState alloc] initWithMajorUpgrade:majorUpgrade criticalUpdate:criticalUpdate informationalUpdate:informationalUpdate minimumUpdateVersionIsOK:minimumUpdateVersionIsOK minimumOperatingSystemVersionIsOK:minimumOperatingSystemVersionIsOK maximumOperatingSystemVersionIsOK:maximumOperatingSystemVersionIsOK arm64HardwareRequirementIsOK:arm64HardwareRequirementIsOK];
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -0,0 +1,32 @@
|
||||
//
|
||||
// SPUAppcastSigningValidationStatus.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 12/30/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#ifndef SPUAppcastSigningValidationStatus_h
|
||||
#define SPUAppcastSigningValidationStatus_h
|
||||
|
||||
typedef NS_ENUM(NSInteger, SPUAppcastSigningValidationStatus)
|
||||
{
|
||||
/**
|
||||
The bundle does not opt into requiring appcast signing and no validation of the appcast feed is done.
|
||||
*/
|
||||
SPUAppcastSigningValidationStatusSkipped = 0,
|
||||
|
||||
/**
|
||||
The appcast is signed and validation has passed succesfully.
|
||||
*/
|
||||
SPUAppcastSigningValidationStatusSucceeded,
|
||||
|
||||
/**
|
||||
The appcast is signed and validation has failed. In this case, appcast items operate in a 'safe' fallback mode
|
||||
meaning that they cannot be marked as a critical update, cannot be marked as informational update,
|
||||
and will not have any release note or link references.
|
||||
*/
|
||||
SPUAppcastSigningValidationStatusFailed,
|
||||
};
|
||||
|
||||
#endif /* SPUAppcastSigningValidationStatus_h */
|
||||
@@ -31,7 +31,7 @@
|
||||
__weak id<SPUUserDriver> _userDriver;
|
||||
__weak id _updaterDelegate;
|
||||
|
||||
BOOL _willInstallSilently;
|
||||
BOOL _installerDidFinishPreparation;
|
||||
}
|
||||
|
||||
- (instancetype)initWithHost:(SUHost *)host applicationBundle:(NSBundle *)applicationBundle updater:(id)updater userDriver:(id <SPUUserDriver>)userDriver updaterDelegate:(nullable id <SPUUpdaterDelegate>)updaterDelegate
|
||||
@@ -78,11 +78,17 @@
|
||||
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 (updateItem.isInformationOnlyUpdate || updateItem.majorUpgrade) {
|
||||
if (SPUUpdateRequiresUserAttentionBeforeDownloading(updateItem)) {
|
||||
[_coreDriver deferInformationalUpdate:updateItem secondaryUpdate:secondaryUpdateItem];
|
||||
[self abortUpdate];
|
||||
} else {
|
||||
@@ -95,14 +101,14 @@
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
|
||||
{
|
||||
_willInstallSilently = willInstallSilently;
|
||||
_installerDidFinishPreparation = YES;
|
||||
|
||||
if (!willInstallImmediately) {
|
||||
BOOL installationHandledByDelegate = NO;
|
||||
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
|
||||
if (_willInstallSilently && [updaterDelegate respondsToSelector:@selector(updater:willInstallUpdateOnQuit:immediateInstallationBlock:)]) {
|
||||
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(), ^{
|
||||
@@ -139,7 +145,9 @@
|
||||
|
||||
- (void)abortUpdateWithError:(NSError *)error
|
||||
{
|
||||
BOOL showNextUpdateImmediately = (error == nil || error.code == SUInstallationAuthorizeLaterError) && (!_willInstallSilently || _updateItem.criticalUpdate || _updateItem.isInformationOnlyUpdate);
|
||||
// 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];
|
||||
}
|
||||
|
||||
@@ -148,21 +148,12 @@
|
||||
id updater = _updater;
|
||||
|
||||
if (!resuming) {
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
// interactive pkg based updates are not supported under root user
|
||||
if ([updateItem.installationType isEqualToString:SPUInstallationTypeInteractivePackage] && geteuid() == 0) {
|
||||
[delegate basicDriverIsRequestingAbortUpdateWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationRootInteractiveError userInfo:@{ NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"Interactive based packages cannot be installed as the root user.", SPARKLE_TABLE, SUSparkleBundle(), nil) }]];
|
||||
// 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;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
// 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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -211,8 +202,13 @@
|
||||
break;
|
||||
case NSOrderedAscending:
|
||||
// A new update is available but cannot be installed
|
||||
// More detailed recovery suggestions are in SPUNoUpdateFoundRecoverySuggestion()
|
||||
|
||||
if (!latestAppcastItem.minimumOperatingSystemVersionIsOK) {
|
||||
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;
|
||||
|
||||
@@ -20,7 +20,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
- (void)basicDriverDidFindUpdateWithAppcastItem:(SUAppcastItem *)updateItem secondaryAppcastItem:(SUAppcastItem * _Nullable)secondaryAppcastItem;
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently;
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately;
|
||||
|
||||
- (void)coreDriverIsRequestingAbortUpdateWithError:(nullable NSError *)error;
|
||||
|
||||
|
||||
@@ -295,9 +295,9 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
|
||||
{
|
||||
[_delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately silently:willInstallSilently];
|
||||
[_delegate installerDidFinishPreparationAndWillInstallImmediately:willInstallImmediately];
|
||||
}
|
||||
|
||||
- (void)finishInstallationWithResponse:(SPUUserUpdateChoice)response displayingUserInterface:(BOOL)displayingUserInterface
|
||||
|
||||
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
* A class for containing downloaded data along with some information about it.
|
||||
*/
|
||||
SU_EXPORT @interface SPUDownloadData : NSObject <NSSecureCoding>
|
||||
SU_EXPORT NS_SWIFT_SENDABLE @interface SPUDownloadData : NSObject <NSSecureCoding>
|
||||
|
||||
/**
|
||||
* The raw data that was downloaded.
|
||||
|
||||
@@ -81,11 +81,20 @@
|
||||
if (strongSelf != nil && !strongSelf->_retrievedDownloadResult && !strongSelf->_cleaningUp) {
|
||||
strongSelf->_downloader = nil;
|
||||
|
||||
SULog(SULogLevelError, @"Connection to update downloader was invalidated");
|
||||
NSString *additionalFailureReason;
|
||||
{
|
||||
NSString *executableFailureReason;
|
||||
if (!SPUXPCServiceHasExecutablePermission(@DOWNLOADER_NAME, &executableFailureReason)) {
|
||||
additionalFailureReason = [NSString stringWithFormat:@" %@", executableFailureReason];
|
||||
} else {
|
||||
additionalFailureReason = @"";
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary *userInfo =
|
||||
@{
|
||||
NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while downloading the update. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
|
||||
NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"If your app is not sandboxed or has com.apple.security.network.client set to YES, please remove %@ from your Info.plist. Please also check Console logs for "@DOWNLOADER_NAME" if there are any additional details.%@", SUEnableDownloaderServiceKey, additionalFailureReason]
|
||||
};
|
||||
|
||||
NSError *downloadError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUDownloadError userInfo:userInfo];
|
||||
@@ -113,6 +122,10 @@
|
||||
_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;
|
||||
|
||||
if (userAgent != nil) {
|
||||
@@ -148,6 +161,8 @@
|
||||
|
||||
- (void)downloadFile
|
||||
{
|
||||
assert(NSThread.isMainThread);
|
||||
|
||||
id<SPUDownloadDriverDelegate> delegate = _delegate;
|
||||
if ([delegate respondsToSelector:@selector(downloadDriverWillBeginDownload)]) {
|
||||
[delegate downloadDriverWillBeginDownload];
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
//
|
||||
// SPUExtractSignedFeed.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 12/25/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
// Extracts content from an appcast without the signing block, optionally returning back the signed signature & expected content length
|
||||
NSData *SPUExtractAppcastContent(NSData *appcastData, NSString * _Nullable __autoreleasing * _Nullable outEdSignatureBase64, uint64_t * _Nullable outContentLength);
|
||||
|
||||
// Extracts HTML or markdown release notes data without the beginning sign warning comment
|
||||
NSData *SPUExtractReleaseNotesContent(NSData *data);
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -0,0 +1,95 @@
|
||||
//
|
||||
// SPUExtractSignedFeed.m
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 12/25/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SPUExtractSignedFeed.h"
|
||||
|
||||
NSData *SPUExtractAppcastContent(NSData *appcastData, NSString * _Nullable __autoreleasing * _Nullable outEdSignatureBase64, uint64_t * _Nullable outContentLength)
|
||||
{
|
||||
static char feedSigningPrefix[] = "<!-- sparkle-signatures:\n";
|
||||
static char feedSigningSuffix[] = "-->";
|
||||
|
||||
NSUInteger appcastDataLength = appcastData.length;
|
||||
|
||||
NSRange prefixRange = [appcastData rangeOfData:[NSData dataWithBytesNoCopy:feedSigningPrefix length:sizeof(feedSigningPrefix) - 1 freeWhenDone:NO] options:NSDataSearchBackwards range:NSMakeRange(0, appcastDataLength)];
|
||||
|
||||
if (prefixRange.location == NSNotFound) {
|
||||
return appcastData;
|
||||
}
|
||||
|
||||
NSData *contentFeedData = [appcastData subdataWithRange:NSMakeRange(0, prefixRange.location)];
|
||||
|
||||
NSRange suffixRange = [appcastData rangeOfData:[NSData dataWithBytesNoCopy:feedSigningSuffix length:sizeof(feedSigningSuffix) - 1 freeWhenDone:NO] options:0 range:NSMakeRange(NSMaxRange(prefixRange), appcastDataLength - NSMaxRange(prefixRange))];
|
||||
|
||||
if (suffixRange.location == NSNotFound) {
|
||||
return appcastData;
|
||||
}
|
||||
|
||||
NSData *signingBlockData = [appcastData subdataWithRange:NSMakeRange(NSMaxRange(prefixRange), suffixRange.location - NSMaxRange(prefixRange))];
|
||||
|
||||
NSString *signingBlockString = [[NSString alloc] initWithData:signingBlockData encoding:NSUTF8StringEncoding];
|
||||
if (signingBlockString == nil) {
|
||||
return appcastData;
|
||||
}
|
||||
|
||||
__block NSString *edSignatureBase64 = nil;
|
||||
__block uint64_t contentLength = 0;
|
||||
static NSString *edSignatureKey = @"edSignature:";
|
||||
static NSString *lengthKey = @"length:";
|
||||
[signingBlockString enumerateLinesUsingBlock:^(NSString * _Nonnull line, BOOL * _Nonnull __unused stop) {
|
||||
if ([line hasPrefix:edSignatureKey]) {
|
||||
edSignatureBase64 = [[line substringFromIndex:edSignatureKey.length] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
|
||||
} else if ([line hasPrefix:lengthKey]) {
|
||||
contentLength = (uint64_t)[[[line substringFromIndex:lengthKey.length] stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet] longLongValue];
|
||||
}
|
||||
}];
|
||||
|
||||
if (outEdSignatureBase64 != nil) {
|
||||
*outEdSignatureBase64 = [edSignatureBase64 copy];
|
||||
}
|
||||
|
||||
if (outContentLength != NULL) {
|
||||
*outContentLength = contentLength;
|
||||
}
|
||||
|
||||
return contentFeedData;
|
||||
}
|
||||
|
||||
NSData *SPUExtractReleaseNotesContent(NSData *data)
|
||||
{
|
||||
NSData *signWarningCommentPrefix = [@"<!-- sparkle-sign-warning:" dataUsingEncoding:NSUTF8StringEncoding];
|
||||
NSData *signWarningComment = [@"-->" dataUsingEncoding:NSUTF8StringEncoding];
|
||||
|
||||
if (signWarningCommentPrefix.length == 0 || signWarningComment.length == 0) {
|
||||
return data;
|
||||
}
|
||||
|
||||
if (data.length < signWarningCommentPrefix.length + signWarningComment.length) {
|
||||
return data;
|
||||
}
|
||||
|
||||
if (![[data subdataWithRange:NSMakeRange(0, signWarningCommentPrefix.length)] isEqualToData:signWarningCommentPrefix]) {
|
||||
return data;
|
||||
}
|
||||
|
||||
NSRange commentSuffixRange = [data rangeOfData:signWarningComment options:0 range:NSMakeRange(signWarningCommentPrefix.length, data.length - signWarningCommentPrefix.length)];
|
||||
|
||||
if (commentSuffixRange.location == NSNotFound) {
|
||||
return data;
|
||||
}
|
||||
|
||||
// A newline is usually inserted after the signing warning comment
|
||||
// Ignore that character too if present
|
||||
NSUInteger endOfCommentSuffix = NSMaxRange(commentSuffixRange);
|
||||
NSUInteger endOfCommentSuffixAccountingForNewline =
|
||||
(data.length > endOfCommentSuffix && *((const uint8_t *)data.bytes + endOfCommentSuffix) == '\n') ?
|
||||
(endOfCommentSuffix + 1) :
|
||||
endOfCommentSuffix;
|
||||
|
||||
NSData *contentData = [data subdataWithRange:NSMakeRange(endOfCommentSuffixAccountingForNewline, data.length - endOfCommentSuffixAccountingForNewline)];
|
||||
return contentData;
|
||||
}
|
||||
@@ -11,9 +11,9 @@
|
||||
|
||||
#define SPUInstallationTypeApplication @"application" // the default installation type for ordinary application updates
|
||||
#define SPUInstallationTypeGuidedPackage @"package" // the preferred installation type for package installations
|
||||
#define SPUInstallationTypeInteractivePackage @"interactive-package" // the deprecated installation type; use guided package instead
|
||||
#define SPUInstallationTypeInteractivePackage @"interactive-package" // removed installation type; use guided package instead
|
||||
|
||||
#define SPUInstallationTypesArray (@[SPUInstallationTypeApplication, SPUInstallationTypeGuidedPackage, SPUInstallationTypeInteractivePackage])
|
||||
#define SPUInstallationTypesArray (@[SPUInstallationTypeApplication, SPUInstallationTypeGuidedPackage])
|
||||
#define SPUValidInstallationType(x) ((x != nil) && [SPUInstallationTypesArray containsObject:(NSString * _Nonnull)x])
|
||||
|
||||
#endif /* SPUInstallationType_h */
|
||||
@@ -18,7 +18,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- (void)installerDidStartInstallingWithApplicationTerminated:(BOOL)applicationTerminated;
|
||||
- (void)installerDidStartExtracting;
|
||||
- (void)installerDidExtractUpdateWithProgress:(double)progress;
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)willInstallSilently;
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately;
|
||||
- (void)installerWillFinishInstallationAndRelaunch:(BOOL)relaunch;
|
||||
- (void)installerDidFinishInstallationAndRelaunched:(BOOL)relaunch acknowledgement:(void(^)(void))acknowledgement;
|
||||
|
||||
|
||||
@@ -167,13 +167,16 @@
|
||||
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
|
||||
assert(hostBundleIdentifier != nil);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
@@ -181,9 +184,21 @@
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
__typeof__(self) strongSelf = weakSelf;
|
||||
if (strongSelf != nil && strongSelf->_installerConnection != nil && !strongSelf->_aborted) {
|
||||
NSString *impactedTools = usingInstallerService ? (@SPARKLE_RELAUNCH_TOOL_NAME" and "@INSTALLER_LAUNCHER_NAME) : @SPARKLE_RELAUNCH_TOOL_NAME;
|
||||
|
||||
NSString *additionalFailureReason;
|
||||
{
|
||||
NSString *executableFailureReason;
|
||||
if (!SPUHelperHasExecutablePermission(@SPARKLE_RELAUNCH_TOOL_NAME, &executableFailureReason) || !SPUHelperHasExecutablePermission(@SPARKLE_INSTALLER_PROGRESS_TOOL_NAME@".app/Contents/MacOS/"@SPARKLE_INSTALLER_PROGRESS_TOOL_NAME, &executableFailureReason)) {
|
||||
additionalFailureReason = executableFailureReason;
|
||||
} else {
|
||||
additionalFailureReason = [NSString stringWithFormat:@"If your application is sandboxed, please ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/ . Otherwise if %@ %@ not adhoc signed, your app must be signed with a matching team ID", impactedTools, (usingInstallerService ? @"are" : @"is")];
|
||||
}
|
||||
}
|
||||
|
||||
NSDictionary *genericUserInfo = @{
|
||||
NSLocalizedDescriptionKey: SULocalizedStringFromTableInBundle(@"An error occurred while running the updater. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
|
||||
NSLocalizedFailureReasonErrorKey:@"The remote port connection was invalidated from the updater. For additional details, please check Console logs for "@SPARKLE_RELAUNCH_TOOL_NAME". If your application is sandboxed, please also ensure Installer Connection & Status entitlements are correctly set up: https://sparkle-project.org/documentation/sandboxing/"
|
||||
NSLocalizedFailureReasonErrorKey:[NSString stringWithFormat:@"The remote port connection was invalidated from the updater. %@. For additional details, check Console logs for %@", additionalFailureReason, impactedTools]
|
||||
};
|
||||
|
||||
[strongSelf _reportInstallerError:strongSelf->_installerError genericErrorCode:SUInstallationError genericUserInfo:genericUserInfo];
|
||||
@@ -327,17 +342,12 @@
|
||||
SULog(SULogLevelError, @"Error: Archived data to send for appcast item is nil");
|
||||
}
|
||||
|
||||
BOOL canInstallSilently = NO;
|
||||
if (data.length >= sizeof(uint8_t)) {
|
||||
canInstallSilently = (BOOL)*(const uint8_t *)data.bytes;
|
||||
}
|
||||
|
||||
BOOL hasTargetTerminated = NO;
|
||||
if (data.length >= sizeof(uint8_t) * 2) {
|
||||
hasTargetTerminated = (BOOL)*((const uint8_t *)data.bytes + 1);
|
||||
if (data.length >= sizeof(uint8_t)) {
|
||||
hasTargetTerminated = (BOOL)*((const uint8_t *)data.bytes);
|
||||
}
|
||||
|
||||
[delegate installerDidFinishPreparationAndWillInstallImmediately:hasTargetTerminated silently:canInstallSilently];
|
||||
[delegate installerDidFinishPreparationAndWillInstallImmediately:hasTargetTerminated];
|
||||
} else if (identifier == SPUInstallationFinishedStage2) {
|
||||
_currentStage = identifier;
|
||||
|
||||
@@ -407,8 +417,19 @@
|
||||
#endif
|
||||
if (!retrievedLaunchStatus) {
|
||||
#pragma clang diagnostic pop
|
||||
NSString *additionalFailureReason;
|
||||
{
|
||||
NSString *executableFailureReason;
|
||||
if (!SPUXPCServiceHasExecutablePermission(@INSTALLER_LAUNCHER_NAME, &executableFailureReason)) {
|
||||
additionalFailureReason = [NSString stringWithFormat:@" %@", executableFailureReason];
|
||||
} else {
|
||||
additionalFailureReason = @"";
|
||||
}
|
||||
}
|
||||
|
||||
NSError *error =
|
||||
[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while connecting to the installer. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil) }];
|
||||
[NSError errorWithDomain:SUSparkleErrorDomain code:SUInstallationError userInfo:@{ NSLocalizedDescriptionKey:SULocalizedStringFromTableInBundle(@"An error occurred while connecting to the installer. Please try again later.", SPARKLE_TABLE, SUSparkleBundle(), nil),
|
||||
NSLocalizedFailureReasonErrorKey: [NSString stringWithFormat:@"If your app is not sandboxed, please remove or disable %@ in your app's Info.plist. Please also check Console logs for "@INSTALLER_LAUNCHER_NAME" and "@SPARKLE_RELAUNCH_TOOL_NAME" processes if there are additional details.%@", SUEnableInstallerLauncherServiceKey, additionalFailureReason]}];
|
||||
|
||||
completionHandler(error);
|
||||
|
||||
@@ -441,34 +462,7 @@
|
||||
NSString *installationType = _updateItem.installationType;
|
||||
assert(installationType != nil);
|
||||
|
||||
// The installer launcher could be in a XPC service, so we don't want to do localization in there
|
||||
// Make sure the authorization prompt reflects whether or not the updater is updating itself, or
|
||||
// if the updater is updating another application. We use SUHost.name property, so an application
|
||||
// or Sparkle helper application can override its name with SUBundleName key
|
||||
|
||||
SUHost *mainBundleHost = [[SUHost alloc] initWithBundle:[NSBundle mainBundle]];
|
||||
NSString *mainBundleName = mainBundleHost.name;
|
||||
NSString *hostName = _host.name;
|
||||
|
||||
// Changing this authorization prompt is a little complicated because the
|
||||
// Auth database retains and caches the right we use, and there isn't a good way
|
||||
// of updating the prompt. See code in SUInstallerLauncher.m
|
||||
// For this reason, we don't provide localized strings for this prompt yet
|
||||
// (and I believe, the authorization framework has a different way of specifying localizations..)
|
||||
NSString *authorizationPrompt;
|
||||
if ([mainBundleName isEqualToString:hostName]) {
|
||||
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update.", hostName];
|
||||
} else {
|
||||
authorizationPrompt = [NSString stringWithFormat:@"%1$@ wants permission to update %2$@.", mainBundleName, hostName];
|
||||
}
|
||||
|
||||
NSString *mainBundleIdentifier;
|
||||
{
|
||||
NSString *bundleIdentifier = mainBundleHost.bundle.bundleIdentifier;
|
||||
mainBundleIdentifier = (bundleIdentifier == nil) ? mainBundleName : bundleIdentifier;
|
||||
}
|
||||
|
||||
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath updaterIdentifier:mainBundleIdentifier authorizationPrompt:authorizationPrompt installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
|
||||
[installerLauncher launchInstallerWithHostBundlePath:hostBundlePath mainBundlePath:NSBundle.mainBundle.bundlePath installationType:installationType allowingDriverInteraction:driverAllowsInteraction completion:^(SUInstallerLauncherStatus result, BOOL systemDomain) {
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
#if INSTALLER_LAUNCHER_XPC_SERVICE_EMBEDDED
|
||||
retrievedLaunchStatus = YES;
|
||||
|
||||
@@ -39,6 +39,7 @@ NSString *SPUNoUpdateFoundRecoverySuggestion(SPUNoUpdateFoundReason reason, SUAp
|
||||
case SPUNoUpdateFoundReasonOnNewerThanLatestVersion:
|
||||
case SPUNoUpdateFoundReasonSystemIsTooOld:
|
||||
case SPUNoUpdateFoundReasonSystemIsTooNew:
|
||||
case SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64:
|
||||
assert(latestAppcastItem != nil);
|
||||
|
||||
hostDisplayVersion = host.displayVersion;
|
||||
@@ -68,6 +69,9 @@ NSString *SPUNoUpdateFoundRecoverySuggestion(SPUNoUpdateFoundReason reason, SUAp
|
||||
case SPUNoUpdateFoundReasonSystemIsTooNew:
|
||||
recoverySuggestion = [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ %2$@ is available but your macOS version is too new for this update. This update only supports up to macOS %3$@.", SPARKLE_TABLE, sparkleBundle, nil), host.name, latestAppcastItemDisplayVersion, latestAppcastItem.maximumSystemVersion];
|
||||
break;
|
||||
case SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64:
|
||||
recoverySuggestion = [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"%1$@ %2$@ is available but this update requires a new Apple silicon Mac.", SPARKLE_TABLE, sparkleBundle, nil), host.name, latestAppcastItemDisplayVersion];
|
||||
break;
|
||||
}
|
||||
return recoverySuggestion;
|
||||
}
|
||||
@@ -35,9 +35,9 @@
|
||||
|
||||
+ (nullable SPUSkippedUpdate *)skippedUpdateForHost:(SUHost *)host
|
||||
{
|
||||
NSString *minorVersion = [host objectForUserDefaultsKey:SUSkippedMinorVersionKey];
|
||||
NSString *majorVersion = [host objectForUserDefaultsKey:SUSkippedMajorVersionKey];
|
||||
NSString *majorSubreleaseVersion = [host objectForUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey];
|
||||
NSString *minorVersion = [host objectForUserDefaultsKey:SUSkippedMinorVersionKey ofClass:NSString.class];
|
||||
NSString *majorVersion = [host objectForUserDefaultsKey:SUSkippedMajorVersionKey ofClass:NSString.class];
|
||||
NSString *majorSubreleaseVersion = [host objectForUserDefaultsKey:SUSkippedMajorSubreleaseVersionKey ofClass:NSString.class];
|
||||
|
||||
if (minorVersion != nil || majorVersion != nil) {
|
||||
return [[SPUSkippedUpdate alloc] initWithMinorVersion:minorVersion majorVersion:majorVersion majorSubreleaseVersion:majorSubreleaseVersion];
|
||||
|
||||
@@ -37,8 +37,10 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
It also allows hooking up the updater's and user driver's delegates.
|
||||
|
||||
If you need more control over what bundle you want to update, or you want to provide a custom user interface (via `SPUUserDriver`), please use `SPUUpdater` directly instead.
|
||||
|
||||
This class must be used on the main thread.
|
||||
*/
|
||||
SU_EXPORT @interface SPUStandardUpdaterController : NSObject
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUStandardUpdaterController : NSObject
|
||||
{
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wobjc-interface-ivars"
|
||||
@@ -79,6 +81,8 @@ SU_EXPORT @interface SPUStandardUpdaterController : NSObject
|
||||
Create a new `SPUStandardUpdaterController` programmatically.
|
||||
|
||||
The updater is started automatically. See `-startUpdater` for more information.
|
||||
|
||||
Note the `updaterDelegate` and `userDriverDelegate` are weakly referenced, so you are responsible for keeping them alive.
|
||||
*/
|
||||
- (instancetype)initWithUpdaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
|
||||
|
||||
@@ -87,6 +91,8 @@ SU_EXPORT @interface SPUStandardUpdaterController : NSObject
|
||||
|
||||
You can specify whether or not you want to start the updater immediately.
|
||||
If you do not start the updater, you must invoke `-startUpdater` at a later time to start it.
|
||||
|
||||
Note the `updaterDelegate` and `userDriverDelegate` are weakly referenced, so you are responsible for keeping them alive.
|
||||
*/
|
||||
- (instancetype)initWithStartingUpdater:(BOOL)startUpdater updaterDelegate:(nullable id<SPUUpdaterDelegate>)updaterDelegate userDriverDelegate:(nullable id<SPUStandardUserDriverDelegate>)userDriverDelegate;
|
||||
|
||||
|
||||
@@ -81,15 +81,21 @@
|
||||
if (![_updater startUpdater:&updaterError]) {
|
||||
SULog(SULogLevelError, @"Fatal updater error (%ld): %@", updaterError.code, updaterError.localizedDescription);
|
||||
|
||||
// Delay the alert four seconds so it doesn't show RIGHT as the app launches, but also doesn't interrupt the user once they really get to work.
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(4 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
// Delay the alert a bit to allow other start-up actions
|
||||
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
|
||||
NSBundle *hostBundle = [NSBundle mainBundle];
|
||||
SUHost *host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
|
||||
#if SPARKLE_COPY_LOCALIZATIONS
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
// This is a developer facing error message which is never actually meant to occur in production
|
||||
// Feel free to provide localizations if you want, but it is not strictly necessary.
|
||||
// Previously, this code path used to be an abort()
|
||||
NSAlert *alert = [[NSAlert alloc] init];
|
||||
alert.messageText = SULocalizedStringFromTableInBundle(@"Unable to Check For Updates", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
alert.informativeText = SULocalizedStringFromTableInBundle(@"The update checker failed to start correctly. You should contact the app developer to report this issue and verify that you have the latest version.", SPARKLE_TABLE, sparkleBundle, nil);
|
||||
alert.informativeText = [NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"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.", SPARKLE_TABLE, sparkleBundle, nil), host.name];
|
||||
[alert runModal];
|
||||
});
|
||||
}
|
||||
|
||||
@@ -27,13 +27,13 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
Sparkle's standard built-in user driver for updater interactions
|
||||
*/
|
||||
SU_EXPORT @interface SPUStandardUserDriver : NSObject <SPUUserDriver>
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUStandardUserDriver : NSObject <SPUUserDriver>
|
||||
|
||||
/**
|
||||
Initializes a Sparkle's standard user driver for user update interactions
|
||||
|
||||
@param hostBundle The target bundle of the host that is being updated.
|
||||
@param delegate The optional delegate to this user driver.
|
||||
@param delegate The optional delegate to this user driver. Note the standard user driver weakly references the delegate, so you are responsible for keeping it alive.
|
||||
*/
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle delegate:(nullable id<SPUStandardUserDriverDelegate>)delegate;
|
||||
|
||||
|
||||
@@ -25,6 +25,9 @@
|
||||
#import "SPUStandardVersionDisplay.h"
|
||||
#import "SULog.h"
|
||||
#import "SPUNoUpdateFoundInfo.h"
|
||||
#import "SPUUpdaterSettings.h"
|
||||
#import "SPUUpdaterSettings+Debug.h"
|
||||
|
||||
#include <time.h>
|
||||
#include <mach/mach_time.h>
|
||||
#import <IOKit/pwr_mgt/IOPMLib.h>
|
||||
@@ -38,9 +41,6 @@
|
||||
@end
|
||||
#endif
|
||||
|
||||
// The amount of time the app is allowed to be idle for us to consider showing an update prompt right away when the app is active
|
||||
static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 30.0 : 5 * 60.0;
|
||||
|
||||
@interface SPUStandardUserDriver () <SPUGentleUserDriverReminders>
|
||||
|
||||
// Note: we expose a private interface for activeUpdateAlert property in SPUStandardUserDriver+Private.h as NSWindowController
|
||||
@@ -65,6 +65,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
SUStatusController *_checkingController;
|
||||
|
||||
SUUpdateAlert *_activeUpdateAlert;
|
||||
SPUUpdaterSettings *_updaterSettings;
|
||||
|
||||
SUStatusController *_statusController;
|
||||
SUUpdatePermissionPrompt *_permissionPrompt;
|
||||
@@ -92,6 +93,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
_updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:hostBundle];
|
||||
_oldHostName = _host.name;
|
||||
_oldHostBundleURL = hostBundle.bundleURL;
|
||||
_delegate = delegate;
|
||||
@@ -218,7 +220,9 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
if (!appNearUpdaterInitialization && !backgroundApp) {
|
||||
timeSinceLastEvent = CGEventSourceSecondsSinceLastEventType(kCGEventSourceStateHIDSystemState, kCGAnyInputEventType);
|
||||
|
||||
if (timeSinceLastEvent >= SUScheduledUpdateIdleEventLeewayInterval) {
|
||||
NSTimeInterval scheduledUpdateIdleEventLeewayInterval = _updaterSettings.standardUIScheduledUpdateIdleEventLeewayInterval;
|
||||
|
||||
if (timeSinceLastEvent >= scheduledUpdateIdleEventLeewayInterval) {
|
||||
// Make sure there's no active power management assertions preventing
|
||||
// the display from sleeping by the current application.
|
||||
// If there is, then the app may still actively be in use
|
||||
@@ -350,6 +354,10 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
[self closeCheckingWindow];
|
||||
|
||||
if (_activeUpdateAlert != nil) {
|
||||
SULog(SULogLevelError, @"Error: -[%@ %@] should not be called when _activeUpdateAlert != nil:\n%@", NSStringFromClass([self class]), NSStringFromSelector(_cmd), NSThread.callStackSymbols);
|
||||
}
|
||||
|
||||
id<SPUStandardUserDriverDelegate> delegate = _delegate;
|
||||
id<SUVersionDisplay> customVersionDisplayer = nil;
|
||||
|
||||
@@ -363,7 +371,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
__weak id<SPUStandardUserDriverDelegate> weakDelegate = delegate;
|
||||
_activeUpdateAlert = [[SUUpdateAlert alloc] initWithAppcastItem:appcastItem state:state host:_host versionDisplayer:versionDisplayer completionBlock:^(SPUUserUpdateChoice choice, NSRect windowFrame, BOOL wasKeyWindow) {
|
||||
_activeUpdateAlert = [[SUUpdateAlert alloc] initWithAppcastItem:appcastItem state:state host:_host versionDisplayer:versionDisplayer updaterSettings:_updaterSettings delegate:delegate completionBlock:^(SPUUserUpdateChoice choice, NSRect windowFrame, BOOL wasKeyWindow) {
|
||||
reply(choice);
|
||||
|
||||
__typeof__(self) strongSelf = weakSelf;
|
||||
@@ -453,7 +461,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
// I don't want to expose SULog here because it's more of a user driver facing error
|
||||
// For our purposes we just ignore it and continue on..
|
||||
NSLog(@"Failed to download release notes with error: %@", error);
|
||||
[_activeUpdateAlert showReleaseNotesFailedToDownload];
|
||||
[_activeUpdateAlert showReleaseNotesFailedToDownloadWithError:error];
|
||||
}
|
||||
|
||||
- (void)showUpdateInFocus
|
||||
@@ -497,7 +505,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Ready to Install", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:1.0 statusText:nil];
|
||||
[_statusController setProgressValue:1.0]; // Fill the bar.
|
||||
[_statusController setButtonEnabled:YES];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil) target:self action:selector isDefault:YES];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Install and Relaunch", SPARKLE_TABLE, sparkleBundle, nil) target:self action:selector isDefault:YES accessibilityIdentifier:@"SUStatusInstallAndRelaunch"];
|
||||
}
|
||||
|
||||
- (void)showReadyToInstallAndRelaunch:(void (^)(SPUUserUpdateChoice))installUpdateHandler
|
||||
@@ -538,10 +546,10 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
NSBundle *sparkleBundle = SUSparkleBundle();
|
||||
#endif
|
||||
|
||||
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:[NSString stringWithFormat:SULocalizedStringFromTableInBundle(@"Updating %@", SPARKLE_TABLE, sparkleBundle, nil), [_host name]] centerPointValue:nil minimizable:NO closable:NO];
|
||||
_checkingController = [[SUStatusController alloc] initWithHost:_host windowTitle:SULocalizedStringFromTableInBundle(@"Software Update", SPARKLE_TABLE, sparkleBundle, nil) centerPointValue:nil minimizable:NO closable:NO];
|
||||
[[_checkingController window] center]; // Force the checking controller to load its window.
|
||||
[_checkingController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Checking for updates…", SPARKLE_TABLE, sparkleBundle, nil) maxProgressValue:0.0 statusText:nil];
|
||||
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO];
|
||||
[_checkingController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelCheckForUpdates:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
// For background applications, obtain focus.
|
||||
// Useful if the update check is requested from another app like System Preferences.
|
||||
@@ -691,6 +699,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
}
|
||||
case SPUNoUpdateFoundReasonSystemIsTooOld:
|
||||
case SPUNoUpdateFoundReasonSystemIsTooNew:
|
||||
case SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64:
|
||||
if (latestAppcastItem.infoURL != nil) {
|
||||
// Show the user the product's link if available
|
||||
[alert addButtonWithTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, sparkleBundle, nil)];
|
||||
@@ -781,7 +790,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Downloading update…", SPARKLE_TABLE, sparkleBundle, @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil];
|
||||
[_statusController setProgressValue:0.0];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelDownload:) isDefault:NO];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:self action:@selector(cancelDownload:) isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
|
||||
_bytesDownloaded = 0;
|
||||
}
|
||||
@@ -841,7 +850,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
|
||||
|
||||
[_statusController beginActionWithTitle:SULocalizedStringFromTableInBundle(@"Extracting update…", SPARKLE_TABLE, sparkleBundle, @"Take care not to overflow the status window.") maxProgressValue:1.0 statusText:nil];
|
||||
[_statusController setProgressValue:0.0];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:nil action:nil isDefault:NO];
|
||||
[_statusController setButtonTitle:SULocalizedStringFromTableInBundle(@"Cancel", SPARKLE_TABLE, sparkleBundle, nil) target:nil action:nil isDefault:NO accessibilityIdentifier:@"SUStatusCancel"];
|
||||
[_statusController setButtonEnabled:NO];
|
||||
}
|
||||
|
||||
|
||||
@@ -188,6 +188,22 @@ SU_EXPORT @protocol SPUStandardUserDriverDelegate <NSObject>
|
||||
*/
|
||||
- (void)standardUserDriverWillFinishUpdateSession;
|
||||
|
||||
/**
|
||||
Called before the standard user driver shows plain-text or markdown release notes text to the user.
|
||||
|
||||
The delegate has the opportunity to return a new attributed string for the release notes text that will be shown to the user.
|
||||
The `bundleDisplayVersion` and `bundleVersion` are supplied in case they're useful for creating a new attributed string.
|
||||
|
||||
This method will not be invoked for HTML release notes. It is only applicable to plain-text and markdown release notes.
|
||||
|
||||
@param releaseNotesAttributedString The release notes text that the standard user driver wants to show to the user.
|
||||
@param update The new update the release notes will be shown for.
|
||||
@param bundleDisplayVersion The current display version (or `CFBundleShortVersionString`) of the bundle that is being updated.
|
||||
@param bundleVersion The current version (or `CFBundleVersion`) of the bundle that is being updated.
|
||||
@return A new attributed string for the release notes text to show, or @c nil if the `releaseNotesAttributedString` should still be used.
|
||||
*/
|
||||
- (NSAttributedString * _Nullable)standardUserDriverWillShowReleaseNotesText:(NSAttributedString *)releaseNotesAttributedString forUpdate:(SUAppcastItem *)update withBundleDisplayVersion:(NSString *)bundleDisplayVersion bundleVersion:(NSString *)bundleVersion;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -15,10 +15,17 @@
|
||||
#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"
|
||||
@@ -30,14 +37,21 @@
|
||||
@implementation SPUReleaseNotesDriver
|
||||
{
|
||||
SPUDownloadDriver *_downloadDriver;
|
||||
SUHost *_host;
|
||||
SUSignatures *_signatures;
|
||||
|
||||
void (^_completionHandler)(SPUDownloadData * _Nullable, NSError * _Nullable);
|
||||
|
||||
uint64_t _contentLength;
|
||||
}
|
||||
|
||||
- (instancetype)initWithReleaseNotesURL:(NSURL *)releaseNotesURL httpHeaders:(NSDictionary * _Nullable)httpHeaders userAgent:(NSString * _Nullable)userAgent host:(SUHost *)host completionHandler:(void (^)(SPUDownloadData * _Nullable, NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
|
||||
- (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 {
|
||||
@@ -51,10 +65,49 @@
|
||||
[_downloadDriver downloadFile];
|
||||
}
|
||||
|
||||
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
|
||||
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadDataToValidate
|
||||
{
|
||||
if (_completionHandler != nil) {
|
||||
_completionHandler(downloadData, 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;
|
||||
}
|
||||
}
|
||||
@@ -62,7 +115,13 @@
|
||||
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
|
||||
{
|
||||
if (_completionHandler != nil) {
|
||||
_completionHandler(nil, error);
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -171,8 +230,8 @@
|
||||
id<SPUUIBasedUpdateDriverDelegate> delegate = _delegate;
|
||||
|
||||
SPUUserUpdateStage stage;
|
||||
// Major upgrades and information only updates are not downloaded automatically
|
||||
if (_resumingDownloadedInfoOrUpdate && !updateItem.majorUpgrade && !updateItem.informationOnlyUpdate) {
|
||||
// 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;
|
||||
@@ -268,7 +327,7 @@
|
||||
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 httpHeaders:_httpHeaders userAgent:_userAgent host:_host completionHandler:^(SPUDownloadData * _Nullable downloadData, NSError * _Nullable error) {
|
||||
_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;
|
||||
@@ -355,7 +414,7 @@
|
||||
[_userDriver showExtractionReceivedProgress:progress];
|
||||
}
|
||||
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately silently:(BOOL)__unused willInstallSilently
|
||||
- (void)installerDidFinishPreparationAndWillInstallImmediately:(BOOL)willInstallImmediately
|
||||
{
|
||||
if (!willInstallImmediately) {
|
||||
[_userDriver showReadyToInstallAndRelaunch:^(SPUUserUpdateChoice choice) {
|
||||
|
||||
@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
This class represents information needed to make a permission request for checking updates.
|
||||
*/
|
||||
SU_EXPORT @interface SPUUpdatePermissionRequest : NSObject<NSSecureCoding>
|
||||
SU_EXPORT NS_SWIFT_SENDABLE @interface SPUUpdatePermissionRequest : NSObject<NSSecureCoding>
|
||||
|
||||
/**
|
||||
Initializes a new update permission request instance.
|
||||
|
||||
@@ -42,8 +42,10 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
- `feedURL`
|
||||
|
||||
Please view the documentation on each of these properties for more detail if you are to configure them dynamically.
|
||||
|
||||
This class must be used on the main thread.
|
||||
*/
|
||||
SU_EXPORT @interface SPUUpdater : NSObject
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUUpdater : NSObject
|
||||
|
||||
/**
|
||||
Initializes a new `SPUUpdater` instance
|
||||
@@ -55,7 +57,7 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
@param hostBundle The bundle that should be targeted for updating.
|
||||
@param applicationBundle The application bundle that should be waited for termination and relaunched (unless overridden). Usually this can be the same as hostBundle. This may differ when updating a plug-in or other non-application bundle.
|
||||
@param userDriver The user driver that Sparkle uses for user update interaction.
|
||||
@param delegate The delegate for `SPUUpdater`.
|
||||
@param delegate The delegate for `SPUUpdater`. Note the updater weakly references the delegate, so you are responsible for keeping it alive.
|
||||
*/
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle applicationBundle:(NSBundle *)applicationBundle userDriver:(id <SPUUserDriver>)userDriver delegate:(nullable id<SPUUpdaterDelegate>)delegate;
|
||||
|
||||
@@ -96,11 +98,13 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
|
||||
If an update hasn't started, the user may be shown that a new check for updates is occurring.
|
||||
If an update has already been downloaded or begun installing from a previous session, the user may be presented to install that update.
|
||||
If the user is already being presented with an update, that update will be shown to the user in active focus.
|
||||
If the user is already being presented with an update or update permission prompt, that notice may be shown to the user in active focus
|
||||
(as long as the user driver is the standard `SPUStandardUserDriver` or if it implements `-[SPUUserDriver showUpdateInFocus]`).
|
||||
|
||||
This will find updates that the user has previously opted into skipping.
|
||||
|
||||
See `canCheckForUpdates` property which can determine when this method may be invoked.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)checkForUpdates;
|
||||
|
||||
@@ -126,6 +130,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
This will not find updates that the user has opted into skipping.
|
||||
|
||||
This method does not do anything if there is a `sessionInProgress`.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)checkForUpdatesInBackground;
|
||||
|
||||
@@ -144,13 +150,18 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
Updates that have been skipped by the user will not be found.
|
||||
|
||||
This method does not do anything if there is a `sessionInProgress`.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)checkForUpdateInformation;
|
||||
|
||||
/**
|
||||
A property indicating whether or not updates can be checked by the user.
|
||||
|
||||
An update check can be made by the user when an update session isn't in progress, or when an update or its progress is being shown to the user.
|
||||
An update check can be made by the user when an update session isn't in progress.
|
||||
An update check can also be made when an update or its progress is being shown to the user
|
||||
(as long as the user driver is the standard `SPUStandardUserDriver` or if it implements `-[SPUUserDriver showUpdateInFocus]`).
|
||||
|
||||
A user cannot check for updates when data (such as the feed or an update) is still being downloaded automatically in the background.
|
||||
|
||||
This property is suitable to use for menu item validation for seeing if `-checkForUpdates` can be invoked.
|
||||
@@ -194,7 +205,9 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
to your app's command line arguments instead of setting this property.
|
||||
|
||||
The update schedule cycle will be reset in a short delay after the property's new value is set.
|
||||
This is to allow reverting this property without kicking off a schedule change immediately
|
||||
This is to allow reverting this property without kicking off a schedule change immediately.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) BOOL automaticallyChecksForUpdates;
|
||||
|
||||
@@ -209,7 +222,9 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
Do not always set it on launch unless you want to ignore the user's preference.
|
||||
|
||||
The update schedule cycle will be reset in a short delay after the property's new value is set.
|
||||
This is to allow reverting this property without kicking off a schedule change immediately
|
||||
This is to allow reverting this property without kicking off a schedule change immediately.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) NSTimeInterval updateCheckInterval;
|
||||
|
||||
@@ -231,9 +246,23 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
Hence developers shouldn't maintain an additional user default for this property.
|
||||
Only set this property if the user wants to change the default via a user settings option.
|
||||
Do not always set it on launch unless you want to ignore the user's preference.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) BOOL automaticallyDownloadsUpdates;
|
||||
|
||||
/**
|
||||
A property indicating whether or not the *option* to automatically download updates in the background can be turned on.
|
||||
|
||||
This property can be used to determine whether an option to automatically download/install updates should be enabled.
|
||||
|
||||
Its value depends on `automaticallyChecksForUpdates`, or the `SUAllowsAutomaticUpdates`in the host bundle's Info.plist if specified.
|
||||
Don't set `SUAllowsAutomaticUpdates` in the Info.plist unless you need custom behavior.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic, readonly) BOOL allowsAutomaticUpdates;
|
||||
|
||||
/**
|
||||
The URL of the appcast used to download update information.
|
||||
|
||||
@@ -322,6 +351,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
A property indicating whether or not the user's system profile information is sent when checking for updates.
|
||||
|
||||
Setting this property will persist in the host bundle's user defaults.
|
||||
|
||||
This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic) BOOL sendsSystemProfile;
|
||||
|
||||
@@ -331,6 +362,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
For testing purposes, the last update check is stored in the `SULastCheckTime` key in the host bundle's user defaults.
|
||||
For example, `defaults delete my-bundle-id SULastCheckTime` can be invoked to clear the last update check time and test
|
||||
if update checks are automatically scheduled.
|
||||
|
||||
This property must be called on the main thread.
|
||||
*/
|
||||
@property (nonatomic, readonly, copy, nullable) NSDate *lastUpdateCheckDate;
|
||||
|
||||
@@ -342,6 +375,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
If the `updateCheckInterval` or `automaticallyChecksForUpdates` properties are changed, this method is automatically invoked after a short delay using `-resetUpdateCycleAfterShortDelay`. In these cases, manually resetting the update cycle is not necessary.
|
||||
|
||||
See also `-resetUpdateCycleAfterShortDelay` which gives the user a short delay before triggering a cycle reset.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)resetUpdateCycle;
|
||||
|
||||
@@ -355,6 +390,8 @@ SU_EXPORT @interface SPUUpdater : NSObject
|
||||
no cycle reset will be done.
|
||||
|
||||
If the `updateCheckInterval` or `automaticallyChecksForUpdates` properties are changed, this method is automatically invoked. In these cases, manually resetting the update cycle is not necessary.
|
||||
|
||||
This must be called on the main thread.
|
||||
*/
|
||||
- (void)resetUpdateCycleAfterShortDelay;
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#import "SPUUpdater.h"
|
||||
#import "SPUUpdaterDelegate.h"
|
||||
#import "SPUUpdaterSettings.h"
|
||||
#import "SPUUpdaterSettings+Debug.h"
|
||||
#import "SUHost.h"
|
||||
#import "SPUUpdatePermissionRequest.h"
|
||||
#import "SUUpdatePermissionResponse.h"
|
||||
@@ -85,18 +86,6 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
@synthesize sessionInProgress = _sessionInProgress;
|
||||
@synthesize canCheckForUpdates = _canCheckForUpdates;
|
||||
|
||||
#if DEBUG
|
||||
+ (void)initialize
|
||||
{
|
||||
static dispatch_once_t onceToken;
|
||||
dispatch_once(&onceToken, ^{
|
||||
// We're using NSLog instead of SULog here because we don't want to start Sparkle's logger here,
|
||||
// and because this is not really an error, just a warning notice
|
||||
NSLog(@"WARNING: This is running a Debug build of Sparkle 2; don't use this in production!");
|
||||
});
|
||||
}
|
||||
#endif
|
||||
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle applicationBundle:(NSBundle *)applicationBundle userDriver:(id <SPUUserDriver>)userDriver delegate:(id<SPUUpdaterDelegate> _Nullable)delegate
|
||||
{
|
||||
self = [super init];
|
||||
@@ -156,6 +145,13 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (BOOL)startUpdater:(NSError * __autoreleasing *)error
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: @"-[SPUUpdater startUpdater:] must be called on the main thread]"}];
|
||||
}
|
||||
return NO;
|
||||
}
|
||||
|
||||
if (_startedUpdater) {
|
||||
return YES;
|
||||
}
|
||||
@@ -171,6 +167,8 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
_startedUpdater = YES;
|
||||
[self setCanCheckForUpdates:YES];
|
||||
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(updateAutomaticCheckSettingChanged:) name:SUUpdateAutomaticCheckSettingChangedNotification object:nil];
|
||||
|
||||
// Start updater on next update cycle so we make sure the application invoking the updater is ready
|
||||
// This also gives the developer a cycle to check for updates before Sparkle's update cycle scheduler kicks in
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
@@ -178,7 +176,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
// We perform this check one runloop cycle after starting the updater to give the developer
|
||||
// a chance to call -clearFeedURLFromUserDefaults before this warning can show up
|
||||
if (self->_updatingMainBundle) {
|
||||
NSString *appcastUserDefaultsString = [self->_host objectForUserDefaultsKey:SUFeedURLKey];
|
||||
NSString *appcastUserDefaultsString = [self->_host objectForUserDefaultsKey:SUFeedURLKey ofClass:NSString.class];
|
||||
if (appcastUserDefaultsString != nil) {
|
||||
SULog(SULogLevelError, @"Warning: A feed URL was found stored in user defaults for %@. This was likely set using -[SPUUpdater setFeedURL:] which is deprecated. Please migrate away from using this API and call -[SPUUpdater clearFeedURLFromUserDefaults] to remove any stored defaults, otherwise Sparkle may continue to use the feed stored from the defaults. If the feed url was set via a defaults write command for testing purposes, then please ignore this warning.", self->_host.name);
|
||||
}
|
||||
@@ -298,7 +296,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
BOOL foundATSMainBundleIssue = NO;
|
||||
if (!foundATSPersistentIssue && !foundXPCDownloaderService) {
|
||||
BOOL foundATSIssue = ([mainBundleHost objectForInfoDictionaryKey:@"NSAppTransportSecurity"] == nil);
|
||||
BOOL foundATSIssue = ([mainBundleHost objectForInfoDictionaryKey:@"NSAppTransportSecurity" ofClass:NSDictionary.class] == nil);
|
||||
|
||||
if (_updatingMainBundle) {
|
||||
// The only way we'll know for sure if there is an issue is if the main bundle is the same as the one we're updating
|
||||
@@ -309,7 +307,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
if (foundATSPersistentIssue || foundATSMainBundleIssue) {
|
||||
// Just log a warning. Don't outright fail in case we are wrong (eg: app is linked on an old SDK where ATS doesn't take effect)
|
||||
SULog(SULogLevelDefault, @"The feed URL (%@) may need to change to use HTTPS.\nFor more information: https://sparkle-project.org/documentation/app-transport-security", [feedURL absoluteString]);
|
||||
SULog(SULogLevelDefault, @"The feed URL (%@) may need to change to use HTTPS. If the feed URL is using local networking for testing, this warning may be incorrect and ignored however.\nFor more information: https://sparkle-project.org/documentation/app-transport-security", [feedURL absoluteString]);
|
||||
|
||||
_loggedATSWarning = YES;
|
||||
}
|
||||
@@ -369,6 +367,21 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
}
|
||||
}
|
||||
|
||||
// This is a policy decision
|
||||
// If developers want greater security by signing appcasts, we can also enforce greater security
|
||||
// in validating updates before extracting them.
|
||||
BOOL requiresSignedFeed = [_host boolForInfoDictionaryKey:SURequireSignedFeedKey];
|
||||
if (requiresSignedFeed) {
|
||||
BOOL verifyBeforeExtraction = [_host boolForInfoDictionaryKey:SUVerifyUpdateBeforeExtractionKey];
|
||||
if (!verifyBeforeExtraction) {
|
||||
if (error != NULL) {
|
||||
*error = [NSError errorWithDomain:SUSparkleErrorDomain code:SUInvalidUpdaterError userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"For security reasons, %@ needs to also be enabled if %@ is enabled for %@. Visit Sparkle's documentation for more information: https://sparkle-project.org/documentation/customization/", SUVerifyUpdateBeforeExtractionKey, SURequireSignedFeedKey, hostName] }];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
if (_updatingMainBundle) {
|
||||
if (!_loggedUpdateSecurityPolicyWarning && mainBundleHost.hasUpdateSecurityPolicy) {
|
||||
SULog(SULogLevelDefault, @"Warning: %@ has a custom NSUpdateSecurityPolicy in its Info.plist. This may cause issues when installing updates. Please consider removing this key for your builds using Sparkle if you do not really require a custom update security policy.", hostName);
|
||||
@@ -391,7 +404,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
// If the user has been asked about automatic checks or the developer has overridden the setting, don't bother prompting
|
||||
// When the user answers to the permission prompt, this will be set to either @YES or @NO instead of nil
|
||||
if ([_host objectForKey:SUEnableAutomaticChecksKey] != nil) {
|
||||
if ([_host boolNumberForKey:SUEnableAutomaticChecksKey] != nil) {
|
||||
shouldPrompt = NO;
|
||||
}
|
||||
// Does the delegate want to take care of the logic for when we should ask permission to update?
|
||||
@@ -421,7 +434,9 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
_showingPermissionRequest = YES;
|
||||
[self setSessionInProgress:YES];
|
||||
[self setCanCheckForUpdates:YES];
|
||||
|
||||
BOOL canShowUserDriverInFocusDuringPermissionPrompt = [_userDriver respondsToSelector:@selector(showUpdateInFocus)];
|
||||
[self setCanCheckForUpdates:canShowUserDriverInFocusDuringPermissionPrompt];
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
[_userDriver showUpdatePermissionRequest:updatePermissionRequest reply:^(SUUpdatePermissionResponse *response) {
|
||||
@@ -432,6 +447,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
strongSelf->_showingPermissionRequest = NO;
|
||||
|
||||
[strongSelf updatePermissionRequestFinishedWithResponse:response];
|
||||
|
||||
if (!canShowUserDriverInFocusDuringPermissionPrompt) {
|
||||
[strongSelf setCanCheckForUpdates:YES];
|
||||
}
|
||||
|
||||
// Schedule checks, but make sure we ignore the delayed call from KVO
|
||||
[strongSelf resetUpdateCycle];
|
||||
}
|
||||
@@ -458,9 +478,13 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (NSDate *)lastUpdateCheckDate
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater lastUpdateCheckDate] must be called on the main thread.");
|
||||
}
|
||||
|
||||
if (_updateLastCheckedDate == nil)
|
||||
{
|
||||
_updateLastCheckedDate = [_host objectForUserDefaultsKey:SULastCheckTimeKey];
|
||||
_updateLastCheckedDate = [_host objectForUserDefaultsKey:SULastCheckTimeKey ofClass:NSDate.class];
|
||||
}
|
||||
|
||||
return _updateLastCheckedDate;
|
||||
@@ -500,14 +524,15 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
[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.canSilentlyInstall || [installationInfo.appcastItem isCriticalUpdate] || [installationInfo.appcastItem isInformationOnlyUpdate]) {
|
||||
completionHandler(MIN(regularCheckInterval, SUImpatientUpdateCheckInterval));
|
||||
if ([installationInfo.appcastItem isCriticalUpdate] || [installationInfo.appcastItem isInformationOnlyUpdate]) {
|
||||
completionHandler(MIN(regularCheckInterval, impatientCheckInterval));
|
||||
} else {
|
||||
completionHandler(MAX(regularCheckInterval, SUImpatientUpdateCheckInterval));
|
||||
completionHandler(MAX(regularCheckInterval, impatientCheckInterval));
|
||||
}
|
||||
}
|
||||
});
|
||||
@@ -540,9 +565,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
intervalSinceCheck = 0;
|
||||
}
|
||||
|
||||
NSTimeInterval minimumUpdateCheckInterval = self->_updaterSettings.minimumUpdateCheckInterval;
|
||||
|
||||
// Now we want to figure out how long until we check again.
|
||||
if (updateCheckInterval < SUMinimumUpdateCheckInterval)
|
||||
updateCheckInterval = SUMinimumUpdateCheckInterval;
|
||||
if (updateCheckInterval < minimumUpdateCheckInterval)
|
||||
updateCheckInterval = minimumUpdateCheckInterval;
|
||||
if (intervalSinceCheck < updateCheckInterval) {
|
||||
NSTimeInterval delayUntilCheck = (updateCheckInterval - intervalSinceCheck); // It hasn't been long enough.
|
||||
if ([delegate respondsToSelector:@selector(updater:willScheduleUpdateCheckAfterDelay:)]) {
|
||||
@@ -553,7 +580,9 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
[(id<SPUGentleUserDriverReminders>)self->_userDriver logGentleScheduledUpdateReminderWarningIfNeeded];
|
||||
}
|
||||
|
||||
[self->_updaterTimer startAndFireAfterDelay:delayUntilCheck];
|
||||
uint64_t leewayUpdateCheckInterval = self->_updaterSettings.leewayUpdateCheckInterval;
|
||||
|
||||
[self->_updaterTimer startAndFireAfterDelay:delayUntilCheck leewayUpdateCheckInterval:leewayUpdateCheckInterval];
|
||||
} else {
|
||||
// We're overdue! Run one now.
|
||||
[self _checkForUpdatesInBackground];
|
||||
@@ -617,6 +646,16 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
// Sparkle internally uses _checkForUpdatesInBackground
|
||||
- (void)checkForUpdatesInBackground
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdatesInBackground] can only be called on the main thread");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self checkForUpdatesInBackground];
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_startedUpdater) {
|
||||
SULog(SULogLevelError, @"Error: checkForUpdatesInBackground - updater hasn't been started yet. Please call -startUpdater: first");
|
||||
return;
|
||||
@@ -629,7 +668,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
if (_updatingMainBundle) {
|
||||
// Check if Sparkle is configured to ask the user's permission to enable automatic update checks
|
||||
NSNumber *automaticChecksInInfoPlist = [_host objectForInfoDictionaryKey:SUEnableAutomaticChecksKey];
|
||||
NSNumber *automaticChecksInInfoPlist = [_host boolNumberForInfoDictionaryKey:SUEnableAutomaticChecksKey];
|
||||
if (automaticChecksInInfoPlist == nil) {
|
||||
// Check if automatic update checking is disabled or if the user hasn't given permission for Sparkle to check
|
||||
BOOL automaticChecksInDefaults = [self automaticallyChecksForUpdates];
|
||||
@@ -644,9 +683,24 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)checkForUpdates
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdates] can only be called on the main thread");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self checkForUpdates];
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (_showingPermissionRequest || _driver.showingUpdate) {
|
||||
if ([_userDriver respondsToSelector:@selector(showUpdateInFocus)]) {
|
||||
[_userDriver showUpdateInFocus];
|
||||
} else {
|
||||
NSString *noticeType = _showingPermissionRequest ? @"permission request" : @"update";
|
||||
|
||||
SULog(SULogLevelError, @"Error: checkForUpdates called but %@ is being shown and %@ does not implement -[SPUUserDriver showUpdateInFocus]", noticeType, _userDriver);
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -686,6 +740,17 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)checkForUpdateInformation
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater checkForUpdateInformation] can only be called on the main thread");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self checkForUpdateInformation];
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
if (!_startedUpdater) {
|
||||
SULog(SULogLevelError, @"Error: checkForUpdateInformation - updater hasn't been started yet. Please call -startUpdater: first");
|
||||
@@ -812,6 +877,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
[strongSelf setSessionInProgress:NO];
|
||||
[strongSelf setCanCheckForUpdates:YES];
|
||||
|
||||
if (!strongSelf->_updatingMainBundle && error == nil && !shouldShowUpdateImmediately && resumableUpdate == 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);
|
||||
|
||||
// Ensure the delegate doesn't start a new session when being notified of the previous one ending
|
||||
@@ -821,9 +891,11 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
}
|
||||
}];
|
||||
|
||||
[_driver setUpdateShownHandler:^{
|
||||
weakSelf.canCheckForUpdates = YES;
|
||||
}];
|
||||
if ([_userDriver respondsToSelector:@selector(showUpdateInFocus)]) {
|
||||
[_driver setUpdateShownHandler:^{
|
||||
weakSelf.canCheckForUpdates = YES;
|
||||
}];
|
||||
}
|
||||
|
||||
[_driver setUpdateWillInstallHandler:^{
|
||||
[weakSelf updateLastUpdateCheckDate];
|
||||
@@ -868,6 +940,16 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)resetUpdateCycle
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater resetUpdateCycle] must be called on the main thread.");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self resetUpdateCycle];
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (!_startedUpdater) {
|
||||
SULog(SULogLevelError, @"Error: resetUpdateCycle - updater hasn't been started yet. Please call -startUpdater: first");
|
||||
return; // not even ready yet
|
||||
@@ -906,38 +988,106 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)resetUpdateCycleAfterShortDelay
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater resetUpdateCycleAfterShortDelay] must be called on the main thread.");
|
||||
|
||||
// Try to be nice and dispatch on main thread anyway
|
||||
dispatch_async(dispatch_get_main_queue(), ^{
|
||||
[self resetUpdateCycleAfterShortDelay];
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
[self cancelNextUpdateCycle];
|
||||
[_updaterCycle resetUpdateCycleAfterDelay];
|
||||
}
|
||||
|
||||
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
|
||||
{
|
||||
[_host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey];
|
||||
// Hack to support backwards compatibility with older Sparkle versions, which supported
|
||||
// disabling updates by setting the check interval to 0.
|
||||
if (automaticallyCheckForUpdates && (NSInteger)[self updateCheckInterval] == 0) {
|
||||
[self setUpdateCheckInterval:SUDefaultUpdateCheckInterval];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setAutomaticallyChecksForUpdates:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
if (_startedUpdater) {
|
||||
_updaterSettings.automaticallyChecksForUpdates = automaticallyCheckForUpdates;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyChecksForUpdates
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater automaticallyChecksForUpdates] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings automaticallyChecksForUpdates];
|
||||
}
|
||||
|
||||
- (void)updateAutomaticCheckSettingChanged:(NSNotification *)notification
|
||||
{
|
||||
NSString *bundlePath = notification.userInfo[SUUpdateBundlePathUserInfoKey];
|
||||
if (![bundlePath isEqualToString:_host.bundlePath]) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (_startedUpdater && !_sessionInProgress) {
|
||||
// Provide a small delay in case multiple preferences are being updated simultaneously.
|
||||
[self resetUpdateCycleAfterShortDelay];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyChecksForUpdates
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAutomaticallyChecksForUpdates
|
||||
{
|
||||
return [_updaterSettings automaticallyChecksForUpdates];
|
||||
return [NSSet setWithObject:@"updaterSettings.automaticallyChecksForUpdates"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyUpdates
|
||||
{
|
||||
[_host setBool:automaticallyUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setAutomaticallyDownloadsUpdates:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
_updaterSettings.automaticallyDownloadsUpdates = automaticallyUpdates;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyDownloadsUpdates
|
||||
{
|
||||
return [_updaterSettings allowsAutomaticUpdates] && [_updaterSettings automaticallyDownloadsUpdates];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater automaticallyDownloadsUpdates] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings automaticallyDownloadsUpdates];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAutomaticallyDownloadsUpdates
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.automaticallyDownloadsUpdates"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyDownloadsUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL)allowsAutomaticUpdates
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater allowsAutomaticUpdates] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings allowsAutomaticUpdates];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingAllowsAutomaticUpdates
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.allowsAutomaticUpdates"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAllowsAutomaticUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)setFeedURL:(NSURL * _Nullable)feedURL
|
||||
@@ -958,7 +1108,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater clearFeedURLFromUserDefaults] must be called on the main thread.");
|
||||
}
|
||||
|
||||
NSString *appcastString = [_host objectForUserDefaultsKey:SUFeedURLKey];
|
||||
NSString *appcastString = [_host objectForUserDefaultsKey:SUFeedURLKey ofClass:NSString.class];
|
||||
|
||||
[_host setObject:nil forUserDefaultsKey:SUFeedURLKey];
|
||||
|
||||
@@ -1002,7 +1152,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
}
|
||||
|
||||
// Delegate gets first priority for determining the feed URL
|
||||
NSString *appcastString = [_host objectForKey:SUFeedURLKey];
|
||||
NSString *appcastString = [_host objectForKey:SUFeedURLKey ofClass:NSString.class];
|
||||
id<SPUUpdaterDelegate> delegate = _delegate;
|
||||
if ([delegate respondsToSelector:@selector((feedURLStringForUpdater:))]) {
|
||||
NSString *delegateAppcastString = [delegate feedURLStringForUpdater:self];
|
||||
@@ -1014,7 +1164,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
// A value in the user defaults overrides one in the Info.plist
|
||||
// (as this used to be used for setting alternative feed URLs but is now deprecated)
|
||||
if (appcastString == nil) {
|
||||
appcastString = [_host objectForKey:SUFeedURLKey];
|
||||
appcastString = [_host objectForKey:SUFeedURLKey ofClass:NSString.class];
|
||||
}
|
||||
|
||||
if (appcastString == nil) { // Can't find an appcast string!
|
||||
@@ -1054,14 +1204,32 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
|
||||
|
||||
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
|
||||
{
|
||||
[_host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setSendsSystemProfile:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
_updaterSettings.sendsSystemProfile = sendsSystemProfile;
|
||||
}
|
||||
|
||||
- (BOOL)sendsSystemProfile
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater sendsSystemProfile] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings sendsSystemProfile];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingSendsSystemProfile
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.sendsSystemProfile"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfSendsSystemProfile
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
static NSString *escapeURLComponent(NSString *str) {
|
||||
NSString *escapedString = [str stringByAddingPercentEncodingWithAllowedCharacters:NSCharacterSet.URLQueryAllowedCharacterSet];
|
||||
|
||||
@@ -1081,12 +1249,17 @@ 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 *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey];
|
||||
if (!lastSubmitDate) {
|
||||
lastSubmitDate = [NSDate distantPast];
|
||||
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) {
|
||||
sendingSystemProfile = NO;
|
||||
}
|
||||
}
|
||||
const NSTimeInterval oneWeek = 60 * 60 * 24 * 7;
|
||||
sendingSystemProfile &= (-[lastSubmitDate timeIntervalSinceNow] >= oneWeek);
|
||||
|
||||
id<SPUUpdaterDelegate> delegate = _delegate;
|
||||
NSArray<NSDictionary<NSString *, NSString *> *> *parameters = @[];
|
||||
@@ -1144,24 +1317,38 @@ static NSString *escapeURLComponent(NSString *str) {
|
||||
|
||||
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
|
||||
{
|
||||
[_host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey];
|
||||
if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
|
||||
[self setAutomaticallyChecksForUpdates:NO];
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater setUpdateCheckInterval:] must be called on the main thread.");
|
||||
}
|
||||
|
||||
if (_startedUpdater) {
|
||||
// Provide a small delay in case multiple preferences are being updated simultaneously.
|
||||
[self resetUpdateCycleAfterShortDelay];
|
||||
}
|
||||
_updaterSettings.updateCheckInterval = updateCheckInterval;
|
||||
}
|
||||
|
||||
- (NSTimeInterval)updateCheckInterval
|
||||
{
|
||||
if (![NSThread isMainThread]) {
|
||||
SULog(SULogLevelError, @"Error: -[SPUUpdater updateCheckInterval] must be called on the main thread.");
|
||||
}
|
||||
|
||||
return [_updaterSettings updateCheckInterval];
|
||||
}
|
||||
|
||||
+ (NSSet<NSString *> *)keyPathsForValuesAffectingUpdateCheckInterval
|
||||
{
|
||||
return [NSSet setWithObject:@"updaterSettings.updateCheckInterval"];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (void)dealloc
|
||||
{
|
||||
if (_startedUpdater) {
|
||||
[NSNotificationCenter.defaultCenter removeObserver:self name:SUUpdateAutomaticCheckSettingChangedNotification object:nil];
|
||||
}
|
||||
|
||||
// Stop checking for updates
|
||||
[self cancelNextUpdateCycle];
|
||||
[_updaterTimer invalidate];
|
||||
|
||||
@@ -66,7 +66,7 @@ SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
|
||||
/**
|
||||
Provides delegation methods to control the behavior of an `SPUUpdater` object.
|
||||
*/
|
||||
@protocol SPUUpdaterDelegate <NSObject>
|
||||
NS_SWIFT_UI_ACTOR @protocol SPUUpdaterDelegate <NSObject>
|
||||
@optional
|
||||
|
||||
/**
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
//
|
||||
// SPUUpdaterSettings+Debug.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created on 11/16/25.
|
||||
// Copyright © 2025 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SPUUpdaterSettings.h"
|
||||
|
||||
/**
|
||||
* Private settings which may be debug gated for the Sparkle Test App under DEBUG
|
||||
*/
|
||||
@interface SPUUpdaterSettings (Debug)
|
||||
|
||||
/**
|
||||
* The minimum update check interval
|
||||
*/
|
||||
@property (nonatomic, readonly) NSTimeInterval minimumUpdateCheckInterval;
|
||||
|
||||
/**
|
||||
* The amount of time the system can defer our update check (for improved performance)
|
||||
*/
|
||||
@property (nonatomic, readonly) uint64_t leewayUpdateCheckInterval;
|
||||
|
||||
/**
|
||||
* The amount of time the app is allowed to be idle for us to consider showing an update prompt right away when the app is active.
|
||||
*
|
||||
* This is for the standard user driver.
|
||||
*/
|
||||
@property (nonatomic, readonly) NSTimeInterval standardUIScheduledUpdateIdleEventLeewayInterval;
|
||||
|
||||
@end
|
||||
@@ -21,33 +21,39 @@
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
/**
|
||||
This class can be used for reading certain updater settings.
|
||||
This class can be used for reading and updating updater settings.
|
||||
|
||||
It retrieves the settings by first looking into the host's user defaults.
|
||||
If the setting is not found in there, then the host's Info.plist file is looked at.
|
||||
|
||||
For updating updater settings, changes are made in the host's user defaults.
|
||||
*/
|
||||
SU_EXPORT @interface SPUUpdaterSettings : NSObject
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @interface SPUUpdaterSettings : NSObject
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle;
|
||||
|
||||
/**
|
||||
* Indicates whether or not automatic update checks are enabled.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL automaticallyChecksForUpdates;
|
||||
@property (nonatomic) BOOL automaticallyChecksForUpdates;
|
||||
|
||||
/**
|
||||
* The regular update check interval.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) NSTimeInterval updateCheckInterval;
|
||||
|
||||
/**
|
||||
* Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
|
||||
* If this value is nil, the developer has not explicitly specified this option.
|
||||
*/
|
||||
@property (readonly, nonatomic, nullable) NSNumber *allowsAutomaticUpdatesOption;
|
||||
@property (nonatomic) NSTimeInterval updateCheckInterval;
|
||||
|
||||
/**
|
||||
* Indicates whether or not automatically downloading updates is allowed to be turned on by the user.
|
||||
*
|
||||
* This property is determined by checking `automaticallyChecksForUpdates` and `allowsAutomaticUpdatesOption`.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL allowsAutomaticUpdates;
|
||||
|
||||
@@ -56,13 +62,36 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
|
||||
*
|
||||
* Note this does not indicate whether or not automatic downloading of updates is allowable.
|
||||
* See `-allowsAutomaticUpdates` property for that.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL automaticallyDownloadsUpdates;
|
||||
@property (nonatomic) BOOL automaticallyDownloadsUpdates;
|
||||
|
||||
/**
|
||||
* Indicates whether or not the developer allows turning on updates being automatically downloaded and installed.
|
||||
* If this value is nil, the developer has not explicitly specified this option (which is the default).
|
||||
*
|
||||
* Please prefer to use `allowsAutomaticUpdates` instead.
|
||||
*/
|
||||
@property (readonly, nonatomic, nullable) NSNumber *allowsAutomaticUpdatesOption;
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*
|
||||
* 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`.
|
||||
*/
|
||||
@property (nonatomic, readonly) NSTimeInterval impatientUpdateCheckInterval;
|
||||
|
||||
/**
|
||||
* Indicates whether or not anonymous system profile information is sent when checking for updates.
|
||||
*
|
||||
* This property is KVO compliant. This property must be called on the main thread.
|
||||
*/
|
||||
@property (readonly, nonatomic) BOOL sendsSystemProfile;
|
||||
@property (nonatomic) BOOL sendsSystemProfile;
|
||||
|
||||
@end
|
||||
|
||||
|
||||
@@ -7,66 +7,438 @@
|
||||
//
|
||||
|
||||
#import "SPUUpdaterSettings.h"
|
||||
#import "SPUUpdaterSettings+Debug.h"
|
||||
#import "SUHost.h"
|
||||
#import "SUConstants.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
static NSString *SUAutomaticallyChecksForUpdatesKeyPath = @"automaticallyChecksForUpdates";
|
||||
static NSString *SUUpdateCheckIntervalKeyPath = @"updateCheckInterval";
|
||||
static NSString *SUImpatientUpdateCheckIntervalKeyPath = @"impatientUpdateCheckInterval";
|
||||
static NSString *SUAutomaticallyDownloadsUpdatesKeyPath = @"automaticallyDownloadsUpdates";
|
||||
static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
|
||||
static NSString *SUAllowsAutomaticUpdatesOptionKeyPath = @"allowsAutomaticUpdatesOption";
|
||||
static NSString *SUAllowsAutomaticUpdatesKeyPath = @"allowsAutomaticUpdates";
|
||||
|
||||
@implementation SPUUpdaterSettings
|
||||
{
|
||||
SUHost *_host;
|
||||
|
||||
#if DEBUG
|
||||
BOOL _enableDebugUpdateCheckIntervals;
|
||||
#endif
|
||||
}
|
||||
|
||||
@synthesize automaticallyChecksForUpdates = _automaticallyChecksForUpdates;
|
||||
@synthesize updateCheckInterval = _updateCheckInterval;
|
||||
@synthesize impatientUpdateCheckInterval = _impatientUpdateCheckInterval;
|
||||
@synthesize automaticallyDownloadsUpdates = _automaticallyDownloadsUpdates;
|
||||
@synthesize sendsSystemProfile = _sendsSystemProfile;
|
||||
@synthesize allowsAutomaticUpdatesOption = _allowsAutomaticUpdatesOption;
|
||||
@synthesize allowsAutomaticUpdates = _allowsAutomaticUpdates;
|
||||
|
||||
- (instancetype)initWithHostBundle:(NSBundle *)hostBundle
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_host = [[SUHost alloc] initWithBundle:hostBundle];
|
||||
|
||||
#if DEBUG
|
||||
// This one must be checked first, before checking the other settings,
|
||||
// since the others may rely on this
|
||||
_enableDebugUpdateCheckIntervals = [self currentEnableDebugUpdateCheckIntervals];
|
||||
#endif
|
||||
|
||||
_automaticallyChecksForUpdates = [self currentAutomaticallyChecksForUpdates];
|
||||
_updateCheckInterval = [self currentUpdateCheckInterval];
|
||||
_impatientUpdateCheckInterval = [self currentImpatientUpdateCheckInterval];
|
||||
_allowsAutomaticUpdatesOption = [self currentAllowsAutomaticUpdatesOption];
|
||||
_allowsAutomaticUpdates = [self currentAllowsAutomaticUpdates];
|
||||
_automaticallyDownloadsUpdates = [self currentAutomaticallyDownloadsUpdates];
|
||||
_sendsSystemProfile = [self currentSendsSystemProfile];
|
||||
|
||||
[NSNotificationCenter.defaultCenter addObserver:self selector:@selector(synchronize:) name:SUUpdateSettingsNeedsSynchronizationNotification object:nil];
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
[_host observeChangesFromUserDefaultKeys:[NSSet setWithArray:@[SUEnableAutomaticChecksKey, SUScheduledCheckIntervalKey, SUAutomaticallyUpdateKey, SUSendProfileInfoKey]] changeHandler:^(NSString *keyPath) {
|
||||
__typeof(self) strongSelf = weakSelf;
|
||||
if (strongSelf == nil) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ([keyPath isEqualToString:SUEnableAutomaticChecksKey]) {
|
||||
[strongSelf processCurrentAutomaticallyChecksForUpdates];
|
||||
} else if ([keyPath isEqualToString:SUScheduledCheckIntervalKey]) {
|
||||
[strongSelf processUpdateCheckInterval];
|
||||
} else if ([keyPath isEqualToString:SUAutomaticallyUpdateKey]) {
|
||||
[strongSelf processAutomaticallyDownloadsUpdates];
|
||||
} else if ([keyPath isEqualToString:SUSendProfileInfoKey]) {
|
||||
[strongSelf processSendsSystemProfile];
|
||||
}
|
||||
}];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyChecksForUpdates
|
||||
- (void)dealloc
|
||||
{
|
||||
[NSNotificationCenter.defaultCenter removeObserver:self name:SUUpdateSettingsNeedsSynchronizationNotification object:_host.bundlePath];
|
||||
}
|
||||
|
||||
- (void)processCurrentAutomaticallyChecksForUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentAutomaticallyChecksForUpdates];
|
||||
|
||||
if (currentValue != _automaticallyChecksForUpdates) {
|
||||
NSString *updatedKeyPath = SUAutomaticallyChecksForUpdatesKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_automaticallyChecksForUpdates = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
|
||||
[self processAllowsAutomaticUpdates];
|
||||
[self processAutomaticallyDownloadsUpdates];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
NSTimeInterval currentValue = [self currentUpdateCheckInterval];
|
||||
|
||||
if (fabs(currentValue - _updateCheckInterval) >= 0.001) {
|
||||
NSString *updatedKeyPath = SUUpdateCheckIntervalKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_updateCheckInterval = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processImpatientUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
NSTimeInterval currentValue = [self currentImpatientUpdateCheckInterval];
|
||||
|
||||
if (fabs(currentValue - _impatientUpdateCheckInterval) >= 0.001) {
|
||||
NSString *updatedKeyPath = SUImpatientUpdateCheckIntervalKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_impatientUpdateCheckInterval = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processAllowsAutomaticUpdatesOption SPU_OBJC_DIRECT
|
||||
{
|
||||
NSNumber *currentValue = [self currentAllowsAutomaticUpdatesOption];
|
||||
|
||||
if (((currentValue != nil) != (_allowsAutomaticUpdatesOption != nil)) || (currentValue.boolValue != _allowsAutomaticUpdatesOption.boolValue)) {
|
||||
NSString *updatedKeyPath = SUAllowsAutomaticUpdatesOptionKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_allowsAutomaticUpdatesOption = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processAllowsAutomaticUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentAllowsAutomaticUpdates];
|
||||
|
||||
if (currentValue != _allowsAutomaticUpdates) {
|
||||
NSString *updatedKeyPath = SUAllowsAutomaticUpdatesKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_allowsAutomaticUpdates = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processAutomaticallyDownloadsUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentAutomaticallyDownloadsUpdates];
|
||||
|
||||
if (currentValue != _automaticallyDownloadsUpdates) {
|
||||
NSString *updatedKeyPath = SUAutomaticallyDownloadsUpdatesKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_automaticallyDownloadsUpdates = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)processSendsSystemProfile SPU_OBJC_DIRECT
|
||||
{
|
||||
BOOL currentValue = [self currentSendsSystemProfile];
|
||||
|
||||
if (currentValue != _sendsSystemProfile) {
|
||||
NSString *updatedKeyPath = SUSendsSystemProfileKeyPath;
|
||||
|
||||
[self willChangeValueForKey:updatedKeyPath];
|
||||
|
||||
_sendsSystemProfile = currentValue;
|
||||
|
||||
[self didChangeValueForKey:updatedKeyPath];
|
||||
}
|
||||
}
|
||||
|
||||
- (void)synchronize:(NSNotification *)notification
|
||||
{
|
||||
NSString *bundlePath = notification.userInfo[SUUpdateBundlePathUserInfoKey];
|
||||
if (![bundlePath isEqualToString:_host.bundlePath]) {
|
||||
return;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
// This one must be checked first, before checking the other settings,
|
||||
// since the others may rely on this
|
||||
_enableDebugUpdateCheckIntervals = [self currentEnableDebugUpdateCheckIntervals];
|
||||
#endif
|
||||
|
||||
[self processCurrentAutomaticallyChecksForUpdates];
|
||||
[self processUpdateCheckInterval];
|
||||
[self processImpatientUpdateCheckInterval];
|
||||
[self processAllowsAutomaticUpdatesOption];
|
||||
[self processAllowsAutomaticUpdates];
|
||||
[self processAutomaticallyDownloadsUpdates];
|
||||
[self processSendsSystemProfile];
|
||||
}
|
||||
|
||||
- (BOOL)currentAutomaticallyChecksForUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
// Don't automatically update when the check interval is 0, to be compatible with 1.1 settings.
|
||||
if ((NSInteger)[self updateCheckInterval] == 0) {
|
||||
if ((NSInteger)[self currentUpdateCheckInterval] == 0) {
|
||||
return NO;
|
||||
}
|
||||
return [_host boolForKey:SUEnableAutomaticChecksKey];
|
||||
}
|
||||
|
||||
- (NSTimeInterval)updateCheckInterval
|
||||
- (void)setAutomaticallyChecksForUpdates:(BOOL)automaticallyCheckForUpdates
|
||||
{
|
||||
[self willChangeValueForKey:SUAutomaticallyChecksForUpdatesKeyPath];
|
||||
|
||||
_automaticallyChecksForUpdates = automaticallyCheckForUpdates;
|
||||
[_host setBool:automaticallyCheckForUpdates forUserDefaultsKey:SUEnableAutomaticChecksKey];
|
||||
|
||||
[self didChangeValueForKey:SUAutomaticallyChecksForUpdatesKeyPath];
|
||||
|
||||
// Hack to support backwards compatibility with older Sparkle versions, which supported
|
||||
// disabling updates by setting the check interval to 0.
|
||||
if (automaticallyCheckForUpdates && (NSInteger)[self currentUpdateCheckInterval] == 0) {
|
||||
[self setUpdateCheckInterval:[self defaultUpdateCheckInterval]];
|
||||
} else {
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
|
||||
}
|
||||
|
||||
[self processAllowsAutomaticUpdates];
|
||||
[self processAutomaticallyDownloadsUpdates];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (NSTimeInterval)currentUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
// Find the stored check interval. User defaults override Info.plist.
|
||||
NSNumber *intervalValue = [_host objectForKey:SUScheduledCheckIntervalKey];
|
||||
if (intervalValue)
|
||||
return [intervalValue doubleValue];
|
||||
else
|
||||
return SUDefaultUpdateCheckInterval;
|
||||
NSNumber *intervalValue = [_host doubleNumberForKey:SUScheduledCheckIntervalKey];
|
||||
if (intervalValue == nil) {
|
||||
return [self defaultUpdateCheckInterval];
|
||||
}
|
||||
|
||||
return intervalValue.doubleValue;
|
||||
}
|
||||
|
||||
// For allowing automatic downloaded updates to be turned on or off
|
||||
- (NSNumber * _Nullable)allowsAutomaticUpdatesOption
|
||||
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
|
||||
{
|
||||
NSNumber *developerAllowsAutomaticUpdates = [_host objectForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey];
|
||||
return [developerAllowsAutomaticUpdates isKindOfClass:[NSNumber class]] ? developerAllowsAutomaticUpdates : nil;
|
||||
[self willChangeValueForKey:SUUpdateCheckIntervalKeyPath];
|
||||
|
||||
_updateCheckInterval = updateCheckInterval;
|
||||
[_host setObject:@(updateCheckInterval) forUserDefaultsKey:SUScheduledCheckIntervalKey];
|
||||
|
||||
[self didChangeValueForKey:SUUpdateCheckIntervalKeyPath];
|
||||
|
||||
if ((NSInteger)updateCheckInterval == 0) { // For compatibility with 1.1's settings.
|
||||
[self setAutomaticallyChecksForUpdates:NO];
|
||||
} else {
|
||||
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)allowsAutomaticUpdates
|
||||
- (NSTimeInterval)currentImpatientUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
NSNumber *developerAllowsAutomaticUpdates = [self allowsAutomaticUpdatesOption];
|
||||
return (developerAllowsAutomaticUpdates == nil || developerAllowsAutomaticUpdates.boolValue);
|
||||
NSNumber *intervalValue = [_host doubleNumberForInfoDictionaryKey:SUScheduledImpatientCheckIntervalKey];
|
||||
if (intervalValue == nil) {
|
||||
return [self defaultImpatientUpdateCheckInterval];
|
||||
}
|
||||
|
||||
return intervalValue.doubleValue;
|
||||
}
|
||||
|
||||
- (BOOL)automaticallyDownloadsUpdates
|
||||
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
|
||||
{
|
||||
return [_host boolForKey:SUAutomaticallyUpdateKey];
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL)sendsSystemProfile
|
||||
+ (BOOL)automaticallyNotifiesObserversOfImpatientUpdateCheckInterval
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (NSNumber * _Nullable)currentAllowsAutomaticUpdatesOption SPU_OBJC_DIRECT
|
||||
{
|
||||
NSNumber *developerAllowsAutomaticUpdates = [_host boolNumberForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey];
|
||||
return developerAllowsAutomaticUpdates;
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAllowsAutomaticUpdatesOption
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
// This depends on currentAllowsAutomaticUpdatesOption and currentAutomaticallyChecksForUpdates and must be processed afterwards
|
||||
- (BOOL)currentAllowsAutomaticUpdates
|
||||
{
|
||||
return (_allowsAutomaticUpdatesOption == nil) ? _automaticallyChecksForUpdates : _allowsAutomaticUpdatesOption.boolValue;
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAllowsAutomaticUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
// This depends on currentAllowsAutomaticUpdates and must be processed afterwards
|
||||
- (BOOL)currentAutomaticallyDownloadsUpdates SPU_OBJC_DIRECT
|
||||
{
|
||||
return _allowsAutomaticUpdates && [_host boolForKey:SUAutomaticallyUpdateKey];
|
||||
}
|
||||
|
||||
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates
|
||||
{
|
||||
if (![self allowsAutomaticUpdates]) {
|
||||
return;
|
||||
}
|
||||
|
||||
[self willChangeValueForKey:SUAutomaticallyDownloadsUpdatesKeyPath];
|
||||
|
||||
_automaticallyDownloadsUpdates = automaticallyDownloadsUpdates;
|
||||
[_host setBool:automaticallyDownloadsUpdates forUserDefaultsKey:SUAutomaticallyUpdateKey];
|
||||
|
||||
[self didChangeValueForKey:SUAutomaticallyDownloadsUpdatesKeyPath];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyDownloadsUpdates
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
- (BOOL)currentSendsSystemProfile SPU_OBJC_DIRECT
|
||||
{
|
||||
return [_host boolForKey:SUSendProfileInfoKey];
|
||||
}
|
||||
|
||||
- (void)setSendsSystemProfile:(BOOL)sendsSystemProfile
|
||||
{
|
||||
[self willChangeValueForKey:SUSendsSystemProfileKeyPath];
|
||||
|
||||
_sendsSystemProfile = sendsSystemProfile;
|
||||
[_host setBool:sendsSystemProfile forUserDefaultsKey:SUSendProfileInfoKey];
|
||||
|
||||
[self didChangeValueForKey:SUSendsSystemProfileKeyPath];
|
||||
}
|
||||
|
||||
+ (BOOL)automaticallyNotifiesObserversOfSendsSystemProfile
|
||||
{
|
||||
return NO;
|
||||
}
|
||||
|
||||
#if DEBUG
|
||||
// This is only used in DEBUG and is meant for the Sparkle Test App
|
||||
- (BOOL)currentEnableDebugUpdateCheckIntervals
|
||||
{
|
||||
return [_host boolForInfoDictionaryKey:@"_SUEnableDebugUpdateCheckIntervals"];
|
||||
}
|
||||
#endif
|
||||
|
||||
- (NSTimeInterval)minimumUpdateCheckInterval
|
||||
{
|
||||
#if DEBUG
|
||||
if (_enableDebugUpdateCheckIntervals) {
|
||||
// 1 minute
|
||||
return 60;
|
||||
}
|
||||
#endif
|
||||
|
||||
// 1 hour
|
||||
return (60 * 60);
|
||||
}
|
||||
|
||||
- (uint64_t)leewayUpdateCheckInterval
|
||||
{
|
||||
#if DEBUG
|
||||
if (_enableDebugUpdateCheckIntervals) {
|
||||
// 1 second
|
||||
return 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
// 15 seconds
|
||||
return 15;
|
||||
}
|
||||
|
||||
- (NSTimeInterval)defaultUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
#if DEBUG
|
||||
if (_enableDebugUpdateCheckIntervals) {
|
||||
// 1 minute
|
||||
return 60;
|
||||
}
|
||||
#endif
|
||||
|
||||
// 1 day
|
||||
return (60 * 60 * 24);
|
||||
}
|
||||
|
||||
// If the update has already been automatically downloaded, we normally don't want to bug the user about the update
|
||||
// However if the user has gone a very long time without quitting an application, we will notify them
|
||||
- (NSTimeInterval)defaultImpatientUpdateCheckInterval SPU_OBJC_DIRECT
|
||||
{
|
||||
#if DEBUG
|
||||
if (_enableDebugUpdateCheckIntervals) {
|
||||
// 2 minutes
|
||||
return (60 * 2);
|
||||
}
|
||||
#endif
|
||||
|
||||
// 1 week
|
||||
return (60 * 60 * 24 * 7);
|
||||
}
|
||||
|
||||
- (NSTimeInterval)standardUIScheduledUpdateIdleEventLeewayInterval
|
||||
{
|
||||
#if DEBUG
|
||||
if (_enableDebugUpdateCheckIntervals) {
|
||||
// 30 seconds
|
||||
return 30.0;
|
||||
}
|
||||
#endif
|
||||
|
||||
// 5 minutes
|
||||
return (5 * 60.0);
|
||||
}
|
||||
|
||||
@end
|
||||
@@ -22,7 +22,7 @@ SPU_OBJC_DIRECT_MEMBERS @interface SPUUpdaterTimer : NSObject
|
||||
|
||||
- (instancetype)initWithDelegate:(id<SPUUpdaterTimerDelegate>)delegate;
|
||||
|
||||
- (void)startAndFireAfterDelay:(NSTimeInterval)delay;
|
||||
- (void)startAndFireAfterDelay:(NSTimeInterval)delay leewayUpdateCheckInterval:(uint64_t)leewayUpdateCheckInterval;
|
||||
|
||||
- (void)invalidate;
|
||||
|
||||
|
||||
@@ -28,14 +28,14 @@
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)startAndFireAfterDelay:(NSTimeInterval)delay
|
||||
- (void)startAndFireAfterDelay:(NSTimeInterval)delay leewayUpdateCheckInterval:(uint64_t)leewayUpdateCheckInterval
|
||||
{
|
||||
_source = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0, dispatch_get_main_queue());
|
||||
|
||||
// We use the wall time instead of cpu time for our dispatch timer
|
||||
// So eg if the computer sleeps we want to include that time spent in our timer
|
||||
dispatch_time_t timeToFire = dispatch_walltime(NULL, (int64_t)(delay * NSEC_PER_SEC));
|
||||
dispatch_source_set_timer(_source, timeToFire, DISPATCH_TIME_FOREVER, SULeewayUpdateCheckInterval * NSEC_PER_SEC);
|
||||
dispatch_source_set_timer(_source, timeToFire, DISPATCH_TIME_FOREVER, leewayUpdateCheckInterval * NSEC_PER_SEC);
|
||||
|
||||
__weak __typeof__(self) weakSelf = self;
|
||||
dispatch_source_set_event_handler(_source, ^{
|
||||
|
||||
@@ -32,7 +32,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
Every method in this protocol can be assumed to be called from the main thread.
|
||||
*/
|
||||
SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
SU_EXPORT NS_SWIFT_UI_ACTOR @protocol SPUUserDriver <NSObject>
|
||||
|
||||
/**
|
||||
* Show an updater permission request to the user
|
||||
@@ -78,6 +78,8 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
*
|
||||
* @c appcastItem.criticalUpdate indicates if the update is a critical update.
|
||||
*
|
||||
* @c appcastItem.signingValidationStatus indicates the signing validation status of the appcast, which may be applicable if appcast signing is required.
|
||||
*
|
||||
* A reply of `SPUUserUpdateChoiceInstall` begins or resumes downloading, extracting, or installing the update.
|
||||
* If the state.stage is `SPUUserUpdateStateInstalling`, this may send a quit event to the application and relaunch it immediately (in this state, this behaves as a fast "install and Relaunch").
|
||||
* If the state.stage is `SPUUpdateStateNotDownloaded` or `SPUUpdateStateDownloaded` the user may be presented an authorization prompt to install the update after `-showDownloadDidStartExtractingUpdate` is called if authorization is required for installation. For example, this may occur if the update on disk is owned by a different user (e.g. root or admin for non-admin users), or if the update is a package install.
|
||||
@@ -138,7 +140,7 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
* @param error The error associated with why a new update was not found. See above discussion for more details.
|
||||
* @param acknowledgement Acknowledge to the updater that no update found error was shown.
|
||||
*/
|
||||
- (void)showUpdateNotFoundWithError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement;
|
||||
- (void)showUpdateNotFoundWithError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement NS_SWIFT_ASYNC(2);
|
||||
|
||||
/**
|
||||
* Show the user an update error occurred
|
||||
@@ -151,7 +153,7 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
* @param error The error associated with what update error occurred.
|
||||
* @param acknowledgement Acknowledge to the updater that the error was shown.
|
||||
*/
|
||||
- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement;
|
||||
- (void)showUpdaterError:(NSError *)error acknowledgement:(void (^)(void))acknowledgement NS_SWIFT_ASYNC(2);
|
||||
|
||||
/**
|
||||
* Show the user that downloading the new update initiated
|
||||
@@ -254,15 +256,7 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
* @param relaunched Indicates if the update was relaunched.
|
||||
* @param acknowledgement Acknowledge to the updater that the finished installation was shown.
|
||||
*/
|
||||
- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement;
|
||||
|
||||
/**
|
||||
* Show the user the current presented update or its progress in utmost focus
|
||||
*
|
||||
* The user wishes to check for updates while the user is being shown update progress.
|
||||
* Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
|
||||
*/
|
||||
- (void)showUpdateInFocus;
|
||||
- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement NS_SWIFT_ASYNC(2);
|
||||
|
||||
/**
|
||||
* Dismiss the current update installation
|
||||
@@ -273,12 +267,22 @@ SU_EXPORT @protocol SPUUserDriver <NSObject>
|
||||
*/
|
||||
- (void)dismissUpdateInstallation;
|
||||
|
||||
@optional
|
||||
|
||||
/**
|
||||
* Show the user the current presented update or its progress in utmost focus
|
||||
*
|
||||
* The user wishes to check for updates while the user is being shown update progress.
|
||||
* Bring whatever is on screen to frontmost focus (permission request, update information, downloading or extraction status, choice to install update, etc).
|
||||
* Implementing this method is optional.
|
||||
*/
|
||||
- (void)showUpdateInFocus;
|
||||
|
||||
/*
|
||||
* Below are deprecated methods that have been replaced by better alternatives.
|
||||
* The deprecated methods will be used if the alternatives have not been implemented yet.
|
||||
* In the future support for using these deprecated methods may be removed however.
|
||||
*/
|
||||
@optional
|
||||
|
||||
// Clients should move to non-deprecated methods
|
||||
// Deprecated methods are only (temporarily) kept around for compatibility reasons
|
||||
|
||||
@@ -62,7 +62,7 @@ typedef NS_ENUM(NSInteger, SPUUserUpdateStage) {
|
||||
/**
|
||||
This represents the user's current update state.
|
||||
*/
|
||||
SU_EXPORT @interface SPUUserUpdateState : NSObject
|
||||
SU_EXPORT NS_SWIFT_SENDABLE @interface SPUUserUpdateState : NSObject<NSSecureCoding>
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
|
||||
@@ -17,9 +17,6 @@
|
||||
#define SPUUserUpdateStateMajorUpgradeKey @"SPUUserUpdateStateMajorUpgrade"
|
||||
#define SPUUserUpdateStateCriticalUpdateKey @"SPUUserUpdateStateCriticalUpdate"
|
||||
|
||||
@interface SPUUserUpdateState () <NSSecureCoding>
|
||||
@end
|
||||
|
||||
@implementation SPUUserUpdateState
|
||||
|
||||
@synthesize stage = _stage;
|
||||
|
||||
@@ -12,4 +12,8 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
BOOL SPUXPCServiceIsEnabled(NSString *enabledKey);
|
||||
|
||||
BOOL SPUHelperHasExecutablePermission(NSString *component, NSString * _Nullable __autoreleasing * _Nullable failureReason);
|
||||
|
||||
BOOL SPUXPCServiceHasExecutablePermission(NSString *serviceName, NSString * _Nullable __autoreleasing * _Nullable failureReason);
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -20,3 +20,44 @@ BOOL SPUXPCServiceIsEnabled(NSString *enabledKey)
|
||||
|
||||
return [mainBundleHost boolForInfoDictionaryKey:enabledKey];
|
||||
}
|
||||
|
||||
BOOL SPUHelperHasExecutablePermission(NSString *component, NSString * _Nullable __autoreleasing * _Nullable failureReason)
|
||||
{
|
||||
NSBundle *sparkleBundle = [NSBundle bundleWithIdentifier:SUBundleIdentifier];
|
||||
NSURL *helperURL = [[sparkleBundle.bundleURL URLByAppendingPathComponent:component isDirectory:NO] URLByResolvingSymlinksInPath];
|
||||
|
||||
NSString *helperPath = helperURL.path;
|
||||
|
||||
NSError *attributesError = nil;
|
||||
NSDictionary<NSFileAttributeKey, id> *attributes = [NSFileManager.defaultManager attributesOfItemAtPath:helperPath error:&attributesError];
|
||||
|
||||
if (attributes == nil) {
|
||||
if (failureReason != NULL) {
|
||||
*failureReason = [NSString stringWithFormat:@"Failed to fetch info from file '%@' -- does this helper exist? %@", helperPath, attributesError.localizedDescription];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
|
||||
NSNumber *posixPermissions = attributes[NSFilePosixPermissions];
|
||||
|
||||
if (posixPermissions != nil) {
|
||||
mode_t mode = posixPermissions.unsignedShortValue;
|
||||
if (((mode & S_IXUSR) == 0 || (mode & S_IXGRP) == 0 || (mode & S_IXOTH) == 0)) {
|
||||
if (failureReason != NULL) {
|
||||
*failureReason = [NSString stringWithFormat:@"The file '%@' may not have executable permissions -- were they lost during a bad file copy? Please ensure file permissions and symbolic links for Sparkle framework are preserved.", helperPath];
|
||||
}
|
||||
|
||||
return NO;
|
||||
}
|
||||
}
|
||||
|
||||
return YES;
|
||||
}
|
||||
|
||||
BOOL SPUXPCServiceHasExecutablePermission(NSString *serviceName, NSString * _Nullable __autoreleasing * _Nullable failureReason)
|
||||
{
|
||||
NSString *componentName = [NSString stringWithFormat:@"XPCServices/%@.xpc/Contents/MacOS/%@", serviceName, serviceName];
|
||||
|
||||
return SPUHelperHasExecutablePermission(componentName, failureReason);
|
||||
}
|
||||
@@ -13,9 +13,11 @@
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
|
||||
#import "SUAppcast.h"
|
||||
#import "SPUAppcastSigningValidationStatus.h"
|
||||
#pragma clang diagnostic pop
|
||||
#else
|
||||
#import <Sparkle/SUAppcast.h>
|
||||
#import <Sparkle/SPUAppcastSigningValidationStatus.h>
|
||||
#endif
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
@@ -24,7 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@interface SUAppcast (Private)
|
||||
|
||||
- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver error:(NSError * __autoreleasing *)error;
|
||||
- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus error:(NSError * __autoreleasing *)error;
|
||||
|
||||
- (SUAppcast *)copyByFilteringItems:(BOOL (^)(SUAppcastItem *))filterBlock;
|
||||
|
||||
|
||||
@@ -15,9 +15,11 @@
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
|
||||
#import "SUExport.h"
|
||||
#import "SPUAppcastSigningValidationStatus.h"
|
||||
#pragma clang diagnostic pop
|
||||
#else
|
||||
#import <Sparkle/SUExport.h>
|
||||
#import <Sparkle/SPUAppcastSigningValidationStatus.h>
|
||||
#endif
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
@@ -27,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
/**
|
||||
The appcast representing a collection of `SUAppcastItem` items in the feed.
|
||||
*/
|
||||
SU_EXPORT @interface SUAppcast : NSObject
|
||||
SU_EXPORT NS_SWIFT_SENDABLE @interface SUAppcast : NSObject
|
||||
|
||||
- (instancetype)init NS_UNAVAILABLE;
|
||||
|
||||
@@ -38,6 +40,13 @@ SU_EXPORT @interface SUAppcast : NSObject
|
||||
*/
|
||||
@property (readonly, nonatomic, copy) NSArray<SUAppcastItem *> *items;
|
||||
|
||||
/**
|
||||
The appcast signing validation status.
|
||||
|
||||
Please see documentation of @c SPUAppcastSigningValidationStatus values for more information.
|
||||
*/
|
||||
@property (nonatomic, readonly) SPUAppcastSigningValidationStatus signingValidationStatus;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -24,12 +24,14 @@
|
||||
@implementation SUAppcast
|
||||
|
||||
@synthesize items = _items;
|
||||
@synthesize signingValidationStatus = _signingValidationStatus;
|
||||
|
||||
- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver error:(NSError * __autoreleasing *)error
|
||||
- (nullable instancetype)initWithXMLData:(NSData *)xmlData relativeToURL:(NSURL * _Nullable)relativeURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus error:(NSError * __autoreleasing *)error
|
||||
{
|
||||
self = [super init];
|
||||
if (self != nil) {
|
||||
_items = [self parseAppcastItemsFromXMLData:xmlData relativeToURL:relativeURL stateResolver:stateResolver error:error];
|
||||
_signingValidationStatus = signingValidationStatus;
|
||||
_items = [self parseAppcastItemsFromXMLData:xmlData relativeToURL:relativeURL stateResolver:stateResolver signingValidationStatus:signingValidationStatus error:error];
|
||||
if (_items == nil) {
|
||||
return nil;
|
||||
}
|
||||
@@ -68,7 +70,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
-(NSArray *)parseAppcastItemsFromXMLData:(NSData *)appcastData relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver error:(NSError *__autoreleasing*)errorp SPU_OBJC_DIRECT
|
||||
-(NSArray *)parseAppcastItemsFromXMLData:(NSData *)appcastData relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus error:(NSError *__autoreleasing*)errorp SPU_OBJC_DIRECT
|
||||
{
|
||||
if (errorp) {
|
||||
*errorp = nil;
|
||||
@@ -142,6 +144,26 @@
|
||||
|
||||
[dict setObject:descriptionDict forKey:SURSSElementDescription];
|
||||
}
|
||||
} else if ([name isEqualToString:SUAppcastElementReleaseNotesLink]) {
|
||||
NSString *releaseNotesLink = node.stringValue;
|
||||
if (releaseNotesLink != nil) {
|
||||
NSDictionary *attributes = [self attributesOfNode:(NSXMLElement *)node];
|
||||
|
||||
NSMutableDictionary *linkDict = [NSMutableDictionary dictionary];
|
||||
[linkDict setObject:releaseNotesLink forKey:@"content"];
|
||||
|
||||
NSString *edSignature = attributes[SUAppcastAttributeEDSignature];
|
||||
if (edSignature != nil) {
|
||||
[linkDict setObject:edSignature forKey:SUAppcastAttributeEDSignature];
|
||||
}
|
||||
|
||||
NSString *length = attributes[SUAppcastAttributeLength];
|
||||
if (length != nil) {
|
||||
[linkDict setObject:length forKey:SUAppcastAttributeLength];
|
||||
}
|
||||
|
||||
[dict setObject:linkDict forKey:SUAppcastElementReleaseNotesLink];
|
||||
}
|
||||
} else if ([name isEqualToString:SUAppcastElementDeltas]) {
|
||||
NSMutableArray *deltas = [NSMutableArray array];
|
||||
NSEnumerator *childEnum = [[node children] objectEnumerator];
|
||||
@@ -189,16 +211,21 @@
|
||||
}
|
||||
|
||||
NSString *errString;
|
||||
SUAppcastItem *anItem = [[SUAppcastItem alloc] initWithDictionary:dict relativeToURL:appcastURL stateResolver:stateResolver failureReason:&errString];
|
||||
SUAppcastItem *anItem = [[SUAppcastItem alloc] initWithDictionary:dict relativeToURL:appcastURL stateResolver:stateResolver signingValidationStatus:signingValidationStatus failureReason:&errString];
|
||||
|
||||
if (anItem) {
|
||||
if (anItem != nil) {
|
||||
[appcastItems addObject:anItem];
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Sparkle Updater: Failed to parse appcast item: %@.\nAppcast dictionary was: %@", errString, dict);
|
||||
if (errorp) *errorp = [NSError errorWithDomain:SUSparkleErrorDomain
|
||||
code:SUAppcastParseError
|
||||
userInfo:@{NSLocalizedDescriptionKey: errString}];
|
||||
return nil;
|
||||
// An info-only update item could fail to be created when signing validation fails
|
||||
// Let's just resume creating the other appcast items in that case.
|
||||
if (signingValidationStatus != SPUAppcastSigningValidationStatusFailed) {
|
||||
SULog(SULogLevelError, @"Sparkle Updater: Failed to parse appcast item: %@.\nAppcast dictionary was: %@", errString, dict);
|
||||
if (errorp) *errorp = [NSError errorWithDomain:SUSparkleErrorDomain
|
||||
code:SUAppcastParseError
|
||||
userInfo:@{NSLocalizedDescriptionKey: errString}];
|
||||
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -258,6 +285,7 @@
|
||||
}
|
||||
|
||||
other->_items = newItems;
|
||||
other->_signingValidationStatus = _signingValidationStatus;
|
||||
return other;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,10 +26,18 @@
|
||||
#import "SPUAppcastItemStateResolver.h"
|
||||
#import "SPUAppcastItemStateResolver+Private.h"
|
||||
#import "SPUAppcastItemState.h"
|
||||
#import "SUSignatureVerifier.h"
|
||||
#import "SPUExtractSignedFeed.h"
|
||||
#import "SUSignatures.h"
|
||||
#import "SPUVerifierInformation.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
#define SUInitialFailedFeedSigningValidationDateKey @"SUInitialFailedFeedSigningValidationDate"
|
||||
|
||||
#define DEFAULT_APPCAST_FAILURE_EXPIRATION_INTERVAL 1728000 // 20 days
|
||||
|
||||
@interface SUAppcastDriver () <SPUDownloadDriverDelegate>
|
||||
@end
|
||||
|
||||
@@ -57,6 +65,8 @@
|
||||
|
||||
- (void)loadAppcastFromURL:(NSURL *)appcastURL userAgent:(NSString *)userAgent httpHeaders:(NSDictionary * _Nullable)httpHeaders inBackground:(BOOL)background
|
||||
{
|
||||
assert(NSThread.isMainThread);
|
||||
|
||||
NSMutableDictionary *requestHTTPHeaders = [NSMutableDictionary dictionary];
|
||||
if (httpHeaders != nil) {
|
||||
[requestHTTPHeaders addEntriesFromDictionary:(NSDictionary * _Nonnull)httpHeaders];
|
||||
@@ -71,21 +81,203 @@
|
||||
- (void)downloadDriverDidDownloadData:(SPUDownloadData *)downloadData
|
||||
{
|
||||
SPUAppcastItemStateResolver *stateResolver = [[SPUAppcastItemStateResolver alloc] initWithHostVersion:_host.version applicationVersionComparator:[self versionComparator] standardVersionComparator:[SUStandardVersionComparator defaultComparator]];
|
||||
|
||||
NSData *downloadedAppcastData = downloadData.data;
|
||||
|
||||
id<SUAppcastDriverDelegate> delegate = _delegate;
|
||||
|
||||
NSDate *currentDate = [NSDate date];
|
||||
|
||||
// Verify feed if appcast signing is required
|
||||
SPUAppcastSigningValidationStatus appcastSigningValidationStatus;
|
||||
NSData *verifiedAppcastData;
|
||||
NSError *verifyAppcastDataFailureError = nil;
|
||||
if (_host.requiresSignedAppcast) {
|
||||
// Extract appcast content without signing information and prepare verification information
|
||||
SUSignatureVerifier *signatureVerifier = [[SUSignatureVerifier alloc] initWithPublicKeys:_host.publicKeys];
|
||||
|
||||
NSString *edSignatureBase64 = nil;
|
||||
uint64_t contentLength = 0;
|
||||
verifiedAppcastData = SPUExtractAppcastContent(downloadedAppcastData, &edSignatureBase64, &contentLength);
|
||||
|
||||
SUSignatures *signatures = [[SUSignatures alloc] initWithEd:edSignatureBase64
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
dsa:nil
|
||||
#endif
|
||||
];
|
||||
|
||||
SPUVerifierInformation *verifierInformation = [[SPUVerifierInformation alloc] initWithExpectedVersion:nil expectedContentLength:contentLength];
|
||||
verifierInformation.actualContentLength = verifiedAppcastData.length;
|
||||
|
||||
// If signature verification fails, we will record the initial date it failed
|
||||
// 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;
|
||||
}
|
||||
|
||||
NSError *verifyAppcastDataInnerError = nil;
|
||||
if (![signatureVerifier verifyData:verifiedAppcastData signatures:signatures fileKind:@"appcast" verifierInformation:verifierInformation error:&verifyAppcastDataInnerError]) {
|
||||
// Feed validation failed. Proceed to check if we can operate in safe mode if feed failure expiration interval has passed.
|
||||
|
||||
NSNumber *failureExpirationIntervalSetting = [_host doubleNumberForInfoDictionaryKey:SUSignedFeedFailureExpirationIntervalKey];
|
||||
|
||||
NSTimeInterval failureExpirationInterval = (failureExpirationIntervalSetting == nil) ? DEFAULT_APPCAST_FAILURE_EXPIRATION_INTERVAL : failureExpirationIntervalSetting.doubleValue;
|
||||
|
||||
BOOL canRecoverFromSigningValidationFailure;
|
||||
if (initialFailedFeedSigningValidationDateKey == nil || fpclassify(failureExpirationInterval) == FP_ZERO) {
|
||||
canRecoverFromSigningValidationFailure = NO;
|
||||
} else {
|
||||
NSDate *firstFailedSigningValidationDate = [hostForFailedSigningValidationDate objectForUserDefaultsKey:initialFailedFeedSigningValidationDateKey ofClass:NSDate.class];
|
||||
|
||||
if (firstFailedSigningValidationDate == nil) {
|
||||
// Record first signing validation date
|
||||
[hostForFailedSigningValidationDate setObject:currentDate forUserDefaultsKey:initialFailedFeedSigningValidationDateKey];
|
||||
canRecoverFromSigningValidationFailure = NO;
|
||||
} else {
|
||||
canRecoverFromSigningValidationFailure = ([currentDate timeIntervalSinceDate:firstFailedSigningValidationDate] >= failureExpirationInterval);
|
||||
}
|
||||
}
|
||||
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObject:SULocalizedStringFromTableInBundle(@"The update feed is improperly signed and could not be validated. Please try again later or contact the app developer.", SPARKLE_TABLE, SUSparkleBundle(), nil) forKey:NSLocalizedDescriptionKey];
|
||||
|
||||
if (verifyAppcastDataInnerError != nil) {
|
||||
[userInfo setObject:verifyAppcastDataInnerError forKey:NSUnderlyingErrorKey];
|
||||
}
|
||||
|
||||
verifyAppcastDataFailureError = [NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:userInfo];
|
||||
|
||||
// If we can recover from signing validation failure for now, still hold onto failureVerifyAppcastDataError
|
||||
// because we will use it later on if there's no actual new update to report
|
||||
if (!canRecoverFromSigningValidationFailure) {
|
||||
[delegate didFailToFetchAppcastWithError:verifyAppcastDataFailureError];
|
||||
return;
|
||||
}
|
||||
|
||||
appcastSigningValidationStatus = SPUAppcastSigningValidationStatusFailed;
|
||||
} else {
|
||||
// Feed validation passes
|
||||
if (initialFailedFeedSigningValidationDateKey != nil) {
|
||||
[hostForFailedSigningValidationDate setObject:nil forUserDefaultsKey:initialFailedFeedSigningValidationDateKey];
|
||||
}
|
||||
|
||||
appcastSigningValidationStatus = SPUAppcastSigningValidationStatusSucceeded;
|
||||
}
|
||||
} else {
|
||||
verifiedAppcastData = downloadedAppcastData;
|
||||
appcastSigningValidationStatus = SPUAppcastSigningValidationStatusSkipped;
|
||||
}
|
||||
|
||||
NSError *appcastError = nil;
|
||||
SUAppcast *appcast = [[SUAppcast alloc] initWithXMLData:downloadData.data relativeToURL:downloadData.URL stateResolver:stateResolver error:&appcastError];
|
||||
SUAppcast *loadedAppcast = [[SUAppcast alloc] initWithXMLData:verifiedAppcastData relativeToURL:downloadData.URL stateResolver:stateResolver signingValidationStatus:appcastSigningValidationStatus error:&appcastError];
|
||||
|
||||
if (appcast == nil) {
|
||||
if (loadedAppcast == nil) {
|
||||
NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithObject:SULocalizedStringFromTableInBundle(@"An error occurred while parsing the update feed.", SPARKLE_TABLE, SUSparkleBundle(), nil) forKey:NSLocalizedDescriptionKey];
|
||||
|
||||
if (appcastError != nil) {
|
||||
[userInfo setObject:appcastError forKey:NSUnderlyingErrorKey];
|
||||
}
|
||||
|
||||
[_delegate didFailToFetchAppcastWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:userInfo]];
|
||||
} else {
|
||||
[self appcastDidFinishLoading:appcast inBackground:_downloadDriver.inBackground];
|
||||
[delegate didFailToFetchAppcastWithError:[NSError errorWithDomain:SUSparkleErrorDomain code:SUAppcastParseError userInfo:userInfo]];
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
// Now process the loaded appcast and find a suitable update item
|
||||
|
||||
[delegate didFinishLoadingAppcast:loadedAppcast];
|
||||
|
||||
id updater = _updater;
|
||||
if (updater != nil) {
|
||||
NSDictionary *userInfo = @{ SUUpdaterAppcastNotificationKey: loadedAppcast };
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFinishLoadingAppCastNotification object:updater userInfo:userInfo];
|
||||
}
|
||||
|
||||
NSSet<NSString *> *allowedChannels;
|
||||
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
|
||||
if (updater != nil && [updaterDelegate respondsToSelector:@selector(allowedChannelsForUpdater:)]) {
|
||||
allowedChannels = [updaterDelegate allowedChannelsForUpdater:updater];
|
||||
if (allowedChannels == nil) {
|
||||
SULog(SULogLevelError, @"Error: -allowedChannelsForUpdater: cannot return nil. Treating this as an empty set.");
|
||||
allowedChannels = [NSSet set];
|
||||
}
|
||||
} else {
|
||||
allowedChannels = [NSSet set];
|
||||
}
|
||||
|
||||
SUAppcast *macOSAppcast = [SUAppcastDriver filterAppcast:loadedAppcast forMacOSAndAllowedChannels:allowedChannels];
|
||||
|
||||
id<SUVersionComparison> applicationVersionComparator = [self versionComparator];
|
||||
|
||||
BOOL background = _downloadDriver.inBackground;
|
||||
NSNumber *phasedUpdateGroup = background ? @([SUPhasedUpdateGroupInfo updateGroupForHost:_host]) : nil;
|
||||
|
||||
SPUSkippedUpdate *skippedUpdate = background ? [SPUSkippedUpdate skippedUpdateForHost:_host] : nil;
|
||||
|
||||
// First filter out min/max OS version and see if there's an update that passes
|
||||
// the minimum autoupdate version. We filter out updates that fail the minimum
|
||||
// autoupdate version test because we have a preference over minor updates that can be
|
||||
// downloaded and installed with less disturbance
|
||||
SUAppcast *passesMinimumAutoupdateAppcast = [SUAppcastDriver filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:_host.version versionComparator:applicationVersionComparator testMinimumSystemRequirements:YES testMinimumAutoupdateVersion:YES];
|
||||
|
||||
SUAppcastItem *secondaryItemPassesMinimumAutoupdate = nil;
|
||||
SUAppcastItem *primaryItemPassesMinimumAutoupdate = [self retrieveBestAppcastItemFromAppcast:passesMinimumAutoupdateAppcast versionComparator:applicationVersionComparator secondaryUpdate:&secondaryItemPassesMinimumAutoupdate];
|
||||
|
||||
// If we weren't able to find a valid update, try to find an update that
|
||||
// doesn't pass the minimum autoupdate version
|
||||
SUAppcastItem *finalPrimaryItem;
|
||||
SUAppcastItem *finalSecondaryItem = nil;
|
||||
if (![self isItemNewer:primaryItemPassesMinimumAutoupdate]) {
|
||||
SUAppcast *failsMinimumAutoupdateAppcast = [SUAppcastDriver filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:_host.version versionComparator:applicationVersionComparator testMinimumSystemRequirements:YES testMinimumAutoupdateVersion:NO];
|
||||
|
||||
finalPrimaryItem = [self retrieveBestAppcastItemFromAppcast:failsMinimumAutoupdateAppcast versionComparator:applicationVersionComparator secondaryUpdate:&finalSecondaryItem];
|
||||
} else {
|
||||
finalPrimaryItem = primaryItemPassesMinimumAutoupdate;
|
||||
finalSecondaryItem = secondaryItemPassesMinimumAutoupdate;
|
||||
}
|
||||
|
||||
// Check if we found a new suitable update
|
||||
if ([self isItemNewer:finalPrimaryItem]) {
|
||||
[delegate didFindValidUpdateWithAppcastItem:finalPrimaryItem secondaryAppcastItem:finalSecondaryItem];
|
||||
return;
|
||||
}
|
||||
|
||||
// If we're trying to recover from a failed signing validation of the feed, show an error rather than
|
||||
// showing why there isn't a new update, which we should be cautious about
|
||||
if (appcastSigningValidationStatus == SPUAppcastSigningValidationStatusFailed && verifyAppcastDataFailureError != nil) {
|
||||
[delegate didFailToFetchAppcastWithError:verifyAppcastDataFailureError];
|
||||
return;
|
||||
}
|
||||
|
||||
// Find the latest appcast item that we can report to the user and updater delegates
|
||||
// This may include updates that fail due to OS version requirements.
|
||||
// This excludes newer backgrounded updates that fail because they are skipped or not in current phased rollout group
|
||||
|
||||
SUAppcast *notFoundAppcast = [SUAppcastDriver filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:_host.version versionComparator:applicationVersionComparator testMinimumSystemRequirements:NO testMinimumAutoupdateVersion:NO];
|
||||
|
||||
SUAppcastItem *notFoundPrimaryItem = [self retrieveBestAppcastItemFromAppcast:notFoundAppcast versionComparator:applicationVersionComparator secondaryUpdate:nil];
|
||||
|
||||
NSComparisonResult hostToLatestAppcastItemComparisonResult;
|
||||
if (notFoundPrimaryItem != nil) {
|
||||
hostToLatestAppcastItemComparisonResult = [applicationVersionComparator compareVersion:_host.version toVersion:notFoundPrimaryItem.versionString];
|
||||
} else {
|
||||
hostToLatestAppcastItemComparisonResult = 0;
|
||||
}
|
||||
|
||||
[delegate didNotFindUpdateWithLatestAppcastItem:notFoundPrimaryItem hostToLatestAppcastItemComparisonResult:hostToLatestAppcastItemComparisonResult background:background];
|
||||
}
|
||||
|
||||
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
|
||||
@@ -267,83 +459,6 @@
|
||||
return [self preferredUpdateForRegularAppcastItem:regularItem secondaryUpdate:secondaryAppcastItem];
|
||||
}
|
||||
|
||||
- (void)appcastDidFinishLoading:(SUAppcast *)loadedAppcast inBackground:(BOOL)background SPU_OBJC_DIRECT
|
||||
{
|
||||
id<SUAppcastDriverDelegate> delegate = _delegate;
|
||||
[delegate didFinishLoadingAppcast:loadedAppcast];
|
||||
|
||||
id updater = _updater;
|
||||
if (updater != nil) {
|
||||
NSDictionary *userInfo = @{ SUUpdaterAppcastNotificationKey: loadedAppcast };
|
||||
[[NSNotificationCenter defaultCenter] postNotificationName:SUUpdaterDidFinishLoadingAppCastNotification object:updater userInfo:userInfo];
|
||||
}
|
||||
|
||||
NSSet<NSString *> *allowedChannels;
|
||||
id<SPUUpdaterDelegate> updaterDelegate = _updaterDelegate;
|
||||
if (updater != nil && [updaterDelegate respondsToSelector:@selector(allowedChannelsForUpdater:)]) {
|
||||
allowedChannels = [updaterDelegate allowedChannelsForUpdater:updater];
|
||||
if (allowedChannels == nil) {
|
||||
SULog(SULogLevelError, @"Error: -allowedChannelsForUpdater: cannot return nil. Treating this as an empty set.");
|
||||
allowedChannels = [NSSet set];
|
||||
}
|
||||
} else {
|
||||
allowedChannels = [NSSet set];
|
||||
}
|
||||
|
||||
SUAppcast *macOSAppcast = [SUAppcastDriver filterAppcast:loadedAppcast forMacOSAndAllowedChannels:allowedChannels];
|
||||
|
||||
id<SUVersionComparison> applicationVersionComparator = [self versionComparator];
|
||||
|
||||
NSNumber *phasedUpdateGroup = background ? @([SUPhasedUpdateGroupInfo updateGroupForHost:_host]) : nil;
|
||||
|
||||
SPUSkippedUpdate *skippedUpdate = background ? [SPUSkippedUpdate skippedUpdateForHost:_host] : nil;
|
||||
|
||||
NSDate *currentDate = [NSDate date];
|
||||
|
||||
// First filter out min/max OS version and see if there's an update that passes
|
||||
// the minimum autoupdate version. We filter out updates that fail the minimum
|
||||
// autoupdate version test because we have a preference over minor updates that can be
|
||||
// downloaded and installed with less disturbance
|
||||
SUAppcast *passesMinimumAutoupdateAppcast = [SUAppcastDriver filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:_host.version versionComparator:applicationVersionComparator testOSVersion:YES testMinimumAutoupdateVersion:YES];
|
||||
|
||||
SUAppcastItem *secondaryItemPassesMinimumAutoupdate = nil;
|
||||
SUAppcastItem *primaryItemPassesMinimumAutoupdate = [self retrieveBestAppcastItemFromAppcast:passesMinimumAutoupdateAppcast versionComparator:applicationVersionComparator secondaryUpdate:&secondaryItemPassesMinimumAutoupdate];
|
||||
|
||||
// If we weren't able to find a valid update, try to find an update that
|
||||
// doesn't pass the minimum autoupdate version
|
||||
SUAppcastItem *finalPrimaryItem;
|
||||
SUAppcastItem *finalSecondaryItem = nil;
|
||||
if (![self isItemNewer:primaryItemPassesMinimumAutoupdate]) {
|
||||
SUAppcast *failsMinimumAutoupdateAppcast = [SUAppcastDriver filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:_host.version versionComparator:applicationVersionComparator testOSVersion:YES testMinimumAutoupdateVersion:NO];
|
||||
|
||||
finalPrimaryItem = [self retrieveBestAppcastItemFromAppcast:failsMinimumAutoupdateAppcast versionComparator:applicationVersionComparator secondaryUpdate:&finalSecondaryItem];
|
||||
} else {
|
||||
finalPrimaryItem = primaryItemPassesMinimumAutoupdate;
|
||||
finalSecondaryItem = secondaryItemPassesMinimumAutoupdate;
|
||||
}
|
||||
|
||||
if ([self isItemNewer:finalPrimaryItem]) {
|
||||
// We found a suitable update
|
||||
[delegate didFindValidUpdateWithAppcastItem:finalPrimaryItem secondaryAppcastItem:finalSecondaryItem];
|
||||
} else {
|
||||
// Find the latest appcast item that we can report to the user and updater delegates
|
||||
// This may include updates that fail due to OS version requirements.
|
||||
// This excludes newer backgrounded updates that fail because they are skipped or not in current phased rollout group
|
||||
SUAppcast *notFoundAppcast = [SUAppcastDriver filterSupportedAppcast:macOSAppcast phasedUpdateGroup:phasedUpdateGroup skippedUpdate:skippedUpdate currentDate:currentDate hostVersion:_host.version versionComparator:applicationVersionComparator testOSVersion:NO testMinimumAutoupdateVersion:NO];
|
||||
|
||||
SUAppcastItem *notFoundPrimaryItem = [self retrieveBestAppcastItemFromAppcast:notFoundAppcast versionComparator:applicationVersionComparator secondaryUpdate:nil];
|
||||
|
||||
NSComparisonResult hostToLatestAppcastItemComparisonResult;
|
||||
if (notFoundPrimaryItem != nil) {
|
||||
hostToLatestAppcastItemComparisonResult = [applicationVersionComparator compareVersion:_host.version toVersion:notFoundPrimaryItem.versionString];
|
||||
} else {
|
||||
hostToLatestAppcastItemComparisonResult = 0;
|
||||
}
|
||||
|
||||
[delegate didNotFindUpdateWithLatestAppcastItem:notFoundPrimaryItem hostToLatestAppcastItemComparisonResult:hostToLatestAppcastItemComparisonResult background:background];
|
||||
}
|
||||
}
|
||||
|
||||
// Note: This method is used by unit tests
|
||||
+ (SUAppcast *)filterAppcast:(SUAppcast *)appcast forMacOSAndAllowedChannels:(NSSet<NSString *> *)allowedChannels
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
@@ -363,6 +478,12 @@ SPU_OBJC_DIRECT
|
||||
return NO;
|
||||
}
|
||||
|
||||
// We should never be interested in the update if it doesn't pass the minimum update version
|
||||
BOOL passesUpdateVersion = item.minimumUpdateVersionIsOK;
|
||||
if (!passesUpdateVersion) {
|
||||
return NO;
|
||||
}
|
||||
|
||||
NSString *channel = item.channel;
|
||||
if (channel == nil) {
|
||||
// Item is on the default channel
|
||||
@@ -374,7 +495,7 @@ SPU_OBJC_DIRECT
|
||||
}
|
||||
|
||||
// Note: This method is used by unit tests
|
||||
+ (SUAppcast *)filterSupportedAppcast:(SUAppcast *)appcast phasedUpdateGroup:(NSNumber * _Nullable)phasedUpdateGroup skippedUpdate:(SPUSkippedUpdate * _Nullable)skippedUpdate currentDate:(NSDate *)currentDate hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator testOSVersion:(BOOL)testOSVersion testMinimumAutoupdateVersion:(BOOL)testMinimumAutoupdateVersion
|
||||
+ (SUAppcast *)filterSupportedAppcast:(SUAppcast *)appcast phasedUpdateGroup:(NSNumber * _Nullable)phasedUpdateGroup skippedUpdate:(SPUSkippedUpdate * _Nullable)skippedUpdate currentDate:(NSDate *)currentDate hostVersion:(NSString *)hostVersion versionComparator:(id<SUVersionComparison>)versionComparator testMinimumSystemRequirements:(BOOL)testMinimumSystemRequirements testMinimumAutoupdateVersion:(BOOL)testMinimumAutoupdateVersion
|
||||
#ifndef BUILDING_SPARKLE_TESTS
|
||||
SPU_OBJC_DIRECT
|
||||
#endif
|
||||
@@ -382,7 +503,9 @@ SPU_OBJC_DIRECT
|
||||
BOOL hostPassesSkippedMajorVersion = [SPUAppcastItemStateResolver isMinimumAutoupdateVersionOK:skippedUpdate.majorVersion hostVersion:hostVersion versionComparator:versionComparator];
|
||||
|
||||
return [appcast copyByFilteringItems:^(SUAppcastItem *item) {
|
||||
BOOL passesOSVersion = (!testOSVersion || (item.minimumOperatingSystemVersionIsOK && item.maximumOperatingSystemVersionIsOK));
|
||||
BOOL passesOSVersion = (!testMinimumSystemRequirements || (item.minimumOperatingSystemVersionIsOK && item.maximumOperatingSystemVersionIsOK));
|
||||
|
||||
BOOL passesHardwareRequirements = (!testMinimumSystemRequirements || item.arm64HardwareRequirementIsOK);
|
||||
|
||||
BOOL passesPhasedRollout = [self itemIsReadyForPhasedRollout:item phasedUpdateGroup:phasedUpdateGroup currentDate:currentDate hostVersion:hostVersion versionComparator:versionComparator];
|
||||
|
||||
@@ -390,7 +513,7 @@ SPU_OBJC_DIRECT
|
||||
|
||||
BOOL passesSkippedUpdates = (versionComparator == nil || hostVersion == nil || ![self item:item containsSkippedUpdate:skippedUpdate hostPassesSkippedMajorVersion:hostPassesSkippedMajorVersion versionComparator:versionComparator]);
|
||||
|
||||
return (BOOL)(passesOSVersion && passesPhasedRollout && passesMinimumAutoupdateVersion && passesSkippedUpdates);
|
||||
return (BOOL)(passesOSVersion && passesHardwareRequirements && passesPhasedRollout && passesMinimumAutoupdateVersion && passesSkippedUpdates);
|
||||
}];
|
||||
}
|
||||
|
||||
|
||||
@@ -26,13 +26,23 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
This initializer method is intended to be marked "private" and discouraged from public usage.
|
||||
This method is available however. Talk to us to describe your use case and if you need to construct appcast items yourself.
|
||||
*/
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error;
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus failureReason:(NSString * _Nullable __autoreleasing *_Nullable)error;
|
||||
|
||||
/**
|
||||
The EdDSA and DSA signatures along with their statuses.
|
||||
The EdDSA and DSA signatures of the update along with their statuses.
|
||||
*/
|
||||
@property (readonly, nonatomic, nullable) SUSignatures *signatures;
|
||||
|
||||
/**
|
||||
The EdDSA signature of the external release notes along with its status.
|
||||
*/
|
||||
@property (readonly, nonatomic, nullable) SUSignatures *releaseNotesSignatures;
|
||||
|
||||
/**
|
||||
The expected content length of the release notes file.
|
||||
*/
|
||||
@property (readonly, nonatomic) uint64_t releaseNotesContentLength;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
|
||||
@@ -16,9 +16,11 @@
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wquoted-include-in-framework-header"
|
||||
#import "SUExport.h"
|
||||
#import "SPUAppcastSigningValidationStatus.h"
|
||||
#pragma clang diagnostic pop
|
||||
#else
|
||||
#import <Sparkle/SUExport.h>
|
||||
#import <Sparkle/SPUAppcastSigningValidationStatus.h>
|
||||
#endif
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
@@ -34,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
Extended documentation and examples on using appcast item features are available at:
|
||||
https://sparkle-project.org/documentation/publishing/
|
||||
*/
|
||||
SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
SU_EXPORT NS_SWIFT_SENDABLE @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
|
||||
/**
|
||||
The version of the update item.
|
||||
@@ -199,6 +201,24 @@ SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
*/
|
||||
@property (nonatomic, readonly) BOOL minimumOperatingSystemVersionIsOK;
|
||||
|
||||
/**
|
||||
This update will be ignored if the application's version precedes this update's minimum version.
|
||||
|
||||
This application's version corresponds to the bundle's @c CFBundleVersion
|
||||
|
||||
The minimum update version is extracted from the @c <sparkle:minimumUpdateVersion> element.
|
||||
|
||||
Use `minimumUpdateVersionIsOK` property to test if the current bundle passes this requirement.
|
||||
|
||||
Old applications must be using Sparkle 2.9 or later, otherwise this property will be ignored.
|
||||
*/
|
||||
@property (nonatomic, copy, readonly, nullable) NSString *minimumUpdateVersion;
|
||||
|
||||
/**
|
||||
Indicates whether or not the current bundle passes the `minimumUpdateVersion` requirement.
|
||||
*/
|
||||
@property (nonatomic, readonly) BOOL minimumUpdateVersionIsOK;
|
||||
|
||||
/**
|
||||
The required maximum system operating version string for this update if provided.
|
||||
|
||||
@@ -219,6 +239,22 @@ SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
*/
|
||||
@property (nonatomic, readonly) BOOL maximumOperatingSystemVersionIsOK;
|
||||
|
||||
/**
|
||||
The required hardware requirements for this update if provided.
|
||||
|
||||
Example: @c arm64
|
||||
|
||||
Use `arm64HardwareRequirementIsOK` property to test if the current running system passes the @c arm64 requirement.
|
||||
|
||||
This is extracted from the @c <sparkle:hardwareRequirements> element, which is a comma-delimited list of hardware requirements.
|
||||
*/
|
||||
@property (nonatomic, copy, readonly) NSSet<NSString *> *hardwareRequirements;
|
||||
|
||||
/**
|
||||
Indicates whether or not the current running system passes the arm64 requirement if specified in the `hardwareRequirements` requirement.
|
||||
*/
|
||||
@property (nonatomic, readonly) BOOL arm64HardwareRequirementIsOK;
|
||||
|
||||
/**
|
||||
The channel the update item is on if provided.
|
||||
|
||||
@@ -235,8 +271,7 @@ SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
|
||||
This may be:
|
||||
- @c application - indicates this is a regular application update.
|
||||
- @c package - indicates this is a guided package installer update.
|
||||
- @c interactive-package - indicates this is an interactive package installer update (deprecated; use "package" instead)
|
||||
- @c package - indicates this is a package installer update.
|
||||
|
||||
This is extracted from the @c sparkle:installationType attribute in the @c <enclosure> element.
|
||||
|
||||
@@ -250,6 +285,13 @@ SU_EXPORT @interface SUAppcastItem : NSObject<NSSecureCoding>
|
||||
*/
|
||||
@property (nonatomic, copy, readonly) NSString *installationType;
|
||||
|
||||
/**
|
||||
The appcast signing validation status that this appcast item came from.
|
||||
|
||||
Please see documentation of @c SPUAppcastSigningValidationStatus values for more information.
|
||||
*/
|
||||
@property (readonly, nonatomic) SPUAppcastSigningValidationStatus signingValidationStatus;
|
||||
|
||||
/**
|
||||
The phased rollout interval of the update item in seconds if provided.
|
||||
|
||||
|
||||
@@ -24,13 +24,16 @@
|
||||
static NSString *SUAppcastItemDeltaUpdatesKey = @"deltaUpdates";
|
||||
static NSString *SUAppcastItemDisplayVersionStringKey = @"displayVersionString";
|
||||
static NSString *SUAppcastItemSignaturesKey = @"signatures";
|
||||
static NSString *SUAppcastItemReleaseNotesSignaturesKey = @"releaseNotesSignatures";
|
||||
static NSString *SUAppcastItemFileURLKey = @"fileURL";
|
||||
static NSString *SUAppcastItemInfoURLKey = @"infoURL";
|
||||
static NSString *SUAppcastItemContentLengthKey = @"contentLength";
|
||||
static NSString *SUAppcastItemLinkLengthKey = @"linkLength";
|
||||
static NSString *SUAppcastItemDescriptionKey = @"itemDescription";
|
||||
static NSString *SUAppcastItemDescriptionFormatKey = @"itemDescriptionFormat";
|
||||
static NSString *SUAppcastItemMaximumSystemVersionKey = @"maximumSystemVersion";
|
||||
static NSString *SUAppcastItemMinimumSystemVersionKey = @"minimumSystemVersion";
|
||||
static NSString *SUAppcastElementHardwareRequirementsKey = @"hardwareRequirements";
|
||||
static NSString *SUAppcastItemReleaseNotesURLKey = @"releaseNotesURL";
|
||||
static NSString *SUAppcastItemFullReleaseNotesURLKey = @"fullReleaseNotesURL";
|
||||
static NSString *SUAppcastItemTitleKey = @"title";
|
||||
@@ -40,10 +43,13 @@ static NSString *SUAppcastItemInstallationTypeKey = @"SUAppcastItemInstallationT
|
||||
static NSString *SUAppcastItemStateKey = @"SUAppcastItemState";
|
||||
static NSString *SUAppcastItemDeltaFromSparkleExecutableSizeKey = @"SUAppcastItemDeltaFromSparkleExecutableSize";
|
||||
static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaFromSparkleLocales";
|
||||
static NSString *SUAppcastItemSigningValidationStatusKey = @"SUAppcastItemSigningValidationStatus";
|
||||
|
||||
@interface SUAppcastItem ()
|
||||
|
||||
@property (readonly, nonatomic, nullable) SUSignatures *signatures;
|
||||
@property (readonly, nonatomic, nullable) SUSignatures *releaseNotesSignatures;
|
||||
@property (readonly, nonatomic) uint64_t releaseNotesContentLength;
|
||||
|
||||
@end
|
||||
|
||||
@@ -65,6 +71,8 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
@synthesize deltaUpdates = _deltaUpdates;
|
||||
@synthesize displayVersionString = _displayVersionString;
|
||||
@synthesize signatures = _signatures;
|
||||
@synthesize releaseNotesSignatures = _releaseNotesSignatures;
|
||||
@synthesize releaseNotesContentLength = _releaseNotesContentLength;
|
||||
@synthesize fileURL = _fileURL;
|
||||
@synthesize contentLength = _contentLength;
|
||||
@synthesize infoURL = _infoURL;
|
||||
@@ -72,6 +80,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
@synthesize itemDescriptionFormat = _itemDescriptionFormat;
|
||||
@synthesize maximumSystemVersion = _maximumSystemVersion;
|
||||
@synthesize minimumSystemVersion = _minimumSystemVersion;
|
||||
@synthesize hardwareRequirements = _hardwareRequirements;
|
||||
@synthesize releaseNotesURL = _releaseNotesURL;
|
||||
@synthesize fullReleaseNotesURL = _fullReleaseNotesURL;
|
||||
@synthesize title = _title;
|
||||
@@ -81,10 +90,12 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
@synthesize installationType = _installationType;
|
||||
@synthesize minimumAutoupdateVersion = _minimumAutoupdateVersion;
|
||||
@synthesize ignoreSkippedUpgradesBelowVersion = _ignoreSkippedUpgradesBelowVersion;
|
||||
@synthesize minimumUpdateVersion = _minimumUpdateVersion;
|
||||
@synthesize phasedRolloutInterval = _phasedRolloutInterval;
|
||||
@synthesize channel = _channel;
|
||||
@synthesize deltaFromSparkleExecutableSize = _deltaFromSparkleExecutableSize;
|
||||
@synthesize deltaFromSparkleLocales = _deltaFromSparkleLocales;
|
||||
@synthesize signingValidationStatus = _signingValidationStatus;
|
||||
|
||||
+ (BOOL)supportsSecureCoding
|
||||
{
|
||||
@@ -102,6 +113,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
|
||||
_displayVersionString = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastItemDisplayVersionStringKey] copy];
|
||||
_signatures = (SUSignatures *)[decoder decodeObjectOfClass:[SUSignatures class] forKey:SUAppcastItemSignaturesKey];
|
||||
_releaseNotesSignatures = (SUSignatures *)[decoder decodeObjectOfClass:[SUSignatures class] forKey:SUAppcastItemReleaseNotesSignaturesKey];
|
||||
_fileURL = [decoder decodeObjectOfClass:[NSURL class] forKey:SUAppcastItemFileURLKey];
|
||||
_infoURL = [decoder decodeObjectOfClass:[NSURL class] forKey:SUAppcastItemInfoURLKey];
|
||||
|
||||
@@ -110,6 +122,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
|
||||
_contentLength = (uint64_t)[decoder decodeInt64ForKey:SUAppcastItemContentLengthKey];
|
||||
_releaseNotesContentLength = (uint64_t)[decoder decodeInt64ForKey:SUAppcastItemLinkLengthKey];
|
||||
|
||||
NSString *installationType = [decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastItemInstallationTypeKey];
|
||||
if (!SPUValidInstallationType(installationType)) {
|
||||
@@ -126,6 +139,12 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
_maximumSystemVersion = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastItemMaximumSystemVersionKey] copy];
|
||||
_minimumSystemVersion = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastItemMinimumSystemVersionKey] copy];
|
||||
_minimumAutoupdateVersion = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastElementMinimumAutoupdateVersion] copy];
|
||||
|
||||
NSSet<NSString *> *hardwareRequirements = [(NSSet<NSString *> *)[decoder decodeObjectOfClasses:[NSSet setWithArray:@[[NSString class], [NSSet class]]] forKey:SUAppcastElementHardwareRequirementsKey] copy];
|
||||
|
||||
_hardwareRequirements = (hardwareRequirements != nil) ? hardwareRequirements : [NSSet set];
|
||||
|
||||
_minimumUpdateVersion = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastElementMinimumUpdateVersion] copy];
|
||||
_ignoreSkippedUpgradesBelowVersion = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastElementIgnoreSkippedUpgradesBelowVersion] copy];
|
||||
_releaseNotesURL = [decoder decodeObjectOfClass:[NSURL class] forKey:SUAppcastItemReleaseNotesURLKey];
|
||||
_fullReleaseNotesURL = [decoder decodeObjectOfClass:[NSURL class] forKey:SUAppcastItemFullReleaseNotesURLKey];
|
||||
@@ -150,6 +169,19 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
_phasedRolloutInterval = [decoder decodeObjectOfClass:[NSNumber class] forKey:SUAppcastElementPhasedRolloutInterval];
|
||||
|
||||
_channel = [(NSString *)[decoder decodeObjectOfClass:[NSString class] forKey:SUAppcastElementChannel] copy];
|
||||
|
||||
NSInteger decodedSigningValidationStatus = [decoder decodeIntegerForKey:SUAppcastItemSigningValidationStatusKey];
|
||||
|
||||
switch (decodedSigningValidationStatus) {
|
||||
case SPUAppcastSigningValidationStatusSkipped:
|
||||
case SPUAppcastSigningValidationStatusSucceeded:
|
||||
case SPUAppcastSigningValidationStatusFailed:
|
||||
_signingValidationStatus = decodedSigningValidationStatus;
|
||||
break;
|
||||
default:
|
||||
// This shouldn't be reached, skipped == 0 matches an old encoder that doesn't encode this enum.
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
|
||||
return self;
|
||||
@@ -177,6 +209,10 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
[encoder encodeObject:_signatures forKey:SUAppcastItemSignaturesKey];
|
||||
}
|
||||
|
||||
if (_releaseNotesSignatures != nil) {
|
||||
[encoder encodeObject:_releaseNotesSignatures forKey:SUAppcastItemReleaseNotesSignaturesKey];
|
||||
}
|
||||
|
||||
if (_fileURL != nil) {
|
||||
[encoder encodeObject:_fileURL forKey:SUAppcastItemFileURLKey];
|
||||
}
|
||||
@@ -186,6 +222,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
|
||||
[encoder encodeInt64:(int64_t)_contentLength forKey:SUAppcastItemContentLengthKey];
|
||||
[encoder encodeInt64:(int64_t)_releaseNotesContentLength forKey:SUAppcastItemLinkLengthKey];
|
||||
|
||||
if (_itemDescription != nil) {
|
||||
[encoder encodeObject:_itemDescription forKey:SUAppcastItemDescriptionKey];
|
||||
@@ -207,10 +244,18 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
[encoder encodeObject:_minimumAutoupdateVersion forKey:SUAppcastElementMinimumAutoupdateVersion];
|
||||
}
|
||||
|
||||
if (_hardwareRequirements != nil) {
|
||||
[encoder encodeObject:_hardwareRequirements forKey:SUAppcastElementHardwareRequirementsKey];
|
||||
}
|
||||
|
||||
if (_ignoreSkippedUpgradesBelowVersion != nil) {
|
||||
[encoder encodeObject:_ignoreSkippedUpgradesBelowVersion forKey:SUAppcastElementIgnoreSkippedUpgradesBelowVersion];
|
||||
}
|
||||
|
||||
if (_minimumUpdateVersion != nil) {
|
||||
[encoder encodeObject:_minimumUpdateVersion forKey:SUAppcastElementMinimumUpdateVersion];
|
||||
}
|
||||
|
||||
if (_state != nil) {
|
||||
[encoder encodeObject:_state forKey:SUAppcastItemStateKey];
|
||||
}
|
||||
@@ -250,6 +295,8 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
if (_channel != nil) {
|
||||
[encoder encodeObject:_channel forKey:SUAppcastElementChannel];
|
||||
}
|
||||
|
||||
[encoder encodeInteger:_signingValidationStatus forKey:SUAppcastItemSigningValidationStatusKey];
|
||||
}
|
||||
|
||||
- (BOOL)isDeltaUpdate
|
||||
@@ -294,6 +341,24 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)minimumUpdateVersionIsOK
|
||||
{
|
||||
if (_state != nil) {
|
||||
return _state.minimumUpdateVersionIsOK;
|
||||
} else {
|
||||
return YES;
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)arm64HardwareRequirementIsOK
|
||||
{
|
||||
if (_state != nil) {
|
||||
return _state.arm64HardwareRequirementIsOK;
|
||||
} else {
|
||||
return YES;
|
||||
}
|
||||
}
|
||||
|
||||
- (BOOL)isMacOsUpdate
|
||||
{
|
||||
return _osString == nil || [_osString isEqualToString:SUAppcastAttributeValueMacOS];
|
||||
@@ -333,39 +398,65 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
|
||||
// Initializer used for making delta items
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL state:(SPUAppcastItemState * _Nullable)state SPU_OBJC_DIRECT
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL state:(SPUAppcastItemState * _Nullable)state signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus SPU_OBJC_DIRECT
|
||||
{
|
||||
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:state failureReason:nil];
|
||||
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:nil resolvedState:state signingValidationStatus:signingValidationStatus failureReason:nil];
|
||||
}
|
||||
|
||||
// Exported public initializer
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver failureReason:(NSString *__autoreleasing *)error
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver *)stateResolver signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus failureReason:(NSString *__autoreleasing *)error
|
||||
{
|
||||
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:stateResolver resolvedState:nil failureReason:error];
|
||||
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:stateResolver resolvedState:nil signingValidationStatus:signingValidationStatus failureReason:error];
|
||||
}
|
||||
|
||||
// Deprecated
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict
|
||||
{
|
||||
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:nil failureReason:nil];
|
||||
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:nil signingValidationStatus:SPUAppcastSigningValidationStatusSkipped failureReason:nil];
|
||||
}
|
||||
|
||||
// Deprecated
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict failureReason:(NSString *__autoreleasing *)error
|
||||
{
|
||||
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:nil failureReason:error];
|
||||
return [self initWithDictionary:dict relativeToURL:nil stateResolver:nil resolvedState:nil signingValidationStatus:SPUAppcastSigningValidationStatusSkipped failureReason:error];
|
||||
}
|
||||
|
||||
// Deprecated
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL failureReason:(NSString *__autoreleasing *)error
|
||||
{
|
||||
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:nil resolvedState:nil failureReason:error];
|
||||
return [self initWithDictionary:dict relativeToURL:appcastURL stateResolver:nil resolvedState:nil signingValidationStatus:SPUAppcastSigningValidationStatusSkipped failureReason:error];
|
||||
}
|
||||
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver * _Nullable)stateResolver resolvedState:(SPUAppcastItemState * _Nullable)resolvedState failureReason:(NSString *__autoreleasing *)error
|
||||
// When the feed fails signing validation as fallback, sanitize the version strings
|
||||
// so they don't easily contain long believable messages telling the user to do something
|
||||
#define MAX_NUMBER_OF_CHARACTERS_IN_UNTRUSTED_VERSION_STRING_AFTER_FIRST_LETTER 10
|
||||
static NSString *SPUSanitizeUntrustedVersionString(NSString *versionString, NSString *versionStringElement)
|
||||
{
|
||||
NSCharacterSet *lettersCharacterSet = [NSCharacterSet letterCharacterSet];
|
||||
|
||||
NSRange firstLetterRange = [versionString rangeOfCharacterFromSet:lettersCharacterSet];
|
||||
if (firstLetterRange.location == NSNotFound) {
|
||||
// No alphabetic characters
|
||||
return versionString;
|
||||
}
|
||||
|
||||
NSUInteger maxVersionStringLength = MIN(firstLetterRange.location + MAX_NUMBER_OF_CHARACTERS_IN_UNTRUSTED_VERSION_STRING_AFTER_FIRST_LETTER, versionString.length);
|
||||
|
||||
NSRange allowedRange = NSMakeRange(0, maxVersionStringLength);
|
||||
NSString *allowedVersionString = [versionString substringWithRange:allowedRange];
|
||||
|
||||
if (![versionString isEqualToString:allowedVersionString]) {
|
||||
SULog(SULogLevelError, @"Error: Sanitized appcast item %@ from '%@' to '%@' because appcast signing validation failed and version could be untrusted", versionStringElement, versionString, allowedVersionString);
|
||||
}
|
||||
|
||||
return allowedVersionString;
|
||||
}
|
||||
|
||||
- (nullable instancetype)initWithDictionary:(NSDictionary *)dict relativeToURL:(NSURL * _Nullable)appcastURL stateResolver:(SPUAppcastItemStateResolver * _Nullable)stateResolver resolvedState:(SPUAppcastItemState * _Nullable)resolvedState signingValidationStatus:(SPUAppcastSigningValidationStatus)signingValidationStatus failureReason:(NSString *__autoreleasing *)error
|
||||
{
|
||||
self = [super init];
|
||||
if (self) {
|
||||
_signingValidationStatus = signingValidationStatus;
|
||||
_title = [(NSString *)[dict objectForKey:SURSSElementTitle] copy];
|
||||
|
||||
NSDictionary *enclosure = [dict objectForKey:SURSSElementEnclosure];
|
||||
@@ -389,26 +480,35 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
// No sparkle:version element/attribute anywhere?
|
||||
SULog(SULogLevelError, @"warning: Item '%@' is missing '<%@>' element. Version comparison may be unreliable. Please always specify %@", _title, SUAppcastElementVersion, SUAppcastElementVersion);
|
||||
|
||||
// Separate the url by underscores and take the last component, as that'll be closest to the end,
|
||||
// then we remove the extension. Hopefully, this will be the version.
|
||||
NSArray<NSString *> *fileComponents = [(NSString *)[enclosure objectForKey:SURSSAttributeURL] componentsSeparatedByString:@"_"];
|
||||
if ([fileComponents count] > 1) {
|
||||
newVersion = [[fileComponents lastObject] stringByDeletingPathExtension];
|
||||
// Grabbing the version from the URL is not properly documented or encouraged.
|
||||
// Not supporting it for appcast signing
|
||||
if (signingValidationStatus == SPUAppcastSigningValidationStatusSkipped) {
|
||||
// Separate the url by underscores and take the last component, as that'll be closest to the end,
|
||||
// then we remove the extension. Hopefully, this will be the version.
|
||||
NSArray<NSString *> *fileComponents = [(NSString *)[enclosure objectForKey:SURSSAttributeURL] componentsSeparatedByString:@"_"];
|
||||
if ([fileComponents count] > 1) {
|
||||
newVersion = [[fileComponents lastObject] stringByDeletingPathExtension];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!newVersion) {
|
||||
if (newVersion == nil) {
|
||||
if (error) {
|
||||
*error = [NSString stringWithFormat:@"Feed item lacks %@ element, and version couldn't be deduced from file name (would have used last component of a file name like AppName_1.3.4.zip)", SUAppcastElementVersion];
|
||||
*error = [NSString stringWithFormat:@"Feed item lacks %@ element, and version couldn't be deduced.", SUAppcastElementVersion];
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
if (signingValidationStatus == SPUAppcastSigningValidationStatusFailed) {
|
||||
newVersion = SPUSanitizeUntrustedVersionString(newVersion, SUAppcastElementVersion);
|
||||
}
|
||||
|
||||
_propertiesDictionary = [[NSDictionary alloc] initWithDictionary:dict];
|
||||
_dateString = [(NSString *)[dict objectForKey:SURSSElementPubDate] copy];
|
||||
|
||||
// Description is not to be trusted if appcast wasn't signed correctly
|
||||
id itemDescription = [dict objectForKey:SURSSElementDescription];
|
||||
if (itemDescription != nil) {
|
||||
if (signingValidationStatus != SPUAppcastSigningValidationStatusFailed && itemDescription != nil) {
|
||||
if ([(NSObject *)itemDescription isKindOfClass:[NSDictionary class]]) {
|
||||
NSString *descriptionContent = itemDescription[@"content"];
|
||||
NSString *itemDescriptionString;
|
||||
@@ -454,20 +554,21 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
_itemDescriptionFormat = nil;
|
||||
}
|
||||
|
||||
NSString *theInfoURL = [dict objectForKey:SURSSElementLink];
|
||||
if (theInfoURL) {
|
||||
if (![theInfoURL isKindOfClass:[NSString class]]) {
|
||||
NSURL *infoURL = nil;
|
||||
NSString *infoLinkURLString = [dict objectForKey:SURSSElementLink];
|
||||
if (infoLinkURLString != nil) {
|
||||
if (![infoLinkURLString isKindOfClass:[NSString class]]) {
|
||||
SULog(SULogLevelError, @"%@ -%@ Info URL is not of valid type.", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
|
||||
} else {
|
||||
NSURL *infoURL;
|
||||
NSURL *processedInfoURL;
|
||||
if (appcastURL != nil) {
|
||||
infoURL = [NSURL URLWithString:theInfoURL relativeToURL:appcastURL];
|
||||
processedInfoURL = [NSURL URLWithString:infoLinkURLString relativeToURL:appcastURL];
|
||||
} else {
|
||||
infoURL = [NSURL URLWithString:theInfoURL];
|
||||
processedInfoURL = [NSURL URLWithString:infoLinkURLString];
|
||||
}
|
||||
|
||||
if ([infoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [infoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
_infoURL = infoURL;
|
||||
if ([processedInfoURL.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [processedInfoURL.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
infoURL = processedInfoURL;
|
||||
} else {
|
||||
SULog(SULogLevelError, @"%@ -%@ Info URL must have a http or https URL scheme.", NSStringFromClass([self class]), NSStringFromSelector(_cmd));
|
||||
}
|
||||
@@ -476,14 +577,15 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
|
||||
// Need an info URL or an enclosure URL. Former to show "More Info"
|
||||
// page, latter to download & install:
|
||||
if (!enclosure && !_infoURL) {
|
||||
if (enclosure == nil && infoURL == nil) {
|
||||
if (error) {
|
||||
*error = @"No enclosure in feed item";
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
if (_infoURL != nil) {
|
||||
// Further below in this method validation is done for info-only updates if appcast signing validation failed
|
||||
if (infoURL != nil) {
|
||||
// If enclosure doesn't exist, the update must be an informational update
|
||||
// Otherwise check presence of informational update element
|
||||
_informationalUpdateVersions = (enclosure != nil) ? [dict objectForKey:SUAppcastElementInformationalUpdate] : [NSSet set];
|
||||
@@ -493,7 +595,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
|
||||
NSString *enclosureURLString = [enclosure objectForKey:SURSSAttributeURL];
|
||||
if (!enclosureURLString && !_infoURL) {
|
||||
if (enclosureURLString == nil && infoURL == nil) {
|
||||
if (error) {
|
||||
*error = @"Feed item's enclosure lacks URL";
|
||||
}
|
||||
@@ -543,6 +645,29 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
_maximumSystemVersion = [(NSString *)[dict objectForKey:SUAppcastElementMaximumSystemVersion] copy];
|
||||
_minimumAutoupdateVersion = [(NSString *)[dict objectForKey:SUAppcastElementMinimumAutoupdateVersion] copy];
|
||||
|
||||
{
|
||||
NSString *hardwareRequirementsString = [(NSString *)[dict objectForKey:SUAppcastElementHardwareRequirements] copy];
|
||||
|
||||
if (hardwareRequirementsString != nil) {
|
||||
NSMutableCharacterSet *characterSet = [NSMutableCharacterSet whitespaceCharacterSet];
|
||||
[characterSet addCharactersInString:@","];
|
||||
NSArray<NSString *> *hardwareRequirementsArray = [hardwareRequirementsString componentsSeparatedByCharactersInSet:characterSet];
|
||||
|
||||
NSMutableSet<NSString *> *hardwareRequirements = [[NSMutableSet alloc] init];
|
||||
for (NSString *hardwareRequirement in hardwareRequirementsArray) {
|
||||
if (hardwareRequirement.length > 0) {
|
||||
[hardwareRequirements addObject:hardwareRequirement.lowercaseString];
|
||||
}
|
||||
}
|
||||
|
||||
_hardwareRequirements = [hardwareRequirements copy];
|
||||
} else {
|
||||
_hardwareRequirements = [NSSet set];
|
||||
}
|
||||
}
|
||||
|
||||
_minimumUpdateVersion = [(NSString *)[dict objectForKey:SUAppcastElementMinimumUpdateVersion] copy];
|
||||
|
||||
_ignoreSkippedUpgradesBelowVersion = [(NSString *)[dict objectForKey:SUAppcastElementIgnoreSkippedUpgradesBelowVersion] copy];
|
||||
|
||||
NSString *channel = [dict objectForKey:SUAppcastElementChannel];
|
||||
@@ -564,29 +689,46 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
|
||||
// Grab critical update information
|
||||
NSDictionary * _Nullable criticalUpdateDictionaryFromAppcast = (NSDictionary *)[dict objectForKey:SUAppcastElementCriticalUpdate];
|
||||
NSArray *tags = [dict objectForKey:SUAppcastElementTags];
|
||||
|
||||
// Critical update information is not to be trusted if appcast wasn't signed correctly
|
||||
NSDictionary * _Nullable criticalUpdateDictionary;
|
||||
if (criticalUpdateDictionaryFromAppcast != nil) {
|
||||
criticalUpdateDictionary = criticalUpdateDictionaryFromAppcast;
|
||||
} else if ([tags isKindOfClass:[NSArray class]] && [tags containsObject:SUAppcastElementCriticalUpdate]) {
|
||||
// Legacy path where critical update used to be a tag without a specified version
|
||||
criticalUpdateDictionary = @{};
|
||||
} else {
|
||||
// No critical info present
|
||||
if (signingValidationStatus == SPUAppcastSigningValidationStatusFailed) {
|
||||
criticalUpdateDictionary = nil;
|
||||
} else {
|
||||
NSDictionary * _Nullable criticalUpdateDictionaryFromAppcast = (NSDictionary *)[dict objectForKey:SUAppcastElementCriticalUpdate];
|
||||
NSArray *tags = [dict objectForKey:SUAppcastElementTags];
|
||||
|
||||
if (criticalUpdateDictionaryFromAppcast != nil) {
|
||||
criticalUpdateDictionary = criticalUpdateDictionaryFromAppcast;
|
||||
} else if ([tags isKindOfClass:[NSArray class]] && [tags containsObject:SUAppcastElementCriticalUpdate]) {
|
||||
// Legacy path where critical update used to be a tag without a specified version
|
||||
criticalUpdateDictionary = @{};
|
||||
} else {
|
||||
// No critical info present
|
||||
criticalUpdateDictionary = nil;
|
||||
}
|
||||
}
|
||||
|
||||
_hasCriticalInformation = (criticalUpdateDictionary != nil);
|
||||
|
||||
if (stateResolver != nil) {
|
||||
_state = [(SPUAppcastItemStateResolver * _Nonnull)stateResolver resolveStateWithInformationalUpdateVersions:_informationalUpdateVersions minimumOperatingSystemVersion:_minimumSystemVersion maximumOperatingSystemVersion:_maximumSystemVersion minimumAutoupdateVersion:_minimumAutoupdateVersion criticalUpdateDictionary:criticalUpdateDictionary];
|
||||
_state = [(SPUAppcastItemStateResolver * _Nonnull)stateResolver resolveStateWithInformationalUpdateVersions:_informationalUpdateVersions minimumUpdateVersion:_minimumUpdateVersion minimumOperatingSystemVersion:_minimumSystemVersion maximumOperatingSystemVersion:_maximumSystemVersion minimumAutoupdateVersion:_minimumAutoupdateVersion criticalUpdateDictionary:criticalUpdateDictionary hardwareRequirements:_hardwareRequirements];
|
||||
} else {
|
||||
// Note state still may be nil if a deprecated initializer is used
|
||||
_state = resolvedState;
|
||||
}
|
||||
|
||||
// Note this needs to be checked after creating _state and _informationalUpdateVersions
|
||||
if (signingValidationStatus == SPUAppcastSigningValidationStatusFailed && [self isInformationOnlyUpdate]) {
|
||||
if (error != nil) {
|
||||
*error = @"Informational update is rejected because signing validation on feed failed";
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
// Even when the update is not an informational only update, the link may be referenced elsewhere
|
||||
// If signing validation on appcast failed, the link is not to be trusted anywhere
|
||||
_infoURL = (signingValidationStatus != SPUAppcastSigningValidationStatusFailed) ? infoURL : nil;
|
||||
|
||||
NSString* rolloutIntervalString = [(NSString *)[dict objectForKey:SUAppcastElementPhasedRolloutInterval] copy];
|
||||
if (rolloutIntervalString != nil) {
|
||||
_phasedRolloutInterval = @(rolloutIntervalString.integerValue);
|
||||
@@ -594,7 +736,11 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
|
||||
NSString *shortVersionString = [enclosure objectForKey:SUAppcastAttributeShortVersionString];
|
||||
if (nil == shortVersionString) {
|
||||
shortVersionString = [dict objectForKey:SUAppcastAttributeShortVersionString]; // fall back on the <item>
|
||||
shortVersionString = [dict objectForKey:SUAppcastElementShortVersionString]; // fall back on the <item>
|
||||
}
|
||||
|
||||
if (shortVersionString != nil && signingValidationStatus == SPUAppcastSigningValidationStatusFailed) {
|
||||
shortVersionString = SPUSanitizeUntrustedVersionString(shortVersionString, SUAppcastElementShortVersionString);
|
||||
}
|
||||
|
||||
if (shortVersionString) {
|
||||
@@ -607,8 +753,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
#if SPARKLE_BUILD_PACKAGE_SUPPORT
|
||||
NSString *attributeInstallationType = [enclosure objectForKey:SUAppcastAttributeInstallationType];
|
||||
if (attributeInstallationType == nil) {
|
||||
// If we have a flat package, assume installation type is guided
|
||||
// (flat / non-archived interactive packages are not supported)
|
||||
// If we have a bare package, assume installation type is guided package
|
||||
// Otherwise assume we have a normal application inside an archive
|
||||
if ([_fileURL.pathExtension isEqualToString:@"pkg"] || [_fileURL.pathExtension isEqualToString:@"mpkg"]) {
|
||||
chosenInstallationType = SPUInstallationTypeGuidedPackage;
|
||||
@@ -621,10 +766,6 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
*error = [NSString stringWithFormat:@"Feed item's enclosure lacks valid %@ (found %@)", SUAppcastAttributeInstallationType, attributeInstallationType];
|
||||
}
|
||||
return nil;
|
||||
} else if ([attributeInstallationType isEqualToString:SPUInstallationTypeInteractivePackage]) {
|
||||
SULog(SULogLevelDefault, @"warning: '%@' for %@ is deprecated. Use '%@' instead.", SPUInstallationTypeInteractivePackage, SUAppcastAttributeInstallationType, SPUInstallationTypeGuidedPackage);
|
||||
|
||||
chosenInstallationType = attributeInstallationType;
|
||||
} else {
|
||||
chosenInstallationType = attributeInstallationType;
|
||||
}
|
||||
@@ -666,29 +807,43 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
}
|
||||
|
||||
// Find the appropriate release notes URL.
|
||||
NSString *releaseNotesString = [dict objectForKey:SUAppcastElementReleaseNotesLink];
|
||||
if (releaseNotesString) {
|
||||
NSURL *url;
|
||||
if (appcastURL != nil) {
|
||||
url = [NSURL URLWithString:releaseNotesString relativeToURL:appcastURL];
|
||||
// Release notes is not to be trusted if signing validation on appcast failed
|
||||
NSDictionary *releaseNotesLinkDictionary = [dict objectForKey:SUAppcastElementReleaseNotesLink];
|
||||
if (signingValidationStatus != SPUAppcastSigningValidationStatusFailed && releaseNotesLinkDictionary != nil) {
|
||||
NSString *releaseNotesString = [releaseNotesLinkDictionary objectForKey:@"content"];
|
||||
if (releaseNotesString != nil) {
|
||||
NSURL *url;
|
||||
if (appcastURL != nil) {
|
||||
url = [NSURL URLWithString:releaseNotesString relativeToURL:appcastURL];
|
||||
} else {
|
||||
url = [NSURL URLWithString:releaseNotesString];
|
||||
}
|
||||
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
_releaseNotesURL = url;
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme.");
|
||||
_releaseNotesURL = nil;
|
||||
}
|
||||
} else if ([_itemDescription hasPrefix:@"http://"] || [_itemDescription hasPrefix:@"https://"]) { // if the description starts with http:// or https:// use that.
|
||||
_releaseNotesURL = [NSURL URLWithString:(NSString * _Nonnull)_itemDescription];
|
||||
} else {
|
||||
url = [NSURL URLWithString:releaseNotesString];
|
||||
}
|
||||
if ([url.scheme caseInsensitiveCompare:@"http"] == NSOrderedSame || [url.scheme caseInsensitiveCompare:@"https"] == NSOrderedSame) {
|
||||
_releaseNotesURL = url;
|
||||
} else {
|
||||
SULog(SULogLevelError, @"Release notes must have a http or https URL scheme.");
|
||||
_releaseNotesURL = nil;
|
||||
}
|
||||
} else if ([_itemDescription hasPrefix:@"http://"] || [_itemDescription hasPrefix:@"https://"]) { // if the description starts with http:// or https:// use that.
|
||||
_releaseNotesURL = [NSURL URLWithString:(NSString * _Nonnull)_itemDescription];
|
||||
} else {
|
||||
_releaseNotesURL = nil;
|
||||
|
||||
_releaseNotesSignatures = [[SUSignatures alloc] initWithEd:[releaseNotesLinkDictionary objectForKey:SUAppcastAttributeEDSignature]
|
||||
#if SPARKLE_BUILD_LEGACY_DSA_SUPPORT
|
||||
dsa:nil
|
||||
#endif
|
||||
];
|
||||
|
||||
long long releaseNotesLength = [(NSString *)[releaseNotesLinkDictionary objectForKey:@"length"] longLongValue];
|
||||
_releaseNotesContentLength = (releaseNotesLength > 0) ? (uint64_t)releaseNotesLength : 0;
|
||||
}
|
||||
|
||||
// Get full release notes URL if informed.
|
||||
// Full release notes is not to be trusted if signing validation on appcast failed
|
||||
NSString *fullReleaseNotesString = [dict objectForKey:SUAppcastElementFullReleaseNotesLink];
|
||||
if (fullReleaseNotesString) {
|
||||
if (signingValidationStatus != SPUAppcastSigningValidationStatusFailed && fullReleaseNotesString != nil) {
|
||||
NSURL *url;
|
||||
if (appcastURL != nil) {
|
||||
url = [NSURL URLWithString:fullReleaseNotesString relativeToURL:appcastURL];
|
||||
@@ -715,7 +870,7 @@ static NSString *SUAppcastItemDeltaFromSparkleLocalesKey = @"SUAppcastItemDeltaF
|
||||
NSMutableDictionary *fakeAppCastDict = [dict mutableCopy];
|
||||
[fakeAppCastDict removeObjectForKey:SUAppcastElementDeltas];
|
||||
[fakeAppCastDict setObject:deltaDictionary forKey:SURSSElementEnclosure];
|
||||
SUAppcastItem *deltaItem = [[SUAppcastItem alloc] initWithDictionary:fakeAppCastDict relativeToURL:appcastURL state:_state];
|
||||
SUAppcastItem *deltaItem = [[SUAppcastItem alloc] initWithDictionary:fakeAppCastDict relativeToURL:appcastURL state:_state signingValidationStatus:_signingValidationStatus];
|
||||
|
||||
if (deltaItem != nil) {
|
||||
[deltas setObject:deltaItem forKey:deltaFrom];
|
||||
|
||||
@@ -9,10 +9,8 @@
|
||||
#if SPARKLE_BUILD_UI_BITS || !BUILDING_SPARKLE
|
||||
|
||||
#import "SUApplicationInfo.h"
|
||||
#import "SUBundleIcon.h"
|
||||
#import "SUHost.h"
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
|
||||
|
||||
@implementation SUApplicationInfo
|
||||
|
||||
@@ -23,33 +21,16 @@
|
||||
|
||||
+ (NSImage *)bestIconForHost:(SUHost *)host
|
||||
{
|
||||
NSURL *iconURL = [SUBundleIcon iconURLForHost:host];
|
||||
BOOL isMainBundle = [host.bundle isEqualTo:[NSBundle mainBundle]];
|
||||
|
||||
// First try NSImageNameApplicationIcon. This image can be dynamically updated if the user's system icon settings change.
|
||||
NSImage *icon = isMainBundle ? [NSImage imageNamed:NSImageNameApplicationIcon] : nil;
|
||||
|
||||
NSImage *icon = (iconURL == nil) ? nil : [[NSImage alloc] initWithContentsOfURL:iconURL];
|
||||
|
||||
// Get icon from asset catalog if no explicit filename is provided.
|
||||
if (!icon) {
|
||||
icon = [host.bundle imageForResource:@SPARKLE_ICON_NAME];
|
||||
// Next try asking NSWorkspace for icon of the bundle
|
||||
if (icon == nil) {
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForFile:host.bundlePath];
|
||||
}
|
||||
|
||||
// Use a default icon if none is defined.
|
||||
if (!icon) {
|
||||
// this assumption may not be correct (eg. even though we're not the main bundle, it could be still be a regular app)
|
||||
// but still better than nothing if no icon was included
|
||||
BOOL isMainBundle = [host.bundle isEqualTo:[NSBundle mainBundle]];
|
||||
|
||||
if (@available(macOS 11, *)) {
|
||||
UTType *contentType = isMainBundle ? UTTypeApplication : UTTypeBundle;
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForContentType:contentType];
|
||||
}
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_11_0
|
||||
else
|
||||
{
|
||||
NSString *fileType = isMainBundle ? (__bridge NSString *)kUTTypeApplication : (__bridge NSString *)kUTTypeBundle;
|
||||
icon = [[NSWorkspace sharedWorkspace] iconForFileType:fileType];
|
||||
}
|
||||
#endif
|
||||
}
|
||||
return icon;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,21 +0,0 @@
|
||||
//
|
||||
// SUBundleIcon.h
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Mayur Pawashe on 7/24/16.
|
||||
// Copyright © 2016 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import <Foundation/Foundation.h>
|
||||
|
||||
NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
@class SUHost;
|
||||
|
||||
SPU_OBJC_DIRECT_MEMBERS @interface SUBundleIcon : NSObject
|
||||
|
||||
+ (NSURL * _Nullable)iconURLForHost:(SUHost *)host;
|
||||
|
||||
@end
|
||||
|
||||
NS_ASSUME_NONNULL_END
|
||||
@@ -1,34 +0,0 @@
|
||||
//
|
||||
// SUBundleIcon.m
|
||||
// Sparkle
|
||||
//
|
||||
// Created by Mayur Pawashe on 7/24/16.
|
||||
// Copyright © 2016 Sparkle Project. All rights reserved.
|
||||
//
|
||||
|
||||
#import "SUBundleIcon.h"
|
||||
#import "SUHost.h"
|
||||
|
||||
|
||||
#include "AppKitPrevention.h"
|
||||
|
||||
@implementation SUBundleIcon
|
||||
|
||||
// Note: To obtain the most current bundle icon file from the Info dictionary, this should take a SUHost, not a NSBundle
|
||||
+ (NSURL *)iconURLForHost:(SUHost *)host
|
||||
{
|
||||
NSString *resource = [host objectForInfoDictionaryKey:@"CFBundleIconFile"];
|
||||
if (resource == nil || ![resource isKindOfClass:[NSString class]]) {
|
||||
return nil;
|
||||
}
|
||||
|
||||
NSURL *iconURL = [host.bundle URLForResource:resource withExtension:@"icns"];
|
||||
|
||||
// The resource could already be containing the path extension, so try again without the extra extension
|
||||
if (iconURL == nil) {
|
||||
iconURL = [host.bundle URLForResource:resource withExtension:nil];
|
||||
}
|
||||
return iconURL;
|
||||
}
|
||||
|
||||
@end
|
||||