GP-4145 improve External Symbol Resolver analyzer handling of binaries

The analyzer wasn't handling external library binaries that
needed to be updated because the Ghidra version changed, and
wasn't logging any error messages or other useful diagnostic info.

Author: dev747368

Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/analysis/ExternalSymbolResolverAnalyzer.java

@@ -15,21 +15,16 @@
  */
 package ghidra.app.plugin.core.analysis;
 
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
 import ghidra.app.services.*;
 import ghidra.app.util.importer.MessageLog;
-import ghidra.app.util.opinion.*;
-import ghidra.framework.model.*;
+import ghidra.app.util.opinion.ElfLoader;
+import ghidra.app.util.opinion.MachoLoader;
 import ghidra.framework.options.Options;
 import ghidra.program.model.address.AddressSetView;
-import ghidra.program.model.listing.Library;
 import ghidra.program.model.listing.Program;
 import ghidra.program.util.ExternalSymbolResolver;
+import ghidra.util.Msg;
 import ghidra.util.exception.CancelledException;
-import ghidra.util.exception.VersionException;
 import ghidra.util.task.TaskMonitor;
 
 /**
@@ -61,7 +56,7 @@ public boolean canAnalyze(Program program) {
 		if (program.getDomainFile().getParent() == null) {
 			return false;
 		}
-		
+
 		Options options = program.getOptions(Program.PROGRAM_INFO);
 		String format = options.getString("Executable Format", null);
 		return ElfLoader.ELF_NAME.equals(format) || MachoLoader.MACH_O_NAME.equals(format);
@@ -71,65 +66,16 @@ public boolean canAnalyze(Program program) {
 	public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log)
 			throws CancelledException {
 
-		Object consumer = new Object();
-		log = new MessageLog(); // For now, we don't want the analysis log spammed
-		ProjectData projectData = program.getDomainFile().getParent().getProjectData();
-		List<Loaded<Program>> loadedPrograms = new ArrayList<>();
-
-		// Add program to list
-		loadedPrograms.add(new Loaded<>(program, program.getName(),
-			program.getDomainFile().getParent().getPathname()));
-
-		// Add external libraries to list
-		for (Library extLibrary : ExternalSymbolResolver.getLibrarySearchList(program)) {
-			monitor.checkCancelled();
-			String libPath = extLibrary.getAssociatedProgramPath();
-			if (libPath == null) {
-				continue;
-			}
-
-			DomainFile libDomainFile = projectData.getFile(libPath);
-			if (libDomainFile == null) {
-				log.appendMsg("Referenced external program not found: " + libPath);
-				continue;
-			}
-
-			try {
-				DomainObject libDomainObject =
-					libDomainFile.getDomainObject(consumer, false, false, monitor);
-				if (libDomainObject instanceof Program p) {
-					loadedPrograms.add(new Loaded<>(p, libDomainFile.getName(),
-						libDomainFile.getParent().getPathname()));
-				}
-				else {
-					libDomainObject.release(consumer);
-					log.appendMsg("Referenced external program is not a program: " + libPath);
-				}
+		try (ExternalSymbolResolver esr = new ExternalSymbolResolver(
+			program.getDomainFile().getParent().getProjectData(), monitor)) {
+			esr.addProgramToFixup(program);
+			esr.fixUnresolvedExternalSymbols();
+			esr.logInfo(s -> Msg.info(this, s), false);
+			if (esr.hasProblemLibraries()) {
+				// causes a popup message at end of analysis session
+				esr.logInfo(log::appendMsg, true);
 			}
-			catch (IOException e) {
-				log.appendMsg("Failed to open library dependency project file: " +
-					libDomainFile.getPathname());
-			}
-			catch (VersionException e) {
-				log.appendMsg(
-					"Referenced external program requires updgrade, unable to consider symbols: " +
-						libPath);
-			}
-		}
-
-		// Resolve symbols
-		try {
-			ExternalSymbolResolver.fixUnresolvedExternalSymbols(loadedPrograms, false, log,
-				monitor);
 			return true;
 		}
-		catch (IOException e) {
-			return false;
-		}
-		finally {
-			for (int i = 1; i < loadedPrograms.size(); i++) {
-				loadedPrograms.get(i).release(consumer);
-			}
-		}
 	}
 }

Ghidra/Features/Base/src/main/java/ghidra/app/util/opinion/ElfLoader.java

@@ -158,8 +158,16 @@ protected void postLoadProgramFixups(List<Loaded<Program>> loadedPrograms, Proje
 			throws CancelledException, IOException {
 		super.postLoadProgramFixups(loadedPrograms, project, options, messageLog, monitor);
 
-		ExternalSymbolResolver.fixUnresolvedExternalSymbols(loadedPrograms, true, messageLog,
-			monitor);
+		try (ExternalSymbolResolver esr =
+			new ExternalSymbolResolver(project.getProjectData(), monitor)) {
+			for (Loaded<Program> loadedProgram : loadedPrograms) {
+				esr.addProgramToFixup(
+					loadedProgram.getProjectFolderPath() + loadedProgram.getName(),
+					loadedProgram.getDomainObject());
+			}
+			esr.fixUnresolvedExternalSymbols();
+			esr.logInfo(messageLog::appendMsg, true);
+		}
 	}
 
 	@Override