From 6cbebfb33fb20e7d9266091fcde28f93bcc69b57 Mon Sep 17 00:00:00 2001 From: apriestman Date: Thu, 17 Sep 2020 15:29:14 -0400 Subject: [PATCH] Change to Bundle message. Convert to lower case. --- .../recentactivity/Bundle.properties-MERGED | 3 +++ .../recentactivity/ExtractWebAccountType.java | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED index a69181f228..4456663bd8 100755 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/Bundle.properties-MERGED @@ -72,6 +72,9 @@ ExtractSru_process_errormsg_find_software_hive=Unable to find SOFTWARE HIVE file ExtractSru_process_errormsg_find_srudb_dat=Unable to find srudb.dat file ExtractSru_process_errormsg_write_software_hive=Unable to write SOFTWARE HIVE file ExtractSru_process_errormsg_write_srudb_dat=Unable to write srudb.dat file +ExtractWebAccountType.role.admin=Administrator role +ExtractWebAccountType.role.moderator=Moderator role +ExtractWebAccountType.role.user=User role ExtractZone_Internet=Internet Zone ExtractZone_Local_Intranet=Local Intranet Zone ExtractZone_Local_Machine=Local Machine Zone diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractWebAccountType.java b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractWebAccountType.java index c4fbb8fcba..0c05907fb6 100644 --- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractWebAccountType.java +++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractWebAccountType.java @@ -95,8 +95,8 @@ class ExtractWebAccountType extends Extract { return; } - String url = urlAttr.getValueString(); - String domain = domainAttr.getValueString(); + String url = urlAttr.getValueString().toLowerCase(); + String domain = domainAttr.getValueString().toLowerCase(); findMyBbRole(url, domain, artifact, roleProcessor); findPhpBbRole(url, domain, artifact, roleProcessor); @@ -250,7 +250,7 @@ class ExtractWebAccountType extends Extract { continue; } - String desc = role.getRole().getDesc() + " role (" + role.getPlatform() + ")"; // NON-NLS + String desc = role.getRole().getDesc() + " (" + role.getPlatform() + ")"; // NON-NLS Collection bbattributes = new ArrayList<>(); bbattributes.add(new BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DOMAIN, @@ -274,10 +274,15 @@ class ExtractWebAccountType extends Extract { /** * Possible roles with rank and display name. */ + @NbBundle.Messages({ + "ExtractWebAccountType.role.user=User role", + "ExtractWebAccountType.role.moderator=Moderator role", + "ExtractWebAccountType.role.admin=Administrator role" + }) private enum Role { - USER("User", 0), - MOD("Moderator", 1), - ADMIN("Administrator", 2); + USER(Bundle.ExtractWebAccountType_role_user(), 0), + MOD(Bundle.ExtractWebAccountType_role_moderator(), 1), + ADMIN(Bundle.ExtractWebAccountType_role_admin(), 2); private final String desc; private final int rank;