Merge remote-tracking branch 'origin/GP-1830_ghidra1_BSim_GSON'

Author: ghidra1

Ghidra/Features/BSim/Module.manifest

@@ -1,7 +1,6 @@
 ##MODULE IP: Oxygen Icons - LGPL 3.0
 MODULE FILE LICENSE: postgresql-15.3.tar.gz Postgresql License
 MODULE FILE LICENSE: lib/postgresql-42.6.2.jar PostgresqlJDBC License
-MODULE FILE LICENSE: lib/json-simple-1.1.1.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-dbcp2-2.9.0.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-pool2-2.11.1.jar Apache License 2.0
 MODULE FILE LICENSE: lib/commons-logging-1.2.jar Apache License 2.0

Ghidra/Features/BSim/build.gradle

@@ -33,7 +33,6 @@ dependencies {
 	api project(":CodeCompare")
 
 	api "org.postgresql:postgresql:42.6.2"
-    api "com.googlecode.json-simple:json-simple:1.1.1"
     api "org.apache.commons:commons-dbcp2:2.9.0"
     api "org.apache.commons:commons-pool2:2.11.1"
     api "commons-logging:commons-logging:1.2"

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/ExecutableNameBSimFilterType.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,6 @@
 
 import java.sql.SQLException;
 
-import org.json.simple.JSONObject;
-
 import ghidra.features.bsim.query.client.IDSQLResolution;
 import ghidra.features.bsim.query.client.SQLEffects;
 import ghidra.features.bsim.query.description.ExecutableRecord;
@@ -38,7 +36,7 @@ public ExecutableNameBSimFilterType() {
 
 	@Override
 	public void gatherSQLEffect(SQLEffects effect, FilterAtom atom, IDSQLResolution resolution)
-		throws SQLException {
+			throws SQLException {
 		effect.setExeTable();
 		StringBuilder buf = new StringBuilder();
 		buf.append("exetable.name_exec = '").append(atom.value).append('\'');
@@ -47,10 +45,10 @@ public void gatherSQLEffect(SQLEffects effect, FilterAtom atom, IDSQLResolution
 
 	@Override
 	public void gatherElasticEffect(ElasticEffects effect, FilterAtom atom,
-		IDElasticResolution resolution) throws ElasticException {
+			IDElasticResolution resolution) throws ElasticException {
 		StringBuilder buffer = new StringBuilder();
 		buffer.append("\"filter\": { \"term\": { \"name_exec\": \"");
-		buffer.append(JSONObject.escape(atom.value));
+		buffer.append(ElasticDatabase.escape(atom.value));
 		buffer.append("\" } } ");
 		effect.addStandalone(this, buffer.toString());
 	}

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/NotExecutableNameBSimFilterType.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,8 +17,6 @@
 
 import java.sql.SQLException;
 
-import org.json.simple.JSONObject;
-
 import ghidra.features.bsim.query.client.IDSQLResolution;
 import ghidra.features.bsim.query.client.SQLEffects;
 import ghidra.features.bsim.query.description.ExecutableRecord;
@@ -37,7 +35,7 @@ public NotExecutableNameBSimFilterType() {
 
 	@Override
 	public void gatherSQLEffect(SQLEffects effect, FilterAtom atom, IDSQLResolution resolution)
-		throws SQLException {
+			throws SQLException {
 		effect.setExeTable();
 		StringBuilder buf = new StringBuilder();
 		buf.append("exetable.name_exec != '").append(atom.value).append('\'');
@@ -46,10 +44,10 @@ public void gatherSQLEffect(SQLEffects effect, FilterAtom atom, IDSQLResolution
 
 	@Override
 	public void gatherElasticEffect(ElasticEffects effect, FilterAtom atom,
-		IDElasticResolution resolution) throws ElasticException {
+			IDElasticResolution resolution) throws ElasticException {
 		StringBuilder buffer = new StringBuilder();
 		buffer.append("\"must_not\": { \"term\": { \"name_exec\": \"");
-		buffer.append(JSONObject.escape(atom.value));
+		buffer.append(ElasticDatabase.escape(atom.value));
 		buffer.append("\" } } ");
 		effect.addStandalone(this, buffer.toString());
 	}

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/gui/filters/PathStartsBSimFilterType.java

@@ -4,9 +4,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,7 +35,7 @@ public PathStartsBSimFilterType() {
 
 	@Override
 	public void gatherSQLEffect(SQLEffects effect, FilterAtom atom, IDSQLResolution resolution)
-		throws SQLException {
+			throws SQLException {
 		if (atom.value.length() > 0) {
 			effect.setExeTable();
 			effect.setPathTable();
@@ -47,11 +47,10 @@ public void gatherSQLEffect(SQLEffects effect, FilterAtom atom, IDSQLResolution
 
 	@Override
 	public void gatherElasticEffect(ElasticEffects effect, FilterAtom atom,
-		IDElasticResolution resolution) throws ElasticException {
-		effect.addDocValue("String path = doc['path'].value; ");
+			IDElasticResolution resolution) throws ElasticException {
+		effect.addDocValue("String path = doc['path'].size() == 0 ? null : doc['path'].value; ");
 		String argName = effect.assignArgument();
-		effect.addScriptElement(this,
-			"(path != null) && path.startsWith(params." + argName + ')');
+		effect.addScriptElement(this, "(path != null) && path.startsWith(params." + argName + ')');
 		effect.addParam(argName, atom.value);
 	}
 

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/BSimPostgresDBConnectionManager.java

@@ -284,7 +284,9 @@ private Connection connect() throws SQLException, CancelledException {
 
 			String loginError = null;
 
-			serverInfo.setUserInfo(bds);
+			if (bds.getPassword() == null) {
+				serverInfo.setUserInfo(bds);
+			}
 
 			connectionType = serverInfo.hasPassword() ? ConnectionType.SSL_Password_Authentication
 					: ConnectionType.SSL_No_Authentication;

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/client/AbstractSQLFunctionDatabase.java

@@ -186,7 +186,7 @@ protected void closing(Connection c) {
 	 * @throws SQLException if error occurs obtaining connection
 	 */
 	protected Connection initConnection() throws SQLException {
-		if (db == null) {
+		if (db == null || db.isClosed()) {
 			db = ds.getConnection();
 		}
 		return db;
@@ -435,6 +435,12 @@ protected void createDatabase(Configuration config) throws SQLException {
 		}
 	}
 
+	/**
+	 * Drop this database
+	 * @throws SQLException if a database error occured
+	 */
+	abstract protected void dropDatabase() throws SQLException;
+
 	protected void setConnectionOnTables(Connection db) {
 
 		weightTable.setConnection(db);
@@ -1201,8 +1207,8 @@ public boolean initialize() {
 			}
 			else if (msg.contains("authentication failed") ||
 				msg.contains("requires a valid client certificate")) {
-				lasterror =
-					new BSimError(ErrorCategory.Authentication, "Could not authenticate with database");
+				lasterror = new BSimError(ErrorCategory.Authentication,
+					"Could not authenticate with database");
 			}
 			else if (msg.contains("does not exist") && !msg.contains(" role ")) {
 				lasterror = new BSimError(ErrorCategory.Nodatabase, cause.getMessage());
@@ -1572,6 +1578,9 @@ else if (query instanceof QueryExeInfo q) {
 		else if (query instanceof QueryExeCount q) {
 			fdbQueryExeCount(q);
 		}
+		else if (query instanceof DropDatabase q) {
+			fdbDatabaseDrop(q);
+		}
 		else if (query instanceof CreateDatabase q) {
 			fdbDatabaseCreate(q);
 		}
@@ -1622,7 +1631,8 @@ public QueryResponseRecord query(BSimQuery<?> query) {
 
 		lasterror = null;
 		try {
-			if (!(query instanceof CreateDatabase) && !initialize()) {
+			if (!(query instanceof CreateDatabase) && !(query instanceof DropDatabase) &&
+				!initialize()) {
 				lasterror = new BSimError(ErrorCategory.Nodatabase, "The database does not exist");
 				return null;
 			}
@@ -2087,6 +2097,29 @@ private void fdbQueryChildren(QueryChildren query) throws LSHException, SQLExcep
 		}
 	}
 
+	private void fdbDatabaseDrop(DropDatabase query) throws LSHException {
+		ResponseDropDatabase response = query.getResponse();
+		if (query.databaseName == null) {
+			throw new LSHException("Missing databaseName for drop database");
+		}
+		if (!query.databaseName.equals(ds.getServerInfo().getDBName())) {
+			throw new UnsupportedOperationException("drop database name must match");
+		}
+		response.dropSuccessful = true;		// Response parameters assuming success
+		response.errorMessage = null;
+		try {
+			dropDatabase();
+		}
+		catch (SQLException e) {
+			String msg = e.getMessage();
+			if (msg.indexOf("database \"" + query.databaseName + "\" does not exist") > 0) {
+				return; // missing database
+			}
+			response.dropSuccessful = false;
+			response.errorMessage = e.getMessage();
+		}
+	}
+
 	/**
 	 * Entry point for the CreateDatabase command
 	 * @param query the query to execute

Ghidra/Features/BSim/src/main/java/ghidra/features/bsim/query/client/PostgresFunctionDatabase.java

@@ -31,6 +31,7 @@
 import ghidra.features.bsim.query.client.tables.SQLStringTable;
 import ghidra.features.bsim.query.description.*;
 import ghidra.features.bsim.query.protocol.*;
+import ghidra.util.Msg;
 
 /**
  * Defines the BSim {@link FunctionDatabase} backed by a PostgreSQL database.
@@ -200,9 +201,6 @@ protected void generateRawDatabase() throws SQLException {
 			st.executeUpdate(createdbstring);
 			postgresDs.initializeFrom(defaultDs);
 		}
-		finally {
-			defaultDs.dispose();
-		}
 	}
 
 	@Override
@@ -244,6 +242,64 @@ protected void createDatabase(Configuration config) throws SQLException {
 		}
 	}
 
+	@Override
+	protected void dropDatabase() throws SQLException {
+
+		if (getStatus() == Status.Busy || postgresDs.getActiveConnections() != 0) {
+			throw new SQLException("database in use");
+		}
+
+		BSimServerInfo serverInfo = postgresDs.getServerInfo();
+		BSimServerInfo defaultServerInfo =
+			new BSimServerInfo(DBType.postgres, serverInfo.getUserInfo(),
+				serverInfo.getServerName(), serverInfo.getPort(), DEFAULT_DATABASE_NAME);
+
+		BSimPostgresDataSource defaultDs =
+			BSimPostgresDBConnectionManager.getDataSource(defaultServerInfo);
+		if (getStatus() == Status.Ready) {
+			defaultDs.initializeFrom(postgresDs);
+		}
+
+		close(); // close this instance
+
+		try (Connection defaultDb = defaultDs.getConnection();
+				Statement defaultSt = defaultDb.createStatement()) {
+			try (ResultSet rs = defaultSt.executeQuery(
+				"SELECT 1 FROM pg_database WHERE datname='" + serverInfo.getDBName() + "'")) {
+				if (!rs.next()) {
+					return; // database does not exist
+				}
+			}
+
+			// Connect to database and examine schema
+			HashSet<String> tableNames = new HashSet<>();
+			postgresDs.initializeFrom(defaultDs);
+			try (Connection c = initConnection(); Statement st = c.createStatement()) {
+				try (ResultSet rs = st.executeQuery(
+					"SELECT table_name FROM information_schema.tables WHERE table_schema = 'public' ORDER BY table_name")) {
+					while (rs.next()) {
+						tableNames.add(rs.getString(1));
+					}
+				}
+			}
+
+			// Spot check for a few BSim table names that always exist
+			if (!tableNames.contains("keyvaluetable") || !tableNames.contains("desctable") ||
+				!tableNames.contains("weighttable")) {
+				throw new SQLException("attempted to drop non-BSim database");
+			}
+
+			postgresDs.dispose(); // disconnect before dropping database
+
+			Msg.info(this, "Dropping BSim postgresql database: " + serverInfo);
+			defaultSt.executeUpdate("DROP DATABASE \"" + serverInfo.getDBName() + '"');
+		}
+		finally {
+			// ensure 
+			postgresDs.initializeFrom(defaultDs);
+		}
+	}
+
 	/**
 	 * 
 	 * @throws SQLException if there is a problem creating or executing the query