Merge pull request #9 from galaxy4public/catalina

Catalina support

Author: galaxy4public

CHANGELOG.md

@@ -1,3 +1,9 @@
+1.2.0
+-----
+- Replaced some calls to "osascript" where AppleScript was hitting new security
+  measures introduced in Catalina with JXA (Javascript for Apps).  This should
+  enable the package to work on Catalina.
+
 1.1.0
 -----
 - Switched to (Semantic Versioning)[https://semver.org/] for the package

build/Distribution.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <installer-gui-script minSpecVersion="2">
     <title>BootUnlock</title>
-    <product id="au.com.openwall.BootUnlock" version="1.0" />
+    <product id="au.com.openwall.BootUnlock" version="1.2.0" />
     <background file="background.png" scaling="proportional" alignment="bottomleft"/>
     <welcome file="welcome.rtf"/>
     <readme file="readme.rtf"/>
@@ -20,5 +20,5 @@
     <choice id="au.com.openwall.BootUnlock" visible="false">
         <pkg-ref id="au.com.openwall.BootUnlock"/>
     </choice>
-    <pkg-ref id="au.com.openwall.BootUnlock">BootUnlock-1.1.0-dist.pkg</pkg-ref>
+    <pkg-ref id="au.com.openwall.BootUnlock">BootUnlock-1.2.0-dist.pkg</pkg-ref>
 </installer-gui-script>

build/build.sh

@@ -7,7 +7,7 @@ NAME="BootUnlock"
 IDENTIFIER="au.com.openwall.$NAME"
 
 # Package version number.
-VERSION="1.1.0"
+VERSION="1.2.0"
 
 # The location to copy the contents of files.
 INSTALL_LOCATION="/Library/PrivilegedHelperTools/$IDENTIFIER"

files/update.sh

@@ -48,10 +48,16 @@ for V in "${VOLUME[@]}" ; do
 	VOLUME_LIST="$VOLUME_LIST${VOLUME_LIST:+, }\"$DEVICE > $NAME\""
 done
 
-RESPONSE=$(osascript -e "
-	set volumeList to { $VOLUME_LIST }
-	set unlockList to choose from list volumeList with title \"BootUnlock\" with prompt \"
-Please select volume(s) you want to be automatically unlocked during the boot (you can select multiple volumes by holding the Option key)\" multiple selections allowed true empty selection allowed true
+RESPONSE=$(osascript -l JavaScript -e "
+	var app = Application.currentApplication()
+	app.includeStandardAdditions = true
+	volumeList = [ $VOLUME_LIST ]
+	app.chooseFromList(volumeList,
+	{
+		withPrompt: 'Please select volume(s) you want to be automatically unlocked during the boot (you can select multiple volumes by holding the Command key)',
+		multipleSelectionsAllowed: true,
+		emptySelectionAllowed: true
+	})
 ")
 
 if [ -z "$RESPONSE" -o "$RESPONSE" = false ]; then
@@ -75,12 +81,38 @@ for V in "${VOLUME[@]}" ; do
 	printf '%s' "$RESPONSE" | grep -E "^$DEVICE\$" &>/dev/null || continue
 
 	while : ; do # This is a wrapper in case user provides a wrong password
-		PASSPHRASE=$(osascript -e "
-			display dialog \"Please provide the passphrase for volume '$NAME':\" with title \"BootUnlock\" buttons { \"Skip\", \"Unlock\" } default button \"Unlock\" with icon file ((path to \"apps\" as text) & \"Utilities:Disk Utility.app:Contents:Resources:AppIcon.icns\") default answer \"\" hidden answer true
+		PASSPHRASE=$(osascript -l JavaScript -e "
+			var app = Application.currentApplication()
+			app.includeStandardAdditions = true
+			ObjC.import('Foundation')
+			/*
+			iconPath = Path(
+				ObjC.deepUnwrap(
+					$.NSBundle.bundleWithIdentifier(
+						Application('Disk Utility').id()
+					).pathsForResourcesOfTypeInDirectory('icns', $()))[0])
+			*/
+			function promptPassword(text, defaultAnswer) {
+			  var options = {
+			  	defaultAnswer: defaultAnswer || '',
+				withTitle: 'BootUnlock',
+				buttons: [ 'Skip', 'Unlock' ],
+				defaultButton: 'Unlock',
+				// withIcon: iconPath,
+				hiddenAnswer: true
+			  }
+			  try {
+			    let result = app.displayDialog(text, options)
+				if (result.buttonReturned == 'Unlock')
+					return result.textReturned
+				return ''
+			  } catch (e) {
+			    return null
+			  }
+			}
+			promptPassword('Please provide the passphrase for volume \"$NAME\":')
 		")
 
-		PASSPHRASE=$(printf '%s' "$PASSPHRASE" | cut -f3- -d:)
-
 		if printf '%s' "$PASSPHRASE" | diskutil apfs unlock "$DEVICE" -stdinpassphrase -verify -user "$UUID"; then
 			printf 'Adding password for volume "%s" with UUID %s to the System keychain...\n' "$NAME" "$UUID"
 			if sudo /usr/bin/security add-generic-password \