New: Username and Password as commandline parameter

Use /username:xxx and /Password:xxx as arguments to pass credentials

Author: rzander

.gitignore

@@ -323,6 +323,7 @@ ASALocalRun/
 
 #SCCCliCtr Files
 Customization.dll
+Customization.dll.config
 Plugin_*.dll
 Plugin_*/
 Customization/

SCCMCliCtrWPF/SCCMCliCtrWPF/MainPage.xaml.cs

@@ -205,7 +205,7 @@ public MainPage()
             if (Properties.Settings.Default.showPingButton)
                 bt_Ping.Visibility = System.Windows.Visibility.Visible;
 
-
+            bool bNoConnect = true;
             try
             {
                 if (System.Deployment.Application.ApplicationDeployment.IsNetworkDeployed)
@@ -250,12 +250,16 @@ public MainPage()
                 {
                     if (Environment.GetCommandLineArgs().Count() > 0)
                     {
-                        tb_TargetComputer.Text = Environment.GetCommandLineArgs()[1].Trim();
-                        tb_TargetComputer2.Text = Environment.GetCommandLineArgs()[1].Trim();
-                        tb_TargetComputer.Text = tb_TargetComputer.Text.Replace("-debug", "127.0.0.1");
-                        tb_TargetComputer2.Text = tb_TargetComputer.Text.Replace("-debug", "127.0.0.1");
-                        tb_TargetComputer.Text = tb_TargetComputer.Text.Replace("-Embedding", "");
-                        tb_TargetComputer2.Text = tb_TargetComputer2.Text.Replace("-Embedding", "");
+                        if (!Environment.GetCommandLineArgs()[1].StartsWith("/"))
+                        {
+                            tb_TargetComputer.Text = Environment.GetCommandLineArgs()[1].Trim();
+                            tb_TargetComputer2.Text = Environment.GetCommandLineArgs()[1].Trim();
+                            tb_TargetComputer.Text = tb_TargetComputer.Text.Replace("-debug", "127.0.0.1");
+                            tb_TargetComputer2.Text = tb_TargetComputer.Text.Replace("-debug", "127.0.0.1");
+                            tb_TargetComputer.Text = tb_TargetComputer.Text.Replace("-Embedding", "");
+                            tb_TargetComputer2.Text = tb_TargetComputer2.Text.Replace("-Embedding", "");
+                            bNoConnect = false;
+                        }
                     }
                 }
             }
@@ -271,7 +275,7 @@ public MainPage()
                 if (Environment.GetCommandLineArgs().Count() > 1)
                 {
                     var Args = Environment.GetCommandLineArgs().ToList();
-                    bool bNoConnect = false;
+                    
                     if (Args.Contains("/RegisterConsole", StringComparer.OrdinalIgnoreCase))
                     {
                         try
@@ -295,6 +299,23 @@ public MainPage()
                         return;
                     }
 
+                    string sUser = Args.FirstOrDefault(t => t.StartsWith("/Username:", StringComparison.CurrentCultureIgnoreCase));
+                    string sPW = Args.FirstOrDefault(t => t.StartsWith("/Password:", StringComparison.CurrentCultureIgnoreCase));
+
+                    if (sUser != null && sPW != null)
+                    {
+                        sUser = sUser.Substring(10);
+                        sPW = sPW.Substring(10);
+                        if (!string.IsNullOrEmpty(sUser) && !string.IsNullOrEmpty(sPW))
+                        {
+                            tb_Username.Text = sUser;
+                            pb_Password.Password = common.Encrypt(sPW, Application.ResourceAssembly.ManifestModule.Name);
+                            sUser = "";
+                            sPW = "";
+                        }
+                    }
+
+
                     if (!bNoConnect)
                     {
                         if (!string.IsNullOrEmpty(tb_TargetComputer.Text))
@@ -498,6 +519,7 @@ private void bt_Connect_Click(object sender, RoutedEventArgs e)
                         }
                         string sPW = common.Decrypt(pb_Password.Password, Application.ResourceAssembly.ManifestModule.Name);
                         oAgent = new SCCMAgent(sTarget, tb_Username.Text, sPW, int.Parse(tb_wsmanport.Text), false, cb_ssl.IsChecked ?? false);
+                        sPW = "";
                     }
 
                     oAgent.PSCode.Listeners.Add(myTrace);

SCCMCliCtrWPF/SCCMCliCtrWPF/Properties/AssemblyInfo.cs

@@ -52,4 +52,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.4.*")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyFileVersion("1.0.4.2")]

SCCMCliCtrWPF/SCCMCliCtrWPF/SCCMCliCtr.csproj

@@ -46,8 +46,8 @@
     <WebPage>default.htm</WebPage>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
     <TrustUrlParameters>true</TrustUrlParameters>
-    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>1.0.4.1</ApplicationVersion>
+    <ApplicationRevision>2</ApplicationRevision>
+    <ApplicationVersion>1.0.4.2</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -87,8 +87,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="PresentationFramework.Aero" />
-    <Reference Include="sccmclictr.automation, Version=1.0.0.11, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\sccmclictrlib.1.0.0.11\lib\net46\sccmclictr.automation.dll</HintPath>
+    <Reference Include="sccmclictr.automation, Version=1.0.0.12, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\sccmclictrlib.1.0.0.12\lib\net46\sccmclictr.automation.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -366,6 +366,7 @@
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <Content Condition="Exists('Customization.dll.config')" Include="Customization.dll.config" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

SCCMCliCtrWPF/SCCMCliCtrWPF/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NavigationPane" version="2.1.0.0" targetFramework="net45" />
-  <package id="sccmclictrlib" version="1.0.0.11" targetFramework="net46" />
+  <package id="sccmclictrlib" version="1.0.0.12" targetFramework="net46" />
   <package id="WPFToolkit" version="3.5.50211.1" targetFramework="net45" />
 </packages>