mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-06 21:00:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few issues

Browse Source
This commit is contained in:
Kelly Kelly 2022-03-02 12:15:40 -05:00
parent daa66b7237
commit 5648b0f997
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractRegistry.java
View File

@ -658,30 +658,6 @@ class ExtractRegistry extends Extract {
osInfo.setProductId(productId); osInfo.setProductId(productId);
osInfo.setRegOwner(regOwner); osInfo.setRegOwner(regOwner);
osInfo.setRegOrg(regOrg); osInfo.setRegOrg(regOrg);
// try {
// Collection<BlackboardAttribute> bbattributes = new ArrayList<>();
// bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PROG_NAME, parentModuleName, version));
// if (installtime != null) {
// bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DATETIME, parentModuleName, installtime));
// }
// bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PATH, parentModuleName, systemRoot));
// bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PRODUCT_ID, parentModuleName, productId));
// bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_OWNER, parentModuleName, regOwner));
// bbattributes.add(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_ORGANIZATION, parentModuleName, regOrg));
//
// // Check if there is already an OS_INFO artifact for this file, and add to that if possible.
// ArrayList<BlackboardArtifact> results = tskCase.getBlackboardArtifacts(ARTIFACT_TYPE.TSK_OS_INFO, regFile.getId());
// if (results.isEmpty()) {
// newArtifacts.add(createArtifactWithAttributes(BlackboardArtifact.Type.TSK_OS_INFO, regFile, bbattributes));
// } else {
// results.get(0).addAttributes(bbattributes);
// }
// } catch (TskCoreException ex) {
// logger.log(Level.SEVERE, String.format("Error adding installed program artifact to blackboard for file %d.", regFile.getId()), ex); //NON-NLS
// }
break; break;
case "Profiler": // NON-NLS case "Profiler": // NON-NLS
String os = ""; String os = "";
@ -735,7 +711,7 @@ class ExtractRegistry extends Extract {
} }
} }
osInfo.setOsName(compName); osInfo.setCompName(compName);
osInfo.setDomain(domainName); osInfo.setDomain(domainName);
for (Map.Entry<String, String> userMap : getUserNameMap().entrySet()) { for (Map.Entry<String, String> userMap : getUserNameMap().entrySet()) {
@ -2351,7 +2327,7 @@ class ExtractRegistry extends Extract {
// of TSK_OS_INFO is created per RA run. // of TSK_OS_INFO is created per RA run.
private class OSInfo { private class OSInfo {
private String compName = null; private String compName = null;
private String progName = "Window"; private String progName = "Windows";
private String processorArchitecture = null; private String processorArchitecture = null;
private String tempDir = null; private String tempDir = null;
private String domain = null; private String domain = null;
@ -2415,7 +2391,7 @@ class ExtractRegistry extends Extract {
} }
void setOsName(String progName) { void setOsName(String progName) {
if(this.progName == null || this.progName.isEmpty()) { if(progName != null && !progName.isEmpty()) {
this.progName = progName; this.progName = progName;
} }
} }