Support for creating encrypted databases (DNET-841).

cincuranet · cincuranet · commit ab0ecd1fa246 · 2018-08-20T10:56:55.000+02:00
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsDatabase.cs
@@ -276,7 +276,7 @@ protected void SafelyDetach()
 
 		#region Database Methods
 
-		public virtual void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database)
+		public virtual void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
 		{
 			try
 			{
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version10/GdsServiceManager.cs
@@ -55,7 +55,7 @@ public GdsDatabase Database
 		public GdsServiceManager(GdsConnection connection)
 		{
 			_connection = connection;
-			_database = new GdsDatabase(_connection);
+			_database = CreateDatabase(_connection);
 		}
 
 		#endregion
@@ -178,6 +178,11 @@ public virtual void Query(ServiceParameterBuffer spb, int requestLength, byte[]
 			}
 		}
 
+		protected virtual GdsDatabase CreateDatabase(GdsConnection connection)
+		{
+			return new GdsDatabase(connection);
+		}
+
 		#endregion
 	}
 }
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsServiceManager.cs
@@ -15,12 +15,19 @@
 
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
+using FirebirdSql.Data.Common;
+
 namespace FirebirdSql.Data.Client.Managed.Version11
 {
 	internal class GdsServiceManager : Version10.GdsServiceManager
 	{
 		public GdsServiceManager(GdsConnection connection)
 			: base(connection)
 		{ }
+
+		protected override Version10.GdsDatabase CreateDatabase(GdsConnection connection)
+		{
+			return new GdsDatabase(connection);
+		}
 	}
 }
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version12/GdsServiceManager.cs
@@ -15,12 +15,19 @@
 
 //$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)
 
+using FirebirdSql.Data.Common;
+
 namespace FirebirdSql.Data.Client.Managed.Version12
 {
 	internal class GdsServiceManager : Version11.GdsServiceManager
 	{
 		public GdsServiceManager(GdsConnection connection)
 			: base(connection)
 		{ }
+
+		protected override Version10.GdsDatabase CreateDatabase(GdsConnection connection)
+		{
+			return new GdsDatabase(connection);
+		}
 	}
 }
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs
@@ -30,7 +30,6 @@ namespace FirebirdSql.Data.Client.Managed.Version13
 {
 	internal class GdsDatabase : Version12.GdsDatabase
 	{
-#warning Refactoring op_attach and op_create.
 		public GdsDatabase(GdsConnection connection)
 			: base(connection)
 		{ }
@@ -42,14 +41,7 @@ public override void Attach(DatabaseParameterBuffer dpb, string dataSource, int
 				SendAttachToBuffer(dpb, database);
 				XdrStream.Flush();
 				var response = ReadResponse();
-#warning Unification
-				while (response is CryptKeyCallbackReponse cryptResponse)
-				{
-					XdrStream.Write(IscCodes.op_crypt_key_callback);
-					XdrStream.WriteBuffer(cryptKey);
-					XdrStream.Flush();
-					response = ReadResponse();
-				}
+				response = ProcessCryptCallbackResponseIfNeeded(response, cryptKey);
 				ProcessAttachResponse(response as GenericResponse);
 			}
 			catch (IscException)
@@ -79,6 +71,38 @@ protected override void SendAttachToBuffer(DatabaseParameterBuffer dpb, string d
 			XdrStream.WriteBuffer(dpb.ToArray());
 		}
 
+		public override void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
+		{
+			try
+			{
+				SendCreateToBuffer(dpb, database);
+				XdrStream.Flush();
+
+				try
+				{
+					var response = ReadResponse();
+					response = ProcessCryptCallbackResponseIfNeeded(response, cryptKey);
+					ProcessCreateResponse(response as GenericResponse);
+
+					Detach();
+				}
+				catch (IscException)
+				{
+					try
+					{
+						CloseConnection();
+					}
+					catch
+					{ }
+					throw;
+				}
+			}
+			catch (IOException ex)
+			{
+				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
+			}
+		}
+
 		protected override void SendCreateToBuffer(DatabaseParameterBuffer dpb, string database)
 		{
 			XdrStream.Write(IscCodes.op_create);
@@ -97,6 +121,18 @@ public override void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string d
 			Attach(dpb, dataSource, port, database, cryptKey);
 		}
 
+		public IResponse ProcessCryptCallbackResponseIfNeeded(IResponse response, byte[] cryptKey)
+		{
+			while (response is CryptKeyCallbackReponse cryptResponse)
+			{
+				XdrStream.Write(IscCodes.op_crypt_key_callback);
+				XdrStream.WriteBuffer(cryptKey);
+				XdrStream.Flush();
+				response = ReadResponse();
+			}
+			return response;
+		}
+
 		#region Override Statement Creation Methods
 
 		public override StatementBase CreateStatement()
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsServiceManager.cs
@@ -33,13 +33,7 @@ public override void Attach(ServiceParameterBuffer spb, string dataSource, int p
 				SendAttachToBuffer(spb, service);
 				Database.XdrStream.Flush();
 				var response = Database.ReadResponse();
-				while (response is CryptKeyCallbackReponse cryptResponse)
-				{
-					Database.XdrStream.Write(IscCodes.op_crypt_key_callback);
-					Database.XdrStream.WriteBuffer(cryptKey);
-					Database.XdrStream.Flush();
-					response = Database.ReadResponse();
-				}
+				response = (Database as GdsDatabase).ProcessCryptCallbackResponseIfNeeded(response, cryptKey);
 				ProcessAttachResponse(response as GenericResponse);
 			}
 			catch (IOException ex)
@@ -48,5 +42,10 @@ public override void Attach(ServiceParameterBuffer spb, string dataSource, int p
 				throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);
 			}
 		}
