Compare commits

..
49 Commits
Author SHA1 Message Date
Sparkle-Bot 21d8df8044 Update Package management files for version 2.9.0 2026-02-22 02:28:35 +00:00
Zorg cb33faafa2 Update change log for 2.9.0 2026-02-21 15:21:25 -08:00
Nathan Manceaux-Panot 79475ea34a Make generate_appcast deltas order stable and thread-safe (#2848) 2026-02-21 10:45:12 -08:00
Zorg aa42f7a020 Probe agent & status service as soon as we launch it (#2852)
Hopefully this fixes potential issues like #2851 for the last time.
2026-02-21 09:45:21 -08:00
Zorg a3f136022a Fix Xcode 26.4 beta compiler warnings (#2850) 2026-02-20 20:58:32 -08:00
Marco Hillger 192dce5f72 Improve German localization (#2847)
- Fix typo: "Downloads-Order" → "Downloads-Ordner"
- Clarify "Install and Relaunch": "neu starten" (ambiguous, sounds
  like system reboot) → "App neu starten"
- Simplify downloaded-update prompts: replace verbose "durch die neue
  Version ersetzen und neu starten" with "jetzt aktualisieren"
- Fix "Learn More…" translation: "Mehr über …" (fragment) →
  "Mehr erfahren …"
- Use more natural Perfekt tense: "ist aktualisiert" → "wurde
  aktualisiert"
- Fix "App Management" translation: "hinzufügen" (add) →
  "Änderungen von … erlauben" (allow modifications from), matching
  the English source string
2026-02-18 20:53:57 -08:00
Sparkle-Bot afea2cda87 Update Package management files for version 2.9.0-beta.2 2026-01-26 03:25:43 +00:00
Zorg 99ace46e4a Update CHANGELOG for 2.9
Updated Vietnamese translation entry to include issue #2839.
2026-01-25 19:19:22 -08:00
Zorg 90eff791ec Fix signature verifier class collisions in unit tests (#2843) 2026-01-18 19:11:37 -08:00
Zorg 7ba3dedd6d Update API documentation for updates checked in background (#2842) 2026-01-17 10:25:31 -08:00
Zorg 7c460d70f6 Formalize disable-signing-warning flag in signing tools (#2841) 2026-01-12 20:49:12 -08:00
Zorg 596b6b031b Preserve XML whitespace better when signing appcast feed (#2840)
We don't force pretty print when writing new XML data now when we insert a signing warning. This may mean the signing warning prefix may start on the same line as the first XML element, but I think this is alright since the rest of the warning starts on its own line.
2026-01-11 21:25:12 -08:00
TranPhuong319 480b895279 Update Vietnamese translation (#2839) 2026-01-11 21:24:27 -08:00
Sparkle-Bot e641adb419 Update Package management files for version 2.9.0-beta.1 2026-01-10 18:19:03 +00:00
Zorg 52e9c64b48 Update macOS version for draft release job 2026-01-10 10:14:04 -08:00
Zorg 88a0edc38d Update CHANGELOG for 2.9 2026-01-10 09:11:49 -08:00
Zorg 787d844be3 Improve detecting non-canonical Sparkle bundles in generate_appcast (#2836)
Don't check for Contents parent directory when checking for "Resources"
2026-01-09 21:40:20 -08:00
Zorg 6460d63f3e Update CI runners to Xcode/macOS 26.2 (#2834) 2026-01-08 20:57:28 -08:00
Zorg ca426e4b2d Find non-canonical Sparkle.framework locations in generate_appcast (#2833)
If Sparkle.framework isn't in Contents/Frameworks/ then we do a deep scan in the app bundle (but ignore Contents/Resources/). Sparkle may be placed in a plug-in or other parent framework.

Also remove legacy SparkleCore lookup which is no longer needed.
2026-01-08 20:28:28 -08:00
Zorg cb2dea4178 Fix build when disabling SPARKLE_BUILD_LEGACY_DSA_SUPPORT (#2829) 2026-01-04 16:39:19 -08:00
Zorg 736b331dd6 Improve extracting signed markdown content (#2828)
This strips the beginning sparkle sign warning comment (if present) in the release notes downloader driver rather than the user driver. The comment is also stripped (if present) in generate_appcast when inserting embedded release notes.

Also improve markdown compatibility with sparkle-cli and alternative user driver in Sparkle Test App.
2026-01-03 19:43:12 -08:00
Zorg d3ae95f76f Download temporary files in-memory using NSURLSessionDataTask (#2825) 2026-01-02 20:10:22 -08:00
Zorg b4f427b747 Add API annotations for Swift concurrency (#2827) 2026-01-02 19:44:20 -08:00
Zorg 5e527f9a11 Remove sparkle-cli (sparkle.app) from binary distribution (#2826) 2026-01-01 19:03:40 -08:00
Zorg 4cda0dc428 Merge MARKDOWN and DELTA test app modes (#2824) 2026-01-01 12:53:35 -08:00
Zorg 7761e65c78 Add support for signing and verifying appcast feeds (#2822)
This provides enhanced opt-in security preventing informational attacks that for example suggest the user the auto-updater is broken and an update needs to be installed from a compromised website (assuming the developer's website is hijacked).

To opt in, developers need to add SURequireSignedFeed Info.plist key to their bundle.

generate_appcast and sign_update have been updated to support signing appcast feeds and release note files (both need to be signed). By default, they embed a HTML comment warning in the files that further modifications will invalidate previously signed signatures. Signed appcasts include a signing block comment at the end of the XML file describing the signature of the content preceding it. Signed release notes will have their signatures annotated in the <sparkle:releaseNotesLink> element with a sparkle:edSignature attribute (and optionally a sparkle:length attribute for diagnostic purposes).

A signingValidationStatus property is also now added to SUAppcast and SUAppcastItem indicating the signing status (skipped, succeeded, failed).

The standard user driver's release notes HTML web view rejects external file references when appcasts are signed. A bug has also been fixed where the update alert would not provide errors when loading external release note files fails. These changes also introduce a showing new error / localizable strings when the release notes is not signed correctly or fails to load.

As a hardening policy, we also enforce SUVerifyUpdateBeforeExtraction when opting into signed feeds, so key rotation is only possible with Developer ID code signed dmg archives.

A fallback feed signing failure expiration policy has also been added. When a signed feed has failed validation for more than a configurable period of time (by default SUSignedFeedFailureExpirationInterval is set to 20 days), Sparkle will allow appcast items to be shown to the user. However, these items operate in a safe mode that strip abusable information like release notes / descriptions / links, sanitize the version strings, and they cannot be marked critical or informational, nor be installed automatically. After this policy expires, this allows users installing updates as long as the updates are signed correctly, or be aware that the updater has not been functioning correctly.

Fixes #971.
2026-01-01 11:33:28 -08:00
Zorg 2c60bb2825 Use TextKit 1 on older systems for plain text release notes view (#2823) 2025-12-31 22:12:42 -08:00
Zorg f28aacfd89 Handle markdown paths for localized release notes in generate_appcast (#2817) 2025-12-29 17:38:04 -08:00
Zorg 04a15cbc28 Add missing nn and vi languages to Installer progress Info.plist (#2818) 2025-12-28 14:08:52 -08:00
TranPhuong319 0516f07b7c Add Vietnamese translation (#2816) 2025-12-28 08:28:59 -08:00
Zorg 82d7da9326 Add markdown support for release notes (#2810)
* Supports Markdown ordered/unordered lists, paragraphs, headers, code blocks, inline styling. Block quotes and thematic breaks are handled in simple manner through indentation and extra newline respectively. Tables are not supported. HTML isn't supported.
* Requires macOS 12 or later due to leveraging Foundation / presentation intents for markdown processing. Older OS's and older Sparkle versions >= 2.4.0 will fall back to plain-text interpretation. Additionally, TextKit 2 is now adopted for macOS 12+, and TextKit 1 only code is to be avoided.
* Adds delegate method to allow formatting / modifying the presented text before it will be shown for plain-text and markdown release notes. This, for example, can be used to adapting release notes based on currently installed version, but it could also open up styling release notes in other ways.
* Adds sparkle:format="markdown" option to <description> element for embedded release notes (in addition to already existingsparkle:format="plain-text" option)
* Adds support for generate_appcast to handle markdown release note files and embedded release notes.
* Adds a MARKDOWN test mode to Sparkle Test App.
2025-12-19 18:10:18 -05:00
Zorg 5d9649e29b Add sparkle:minimumUpdateVersion element (#2811)
This allows specifying a minimum version the host bundle needs to be on before upgrading. This may be useful for new appcast features where this requirement can be used instead of switching to a new appcast.
2025-12-19 16:08:13 -05:00
Zorg 15f7dd5690 Add allowsAutomaticUpdates property (#2809)
This allows us to determine if automatic downloading/installing of updates option (typically a checkbox) should be enabled or not. This property is based on whether or not automatically checking of updates is enabled, or the SUAllowsAutomaticUpdates option (if specified by developer for custom needs).

The update alert now updates hiding/unhiding the automatic downloading checkbox if the automatic update checking option changes.

The test application is now updated to use -[SPUUpdater allowsAutomaticUpdates] for enabling/disabling the automatic downloads update checkbox.
2025-11-26 11:02:31 -08:00
Zorg 8c2ff583a0 Make Debug builds use same time interval settings as Release (#2805)
The Sparkle Test App will opt into a private setting that changes some of the default and minimum values for Debug builds.

This also removes the "WARNING: This is running a Debug build of Sparkle 2; don't use this in production!" log in Debug builds, and removes some unused constants internal to Sparkle.
2025-11-16 13:59:38 -08:00
Zorg 8ed643c901 Allow impatient update check interval to be configured (#2799)
This is the update check interval used after an update has been downloaded/staged to be installed automatically in the background. By default this is 1 week (in seconds) but this change now allows it to be configured.
2025-11-15 20:30:40 -08:00
Zorg a5401bbf3f Clean up code relating to interactive pkg installations (#2803) 2025-11-15 17:25:42 -08:00
Zorg fc7350329e Add hardware requirements element (#2797)
The first requirement we support is arm64 which allows updates to mark themselves as Apple silicon only.

The message that shows up when users check for updates tells them their Mac is too old and a newer Apple silicon Mac is required for new updates. This introduces a new localizable string.

This requirement is also inferred if the minimum system version is >= 27.0

generate_appcast is also updated to handle a new branch for hardwareRequirements element, and for automatically populating it if needed.

Fixes #2796
2025-11-15 17:03:59 -08:00
Zorg 3dfee03f5c Prepend "Changes:" to GitHub draft description (#2804) 2025-11-15 11:08:18 -08:00
Sparkle-Bot b83c87c033 Update Package management files for version 2.8.1 2025-11-15 10:33:58 -08:00
Zorg d9180f7d7f Add CHANGELOG for 2.8.1 2025-11-15 10:33:58 -08:00
Zorg 9faabd7c69 Fix build status badge in README 2025-11-15 10:21:07 -08:00
Zorg ccd1e7a2be Wait after checking for updates for UI tests (#2798) 2025-11-13 21:01:49 -08:00
Zorg 956385b5aa Add documentation note for delegates being weakly referenced (#2802) 2025-11-12 21:01:23 -08:00
Zorg f80d06325c Enforce RunAtLoad and remove KeepAlive (#2795)
Overriding KeepAlive before actually implies RunAtLoad is true but we were setting RunAtLoad to false which is conflicting. In any case we don't want to restart the job if it crashes, and we want to run Updater when the job is loaded.
2025-11-08 08:19:02 -08:00
Zorg 0843eee299 Add missing executable bit permission warnings (#2792)
These warnings are logged after failing to connect to XPC and launchd helpers and indicate the helpers likely did not launch at all.

This error happens when developers incorrectly copy Sparkle framework not preserving executable permissions, and is sadly somewhat common.
2025-11-03 19:47:01 -08:00
Francis Feng 70b82ce304 Add missing localizations to zh-TW (#2791)
Also fix some formatting issues in zh-CN localizations
2025-10-28 21:53:37 -07:00
Zorg ee39041587 Remove NSAppTransportSecurity from the Sparkle Test App (#2790)
NSAllowsLocalNetworking is enabled by default these days since 10.12.
2025-10-26 19:57:06 -07:00
Zorg c8cc30f0a7 Remove unused connection validation options (#2783) 2025-10-26 15:32:25 -07:00
Zorg 557218237f Validate Obj-C class when reading objects from user defaults / plists (#2782)
This includes handling converting NSString -> NSNumber for info/default keys too when reading bools/doubles.
2025-10-26 15:07:03 -07:00
141 changed files with 4458 additions and 1397 deletions

No files matched your search

+6 -6
View File
@@ -10,17 +10,17 @@ jobs:
build:
strategy:
matrix:
xcode: ['xcode26.1', 'xcode16.4']
xcode: ['xcode26.2', 'xcode16.4']
include:
- xcode: 'xcode16.4'
xcode-path: '/Applications/Xcode_16.4.app/Contents/Developer'
upload-dist: true
run-analyzer: true
macos: 'macos-15'
- xcode: 'xcode26.1'
xcode-path: '/Applications/Xcode_26.1.app'
upload-dist: false
run-analyzer: false
macos: 'macos-15'
- xcode: 'xcode26.2'
xcode-path: '/Applications/Xcode_26.2.app/Contents/Developer'
upload-dist: true
run-analyzer: true
macos: 'macos-26'
name: Build and Test Sparkle
+2 -2
View File
@@ -2,7 +2,7 @@ name: "Create Draft Release"
env:
BUILDDIR: "build"
DEVELOPER_DIR: "/Applications/Xcode_16.4.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"
+1 -1
View File
@@ -71,7 +71,7 @@
// Hardening but not critical for security
NSError *validationError = nil;
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
switch (validationStatus) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
break;
+17 -29
View File
@@ -147,7 +147,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
if (!_performedStage1Installation) {
BOOL passesValidation;
NSError *validationError = nil;
SUValidateConnectionStatus status = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
SUValidateConnectionStatus status = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
switch (status) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
passesValidation = YES;
@@ -599,7 +599,7 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
} else if (identifier == SPUSentUpdateAppcastItemData) {
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) {
@@ -612,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;
@@ -679,8 +679,6 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
return;
}
uint8_t canPerformSilentInstall = (uint8_t)[installer canInstallSilently];
dispatch_async(dispatch_get_main_queue(), ^{
self->_installer = installer;
@@ -688,9 +686,9 @@ static const NSTimeInterval SUDisplayProgressTimeDelay = 0.7;
self->_performedStage1Installation = YES;
os_unfair_lock_unlock(&self->_newConnectionLock);
uint8_t sendInformation[] = {canPerformSilentInstall, (uint8_t)self->_targetTerminated};
uint8_t targetTerminated = (uint8_t)self->_targetTerminated;
NSData *sendData = [NSData dataWithBytes:sendInformation length:sizeof(sendInformation)];
NSData *sendData = [NSData dataWithBytes:&targetTerminated length:sizeof(targetTerminated)];
[self->_communicator handleMessageWithIdentifier:SPUInstallationFinishedStage1 data:sendData];
@@ -705,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
+1 -2
View File
@@ -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;
+8 -8
View File
@@ -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
+8 -8
View File
@@ -178,7 +178,7 @@ typedef struct
FILE *file = _file;
void *compressionBuffer = _compressionBuffer;
_compressionStream.dst_ptr = buffer;
_compressionStream.dst_ptr = (uint8_t *)buffer;
_compressionStream.dst_size = (size_t)length;
while (_compressionStream.dst_size > 0) {
@@ -194,7 +194,7 @@ typedef struct
}
// Reset source buffer
_compressionStream.src_ptr = compressionBuffer;
_compressionStream.src_ptr = (const uint8_t *)compressionBuffer;
_compressionStream.src_size = bytesRead;
}
@@ -264,7 +264,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
return nil;
}
SPUDeltaCompressionMode compression = 0;
SPUDeltaCompressionMode compression = SPUDeltaCompressionModeNone;
if (fread(&compression, sizeof(compression), 1, file) < 1) {
_error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to read compression value from patch file: %@", patchFile] }];
return nil;
@@ -379,7 +379,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
return @[];
}
char *fileTableData = calloc(1, filePathSectionSize);
char *fileTableData = (char *)calloc(1, filePathSectionSize);
if (fileTableData == NULL) {
_error = [NSError errorWithDomain:NSPOSIXErrorDomain code:errno userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to calloc() %llu bytes for relative file paths.", filePathSectionSize] }];
return nil;
@@ -449,7 +449,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
{
uint64_t currentItemIndex = 0;
while (YES) {
SPUDeltaItemCommands commands = 0;
SPUDeltaItemCommands commands = (SPUDeltaItemCommands)0;
if (![self _readBuffer:&commands length:sizeof(commands)]) {
break;
}
@@ -715,14 +715,14 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
case SPUDeltaCompressionModeLZFSE:
case SPUDeltaCompressionModeLZ4:
case SPUDeltaCompressionModeZLIB: {
_compressionStream.src_ptr = buffer;
_compressionStream.src_ptr = (const uint8_t *)buffer;
_compressionStream.src_size = (size_t)length;
FILE *file = _file;
void *compressionBuffer = _compressionBuffer;
while (_compressionStream.src_size > 0) {
// Reset destination buffer
_compressionStream.dst_ptr = compressionBuffer;
_compressionStream.dst_ptr = (uint8_t *)compressionBuffer;
_compressionStream.dst_size = COMPRESSION_BUFFER_SIZE;
if (compression_stream_process(&_compressionStream, 0) == COMPRESSION_STATUS_ERROR) {
@@ -1259,7 +1259,7 @@ static compression_algorithm compressionAlgorithmForMode(SPUDeltaCompressionMode
_compressionStream.src_size = 0;
while (_compressionStream.dst_size > 0) {
_compressionStream.dst_ptr = compressionBuffer;
_compressionStream.dst_ptr = (uint8_t *)compressionBuffer;
_compressionStream.dst_size = COMPRESSION_BUFFER_SIZE;
compression_status status = compression_stream_process(&_compressionStream, COMPRESSION_STREAM_FINALIZE);
+3 -3
View File
@@ -252,7 +252,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
NSArray<NSString *> *subpathComponents = [relativePathComponents subarrayWithRange:NSMakeRange(0, componentIndex + 1)];
NSString *subpathKey = [subpathComponents componentsJoinedByString:@"/"];
xar_file_t cachedFile = [fileTable[subpathKey] pointerValue];
xar_file_t cachedFile = (xar_file_t)[fileTable[subpathKey] pointerValue];
if (cachedFile != NULL) {
lastParent = cachedFile;
} else {
@@ -349,7 +349,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
continue;
}
SPUDeltaItemCommands commands = 0;
SPUDeltaItemCommands commands = (SPUDeltaItemCommands)0;
{
const char *value = NULL;
if (xar_prop_get(file, DELETE_KEY, &value) == 0) {
@@ -399,7 +399,7 @@ static xar_file_t xarAddFile(NSMutableDictionary<NSString *, NSValue *> *fileTab
assert(item.itemFilePath != nil);
assert(item.xarContext != NULL);
xar_file_t file = item.xarContext;
xar_file_t file = (xar_file_t)item.xarContext;
if (xar_extract_tofile(_x, file, item.itemFilePath.fileSystemRepresentation) != 0) {
_error = [NSError errorWithDomain:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_DOMAIN code:SPARKLE_DELTA_XAR_ARCHIVE_ERROR_CODE_EXTRACT_FAILURE userInfo:@{ NSLocalizedDescriptionKey: [NSString stringWithFormat:@"Failed to extract xar file entry to %@", item.itemFilePath] }];
return NO;
+2 -2
View File
@@ -41,7 +41,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
progressCallback(0/7.0);
SUBinaryDeltaMajorVersion majorDiffVersion = header.majorVersion;
SUBinaryDeltaMajorVersion majorDiffVersion = (SUBinaryDeltaMajorVersion)header.majorVersion;
uint16_t minorDiffVersion = header.minorVersion;
unsigned char *expectedBeforeHash = header.beforeTreeHash;
@@ -444,7 +444,7 @@ BOOL applyBinaryDelta(NSString *source, NSString *finalDestination, NSString *pa
if (failedToApplyFileSystemCompression) {
// Try to replace bundle normally
if (![fileManager replaceItemAtURL:[NSURL fileURLWithPath:finalDestination] withItemAtURL:[NSURL fileURLWithPath:destination isDirectory:YES] backupItemName:nil options:0 resultingItemURL:NULL error:error]) {
if (![fileManager replaceItemAtURL:[NSURL fileURLWithPath:finalDestination] withItemAtURL:[NSURL fileURLWithPath:destination isDirectory:YES] backupItemName:nil options:(NSFileManagerItemReplacementOptions)0 resultingItemURL:NULL error:error]) {
removeTree(destination);
return NO;
}
+10 -10
View File
@@ -128,7 +128,7 @@ NSString *temporaryFilename(NSString *base)
NSMutableData *data = [NSMutableData data];
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
char *buffer = data.mutableBytes;
char *buffer = (char *)data.mutableBytes;
int fd = mkstemp(buffer);
if (fd == -1) {
perror("mkstemp");
@@ -149,7 +149,7 @@ NSString *temporaryDirectory(NSString *base)
NSMutableData *data = [NSMutableData data];
[data appendBytes:template.fileSystemRepresentation length:strlen(template.fileSystemRepresentation) + 1];
char *buffer = data.mutableBytes;
char *buffer = (char *)data.mutableBytes;
char *templateResult = mkdtemp(buffer);
if (templateResult == NULL) {
perror("mkdtemp");
@@ -180,12 +180,12 @@ static BOOL crc32HashOfFileContents(uLong *outChecksum, FTSENT *ent, void *tempB
return NO;
}
checksum = crc32(checksum, (const void *)linkDestination, (unsigned int)linkDestinationLength);
checksum = crc32(checksum, (const Bytef *)linkDestination, (unsigned int)linkDestinationLength);
} else if (ent->fts_info == FTS_F) {
ssize_t fileSize = ent->fts_statp->st_size;
uint64_t encodedFileSize = (uint64_t)fileSize;
checksum = crc32(checksum, (const void *)&encodedFileSize, sizeof(encodedFileSize));
checksum = crc32(checksum, (const Bytef *)&encodedFileSize, sizeof(encodedFileSize));
if (fileSize > 0) {
FILE *file = fopen(ent->fts_path, "rb");
@@ -204,7 +204,7 @@ static BOOL crc32HashOfFileContents(uLong *outChecksum, FTSENT *ent, void *tempB
return NO;
}
checksum = crc32(checksum, tempBuffer, (uInt)bytesToConsume);
checksum = crc32(checksum, (const Bytef *)tempBuffer, (uInt)bytesToConsume);
bytesLeft -= bytesToConsume;
}
@@ -337,7 +337,7 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
uint64_t encodedFileContentsChecksum = fileContentsChecksum;
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&encodedFileContentsChecksum, sizeof(encodedFileContentsChecksum));
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)&encodedFileContentsChecksum, sizeof(encodedFileContentsChecksum));
if (ent->fts_info == FTS_F) {
fileHashKey = [NSData dataWithBytes:&encodedFileContentsChecksum length:sizeof(encodedFileContentsChecksum)];
@@ -378,7 +378,7 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
const char *relativePathBytes = [relativePath fileSystemRepresentation];
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)relativePathBytes, (uInt)strlen(relativePathBytes));
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)relativePathBytes, (uInt)strlen(relativePathBytes));
} else {
CC_SHA1_Update(&hashContext, relativePathBytes, (CC_LONG)strlen(relativePathBytes));
}
@@ -393,8 +393,8 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
uint16_t hashedPermissions = (ent->fts_info == FTS_SL) ? VALID_SYMBOLIC_LINK_PERMISSIONS : permissions;
if (majorVersion >= SUBinaryDeltaMajorVersion4) {
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&type, sizeof(type));
crc32ChecksumValue = crc32(crc32ChecksumValue, (const void *)&hashedPermissions, sizeof(hashedPermissions));
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)&type, sizeof(type));
crc32ChecksumValue = crc32(crc32ChecksumValue, (const Bytef *)&hashedPermissions, sizeof(hashedPermissions));
} else {
CC_SHA1_Update(&hashContext, &type, sizeof(type));
CC_SHA1_Update(&hashContext, &hashedPermissions, sizeof(hashedPermissions));
@@ -410,7 +410,7 @@ BOOL getRawHashOfTreeAndFileTablesWithVersion(void *hashBuffer, NSString *path,
memset(hashBuffer, 0, BINARY_DELTA_HASH_LENGTH);
memcpy(hashBuffer, &encodedCrc32ChecksumValue, sizeof(encodedCrc32ChecksumValue));
} else {
CC_SHA1_Final(hashBuffer, &hashContext);
CC_SHA1_Final((unsigned char *)hashBuffer, &hashContext);
}
return YES;
+1 -1
View File
@@ -133,7 +133,7 @@ static bool codeSignatureExtendedAttributeExists(const FTSENT *ent)
return false;
}
char *buffer = malloc((size_t)listSize);
char *buffer = (char *)malloc((size_t)listSize);
assert(buffer != NULL);
ssize_t sizeBack = listxattr(ent->fts_path, buffer, (size_t)listSize, options);
+1 -9
View File
@@ -27,14 +27,6 @@ typedef NS_ENUM(NSUInteger, SUValidateConnectionStatus) {
SUValidateConectionNoSupportedValidationMethodFailure,
};
typedef NS_OPTIONS(NSUInteger, SUValidateConnectionOptions) {
// Default validation behavior (matches against Team ID from main executable if available)
SUValidateConnectionOptionDefault = 0,
// Require that the connecting client has the app sandbox entitlement
SUValidateConnectionOptionRequireSandboxEntitlement = 1 << 0,
};
SUCodeSigningVerifierDefinitionAttribute
@interface SUCodeSigningVerifier : NSObject
@@ -52,7 +44,7 @@ SUCodeSigningVerifierDefinitionAttribute
+ (NSString * _Nullable)teamIdentifierAtURL:(NSURL *)url;
+ (NSString * _Nullable)teamIdentifierFromMainExecutable;
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection options:(SUValidateConnectionOptions)options error:(NSError * __autoreleasing *)error;
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection error:(NSError * __autoreleasing *)error;
@end
+10 -25
View File
@@ -74,8 +74,7 @@
// See https://github.com/sparkle-project/Sparkle/issues/376#issuecomment-48824267 and https://developer.apple.com/library/mac/technotes/tn2206
// Additionally, there are several reasons to stay away from deep verification and to prefer EdDSA signing the download archive instead.
// See https://github.com/sparkle-project/Sparkle/pull/523#commitcomment-17549302 and https://github.com/sparkle-project/Sparkle/issues/543
SecCSFlags flags = kSecCSCheckAllArchitectures;
result = SecStaticCodeCheckValidityWithErrors(staticCode, flags, requirement, &cfError);
result = SecStaticCodeCheckValidityWithErrors(staticCode, kSecCSCheckAllArchitectures, requirement, &cfError);
if (result != errSecSuccess) {
NSError *underlyingError;
@@ -147,6 +146,8 @@ finally:
OSStatus result;
SecStaticCodeRef staticCode = NULL;
CFErrorRef cfError = NULL;
// See also code further below where kSecCSCheckNestedCode may be added
SecCSFlags flags = kSecCSCheckAllArchitectures;
result = SecStaticCodeCreateWithPath((__bridge CFURLRef)bundleURL, kSecCSDefaultFlags, &staticCode);
if (result != noErr) {
@@ -160,7 +161,6 @@ finally:
}
// See in -codeSignatureIsValidAtBundleURL:andMatchesSignatureAtBundleURL:error: for why kSecCSCheckNestedCode is not always passed
SecCSFlags flags = kSecCSCheckAllArchitectures;
if (checkNestedCode) {
flags |= kSecCSCheckNestedCode;
}
@@ -330,6 +330,7 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
OSStatus result;
NSError *resultError = nil;
CFErrorRef cfError = NULL;
NSString *commonErrorMessage = @"The download archive cannot be validated with Apple Developer ID code signing as fallback (after (Ed)DSA verification has failed)";
@@ -379,9 +380,7 @@ static NSString * _Nullable SUTeamIdentifierFromCode(SecStaticCodeRef staticCode
goto finally;
}
SecCSFlags flags = (SecCSFlags)kSecCSDefaultFlags;
CFErrorRef cfError = NULL;
result = SecStaticCodeCheckValidityWithErrors(downloadStaticCode, flags, requirement, &cfError);
result = SecStaticCodeCheckValidityWithErrors(downloadStaticCode, kSecCSDefaultFlags, requirement, &cfError);
if (result != errSecSuccess) {
NSError *underlyingError;
if (cfError != NULL) {
@@ -443,30 +442,16 @@ finally:
return (resultError == nil);
}
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection options:(SUValidateConnectionOptions)options error:(NSError * __autoreleasing *)error
+ (SUValidateConnectionStatus)validateConnection:(NSXPCConnection *)connection error:(NSError * __autoreleasing *)error
{
NSMutableArray<NSString *> *codeSigningRequirementComponents = [NSMutableArray array];
// Build the default team ID signing requirement
// Check if code signing requirement is required
NSString *hostTeamIdentifier = [self teamIdentifierFromMainExecutable];
if (hostTeamIdentifier != nil) {
NSString *teamIdentifierRequirement = [NSString stringWithFormat:@"(anchor apple generic and certificate leaf[subject.OU] = \"%@\")", hostTeamIdentifier];
[codeSigningRequirementComponents addObject:teamIdentifierRequirement];
}
// Build the sandboxing requirement
if ((options & SUValidateConnectionOptionRequireSandboxEntitlement) != 0) {
// This ensures the entitlement is set to true too
NSString *sandboxingRequirement = @"(entitlement [\"com.apple.security.app-sandbox\"] exists)";
[codeSigningRequirementComponents addObject:sandboxingRequirement];
}
// Check if no requirement is required
if (codeSigningRequirementComponents.count == 0) {
if (hostTeamIdentifier == nil) {
return SUValidateConnectionStatusSetNoRequirementSuccess;
}
NSString *codeSigningRequirement = [codeSigningRequirementComponents componentsJoinedByString:@" and "];
// 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];
+3 -2
View File
@@ -133,6 +133,8 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
NSMutableArray<NSString *> *itemsToExtract = [NSMutableArray array];
NSUInteger totalFileExtractionCount = 0;
BOOL success = YES;
{
NSTask *task = [[NSTask alloc] init];
task.launchPath = @"/usr/bin/hdiutil";
@@ -269,7 +271,7 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
[itemsToExtract addObject:item];
}
_fileProgressIncrement = (0.99 - _currentExtractionProgress) / totalFileExtractionCount;
_fileProgressIncrement = (0.99 - _currentExtractionProgress) / (double)totalFileExtractionCount;
_notifier = notifier;
// Copy all items we want to extract and notify of progress
@@ -286,7 +288,6 @@ static NSUInteger fileCountForDirectory(NSFileManager *fileManager, NSString *it
[notifier notifyProgress:1.0];
BOOL success = YES;
goto finally;
reportError:
-5
View File
@@ -82,11 +82,6 @@
{
}
- (BOOL)canInstallSilently
{
return YES;
}
@end
#endif
-5
View File
@@ -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 -6
View File
@@ -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) {
@@ -406,9 +406,4 @@
}
}
- (BOOL)canInstallSilently
{
return YES;
}
@end
+12 -1
View File
@@ -22,16 +22,27 @@
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUSignatureVerifier : NSObject
#ifndef BUILDING_SPARKLE_TESTS
#define SUSignatureVerifierDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
#else
#define SUSignatureVerifierDefinitionAttribute __attribute__((objc_runtime_name("SUTestSignatureVerifier")))
#endif
SUSignatureVerifierDefinitionAttribute @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
+56 -46
View File
@@ -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;
}
if (ed25519_verify(signatures.ed25519Signature, data.bytes, data.length, _pubKeys.ed25519PubKey)) {
SULog(SULogLevelDefault, @"OK: EdDSA signature is correct");
assert(data != nil);
if (ed25519_verify(signatures.ed25519Signature, (const unsigned char *)data.bytes, data.length, _pubKeys.ed25519PubKey)) {
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;
+21
View File
@@ -1,3 +1,24 @@
# 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)
* Probe agent & status service as soon as we launch it to reduce timeout issues (#2852) (Zorg)
* Add `allowsAutomaticUpdates` property to determine if automatic downloading/installing of updates option should be enabled (#2809) (Zorg)
* Add Vietnamese translation (#2816, #2839) (TranPhuong319)
* Add missing nn language to Installer progress Info.plist (#2818) (Zorg)
* Improve German localization (#2847) (Marco Hillger)
* 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)
* Make generate_appcast deltas order stable and thread-safe (#2848) (Nathan Manceaux-Panot)
* Fix Xcode 26.4 beta compiler warnings (#2850) (Zorg)
# 2.8.1
* Enforce RunAtLoad to reduce potential timeout issue when launching updater task (#2795) (Zorg)
+1 -1
View File
@@ -1 +1 @@
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
{"1.27.1": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.1/Sparkle-1.27.1.tar.xz", "2.0.0-beta.6": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-beta.6/Sparkle-2.0.0-beta.6.tar.xz", "2.0.0-rc.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0-rc.1/Sparkle-2.0.0-rc.1.tar.xz", "2.0.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.0.0/Sparkle-2.0.0.tar.xz", "2.1.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.1/Sparkle-2.1.0-beta.1.tar.xz", "2.1.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0-beta.2/Sparkle-2.1.0-beta.2.tar.xz", "2.1.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.1.0/Sparkle-2.1.0.tar.xz", "2.2.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.1/Sparkle-2.2.0-beta.1.tar.xz", "2.2.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0-beta.2/Sparkle-2.2.0-beta.2.tar.xz", "2.2.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.0/Sparkle-2.2.0.tar.xz", "2.2.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.1/Sparkle-2.2.1.tar.xz", "2.2.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.2.2/Sparkle-2.2.2.tar.xz", "2.3.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.1/Sparkle-2.3.0-beta.1.tar.xz", "2.3.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0-beta.2/Sparkle-2.3.0-beta.2.tar.xz", "2.3.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.0/Sparkle-2.3.0.tar.xz", "2.3.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.1/Sparkle-2.3.1.tar.xz", "2.3.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.3.2/Sparkle-2.3.2.tar.xz", "2.4.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.1/Sparkle-2.4.0-beta.1.tar.xz", "2.4.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0-beta.2/Sparkle-2.4.0-beta.2.tar.xz", "2.4.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.0/Sparkle-2.4.0.tar.xz", "2.4.1-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1-beta.1/Sparkle-2.4.1-beta.1.tar.xz", "2.4.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.1/Sparkle-2.4.1.tar.xz", "2.4.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.4.2/Sparkle-2.4.2.tar.xz", "2.5.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.1/Sparkle-2.5.0-beta.1.tar.xz", "2.5.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0-beta.2/Sparkle-2.5.0-beta.2.tar.xz", "2.5.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.0/Sparkle-2.5.0.tar.xz", "2.5.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.1/Sparkle-2.5.1.tar.xz", "2.5.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.5.2/Sparkle-2.5.2.tar.xz", "2.6.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.1/Sparkle-2.6.0-beta.1.tar.xz", "2.6.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0-beta.2/Sparkle-2.6.0-beta.2.tar.xz", "2.6.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.0/Sparkle-2.6.0.tar.xz", "2.6.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.1/Sparkle-2.6.1.tar.xz", "1.27.2": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.2/Sparkle-1.27.2.tar.xz", "2.6.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.2/Sparkle-2.6.2.tar.xz", "1.27.3": "https://github.com/sparkle-project/Sparkle/releases/download/1.27.3/Sparkle-1.27.3.tar.xz", "2.6.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.3/Sparkle-2.6.3.tar.xz", "2.6.4": "https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz", "2.7.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0-beta.1/Sparkle-2.7.0-beta.1.tar.xz", "2.7.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.0/Sparkle-2.7.0.tar.xz", "2.7.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.1/Sparkle-2.7.1.tar.xz", "2.7.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.2/Sparkle-2.7.2.tar.xz", "2.7.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.7.3/Sparkle-2.7.3.tar.xz", "2.8.0-beta.1": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.1/Sparkle-2.8.0-beta.1.tar.xz", "2.8.0-beta.2": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.2/Sparkle-2.8.0-beta.2.tar.xz", "2.8.0-beta.3": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0-beta.3/Sparkle-2.8.0-beta.3.tar.xz", "2.8.0": "https://github.com/sparkle-project/Sparkle/releases/download/2.8.0/Sparkle-2.8.0.tar.xLine truncated
+3 -3
View File
@@ -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 = 8
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 = 2050
CURRENT_PROJECT_VERSION = 2053
MARKETING_VERSION = $(SPARKLE_VERSION_MAJOR).$(SPARKLE_VERSION_MINOR).$(SPARKLE_VERSION_PATCH)$(SPARKLE_VERSION_SUFFIX)
ALWAYS_SEARCH_USER_PATHS = NO
@@ -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:
-4
View File
@@ -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"
+129 -121
View File
@@ -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;
@@ -85,8 +84,21 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
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
@@ -94,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;
@@ -111,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;
@@ -158,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
@@ -182,76 +188,119 @@ static NSString *SUDownloadingReason = @"Downloading update related file";
});
}
- (void)URLSession:(NSURLSession *)__unused session downloadTask:(NSURLSessionDownloadTask *)downloadTask didFinishDownloadingToURL:(NSURL *)location
static bool SPUValidateStatusCodeAndFailIfInvalid(NSURLResponse * _Nullable response, NSURL *url, id<SPUDownloaderDelegate> delegate)
{
NSInteger statusCode = [downloadTask.response isKindOfClass:[NSHTTPURLResponse class]] ? ((NSHTTPURLResponse *)downloadTask.response).statusCode : 200;
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)", downloadTask.originalRequest.URL.absoluteString, [NSHTTPURLResponse localizedStringForStatusCode:statusCode], (long)statusCode];
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];
}
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];
[SPULocalCacheDirectory removeOldItemsInDirectory:rootPersistentDownloadCachePath];
[delegate downloaderDidFailWithError:error];
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] }];
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
{
if (!SPUValidateStatusCodeAndFailIfInvalid(downloadTask.response, downloadTask.originalRequest.URL, _delegate)) {
return;
}
// Remove our old caches path so we don't start accumulating files in there
NSString *rootPersistentDownloadCachePath = [self rootPersistentDownloadCachePathForBundleIdentifier:_bundleIdentifier];
[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;
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:(NSURLBookmarkCreationOptions)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];
}
}
}
@@ -259,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
+1 -1
View File
@@ -26,7 +26,7 @@
// This is a policy, not a security critical enforcement.
{
NSError *validationError = nil;
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options:SUValidateConnectionOptionDefault error:&validationError];
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
switch (validationStatus) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
break;
+1 -1
View File
@@ -73,7 +73,7 @@ static NSString *SUInstallerConnectionKeepAliveReason = @"Installer Connection K
- (void)_setServiceName:(NSString *)serviceName systemDomain:(BOOL)systemDomain SPU_OBJC_DIRECT
{
NSXPCConnectionOptions options = systemDomain ? NSXPCConnectionPrivileged : 0;
NSXPCConnectionOptions options = systemDomain ? NSXPCConnectionPrivileged : (NSXPCConnectionOptions)0;
NSXPCConnection *connection = [[NSXPCConnection alloc] initWithMachServiceName:serviceName options:options];
connection.exportedInterface = [NSXPCInterface interfaceWithProtocol:@protocol(SUInstallerCommunicationProtocol)];
+1 -1
View File
@@ -206,7 +206,7 @@
[NSGraphicsContext saveGraphicsState];
NSGraphicsContext.currentContext = [NSGraphicsContext graphicsContextWithBitmapImageRep:iconBitmapRep];
[icon drawInRect:NSMakeRect(0, 0, imageDimensions, imageDimensions)];
[icon drawInRect:NSMakeRect(0.0, 0.0, (CGFloat)imageDimensions, (CGFloat)imageDimensions)];
[NSGraphicsContext restoreGraphicsState];
+1 -1
View File
@@ -23,7 +23,7 @@
// This is a policy, not a security critical enforcement.
{
NSError *validationError = nil;
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection options: SUValidateConnectionOptionDefault error:&validationError];
SUValidateConnectionStatus validationStatus = [SUCodeSigningVerifier validateConnection:newConnection error:&validationError];
switch (validationStatus) {
case SUValidateConnectionStatusSetCodeSigningRequirementSuccess:
break;
+3 -3
View File
@@ -2,10 +2,10 @@
import PackageDescription
// Version is technically not required here, SPM doesn't check
let version = "2.8.1"
let version = "2.9.0"
// 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.8.1"
let checksum = "995f913935fe903d50b3be5344fc52a638f56b39ef7984bf7a44244786d28638"
let tag = "2.9.0"
let checksum = "44a0d5a00d5bfb6c2ad1755a92b694d948876d61ad44f35a0119eb0e7ace4b65"
let url = "https://github.com/sparkle-project/Sparkle/releases/download/\(tag)/Sparkle-for-Swift-Package-Manager.zip"
let package = Package(
+1 -1
View File
@@ -1,4 +1,4 @@
# Sparkle 2 ![Build Status](https://github.com/sparkle-project/Sparkle/workflows/Build%20%26%20Tests/badge.svg?branch=2.x) ![SwiftPM](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/Sparkle.svg?cacheSeconds=86400)](https://cocoapods.org/pods/Sparkle)
# Sparkle 2 [![Build Status](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml/badge.svg?branch=2.x)](https://github.com/sparkle-project/Sparkle/actions/workflows/ci.yml) ![SwiftPM](https://img.shields.io/badge/SwiftPM-compatible-4BC51D.svg?style=flat) [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage) [![CocoaPods](https://img.shields.io/cocoapods/v/Sparkle.svg?cacheSeconds=86400)](https://cocoapods.org/pods/Sparkle)
Secure and reliable software update framework for macOS.
+1 -1
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Sparkle"
s.version = "2.8.1"
s.version = "2.9.0"
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"
+77 -33
View File
@@ -117,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 */; };
@@ -180,6 +179,7 @@
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 */; };
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 */; };
@@ -198,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 */; };
@@ -215,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 */; };
@@ -240,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 */; };
@@ -338,8 +340,8 @@
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 */; };
@@ -391,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 */; };
@@ -728,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 */;
@@ -1026,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>"; };
@@ -1082,6 +1092,7 @@
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>"; };
@@ -1137,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; };
@@ -1161,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>"; };
@@ -1186,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; };
@@ -1272,8 +1285,8 @@
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; };
728FBA1B2BB5013300651EDF /* nn */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = nn; path = nn.lproj/MainMenu.strings; sourceTree = "<group>"; };
@@ -1328,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>"; };
@@ -1387,6 +1406,8 @@
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>"; };
@@ -1586,6 +1607,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
72C56E062EFB45C80005A484 /* libed25519.a in Frameworks */,
725B81FC2781CDC20041746F /* libcompression.tbd in Frameworks */,
1495006F195FCE1800BC5B5B /* Foundation.framework in Frameworks */,
);
@@ -1811,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 */,
@@ -1821,6 +1845,7 @@
5A5DD41B249F0F4B0045EB3E /* test-relative-urls.xml */,
729F7EAB27366353004592DC /* test-links.xml */,
723AD12E29922B5F006BB02F /* test-dangerous-link.xml */,
72C56E212F04C28B0005A484 /* testreleasenotes.html */,
5A5DD40324958AFF0045EB3E /* SUUpdateValidatorTest */,
);
path = Resources;
@@ -1900,6 +1925,7 @@
142E0E0819A83AAC00E4312B /* SUBinaryDeltaTest.m */,
F8761EB01ADC5068000C9034 /* SUCodeSigningVerifierTest.m */,
5AF9DC3B1981DBEE001EA135 /* SUSignatureVerifierTest.m */,
72C56E1E2F04AC890005A484 /* SUFeedSignatureVerifierTest.swift */,
72A4A23F1BB6567D00E7820D /* SUFileManagerTest.swift */,
5AF6C74C1AEA40760014A3AB /* SUInstallerTest.m */,
72BEBFEE1D7287560019146B /* SUSpotlightImporterTest.swift */,
@@ -1918,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 */,
@@ -2048,6 +2075,8 @@
7267E5991D3D8A5A00D1BF90 /* SUCodeSigningVerifier.m */,
7267E59A1D3D8A5A00D1BF90 /* SUSignatureVerifier.h */,
7267E59B1D3D8A5A00D1BF90 /* SUSignatureVerifier.m */,
72C56E072EFDFB850005A484 /* SPUExtractSignedFeed.h */,
72C56E082EFDFB850005A484 /* SPUExtractSignedFeed.m */,
72D04F3B2B094C8400A6DEAA /* SPUVerifierInformation.h */,
72D04F3C2B094C8400A6DEAA /* SPUVerifierInformation.m */,
);
@@ -2095,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 */,
@@ -2112,7 +2142,6 @@
7205C4481E1304CE00E370AE /* ArchiveItem.swift */,
7205C44A1E1304CE00E370AE /* FeedXML.swift */,
7205C4401E13049400E370AE /* main.swift */,
7205C4491E1304CE00E370AE /* Signatures.swift */,
7205C44B1E1304CE00E370AE /* Unarchive.swift */,
FA30773E24CBC3E9007BA37D /* URL+Hashing.swift */,
);
@@ -2158,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>";
@@ -2217,7 +2246,8 @@
72666DC42B0B28D4001511B0 /* common_cli */ = {
isa = PBXGroup;
children = (
72666DC52B0B28F4001511B0 /* secret.swift */,
72666DC52B0B28F4001511B0 /* Secret.swift */,
72C56E0F2EFEF10B0005A484 /* Signing.swift */,
);
path = common_cli;
sourceTree = "<group>";
@@ -2479,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 */,
@@ -2500,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 */,
@@ -2561,7 +2594,6 @@
buildWorkingDirectory = "";
dependencies = (
14732BCB1960F73500593899 /* PBXTargetDependency */,
72DBA37A1D5FDE95002594A8 /* PBXTargetDependency */,
72F94F6B1CC4A0C8002DEE68 /* PBXTargetDependency */,
725148E9266D918900247C9C /* PBXTargetDependency */,
7218EC352623ED97008FECF3 /* PBXTargetDependency */,
@@ -3061,6 +3093,7 @@
fa,
zh_HK,
nn,
vi,
);
mainGroup = 0867D691FE84028FC02AAC07 /* Sparkle */;
packageReferences = (
@@ -3102,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 */,
@@ -3131,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 */,
@@ -3309,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 */,
@@ -3346,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;
};
@@ -3372,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 */,
@@ -3379,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 */,
@@ -3397,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;
};
@@ -3531,6 +3571,7 @@
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 */,
7267E5871D3D89B300D1BF90 /* SUPipedUnarchiver.m in Sources */,
7267E5C51D3D8B2700D1BF90 /* SUPlainInstaller.m in Sources */,
@@ -3556,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 */,
@@ -3607,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 */,
@@ -3655,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;
};
@@ -3664,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;
};
@@ -3842,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 */;
@@ -3913,6 +3955,7 @@
F6E11510281410D10003736C /* ar */,
37A5F28528E9219000891504 /* zh_HK */,
728FBA1C2BB5013300651EDF /* nn */,
E0949FD02EFC4CFD0039C748 /* vi */,
);
name = Sparkle.strings;
sourceTree = "<group>";
@@ -3964,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>
+15
View File
@@ -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.";
@@ -163,6 +169,12 @@
/* 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";
@@ -193,6 +205,9 @@
/* 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!";
+2 -1
View File
@@ -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>
+1 -1
View File
@@ -102,7 +102,7 @@ static const NSTimeInterval SUTerminationTimeDelay = 0.3;
// This difference is significant. We shouldn't have a model where the 'server' tries to connect to a 'client',
// nor have a model where a process that runs at the highest level (the installer can run as root) tries to connect to a user level agent or process
BOOL systemDomain = arguments[2].boolValue;
NSXPCConnectionOptions connectionOptions = systemDomain ? NSXPCConnectionPrivileged : 0;
NSXPCConnectionOptions connectionOptions = systemDomain ? NSXPCConnectionPrivileged : (NSXPCConnectionOptions)0;
_systemDomain = systemDomain;
_connection = [[NSXPCConnection alloc] initWithMachServiceName:SPUProgressAgentServiceNameForBundleIdentifier(hostBundleIdentifier) options:connectionOptions];
+3 -1
View File
@@ -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
+12 -2
View File
@@ -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
+1 -1
View File
@@ -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;
+63 -8
View File
@@ -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,19 +124,59 @@
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];;
BOOL maximumOperatingSystemVersionIsOK = [self isMaximumOperatingSystemVersionOK:maximumOperatingSystemVersion];
BOOL majorUpgrade = ![self isMinimumAutoupdateVersionOK:minimumAutoupdateVersion];
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
+32
View File
@@ -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 */
+14 -6
View File
@@ -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];
}
+6 -1
View File
@@ -202,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;
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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.
+4
View File
@@ -122,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) {
+19
View File
@@ -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
+95
View File
@@ -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:(NSDataSearchOptions)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:(NSDataSearchOptions)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;
}
+1 -1
View File
@@ -11,7 +11,7 @@
#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])
#define SPUValidInstallationType(x) ((x != nil) && [SPUInstallationTypesArray containsObject:(NSString * _Nonnull)x])
+1 -1
View File
@@ -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;
+28 -17
View File
@@ -26,6 +26,7 @@
#import "SPUDownloadedUpdate.h"
#import "SPUInstallationType.h"
#import "SUConstants.h"
#import "SPUProbeInstallStatus.h"
#include "AppKitPrevention.h"
@@ -296,7 +297,7 @@
- (void)_handleMessageWithIdentifier:(int32_t)identifier data:(NSData *)data SPU_OBJC_DIRECT
{
if (!SPUInstallerMessageTypeIsLegal(_currentStage, identifier)) {
if (!SPUInstallerMessageTypeIsLegal(_currentStage, (SPUInstallerMessageType)identifier)) {
SULog(SULogLevelError, @"Error: received out of order message with current stage: %d, requested stage: %d", _currentStage, identifier);
return;
}
@@ -305,14 +306,14 @@
if (identifier == SPUExtractionStarted) {
_extractionAttempts++;
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
[delegate installerDidStartExtracting];
} else if (identifier == SPUExtractedArchiveWithProgress) {
if (data.length == sizeof(double) && sizeof(double) == sizeof(uint64_t)) {
uint64_t progressValue = CFSwapInt64LittleToHost(*(const uint64_t *)data.bytes);
double progress = *(double *)&progressValue;
[delegate installerDidExtractUpdateWithProgress:progress];
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
}
} else if (identifier == SPUArchiveExtractionFailed) {
// If this is a delta update, there must be a regular update we can fall back to
@@ -326,11 +327,11 @@
[self _reportInstallerError:unarchivedError genericErrorCode:SUUnarchivingError genericUserInfo:genericUserInfo];
}
} else if (identifier == SPUValidationStarted) {
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
} else if (identifier == SPUInstallationStartedStage1) {
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
} else if (identifier == SPUInstallationFinishedStage1) {
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
// Let the installer keep a copy of the appcast item data
// We may want to ask for it later (note the updater can relaunch without the app necessarily having relaunched)
@@ -342,19 +343,14 @@
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;
_currentStage = (SPUInstallerMessageType)identifier;
BOOL hasTargetTerminated = NO;
if (data.length >= sizeof(uint8_t)) {
@@ -371,7 +367,7 @@
[delegate installerDidStartInstallingWithApplicationTerminated:hasTargetTerminated];
} else if (identifier == SPUInstallationFinishedStage3) {
_currentStage = identifier;
_currentStage = (SPUInstallerMessageType)identifier;
[_installerConnection invalidate];
_installerConnection = nil;
@@ -464,6 +460,8 @@
NSString *hostBundlePath = _host.bundle.bundlePath;
assert(hostBundlePath != nil);
NSString *hostBundleIdentifier = _host.bundle.bundleIdentifier;
NSString *installationType = _updateItem.installationType;
assert(installationType != nil);
@@ -489,7 +487,20 @@
self->_systemDomain = systemDomain;
[self setUpConnection];
[self sendInstallationData];
completionHandler(nil);
// Send a probe/ping to the status service, which should boost/prioritize its startup
if (hostBundleIdentifier != nil) {
[SPUProbeInstallStatus probeInstallerInProgressForHostBundleIdentifier:hostBundleIdentifier completion:^(BOOL stausServiceIsRunning) {
if (!stausServiceIsRunning) {
SULog(SULogLevelError, @"Error: failed to probe status service for %@ from the framework", hostBundleIdentifier);
}
completionHandler(nil);
}];
} else {
completionHandler(nil);
}
break;
}
});
+4
View File
@@ -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;
}
+3 -3
View File
@@ -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];
+1 -1
View File
@@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
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"
+1 -1
View File
@@ -27,7 +27,7 @@ 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
+13 -8
View File
@@ -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;
@@ -110,7 +112,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
- (double)currentTime SPU_OBJC_DIRECT
{
if (_timebaseInfo.denom > 0) {
return (1.0 * mach_absolute_time() * _timebaseInfo.numer / _timebaseInfo.denom);
return (double)(mach_absolute_time() * _timebaseInfo.numer) / (double)_timebaseInfo.denom;
} else {
return 0.0;
}
@@ -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
@@ -367,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;
@@ -457,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
@@ -695,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)];
@@ -821,7 +826,7 @@ static const NSTimeInterval SUScheduledUpdateIdleEventLeewayInterval = DEBUG ? 3
NSBundle *sparkleBundle = SUSparkleBundle();
#endif
if (_expectedContentLength > 0.0) {
if (_expectedContentLength > 0) {
double newProgressValue = (double)_bytesDownloaded / (double)_expectedContentLength;
[_statusController setProgressValue:MIN(newProgressValue, 1.0)];
+16
View File
@@ -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
+67 -8
View File
@@ -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) {
+1 -1
View File
@@ -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.
+26 -16
View File
@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
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
@@ -92,7 +92,7 @@ SU_EXPORT @interface SPUUpdater : NSObject
- (BOOL)startUpdater:(NSError * __autoreleasing *)error;
/**
Checks for updates, and displays progress while doing so if needed.
Checks for new updates, and displays progress while doing so if needed.
This is meant for users initiating a new update check or checking the current update progress.
@@ -109,25 +109,23 @@ SU_EXPORT @interface SPUUpdater : NSObject
- (void)checkForUpdates;
/**
Checks for updates, but does not show any UI unless an update is found.
Checks for new updates in the background.
You usually do not need to call this method directly. If `automaticallyChecksForUpdates` is @c YES,
Sparkle calls this method automatically according to its update schedule using the `updateCheckInterval`
and the `lastUpdateCheckDate`. Therefore, you should typically only consider calling this method directly if you
opt out of automatic update checks. Calling this method when updating your own bundle is invalid if Sparkle is configured
to ask the user's permission to check for updates automatically and `automaticallyChecksForUpdates` is `NO`.
If you want to reset the updater's cycle after an updater setting change, see `resetUpdateCycle` or `resetUpdateCycleAfterShortDelay` instead.
You usually should not call this method directly. By default Sparkle calls this method automatically
on a scheduled basis if automatic update checks are enabled. This is done by checking the current state of
`automaticallyChecksForUpdates`, `updateCheckInterval`, `lastUpdateCheckDate`, and
`SUScheduledImpatientCheckInterval`.
This is meant for programmatically initiating a check for updates in the background without the user initiating it.
This check will not show UI if no new updates are found.
If you want to additionally force an update check on every app launch though, it's recommended to only call this method immediately after starting the updater,
and only when automatic update checks are enabled (by checking `automaticallyChecksForUpdates` is `YES`). Calling this method at later points
could interfere with Sparkle's scheduler in unexpected ways.
If a new update is found, the updater's user driver may handle showing it at an appropriate (but not necessarily immediate) time.
If you want control over when and how a new update is shown, please see https://sparkle-project.org/documentation/gentle-reminders/
If you want to reset the updater's cycle after an updater setting change, please use `resetUpdateCycle` or `resetUpdateCycleAfterShortDelay` instead.
Note if automated downloading/installing is turned on, either a new update may be downloaded in the background to be installed silently,
or an already downloaded update may be shown.
Updates that are found may not be presented immediately to the user, either due to automatic downloading/installing of updates being on or
due to gentle reminders https://sparkle-project.org/documentation/gentle-reminders/ for example.
This will not find updates that the user has opted into skipping.
Updates that have been skipped by the user will not be found.
This method does not do anything if there is a `sessionInProgress`.
@@ -251,6 +249,18 @@ SU_EXPORT @interface SPUUpdater : NSObject
*/
@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.
+56 -28
View File
@@ -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];
@@ -187,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);
}
@@ -307,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
@@ -318,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;
}
@@ -378,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);
@@ -400,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?
@@ -480,7 +484,7 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
if (_updateLastCheckedDate == nil)
{
_updateLastCheckedDate = [_host objectForUserDefaultsKey:SULastCheckTimeKey];
_updateLastCheckedDate = [_host objectForUserDefaultsKey:SULastCheckTimeKey ofClass:NSDate.class];
}
return _updateLastCheckedDate;
@@ -520,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));
}
}
});
@@ -560,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:)]) {
@@ -573,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];
@@ -659,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];
@@ -1062,6 +1071,25 @@ NSString *const SUUpdaterAppcastNotificationKey = @"SUUpdaterAppCastNotification
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
{
if (![NSThread isMainThread]) {
@@ -1080,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];
@@ -1124,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];
@@ -1136,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!
@@ -1222,7 +1250,7 @@ static NSString *escapeURLComponent(NSString *str) {
// Let's only send the system profiling information once per week at most, so we normalize daily-checkers vs. biweekly-checkers and the such.
if (sendingSystemProfile) {
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey];
NSDate *lastSubmitDate = [_host objectForUserDefaultsKey:SULastProfileSubmitDateKey ofClass:NSDate.class];
if (!lastSubmitDate) {
lastSubmitDate = [NSDate distantPast];
}
+11 -6
View File
@@ -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
/**
@@ -421,16 +421,21 @@ SU_EXPORT extern NSString *const SUSystemProfilerPreferredLanguageKey;
/**
Called when an update is scheduled to be silently installed on quit after downloading the update automatically.
If the updater is given responsibility, it can later remind the user an update is available if they have not terminated the application for a long time.
If you want to intercept this method without taking control of installing the update, return @c NO.
This will let future update cycles to run and allow Sparkle to present the update to the user later if certain conditions are met.
For example, critical updates will be presented to the user right away. Other updates may be presented later if the user hasn't terminated the application
for a long time (defined by `SUScheduledImpatientCheckInterval`).
Also if the updater is given responsibility and the update item is marked critical, the new update will be presented to the user immediately after.
If you want to take control of installing the update, return @c YES.
This stalls the current update cycle and prevents future update cycles from running. When the opportunity arrives, you can invoke `immediateInstallHandler` to
install the update and relaunch the application without any UI interaction shown.
Even if the @c immediateInstallHandler is not invoked, the installer will attempt to install the update on termination.
In either case Sparkle will always attempt to install the update when the app terminates.
@param updater The updater instance.
@param item The appcast item corresponding to the update that is proposed to be installed.
@param immediateInstallHandler The install handler for the delegate to immediately install the update. No UI interaction will be shown and the application will be relaunched after installation. This handler can only be used if @c YES is returned and the delegate handles installing the update. For Sparkle 2.3 onwards, this handler can be invoked multiple times in case the application cancels the termination request.
@return @c YES if the delegate will handle installing the update or @c NO if the updater should be given responsibility.
@param immediateInstallHandler The install handler to immediately install the update and relaunch the application. This handler can only be used if @c YES is returned. For Sparkle 2.3 onwards, this handler can be invoked multiple times in case the application cancels the termination request.
@return @c YES if you will handle installing the update using `immediateInstallHandler` or @c NO to allow Sparkle's update scheduler to continue running.
*/
- (BOOL)updater:(SPUUpdater *)updater willInstallUpdateOnQuit:(SUAppcastItem *)item immediateInstallationBlock:(void (^)(void))immediateInstallHandler;
+33
View File
@@ -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
+26 -7
View File
@@ -28,7 +28,9 @@ NS_ASSUME_NONNULL_BEGIN
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;
@@ -48,12 +50,10 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
/**
* 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;
/**
* 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;
@@ -67,6 +67,25 @@ SU_EXPORT @interface SPUUpdaterSettings : NSObject
*/
@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.
*
+193 -13
View File
@@ -7,6 +7,7 @@
//
#import "SPUUpdaterSettings.h"
#import "SPUUpdaterSettings+Debug.h"
#import "SUHost.h"
#import "SUConstants.h"
@@ -15,18 +16,28 @@
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
{
@@ -34,8 +45,17 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
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];
@@ -79,6 +99,9 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
_automaticallyChecksForUpdates = currentValue;
[self didChangeValueForKey:updatedKeyPath];
[self processAllowsAutomaticUpdates];
[self processAutomaticallyDownloadsUpdates];
}
}
@@ -97,6 +120,51 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
}
}
- (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];
@@ -134,8 +202,17 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
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];
}
@@ -161,10 +238,13 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
// 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:SUDefaultUpdateCheckInterval];
[self setUpdateCheckInterval:[self defaultUpdateCheckInterval]];
} else {
[NSNotificationCenter.defaultCenter postNotificationName:SUUpdateAutomaticCheckSettingChangedNotification object:nil userInfo:@{SUUpdateBundlePathUserInfoKey: _host.bundlePath}];
}
[self processAllowsAutomaticUpdates];
[self processAutomaticallyDownloadsUpdates];
}
+ (BOOL)automaticallyNotifiesObserversOfAutomaticallyChecksForUpdates
@@ -175,12 +255,12 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
- (NSTimeInterval)currentUpdateCheckInterval SPU_OBJC_DIRECT
{
// Find the stored check interval. User defaults override Info.plist.
id intervalValue = [_host objectForKey:SUScheduledCheckIntervalKey];
if (intervalValue == nil || ![(NSObject *)intervalValue isKindOfClass:[NSNumber class]]) {
return SUDefaultUpdateCheckInterval;
NSNumber *intervalValue = [_host doubleNumberForKey:SUScheduledCheckIntervalKey];
if (intervalValue == nil) {
return [self defaultUpdateCheckInterval];
}
return [(NSNumber *)intervalValue doubleValue];
return intervalValue.doubleValue;
}
- (void)setUpdateCheckInterval:(NSTimeInterval)updateCheckInterval
@@ -199,27 +279,52 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
}
}
- (NSTimeInterval)currentImpatientUpdateCheckInterval SPU_OBJC_DIRECT
{
NSNumber *intervalValue = [_host doubleNumberForInfoDictionaryKey:SUScheduledImpatientCheckIntervalKey];
if (intervalValue == nil) {
return [self defaultImpatientUpdateCheckInterval];
}
return intervalValue.doubleValue;
}
+ (BOOL)automaticallyNotifiesObserversOfUpdateCheckInterval
{
return NO;
}
// For allowing automatic downloaded updates to be turned on or off
- (NSNumber * _Nullable)allowsAutomaticUpdatesOption
+ (BOOL)automaticallyNotifiesObserversOfImpatientUpdateCheckInterval
{
NSNumber *developerAllowsAutomaticUpdates = [_host objectForInfoDictionaryKey:SUAllowsAutomaticUpdatesKey];
return [developerAllowsAutomaticUpdates isKindOfClass:[NSNumber class]] ? developerAllowsAutomaticUpdates : nil;
return NO;
}
- (BOOL)allowsAutomaticUpdates
- (NSNumber * _Nullable)currentAllowsAutomaticUpdatesOption SPU_OBJC_DIRECT
{
NSNumber *developerAllowsAutomaticUpdates = [self allowsAutomaticUpdatesOption];
return (developerAllowsAutomaticUpdates == nil || developerAllowsAutomaticUpdates.boolValue);
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 [self allowsAutomaticUpdates] && [_host boolForKey:SUAutomaticallyUpdateKey];
return _allowsAutomaticUpdates && [_host boolForKey:SUAutomaticallyUpdateKey];
}
- (void)setAutomaticallyDownloadsUpdates:(BOOL)automaticallyDownloadsUpdates
@@ -261,4 +366,79 @@ static NSString *SUSendsSystemProfileKeyPath = @"sendsSystemProfile";
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
+1 -1
View File
@@ -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;
+2 -2
View File
@@ -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, ^{
+6 -4
View File
@@ -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,7 +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;
- (void)showUpdateInstalledAndRelaunched:(BOOL)relaunched acknowledgement:(void (^)(void))acknowledgement NS_SWIFT_ASYNC(2);
/**
* Dismiss the current update installation
+1 -1
View File
@@ -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;
+1 -4
View File
@@ -17,9 +17,6 @@
#define SPUUserUpdateStateMajorUpgradeKey @"SPUUserUpdateStateMajorUpgrade"
#define SPUUserUpdateStateCriticalUpdateKey @"SPUUserUpdateStateCriticalUpdate"
@interface SPUUserUpdateState () <NSSecureCoding>
@end
@implementation SPUUserUpdateState
@synthesize stage = _stage;
@@ -43,7 +40,7 @@
- (instancetype)initWithCoder:(NSCoder *)decoder
{
SPUUserUpdateStage stage = [decoder decodeIntegerForKey:SPUUserUpdateStateStageKey];
SPUUserUpdateStage stage = (SPUUserUpdateStage)[decoder decodeIntegerForKey:SPUUserUpdateStateStageKey];
BOOL userInitiated = [decoder decodeBoolForKey:SPUUserUpdateStateUserInitiatedKey];
return [self initWithStage:stage userInitiated:userInitiated];
+7 -1
View File
@@ -9,7 +9,13 @@
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SPUVerifierInformation : NSObject
#ifndef BUILDING_SPARKLE_TESTS
#define SPUVerifierInformationDefinitionAttribute SPU_OBJC_DIRECT_MEMBERS
#else
#define SPUVerifierInformationDefinitionAttribute __attribute__((objc_runtime_name("SPUTestVerifierInformation")))
#endif
SPUVerifierInformationDefinitionAttribute @interface SPUVerifierInformation : NSObject
- (instancetype)initWithExpectedVersion:(NSString * _Nullable)expectedVersion expectedContentLength:(uint64_t)expectedContentLength;
+3 -1
View File
@@ -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;
+10 -1
View File
@@ -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
+39 -11
View File
@@ -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;
@@ -78,7 +80,7 @@
return nil;
}
NSUInteger options = NSXMLNodeLoadExternalEntitiesNever; // Prevent inclusion from file://
NSXMLNodeOptions options = NSXMLNodeLoadExternalEntitiesNever; // Prevent inclusion from file://
NSXMLDocument *document = [[NSXMLDocument alloc] initWithData:appcastData options:options error:errorp];
if (nil == document) {
return 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;
}
+207 -86
View File
@@ -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
@@ -73,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 = NSOrderedSame;
}
[delegate didNotFindUpdateWithLatestAppcastItem:notFoundPrimaryItem hostToLatestAppcastItemComparisonResult:hostToLatestAppcastItemComparisonResult background:background];
}
- (void)downloadDriverDidFailToDownloadFileWithError:(nonnull NSError *)error
@@ -269,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
@@ -365,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
@@ -376,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
@@ -384,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];
@@ -392,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);
}];
}
@@ -498,7 +619,7 @@ SPU_OBJC_DIRECT
NSTimeInterval timeSinceRelease = [currentDate timeIntervalSinceDate:itemReleaseDate];
NSTimeInterval phasedRolloutInterval = [phasedRolloutIntervalObject doubleValue];
NSTimeInterval timeToWaitForGroup = phasedRolloutInterval * phasedUpdateGroup.unsignedIntegerValue;
NSTimeInterval timeToWaitForGroup = phasedRolloutInterval * (NSTimeInterval)(phasedUpdateGroup.unsignedIntegerValue);
if (timeSinceRelease >= timeToWaitForGroup) {
return YES;
+12 -2
View File
@@ -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
+44 -1
View File
@@ -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.
@@ -249,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.
+217 -58
View File
@@ -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 = (SPUAppcastSigningValidationStatus)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:appcastURL 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 anymore)
// 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;
@@ -662,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];
@@ -711,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];
+7 -12
View File
@@ -16,12 +16,6 @@
// Misc:
// -----------------------------------------------------------------------------
extern const NSTimeInterval SUDefaultUpdatePermissionPromptInterval;
extern const NSTimeInterval SUMinimumUpdateCheckInterval;
extern const NSTimeInterval SUDefaultUpdateCheckInterval;
extern const uint64_t SULeewayUpdateCheckInterval;
extern const NSTimeInterval SUImpatientUpdateCheckInterval;
extern NSString *const SUBundleIdentifier;
extern NSString *const SUAppcastAttributeValueMacOS;
@@ -30,7 +24,6 @@ extern NSString *const SUAppcastAttributeValueMacOS;
// Notifications:
// -----------------------------------------------------------------------------
extern NSString *const SUTechnicalErrorInformationKey;
extern NSString *const SUUpdateAutomaticCheckSettingChangedNotification;
extern NSString *const SUUpdateSettingsNeedsSynchronizationNotification;
extern NSString *const SUUpdateBundlePathUserInfoKey;
@@ -47,10 +40,13 @@ extern NSString *const SUSkippedMinorVersionKey;
extern NSString *const SUSkippedMajorVersionKey;
extern NSString *const SUSkippedMajorSubreleaseVersionKey;
extern NSString *const SUScheduledCheckIntervalKey;
extern NSString *const SUScheduledImpatientCheckIntervalKey;
extern NSString *const SULastCheckTimeKey;
extern NSString *const SUSignedFeedFailureExpirationIntervalKey;
extern NSString *const SUPublicDSAKeyKey;
extern NSString *const SUPublicDSAKeyFileKey;
extern NSString *const SUPublicEDKeyKey;
extern NSString *const SURequireSignedFeedKey;
extern NSString *const SUVerifyUpdateBeforeExtractionKey;
extern NSString *const SUAutomaticallyUpdateKey;
extern NSString *const SUAllowsAutomaticUpdatesKey;
@@ -67,11 +63,6 @@ extern NSString *const SUPromptUserOnFirstLaunchKey;
extern NSString *const SUDefaultsDomainKey;
extern NSString *const SUEnableJavaScriptKey;
extern NSString *const SUAllowedURLSchemesKey;
extern NSString *const SUFixedHTMLDisplaySizeKey __attribute__((deprecated("This key is obsolete and has no effect.")));
extern NSString *const SUAppendVersionNumberKey __attribute__((deprecated("This key is obsolete. See SPARKLE_APPEND_VERSION_NUMBER.")));
extern NSString *const SUEnableAutomatedDowngradesKey __attribute__((deprecated("This key is obsolete. See SPARKLE_AUTOMATED_DOWNGRADES.")));
extern NSString *const SUNormalizeInstalledApplicationNameKey __attribute__((deprecated("This key is obsolete. SPARKLE_NORMALIZE_INSTALLED_APPLICATION_NAME.")));
extern NSString *const SURelaunchToolNameKey __attribute__((deprecated("This key is obsolete. SPARKLE_RELAUNCH_TOOL_NAME.")));
// -----------------------------------------------------------------------------
// Appcast keys::
@@ -87,6 +78,7 @@ extern NSString *const SUAppcastAttributeVersion;
extern NSString *const SUAppcastAttributeOsType;
extern NSString *const SUAppcastAttributeInstallationType;
extern NSString *const SUAppcastAttributeFormat;
extern NSString *const SUAppcastAttributeLength;
extern NSString *const SUAppcastElementVersion;
extern NSString *const SUAppcastElementShortVersionString;
@@ -95,6 +87,9 @@ extern NSString *const SUAppcastElementDeltas;
extern NSString *const SUAppcastElementMinimumAutoupdateVersion;
extern NSString *const SUAppcastElementMinimumSystemVersion;
extern NSString *const SUAppcastElementMaximumSystemVersion;
extern NSString *const SUAppcastElementMinimumUpdateVersion;
extern NSString *const SUAppcastElementHardwareRequirements;
extern NSString *const SUAppcastElementHardwareRequirementARM64;
extern NSString *const SUAppcastElementReleaseNotesLink;
extern NSString *const SUAppcastElementFullReleaseNotesLink;
extern NSString *const SUAppcastElementTags;
+7 -22
View File
@@ -9,28 +9,12 @@
#import "SUConstants.h"
#import "SUErrors.h"
#ifndef DEBUG
#define DEBUG 0
#endif
#include "AppKitPrevention.h"
// Define some minimum intervals to avoid DoS-like checking attacks
const NSTimeInterval SUMinimumUpdateCheckInterval = DEBUG ? 60 : (60 * 60);
const NSTimeInterval SUDefaultUpdateCheckInterval = DEBUG ? 60 : (60 * 60 * 24);
// The amount of time the system can defer our update check (for improved performance)
const uint64_t SULeewayUpdateCheckInterval = DEBUG ? 1 : 15;
// 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 bug them
// This is the time interval for a "week"; it doesn't matter that this measure is imprecise.
const NSTimeInterval SUImpatientUpdateCheckInterval = DEBUG ? (60 * 2) : (60 * 60 * 24 * 7);
NSString *const SUBundleIdentifier = @SPARKLE_BUNDLE_IDENTIFIER;
NSString *const SUAppcastAttributeValueMacOS = @"macos";
NSString *const SUTechnicalErrorInformationKey = @"SUTechnicalErrorInformation";
NSString *const SUUpdateAutomaticCheckSettingChangedNotification = @"SUUpdateAutomaticCheckSettingChanged";
NSString *const SUUpdateSettingsNeedsSynchronizationNotification = @"SUUpdateSettingsNeedsSynchronization";
NSString *const SUUpdateBundlePathUserInfoKey = @"SUBundlePath";
@@ -43,10 +27,13 @@ NSString *const SUSkippedMinorVersionKey = @"SUSkippedVersion";
NSString *const SUSkippedMajorVersionKey = @"SUSkippedMajorVersion";
NSString *const SUSkippedMajorSubreleaseVersionKey = @"SUSkippedMajorSubreleaseVersion";
NSString *const SUScheduledCheckIntervalKey = @"SUScheduledCheckInterval";
NSString *const SUScheduledImpatientCheckIntervalKey = @"SUScheduledImpatientCheckInterval";
NSString *const SULastCheckTimeKey = @"SULastCheckTime";
NSString *const SUSignedFeedFailureExpirationIntervalKey = @"SUSignedFeedFailureExpirationInterval";
NSString *const SUPublicDSAKeyKey = @"SUPublicDSAKey";
NSString *const SUPublicDSAKeyFileKey = @"SUPublicDSAKeyFile";
NSString *const SUPublicEDKeyKey = @"SUPublicEDKey";
NSString *const SURequireSignedFeedKey = @"SURequireSignedFeed";
NSString *const SUVerifyUpdateBeforeExtractionKey = @"SUVerifyUpdateBeforeExtraction";
NSString *const SUAutomaticallyUpdateKey = @"SUAutomaticallyUpdate";
NSString *const SUAllowsAutomaticUpdatesKey = @"SUAllowsAutomaticUpdates";
@@ -62,18 +49,12 @@ NSString *const SULastProfileSubmitDateKey = @"SULastProfileSubmissionDate";
NSString *const SUPromptUserOnFirstLaunchKey = @"SUPromptUserOnFirstLaunch";
NSString *const SUEnableJavaScriptKey = @"SUEnableJavaScript";
NSString *const SUAllowedURLSchemesKey = @"SUAllowedURLSchemes";
NSString *const SUFixedHTMLDisplaySizeKey = @"SUFixedHTMLDisplaySize";
NSString *const SUDefaultsDomainKey = @"SUDefaultsDomain";
NSString *const SUSparkleErrorDomain = @"SUSparkleErrorDomain";
NSString *const SPUNoUpdateFoundReasonKey = @"SUNoUpdateFoundReason";
NSString *const SPUNoUpdateFoundUserInitiatedKey = @"SPUNoUpdateUserInitiated";
NSString *const SPULatestAppcastItemFoundKey = @"SULatestAppcastItemFound";
NSString *const SUAppendVersionNumberKey = @"SUAppendVersionNumber";
NSString *const SUEnableAutomatedDowngradesKey = @"SUEnableAutomatedDowngrades";
NSString *const SUNormalizeInstalledApplicationNameKey = @"SUNormalizeInstalledApplicationName";
NSString *const SURelaunchToolNameKey = @"SURelaunchToolName";
NSString *const SUAppcastAttributeDeltaFrom = @"sparkle:deltaFrom";
NSString *const SUAppcastAttributeDeltaFromSparkleExecutableSize = @"sparkle:deltaFromSparkleExecutableSize";
NSString *const SUAppcastAttributeDeltaFromSparkleLocales = @"sparkle:deltaFromSparkleLocales";
@@ -86,6 +67,7 @@ NSString *const SUAppcastAttributeVersion = @"sparkle:version";
NSString *const SUAppcastAttributeOsType = @"sparkle:os";
NSString *const SUAppcastAttributeInstallationType = @"sparkle:installationType";
NSString *const SUAppcastAttributeFormat = @"sparkle:format";
NSString *const SUAppcastAttributeLength = @"sparkle:length";
NSString *const SUAppcastElementVersion = SUAppcastAttributeVersion;
NSString *const SUAppcastElementShortVersionString = SUAppcastAttributeShortVersionString;
@@ -94,6 +76,9 @@ NSString *const SUAppcastElementDeltas = @"sparkle:deltas";
NSString *const SUAppcastElementMinimumAutoupdateVersion = @"sparkle:minimumAutoupdateVersion";
NSString *const SUAppcastElementMinimumSystemVersion = @"sparkle:minimumSystemVersion";
NSString *const SUAppcastElementMaximumSystemVersion = @"sparkle:maximumSystemVersion";
NSString *const SUAppcastElementMinimumUpdateVersion = @"sparkle:minimumUpdateVersion";
NSString *const SUAppcastElementHardwareRequirements = @"sparkle:hardwareRequirements";
NSString *const SUAppcastElementHardwareRequirementARM64 = @"arm64";
NSString *const SUAppcastElementReleaseNotesLink = @"sparkle:releaseNotesLink";
NSString *const SUAppcastElementFullReleaseNotesLink = @"sparkle:fullReleaseNotesLink";
NSString *const SUAppcastElementTags = @"sparkle:tags";
+5 -1
View File
@@ -97,7 +97,11 @@ typedef NS_ENUM(OSStatus, SPUNoUpdateFoundReason) {
/**
A new update is unavailable because the user's operating system version is too new for the update.
*/
SPUNoUpdateFoundReasonSystemIsTooNew
SPUNoUpdateFoundReasonSystemIsTooNew,
/**
A new update is unavailable because the user's system is an Intel Mac that doesn't support ARM64.
*/
SPUNoUpdateFoundReasonHardwareDoesNotSupportARM64,
};
SU_EXPORT extern NSString *const SPUNoUpdateFoundReasonKey;
+1 -1
View File
@@ -415,7 +415,7 @@ SPU_OBJC_DIRECT
// Preserve the modification time
struct timeval modTime;
TIMESPEC_TO_TIMEVAL(&modTime, &statInfo.st_mtimespec);
TIMESPEC_TO_TIMEVAL(&modTime, &statInfo.st_mtimespec)
const struct timeval timeInputs[] = {accessTime, modTime};
+12 -3
View File
@@ -38,15 +38,24 @@ SUHostDefinitionAttribute
@property (readonly, nonatomic, copy, nullable) NSString *publicDSAKeyFileKey;
@property (nonatomic, readonly) BOOL hasUpdateSecurityPolicy;
@property (nonatomic, readonly) BOOL requiresSignedAppcast;
- (nullable id)objectForInfoDictionaryKey:(NSString *)key;
- (nullable id)objectForInfoDictionaryKey:(NSString *)key ofClass:(Class)aClass;
- (nullable NSNumber *)boolNumberForInfoDictionaryKey:(NSString *)key;
- (BOOL)boolForInfoDictionaryKey:(NSString *)key;
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName;
- (nullable NSNumber *)doubleNumberForInfoDictionaryKey:(NSString *)key;
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName ofClass:(Class)aClass;
- (void)setObject:(nullable id)value forUserDefaultsKey:(NSString *)defaultName;
- (nullable NSNumber *)boolNumberForUserDefaultsKey:(NSString *)key;
- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName;
- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName;
- (nullable id)objectForKey:(NSString *)key;
- (nullable NSNumber *)doubleNumberForUserDefaultsKey:(NSString *)key;
- (nullable id)objectForKey:(NSString *)key ofClass:(Class)aClass;
- (nullable NSNumber *)boolNumberForKey:(NSString *)key;
- (BOOL)boolForKey:(NSString *)key;
- (nullable NSNumber *)doubleNumberForKey:(NSString *)key;
- (void)observeChangesFromUserDefaultKeys:(NSSet<NSString *> *)keyPaths changeHandler:(void (^)(NSString *))changeHandler;
+133 -21
View File
@@ -52,7 +52,7 @@ static void *SUHostObservableContext = &SUHostObservableContext;
NSString *domainIdentifier;
{
NSString *defaultsDomain = [self objectForInfoDictionaryKey:SUDefaultsDomainKey];
NSString *defaultsDomain = [self objectForInfoDictionaryKey:SUDefaultsDomainKey ofClass:NSString.class];
if (defaultsDomain != nil) {
domainIdentifier = defaultsDomain;
} else if (!_isMainBundle) {
@@ -123,13 +123,13 @@ static void *SUHostObservableContext = &SUHostObservableContext;
NSString *name;
// Allow host bundle to provide a custom name
name = [self objectForInfoDictionaryKey:@"SUBundleName"];
name = [self objectForInfoDictionaryKey:@"SUBundleName" ofClass:NSString.class];
if (name && name.length > 0) return name;
name = [self objectForInfoDictionaryKey:@"CFBundleDisplayName"];
name = [self objectForInfoDictionaryKey:@"CFBundleDisplayName" ofClass:NSString.class];
if (name && name.length > 0) return name;
name = [self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey];
name = [self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey ofClass:NSString.class];
if (name && name.length > 0) return name;
return [[[NSFileManager defaultManager] displayNameAtPath:[self bundlePath]] stringByDeletingPathExtension];
@@ -147,7 +147,7 @@ static void *SUHostObservableContext = &SUHostObservableContext;
- (NSString * _Nullable)_version SPU_OBJC_DIRECT
{
NSString *version = [self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey];
NSString *version = [self objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleVersionKey ofClass:NSString.class];
return ([self isValidVersion:version] ? version : nil);
}
@@ -164,7 +164,7 @@ static void *SUHostObservableContext = &SUHostObservableContext;
- (NSString * _Nonnull)displayVersion
{
NSString *shortVersionString = [self objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
NSString *shortVersionString = [self objectForInfoDictionaryKey:@"CFBundleShortVersionString" ofClass:NSString.class];
if (shortVersionString)
return shortVersionString;
else
@@ -190,13 +190,13 @@ static void *SUHostObservableContext = &SUHostObservableContext;
- (NSString *_Nullable)publicEDKey SPU_OBJC_DIRECT
{
return [self objectForInfoDictionaryKey:SUPublicEDKeyKey];
return [self objectForInfoDictionaryKey:SUPublicEDKeyKey ofClass:NSString.class];
}
- (NSString *_Nullable)publicDSAKey SPU_OBJC_DIRECT
{
// Maybe the key is just a string in the Info.plist.
NSString *key = [self objectForInfoDictionaryKey:SUPublicDSAKeyKey];
NSString *key = [self objectForInfoDictionaryKey:SUPublicDSAKeyKey ofClass:NSString.class];
if (key) {
return key;
}
@@ -221,11 +221,16 @@ static void *SUHostObservableContext = &SUHostObservableContext;
- (BOOL)hasUpdateSecurityPolicy
{
NSDictionary<NSString *, id> *updateSecurityPolicy = [self objectForInfoDictionaryKey:@"NSUpdateSecurityPolicy"];
NSDictionary<NSString *, id> *updateSecurityPolicy = [self objectForInfoDictionaryKey:@"NSUpdateSecurityPolicy" ofClass:NSDictionary.class];
return (updateSecurityPolicy != nil);
}
- (BOOL)requiresSignedAppcast
{
return [self boolForInfoDictionaryKey:SURequireSignedFeedKey];
}
- (SUPublicKeys *)publicKeys
{
return [[SUPublicKeys alloc] initWithEd:[self publicEDKey]
@@ -234,16 +239,34 @@ static void *SUHostObservableContext = &SUHostObservableContext;
- (NSString * _Nullable)publicDSAKeyFileKey
{
return [self objectForInfoDictionaryKey:SUPublicDSAKeyFileKey];
return [self objectForInfoDictionaryKey:SUPublicDSAKeyFileKey ofClass:NSString.class];
}
- (nullable id)objectForInfoDictionaryKey:(NSString *)key
static _Nullable id validateObject(id _Nullable object, NSSet<Class> * classes, NSString *key, NSString *keyType)
{
if (object == nil) {
return nil;
}
for (Class aClass in classes) {
if ([(NSObject *)object isKindOfClass:aClass]) {
return object;
}
}
SULog(SULogLevelError, @"Error: Reading %@ key %@ with expected classes %@ but instead found %@", keyType, key, classes, ((NSObject *)object).className);
return nil;
}
- (nullable id)objectForInfoDictionaryKey:(NSString *)key ofClasses:(NSSet<Class> *)classes SPU_OBJC_DIRECT
{
id object;
if (_isMainBundle) {
// Common fast path - if we're updating the main bundle, that means our updater and host bundle's lifetime is the same
// If the bundle happens to be updated or change, that means our updater process needs to be terminated first to do it safely
// Thus we can rely on the cached Info dictionary
return [_bundle objectForInfoDictionaryKey:key];
object = [_bundle objectForInfoDictionaryKey:key];
} else {
// Slow path - if we're updating another bundle, we should read in the most up to date Info dictionary because
// the bundle can be replaced externally or even by us.
@@ -252,22 +275,85 @@ static void *SUHostObservableContext = &SUHostObservableContext;
CFDictionaryRef cfInfoDictionary = CFBundleCopyInfoDictionaryInDirectory((CFURLRef)_bundle.bundleURL);
NSDictionary *infoDictionary = CFBridgingRelease(cfInfoDictionary);
return [infoDictionary objectForKey:key];
object = [infoDictionary objectForKey:key];
}
return validateObject(object, classes, key, @"info dictionary");
}
- (nullable id)objectForInfoDictionaryKey:(NSString *)key ofClass:(Class)aClass
{
return [self objectForInfoDictionaryKey:key ofClasses:[NSSet setWithObject:aClass]];
}
static NSNumber * _Nullable convertObjectToBoolNumber(NSObject * _Nullable object, NSString *key, NSString *keyType)
{
if (object == nil) {
return nil;
}
if ([object isKindOfClass:NSNumber.class]) {
return (NSNumber *)object;
}
if ([object isKindOfClass:NSString.class]) {
return @(((NSString *)object).boolValue);
}
SULog(SULogLevelError, @"Error: Reading %@ key %@ expecting convertible bool but instead found class %@", keyType, key, ((NSObject *)object).className);
return nil;
}
static NSNumber * _Nullable convertObjectToDoubleNumber(NSObject * _Nullable object, NSString *key, NSString *keyType)
{
if (object == nil) {
return nil;
}
if ([object isKindOfClass:NSNumber.class]) {
return (NSNumber *)object;
}
if ([object isKindOfClass:NSString.class]) {
return @(((NSString *)object).doubleValue);
}
SULog(SULogLevelError, @"Error: Reading %@ key %@ expecting convertible double but instead found class %@", keyType, key, ((NSObject *)object).className);
return nil;
}
- (nullable NSNumber *)boolNumberForInfoDictionaryKey:(NSString *)key
{
NSObject *object = [self objectForInfoDictionaryKey:key ofClasses:[NSSet setWithArray:@[NSNumber.class, NSString.class]]];
return convertObjectToBoolNumber(object, key, @"info dictionary");
}
- (BOOL)boolForInfoDictionaryKey:(NSString *)key
{
return [(NSNumber *)[self objectForInfoDictionaryKey:key] boolValue];
return [[self boolNumberForInfoDictionaryKey:key] boolValue];
}
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName
- (nullable NSNumber *)doubleNumberForInfoDictionaryKey:(NSString *)key
{
NSObject *object = [self objectForInfoDictionaryKey:key ofClasses:[NSSet setWithArray:@[NSNumber.class, NSString.class]]];
return convertObjectToDoubleNumber(object, key, @"info dictionary");
}
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName ofClasses:(NSSet<Class> *)classes SPU_OBJC_DIRECT
{
if (defaultName == nil || _userDefaults == nil) {
return nil;
}
return [_userDefaults objectForKey:defaultName];
id object = [_userDefaults objectForKey:defaultName];
return validateObject(object, classes, defaultName, @"user default");
}
- (nullable id)objectForUserDefaultsKey:(NSString *)defaultName ofClass:(Class)aClass
{
return [self objectForUserDefaultsKey:defaultName ofClasses:[NSSet setWithObject:aClass]];
}
// Note this handles nil being passed for defaultName, in which case the user default will be removed
@@ -280,9 +366,15 @@ static void *SUHostObservableContext = &SUHostObservableContext;
[_modifyingKeyPaths removeObject:defaultName];
}
- (nullable NSNumber *)boolNumberForUserDefaultsKey:(NSString *)key;
{
NSObject *object = [self objectForUserDefaultsKey:key ofClasses:[NSSet setWithArray:@[NSNumber.class, NSString.class]]];
return convertObjectToBoolNumber(object, key, @"user default");
}
- (BOOL)boolForUserDefaultsKey:(NSString *)defaultName
{
return [_userDefaults boolForKey:defaultName];
return [[self boolNumberForUserDefaultsKey:defaultName] boolValue];
}
- (void)setBool:(BOOL)value forUserDefaultsKey:(NSString *)defaultName
@@ -294,12 +386,32 @@ static void *SUHostObservableContext = &SUHostObservableContext;
[_modifyingKeyPaths removeObject:defaultName];
}
- (nullable id)objectForKey:(NSString *)key {
return [self objectForUserDefaultsKey:key] ? [self objectForUserDefaultsKey:key] : [self objectForInfoDictionaryKey:key];
- (nullable NSNumber *)doubleNumberForUserDefaultsKey:(NSString *)key
{
NSObject *object = [self objectForUserDefaultsKey:key ofClasses:[NSSet setWithArray:@[NSNumber.class, NSString.class]]];
return convertObjectToDoubleNumber(object, key, @"user default");
}
- (BOOL)boolForKey:(NSString *)key {
return [self objectForUserDefaultsKey:key] ? [self boolForUserDefaultsKey:key] : [self boolForInfoDictionaryKey:key];
- (nullable id)objectForKey:(NSString *)key ofClass:(Class)aClass {
id userDefaultsObject = [self objectForUserDefaultsKey:key ofClass:aClass];
return userDefaultsObject != nil ? userDefaultsObject : [self objectForInfoDictionaryKey:key ofClass:aClass];
}
- (nullable NSNumber *)boolNumberForKey:(NSString *)key
{
NSNumber *boolFromUserDefaults = [self boolNumberForUserDefaultsKey:key];
return (boolFromUserDefaults != nil) ? boolFromUserDefaults : [self boolNumberForInfoDictionaryKey:key];
}
- (BOOL)boolForKey:(NSString *)key
{
return [[self boolNumberForKey:key] boolValue];
}
- (nullable NSNumber *)doubleNumberForKey:(NSString *)key
{
NSNumber *doubleFromUserDefaults = [self doubleNumberForUserDefaultsKey:key];
return (doubleFromUserDefaults != nil) ? doubleFromUserDefaults : [self doubleNumberForInfoDictionaryKey:key];
}
@end
+2 -2
View File
@@ -16,10 +16,10 @@ NSString *SUNormalizedInstallationPath(SUHost *host)
NSBundle *bundle = host.bundle;
assert(bundle != nil);
NSString * baseBundleName = [host objectForInfoDictionaryKey:@"SUBundleName"];
NSString * baseBundleName = [host objectForInfoDictionaryKey:@"SUBundleName" ofClass:NSString.class];
if (baseBundleName == nil) {
baseBundleName = [host objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey];
baseBundleName = [host objectForInfoDictionaryKey:(__bridge NSString *)kCFBundleNameKey ofClass:NSString.class];
}
NSString *normalizedAppPath = [[[bundle bundlePath] stringByDeletingLastPathComponent] stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.%@", baseBundleName, [[bundle bundlePath] pathExtension]]];
+4 -2
View File
@@ -24,7 +24,9 @@
+ (NSNumber*)updateGroupIdentifierForHost:(SUHost*)host SPU_OBJC_DIRECT
{
NSNumber* updateGroupIdentifier = [host objectForUserDefaultsKey:SUUpdateGroupIdentifierKey];
// Only Sparkle should set this user default, so we don't need to convert NSString -> integer number
// We can just require NSNumber class.
NSNumber* updateGroupIdentifier = [host objectForUserDefaultsKey:SUUpdateGroupIdentifierKey ofClass:NSNumber.class];
if(updateGroupIdentifier == nil) {
updateGroupIdentifier = [self setNewUpdateGroupIdentifierForHost:host];
}
@@ -34,7 +36,7 @@
+ (NSNumber*)setNewUpdateGroupIdentifierForHost:(SUHost*)host
{
unsigned int r = arc4random_uniform(UINT_MAX);
uint32_t r = arc4random_uniform(UINT_MAX);
NSNumber* updateGroupIdentifier = @(r);
[host setObject:updateGroupIdentifier forUserDefaultsKey:SUUpdateGroupIdentifierKey];
-25
View File
@@ -1,25 +0,0 @@
//
// SUPlainTextReleaseNotesView.h
// Sparkle
//
// Created on 9/11/22.
// Copyright © 2022 Sparkle Project. All rights reserved.
//
#if SPARKLE_BUILD_UI_BITS
#import <Foundation/Foundation.h>
#import "SUReleaseNotesView.h"
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUPlainTextReleaseNotesView : NSObject <SUReleaseNotesView>
- (instancetype)initWithFontPointSize:(int)fontPointSize customAllowedURLSchemes:(NSArray<NSString *> *)customAllowedURLSchemes;
@end
NS_ASSUME_NONNULL_END
#endif
-140
View File
@@ -1,140 +0,0 @@
//
// SUPlainReleaseNotesView.m
// Sparkle
//
// Created on 9/11/22.
// Copyright © 2022 Sparkle Project. All rights reserved.
//
#if SPARKLE_BUILD_UI_BITS
#import "SUPlainTextReleaseNotesView.h"
#import "SUReleaseNotesCommon.h"
#import "SULog.h"
#import "SUErrors.h"
#import <AppKit/AppKit.h>
@interface SUPlainTextReleaseNotesView () <NSTextViewDelegate>
@end
@implementation SUPlainTextReleaseNotesView
{
NSScrollView *_scrollView;
NSTextView *_textView;
NSArray<NSString *> *_customAllowedURLSchemes;
int _fontPointSize;
}
- (instancetype)initWithFontPointSize:(int)fontPointSize customAllowedURLSchemes:(NSArray<NSString *> *)customAllowedURLSchemes
{
self = [super init];
if (self != nil) {
_scrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect];
_textView = [[NSTextView alloc] initWithFrame:NSZeroRect];
_textView.delegate = self;
_scrollView.documentView = _textView;
_fontPointSize = fontPointSize;
_customAllowedURLSchemes = customAllowedURLSchemes;
}
return self;
}
- (NSView *)view
{
return _scrollView;
}
- (void)_loadString:(NSString *)contents completionHandler:(void (^)(NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
{
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)_fontPointSize] }];
if (attributedString == nil) {
completionHandler([NSError errorWithDomain:SUSparkleErrorDomain code:SUReleaseNotesError userInfo:@{NSLocalizedDescriptionKey: @"Failed to create attributed string of contents to load"}]);
return;
}
[_textView.textStorage setAttributedString:attributedString];
NSSize contentSize = [_scrollView contentSize];
[_textView setFrame:NSMakeRect(0, 0, contentSize.width, contentSize.height)];
[_textView setMinSize:NSMakeSize(0.0, contentSize.height)];
[_textView setMaxSize:NSMakeSize(DBL_MAX, DBL_MAX)];
[_textView setVerticallyResizable:YES];
[_textView setHorizontallyResizable:NO];
[_textView setAutoresizingMask:NSViewWidthSizable];
[_textView setTextContainerInset:NSMakeSize(8, 8)];
[_textView setContinuousSpellCheckingEnabled:NO];
_textView.usesFontPanel = NO;
_textView.editable = NO;
if (@available(macOS 10.14, *)) {
_textView.usesAdaptiveColorMappingForDarkAppearance = YES;
}
[_scrollView setHasVerticalScroller:YES];
[_scrollView setHasHorizontalScroller:NO];
completionHandler(nil);
}
- (void)loadString:(NSString *)contents baseURL:(NSURL * _Nullable)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
{
[self _loadString:contents completionHandler:completionHandler];
}
- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName baseURL:(NSURL *)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
{
CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)textEncodingName);
NSStringEncoding encoding;
if (cfEncoding != kCFStringEncodingInvalidId) {
encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
} else {
encoding = NSUTF8StringEncoding;
}
NSString *contents = [[NSString alloc] initWithData:data encoding:encoding];
if (contents == nil) {
completionHandler([NSError errorWithDomain:SUSparkleErrorDomain code:SUReleaseNotesError userInfo:@{NSLocalizedDescriptionKey: @"Failed to convert data contents to string"}]);
return;
}
[self _loadString:contents completionHandler:completionHandler];
}
- (void)stopLoading
{
}
- (void)setDrawsBackground:(BOOL)drawsBackground
{
}
// Links are not insertable yet but this is useful in case we support them in the future
// This is also a defence in case links are somehow insertable
- (BOOL)textView:(NSTextView *)textView clickedOnLink:(id)link atIndex:(NSUInteger)charIndex
{
NSURL *linkURL;
if ([(NSObject *)link isKindOfClass:[NSURL class]]) {
linkURL = link;
} else if ([(NSObject *)link isKindOfClass:[NSString class]]) {
linkURL = [NSURL URLWithString:link];
} else {
SULog(SULogLevelDefault, @"Blocked display of %@ link of unknown type", link);
return YES;
}
BOOL isAboutBlankURL;
if (!SUReleaseNotesIsSafeURL(linkURL, _customAllowedURLSchemes, &isAboutBlankURL)) {
SULog(SULogLevelDefault, @"Blocked display of %@ URL which may be dangerous", linkURL.scheme);
return YES;
}
return NO;
}
@end
#endif
+1 -2
View File
@@ -64,8 +64,7 @@ SUPublicKeysDefinitionAttribute
@property (nonatomic, readonly) BOOL hasAnyKeys;
- (instancetype)initWithEd:(NSString * _Nullable)ed
dsa:(NSString * _Nullable)dsa
;
dsa:(NSString * _Nullable)dsa;
@end
+1 -1
View File
@@ -37,7 +37,7 @@ static SUSigningInputStatus decode(NSString *str, NSData * __strong *outData) {
}
NSString *stripped = [str stringByTrimmingCharactersInSet:NSCharacterSet.whitespaceAndNewlineCharacterSet];
NSData *result = [[NSData alloc] initWithBase64EncodedString:stripped options:0];
NSData *result = [[NSData alloc] initWithBase64EncodedString:stripped options:(NSDataBase64DecodingOptions)0];
if (!result) {
return SUSigningInputStatusInvalid;
}
+1 -1
View File
@@ -171,7 +171,7 @@ typedef NS_ENUM(NSInteger, SUCharacterType) {
- (void)balanceVersionPartsA:(NSMutableArray<NSString *> *)partsA partsB:(NSMutableArray<NSString *> *)partsB SPU_OBJC_DIRECT
{
NSUInteger partANumberAndPeriodPartsCount = [self countOfNumberAndPeriodStartingParts:partsA];
NSUInteger partBNumberAndPeriodPartsCount = [self countOfNumberAndPeriodStartingParts:partsB];;
NSUInteger partBNumberAndPeriodPartsCount = [self countOfNumberAndPeriodStartingParts:partsB];
if (partANumberAndPeriodPartsCount > partBNumberAndPeriodPartsCount) {
[self addNumberAndPeriodPartsToParts:partsB toNumberAndPeriodPartsCount:partBNumberAndPeriodPartsCount fromParts:partsA fromNumberAndPeriodPartsCount:partANumberAndPeriodPartsCount];
+2 -2
View File
@@ -80,10 +80,10 @@ static NSString *const SUStatusControllerTouchBarIdentifier = @"" SPARKLE_BUNDLE
}
if (_minimizable) {
window.styleMask |= NSWindowStyleMaskMiniaturizable;
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskMiniaturizable);
}
if (_closable) {
window.styleMask |= NSWindowStyleMaskClosable;
window.styleMask = (NSWindowStyleMask)(window.styleMask | NSWindowStyleMaskClosable);
}
[_progressBar setUsesThreadedAnimation:YES];
[_statusTextField setFont:[NSFont monospacedDigitSystemFontOfSize:0 weight:NSFontWeightRegular]];
+1 -1
View File
@@ -157,7 +157,7 @@ NSString *const SUSystemProfilerPreferredLanguageKey = @"lang";
unsigned long bytes;
size_t bytes_size = sizeof(unsigned long);
if (sysctlbyname("hw.memsize", &bytes, &bytes_size, NULL, 0) == 0) {
double megabytes = bytes / (1024. * 1024.);
double megabytes = (double)bytes / (1024. * 1024.);
NSString *stringValue = [NSString stringWithFormat:@"%lu", (unsigned long)megabytes];
[profileArray addObject:[NSDictionary dictionaryWithObjects:@[SUSystemProfilerMemoryKey, SULocalizedStringFromTableInBundle(@"Memory (MB)", SPARKLE_TABLE, sparkleBundle, nil), stringValue, stringValue] forKeys:profileDictKeys]];
}
+29
View File
@@ -0,0 +1,29 @@
//
// SUTextViewReleaseNotesView.h
// Sparkle
//
// Created on 9/11/22.
// Copyright © 2022 Sparkle Project. All rights reserved.
//
#if SPARKLE_BUILD_UI_BITS
#import <Foundation/Foundation.h>
#import "SUReleaseNotesView.h"
@protocol SPUStandardUserDriverDelegate;
@class SUAppcastItem;
@class SUHost;
NS_ASSUME_NONNULL_BEGIN
SPU_OBJC_DIRECT_MEMBERS @interface SUTextViewReleaseNotesView : NSObject <SUReleaseNotesView>
- (instancetype)initWithFontPointSize:(int)fontPointSize appcastItem:(SUAppcastItem *)appcastItem host:(SUHost *)host delegate:(id<SPUStandardUserDriverDelegate>)delegate prefersMarkdown:(BOOL)prefersMarkdown customAllowedURLSchemes:(NSArray<NSString *> *)customAllowedURLSchemes;
@end
NS_ASSUME_NONNULL_END
#endif
+469
View File
@@ -0,0 +1,469 @@
//
// SUTextViewReleaseNotesView.m
// Sparkle
//
// Created on 9/11/22.
// Copyright © 2022 Sparkle Project. All rights reserved.
//
#if SPARKLE_BUILD_UI_BITS
#import "SUTextViewReleaseNotesView.h"
#import "SUReleaseNotesCommon.h"
#import "SPUStandardUserDriverDelegate.h"
#import "SULog.h"
#import "SUErrors.h"
#import "SUHost.h"
#import <AppKit/AppKit.h>
@interface SUTextViewReleaseNotesView () <NSTextViewDelegate>
@end
@implementation SUTextViewReleaseNotesView
{
NSScrollView *_scrollView;
NSTextView *_textView;
#if DEBUG
id _textViewSwitchedToTextKit1Observer;
#endif
NSArray<NSString *> *_customAllowedURLSchemes;
SUAppcastItem *_updateItem;
SUHost *_host;
__weak id<SPUStandardUserDriverDelegate> _delegate;
int _fontPointSize;
BOOL _prefersMarkdown;
}
- (instancetype)initWithFontPointSize:(int)fontPointSize appcastItem:(SUAppcastItem *)appcastItem host:(SUHost *)host delegate:(id<SPUStandardUserDriverDelegate>)delegate prefersMarkdown:(BOOL)prefersMarkdown customAllowedURLSchemes:(NSArray<NSString *> *)customAllowedURLSchemes
{
self = [super init];
if (self != nil) {
_fontPointSize = fontPointSize;
_customAllowedURLSchemes = customAllowedURLSchemes;
_prefersMarkdown = prefersMarkdown;
_scrollView = [[NSScrollView alloc] initWithFrame:NSZeroRect];
_updateItem = appcastItem;
_host = host;
_delegate = delegate;
// On macOS 12.7, TextKit 2 is very buggy in handling our simple text with NSParagraphStyle attributes.
// So even though macOS 12 supports TextKit 2 we do not use it there.
// My development machines are currently on macOS 26 so I know TextKit 2 works well there.
// macOS 13 - 15 requires more testing if we care to make the switch there.
if (@available(macOS 16, *)) {
// Create NSTextView using TextKit 2
// https://developer.apple.com/documentation/appkit/nstextview/1449347-initwithframe
NSTextContainer *textContainer = [[NSTextContainer alloc] initWithContainerSize:NSMakeSize(0, (CGFloat)FLT_MAX)];
textContainer.widthTracksTextView = YES;
NSTextLayoutManager *textLayoutManager = [[NSTextLayoutManager alloc] init];
textLayoutManager.textContainer = textContainer;
NSTextContentStorage *textContentStorage = [[NSTextContentStorage alloc] init];
[textContentStorage addTextLayoutManager:textLayoutManager];
_textView = [[NSTextView alloc] initWithFrame:NSZeroRect textContainer:textLayoutManager.textContainer];
#if DEBUG
_textViewSwitchedToTextKit1Observer = [NSNotificationCenter.defaultCenter addObserverForName:NSTextViewDidSwitchToNSLayoutManagerNotification object:_textView queue:nil usingBlock:^(NSNotification * _Nonnull __unused notification) {
SULog(SULogLevelError, @"Error: Plain text release notes text view switched to TextKit 1. This should not happen. Was some TextKit 1 API called that is causing this?");
}];
#endif
} else {
_textView = [[NSTextView alloc] initWithFrame:NSZeroRect];
}
_textView.delegate = self;
_scrollView.documentView = _textView;
}
return self;
}
#if DEBUG
- (void)dealloc
{
[NSNotificationCenter.defaultCenter removeObserver:_textViewSwitchedToTextKit1Observer];
}
#endif
- (NSView *)view
{
return _scrollView;
}
static void processMarkdownFragmentAttributedString(NSAttributedString *fragmentAttributedString, NSMutableAttributedString *outputAttributedSubString, NSMutableParagraphStyle *paragraphStyle, BOOL canProcessListItem, NSMutableSet<NSNumber *> *previousVisitedListItemIntents, NSPresentationIntent *intent, NSFont *inputParagraphFont, NSFont *monospacedParagraphFont, NSAttributedString *tabAttributedString, NSAttributedString *newlineAttributedString, NSAttributedString *listBulletAttributedString) API_AVAILABLE(macos(12.0))
{
// Pre-pass processing of intent
// This info must be computed before processing parent intent
BOOL isListItem = NO;
NSFont *font = inputParagraphFont;
switch (intent.intentKind) {
case NSPresentationIntentKindHeader:
switch (intent.headerLevel) {
case 1:
font = [NSFont boldSystemFontOfSize:(CGFloat)inputParagraphFont.pointSize * 1.5];
break;
case 2:
font = [NSFont boldSystemFontOfSize:(CGFloat)inputParagraphFont.pointSize * 1.3];
break;
case 3:
font = [NSFont boldSystemFontOfSize:(CGFloat)inputParagraphFont.pointSize * 1.2];
break;
default:
font = [NSFont boldSystemFontOfSize:(CGFloat)inputParagraphFont.pointSize * 1.1];
break;
}
break;
case NSPresentationIntentKindListItem:
isListItem = YES;
break;
case NSPresentationIntentKindParagraph:
case NSPresentationIntentKindThematicBreak:
case NSPresentationIntentKindBlockQuote:
case NSPresentationIntentKindCodeBlock:
case NSPresentationIntentKindOrderedList:
case NSPresentationIntentKindUnorderedList:
case NSPresentationIntentKindTable:
case NSPresentationIntentKindTableHeaderRow:
case NSPresentationIntentKindTableRow:
case NSPresentationIntentKindTableCell:
break;
}
// Process parent intent if available
// A paragraph's intent may be a list item, or a block quote for example. A header's parent intent could be a block quote.
// In these cases, we may pre-append attributed string to the output before processing current intent.
NSPresentationIntent *parentIntent = intent.parentIntent;
if (parentIntent != nil) {
processMarkdownFragmentAttributedString(fragmentAttributedString, outputAttributedSubString, paragraphStyle, canProcessListItem && !isListItem, previousVisitedListItemIntents, parentIntent, font, monospacedParagraphFont, tabAttributedString, newlineAttributedString, listBulletAttributedString);
}
// Process the current intent
switch (intent.intentKind) {
case NSPresentationIntentKindHeader: {
CGFloat paragraphSpacing = font.pointSize * 0.8;
paragraphStyle.paragraphSpacingBefore += paragraphSpacing;
paragraphStyle.paragraphSpacing += paragraphSpacing;
NSMutableAttributedString *headerAttributedString = [fragmentAttributedString mutableCopy];
[headerAttributedString addAttributes:@{NSFontAttributeName: font} range:NSMakeRange(0, headerAttributedString.length)];
[outputAttributedSubString appendAttributedString:headerAttributedString];
break;
}
case NSPresentationIntentKindParagraph: {
if (parentIntent != nil && parentIntent.intentKind == NSPresentationIntentKindListItem) {
// If the parent intent is a list item we don't want to apply paragraphSpacingBefore,
// and we'll apply less spacing
paragraphStyle.paragraphSpacing += font.pointSize * 0.3;
} else {
CGFloat paragraphSpacing = font.pointSize * 0.5;
paragraphStyle.paragraphSpacing += paragraphSpacing;
paragraphStyle.paragraphSpacingBefore += paragraphSpacing;
}
NSMutableAttributedString *contentAttributedString = [fragmentAttributedString mutableCopy];
[contentAttributedString addAttributes:@{NSFontAttributeName: font} range:NSMakeRange(0, contentAttributedString.length)];
[outputAttributedSubString appendAttributedString:contentAttributedString];
break;
}
case NSPresentationIntentKindListItem: {
// We only process (the innermost first) list item once when we encounter nested lists,
// to avoid outputting multiple list bullets
// Also avoid processing list items that were processed from previous passes / fragments
if (canProcessListItem) {
CGFloat firstLineIdentation = (CGFloat)intent.indentationLevel * (font.pointSize * 1.5);
paragraphStyle.firstLineHeadIndent += firstLineIdentation;
// Advance subsequent lines and text that wraps to next line by next tab interval past the firstLineIdentation
CGFloat defaultTabInterval = paragraphStyle.defaultTabInterval;
paragraphStyle.headIndent += ceil(firstLineIdentation / defaultTabInterval) * defaultTabInterval;
NSNumber *intentIdentity = @(intent.identity);
BOOL didVisitListItemFromPreviousPass = [previousVisitedListItemIntents containsObject:intentIdentity];
BOOL insertUnorderedBullet = (parentIntent == nil || parentIntent.intentKind == NSPresentationIntentKindUnorderedList);
if (!didVisitListItemFromPreviousPass) {
if (insertUnorderedBullet) {
[outputAttributedSubString appendAttributedString:listBulletAttributedString];
} else {
NSString *ordinalStringWithSpacing = [NSString stringWithFormat:@"%ld.", intent.ordinal];
NSAttributedString *listItemAttributedString = [[NSAttributedString alloc] initWithString:ordinalStringWithSpacing attributes:@{NSFontAttributeName: font}];
[outputAttributedSubString appendAttributedString:listItemAttributedString];
}
[previousVisitedListItemIntents addObject:intentIdentity];
}
[outputAttributedSubString appendAttributedString:tabAttributedString];
}
break;
}
case NSPresentationIntentKindBlockQuote: {
// Advance text that wraps to next line by this divider width
// Multiple levels of block quotes will be advanced mulitiple times
// Special rendering via text attachments or decorations is not done because
// it's complex and may have tradeoffs
paragraphStyle.firstLineHeadIndent += paragraphStyle.defaultTabInterval;
paragraphStyle.headIndent += paragraphStyle.defaultTabInterval;
break;
}
case NSPresentationIntentKindCodeBlock: {
paragraphStyle.paragraphSpacing += font.pointSize * 0.25;
// A parent of a code block could be a block quote or list item
// It's more correct to use tab rather than leading paragraph indentation in this case
[outputAttributedSubString appendAttributedString:tabAttributedString];
// Advance text that wraps to next line by next tab interval
paragraphStyle.headIndent += paragraphStyle.defaultTabInterval;
NSMutableAttributedString *blockquoteAttributedString = [fragmentAttributedString mutableCopy];
[blockquoteAttributedString addAttributes:@{NSFontAttributeName: monospacedParagraphFont, NSForegroundColorAttributeName: NSColor.labelColor} range:NSMakeRange(0, blockquoteAttributedString.length)];
[outputAttributedSubString appendAttributedString:blockquoteAttributedString];
break;
}
case NSPresentationIntentKindOrderedList:
case NSPresentationIntentKindUnorderedList:
// Nothing special is rendered for thematic breaks
// Rendering them via text attachments or decorations is complex and has tradeoffs
case NSPresentationIntentKindThematicBreak:
// Note: TextKit 2 doesn't support NSTextTable
// Tables don't show up in release notes often, so they're not that worthwhile supporting
case NSPresentationIntentKindTable:
case NSPresentationIntentKindTableHeaderRow:
case NSPresentationIntentKindTableRow:
case NSPresentationIntentKindTableCell:
break;
}
}
// Note: this function can be called from a background thread and shouldn't use main-thread only APIs
// More decorative rendering for blockquotes and line breaks (i.e. rendering dividers) was tried out,
// using a. NSTextAttachmentCell based subclass, or b. NSTextAttachmentViewProvider, or c. adopting custom NSTextViewportLayoutControllerDelegate.
// This was ultimatily given up on and they all have various tradeoffs. NSCell based text attachments don't work in Catalyst,
// view based attachments take up additional space, and TextKit2 CALayer decorations are hard to (re)size/position correctly.
// Also each increases code complexity and risk. In the end, changelogs can can live without these.
// Furthermore we currently support TextKit 1 (on older systems) and TextKit 2 so this function needs to handle both paths.
static NSAttributedString *formatMarkdownAttributedString(NSAttributedString *originalAttributedString, CGFloat defaultFontPointSize) API_AVAILABLE(macos(12.0))
{
// Create our fonts and cache some common attributed strings up front (list bullets, newline)
NSFont *paragraphFont = [NSFont systemFontOfSize:defaultFontPointSize];
NSFont *monospacedParagraphFont = [NSFont monospacedSystemFontOfSize:defaultFontPointSize weight:NSFontWeightRegular];
NSMutableAttributedString *outputAttributedString = [[NSMutableAttributedString alloc] init];
NSAttributedString *newlineAttributedString = [[NSAttributedString alloc] initWithString:@"\n"];
NSAttributedString *listBulletAttributedString;
{
// The bullet character looks too small in the system font, so switch to another font where it's bigger at same point size
NSFont *listBulletPreferredFont = [NSFont fontWithName:@"Menlo Regular" size:defaultFontPointSize];
NSFont *listBulletFont = (listBulletPreferredFont != nil) ? listBulletPreferredFont : paragraphFont;
listBulletAttributedString = [[NSAttributedString alloc] initWithString:@"•" attributes:@{NSFontAttributeName : listBulletFont}];
}
NSAttributedString *tabAttributedString = [[NSAttributedString alloc] initWithString:@"\t" attributes:@{NSFontAttributeName: paragraphFont}];
NSMutableSet<NSNumber *> *previousVisitedListItemIntents = [[NSMutableSet alloc] init];
// Enumerate through every presentation intent fragment and create a new attributed string that we append to the output
// Foundation handles formatting some things for us already in the attributed string such as bold/itatlics and hyperlinks,
// but we need to handle formatting paragraphs, headers, lists, block quotes, etc in the attributed string.
[originalAttributedString enumerateAttribute:NSPresentationIntentAttributeName inRange:NSMakeRange(0, originalAttributedString.length) options:(NSAttributedStringEnumerationOptions)0 usingBlock:^(NSPresentationIntent *intent, NSRange presentationIntentRange, BOOL * _Nonnull __unused stopPresentationIntentEnumeration) {
// Split the presentation intent by lines so we treat every line as a separate paragraph so we present them properly (with correct indentation / tabs)
// Normally multiple lines aren't in the same paragraph, but this can happen in some cases like code blocks
[originalAttributedString.string enumerateSubstringsInRange:presentationIntentRange options:NSStringEnumerationByLines usingBlock:^(NSString * _Nullable __unused substring, NSRange substringRange, NSRange __unused enclosingRange, BOOL * _Nonnull __unused stopLineEnumeration) {
// Insert newline after outputting previous paragraph
// This check ensures an extra newline is not inserted after the last outputted paragraph
if (outputAttributedString.length > 0) {
[outputAttributedString appendAttributedString:newlineAttributedString];
}
NSAttributedString *fragmentAttributedString = [originalAttributedString attributedSubstringFromRange:substringRange];
// Properties of the paragraph start as 0 and later get incremented based on what is processed
NSMutableParagraphStyle *paragraphStyle = [[NSMutableParagraphStyle alloc] init];
paragraphStyle.paragraphSpacingBefore = 0;
paragraphStyle.paragraphSpacing = 0;
paragraphStyle.headIndent = 0;
paragraphStyle.firstLineHeadIndent = 0;
// Assume tabs won't be used in headers so we'll just use regular paragraph font size
paragraphStyle.tabStops = @[];
paragraphStyle.defaultTabInterval = paragraphFont.pointSize * 1.38;
NSUInteger previousOutputLength = outputAttributedString.length;
BOOL canProcessListItem = YES;
processMarkdownFragmentAttributedString(fragmentAttributedString, outputAttributedString, paragraphStyle, canProcessListItem, previousVisitedListItemIntents, intent, paragraphFont, monospacedParagraphFont, tabAttributedString, newlineAttributedString, listBulletAttributedString);
[outputAttributedString addAttributes:@{NSParagraphStyleAttributeName: paragraphStyle} range:NSMakeRange(previousOutputLength, outputAttributedString.length - previousOutputLength)];
}];
}];
return outputAttributedString;
}
- (void)_loadAttributedString:(NSAttributedString * _Nullable)attributedString completionHandler:(void (^)(NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
{
if (attributedString == nil) {
completionHandler([NSError errorWithDomain:SUSparkleErrorDomain code:SUReleaseNotesError userInfo:@{NSLocalizedDescriptionKey: @"Failed to create attributed string of contents to load"}]);
return;
}
// Give delegate a chance to process and modify the attributed string
NSAttributedString *finalAttributedString;
id<SPUStandardUserDriverDelegate> delegate = _delegate;
if ([(NSObject *)delegate respondsToSelector:@selector(standardUserDriverWillShowReleaseNotesText:forUpdate:withBundleDisplayVersion:bundleVersion:)]) {
NSAttributedString *attributedStringFromDelegate = [delegate standardUserDriverWillShowReleaseNotesText:(NSAttributedString * _Nonnull)attributedString forUpdate:_updateItem withBundleDisplayVersion:_host.displayVersion bundleVersion:_host.version];
if (attributedStringFromDelegate != nil) {
finalAttributedString = attributedStringFromDelegate;
} else {
finalAttributedString = attributedString;
}
} else {
finalAttributedString = attributedString;
}
[_textView.textStorage setAttributedString:finalAttributedString];
completionHandler(nil);
}
- (void)_loadString:(NSString *)contents baseURL:(nullable NSURL *)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler SPU_OBJC_DIRECT
{
NSSize contentSize = [_scrollView contentSize];
[_textView setFrame:NSMakeRect(0, 0, contentSize.width, contentSize.height)];
[_textView setMinSize:NSMakeSize(0.0, contentSize.height)];
[_textView setMaxSize:NSMakeSize(DBL_MAX, DBL_MAX)];
[_textView setVerticallyResizable:YES];
[_textView setHorizontallyResizable:NO];
[_textView setAutoresizingMask:NSViewWidthSizable];
[_textView setTextContainerInset:NSMakeSize(4, 8)];
[_textView setContinuousSpellCheckingEnabled:NO];
_textView.usesFontPanel = NO;
_textView.editable = NO;
if (@available(macOS 10.14, *)) {
_textView.usesAdaptiveColorMappingForDarkAppearance = YES;
}
[_scrollView setHasVerticalScroller:YES];
[_scrollView setHasHorizontalScroller:NO];
if (_prefersMarkdown) {
if (@available(macOS 12, *)) {
dispatch_queue_attr_t queuePriority = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, QOS_CLASS_USER_INITIATED, 0);
dispatch_queue_t markdownDispatchQueue = dispatch_queue_create("org.sparkle-project.markdown-loader", queuePriority);
dispatch_async(markdownDispatchQueue, ^{
NSError *loadMarkdownError = nil;
NSAttributedString *originalMarkdownAttributedString = [[NSAttributedString alloc] initWithMarkdownString:contents options:nil baseURL:baseURL error:&loadMarkdownError];
if (originalMarkdownAttributedString == nil) {
// Fallback to plain-text
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)self->_fontPointSize] }];
dispatch_async(dispatch_get_main_queue(), ^{
[self _loadAttributedString:attributedString completionHandler:completionHandler];
});
} else {
NSAttributedString *formattedAttributedString = formatMarkdownAttributedString(originalMarkdownAttributedString, (CGFloat)self->_fontPointSize);
dispatch_async(dispatch_get_main_queue(), ^{
[self _loadAttributedString:formattedAttributedString completionHandler:completionHandler];
});
}
});
return;
} else {
SULog(SULogLevelDefault, @"Warning: falling back to plain text because markdown support requires macOS 12 or newer");
}
}
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:contents attributes:@{ NSFontAttributeName : [NSFont systemFontOfSize:(CGFloat)_fontPointSize] }];
[self _loadAttributedString:attributedString completionHandler:completionHandler];
}
- (void)loadString:(NSString *)contents baseURL:(NSURL * _Nullable)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
{
[self _loadString:contents baseURL:baseURL completionHandler:completionHandler];
}
- (void)loadData:(NSData *)data MIMEType:(NSString *)MIMEType textEncodingName:(NSString *)textEncodingName baseURL:(NSURL *)baseURL completionHandler:(void (^)(NSError * _Nullable))completionHandler
{
CFStringEncoding cfEncoding = CFStringConvertIANACharSetNameToEncoding((CFStringRef)textEncodingName);
NSStringEncoding encoding;
if (cfEncoding != kCFStringEncodingInvalidId) {
encoding = CFStringConvertEncodingToNSStringEncoding(cfEncoding);
} else {
encoding = NSUTF8StringEncoding;
}
NSString *contents = [[NSString alloc] initWithData:data encoding:encoding];
if (contents == nil) {
completionHandler([NSError errorWithDomain:SUSparkleErrorDomain code:SUReleaseNotesError userInfo:@{NSLocalizedDescriptionKey: @"Failed to convert data contents to string"}]);
return;
}
[self _loadString:contents baseURL:baseURL completionHandler:completionHandler];
}
- (void)stopLoading
{
}
- (void)setDrawsBackground:(BOOL)drawsBackground
{
}
- (BOOL)textView:(NSTextView *)textView clickedOnLink:(id)link atIndex:(NSUInteger)charIndex
{
NSURL *linkURL;
if ([(NSObject *)link isKindOfClass:[NSURL class]]) {
linkURL = link;
} else if ([(NSObject *)link isKindOfClass:[NSString class]]) {
linkURL = [NSURL URLWithString:link];
} else {
SULog(SULogLevelDefault, @"Blocked display of %@ link of unknown type", link);
return YES;
}
BOOL isAboutBlankURL;
if (!SUReleaseNotesIsSafeURL(linkURL, _customAllowedURLSchemes, &isAboutBlankURL)) {
SULog(SULogLevelDefault, @"Blocked display of %@ URL which may be dangerous", linkURL.scheme);
return YES;
}
return NO;
}
@end
#endif
+4 -3
View File
@@ -16,14 +16,15 @@
#import "SPUUserUpdateState.h"
@protocol SUUpdateAlertDelegate;
@protocol SPUStandardUserDriverDelegate;
@class SUAppcastItem, SPUDownloadData, SUHost;
@class SUAppcastItem, SPUDownloadData, SUHost, SPUUpdaterSettings;
SPU_OBJC_DIRECT_MEMBERS @interface SUUpdateAlert : NSWindowController
- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id<SUVersionDisplay>)versionDisplayer completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock;
- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id<SUVersionDisplay>)versionDisplayer updaterSettings:(SPUUpdaterSettings *)updaterSettings delegate:(id<SPUStandardUserDriverDelegate>)delegate completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock;
- (void)showUpdateReleaseNotesWithDownloadData:(SPUDownloadData *)downloadData;
- (void)showReleaseNotesFailedToDownload;
- (void)showReleaseNotesFailedToDownloadWithError:(NSError *)error;
- (void)setInstallButtonFocus:(BOOL)focus;
+129 -77
View File
@@ -18,7 +18,7 @@
#import "SUReleaseNotesView.h"
#import "SUWKWebView.h"
#import "SULegacyWebView.h"
#import "SUPlainTextReleaseNotesView.h"
#import "SUTextViewReleaseNotesView.h"
#import "SUConstants.h"
#import "SULog.h"
@@ -32,9 +32,17 @@
#import "SPUUserUpdateState.h"
static NSString *const SUUpdateAlertTouchBarIdentifier = @"" SPARKLE_BUNDLE_IDENTIFIER ".SUUpdateAlert";
static NSString *const SUAllowsAutomaticUpdatesKeyPath = @"allowsAutomaticUpdates";
static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
typedef NS_ENUM(NSInteger, SUReleaseNotesFormat)
{
SUReleaseNotesFormatHTML,
SUReleaseNotesFormatPlainText,
SUReleaseNotesFormatMarkdown
};
@interface SUUpdateAlert () <NSTouchBarDelegate>
@end
@@ -48,6 +56,8 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
id<SUReleaseNotesView> _releaseNotesView;
id<SUVersionDisplay> _versionDisplayer;
__weak id<SPUStandardUserDriverDelegate> _delegate;
IBOutlet NSStackView *_stackView;
IBOutlet NSButton *_installButton;
IBOutlet NSButton *_laterButton;
@@ -60,11 +70,10 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
void (^_didBecomeKeyBlock)(void);
void(^_completionBlock)(SPUUserUpdateChoice, NSRect, BOOL);
BOOL _allowsAutomaticUpdates;
BOOL _windowLoadedAndShowsReleaseNotes;
}
- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id<SUVersionDisplay>)versionDisplayer completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock
- (instancetype)initWithAppcastItem:(SUAppcastItem *)item state:(SPUUserUpdateState *)state host:(SUHost *)aHost versionDisplayer:(id<SUVersionDisplay>)versionDisplayer updaterSettings:(SPUUpdaterSettings *)updaterSettings delegate:(id<SPUStandardUserDriverDelegate>)delegate completionBlock:(void (^)(SPUUserUpdateChoice, NSRect, BOOL))completionBlock didBecomeKeyBlock:(void (^)(void))didBecomeKeyBlock
{
self = [super initWithWindowNibName:@"SUUpdateAlert"];
if (self != nil) {
@@ -73,21 +82,11 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
_versionDisplayer = versionDisplayer;
_state = state;
_delegate = delegate;
_completionBlock = [completionBlock copy];
_didBecomeKeyBlock = [didBecomeKeyBlock copy];
_updaterSettings = [[SPUUpdaterSettings alloc] initWithHostBundle:aHost.bundle];
BOOL allowsAutomaticUpdates;
NSNumber *allowsAutomaticUpdatesOption = _updaterSettings.allowsAutomaticUpdatesOption;
if (item.informationOnlyUpdate) {
allowsAutomaticUpdates = NO;
} else if (allowsAutomaticUpdatesOption == nil) {
allowsAutomaticUpdates = _updaterSettings.automaticallyChecksForUpdates;
} else {
allowsAutomaticUpdates = allowsAutomaticUpdatesOption.boolValue;
}
_allowsAutomaticUpdates = allowsAutomaticUpdates;
_updaterSettings = updaterSettings;
[self setShouldCascadeWindows:NO];
} else {
@@ -96,6 +95,13 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
return self;
}
- (void)dealloc
{
if (self.windowLoaded) {
[_updaterSettings removeObserver:self forKeyPath:SUAllowsAutomaticUpdatesKeyPath];
}
}
- (NSString *)description
{
return [NSString stringWithFormat:@"%@ <%@>", [self class], _host.bundlePath];
@@ -154,7 +160,7 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
- (void)displayReleaseNotesSpinner SPU_OBJC_DIRECT
{
// Stick a nice big spinner in the middle of the web view until the page is loaded.
// Stick a nice big spinner in the middle of the release notes view until the page is loaded.
_releaseNotesSpinner = [[NSProgressIndicator alloc] init];
_releaseNotesSpinner.controlSize = NSControlSizeRegular;
[_releaseNotesSpinner setStyle:NSProgressIndicatorStyleSpinning];
@@ -170,23 +176,28 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
_releaseNotesSpinner.displayedWhenStopped = NO;
[_releaseNotesSpinner startAnimation:self];
// If there's no release notes URL, just stick the contents of the description into the web view
// If there's no release notes URL, just stick the contents of the description into the release notes view
// Otherwise we'll wait until the client wants us to show release notes
if (_updateItem.releaseNotesURL == nil) {
NSString *itemDescription = _updateItem.itemDescription;
if (itemDescription != nil) {
NSString *itemDescriptionFormat = _updateItem.itemDescriptionFormat;
// We don't support markdown but prepare for the future in case we support it one day
BOOL prefersPlainText =
([itemDescriptionFormat isEqualToString:@"plain-text"] ||
[itemDescriptionFormat isEqualToString:@"markdown"]);
[self _createReleaseNotesViewPreferringPlainText:prefersPlainText];
SUReleaseNotesFormat releaseNotesFormat;
if ([itemDescriptionFormat isEqualToString:@"plain-text"]) {
releaseNotesFormat = SUReleaseNotesFormatPlainText;
} else if ([itemDescriptionFormat isEqualToString:@"markdown"]) {
releaseNotesFormat = SUReleaseNotesFormatMarkdown;
} else {
releaseNotesFormat = SUReleaseNotesFormatHTML;
}
[self _createReleaseNotesViewPreferringFormat:releaseNotesFormat];
__weak __typeof__(self) weakSelf = self;
[_releaseNotesView loadString:itemDescription baseURL:nil completionHandler:^(NSError * _Nullable error) {
if (error != nil) {
SULog(SULogLevelError, @"Failed to load HTML string from web view: %@", error);
SULog(SULogLevelError, @"Failed to load HTML string from release notes view: %@", error);
}
[weakSelf stopReleaseNotesSpinner];
}];
@@ -217,28 +228,43 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
// We don't support markdown but prepare for the future in case we support it one day
NSString *pathExtension = releaseNotesURL.pathExtension;
BOOL preferringPlainText =
([chosenMIMEType isEqualToString:@"text/plain"] ||
[pathExtension caseInsensitiveCompare:@"txt"] == NSOrderedSame ||
[chosenMIMEType isEqualToString:@"text/markdown"] ||
[chosenMIMEType isEqualToString:@"text/x-markdown"] ||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame ||
[pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame);
[self _createReleaseNotesViewPreferringPlainText:preferringPlainText];
SUReleaseNotesFormat releaseNotesFormat;
// Make sure we test for markdown first because text/plain may be used for MIME type
if ([chosenMIMEType isEqualToString:@"text/markdown"] ||
[chosenMIMEType isEqualToString:@"text/x-markdown"] ||
[pathExtension caseInsensitiveCompare:@"md"] == NSOrderedSame ||
[pathExtension caseInsensitiveCompare:@"markdown"] == NSOrderedSame) {
releaseNotesFormat = SUReleaseNotesFormatMarkdown;
} else if ([chosenMIMEType isEqualToString:@"text/plain"] || [pathExtension caseInsensitiveCompare:@"txt"] == NSOrderedSame) {
releaseNotesFormat = SUReleaseNotesFormatPlainText;
} else {
releaseNotesFormat = SUReleaseNotesFormatHTML;
}
[self _createReleaseNotesViewPreferringFormat:releaseNotesFormat];
__weak __typeof__(self) weakSelf = self;
[_releaseNotesView loadData:downloadData.data MIMEType:chosenMIMEType textEncodingName:chosenTextEncodingName baseURL:baseURL completionHandler:^(NSError * _Nullable error) {
if (error != nil) {
SULog(SULogLevelError, @"Failed to load data from web view: %@", error);
SULog(SULogLevelError, @"Failed to load data from release notes view: %@", error);
}
[weakSelf stopReleaseNotesSpinner];
}];
}
- (void)showReleaseNotesFailedToDownload
- (void)showReleaseNotesFailedToDownloadWithError:(NSError *)error
{
[self stopReleaseNotesSpinner];
[self _createReleaseNotesViewPreferringFormat:SUReleaseNotesFormatPlainText];
__weak __typeof__(self) weakSelf = self;
[_releaseNotesView loadString:error.localizedDescription baseURL:nil completionHandler:^(NSError * _Nullable loadCompletionError) {
if (loadCompletionError != nil) {
SULog(SULogLevelError, @"Failed to load HTML error string from release notes view: %@", loadCompletionError);
}
[weakSelf stopReleaseNotesSpinner];
}];
}
- (void)stopReleaseNotesSpinner SPU_OBJC_DIRECT
@@ -248,7 +274,7 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
- (BOOL)showsReleaseNotes
{
NSNumber *shouldShowReleaseNotes = [_host objectForInfoDictionaryKey:SUShowReleaseNotesKey];
NSNumber *shouldShowReleaseNotes = [_host boolNumberForInfoDictionaryKey:SUShowReleaseNotesKey];
if (shouldShowReleaseNotes == nil) {
// Don't show release notes if RSS item contains no description and no release notes URL:
return (([_updateItem itemDescription] != nil
@@ -259,34 +285,40 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
return [shouldShowReleaseNotes boolValue];
}
- (void)_createReleaseNotesViewPreferringPlainText:(BOOL)preferringPlainText SPU_OBJC_DIRECT
- (void)_createReleaseNotesViewPreferringFormat:(SUReleaseNotesFormat)preferredReleaseNotesFormat SPU_OBJC_DIRECT
{
// "-apple-system-font" is a reference to the system UI font. "-apple-system" is the new recommended token, but for backward compatibility we can't use it.
NSString *defaultFontFamily = @"-apple-system-font";
int defaultFontSize = (int)[NSFont systemFontSize];
BOOL usesPlainText;
if (preferringPlainText) {
usesPlainText = YES;
} else {
if (@available(macOS 10.15, *)) {
usesPlainText = [[NSProcessInfo processInfo] isMacCatalystApp];
if (usesPlainText && !preferringPlainText) {
SULog(SULogLevelError, @"Error: Showing HTML release notes for Catalyst apps is not supported. The release notes will be interpreted as plain text. Please serve a plain-text (.txt) release notes file. If you are using a <description> element then please specify the %@=\"plain-text\" attribute in that element.", SUAppcastAttributeFormat);
SUReleaseNotesFormat usedReleaseNotesFormat;
switch (preferredReleaseNotesFormat) {
case SUReleaseNotesFormatPlainText:
case SUReleaseNotesFormatMarkdown:
usedReleaseNotesFormat = preferredReleaseNotesFormat;
break;
case SUReleaseNotesFormatHTML:
if (@available(macOS 10.15, *)) {
if ([[NSProcessInfo processInfo] isMacCatalystApp]) {
usedReleaseNotesFormat = SUReleaseNotesFormatPlainText;
SULog(SULogLevelError, @"Error: Showing HTML release notes for Catalyst apps is not supported. The release notes will be interpreted as plain text. Please serve a plain-text (.txt) or markdown (.md) release notes file. If you are using a <description> element then please specify the %@=\"plain-text\" or %@=\"markdown\" attribute in that element.", SUAppcastAttributeFormat, SUAppcastAttributeFormat);
} else {
usedReleaseNotesFormat = preferredReleaseNotesFormat;
}
} else {
usedReleaseNotesFormat = preferredReleaseNotesFormat;
}
} else {
usesPlainText = NO;
}
break;
}
NSArray<NSString *> *customAllowedURLSchemes;
{
NSMutableArray<NSString *> *allowedSchemes = [NSMutableArray array];
id hostAllowedURLSchemes = [_host objectForInfoDictionaryKey:SUAllowedURLSchemesKey];
if ([(NSObject *)hostAllowedURLSchemes isKindOfClass:[NSArray class]]) {
for (id urlScheme in (NSArray *)hostAllowedURLSchemes) {
NSArray *hostAllowedURLSchemes = [_host objectForInfoDictionaryKey:SUAllowedURLSchemesKey ofClass:NSArray.class];
if (hostAllowedURLSchemes != nil) {
for (id urlScheme in hostAllowedURLSchemes) {
if ([(NSObject *)urlScheme isKindOfClass:[NSString class]]) {
NSString *allowedURLScheme = [(NSString *)urlScheme lowercaseString];
if (![allowedURLScheme isEqualToString:@"file"]) {
@@ -301,26 +333,41 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
customAllowedURLSchemes = [allowedSchemes copy];
}
if (usesPlainText) {
_releaseNotesView = [[SUPlainTextReleaseNotesView alloc] initWithFontPointSize:defaultFontSize customAllowedURLSchemes:customAllowedURLSchemes];
} else {
NSURL *colorStyleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"ReleaseNotesColorStyle" withExtension:@"css"];
BOOL javaScriptEnabled = [_host boolForInfoDictionaryKey:SUEnableJavaScriptKey];
#if DOWNLOADER_XPC_SERVICE_EMBEDDED
// WKWebView has a bug where it won't work in loading local HTML content in sandboxed apps that do not have an outgoing network entitlement
// FB6993802: https://twitter.com/sindresorhus/status/1160577243929878528 | https://github.com/feedback-assistant/reports/issues/1
// If the developer is using the downloader XPC service, they are very most likely are a) sandboxed b) do not use outgoing network entitlement.
// In this case, fall back to legacy WebKit view.
// (In theory it is possible for a non-sandboxed app or sandboxed app with outgoing network entitlement to use the XPC service, it's just pretty unlikely. And falling back to a legacy web view would not be too harmful in those cases).
BOOL useWKWebView = !SPUXPCServiceIsEnabled(SUEnableDownloaderServiceKey);
if (!useWKWebView) {
_releaseNotesView = [[SULegacyWebView alloc] initWithColorStyleSheetLocation:colorStyleURL fontFamily:defaultFontFamily fontPointSize:defaultFontSize javaScriptEnabled:javaScriptEnabled customAllowedURLSchemes:customAllowedURLSchemes];
} else
#endif
id<SPUStandardUserDriverDelegate> delegate = _delegate;
switch (usedReleaseNotesFormat) {
case SUReleaseNotesFormatPlainText:
_releaseNotesView = [[SUTextViewReleaseNotesView alloc] initWithFontPointSize:defaultFontSize appcastItem:_updateItem host:_host delegate:delegate prefersMarkdown:NO customAllowedURLSchemes:customAllowedURLSchemes];
break;
case SUReleaseNotesFormatMarkdown:
_releaseNotesView = [[SUTextViewReleaseNotesView alloc] initWithFontPointSize:defaultFontSize appcastItem:_updateItem host:_host delegate:delegate prefersMarkdown:YES customAllowedURLSchemes:customAllowedURLSchemes];
break;
case SUReleaseNotesFormatHTML:
{
_releaseNotesView = [[SUWKWebView alloc] initWithColorStyleSheetLocation:colorStyleURL fontFamily:defaultFontFamily fontPointSize:defaultFontSize javaScriptEnabled:javaScriptEnabled customAllowedURLSchemes:customAllowedURLSchemes installedVersion: _host.version];
NSURL *colorStyleURL = [[NSBundle bundleForClass:[self class]] URLForResource:@"ReleaseNotesColorStyle" withExtension:@"css"];
BOOL javaScriptEnabled = [_host boolForInfoDictionaryKey:SUEnableJavaScriptKey];
#if DOWNLOADER_XPC_SERVICE_EMBEDDED
// WKWebView has a bug where it won't work in loading local HTML content in sandboxed apps that do not have an outgoing network entitlement
// FB6993802: https://twitter.com/sindresorhus/status/1160577243929878528 | https://github.com/feedback-assistant/reports/issues/1
// If the developer is using the downloader XPC service, they are very most likely are a) sandboxed b) do not use outgoing network entitlement.
// In this case, fall back to legacy WebKit view.
// (In theory it is possible for a non-sandboxed app or sandboxed app with outgoing network entitlement to use the XPC service, it's just unlikely and unsupported).
// Note: because legacy web view is only supported with using downloader XPC Service, and the app
// should not have an outgoing network client, there's no need to be concerned about the
// appcast signing validation status for loading external resources, which shouldn't be possible.
BOOL useWKWebView = !SPUXPCServiceIsEnabled(SUEnableDownloaderServiceKey);
if (!useWKWebView) {
_releaseNotesView = [[SULegacyWebView alloc] initWithColorStyleSheetLocation:colorStyleURL fontFamily:defaultFontFamily fontPointSize:defaultFontSize javaScriptEnabled:javaScriptEnabled customAllowedURLSchemes:customAllowedURLSchemes];
} else
#endif
{
BOOL allowsLoadingExternalReferences = (_updateItem.signingValidationStatus == SPUAppcastSigningValidationStatusSkipped);
_releaseNotesView = [[SUWKWebView alloc] initWithColorStyleSheetLocation:colorStyleURL fontFamily:defaultFontFamily fontPointSize:defaultFontSize javaScriptEnabled:javaScriptEnabled customAllowedURLSchemes:customAllowedURLSchemes allowsLoadingExternalReferences:allowsLoadingExternalReferences installedVersion:_host.version];
}
break;
}
}
@@ -328,7 +375,7 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
[_releaseNotesContentView addSubview:_releaseNotesView.view positioned:NSWindowBelow relativeTo:_releaseNotesSpinner];
_releaseNotesView.view.frame = _releaseNotesContentView.bounds;
_releaseNotesView.view.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
_releaseNotesView.view.autoresizingMask = (NSAutoresizingMaskOptions)(NSViewWidthSizable | NSViewHeightSizable);
if (@available(macOS 10.14, *)) {
// We need a transparent background
@@ -338,6 +385,15 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
}
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSString *,id> *)change context:(void *)context
{
if ([keyPath isEqualToString:SUAllowsAutomaticUpdatesKeyPath]) {
_automaticallyInstallUpdatesButton.superview.hidden = !_updaterSettings.allowsAutomaticUpdates;
} else {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
}
- (void)windowDidLoad
{
NSWindow *window = self.window;
@@ -387,7 +443,7 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
window.frameAutosaveName = @"SUUpdateAlert2";
} else {
// Update alert should not be resizable when no release notes are available
window.styleMask &= ~NSWindowStyleMaskResizable;
window.styleMask = (NSWindowStyleMask)(window.styleMask & ~NSWindowStyleMaskResizable);
}
_windowLoadedAndShowsReleaseNotes = showReleaseNotes;
@@ -395,8 +451,6 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
[_installButton setTitle:SULocalizedStringFromTableInBundle(@"Learn More…", SPARKLE_TABLE, sparkleBundle, @"Alternate title for 'Install Update' button when there's no download in RSS feed.")];
[_installButton setAction:@selector(openInfoURL:)];
}
BOOL allowsAutomaticUpdates = _allowsAutomaticUpdates;
if (showReleaseNotes) {
[self displayReleaseNotesSpinner];
@@ -409,9 +463,7 @@ static const CGFloat SUUpdateAlertGroupElementSpacing = 12.0;
// NOTE: The code below for deciding what buttons to hide is complex! Due to array of feature configurations :)
if (!allowsAutomaticUpdates) {
_automaticallyInstallUpdatesButton.superview.hidden = YES;
}
[_updaterSettings addObserver:self forKeyPath:SUAllowsAutomaticUpdatesKeyPath options:(NSKeyValueObservingOptions)(NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew) context:NULL];
if (_state.stage == SPUUserUpdateStageInstalling) {
// We're going to be relaunching pretty instantaneously
+12 -12
View File
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24118.1" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="24412" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24118.1"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="24412"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
@@ -26,17 +26,17 @@
<windowCollectionBehavior key="collectionBehavior" fullScreenAuxiliary="YES"/>
<windowPositionMask key="initialPositionMask" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="746" y="229" width="532" height="370"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="918"/>
<rect key="screenRect" x="0.0" y="0.0" width="1470" height="922"/>
<value key="minSize" type="size" width="462" height="150"/>
<view key="contentView" misplaced="YES" id="6">
<rect key="frame" x="0.0" y="0.0" width="532" height="370"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView distribution="fill" orientation="vertical" alignment="leading" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="61v-5k-OXp">
<rect key="frame" x="0.0" y="0.0" width="680" height="377"/>
<rect key="frame" x="0.0" y="0.0" width="680" height="381"/>
<subviews>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="cGD-9V-Gym" userLabel="Title View">
<rect key="frame" x="0.0" y="313" width="680" height="64"/>
<rect key="frame" x="0.0" y="317" width="680" height="64"/>
<subviews>
<imageView translatesAutoresizingMaskIntoConstraints="NO" id="F1L-zh-U8Z" userLabel="Program icon">
<rect key="frame" x="20" y="0.0" width="64" height="64"/>
@@ -96,7 +96,7 @@
</constraints>
</customView>
<box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="ikY-gb-bgB" userLabel="Release Notes Box">
<rect key="frame" x="20" y="70" width="640" height="235"/>
<rect key="frame" x="20" y="74" width="640" height="235"/>
<view key="contentView" id="YbC-Ky-Aam" userLabel="Release Notes Content View">
<rect key="frame" x="1" y="1" width="638" height="233"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -107,10 +107,10 @@
</constraints>
</box>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="Dg5-0U-d14" userLabel="Options view">
<rect key="frame" x="0.0" y="48" width="680" height="14"/>
<rect key="frame" x="0.0" y="52" width="680" height="14"/>
<subviews>
<button verticalHuggingPriority="1000" verticalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="xYY-q8-ZyN">
<rect key="frame" x="19" y="-1" width="316" height="16"/>
<rect key="frame" x="20" y="0.0" 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="fPh-Q9-vLr">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="smallSystem"/>
@@ -128,10 +128,10 @@
</constraints>
</customView>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="iUh-Md-dRX" userLabel="Choices view">
<rect key="frame" x="0.0" y="0.0" width="680" height="40"/>
<rect key="frame" x="0.0" y="0.0" width="680" height="44"/>
<subviews>
<button horizontalHuggingPriority="150" verticalHuggingPriority="750" horizontalCompressionResistancePriority="997" translatesAutoresizingMaskIntoConstraints="NO" id="uGk-Ks-HQR">
<rect key="frame" x="395" y="13" width="137" height="32"/>
<rect key="frame" x="395" y="20" width="127" height="24"/>
<buttonCell key="cell" type="push" title="Remind Me Later" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="G8s-oM-9gf">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -148,7 +148,7 @@ Gw
</connections>
</button>
<button horizontalHuggingPriority="20" verticalHuggingPriority="750" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="sUq-y0-gA3">
<rect key="frame" x="530" y="13" width="137" height="32"/>
<rect key="frame" x="534" y="20" width="126" height="24"/>
<buttonCell key="cell" type="push" title="Install Update" bezelStyle="rounded" alignment="center" state="on" borderStyle="border" inset="2" id="IIY-s3-hkz">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
@@ -165,7 +165,7 @@ DQ
</connections>
</button>
<button verticalHuggingPriority="750" horizontalCompressionResistancePriority="998" translatesAutoresizingMaskIntoConstraints="NO" id="nRH-TL-zdL">
<rect key="frame" x="13" y="13" width="139" height="32"/>
<rect key="frame" x="20" y="20" width="129" height="24"/>
<buttonCell key="cell" type="push" title="Skip This Version" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="kVE-pO-gl0">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
Loaded 100 of 141 files, more files were not shown because too many files have changed in this diff. Show more