CreateDatabase etc. with trusted auth (DNET-284)

cincuranet · cincuranet · commit a6ad61c0bac4 · 2019-01-28T17:09:44.000+01: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
@@ -149,16 +149,59 @@ public void Dispose()
 			if (!_disposed)
 			{
 				_disposed = true;
-				Detach();
-				_connection = null;
-				_charset = null;
-				_eventManager = null;
-				_serverVersion = null;
-				_dialect = 0;
-				_handle = -1;
-				_packetSize = 0;
-				_warningMessage = null;
-				_transactionCount = 0;
+
+				if (TransactionCount > 0)
+				{
+					throw IscException.ForErrorCodeIntParam(IscCodes.isc_open_trans, TransactionCount);
+				}
+
+				try
+				{
+					CloseEventManager();
+
+					var detach = _handle != -1;
+					if (detach)
+					{
+						XdrStream.Write(IscCodes.op_detach);
+						XdrStream.Write(_handle);
+					}
+					XdrStream.Write(IscCodes.op_disconnect);
+					XdrStream.Flush();
+					if (detach)
+					{
+						ReadResponse();
+					}
+
+					CloseConnection();
+
+#warning Here
+					_xdrStream?.Dispose();
+				}
+				catch (IOException ex)
+				{
+					try
+					{
+						CloseConnection();
+					}
+					catch (IOException ex2)
+					{
+						throw IscException.ForErrorCode(IscCodes.isc_network_error, ex2);
+					}
+					throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
+				}
+				finally
+				{
+					_xdrStream = null;
+					_connection = null;
+					_charset = null;
+					_eventManager = null;
+					_serverVersion = null;
+					_dialect = 0;
+					_handle = -1;
+					_packetSize = 0;
+					_warningMessage = null;
+					_transactionCount = 0;
+				}
 			}
 		}
 
@@ -217,55 +260,7 @@ public virtual void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string da
 
 		public virtual void Detach()
 		{
-			if (TransactionCount > 0)
-			{
-				throw IscException.ForErrorCodeIntParam(IscCodes.isc_open_trans, TransactionCount);
-			}
-
-			try
-			{
-				CloseEventManager();
-
-				var detach = _handle != -1;
-				if (detach)
-				{
-					XdrStream.Write(IscCodes.op_detach);
-					XdrStream.Write(_handle);
-				}
-				XdrStream.Write(IscCodes.op_disconnect);
-				XdrStream.Flush();
-				if (detach)
-				{
-					ReadResponse();
-				}
-
-				CloseConnection();
-
-#warning Here
-				_xdrStream?.Dispose();
-
-#warning Same as in Dispose
-				_transactionCount = 0;
-				_handle = -1;
-				_dialect = 0;
-				_packetSize = 0;
-				_xdrStream = null;
-				_charset = null;
-				_connection = null;
-				_serverVersion = null;
-			}
-			catch (IOException ex)
-			{
-				try
-				{
-					CloseConnection();
-				}
-				catch (IOException ex2)
-				{
-					throw IscException.ForErrorCode(IscCodes.isc_network_error, ex2);
-				}
-				throw IscException.ForErrorCode(IscCodes.isc_network_error, ex);
-			}
+			Dispose();
 		}
 
 		protected void SafelyDetach()
@@ -313,6 +308,11 @@ protected void ProcessCreateResponse(GenericResponse response)
 			_handle = response.ObjectHandle;
 		}
 
+		public virtual void CreateDatabaseWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
+		{
+			throw new NotSupportedException("Trusted Auth isn't supported on < FB2.1.");
+		}
+
 		public virtual void DropDatabase()
 		{
 			try
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version11/GdsDatabase.cs
@@ -104,6 +104,21 @@ protected void ProcessTrustedAuthResponse(SspiHelper sspiHelper, ref IResponse r
 				response = ReadResponse();
 			}
 		}
+
+		public override void CreateDatabaseWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
+		{
+			using (var sspiHelper = new SspiHelper())
+			{
+				var authData = sspiHelper.InitializeClientSecurity();
+				SendTrustedAuthToBuffer(dpb, authData);
+				SendCreateToBuffer(dpb, database);
+				XdrStream.Flush();
+
+				var response = ReadResponse();
+				ProcessTrustedAuthResponse(sspiHelper, ref response);
+				ProcessCreateResponse((GenericResponse)response);
+			}
+		}
 		#endregion
 
 		#region Public methods
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Managed/Version13/GdsDatabase.cs
@@ -104,6 +104,11 @@ public override void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string d
 			Attach(dpb, dataSource, port, database, cryptKey);
 		}
 
