diff --git a/Profile Manifest/com.twocanoes.xcreds.plist b/Profile Manifest/com.twocanoes.xcreds.plist index ac9d1957..825f17a1 100644 --- a/Profile Manifest/com.twocanoes.xcreds.plist +++ b/Profile Manifest/com.twocanoes.xcreds.plist @@ -5,7 +5,7 @@ pfm_app_url https://github.com/twocanoes/xcreds pfm_description - XCreds 5.0 (7159) OAuth Settings + XCreds 5.0 (7169) OAuth Settings pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_domain @@ -13,7 +13,7 @@ pfm_format_version 1 pfm_last_modified - 2024-08-21T01:07:52Z + 2024-08-22T03:22:15Z pfm_platforms macOS @@ -648,7 +648,7 @@ Note that Google does not support the offline_access scope so instead use the pr pfm_default pfm_description - Favor using XCreds' local login screen over the cloud login UI. + Favor using XCreds' local login screen over the cloud login UI. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -746,7 +746,7 @@ Note that Google does not support the offline_access scope so instead use the pr pfm_description - Don't show the UI if this key is defined and a file or folder exists at this path. + Don't show the UI if this key is defined and a file or folder exists at this path. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -758,7 +758,7 @@ Note that Google does not support the offline_access scope so instead use the pr pfm_description - Name of OIDC claim that contains an alias to add to a user account. Usually this is the "upn" (eg syd@twocanoes.com) so the user can log in at the standard login window the same as the IdP login window. Adds the value to record name of the user account as an alias. + Name of OIDC claim that contains an alias to add to a user account. Usually this is the "upn" (eg syd@twocanoes.com) so the user can log in at the standard login window the same as the IdP login window. Adds the value to record name of the user account as an alias. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -1086,7 +1086,7 @@ Note that Google does not support the offline_access scope so instead use the pr pfm_default pfm_description - Reset the keychain without prompting if the login password doesn't match the local password. + Reset the keychain without prompting if the login password doesn't match the local password. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -1256,9 +1256,9 @@ Note that Google does not support the offline_access scope so instead use the pr pfm_description - Password element id of the html element that has the password. It is read by using JavaScript to get the value (for example, for Azure, the JavaScript document.getElementById('i0118').value is sent. If this default is not set, standard values for Azure and Google Cloud will be used. To find out this value, use a browser to inspect the source of the page that has the password on it. Find the id of the textfield that has the password. Fill in the password and then open the JavaScript console. Run: + Password element id of the html element that has the password. It is read by using JavaScript to get the value (for example, for Azure, the JavaScript document.getElementById('i0118').value is sent. If this default is not set, standard values for Azure and Google Cloud will be used. To find out this value, use a browser to inspect the source of the page that has the password on it. Find the id of the textfield that has the password. Fill in the password and then open the JavaScript console. Run: -document.getElementById('passwordID').value +document.getElementById('passwordID').value changing “passwordID” to the correct element ID. If the value you typed into the textfield is returned, this is the correct ID. pfm_documentation_url @@ -1290,7 +1290,7 @@ changing “passwordID” to the correct element ID. If the value you typed into pfm_default family_name pfm_description - Local DS to OIDC/AD Mapping for Last Name. Default value: “family_name” (OIDC), "sn" (AD). map_lastname should be set to an OIDC claim for last name. + Local DS to OIDC/AD Mapping for Last Name. Default value: “family_name” (OIDC), "sn" (AD). map_lastname should be set to an OIDC claim for last name. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -1306,7 +1306,7 @@ changing “passwordID” to the correct element ID. If the value you typed into pfm_default name pfm_description - Local DS to OIDC/AD Attribute Mapping for Full Name. Default value: “name”(OIDC), "displayName" (AD). map_fullname should be set to an OIDC claim/AD Attribute for full name. + Local DS to OIDC/AD Attribute Mapping for Full Name. Default value: “name”(OIDC), "displayName" (AD). map_fullname should be set to an OIDC claim/AD Attribute for full name. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -1322,7 +1322,7 @@ changing “passwordID” to the correct element ID. If the value you typed into pfm_default name pfm_description - Local DS to OIDC Mapping/AD Attribute for Name. Default value: “name” (OIDC), "userPrincipalName" (AD). map_username should be set to an OIDC claim/AD Attribute for name. The macOS username will be set as the portion of this value before an @ symbol if present. + Local DS to OIDC Mapping/AD Attribute for Name. Default value: “name” (OIDC), "userPrincipalName" (AD). map_username should be set to an OIDC claim/AD Attribute for name. The macOS username will be set as the portion of this value before an @ symbol if present. pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name @@ -1572,7 +1572,7 @@ changing “passwordID” to the correct element ID. If the value you typed into pfm_description - Name for Shares menu item. Default: "Shares". + Name for Shares menu item. Default: "Shares". pfm_documentation_url https://twocanoes.com/knowledge-base/xcreds-admin-guide/#preferences pfm_name diff --git a/XCreds AutoFill/AppDelegate.swift b/XCreds AutoFill/AppDelegate.swift index f1940ff3..d48d1a11 100644 --- a/XCreds AutoFill/AppDelegate.swift +++ b/XCreds AutoFill/AppDelegate.swift @@ -10,7 +10,22 @@ import Cocoa @main class AppDelegate: NSObject, NSApplicationDelegate { - + static func main() { + if CommandLine.arguments.contains("-r") { + DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()+5) { + NSApplication.shared.terminate(self) + } + } + let app = NSApplication.shared + let appDelegate = AppDelegate() + app.delegate = appDelegate + _ = NSApplicationMain(CommandLine.argc, CommandLine.unsafeArgv) + + + } + + + func applicationDidFinishLaunching(_ aNotification: Notification) { diff --git a/XCreds/AppDelegate.swift b/XCreds/AppDelegate.swift index fa60146a..ac1ca615 100644 --- a/XCreds/AppDelegate.swift +++ b/XCreds/AppDelegate.swift @@ -150,13 +150,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, DSQueryable { NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(screenDidWake(_:)), name:NSWorkspace.screensDidWakeNotification , object: nil) - if let autofillAppPath = Bundle.main.path(forResource: "XCreds Login Autofill", ofType: "app"){ - + if var autofillAppPath = Bundle.main.path(forResource: "XCreds Login Autofill", ofType: "app"){ + autofillAppPath = autofillAppPath + "/Contents/MacOS/XCreds Login Autofill" if FileManager.default.fileExists(atPath: autofillAppPath){ - let msg = TCTaskHelper.shared().runCommand("/usr/bin/pluginkit", withOptions: ["/usr/bin/pluginkit","-a", autofillAppPath]) + let msg = TCTaskHelper.shared().runCommand(autofillAppPath, withOptions:["-r"] ) - TCSLogWithMark(msg ?? "") + print(msg) } } mainController = MainController() diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj index 23a30c52..b34ea7d8 100644 --- a/xCreds.xcodeproj/project.pbxproj +++ b/xCreds.xcodeproj/project.pbxproj @@ -1664,7 +1664,7 @@ CODE_SIGN_ENTITLEMENTS = "XCreds AutoFill/XCreds_AutoFill.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -1707,7 +1707,7 @@ CODE_SIGN_ENTITLEMENTS = "XCreds AutoFill/XCreds_AutoFill.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -1741,7 +1741,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_ENTITLEMENTS = "XCreds AutoFill Extension/XCreds_AutoFill_Extension.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -1780,7 +1780,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_ENTITLEMENTS = "XCreds AutoFill Extension/XCreds_AutoFill_Extension.entitlements"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; ENABLE_USER_SCRIPT_SANDBOXING = YES; @@ -1811,7 +1811,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\""; @@ -1830,7 +1830,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = "\"$(SRCROOT)/Carthage/Build/Mac\""; @@ -1850,7 +1850,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = UXP6YEHSPW; FRAMEWORK_SEARCH_PATHS = ( @@ -1887,7 +1887,7 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = UXP6YEHSPW; FRAMEWORK_SEARCH_PATHS = ( @@ -1923,7 +1923,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEBUGGING_SYMBOLS = YES; DEBUG_INFORMATION_FORMAT = dwarf; DEVELOPMENT_TEAM = UXP6YEHSPW; @@ -1939,7 +1939,7 @@ isa = XCBuildConfiguration; buildSettings = { CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = UXP6YEHSPW; OTHER_CFLAGS = ""; @@ -1953,7 +1953,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; @@ -1969,7 +1969,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; @@ -1985,7 +1985,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; @@ -2000,7 +2000,7 @@ buildSettings = { CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; MACOSX_DEPLOYMENT_TARGET = 13.3; @@ -2018,7 +2018,7 @@ CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -2055,7 +2055,7 @@ CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -2206,7 +2206,7 @@ CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( @@ -2250,7 +2250,7 @@ CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 7167; + CURRENT_PROJECT_VERSION = 7175; DEVELOPMENT_TEAM = UXP6YEHSPW; ENABLE_HARDENED_RUNTIME = YES; FRAMEWORK_SEARCH_PATHS = ( diff --git a/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate index 633af10f..fa44b666 100644 Binary files a/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate and b/xCreds.xcodeproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index e9b597e2..985d5125 100644 --- a/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/xCreds.xcodeproj/xcuserdata/tperfitt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -7,7 +7,7 @@ XCreds Login Autofill.xcscheme_^#shared#^_ orderHint - 8 + 6 XCreds Login Overlay.xcscheme_^#shared#^_ @@ -52,7 +52,7 @@ auth_mech_fixup.xcscheme_^#shared#^_ orderHint - 9 + 8 authrights.xcscheme_^#shared#^_ @@ -62,11 +62,21 @@ test.xcscheme_^#shared#^_ orderHint - 6 + 9 SuppressBuildableAutocreation + 760291DF2C116E450075FBD8 + + primary + + + 760291F32C116EDB0075FBD8 + + primary + + 7631935C287D22C700D36BF7 primary