Register with Keystone using a versionPath and versionKey

chrome/browser/cocoa/keystone_glue.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/cocoa/keystone_glue.h"
 
 #include <sys/param.h>
 #include <sys/mount.h>
 
 #include <vector>
@@ skipping 31 matching lines @@
 NSString* const KSRegistrationExistenceCheckerTypeKey = @"ExistenceCheckerType";
 NSString* const KSRegistrationExistenceCheckerStringKey =
     @"ExistenceCheckerString";
 NSString* const KSRegistrationServerURLStringKey = @"URLString";
 NSString* const KSRegistrationPreserveTrustedTesterTokenKey = @"PreserveTTT";
 NSString* const KSRegistrationTagKey = @"Tag";
 NSString* const KSRegistrationTagPathKey = @"TagPath";
 NSString* const KSRegistrationTagKeyKey = @"TagKey";
 NSString* const KSRegistrationBrandPathKey = @"BrandPath";
 NSString* const KSRegistrationBrandKeyKey = @"BrandKey";
+NSString* const KSRegistrationVersionPathKey = @"VersionPath";
+NSString* const KSRegistrationVersionKeyKey = @"VersionKey";
 
 NSString* const KSRegistrationDidCompleteNotification =
     @"KSRegistrationDidCompleteNotification";
 NSString* const KSRegistrationPromotionDidCompleteNotification =
     @"KSRegistrationPromotionDidCompleteNotification";
 
 NSString* const KSRegistrationCheckForUpdateNotification =
     @"KSRegistrationCheckForUpdateNotification";
 NSString* KSRegistrationStatusKey = @"Status";
 NSString* KSRegistrationUpdateCheckErrorKey = @"Error";
 
 NSString* const KSRegistrationStartUpdateNotification =
     @"KSRegistrationStartUpdateNotification";
 NSString* const KSUpdateCheckSuccessfulKey = @"CheckSuccessful";
 NSString* const KSUpdateCheckSuccessfullyInstalledKey =
     @"SuccessfullyInstalled";
 
 NSString* const KSRegistrationRemoveExistingTag = @"";
 #define KSRegistrationPreserveExistingTag nil
 
-// Constants for the brand file (uses an external file so it can survive updates
-// to Chrome.
+// Constants for the brand file (uses an external file so it can survive
+// updates to Chrome.)
 
 #if defined(GOOGLE_CHROME_BUILD)
 #define kBrandFileName @"Google Chrome Brand.plist";
 #elif defined(CHROMIUM_BUILD)
 #define kBrandFileName @"Chromium Brand.plist";
 #else
 #error Unknown branding
 #endif
 
 // These directories are hardcoded in Keystone promotion preflight and the
@@ skipping 64 matching lines @@
 - (BOOL)promoteWithParameters:(NSDictionary*)args
                 authorization:(AuthorizationRef)authorization;
 
 - (void)setActive;
 - (void)checkForUpdate;
 - (void)startUpdate;
 - (KSRegistrationTicketType)ticketType;
 
 @end  // @interface KSRegistration
 
-@interface KeystoneGlue(Private)
+@interface KeystoneGlue (Private)
 
 // Returns the path to the application's Info.plist file.  This returns the
 // outer application bundle's Info.plist, not the framework's Info.plist.
 - (NSString*)appInfoPlistPath;
 
 // Returns a dictionary containing parameters to be used for a KSRegistration
 // -registerWithParameters: or -promoteWithParameters:authorization: call.
 - (NSDictionary*)keystoneParameters;
 
 // Called when Keystone registration completes.
@@ skipping 52 matching lines @@
 // -promotionComplete.  That routine calls
 // -changePermissionsForPromotionWithTool: on a work queue thread.  When done,
 // -changePermissionsForPromotionComplete is called on the main thread.
 - (void)changePermissionsForPromotionAsync;
 - (void)changePermissionsForPromotionWithTool:(NSString*)toolPath;
 - (void)changePermissionsForPromotionComplete;
 
 // Returns the brand file path to use for Keystone.
 - (NSString*)brandFilePath;
 
