tweaked create user

twocanoes · Jul 24, 2022 · 4bfdd10 · 4bfdd10
1 parent 2bd3cb8
commit 4bfdd10
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 26 deletions.
diff --git a/XCredsLoginPlugIn/LoginWindow/LoginWebViewController.swift b/XCredsLoginPlugIn/LoginWindow/LoginWebViewController.swift
@@ -156,12 +156,12 @@ class LoginWebViewController: WebViewController {
             delegate.denyLogin()
             return
         }
-
-        if isLocal == false {
-            TCSLogWithMark("User is not on system. for now, just abort")
-            delegate.denyLogin()
-            return
-        }
+//
+//        if isLocal == false {
+//            TCSLogWithMark("User is not on system. for now, just abort")
+//            delegate.denyLogin()
+//            return
+//        }
 
         let hasHome = try? PasswordUtils.doesUserHomeExist(username)
         guard let hasHome = hasHome else {
@@ -170,11 +170,11 @@ class LoginWebViewController: WebViewController {
             return
         }
 
-        if hasHome == false {
-            TCSLogWithMark("User has no home. for now, just abort")
-            delegate.denyLogin()
-            return
-        }
+//        if hasHome == false {
+//            TCSLogWithMark("User has no home. for now, just abort")
+//            delegate.denyLogin()
+//            return
+//        }
 
 
 
@@ -241,9 +241,18 @@ class LoginWebViewController: WebViewController {
             }
 
         }
-        TCSLogWithMark("updating username, password, and tokens")
+        TCSLogWithMark("updating username:\(username), password, and tokens")
         delegate.setContextString(type: kAuthorizationEnvironmentUsername, value: username)
         delegate.setContextString(type: kAuthorizationEnvironmentPassword, value: tokens.password)
+        delegate.setHint(type: .user, hint: username)
+        delegate.setHint(type: .pass, hint: tokens.password)
+//        setHint(type: .noMADFirst, hint: user.firstName)
+//        setHint(type: .noMADLast, hint: user.lastName)
+//        setHint(type: .noMADDomain, hint: domainName)
+//        setHint(type: .noMADGroups, hint: user.groups)
+        delegate.setHint(type: .fullName, hint: idTokenObject.unique_name ?? username)
+        delegate.setHint(type: .firstName, hint: idTokenObject.given_name ?? "")
+        delegate.setHint(type: .lastName, hint: idTokenObject.family_name ?? "")
 
         delegate.setHint(type: .tokens, hint: [tokens.idToken,tokens.refreshToken,tokens.accessToken])
 

diff --git a/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift b/XCredsLoginPlugIn/Mechanisms/XCredsBaseMechanism.swift
@@ -38,11 +38,20 @@ protocol XCredsMechanismProtocol {
             let defaultsDict = NSDictionary(contentsOfFile: defaultsPath)
             UserDefaults.standard.register(defaults: defaultsDict as! [String : Any])
         }
-        let infoPlist = Bundle.main.infoDictionary
 
-        if let infoPlist = infoPlist, let build = infoPlist["CFBundleVersion"] {
-            TCSLogWithMark("Build \(build)")
+        let allBundles = Bundle.allBundles
 
+        for currentBundle in allBundles {
+            if currentBundle.bundlePath.contains("XCreds") {
+                let infoPlist = currentBundle.infoDictionary
+                if let infoPlist = infoPlist, let build = infoPlist["CFBundleVersion"] {
+                    TCSLogWithMark("-------------------------------------")
+                    TCSLogWithMark("XCreds Login Build Number: \(build)")
+                    TCSLogWithMark("-------------------------------------")
+                    break
+                }
+
+            }
         }
 
 
@@ -83,7 +92,6 @@ protocol XCredsMechanismProtocol {
 
                 return nil
             }
-            TCSLogWithMark("Computed user accessed")
             return userName
         }
     }
