Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-24 13:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
ghidra1 2024-11-13 15:46:14 -05:00
commit fed00570ac
6 changed files with 85 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Ghidra/Configurations/Public_Release/build.gradle
View File

@ -20,3 +20,9 @@ apply from: "$rootProject.projectDir/gradle/javaTestProject.gradle"
apply from: "$rootProject.projectDir/gradle/helpProject.gradle" apply from: "$rootProject.projectDir/gradle/helpProject.gradle"
apply plugin: 'eclipse' apply plugin: 'eclipse'
eclipse.project.name = 'Z Public Release' eclipse.project.name = 'Z Public Release'
rootProject.assembleDistribution {
from ("${this.projectDir}/src/main/resources/UserAgreement.html") {
into "docs"
}
}

1
Ghidra/Configurations/Public_Release/certification.manifest
View File

@ -3,7 +3,6 @@ Module.manifest||GHIDRA||||END|
README.md||GHIDRA||||END| README.md||GHIDRA||||END|
data/PDB_SYMBOL_SERVER_URLS.pdburl||GHIDRA||||END| data/PDB_SYMBOL_SERVER_URLS.pdburl||GHIDRA||||END|
src/global/docs/ChangeHistory.html||GHIDRA||||END| src/global/docs/ChangeHistory.html||GHIDRA||||END|
src/global/docs/UserAgreement.html||GHIDRA||||END|
src/global/docs/WhatsNew.md||GHIDRA||||END| src/global/docs/WhatsNew.md||GHIDRA||||END|
src/main/resources/UserAgreement.html||GHIDRA||||END| src/main/resources/UserAgreement.html||GHIDRA||||END|
src/main/resources/defaultTools/CodeBrowser.tool||GHIDRA||||END| src/main/resources/defaultTools/CodeBrowser.tool||GHIDRA||||END|

23
Ghidra/Configurations/Public_Release/src/global/docs/UserAgreement.html
View File

@ -1,23 +0,0 @@
<HTML>
<HEAD>
<TITLE>Ghidra User Agreement</TITLE>
</HEAD>
<FONT SIZE="5">
Licensed under the Apache License, Version 2.0 (the "License"); 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. See the License for the
specific language governing permissions and limitations under the License.
<BR>
<BR>
<B>As a software reverse engineering (SRE) framework, Ghidra is designed solely to facilitate
lawful SRE activities. You should always ensure that any SRE activities in which you engage are
permissible as computer software may be protected under governing law (e.g., copyright) or under an
applicable licensing agreement. In making Ghidra available for public use, the National Security
Agency does not condone or encourage any improper usage of Ghidra. Consistent with the Apache 2.0
license under which Ghidra has been made available, you are solely responsible for determining the
appropriateness of using or redistributing Ghidra.</B>
</FONT>
</HTML>

3
Ghidra/Configurations/Public_Release/src/main/resources/UserAgreement.html
View File

@ -1,4 +1,7 @@
<HTML> <HTML>
<HEAD>
<TITLE>Ghidra User Agreement</TITLE>
</HEAD>
<FONT SIZE="5"> <FONT SIZE="5">

102
Ghidra/Features/Base/src/main/java/ghidra/app/plugin/core/misc/MyProgramChangesDisplayPlugin.java
View File

