Certificate/wireless plugins; major refactoring

Migrate much of BI to Services.
Added Wireless Profile Provider plugin feature.
Added Certificate Authority Provider plugin feature.
Modified Certificate Provider plugin feature.
Database migration v17, for Device Profiles.
Enrolment Client Updated to support CA Certificates, Wireless Profiles
and Hardware Info.
New Client Enrolment Protocol to support new features.
Plugin Manifest Generator added to main solution.
Improved AD search performance.

Disco.Models/BI/Device/ImportDevice.cs

@@ -1,35 +0,0 @@
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-
-namespace Disco.Models.BI.Device
-{
-    public class ImportDevice
-    {
-        [Required, StringLength(60)]
-        public string SerialNumber { get; set; }
-
-        public int? DeviceModelId { get; set; }
-
-        [Range(1, int.MaxValue, ErrorMessage = "A valid Device Profile is Required")]
-        public int DeviceProfileId { get; set; }
-
-        public int? DeviceBatchId { get; set; }
-
-        [StringLength(50)]
-        public string AssignedUserId { get; set; }
-
-        [StringLength(250)]
-        public string Location { get; set; }
-        
-        [StringLength(40)]
-        public string AssetNumber { get; set; }
-
-        public Repository.Device Device { get; set; }
-        public Repository.DeviceModel DeviceModel { get; set; }
-        public Repository.DeviceProfile DeviceProfile { get; set; }
-        public Repository.DeviceBatch DeviceBatch { get; set; }        
-        public Repository.User AssignedUser { get; set; }
-        
-        public Dictionary<string, string> Errors { get; set; }
-    }
-}

Disco.Models/BI/Device/ImportDeviceSession.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace Disco.Models.BI.Device
-{
-    public class ImportDeviceSession
-    {
-        public string ImportParseTaskId { get; set; }
-        public string ImportFilename { get; set; }
-        public List<ImportDevice> ImportDevices { get; set; }
-    }
-}

Disco.Models/ClientServices/Enrol.cs

@@ -1,7 +1,5 @@
-using System;
+using Disco.Models.ClientServices.EnrolmentInformation;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Disco.Models.ClientServices
 {
@@ -12,21 +10,20 @@ namespace Disco.Models.ClientServices
             get { return "Enrol"; }
         }
 
-        public string DeviceSerialNumber { get; set; }
-        public string DeviceUUID { get; set; }
+        public string SerialNumber { get; set; }
 
-        public string DeviceDNSDomainName { get; set; }
-        public string DeviceComputerName { get; set; }
-        public bool DeviceIsPartOfDomain { get; set; }
-        
-        public string DeviceManufacturer { get; set; }
-        public string DeviceModel { get; set; }
-        public string DeviceModelType { get; set; }
+        public string DNSDomainName { get; set; }
+        public string ComputerName { get; set; }
+        public bool IsPartOfDomain { get; set; }
 
-        public string DeviceLanMacAddress { get; set; }
-        
-        public string DeviceWlanMacAddress { get; set; }
+        public string RunningUserName { get; set; }
+        public string RunningUserDomain { get; set; }
+        public bool RunningInteractively { get; internal set; }
 
-        public List<string> DeviceCertificates { get; set; }
+        public DeviceHardware Hardware { get; set; }
+
+        public List<Certificate> Certificates { get; set; }
+
+        public List<WirelessProfile> WirelessProfiles { get; set; }
     }
 }