+		public override void CreateDatabaseWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
+		{
+			CreateDatabase(dpb, dataSource, port, database, cryptKey);
+		}
+
 		public IResponse ProcessCryptCallbackResponseIfNeeded(IResponse response, byte[] cryptKey)
 		{
 			while (response is CryptKeyCallbackResponse cryptResponse)
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Client/Native/FesDatabase.cs
@@ -169,6 +169,11 @@ public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int p
 			ProcessStatusVector(_statusVector);
 		}
 
+		public void CreateDatabaseWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)
+		{
+			throw new NotSupportedException("Trusted Auth isn't supported on Firebird Embedded.");
+		}
+
 		public void DropDatabase()
 		{
 			ClearStatusVector();
diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/Common/IDatabase.cs
@@ -39,6 +39,7 @@ internal interface IDatabase : IDisposable
 		void Detach();
 
 		void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey);
+		void CreateDatabaseWithTrustedAuth(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
@@ -122,15 +122,29 @@ public void CreateDatabase(DatabaseParameterBuffer dpb)
 		{
 			using (var db = ClientFactory.CreateDatabase(_options))
 			{
-				db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				if (string.IsNullOrEmpty(_options.UserID) && string.IsNullOrEmpty(_options.Password))
+				{
+					db.CreateDatabaseWithTrustedAuth(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				}
+				else
+				{
+					db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				}
 			}
 		}
 
 		public void DropDatabase()
 		{
 			using (var db = ClientFactory.CreateDatabase(_options))
 			{
-				db.Attach(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				if (string.IsNullOrEmpty(_options.UserID) && string.IsNullOrEmpty(_options.Password))
+				{
+					db.AttachWithTrustedAuth(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				}
+				else
+				{
+					db.Attach(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);
+				}
 				db.DropDatabase();
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,11 @@ public override void AttachWithTrustedAuth(DatabaseParameterBuffer dpb, string d`
`104`	`104`	`Attach(dpb, dataSource, port, database, cryptKey);`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ public override void CreateDatabaseWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)`
	`108`	`+ {`
	`109`	`+ CreateDatabase(dpb, dataSource, port, database, cryptKey);`
	`110`	`+ }`
	`111`	`+`
`107`	`112`	`public IResponse ProcessCryptCallbackResponseIfNeeded(IResponse response, byte[] cryptKey)`
`108`	`113`	`{`
`109`	`114`	`while (response is CryptKeyCallbackResponse cryptResponse)`
Original file line number	Diff line number	Diff line change
`@@ -169,6 +169,11 @@ public void CreateDatabase(DatabaseParameterBuffer dpb, string dataSource, int p`
`169`	`169`	`ProcessStatusVector(_statusVector);`
`170`	`170`	`}`
`171`	`171`
	`172`	`+ public void CreateDatabaseWithTrustedAuth(DatabaseParameterBuffer dpb, string dataSource, int port, string database, byte[] cryptKey)`
	`173`	`+ {`
	`174`	`+ throw new NotSupportedException("Trusted Auth isn't supported on Firebird Embedded.");`
	`175`	`+ }`
	`176`	`+`
`172`	`177`	`public void DropDatabase()`
`173`	`178`	`{`
`174`	`179`	`ClearStatusVector();`
Original file line number	Diff line number	Diff line change
`@@ -122,15 +122,29 @@ public void CreateDatabase(DatabaseParameterBuffer dpb)`
`122`	`122`	`{`
`123`	`123`	`using (var db = ClientFactory.CreateDatabase(_options))`
`124`	`124`	`{`
`125`		`- db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
	`125`	`+ if (string.IsNullOrEmpty(_options.UserID) && string.IsNullOrEmpty(_options.Password))`
	`126`	`+ {`
	`127`	`+ db.CreateDatabaseWithTrustedAuth(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
	`128`	`+ }`
	`129`	`+ else`
	`130`	`+ {`
	`131`	`+ db.CreateDatabase(dpb, _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
	`132`	`+ }`
`126`	`133`	`}`
`127`	`134`	`}`
`128`	`135`
`129`	`136`	`public void DropDatabase()`
`130`	`137`	`{`
`131`	`138`	`using (var db = ClientFactory.CreateDatabase(_options))`
`132`	`139`	`{`
`133`		`- db.Attach(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
	`140`	`+ if (string.IsNullOrEmpty(_options.UserID) && string.IsNullOrEmpty(_options.Password))`
	`141`	`+ {`
	`142`	`+ db.AttachWithTrustedAuth(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
	`143`	`+ }`
	`144`	`+ else`
	`145`	`+ {`
	`146`	`+ db.Attach(BuildDpb(db, _options), _options.DataSource, _options.Port, _options.Database, _options.CryptKey);`
	`147`	`+ }`
`134`	`148`	`db.DropDatabase();`
`135`	`149`	`}`
`136`	`150`	`}`