+
+		protected override Version10.GdsDatabase CreateDatabase(GdsConnection connection)
+		{
+			return new GdsDatabase(connection);
+		}
 	}
 }
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs
@@ -149,8 +149,10 @@ public void Dispose()
 
 		#region Database Methods
 
-		public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database)
+		public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
 		{
+			CheckCryptKeyForSupport(cryptKey);
+
 			var databaseBuffer = Encoding2.Default.GetBytes(database);
 
 			ClearStatusVector();
@@ -205,9 +207,7 @@ public void CancelEvents(RemoteEvent events)
 
 		public void Attach(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
 		{
-			// ICryptKeyCallbackImpl would have to be passed from C# for 'cryptKey' passing
-			if (cryptKey?.Length > 0)
-				throw new NotSupportedException("Passing Encryption Key isn't, yet, supported on Firebird Embedded.");
+			CheckCryptKeyForSupport(cryptKey);
 
 			var databaseBuffer = Encoding2.Default.GetBytes(database);
 
@@ -359,5 +359,16 @@ private void DatabaseInfo(byte[] items, byte[] buffer, int bufferLength)
 		}
 
 		#endregion
+
+		#region Internal Static Methods
+
+		internal static void CheckCryptKeyForSupport(byte[] cryptKey)
+		{
+			// ICryptKeyCallbackImpl would have to be passed from C# for 'cryptKey' passing
+			if (cryptKey?.Length > 0)
+				throw new NotSupportedException("Passing Encryption Key isn't, yet, supported on Firebird Embedded.");
+		}
+
+		#endregion
 	}
 }
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesServiceManager.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesServiceManager.cs
@@ -62,9 +62,7 @@ public FesServiceManager(string dllName, Charset charset)
 
 		public void Attach(ServiceParameterBuffer spb, string dataSource, int port, string service, byte[] cryptKey)
 		{
-			// ICryptKeyCallbackImpl would have to be passed from C# for 'cryptKey' passing
-			if (cryptKey?.Length > 0)
-				throw new NotSupportedException("Passing Encryption Key isn't, yet, supported on Firebird Embedded.");
+			FesDatabase.CheckCryptKeyForSupport(cryptKey);
 
 			ClearStatusVector();
 
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs
@@ -38,7 +38,7 @@ internal interface IDatabase : IDisposable
 		void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey);
 		void Detach();
 
-		void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database);
+		void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey);
 		void DropDatabase();
 
 		TransactionBase BeginTransaction(TransactionParameterBuffer tpb);
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs
@@ -123,7 +123,7 @@ public void Dispose()
 		public void CreateDatabase(DatabaseParameterBuffer dpb)
 		{
 			var db = ClientFactory.CreateDatabase(_options);
-			db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database);
+			db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
 		}
 
 		public void DropDatabase()

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ protected void SafelyDetach()`
`276`	`276`
`277`	`277`	`#region Database Methods`
`278`	`278`
`279`		`- public virtual void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database)`
	`279`	`+ public virtual void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)`