@@ -178,7 +186,7 @@ protocol XCredsMechanismProtocol {
         var err: OSStatus = noErr
         err = mechCallbacks.GetHintValue((mech?.fEngine)!, type.rawValue, &value)
         if err != errSecSuccess {
-            TCSLogWithMark("Couldn't retrieve hint value: %{public}@")
+            TCSLogWithMark("Couldn't retrieve hint value: \(type.rawValue)")
             return nil
         }
         let outputdata = Data.init(bytes: value!.pointee.data!, count: value!.pointee.length)

diff --git a/XCredsLoginPlugIn/XCredsLoginPlugin.m b/XCredsLoginPlugIn/XCredsLoginPlugin.m
@@ -109,7 +109,7 @@ - (OSStatus)MechanismCreate:(AuthorizationPluginRef)inPlugin
     mechanism->fLoginWindow = (strcmp(mechanismId, "LoginWindow") == 0);
     mechanism->fPowerControl = (strcmp(mechanismId, "PowerControl") == 0);
     mechanism->fKeychainAdd = (strcmp(mechanismId, "KeychainAdd") == 0);
-    mechanism->fKeychainAdd = (strcmp(mechanismId, "CreateUser") == 0);
+    mechanism->fCreateUser = (strcmp(mechanismId, "CreateUser") == 0);
     *outMechanism = mechanism;
 
     return errSecSuccess;

diff --git a/app_to_test.sh b/app_to_test.sh
@@ -8,4 +8,10 @@ ssh -J [email protected] [email protected] rm -rf "/Applications/XCreds.app"
 
 scp -r -J [email protected] "${BUILD_ROOT}"/Release/XCreds.app [email protected]:/Applications/ 
 
-#ssh -J [email protected] [email protected] reboot || exit 0
+#ssh -J [email protected] [email protected] reboot || exit 0
+
+ssh -J [email protected] [email protected] /Applications/XCreds.app/Contents/Resources/xcreds_login.sh -r
+
+ssh -J [email protected] [email protected] /Applications/XCreds.app/Contents/Resources/xcreds_login.sh -i
+
+ssh -J [email protected] [email protected] killall -9 SecurityAgent || echo "unable to kill"
diff --git a/xCreds.xcodeproj/project.pbxproj b/xCreds.xcodeproj/project.pbxproj
@@ -860,7 +860,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3011;
+				CURRENT_PROJECT_VERSION = 3022;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -890,7 +890,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3011;
+				CURRENT_PROJECT_VERSION = 3022;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -948,7 +948,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3011;
+				CURRENT_PROJECT_VERSION = 3022;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -978,7 +978,7 @@
 				CODE_SIGN_ENTITLEMENTS = "XCreds Login Overlay/XCreds_Login_Overlay.entitlements";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3011;
+				CURRENT_PROJECT_VERSION = 3022;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1121,7 +1121,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3011;
+				CURRENT_PROJECT_VERSION = 3022;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -1150,7 +1150,7 @@
 				CODE_SIGN_ENTITLEMENTS = XCreds/xCreds.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3011;
+				CURRENT_PROJECT_VERSION = 3022;
 				DEVELOPMENT_TEAM = UXP6YEHSPW;
 				ENABLE_HARDENED_RUNTIME = YES;
 				GENERATE_INFOPLIST_FILE = YES;

diff --git a/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate b/...deproj/project.xcworkspace/xcuserdata/tperfitt.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/xCreds.xcodeproj/xcshareddata/xcschemes/Send To Test.xcscheme b/xCreds.xcodeproj/xcshareddata/xcschemes/Send To Test.xcscheme
@@ -1,10 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
    LastUpgradeVersion = "1340"
-   version = "1.3">
+   version = "1.7">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
+      <PreActions>
+         <ExecutionAction
+            ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
+            <ActionContent
+               title = "Run Script"
+               scriptText = "cd &quot;${PROJECT_DIR}&quot;&#10;&#10;#/usr/bin/agvtool  bump&#10;"
+               shellToInvoke = "/bin/sh">
+               <EnvironmentBuildable>
+                  <BuildableReference
+                     BuildableIdentifier = "primary"
+                     BlueprintIdentifier = "766F4C4C2883B88F0021F548"
+                     BuildableName = "Send To Test"
+                     BlueprintName = "Send To Test"
+                     ReferencedContainer = "container:XCreds.xcodeproj">
+                  </BuildableReference>
+               </EnvironmentBuildable>
+            </ActionContent>
+         </ExecutionAction>
+      </PreActions>
       <BuildActionEntries>
          <BuildActionEntry
             buildForTesting = "YES"