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

Merge branch 'GP-3551_ghidra1_InternalProjectLinks'

Browse source
This commit is contained in:
ghidra1 2025-07-09 13:34:56 -04:00
commit 53552616ec
209 changed files with 10096 additions and 3050 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/android/oat/bundle/FullOatBundle.java
View file

@ -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.
@ -15,9 +15,8 @@
*/
package ghidra.file.formats.android.oat.bundle;
import java.util.*;
import java.io.IOException;
import java.util.*;
import org.apache.commons.io.FilenameUtils;
@ -30,6 +29,7 @@ import ghidra.file.formats.android.oat.OatHeader;
import ghidra.file.formats.android.vdex.*;
import ghidra.framework.model.DomainFile;
import ghidra.framework.model.DomainFolder;
import ghidra.program.database.ProgramContentHandler;
import ghidra.program.model.listing.Program;
import ghidra.util.exception.CancelledException;
import ghidra.util.task.TaskMonitor;
@ -45,8 +45,7 @@ public class FullOatBundle implements OatBundle {
private boolean isLittleEndian;
FullOatBundle(Program oatProgram, OatHeader oatHeader, TaskMonitor monitor,
MessageLog log) {
FullOatBundle(Program oatProgram, OatHeader oatHeader, TaskMonitor monitor, MessageLog log) {
this.oatProgram = oatProgram;
this.oatHeader = oatHeader;
@ -120,12 +119,11 @@ public class FullOatBundle implements OatBundle {
DomainFolder parentFolder = domainFile.getParent();
//first, look in current project for VDEX file....
if (lookInProjectFolder(HeaderType.VDEX, parentFolder,
vdexProgramName, monitor, log)) {
if (lookInProjectFolder(HeaderType.VDEX, parentFolder, vdexProgramName, monitor, log)) {
return;
}
if (lookInProjectFolder(HeaderType.VDEX, parentFolder.getParent(),
vdexProgramName, monitor, log)) {
if (lookInProjectFolder(HeaderType.VDEX, parentFolder.getParent(), vdexProgramName, monitor,
log)) {
return;
}
}
@ -140,8 +138,8 @@ public class FullOatBundle implements OatBundle {
break;
}
if (file.getName().startsWith(CLASSES) && file.getName().endsWith(DEX)) {
lookInProjectFolder(HeaderType.DEX, odexApkFolder, file.getName(),
monitor, log);
lookInProjectFolder(HeaderType.DEX, odexApkFolder, file.getName(), monitor,
log);
}
}
}
@ -153,8 +151,8 @@ public class FullOatBundle implements OatBundle {
break;
}
if (file.getName().startsWith(CLASSES) && file.getName().endsWith(DEX)) {
lookInProjectFolder(HeaderType.DEX, apkOrJarFolder, file.getName(),
monitor, log);
lookInProjectFolder(HeaderType.DEX, apkOrJarFolder, file.getName(), monitor,
log);
}
}
}
@ -166,8 +164,8 @@ public class FullOatBundle implements OatBundle {
break;
}
if (file.getName().startsWith(CDEX)) {
lookInProjectFolder(HeaderType.CDEX, appVdexFolder, file.getName(),
monitor, log);
lookInProjectFolder(HeaderType.CDEX, appVdexFolder, file.getName(), monitor,
log);
}
}
}
@ -183,12 +181,11 @@ public class FullOatBundle implements OatBundle {
DomainFolder parentFolder = domainFile.getParent();
//first, look in current project for ART file....
if (lookInProjectFolder(HeaderType.ART, parentFolder,
artProgramName, monitor, log)) {
if (lookInProjectFolder(HeaderType.ART, parentFolder, artProgramName, monitor, log)) {
return;
}
if (lookInProjectFolder(HeaderType.ART, parentFolder.getParent(),
artProgramName, monitor, log)) {
if (lookInProjectFolder(HeaderType.ART, parentFolder.getParent(), artProgramName, monitor,
log)) {
return;
}
}
@ -203,14 +200,15 @@ public class FullOatBundle implements OatBundle {
* @param log the message log
*/
private boolean lookInProjectFolder(HeaderType type, DomainFolder parentFolder,
String programName,
TaskMonitor monitor, MessageLog log) {
String programName, TaskMonitor monitor, MessageLog log) {
DomainFile child = parentFolder.getFile(programName);
if (child != null) {
DomainFile file = parentFolder.getFile(programName);
// Constrain to Program files only and not program link-files
if (file != null &&
ProgramContentHandler.PROGRAM_CONTENT_TYPE.equals(file.getContentType())) {
Program program = null;
try {
program = (Program) child.getDomainObject(this, true, true, monitor);
program = (Program) file.getDomainObject(this, true, true, monitor);
ByteProvider provider =
MemoryByteProvider.createProgramHeaderByteProvider(program, false);
return makeHeader(type, programName, provider, monitor);

37
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/generic/iOS_KextStubFixupAnalyzer.java
View file

@ -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.
@ -22,6 +22,7 @@ import ghidra.file.analyzers.FileFormatAnalyzer;
import ghidra.framework.main.AppInfo;
import ghidra.framework.model.*;
import ghidra.framework.plugintool.PluginTool;
import ghidra.program.database.ProgramContentHandler;
import ghidra.program.model.address.*;
import ghidra.program.model.data.PointerDataType;
import ghidra.program.model.lang.Processor;
@ -295,6 +296,7 @@ public class iOS_KextStubFixupAnalyzer extends FileFormatAnalyzer {
private DestinationProgramInfo recurseFolder(DomainFolder folder, Address destinationAddress,
ProgramManager programManager, TaskMonitor monitor) {
// NOTE: All folder-links and file-links are ignored
DomainFolder[] folders = folder.getFolders();
for (DomainFolder child : folders) {
if (monitor.isCancelled()) {
@ -311,30 +313,31 @@ public class iOS_KextStubFixupAnalyzer extends FileFormatAnalyzer {
if (monitor.isCancelled()) {
break;
}
DomainObject domainObject = null;
if (!file.getContentType().equals(ProgramContentHandler.PROGRAM_CONTENT_TYPE)) {
continue;
}
Program program = null;
try {
domainObject = file.getDomainObject(this, true /* upgrade */,
program = (Program) file.getDomainObject(this, true /* upgrade */,
false /* do not recover */, monitor);
if (domainObject instanceof Program) {
Program program = (Program) domainObject;
if (program.getMemory().contains(destinationAddress)) {
if (programManager != null) {
programManager.openProgram(program, ProgramManager.OPEN_VISIBLE);//once program is located, open it, so lookup is faster next time!
}
SymbolTable symbolTable = program.getSymbolTable();
Symbol symbol = symbolTable.getPrimarySymbol(destinationAddress);
String symbolName = symbol == null ? null : symbol.getName();
return new DestinationProgramInfo(program.getName(), file.getPathname(),
symbolName);
if (program.getMemory().contains(destinationAddress)) {
if (programManager != null) {
//once program is located, open it, so lookup is faster next time!
programManager.openProgram(program, ProgramManager.OPEN_VISIBLE);
}
SymbolTable symbolTable = program.getSymbolTable();
Symbol symbol = symbolTable.getPrimarySymbol(destinationAddress);
String symbolName = symbol == null ? null : symbol.getName();
return new DestinationProgramInfo(program.getName(), file.getPathname(),
symbolName);
}
}
catch (Exception e) {
Msg.warn(this, e);
}
finally {
if (domainObject != null) {
domainObject.release(this);
if (program != null) {
program.release(this);
}
}
}

5
Ghidra/Features/FileFormats/src/main/java/ghidra/file/formats/ios/prelink/GFileSystemLoadKernelTask.java
View file

@ -118,7 +118,7 @@ public class GFileSystemLoadKernelTask extends Task {
ProjectIndexService projectIndex = ProjectIndexService.getIndexFor(project);
DomainFile existingDF = projectIndex.findFirstByFSRL(file.getFSRL());
if ( existingDF != null && programManager != null ) {
if (existingDF != null && programManager != null) {
programManager.openProgram(existingDF);
return;
}
@ -138,6 +138,9 @@ public class GFileSystemLoadKernelTask extends Task {
AppInfo.getActiveProject().getProjectData().getRootFolder(),
file.getParentFile().getPath());
String fileName = ProjectDataUtils.getUniqueName(folder, program.getName());
if (fileName == null) {
throw new IOException("Unable to find unique name for " + program.getName());
}
GhidraProgramUtilities.markProgramAnalyzed(program);