`280`	`280`	`{`
`281`	`281`	`try`
`282`	`282`	`{`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public GdsDatabase Database`
`55`	`55`	`public GdsServiceManager(GdsConnection connection)`
`56`	`56`	`{`
`57`	`57`	`_connection = connection;`
`58`		`- _database = new GdsDatabase(_connection);`
	`58`	`+ _database = CreateDatabase(_connection);`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`#endregion`
`@@ -178,6 +178,11 @@ public virtual void Query(ServiceParameterBuffer spb, int requestLength, byte[]`
`178`	`178`	`}`
`179`	`179`	`}`
`180`	`180`
	`181`	`+ protected virtual GdsDatabase CreateDatabase(GdsConnection connection)`
	`182`	`+ {`
	`183`	`+ return new GdsDatabase(connection);`
	`184`	`+ }`
	`185`	`+`
`181`	`186`	`#endregion`
`182`	`187`	`}`
`183`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,12 +15,19 @@`
`15`	`15`
`16`	`16`	`//$Authors = Carlos Guzman Alvarez, Jiri Cincura (jiri@cincura.net)`
`17`	`17`
	`18`	`+using FirebirdSql.Data.Common;`
	`19`	`+`
`18`	`20`	`namespace FirebirdSql.Data.Client.Managed.Version11`
`19`	`21`	`{`
`20`	`22`	`internal class GdsServiceManager : Version10.GdsServiceManager`
`21`	`23`	`{`
`22`	`24`	`public GdsServiceManager(GdsConnection connection)`
`23`	`25`	`: base(connection)`
`24`	`26`	`{ }`
	`27`	`+`
	`28`	`+ protected override Version10.GdsDatabase CreateDatabase(GdsConnection connection)`
	`29`	`+ {`
	`30`	`+ return new GdsDatabase(connection);`
	`31`	`+ }`
`25`	`32`	`}`
`26`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,13 +33,7 @@ public override void Attach(ServiceParameterBuffer spb, string dataSource, int p`
`33`	`33`	`SendAttachToBuffer(spb, service);`
`34`	`34`	`Database.XdrStream.Flush();`
`35`	`35`	`var response = Database.ReadResponse();`
`36`		`- while (response is CryptKeyCallbackReponse cryptResponse)`
`37`		`- {`
`38`		`- Database.XdrStream.Write(IscCodes.op_crypt_key_callback);`
`39`		`- Database.XdrStream.WriteBuffer(cryptKey);`
`40`		`- Database.XdrStream.Flush();`
`41`		`- response = Database.ReadResponse();`
`42`		`- }`
	`36`	`+ response = (Database as GdsDatabase).ProcessCryptCallbackResponseIfNeeded(response, cryptKey);`
`43`	`37`	`ProcessAttachResponse(response as GenericResponse);`
`44`	`38`	`}`
`45`	`39`	`catch (IOException ex)`
`@@ -48,5 +42,10 @@ public override void Attach(ServiceParameterBuffer spb, string dataSource, int p`
`48`	`42`	`throw IscException.ForErrorCode(IscCodes.isc_net_write_err, ex);`
`49`	`43`	`}`
`50`	`44`	`}`
	`45`	`+`
	`46`	`+ protected override Version10.GdsDatabase CreateDatabase(GdsConnection connection)`
	`47`	`+ {`
	`48`	`+ return new GdsDatabase(connection);`
	`49`	`+ }`
`51`	`50`	`}`
`52`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ public FesServiceManager(string dllName, Charset charset)`
`62`	`62`
`63`	`63`	`public void Attach(ServiceParameterBuffer spb, string dataSource, int port, string service, byte[] cryptKey)`
`64`	`64`	`{`
`65`		`- // ICryptKeyCallbackImpl would have to be passed from C# for 'cryptKey' passing`
`66`		`- if (cryptKey?.Length > 0)`
`67`		`- throw new NotSupportedException("Passing Encryption Key isn't, yet, supported on Firebird Embedded.");`
	`65`	`+ FesDatabase.CheckCryptKeyForSupport(cryptKey);`
`68`	`66`
`69`	`67`	`ClearStatusVector();`
`70`	`68`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ public void Dispose()`
`123`	`123`	`public void CreateDatabase(DatabaseParameterBuffer dpb)`
`124`	`124`	`{`
`125`	`125`	`var db = ClientFactory.CreateDatabase(_options);`
`126`		`- db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database);`
	`126`	`+ db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`public void DropDatabase()`