Changed naming of checks from SecurityCheck to DeviceCheck

Security/Security.Platform.Android/AndroidSecurityCheckFactory.cs → Security/Security.Platform.Android/AndroidDeviceCheckFactory.cs

@@ -7,16 +7,16 @@ namespace AeroGear.Mobile.Security
     /// <summary>
     /// Factory for Android security checks.
     /// </summary>
-    internal class AndroidSecurityCheckFactory : ISecurityCheckFactory
+    internal class AndroidDeviceCheckFactory : IDeviceCheckFactory
     {
-        public static readonly AndroidSecurityCheckFactory INSTANCE = new AndroidSecurityCheckFactory();
+        public static readonly AndroidDeviceCheckFactory INSTANCE = new AndroidDeviceCheckFactory();
 
         private readonly Context context;
 
         /// <summary>
-        /// Initializes a new instance of the <see cref="T:AeroGear.Mobile.Security.AndroidSecurityCheckFactory"/> class.
+        /// Initializes a new instance of the <see cref="T:AeroGear.Mobile.Security.AndroidDeviceCheckFactory"/> class.
         /// </summary>
-        public AndroidSecurityCheckFactory(Context ctx = null)
+        public AndroidDeviceCheckFactory(Context ctx = null)
         {
             this.context = ctx != null ? ctx.ApplicationContext : Android.App.Application.Context;
         }
@@ -25,17 +25,17 @@ public AndroidSecurityCheckFactory(Context ctx = null)
         /// Returns an initialized instance of the check identified by the passed in pseudo enumeration.
         /// </summary>
         /// <returns>The initialized instance of the check.</returns>
-        /// <param name="type">Type of the check to be instantiated. This must be an instance of <see cref="T:AeroGear.Mobile.Security.SecurityChecks"/></param>
-        public ISecurityCheck create(ISecurityCheckType type)
+        /// <param name="type">Type of the check to be instantiated. This must be an instance of <see cref="T:AeroGear.Mobile.Security.DeviceChecks"/></param>
+        public IDeviceCheck create(IDeviceCheckType type)
         {
-            SecurityChecks checkType = type as SecurityChecks;
+            DeviceChecks checkType = type as DeviceChecks;
 
             if (checkType == null) 
             {
-                throw new Exception("Passed in security check type is not supported");
+                throw new Exception("Passed in device check type is not supported");
             }
 
-            return Activator.CreateInstance(checkType.CheckType, this.context) as ISecurityCheck;
+            return Activator.CreateInstance(checkType.CheckType, this.context) as IDeviceCheck;
         }
 
         /// <summary>
@@ -44,12 +44,12 @@ public ISecurityCheck create(ISecurityCheckType type)
         /// </summary>
         /// <returns>The initialized instance of the check.</returns>
         /// <param name="typeName">The name of the check to be instantiated.</param>
-        public ISecurityCheck create(string typeName)
+        public IDeviceCheck create(string typeName)
         {
-            ISecurityCheckType securityCheckType = SecurityChecks.GetSecurityCheck(typeName);
+            IDeviceCheckType securityCheckType = DeviceChecks.GetDeviceCheck(typeName);
             if (securityCheckType == null)
             {
-                throw new Exception(String.Format("No security check with name {0} is known", typeName));
+                throw new Exception(String.Format("No device check with name {0} is known", typeName));
             }
 
             return create(securityCheckType);

Security/Security.Platform.Android/Checks/BackupDisallowedCheck.cs → Security/Security.Platform.Android/Checks/BackupAllowedCheck.cs

@@ -7,22 +7,22 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// Check to determine whether the allowBackup flag is enabled for the application.
     /// </summary>
-    public class BackupDisallowedCheck : AbstractSecurityCheck
+    public class BackupAllowedCheck : AbstractDeviceCheck
     {
         protected override string Name => "Backup Flag Check";
 
         private readonly Context context;
 
-        public BackupDisallowedCheck(Context ctx)
+        public BackupAllowedCheck(Context ctx)
         {
             this.context = ctx;
         }
 
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
             PackageInfo packageInfo = context.PackageManager.GetPackageInfo(context.PackageName, 0);
-            bool disabled = (packageInfo.ApplicationInfo.Flags & ApplicationInfoFlags.AllowBackup) == 0;
-            return new SecurityCheckResult(this, disabled);
+            bool enabled = (packageInfo.ApplicationInfo.Flags & ApplicationInfoFlags.AllowBackup) != 0;
+            return new DeviceCheckResult(this, enabled);
         }
     }
 }

Security/Security.Platform.Android/Checks/NoDebuggerCheck.cs → Security/Security.Platform.Android/Checks/DebuggerEnabledCheck.cs