@ -102,9 +102,16 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
private int serverVersion = -1; private int serverVersion = -1;
private int localVersion = -1; private int localVersion = -1;
private boolean programChangedLocally; // currentProgram object changed; affects currentMyChangeMarks
private boolean programChangedRemotely; private boolean currentProgramChanged;
private boolean programSaved;
// domain file updated on server; affects currentOtherChangeMarks
private boolean domainFileChangedRemotely;
// domain file updated locally; affects currentChangesSinceCheckoutMarks
private boolean domainFileChangedLocally;
// flag to force update of currentConflictChangeMarks
private boolean updateConflicts; private boolean updateConflicts;
public MyProgramChangesDisplayPlugin(PluginTool tool) { public MyProgramChangesDisplayPlugin(PluginTool tool) {
@ -181,9 +188,9 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
serverVersion = -1; serverVersion = -1;
localVersion = -1; localVersion = -1;
programChangedLocally = false; currentProgramChanged = false;
programChangedRemotely = false; domainFileChangedRemotely = false;
programSaved = false; domainFileChangedLocally = false;
program.removeTransactionListener(transactionListener); program.removeTransactionListener(transactionListener);
program.removeListener(this); program.removeListener(this);
disposeMarkerSets(program); disposeMarkerSets(program);
@ -191,9 +198,9 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
private void intializeChangeMarkers() { private void intializeChangeMarkers() {
// set all the triggers for updating markers when initializing // set all the triggers for updating markers when initializing
programChangedLocally = true; currentProgramChanged = true;
programChangedRemotely = true; domainFileChangedRemotely = true;
programSaved = true; domainFileChangedLocally = true;
updateConflicts = true; updateConflicts = true;
updateChangeMarkers(); updateChangeMarkers();
} }
@ -273,24 +280,25 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
ProgramChangeSet changeSet = currentProgram.getChanges(); ProgramChangeSet changeSet = currentProgram.getChanges();
if (programChangedLocally) { if (currentProgramChanged) {
currentMyChangeMarks currentMyChangeMarks
.setAddressSetCollection(changeSet.getAddressSetCollectionSinceLastSave()); .setAddressSetCollection(changeSet.getAddressSetCollectionSinceLastSave());
} }
if (isTrackingServerChanges()) { if (isTrackingServerChanges()) {
if (programSaved || programChangedRemotely) { if (domainFileChangedLocally) {
currentChangesSinceCheckoutMarks currentChangesSinceCheckoutMarks
.setAddressSetCollection(changeSet.getAddressSetCollectionSinceCheckout()); .setAddressSetCollection(changeSet.getAddressSetCollectionSinceCheckout());
} }
if (programChangedRemotely) { if (domainFileChangedRemotely) {
currentOtherChangeMarks currentOtherChangeMarks
.setAddressSetCollection(new SingleAddressSetCollection(otherChangeSet)); .setAddressSetCollection(new SingleAddressSetCollection(otherChangeSet));
} }
// only update conflict markers when server changeSet changes or we end a transaction // Update conflict markers when forced by server version change,
if (programChangedRemotely || updateConflicts) { // local version change (merge may have occured) or a transaction has ended
if (updateConflicts) {
AddressSet intersect = changeSet.getAddressSetCollectionSinceCheckout() AddressSet intersect = changeSet.getAddressSetCollectionSinceCheckout()
.getCombinedAddressSet() .getCombinedAddressSet()
.intersect(otherChangeSet); .intersect(otherChangeSet);
@ -299,9 +307,9 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
} }
} }
programChangedLocally = false; currentProgramChanged = false;
programChangedRemotely = false; domainFileChangedRemotely = false;
programSaved = false; domainFileChangedLocally = false;
updateConflicts = false; updateConflicts = false;
} }
@ -310,30 +318,43 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
* checkout and launch update thread if necessary. * checkout and launch update thread if necessary.
*/ */
private void updateForDomainFileChanged() { private void updateForDomainFileChanged() {
DomainFile df = currentProgram.getDomainFile(); DomainFile df = currentProgram.getDomainFile();
if (!df.isCheckedOut()) {
// Only currentMyChangeMarks are maintained using domain object change listener
// when file is not checked-out
return;
}
int latestServerVersion = df.getLatestVersion(); int latestServerVersion = df.getLatestVersion();
int latestLocalVersion = df.getVersion(); int latestLocalVersion = df.getVersion();
// if the server version changes, schedule thread to get server changeSet
// which will trigger an marker update for both the other and conflict marker sets. boolean localVersionChanged = localVersion != latestLocalVersion;
if (df.isCheckedOut() && serverVersion != latestServerVersion) { boolean serverVersionChanged = serverVersion != latestServerVersion;
serverVersion = latestServerVersion; if (!localVersionChanged && !serverVersionChanged) {
localVersion = latestLocalVersion; return; // No update to change bars
if (serverVersion == localVersion) {
otherChangeSet = new AddressSet();
programChangedRemotely = true;
updateManager.update();
}
else {
scheduleUpdatesFromServer(currentProgram);
}
} }
// else just the local version changed, update conflict sets.
else if (latestLocalVersion != localVersion) { localVersion = latestLocalVersion;
localVersion = latestLocalVersion; serverVersion = latestServerVersion;
updateConflicts = true;
updateManager.update(); domainFileChangedLocally |= localVersionChanged;
domainFileChangedRemotely |= serverVersionChanged;
updateConflicts = true;
if (localVersion == serverVersion) {
// When server and local versions match otherChangeSet is empty
otherChangeSet = new AddressSet();
domainFileChangedRemotely = true;
} }
else if (serverVersionChanged) {
// Use UpdateChangeSetJob to compute the otherChangeSet
// GUI update deferred to UpdateChangeSetJob
scheduleUpdatesFromServer(currentProgram);
return;
}
updateManager.update();
} }
private void scheduleUpdatesFromServer(Program p) { private void scheduleUpdatesFromServer(Program p) {
@ -350,9 +371,9 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
@Override @Override
public void domainObjectChanged(DomainObjectChangedEvent ev) { public void domainObjectChanged(DomainObjectChangedEvent ev) {
programChangedLocally = true; currentProgramChanged = true;
if (ev.contains(DomainObjectEvent.SAVED)) { if (ev.contains(DomainObjectEvent.SAVED)) {
programSaved = true; domainFileChangedLocally = true;
} }
updateManager.update(); updateManager.update();
@ -428,6 +449,10 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
@Override @Override
public void run(TaskMonitor monitor) throws CancelledException { public void run(TaskMonitor monitor) throws CancelledException {
if (localVersion == serverVersion) {
return; // skip update if versions now match
}
monitor.checkCancelled(); // plugin was shut down while we were scheduled monitor.checkCancelled(); // plugin was shut down while we were scheduled
ProgramChangeSet changes = null; ProgramChangeSet changes = null;
@ -456,7 +481,8 @@ public class MyProgramChangesDisplayPlugin extends ProgramPlugin implements Doma
} }
otherChangeSet = remoteChanges; otherChangeSet = remoteChanges;
programChangedRemotely = true; domainFileChangedRemotely = true;
updateConflicts = true;
updateManager.update(); updateManager.update();
} }
} }

