yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-03 17:59:46 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-5749_ghidra1_SARIF_improvements' into Ghidra_11.4

Browse source
This commit is contained in:
ghidra1 2025-06-05 17:28:46 -04:00
commit 4a65e9af3b
2 changed files with 53 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Features/Sarif/src/main/java/sarif/export/extlib/SarifClassesNamespaceWriter.java
View file

@ -77,10 +77,11 @@ public class SarifClassesNamespaceWriter extends AbstractExtWriter {
objects.add(getTree(sarif)); objects.add(getTree(sarif));
SymbolIterator symbols = symbolTable.getSymbols(cls); SymbolIterator symbols = symbolTable.getSymbols(cls);
if (cls.isExternal()) {
while (symbols.hasNext()) { while (symbols.hasNext()) {
Symbol sym = symbols.next(); Symbol sym = symbols.next();
if (cls.isExternal()) {
ExternalLocation loc = externalManager.getExternalLocation(sym); ExternalLocation loc = externalManager.getExternalLocation(sym);
if (loc != null) {
ExtLibraryLocation obj = new ExtLibraryLocation(loc); ExtLibraryLocation obj = new ExtLibraryLocation(loc);
SarifObject sarif2 = new SarifObject(ExternalLibSarifMgr.SUBKEY1, ExternalLibSarifMgr.KEY, getTree(obj), SarifObject sarif2 = new SarifObject(ExternalLibSarifMgr.SUBKEY1, ExternalLibSarifMgr.KEY, getTree(obj),
loc.getAddress(), loc.getAddress()); loc.getAddress(), loc.getAddress());
@ -88,6 +89,7 @@ public class SarifClassesNamespaceWriter extends AbstractExtWriter {
} }
} }
} }
}
public JsonArray getResults() { public JsonArray getResults() {
return objects; return objects;

38
Ghidra/Features/Sarif/src/main/java/sarif/managers/FunctionsSarifMgr.java
View file

@ -54,22 +54,10 @@ public class FunctionsSarifMgr extends SarifMgr {
FID_BOOKMARK_CATEGORY); FID_BOOKMARK_CATEGORY);
private DtParser dtParser; private DtParser dtParser;
private Library extenalNamespace; private Library externalNamespace;
FunctionsSarifMgr(Program program, MessageLog log) { FunctionsSarifMgr(Program program, MessageLog log) {
super(KEY, program, log); super(KEY, program, log);
int txId = program.startTransaction("SARIF FunctionMgr");
try {
SymbolTable symbolTable = program.getSymbolTable();
Symbol extLib = symbolTable.getLibrarySymbol("<EXTERNAL>");
if (extLib == null) {
extenalNamespace = symbolTable.createExternalLibrary(Library.UNKNOWN, SourceType.IMPORTED);
}
} catch (Exception e) {
log.appendException(e);
} finally {
program.endTransaction(txId, true);
}
} }
//////////////////////////// ////////////////////////////
@ -233,6 +221,24 @@ public class FunctionsSarifMgr extends SarifMgr {
return func; return func;
} }
private Library getExternalNamespace(Program program, MessageLog log) {
if (externalNamespace == null) {
int txId = program.startTransaction("SARIF FunctionMgr");
try {
SymbolTable symbolTable = program.getSymbolTable();
Symbol extLib = symbolTable.getLibrarySymbol("<EXTERNAL>");
if (extLib == null) {
externalNamespace = symbolTable.createExternalLibrary(Library.UNKNOWN, SourceType.IMPORTED);
}
} catch (Exception e) {
log.appendException(e);
} finally {
program.endTransaction(txId, true);
}
}
return externalNamespace;
}
private void setName(Address entryPoint, Function func, String name, Map<String, Object> result) { private void setName(Address entryPoint, Function func, String name, Map<String, Object> result) {
SymbolPath path = new SymbolPath(name); SymbolPath path = new SymbolPath(name);
if (name != null) { if (name != null) {
@ -248,7 +254,6 @@ public class FunctionsSarifMgr extends SarifMgr {
} }
Symbol symbol = func.getSymbol(); Symbol symbol = func.getSymbol();
if (path != null) {
try { try {
Namespace ns = NamespaceUtils.getFunctionNamespaceAt(program, path, entryPoint); Namespace ns = NamespaceUtils.getFunctionNamespaceAt(program, path, entryPoint);
if (ns == null) { if (ns == null) {
@ -264,8 +269,8 @@ public class FunctionsSarifMgr extends SarifMgr {
return; return;
} }
} }
if (path != null && path.getName().contains(Library.UNKNOWN)) { if (path.getName().contains(Library.UNKNOWN)) {
ns = extenalNamespace; ns = getExternalNamespace(program, log);
} }
if (ns.getParentNamespace() == null) { if (ns.getParentNamespace() == null) {
symbol.setName(name, getSourceType("DEFAULT")); symbol.setName(name, getSourceType("DEFAULT"));
@ -276,7 +281,6 @@ public class FunctionsSarifMgr extends SarifMgr {
// name may already be set if symbols were loaded... // name may already be set if symbols were loaded...
} }
} }
}
private String setProperties(Map<String, Object> result, Function func, Address entryPoint) private String setProperties(Map<String, Object> result, Function func, Address entryPoint)
throws InvalidInputException { throws InvalidInputException {