@@ -7,20 +7,20 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// A check for whether a debugger is attached to the current application.
     /// </summary>
-    public class NoDebuggerCheck : AbstractSecurityCheck
+    public class DebuggerEnabledCheck : AbstractDeviceCheck
     {
         protected override string Name => "Debugger Check";
 
         private readonly Context context;
 
-        public NoDebuggerCheck(Context ctx)
+        public DebuggerEnabledCheck(Context ctx)
         {
             this.context = ctx;
         }
 
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
-            return new SecurityCheckResult(this, !(Debug.IsDebuggerConnected || System.Diagnostics.Debugger.IsAttached));
+            return new DeviceCheckResult(this, (Debug.IsDebuggerConnected || System.Diagnostics.Debugger.IsAttached));
         }
     }
 }

Security/Security.Platform.Android/Checks/DeveloperModeDisabledCheck.cs → Security/Security.Platform.Android/Checks/DeveloperModeEnabledCheck.cs

@@ -7,23 +7,23 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// Security check that detects if developer mode is enabled in the device.
     /// </summary>
-    public class DeveloperModeDisabledCheck : AbstractSecurityCheck
+    public class DeveloperModeEnabledCheck : AbstractDeviceCheck
     {
         protected override string Name => "Developer Mode Check";
 
         private readonly Context context;
 
-        public DeveloperModeDisabledCheck(Context ctx)
+        public DeveloperModeEnabledCheck(Context ctx)
         {
             this.context = ctx;
         }
 
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
             bool devModeEnabled = Settings.Global.GetInt(
                 context.ContentResolver,
                 Settings.Global.DevelopmentSettingsEnabled, 0) != 0;
-            return new SecurityCheckResult(this, !devModeEnabled);
+            return new DeviceCheckResult(this, devModeEnabled);
         }
     }
 }

Security/Security.Platform.Android/Checks/NotInEmulatorCheck.cs → Security/Security.Platform.Android/Checks/EmulatorCheck.cs

@@ -7,26 +7,26 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// A check for whether the device the application is running on an emulator.
     /// </summary>
-    public class NotInEmulatorCheck : AbstractSecurityCheck
+    public class EmulatorCheck : AbstractDeviceCheck
     {
         protected override string Name => "Emulator Check";
 
         private readonly Context context;
 
-        public NotInEmulatorCheck(Context ctx)
+        public EmulatorCheck(Context ctx)
         {
             this.context = ctx;
         }
 
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
             if (Build.Fingerprint != null)
             {
                 if (Build.Fingerprint.Contains("vbox") ||
                     Build.Fingerprint.Contains("generic"))
-                    return new SecurityCheckResult(this, false);
+                    return new DeviceCheckResult(this, true);
             }
-            return new SecurityCheckResult(this, true);
+            return new DeviceCheckResult(this, false);
         }
     }
 }

Security/Security.Platform.Android/Checks/EncryptionCheck.cs → Security/Security.Platform.Android/Checks/EncryptionEnabledCheck.cs

@@ -7,24 +7,24 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// Detects whether a devices filesystem is encrypted.
     /// </summary>
-    public class EncryptionCheck : AbstractSecurityCheck
+    public class EncryptionEnabledCheck : AbstractDeviceCheck
     {
         protected override string Name => "Encryption Check";
 
         private readonly Context context;
 
-        public EncryptionCheck(Context ctx)
+        public EncryptionEnabledCheck(Context ctx)
         {
             this.context = ctx;
         }
 
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
             DevicePolicyManager policyManager = (DevicePolicyManager)context
                 .GetSystemService(Context.DevicePolicyService);
             bool enabled = policyManager != null && policyManager
                 .StorageEncryptionStatus == EncryptionStatus.Active;
-            return new SecurityCheckResult(this, enabled);
+            return new DeviceCheckResult(this, enabled);
         }
     }
 }

Security/Security.Platform.Android/Checks/NonRootedCheck.cs → Security/Security.Platform.Android/Checks/RootEnabledCheck.cs

@@ -9,13 +9,13 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// A check for whether the device the application is running on is rooted.
     /// </summary>
-    public class NonRootedCheck : AbstractSecurityCheck
+    public class RootEnabledCheck : AbstractDeviceCheck
     {
         protected override string Name => "Rooted Check";
 
         private readonly Context context;
 
-        public NonRootedCheck(Context ctx)
+        public RootEnabledCheck(Context ctx)
         {
             this.context = ctx;
         }
@@ -24,10 +24,10 @@ public NonRootedCheck(Context ctx)
         /// Solution found at https://stackoverflow.com/a/8097801.
         /// </summary>
         /// <returns>The check.</returns>
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
             bool rooted = CheckForTestKeys() || CheckForSuBinary() || CheckSuExists();
-            return new SecurityCheckResult(this, !rooted);
+            return new DeviceCheckResult(this, rooted);
         }
 
         /// <summary>