-@end  // @interface KeystoneGlue(Private)
+@end  // @interface KeystoneGlue (Private)
 
 NSString* const kAutoupdateStatusNotification = @"AutoupdateStatusNotification";
 NSString* const kAutoupdateStatusStatus = @"status";
 NSString* const kAutoupdateStatusVersion = @"version";
 
 namespace {
 
 NSString* const kChannelKey = @"KSChannelID";
 NSString* const kBrandKey = @"KSBrandID";
+NSString* const kVersionKey = @"KSVersion";
 
 }  // namespace
 
 @implementation KeystoneGlue
 
 + (id)defaultKeystoneGlue {
   static bool sTriedCreatingDefaultKeystoneGlue = false;
   // TODO(jrg): use base::SingletonObjC<KeystoneGlue>
   static KeystoneGlue* sDefaultKeystoneGlue = nil;  // leaked
 
@@ skipping 62 matching lines @@
   NSBundle* appBundle = [NSBundle mainBundle];
   NSDictionary* infoDictionary = [self infoDictionary];
 
   NSString* productID = [infoDictionary objectForKey:@"KSProductID"];
   if (productID == nil) {
     productID = [appBundle bundleIdentifier];
   }
 
   NSString* appPath = [appBundle bundlePath];
   NSString* url = [infoDictionary objectForKey:@"KSUpdateURL"];
-  NSString* version = [infoDictionary objectForKey:@"KSVersion"];
+  NSString* version = [infoDictionary objectForKey:kVersionKey];
 
   if (!productID || !appPath || !url || !version) {
     // If parameters required for Keystone are missing, don't use it.
     return;
   }
 
   NSString* channel = [infoDictionary objectForKey:kChannelKey];
   // The stable channel has no tag.  If updating to stable, remove the
   // dev and beta tags since we've been "promoted".
   if (channel == nil)
@@ skipping 141 matching lines @@
 - (NSString*)appInfoPlistPath {
   // NSBundle ought to have a way to access this path directly, but it
   // doesn't.
   return [[appPath_ stringByAppendingPathComponent:@"Contents"]
              stringByAppendingPathComponent:@"Info.plist"];
 }
 
 - (NSDictionary*)keystoneParameters {
   NSNumber* xcType = [NSNumber numberWithInt:kKSPathExistenceChecker];
   NSNumber* preserveTTToken = [NSNumber numberWithBool:YES];
-  NSString* tagPath = [self appInfoPlistPath];
-
+  NSString* appInfoPlistPath = [self appInfoPlistPath];
   NSString* brandKey = kBrandKey;
   NSString* brandPath = [self brandFilePath];
 
   if ([brandPath length] == 0) {
     // Brand path and brand key must be cleared together or ksadmin seems
     // to throw an error.
     brandKey = @"";
   }
 
   return [NSDictionary dictionaryWithObjectsAndKeys:
              version_, KSRegistrationVersionKey,
+             appInfoPlistPath, KSRegistrationVersionPathKey,
+             kVersionKey, KSRegistrationVersionKeyKey,
              xcType, KSRegistrationExistenceCheckerTypeKey,
              appPath_, KSRegistrationExistenceCheckerStringKey,
              url_, KSRegistrationServerURLStringKey,
              preserveTTToken, KSRegistrationPreserveTrustedTesterTokenKey,
              channel_, KSRegistrationTagKey,
-             tagPath, KSRegistrationTagPathKey,
+             appInfoPlistPath, KSRegistrationTagPathKey,
              kChannelKey, KSRegistrationTagKeyKey,
              brandPath, KSRegistrationBrandPathKey,
              brandKey, KSRegistrationBrandKeyKey,
              nil];
 }
 
 - (void)registerWithKeystone {
   [self updateStatus:kAutoupdateRegistering version:nil];
 
   NSDictionary* parameters = [self keystoneParameters];
@@ skipping 306 matching lines @@
   // synchronous too, and this operation needs to happen before that one.
   //
   // TODO(mark): Make asynchronous.  That only makes sense if the promotion
   // operation itself is asynchronous too.  http://b/2290009.  Hopefully,
   // the Keystone promotion code will just be changed to do what preflight
   // now does, and then the preflight script can be removed instead.
   // However, preflight operation (and promotion) should only be asynchronous
   // if the synchronous parameter is NO.
   NSString* preflightPath =
       [base::mac::MainAppBundle() pathForResource:@"keystone_promote_preflight"
-                                          ofType:@"sh"];
+                                           ofType:@"sh"];
   const char* preflightPathC = [preflightPath fileSystemRepresentation];
   const char* userBrandFile = NULL;
   const char* systemBrandFile = NULL;
   if (brandFileType_ == kBrandFileTypeUser) {
     // Running with user level brand file, promote to the system level.
     userBrandFile = [UserBrandFilePath() fileSystemRepresentation];
     systemBrandFile = [SystemBrandFilePath() fileSystemRepresentation];
   }
   const char* arguments[] = {userBrandFile, systemBrandFile, NULL};
 
@@ skipping 65 matching lines @@
 
 - (void)changePermissionsForPromotionAsync {
   // NSBundle is not documented as being thread-safe.  Do NSBundle operations
   // on the main thread before jumping over to a WorkerPool-managed
   // thread to run the tool.
   DCHECK([NSThread isMainThread]);
 
   SEL selector = @selector(changePermissionsForPromotionWithTool:);
   NSString* toolPath =
       [base::mac::MainAppBundle() pathForResource:@"keystone_promote_postflight"
-                                          ofType:@"sh"];
+                                           ofType:@"sh"];
 
   PerformBridge::PostPerform(self, selector, toolPath);
 }
 
 - (void)changePermissionsForPromotionWithTool:(NSString*)toolPath {
   const char* toolPathC = [toolPath fileSystemRepresentation];
 
   const char* appPathC = [appPath_ fileSystemRepresentation];
   const char* arguments[] = {appPathC, NULL};
 
@@ skipping 38 matching lines @@
   return [KeystoneGlue defaultKeystoneGlue] != nil;
 }
 
 string16 CurrentlyInstalledVersion() {
   KeystoneGlue* keystoneGlue = [KeystoneGlue defaultKeystoneGlue];
   NSString* version = [keystoneGlue currentlyInstalledVersion];
   return base::SysNSStringToUTF16(version);
 }
 
 }  // namespace keystone_glue