Updated the SQLite platform to include encryption support of the SQLi…

…te databases
MohawkMEDIC · Jul 12, 2017 · 903a42d · 903a42d
1 parent 0b4cbb8
commit 903a42d
Show file tree

Hide file tree

Showing 33 changed files with 284 additions and 147 deletions.
diff --git a/AppletCompiler/Properties/AssemblyInfo.cs b/AppletCompiler/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("0.9.4.*")][assembly: AssemblyInformationalVersion("Chippewa")]
-[assembly: AssemblyVersion("0.9.6.*")][assembly: AssemblyInformationalVersion("Edmonton")]
+[assembly: AssemblyVersion("0.9.7.*")][assembly: AssemblyInformationalVersion("Edmonton")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/BrainBug/Properties/AssemblyInfo.cs b/BrainBug/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // 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("0.9.6.*")]
+[assembly: AssemblyVersion("0.9.7.*")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/DisconnectedClient/DcApplicationContext.cs b/DisconnectedClient/DcApplicationContext.cs
@@ -463,5 +463,17 @@ public override void Alert(string alertText)
         public override void PerformanceLog(string className, string methodName, string tagName, TimeSpan counter)
         {
         }
+
+        /// <summary>
+        /// In the OpenIZ DC setting the current context security key is the current windows user SID (since we're storing data in appdata it is 
+        /// encrypted per user SID)
+        /// </summary>
+        public override byte[] GetCurrentContextSecurityKey()
+        {
+            var sid = WindowsIdentity.GetCurrent().User;
+            byte[] retVal = new byte[sid.BinaryLength];
+            WindowsIdentity.GetCurrent().User.GetBinaryForm(retVal, 0);
+            return retVal;
+        }
     }
 }
diff --git a/DisconnectedClient/DcConfigurationManager.cs b/DisconnectedClient/DcConfigurationManager.cs
@@ -173,7 +173,11 @@ public static OpenIZConfiguration GetDefaultConfiguration()
                     typeof(MemoryQueryPersistenceService).AssemblyQualifiedName,
                     typeof(SimpleQueueFileProvider).AssemblyQualifiedName,
                     typeof(SimplePatchService).AssemblyQualifiedName,
+#if NOCRYPT
                     typeof(SQLite.Net.Platform.Generic.SQLitePlatformGeneric).AssemblyQualifiedName,
+#else
+                    typeof(SQLite.Net.Platform.SqlCipher.SQLitePlatformSqlCipher).AssemblyQualifiedName,
+#endif
                     typeof(SearchIndexService).AssemblyQualifiedName,
                     typeof(DcAppletManagerService).AssemblyQualifiedName,
                                         typeof(SQLiteReportDatasource).AssemblyQualifiedName,

diff --git a/DisconnectedClient/DisconnectedClient.csproj b/DisconnectedClient/DisconnectedClient.csproj
@@ -173,6 +173,9 @@
     <Reference Include="SQLite.Net.Platform.Generic">
       <HintPath>..\Solution Items\Net45\SQLite.Net.Platform.Generic.dll</HintPath>
     </Reference>
+    <Reference Include="SQLite.Net.Platform.SqlCipher">
+      <HintPath>..\Solution Items\Net45\SQLite.Net.Platform.SqlCipher.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.Portable">
@@ -273,12 +276,6 @@
     <Content Include="favicon.ico" />
     <Content Include="installsupp\vcredist_x86.exe" />
     <EmbeddedResource Include="lib\shim.ie.js" />
-    <Content Include="sqlite3.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="sqlite3.exe">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
@@ -287,7 +284,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'SignedRelease|x86'">
     <PreBuildEvent>
       "C:\Program Files (x86)\Mohawk College\OpenIZ\sdk\AppletCompiler.exe" --compile -s "$(SolutionDir)OpenIZMobile.Applets" -o "$(TargetDir)\org.openiz.core.pak"   --keyFile="$(SolutionDir)\..\keys\org.openiz.core.pfx" --keyPassword="$(SolutionDir)\..\keys\org.openiz.core.pass" --embedCert --optimize
+
       copy "$(TargetDir)\org.openiz.core.pak" "$(ProjectDir)\Applets\org.openiz.core.pak"
+      copy "$(SolutionDir)\Solution Items\Net45\libeay32.dll" "$(TargetDir)"
+      copy "$(SolutionDir)\Solution Items\Net45\SqlCipher.dll" "$(TargetDir)"
+      copy "$(SolutionDir)\Solution Items\Net45\SqlCipher.dll" "$(TargetDir)\sqlite3.dll"
+
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'IeSignedRelease|x86'">
@@ -300,12 +302,18 @@
     <PreBuildEvent>
       "C:\Program Files (x86)\Mohawk College\OpenIZ\sdk\AppletCompiler.exe" --compile -s "$(SolutionDir)OpenIZMobile.Applets" -o "$(TargetDir)\org.openiz.core.pak" --optimize
       copy "$(TargetDir)\org.openiz.core.pak" "$(ProjectDir)\Applets\org.openiz.core.pak"
+      copy "$(SolutionDir)\Solution Items\Net45\libeay32.dll" "$(TargetDir)"
+      copy "$(SolutionDir)\Solution Items\Net45\SqlCipher.dll" "$(TargetDir)"
+      copy "$(SolutionDir)\Solution Items\Net45\SqlCipher.dll" "$(TargetDir)\sqlite3.dll"
     </PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PreBuildEvent>
       "C:\Program Files (x86)\Mohawk College\OpenIZ\sdk\AppletCompiler.exe" --compile -s "$(SolutionDir)OpenIZMobile.Applets" -o "$(TargetDir)\org.openiz.core.pak"
       copy "$(TargetDir)\org.openiz.core.pak" "$(ProjectDir)\Applets\org.openiz.core.pak"
+      copy "$(SolutionDir)\Solution Items\Net45\libeay32.dll" "$(TargetDir)"
+      copy "$(SolutionDir)\Solution Items\Net45\SqlCipher.dll" "$(TargetDir)"
+      copy "$(SolutionDir)\Solution Items\Net45\SqlCipher.dll" "$(TargetDir)\sqlite3.dll"
     </PreBuildEvent>
   </PropertyGroup>
   <Import Project="..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets" Condition="Exists('..\packages\cef.redist.x64.3.2987.1601\build\cef.redist.x64.targets')" />