Disco.Models/ClientServices/EnrolResponse.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Disco.Models.ClientServices.EnrolmentInformation;
 
 namespace Disco.Models.ClientServices
 {
@@ -9,22 +6,22 @@ namespace Disco.Models.ClientServices
     {
         public string SessionId { get; set; }
 
-        public string DeviceDomainName { get; set; }
-        public string DeviceComputerName { get; set; }
-        
-        public string DeviceAssignedUserDomain { get; set; }
-        public string DeviceAssignedUserName { get; set; }
-        public string DeviceAssignedUserSID { get; set; }
-        public string DeviceAssignedUserUsername { get; set; }
+        public string DomainName { get; set; }
+        public string ComputerName { get; set; }
 
-        public bool DeviceAssignedUserIsLocalAdmin { get; set; }
+        public string AssignedUserDomain { get; set; }
+        public string AssignedUserUsername { get; set; }
+        public string AssignedUserSID { get; set; }
+        public string AssignedUserDescription { get; set; }
 
-        public string OfflineDomainJoin { get; set; }
-        
-        public string DeviceCertificate { get; set; }
-        public List<string> DeviceCertificateRemoveExisting { get; set; }
+        public bool AssignedUserIsLocalAdmin { get; set; }
+
+        public string OfflineDomainJoinManifest { get; set; }
+
+        public CertificateStore Certificates { get; set; }
+
+        public WirelessProfileStore WirelessProfiles { get; set; }
 
-        // Actions
         public bool AllowBootstrapperUninstall { get; set; }
         public bool RequireReboot { get; set; }
 

Disco.Models/ClientServices/EnrolmentInformation/Certificate.cs

@@ -0,0 +1,19 @@
+using System;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class Certificate
+    {
+        public string Store { get; set; }
+        public string SubjectName { get; set; }
+        public string Thumbprint { get; set; }
+        public string FriendlyName { get; set; }
+        public string DnsName { get; set; }
+        public int Version { get; set; }
+        public string SignatureAlgorithm { get; set; }
+        public string Issuer { get; set; }
+        public DateTime NotAfter { get; set; }
+        public DateTime NotBefore { get; set; }
+        public bool HasPrivateKey { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/CertificateStore.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class CertificateStore
+    {
+        public List<byte[]> TrustedRootCertificates { get; set; }
+        public List<string> TrustedRootRemoveThumbprints { get; set; }
+
+        public List<byte[]> IntermediateCertificates { get; set; }
+        public List<string> IntermediateRemoveThumbprints { get; set; }
+
+        public List<byte[]> PersonalCertificates { get; set; }
+        public List<string> PersonalRemoveThumbprints { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/DeviceHardware.cs

@@ -0,0 +1,20 @@
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class DeviceHardware
+    {
+        public string SerialNumber { get; set; }
+        public string UUID { get; set; }
+
+        public string Manufacturer { get; set; }
+        public string Model { get; set; }
+        public string ModelType { get; set; }
+
+        public List<Processor> Processors { get; set; }
+        public List<PhysicalMemory> PhysicalMemory { get; set; }
+        public List<DiskDrive> DiskDrives { get; set; }
+        public List<NetworkAdapter> NetworkAdapters { get; set; }
+
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/DiskDrive.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class DiskDrive
+    {
+        public string DeviceID { get; set; }
+        public string Manufacturer { get; set; }
+        public string Model { get; set; }
+        public string MediaType { get; set; }
+        public string InterfaceType { get; set; }
+        public string SerialNumber { get; set; }
+        public string FirmwareRevision { get; set; }
+        public DateTime InstallDate { get; set; }
+        public ulong Size { get; set; }
+
+        public List<DiskDrivePartition> Partitions { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/DiskDrivePartition.cs

@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class DiskDrivePartition
+    {
+        public bool DeviceID { get; set; }
+        public bool Bootable { get; set; }
+        public bool BootPartition { get; set; }
+        public bool PrimaryParition { get; set; }
+        public ulong Size { get; set; }
+        public ulong StartingOffset { get; set; }
+
+        public List<DiskLogical> LogicalDisks { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/DiskLogical.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class DiskLogical
+    {
+
+        public string DeviceID { get; set; }
+        public string Description { get; set; }
+        public int DriveType { get; set; }
+        public int MediaType { get; set; }
+        public string FileSystem { get; set; }
+        public ulong Size { get; set; }
+        public ulong FreeSpace { get; set; }
+        public string VolumeName { get; set; }
+        public string VolumeSerialNumber { get; set; }
+        
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/NetworkAdapter.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class NetworkAdapter
+    {
+        public string DeviceID { get; set; }
+        public Guid ConnectionIdentifier { get; set; }
+        public bool IsWlanAdapter { get; set; }
+        public string Manufacturer { get; set; }
+        public string ProductName { get; set; }
+        public string AdapterType { get; set; }
+
+        public string MACAddress { get; set; }
+        public ulong Speed { get; set; }
+        public string NetConnectionID { get; set; }
+        public string NetConnectionStatus { get; set; }
+        public string WlanStatus { get; set; }
+        public bool NetEnabled { get; set; }
+        public bool IPEnabled { get; set; }
+        
+        public List<string> IPAddresses { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/PhysicalMemory.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class PhysicalMemory
+    {
+        public string Tag { get; set; }
+        public string SerialNumber { get; set; }
+        public string Manufacturer { get; set; }
+        public string PartNumber { get; set; }
+
+        public ulong Capacity { get; set; }
+        public int ClockSpeed { get; set; }
+        public int Voltage { get; set; }
+
+        public string Location { get; set; }
+
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/Processor.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class Processor
+    {
+        public string DeviceID { get; set; }
+        public string Manufacturer { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Architecture { get; set; }
+        public short Family { get; set; }
+        public int MaxClockSpeed { get; set; }
+        public int NumberOfCores { get; set; }
+        public int NumberOfLogicalProcessors { get; set; }
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/WirelessProfile.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class WirelessProfile
+    {
+
+        /// <summary>
+        /// The name of the wireless profile, typically the SSID
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The guid of the associated interface.
+        /// </summary>
+        public Guid? InterfaceGuid { get; set; }
+
+        /// <summary>
+        /// Indicates the profile is deployed via Group Policy and therefore read-only
+        /// </summary>
+        public bool? IsGroupPolicy { get; set; }
+
+        /// <summary>
+        /// Indicates the profile should be overwritten even if it already exists
+        /// </summary>
+        public bool? ForceDeployment { get; set; }
+
+        /// <summary>
+        /// The wireless profile XML definition
+        /// </summary>
+        public string ProfileXml { get; set; }
+
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/WirelessProfileStore.cs

@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class WirelessProfileStore
+    {
+
+        /// <summary>
+        /// A list of wireless profiles to add to the client device.
+        /// </summary>
+        public List<WirelessProfile> Profiles { get; set; }
+
+        /// <summary>
+        /// A list of transformations to be applied to existing XML wireless profiles found on the client device.
+        /// </summary>
+        public List<WirelessProfileTransformation> Transformations { get; set; }
+
+        /// <summary>
+        /// A list of wireless profile names to be removed from the client device.
+        /// </summary>
+        public List<string> RemoveNames { get; set; }
+
+    }
+}

Disco.Models/ClientServices/EnrolmentInformation/WirelessProfileTransformation.cs

@@ -0,0 +1,22 @@
+namespace Disco.Models.ClientServices.EnrolmentInformation
+{
+    public class WirelessProfileTransformation
+    {
+
+        /// <summary>
+        /// The name of the wireless profile related to this transformation, typically the SSID
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The regular expression to evaluate against the wireless profile XML
+        /// </summary>
+        public string RegularExpression { get; set; }
+
+        /// <summary>
+        /// The replacement string used when evaluating the regular expression
+        /// </summary>
+        public string RegularExpressionReplacement { get; set; }
+
+    }
+}

Disco.Models/ClientServices/WhoAmIResponse.cs

@@ -13,7 +13,7 @@ namespace Disco.Models.ClientServices
 
         public override string ToString()
         {
-            return string.Format("{0} ({1})", DisplayName, Username);
+            return $"{DisplayName} ({Username})";
         }
     }
 }

Disco.Models/Disco.Models.csproj

@@ -13,6 +13,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <AssemblyVersion>2.2.16272.1003</AssemblyVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -48,7 +49,20 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="BI\Job\LocationModes.cs" />
+    <Compile Include="BI\Config\OrganisationAddress.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\DiskLogical.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\DeviceHardware.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\DiskDrive.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\DiskDrivePartition.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\NetworkAdapter.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\PhysicalMemory.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\Processor.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\CertificateStore.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\WirelessProfile.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\WirelessProfileStore.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\WirelessProfileTransformation.cs" />
+    <Compile Include="Services\Jobs\LocationModes.cs" />
+    <Compile Include="ClientServices\EnrolmentInformation\Certificate.cs" />
     <Compile Include="ClientServices\Register.cs" />
     <Compile Include="ClientServices\RegisterResponse.cs" />
     <Compile Include="Repository\Attachment\AttachmentTypes.cs" />
@@ -60,12 +74,9 @@
     <Compile Include="Services\Authorization\IAuthorizationToken.cs" />
     <Compile Include="Services\Authorization\IClaimNavigatorItem.cs" />
     <Compile Include="Services\Authorization\IRoleToken.cs" />
-    <Compile Include="BI\Config\OrganisationAddress.cs" />
-    <Compile Include="BI\Device\ImportDevice.cs" />
-    <Compile Include="BI\Device\ImportDeviceSession.cs" />
     <Compile Include="Services\Documents\DocumentState.cs" />
     <Compile Include="BI\Expressions\IImageExpressionResult.cs" />
-    <Compile Include="BI\Job\Statistics\DailyOpenedClosedItem.cs" />
+    <Compile Include="Services\Jobs\Statistics\DailyOpenedClosedItem.cs" />
     <Compile Include="ClientServices\EnrolResponse.cs" />
     <Compile Include="ClientServices\MacEnrol.cs" />
     <Compile Include="ClientServices\MacEnrolResponse.cs" />
@@ -184,9 +195,7 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="BI\DocumentTemplate\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

Disco.Models/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0.0")]
-[assembly: AssemblyFileVersion("2.1.0.0")]
+[assembly: AssemblyVersion("2.2.16272.1003")]
+[assembly: AssemblyFileVersion("2.2.16272.1003")]

Disco.Models/Repository/Device/DeviceProfile.cs

@@ -61,10 +61,14 @@ namespace Disco.Models.Repository
             return string.Format("{0} ({1})", this.Name, this.ShortName);
         }
 
-        // 2012-06-21
-        // public bool AllocateCertificate { get; set; } // Renamed from 'AllocateWirelessCertificate'
-        [StringLength(64)]
-        public string CertificateProviderId { get; set; }
+        [StringLength(200)]
+        public string CertificateProviders { get; set; }
+
+        [StringLength(200)]
+        public string CertificateAuthorityProviders { get; set; }
+
+        [StringLength(200)]
+        public string WirelessProfileProviders { get; set; }
 
         public const string DefaultComputerNameTemplate = "DeviceProfile.ShortName + '-' + SerialNumber";
 

Disco.Models/Services/Jobs/LocationModes.cs

@@ -1,11 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.ComponentModel.DataAnnotations;
 
-namespace Disco.Models.BI.Job
+namespace Disco.Models.Services.Job
 {
     public enum LocationModes
     {

Disco.Models/Services/Jobs/Statistics/DailyOpenedClosedItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace Disco.Models.BI.Job.Statistics
+namespace Disco.Models.Services.Job.Statistics
 {
     public class DailyOpenedClosedItem
     {

Disco.Models/UI/Config/DeviceProfile/ConfigDeviceProfileShowModel.cs

@@ -1,17 +1,14 @@
-using System;
+using Disco.Models.BI.Config;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Disco.Models.UI.Config.DeviceProfile
 {
     public interface ConfigDeviceProfileShowModel : BaseUIModel
     {
-        Disco.Models.Repository.DeviceProfile DeviceProfile { get; set; }
-        Disco.Models.BI.Config.OrganisationAddress DefaultOrganisationAddress { get; set; }
+        Repository.DeviceProfile DeviceProfile { get; set; }
+        OrganisationAddress DefaultOrganisationAddress { get; set; }
 
-        List<Disco.Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
+        List<OrganisationAddress> OrganisationAddresses { get; set; }
 
         int DeviceCount { get; set; }
         int DeviceDecommissionedCount { get; set; }

Disco.Models/UI/Config/JobPreferences/ConfigJobPreferencesIndexModel.cs

@@ -1,9 +1,5 @@
-using Disco.Models.BI.Job;
-using System;
+using Disco.Models.Services.Job;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Disco.Models.UI.Config.JobPreferences
 {

Disco.Models/UI/Config/Organisation/ConfigOrganisationIndexModel.cs

@@ -1,8 +1,5 @@
-using System;
+using Disco.Models.BI.Config;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Disco.Models.UI.Config.Organisation
 {
@@ -10,6 +7,6 @@ namespace Disco.Models.UI.Config.Organisation
     {
         string OrganisationName { get; set; }
         bool MultiSiteMode { get; set; }
-        List<Models.BI.Config.OrganisationAddress> OrganisationAddresses { get; set; }
+        List<OrganisationAddress> OrganisationAddresses { get; set; }
     }
 }

Disco.Models/UI/Device/DeviceShowModel.cs

@@ -1,21 +1,22 @@
-using Disco.Models.Services.Jobs.JobLists;
+using Disco.Models.BI.Config;
+using Disco.Models.Services.Jobs.JobLists;
 using System.Collections.Generic;
 
 namespace Disco.Models.UI.Device
 {
     public interface DeviceShowModel : BaseUIModel
     {
-        Disco.Models.Repository.Device Device { get; set; }
+        Repository.Device Device { get; set; }
 
-        List<Disco.Models.Repository.DeviceProfile> DeviceProfiles { get; set; }
-        Disco.Models.BI.Config.OrganisationAddress DeviceProfileDefaultOrganisationAddress { get; set; }
+        List<Repository.DeviceProfile> DeviceProfiles { get; set; }
+        OrganisationAddress DeviceProfileDefaultOrganisationAddress { get; set; }
 
-        List<Disco.Models.Repository.DeviceBatch> DeviceBatches { get; set; }
+        List<Repository.DeviceBatch> DeviceBatches { get; set; }
 
         JobTableModel Jobs { get; set; }
 
-        List<Disco.Models.Repository.DeviceCertificate> Certificates { get; set; }
+        List<Repository.DeviceCertificate> Certificates { get; set; }
 
-        List<Disco.Models.Repository.DocumentTemplate> DocumentTemplates { get; set; }
+        List<Repository.DocumentTemplate> DocumentTemplates { get; set; }
     }
 }

Disco.Models/UI/Job/JobShowModel.cs

@@ -1,4 +1,4 @@
-using Disco.Models.BI.Job;
+using Disco.Models.Services.Job;
 using Disco.Models.Services.Jobs.JobLists;
 using System;
 using System.Collections.Generic;