[[ Bug 20592 ]] Add uuid field to deploy parameters

runrevmark · runrevmark · commit 77435c1c2b29 · 2017-10-26T12:50:20.000+01:00
This patch adds a uuid field to the deploy parameters which can
be specified with the deploy command.

When specified, iOS and Mac deployments will place the specified
uuid into the Mach-O UUID load command. This is required to ensure
services such as fingerprint authentication works correctly.
diff --git a/docs/notes/bugfix-20592.md b/docs/notes/bugfix-20592.md
@@ -0,0 +1 @@
+# Ensure iOS standalones are treated as unique by fingerprint scanning
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -367,6 +367,12 @@ bool MCDeployParameters::InitWithArray(MCExecContext &ctxt, MCArrayRef p_array)
 									  kMCStringOptionCompareCaseless))
 		banner_class = kMCLicenseClassProfessionalEvaluation;
 	
+    
+    if (!ctxt.CopyOptElementAsString(p_array, MCNAME("uuid"), false, t_temp_string))
+        return false;
+    MCValueAssign(uuid, t_temp_string);
+    MCValueRelease(t_temp_string);
+    
     return true;
 }
 
diff --git a/engine/src/deploy.h b/engine/src/deploy.h
@@ -119,6 +119,8 @@ struct MCDeployParameters
 	// The data for the banner stackfile.
 	MCDataRef banner_stackfile;
 	
+    // When building for Mac/iOS, there is a UUID field which can be set.
+    MCStringRef uuid;
 	
 	MCDeployParameters()
 	{
@@ -151,6 +153,8 @@ struct MCDeployParameters
 		banner_timeout = 0;
 		banner_stackfile = MCValueRetain(kMCEmptyData);
         banner_class = kMCLicenseClassNone;
+        
+        uuid = MCValueRetain(kMCEmptyString);
 	}
 	
 	~MCDeployParameters()
@@ -174,6 +178,7 @@ struct MCDeployParameters
         MCValueRelease(library);
         MCMemoryDeleteArray(min_os_versions);
 		MCValueRelease(banner_stackfile);
+        MCValueRelease(uuid);
 	}
 	
 	// Creates using an array of parameters
@@ -455,6 +460,9 @@ enum MCDeployError
 	
 	/* An error occurred with the pre-deploy step */
 	kMCDeployErrorTrialBannerError,
+    
+    /* The uuid field was invalid */
+    kMCDeployErrorInvalidUuid,
 
 	// SIGN ERRORS
 
diff --git a/engine/src/deploy_file.cpp b/engine/src/deploy_file.cpp
@@ -316,6 +316,9 @@ const char *MCDeployErrorToString(MCDeployError p_error)
 		
 		case kMCDeployErrorTrialBannerError:
 			return "could not create trial banner";
+            
+        case kMCDeployErrorInvalidUuid:
+            return "invalid uuid";
 
 		case kMCDeployErrorNoCertificate:
 			return "could not load certificate";
diff --git a/engine/src/deploy_macosx.cpp b/engine/src/deploy_macosx.cpp
@@ -21,11 +21,11 @@ along with LiveCode.  If not see <http://www.gnu.org/licenses/>.  */
 #include "parsedef.h"
 #include "filedefs.h"
 
-
 #include "handler.h"
 #include "scriptpt.h"
 #include "variable.h"
 #include "statemnt.h"
+#include "uuid.h"
 
 #include "deploy.h"
 
@@ -894,6 +894,16 @@ struct version_min_command {
     uint32_t	sdk;		/* X.Y.Z is encoded in nibbles xxxx.yy.zz */
 };
 
+/*
+ * The uuid load command contains a single 128-bit unique random number that
+ * identifies an object produced by the static link editor.
+ */
+struct uuid_command {
+    uint32_t	cmd;		/* LC_UUID */
+    uint32_t	cmdsize;	/* sizeof(struct uuid_command) */
+    uint8_t	uuid[16];	/* the 128-bit uuid */
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 struct mach_32bit
@@ -1333,7 +1343,8 @@ template<typename T> bool MCDeployToMacOSXMainBody(const MCDeployParameters& p_p
 			t_old_linkedit_offset = t_misc_segment -> fileoff;
         
 		// Now go through, updating the offsets for all load commands after
-		// and including linkedit.
+		// and including linkedit. We also update the uuid load command here,
+        // if one has been provided.
 		typename T::sfield t_file_delta, t_address_delta;
 		t_file_delta = (t_project_segment -> fileoff + t_project_size) - t_old_linkedit_offset;
 		t_address_delta = t_file_delta;
@@ -1369,9 +1380,25 @@ template<typename T> bool MCDeployToMacOSXMainBody(const MCDeployParameters& p_p
                 case LC_DATA_IN_CODE:
                     relocate_function_starts_command((linkedit_data_command *)t_commands[i], t_file_delta, t_address_delta);
                     break;
-					
-                // These commands have no file offsets
+                    
+                // Update the uuid, if one has been provided.
                 case LC_UUID:
+                    if (!MCStringIsEmpty(p_params.uuid))
+                    {
+                        MCAutoStringRefAsCString t_uuid_cstring;
+                        MCUuid t_uuid;
+                        if (t_uuid_cstring.Lock(p_params.uuid) &&
+                            MCUuidFromCString(*t_uuid_cstring, t_uuid))
+                        {
+                            uuid_command *t_uuid_cmd = (uuid_command *)t_commands[i];
+                            MCUuidToBytes(t_uuid, t_uuid_cmd->uuid);
+                        }
+                        else
+                            t_success = MCDeployThrow(kMCDeployErrorInvalidUuid);
+                    }
+                    break;
+                    
+                // These commands have no file offsets
                 case LC_THREAD:
                 case LC_UNIXTHREAD:
                 case LC_LOAD_DYLIB:
diff --git a/ide-support/revsaveasiosstandalone.livecodescript b/ide-support/revsaveasiosstandalone.livecodescript
@@ -570,6 +570,9 @@ private command revSaveAsMobileStandaloneMain pStack, pAppBundle, pTarget, pSett
    
    -- delete the last LF
    delete last char of tDeploy["fontmappings"]
+
+   -- Make sure the standalone is generated with a unique uuid
+   put uuid() into tDeploy["uuid"]
    
    try
       _internal deploy ios tDeploy
diff --git a/ide-support/revsaveasstandalone.livecodescript b/ide-support/revsaveasstandalone.livecodescript
@@ -701,6 +701,9 @@ command revSaveAsMacStandalone pStack, pRestoreFileName, pFolder
          put return & "revInternal__SetSmallAppIcon" && sStandaloneSettingsA["OSX,smallappicon"] after tDeployInfo["startup_script"]
       end if
       
+      -- Add a random uuid to use in the executable's uuid load command.
+      put uuid() into tDeployInfo["uuid"]
+
       revStandaloneDeployWithParams tTarget, tStackSourceFile, tDeployInfo
       
       -- Make sure we finish off the bundle contents
@@ -2489,7 +2492,7 @@ command revStandaloneDeployWithParams pTarget, pStackFilePath, pDeployInfo
    delete stack pStackFilePath
    unlock screen
    unlock messages
-   
+
    -- Actually do the standalone engine build - we probably need some sort of
    -- error handling here :oD
    revStandaloneProgress "Attaching engine..."

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure iOS standalones are treated as unique by fingerprint scanning`