From bef9e117e2c448c7061c98be3fc37fa81dc81f3c Mon Sep 17 00:00:00 2001 From: Kelly Kelly Date: Thu, 25 Mar 2021 17:40:05 -0400 Subject: [PATCH 1/6] Fixed content panel and osAccount --- .../osaccount/OsAccountDataPanel.java | 32 +++++++++++++++- .../osaccount/OsAccountViewer.java | 37 ++++++++++--------- .../recentactivity/ChromeCacheExtractor.java | 8 +++- .../autopsy/recentactivity/Extract.java | 6 ++- .../recentactivity/RAOsAccountCache.java | 7 ++-- 5 files changed, 66 insertions(+), 24 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java index a1077e3e82..2a78256565 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java @@ -82,6 +82,24 @@ public class OsAccountDataPanel extends JPanel { * @param account OsAccount to display, if null is passed the panel will * appear blank. */ +// void setOsAccount(OsAccount account) { + void setOsAccountId(Long osAccountId) { + removeAll(); + revalidate(); + + if (osAccountId != null) { + setLayout(new BorderLayout()); + add(new JLabel("Loading OsAccount Data..."), BorderLayout.NORTH); + + if (dataFetcher != null && !dataFetcher.isDone()) { + dataFetcher.cancel(true); + } + + dataFetcher = new PanelDataFetcher(osAccountId); + dataFetcher.execute(); + } + } + void setOsAccount(OsAccount account) { removeAll(); revalidate(); @@ -319,15 +337,22 @@ public class OsAccountDataPanel extends JPanel { */ private class PanelDataFetcher extends SwingWorker { - private final OsAccount account; + private final Long accountId; + private OsAccount account; /** * Construct a new worker for the given account. * * @param account */ + PanelDataFetcher(Long accountId) { + this.accountId = accountId; + this.account = null; + } + PanelDataFetcher(OsAccount account) { this.account = account; + this.accountId = null; } @Override @@ -335,6 +360,11 @@ public class OsAccountDataPanel extends JPanel { Map> hostMap = new HashMap<>(); Map instanceMap = new HashMap<>(); OsAccountManager osAccountManager = Case.getCurrentCase().getSleuthkitCase().getOsAccountManager(); + + if(account == null) { + account = osAccountManager.getOsAccount(accountId); + } + List hosts = osAccountManager.getHosts(account); List attributeList = account.getOsAccountAttributes(); diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java index a56e4de8c3..dd43d1f531 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountViewer.java @@ -53,26 +53,29 @@ public class OsAccountViewer extends javax.swing.JPanel implements DataContentVi @Override public void setNode(Node node) { - OsAccount osAccount = null; + Long osAccountId = null; try { - osAccount = node.getLookup().lookup(OsAccount.class); - if (osAccount == null) { - Optional optional; - AbstractFile file = node.getLookup().lookup(AbstractFile.class); - if (file != null) { - optional = file.getOsAccount(); - if (optional.isPresent()) { - osAccount = optional.get(); - } + OsAccount osAccount = node.getLookup().lookup(OsAccount.class); + if (osAccount != null) { + dataPanel.setOsAccount(osAccount); + return; + } + + Optional optional; + AbstractFile file = node.getLookup().lookup(AbstractFile.class); + if (file != null) { + optional = file.getOsAccountObjectId(); + if (optional.isPresent()) { + osAccountId = optional.get(); } } - if (osAccount == null) { + if (osAccountId == null) { DataArtifact dataArtifact = node.getLookup().lookup(DataArtifact.class); if (dataArtifact != null) { - Optional optional = dataArtifact.getOsAccount(); + optional = dataArtifact.getOsAccountObjectId(); if (optional.isPresent()) { - osAccount = optional.get(); + osAccountId = optional.get(); } } @@ -81,8 +84,8 @@ public class OsAccountViewer extends javax.swing.JPanel implements DataContentVi logger.log(Level.SEVERE, String.format("Failed to get OsAccount for node %s", node.getDisplayName()), ex); } - if (osAccount != null) { - dataPanel.setOsAccount(osAccount); + if (osAccountId != null) { + dataPanel.setOsAccountId(osAccountId); } } @@ -125,8 +128,8 @@ public class OsAccountViewer extends javax.swing.JPanel implements DataContentVi try { return osAccount != null - || (file != null && file.getOsAccount().isPresent()) - || (dataArtifact != null && dataArtifact.getOsAccount().isPresent()); + || (file != null && file.getOsAccountObjectId().isPresent()) + || (dataArtifact != null && dataArtifact.getOsAccountObjectId().isPresent()); } catch (TskCoreException ex) { logger.log(Level.SEVERE, String.format("Failed to determine if node %s is Supported for OsAccountViewer", node.getDisplayName()), ex); return false; diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java index 8b13eda7d1..ce60d94d7a 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java @@ -538,8 +538,12 @@ final class ChromeCacheExtractor { webAttr.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_PATH_ID, moduleName, cachedItemFile.getId())); - Optional optional = cacheEntryFile.getOsAccount(); - BlackboardArtifact webCacheArtifact = cacheEntryFile.newDataArtifact(new BlackboardArtifact.Type(ARTIFACT_TYPE.TSK_WEB_CACHE), webAttr, optional.isPresent() ? optional.get() : null); + Optional optional = cacheEntryFile.getOsAccountObjectId(); + OsAccount account = null; + if(optional.isPresent()) { + account = currentCase.getSleuthkitCase().getOsAccountManager().getOsAccount(optional.get()); + } + BlackboardArtifact webCacheArtifact = cacheEntryFile.newDataArtifact(new BlackboardArtifact.Type(ARTIFACT_TYPE.TSK_WEB_CACHE), webAttr, account); artifactsAdded.add(webCacheArtifact); // Create a TSK_ASSOCIATED_OBJECT on the f_XXX or derived file file back to the CACHE entry diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java index 97c17b58dc..d7b4bb20a2 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java @@ -533,7 +533,11 @@ abstract class Extract { Optional getOsAccount(Content content) throws TskCoreException { if(content instanceof AbstractFile) { if(osAccountCache == null) { - return ((AbstractFile)content).getOsAccount(); + Optional accountId = ((AbstractFile)content).getOsAccountObjectId(); + if(accountId.isPresent()) { + return Optional.ofNullable(tskCase.getOsAccountManager().getOsAccount(accountId.get())); + } + return Optional.empty(); } return osAccountCache.getOsAccount(((AbstractFile)content)); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java index f5208807af..54a34196ed 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java @@ -24,6 +24,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; +import org.sleuthkit.autopsy.casemodule.Case; import org.sleuthkit.datamodel.AbstractFile; import org.sleuthkit.datamodel.BlackboardAttribute; import org.sleuthkit.datamodel.Host; @@ -71,18 +72,18 @@ final class RAOsAccountCache { * @throws TskCoreException */ Optional getOsAccount(AbstractFile file) throws TskCoreException { - Optional optional = file.getOsAccount(); + Optional optional = file.getOsAccountObjectId(); if (!optional.isPresent()) { return getAccountForPath(file.getParentPath()); } - OsAccount osAccount = optional.get(); + OsAccount osAccount = Case.getCurrentCase().getSleuthkitCase().getOsAccountManager().getOsAccount(optional.get()); if (osAccount.getName().equals("S-1-5-32-544")) { return getAccountForPath(file.getParentPath()); } - return optional; + return Optional.ofNullable(osAccount); } /** From f78e59e22d08f4fb998179c4be404af74f7e7c0a Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 29 Mar 2021 11:33:00 -0400 Subject: [PATCH 2/6] getId for Host,Person,Realm changed --- .../casemodule/AddImageWizardSelectHostVisual.java | 6 +++--- .../autopsy/casemodule/events/HostsEvent.java | 2 +- .../autopsy/casemodule/events/OsAccountEvent.java | 2 +- .../autopsy/casemodule/events/PersonsEvent.java | 2 +- .../contentviewers/osaccount/OsAccountDataPanel.java | 2 +- .../sleuthkit/autopsy/datamodel/HostDataSources.java | 6 +++--- .../sleuthkit/autopsy/datamodel/HostGrouping.java | 6 +++--- .../org/sleuthkit/autopsy/datamodel/HostNode.java | 4 ++-- .../sleuthkit/autopsy/datamodel/PersonGrouping.java | 6 +++--- .../autopsy/datamodel/PersonGroupingNode.java | 4 ++-- .../autopsy/datamodel/hosts/ManageHostsDialog.java | 12 ++++++------ .../autopsy/recentactivity/RAOsAccountCache.java | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardSelectHostVisual.java b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardSelectHostVisual.java index 9197b2fb42..4ab37d01b5 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardSelectHostVisual.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/AddImageWizardSelectHostVisual.java @@ -79,7 +79,7 @@ class AddImageWizardSelectHostVisual extends javax.swing.JPanel { @Override public int hashCode() { int hash = 7; - hash = 41 * hash + Objects.hashCode(this.host == null ? 0 : this.host.getId()); + hash = 41 * hash + Objects.hashCode(this.host == null ? 0 : this.host.getHostId()); return hash; } @@ -96,8 +96,8 @@ class AddImageWizardSelectHostVisual extends javax.swing.JPanel { } final HostListItem other = (HostListItem) obj; if (!Objects.equals( - this.host == null ? 0 : this.host.getId(), - other.host == null ? 0 : other.host.getId())) { + this.host == null ? 0 : this.host.getHostId(), + other.host == null ? 0 : other.host.getHostId())) { return false; } diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/HostsEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/HostsEvent.java index 1ba225f4a2..f37a159125 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/events/HostsEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/HostsEvent.java @@ -42,7 +42,7 @@ public class HostsEvent extends TskDataModelChangeEvent { private static List getIds(List hosts) { return getSafeList(hosts).stream() .filter(h -> h != null) - .map(h -> h.getId()).collect(Collectors.toList()); + .map(h -> h.getHostId()).collect(Collectors.toList()); } /** diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java index 22b0622ba8..d34da7822d 100755 --- a/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java @@ -56,7 +56,7 @@ class OsAccountEvent extends TskDataModelChangeEvent { @Override protected List getDataModelObjects(SleuthkitCase caseDb, List ids) throws TskCoreException { Long id = ids.get(0); - OsAccount account = caseDb.getOsAccountManager().getOsAccount(id); + OsAccount account = caseDb.getOsAccountManager().getOsAccountByObjectId(id); List accounts = new ArrayList<>(); accounts.add(account); return accounts; diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/PersonsEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/PersonsEvent.java index ef74585b7f..e3f584d58a 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/events/PersonsEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/PersonsEvent.java @@ -42,7 +42,7 @@ public class PersonsEvent extends TskDataModelChangeEvent { private static List getIds(List persons) { return getSafeList(persons).stream() .filter(h -> h != null) - .map(h -> h.getId()).collect(Collectors.toList()); + .map(h -> h.getPersonId()).collect(Collectors.toList()); } /** diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java index a1077e3e82..28d4ec3a24 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java @@ -362,7 +362,7 @@ public class OsAccountDataPanel extends JPanel { // Add attribute lists to the hostMap for (Host host : hosts) { - List atList = idMap.get(host.getId()); + List atList = idMap.get(host.getHostId()); if (atList != null) { hostMap.put(host, atList); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/HostDataSources.java b/Core/src/org/sleuthkit/autopsy/datamodel/HostDataSources.java index 37dadc840e..9451e401da 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/HostDataSources.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/HostDataSources.java @@ -51,7 +51,7 @@ public class HostDataSources implements AutopsyVisitableItem, Comparable h != null && h.getId() == hostId) + .filter(h -> h != null && h.getHostId() == hostId) .findFirst() .ifPresent((newHost) -> { setName(newHost.getName()); @@ -242,7 +242,7 @@ public class HostNode extends DisplayableItemNode { super(children, host == null ? Lookups.fixed(displayName) : Lookups.fixed(host, displayName)); - hostId = host == null ? null : host.getId(); + hostId = host == null ? null : host.getHostId(); Case.addEventTypeSubscriber(EnumSet.of(Case.Events.HOSTS_CHANGED), WeakListeners.propertyChange(hostChangePcl, this)); super.setName(displayName); diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/PersonGrouping.java b/Core/src/org/sleuthkit/autopsy/datamodel/PersonGrouping.java index d606d288f1..1e65a06271 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/PersonGrouping.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/PersonGrouping.java @@ -52,7 +52,7 @@ public class PersonGrouping implements AutopsyVisitableItem, Comparable p != null && p.getId() == personId) + .filter(p -> p != null && p.getPersonId() == personId) .findFirst() .ifPresent((newPerson) -> { setName(newPerson.getName()); @@ -191,7 +191,7 @@ public class PersonGroupingNode extends DisplayableItemNode { super.setDisplayName(displayName); this.setIconBaseWithExtension(ICON_PATH); this.person = person; - this.personId = person == null ? null : person.getId(); + this.personId = person == null ? null : person.getPersonId(); Case.addEventTypeSubscriber(EnumSet.of(Case.Events.PERSONS_CHANGED), WeakListeners.propertyChange(personChangePcl, this)); } diff --git a/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java b/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java index 6d27cd53a1..7d4d521b51 100644 --- a/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java +++ b/Core/src/org/sleuthkit/autopsy/datamodel/hosts/ManageHostsDialog.java @@ -89,7 +89,7 @@ public class ManageHostsDialog extends javax.swing.JDialog { @Override public int hashCode() { int hash = 5; - hash = 89 * hash + Objects.hashCode(this.host == null ? 0 : this.host.getId()); + hash = 89 * hash + Objects.hashCode(this.host == null ? 0 : this.host.getHostId()); return hash; } @@ -109,7 +109,7 @@ public class ManageHostsDialog extends javax.swing.JDialog { return this.host == null && other.getHost() == null; } - return this.host.getId() == other.getHost().getId(); + return this.host.getHostId() == other.getHost().getHostId(); } } @@ -167,7 +167,7 @@ public class ManageHostsDialog extends javax.swing.JDialog { Long selectedId = null; try { Host newHost = Case.getCurrentCaseThrows().getSleuthkitCase().getHostManager().createHost(newHostName); - selectedId = newHost == null ? null : newHost.getId(); + selectedId = newHost == null ? null : newHost.getHostId(); } catch (NoCurrentCaseException | TskCoreException e) { logger.log(Level.WARNING, String.format("Unable to add new host '%s' at this time.", newHostName), e); } @@ -215,7 +215,7 @@ public class ManageHostsDialog extends javax.swing.JDialog { continue; } - if (host.getId() == selectedId) { + if (host.getHostId() == selectedId) { hostList.setSelectedIndex(i); return; } @@ -238,11 +238,11 @@ public class ManageHostsDialog extends javax.swing.JDialog { try { Case.getCurrentCaseThrows().getSleuthkitCase().getHostManager().updateHost(selectedHost); } catch (NoCurrentCaseException | TskCoreException e) { - logger.log(Level.WARNING, String.format("Unable to update host '%s' with id: %d at this time.", selectedHost.getName(), selectedHost.getId()), e); + logger.log(Level.WARNING, String.format("Unable to update host '%s' with id: %d at this time.", selectedHost.getName(), selectedHost.getHostId()), e); } HostListItem selectedItem = hostList.getSelectedValue(); - Long selectedId = selectedItem == null || selectedItem.getHost() == null ? null : selectedItem.getHost().getId(); + Long selectedId = selectedItem == null || selectedItem.getHost() == null ? null : selectedItem.getHost().getHostId(); refresh(); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java index f5208807af..8550f6d412 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java @@ -120,7 +120,7 @@ final class RAOsAccountCache { for (OsAccountAttribute attribute : attributeList) { if (attribute.getHostId().isPresent() - && attribute.getHostId().get().equals(host.getId()) + && attribute.getHostId().get().equals(host.getHostId()) && attribute.getAttributeType().equals(homeDir)) { accountCache.put(attribute.getValueString(), account); } From 2a6908486942bec8dfa00fbbf2d2fe3f6ebfda64 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 29 Mar 2021 13:04:25 -0400 Subject: [PATCH 3/6] getOsAccountbyObjectid changes --- .../org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java index d34da7822d..e08b4a406e 100755 --- a/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java @@ -56,7 +56,7 @@ class OsAccountEvent extends TskDataModelChangeEvent { @Override protected List getDataModelObjects(SleuthkitCase caseDb, List ids) throws TskCoreException { Long id = ids.get(0); - OsAccount account = caseDb.getOsAccountManager().getOsAccountByObjectId(id); + OsAccount account = caseDb.getOsAccountManager().getOsAccountbyObjectid(id); List accounts = new ArrayList<>(); accounts.add(account); return accounts; From 66a8d1634b1b4f65f9d31d20ad0497e21daa3a84 Mon Sep 17 00:00:00 2001 From: Greg DiCristofaro Date: Mon, 29 Mar 2021 15:14:02 -0400 Subject: [PATCH 4/6] getOsAccountByObjectId changes --- .../org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java b/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java index e08b4a406e..d34da7822d 100755 --- a/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/events/OsAccountEvent.java @@ -56,7 +56,7 @@ class OsAccountEvent extends TskDataModelChangeEvent { @Override protected List getDataModelObjects(SleuthkitCase caseDb, List ids) throws TskCoreException { Long id = ids.get(0); - OsAccount account = caseDb.getOsAccountManager().getOsAccountbyObjectid(id); + OsAccount account = caseDb.getOsAccountManager().getOsAccountByObjectId(id); List accounts = new ArrayList<>(); accounts.add(account); return accounts; From 11ddee1c7232eb8a6127d2c014f8a21ad7719cdc Mon Sep 17 00:00:00 2001 From: William Schaefer Date: Mon, 29 Mar 2021 17:30:09 -0400 Subject: [PATCH 5/6] Change getAccounts calls to getOsAccounts so Autopsy builds --- .../org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java | 2 +- .../org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java index 72b8e0d38c..8e6ad2df8e 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRecycleBin.java @@ -340,7 +340,7 @@ final class ExtractRecycleBin extends Extract { private Map makeUserNameMap(Content dataSource) throws TskCoreException { Map userNameMap = new HashMap<>(); - for(OsAccount account: tskCase.getOsAccountManager().getAccounts(((DataSource)dataSource).getHost())) { + for(OsAccount account: tskCase.getOsAccountManager().getOsAccounts(((DataSource)dataSource).getHost())) { Optional userName = account.getLoginName(); userNameMap.put(account.getName(), userName.isPresent() ? userName.get() : ""); } diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java index 348dc72ae4..1699042b52 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java @@ -1716,7 +1716,7 @@ class ExtractRegistry extends Extract { private Map makeUserNameMap(Content dataSource) throws TskCoreException { Map map = new HashMap<>(); - for(OsAccount account: tskCase.getOsAccountManager().getAccounts(((DataSource)dataSource).getHost())) { + for(OsAccount account: tskCase.getOsAccountManager().getOsAccounts(((DataSource)dataSource).getHost())) { Optional userName = account.getLoginName(); map.put(account.getName(), userName.isPresent() ? userName.get() : ""); } From f77a646a83f89e246a47cd78c83295dad0823d2e Mon Sep 17 00:00:00 2001 From: apriestman Date: Tue, 30 Mar 2021 09:40:03 -0400 Subject: [PATCH 6/6] Update name of getOsAccountByObjectId --- .../autopsy/contentviewers/osaccount/OsAccountDataPanel.java | 2 +- .../sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java | 2 +- .../src/org/sleuthkit/autopsy/recentactivity/Extract.java | 2 +- .../org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java index dcdb1e20d1..79b22d81cb 100755 --- a/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java +++ b/Core/src/org/sleuthkit/autopsy/contentviewers/osaccount/OsAccountDataPanel.java @@ -362,7 +362,7 @@ public class OsAccountDataPanel extends JPanel { OsAccountManager osAccountManager = Case.getCurrentCase().getSleuthkitCase().getOsAccountManager(); if(account == null) { - account = osAccountManager.getOsAccount(accountId); + account = osAccountManager.getOsAccountByObjectId(accountId); } List hosts = osAccountManager.getHosts(account); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java index ce60d94d7a..1ddc1ed401 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ChromeCacheExtractor.java @@ -541,7 +541,7 @@ final class ChromeCacheExtractor { Optional optional = cacheEntryFile.getOsAccountObjectId(); OsAccount account = null; if(optional.isPresent()) { - account = currentCase.getSleuthkitCase().getOsAccountManager().getOsAccount(optional.get()); + account = currentCase.getSleuthkitCase().getOsAccountManager().getOsAccountByObjectId(optional.get()); } BlackboardArtifact webCacheArtifact = cacheEntryFile.newDataArtifact(new BlackboardArtifact.Type(ARTIFACT_TYPE.TSK_WEB_CACHE), webAttr, account); artifactsAdded.add(webCacheArtifact); diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java index d7b4bb20a2..e152a146fa 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Extract.java @@ -535,7 +535,7 @@ abstract class Extract { if(osAccountCache == null) { Optional accountId = ((AbstractFile)content).getOsAccountObjectId(); if(accountId.isPresent()) { - return Optional.ofNullable(tskCase.getOsAccountManager().getOsAccount(accountId.get())); + return Optional.ofNullable(tskCase.getOsAccountManager().getOsAccountByObjectId(accountId.get())); } return Optional.empty(); } diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java index f58c4488ea..788f219371 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/RAOsAccountCache.java @@ -78,7 +78,7 @@ final class RAOsAccountCache { return getAccountForPath(file.getParentPath()); } - OsAccount osAccount = Case.getCurrentCase().getSleuthkitCase().getOsAccountManager().getOsAccount(optional.get()); + OsAccount osAccount = Case.getCurrentCase().getSleuthkitCase().getOsAccountManager().getOsAccountByObjectId(optional.get()); if (osAccount.getName().equals("S-1-5-32-544")) { return getAccountForPath(file.getParentPath()); }