Security/Security.Platform.Android/Checks/ScreenLockCheck.cs → Security/Security.Platform.Android/Checks/ScreenLockEnabledCheck.cs

@@ -7,21 +7,21 @@ namespace AeroGear.Mobile.Security.Checks
     /// <summary>
     /// A check for whether the device the application is running on has a screen lock.
     /// </summary>
-    public class ScreenLockCheck : AbstractSecurityCheck
+    public class ScreenLockEnabledCheck : AbstractDeviceCheck
     {
         protected override string Name => "Screen Lock Check";
 
         private readonly Context context;
 
-        public ScreenLockCheck(Context ctx)
+        public ScreenLockEnabledCheck(Context ctx)
         {
             this.context = ctx;
         }
 
-        public override SecurityCheckResult Check()
+        public override DeviceCheckResult Check()
         {
             KeyguardManager manager = (KeyguardManager)context.GetSystemService(Context.KeyguardService);
-            return new SecurityCheckResult(this, manager.IsDeviceSecure);
+            return new DeviceCheckResult(this, manager.IsDeviceSecure);
         }
     }
 }

Security/Security.Platform.Android/DeviceChecks.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Collections.Generic;
+using AeroGear.Mobile.Core.Utils;
+using AeroGear.Mobile.Security.Checks;
+
+namespace AeroGear.Mobile.Security
+{
+    /// <summary>
+    /// This class enums all the provided security checks.
+    /// 
+    /// To get an instance of the check, use the following code:
+    /// <code>
+    /// <![CDATA[
+    /// var deviceChek = ServiceFinder.Resolve<IDeviceCheckFactory>().create(DeviceChecks.NOT_ROOTED);
+    /// ]]>
+    /// </code>
+    /// </summary>
+    public class DeviceChecks : IDeviceCheckType
+    {
+        private static Dictionary<string, DeviceChecks> typesByName = new Dictionary<string, DeviceChecks>();
+
+        public static readonly DeviceChecks ROOT_ENABLED = new DeviceChecks(typeof(RootEnabledCheck));
+        public static readonly DeviceChecks DEVELOPER_MODE_ENABLED = new DeviceChecks(typeof(DeveloperModeEnabledCheck));
+        public static readonly DeviceChecks IS_EMULATOR = new DeviceChecks(typeof(EmulatorCheck));
+        public static readonly DeviceChecks SCREEN_LOCK_ENABLED = new DeviceChecks(typeof(ScreenLockEnabledCheck));
+        public static readonly DeviceChecks BACKUP_ALLOWED = new DeviceChecks(typeof(BackupAllowedCheck));
+        public static readonly DeviceChecks ENCRYPTION_ENABLED = new DeviceChecks(typeof(EncryptionEnabledCheck));
+        public static readonly DeviceChecks DEBUGGER_ENABLED = new DeviceChecks(typeof(DebuggerEnabledCheck));
+
+        // add others checks here
+        // i.e. 
+        // public static readonly DeviceChecks NO_DEBUGGER = new DeviceChecks(typeof(NoDebuggerCheck));
+        // this way the user will be able to do an enum like selection:
+        // DeviceChecks.NOT_JAILBROKEN
+
+        internal readonly Type CheckType;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="T:AeroGear.Mobile.Security.DeviceChecks"/> class.
+        /// Private so that it can't be instantiated externally: useful to emulate an enum.
+        /// </summary>
+        /// <param name="checkType">The class type of the check represented by this instance.</param>
+        private DeviceChecks(Type checkType, string friendlyName = null)
+        {
+            if (!ServiceFinder.IsRegistered<IDeviceCheckFactory>())
+            {
+                ServiceFinder.RegisterInstance<IDeviceCheckFactory>(AndroidDeviceCheckFactory.INSTANCE);
+            }
+
+            this.CheckType = checkType;
+            typesByName[friendlyName ?? checkType.Name] = this;
+        }
+
+        /// <summary>
+        /// Returns an the DeviceChecks instance identified by the passed in name.
+        /// </summary>
+        /// <returns>The DeviceChecks instance identified by the passed in name or <code>null</code> if not found.</returns>
+        /// <param name="name">Name.</param>
+        public static DeviceChecks GetDeviceCheck(string name)
+        {
+            if (typesByName.ContainsKey(name))
+            {
+                return typesByName[name];
+            }
+            return null;
+        }
+
+        /// <summary>
+        /// Returns all the checks.
+        /// </summary>
+        /// <returns>All the checks.</returns>
+        public static ICollection<DeviceChecks> GetAllChecks()
+        {
+            return typesByName.Values;
+        }
+    }
+}