10
Ghidra/Framework/Project/src/main/java/ghidra/framework/data/GhidraFileData.java
View File

@ -89,6 +89,7 @@ public class GhidraFileData {
private Icon disabledIcon; private Icon disabledIcon;
private AtomicBoolean busy = new AtomicBoolean(); private AtomicBoolean busy = new AtomicBoolean();
private boolean mergeInProgress = false;
// TODO: Many of the old methods assumed that the state was up-to-date due to // TODO: Many of the old methods assumed that the state was up-to-date due to
// refreshing ... we are relying on non-refreshed data to be dropped from cache map and no // refreshing ... we are relying on non-refreshed data to be dropped from cache map and no
@ -196,6 +197,9 @@ public class GhidraFileData {
} }
private void statusChanged(boolean fileIDset) throws IOException { private void statusChanged(boolean fileIDset) throws IOException {
if (mergeInProgress) {
return;
}
icon = null; icon = null;
disabledIcon = null; disabledIcon = null;
fileIDset |= refresh(); fileIDset |= refresh();
@ -1099,6 +1103,7 @@ public class GhidraFileData {
} }
DomainObjectAdapterDB inUseDomainObj = null; DomainObjectAdapterDB inUseDomainObj = null;
mergeInProgress = true;
projectData.mergeStarted(); projectData.mergeStarted();
try { try {
inUseDomainObj = getAndLockInUseDomainObjectForMergeUpdate("checkin"); inUseDomainObj = getAndLockInUseDomainObjectForMergeUpdate("checkin");
@ -1195,6 +1200,7 @@ public class GhidraFileData {
finally { finally {
unlockDomainObject(inUseDomainObj); unlockDomainObject(inUseDomainObj);
busy.set(false); busy.set(false);
mergeInProgress = false;
projectData.mergeEnded(); projectData.mergeEnded();
parent.deleteLocalFolderIfEmpty(); parent.deleteLocalFolderIfEmpty();
parent.fileChanged(name); parent.fileChanged(name);
@ -1430,6 +1436,7 @@ public class GhidraFileData {
} }
DomainObjectAdapterDB inUseDomainObj = null; DomainObjectAdapterDB inUseDomainObj = null;
mergeInProgress = true;
projectData.mergeStarted(); projectData.mergeStarted();
try { try {
ContentHandler<?> contentHandler = getContentHandler(); ContentHandler<?> contentHandler = getContentHandler();
@ -1556,6 +1563,7 @@ public class GhidraFileData {
finally { finally {
unlockDomainObject(inUseDomainObj); unlockDomainObject(inUseDomainObj);
busy.set(false); busy.set(false);
mergeInProgress = false;
projectData.mergeEnded(); projectData.mergeEnded();
parent.deleteLocalFolderIfEmpty(); parent.deleteLocalFolderIfEmpty();
parent.fileChanged(name); parent.fileChanged(name);
@ -1914,6 +1922,7 @@ public class GhidraFileData {
FolderItem tmpItem = null; FolderItem tmpItem = null;
DomainObjectAdapterDB inUseDomainObj = null; DomainObjectAdapterDB inUseDomainObj = null;
mergeInProgress = true;
projectData.mergeStarted(); projectData.mergeStarted();
try { try {
inUseDomainObj = getAndLockInUseDomainObjectForMergeUpdate("merge"); inUseDomainObj = getAndLockInUseDomainObjectForMergeUpdate("merge");
@ -2011,6 +2020,7 @@ public class GhidraFileData {
finally { finally {
unlockDomainObject(inUseDomainObj); unlockDomainObject(inUseDomainObj);
busy.set(false); busy.set(false);
mergeInProgress = false;
try { try {
if (tmpItem != null) { if (tmpItem != null) {
try { try {