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

Merge pull request #2324 from millmanorama/regex-accepts-spaces

Browse Source 
Regex accepts spaces
This commit is contained in:
Richard Cordovano 2016-09-12 10:15:35 -04:00 committed by GitHub
commit 2ea97359ae
9 changed files with 499 additions and 337 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/build.xml
View File

@ -32,7 +32,7 @@
ignoreerrors="true" ignoreerrors="true"
verbose="true"/> verbose="true"/>
</target> </target>
<target name="init" depends="basic-init,files-init,build-init,-javac-init"> <target name="init" depends="basic-init,files-init,build-init,-javac-init">
<antcall target="download-binlist" /> <antcall target="download-binlist" />

681
Core/src/org/sleuthkit/autopsy/datamodel/Accounts.java
View File

@ -76,18 +76,29 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
private static final Logger LOGGER = Logger.getLogger(Accounts.class.getName()); private static final Logger LOGGER = Logger.getLogger(Accounts.class.getName());
private static final BlackboardArtifact.Type CREDIT_CARD_ACCOUNT_TYPE = new BlackboardArtifact.Type(TSK_CREDIT_CARD_ACCOUNT); private static final BlackboardArtifact.Type CREDIT_CARD_ACCOUNT_TYPE = new BlackboardArtifact.Type(TSK_CREDIT_CARD_ACCOUNT);
@NbBundle.Messages("AccountsRootNode.name=Accounts")
final public static String NAME = Bundle.AccountsRootNode_name();
/** /**
* Range Map from a (ranges of) B/IINs to data model object with details of * Range Map from a (ranges of) B/IINs to data model object with details of
* the B/IIN, ie, bank name, phone, url, visa/amex/mastercard/..., * the B/IIN, ie, bank name, phone, url, visa/amex/mastercard/...,
*/ */
@GuardedBy("Accounts.class") @GuardedBy("Accounts.class")
private final static RangeMap<Integer, IINInfo> iinRanges = TreeRangeMap.create(); private final static RangeMap<Integer, IINRange> iinRanges = TreeRangeMap.create();
/**
* Flag for if we have loaded the IINs from the file already.
*/
@GuardedBy("Accounts.class") @GuardedBy("Accounts.class")
private static boolean iinsLoaded = false; private static boolean iinsLoaded = false;
private SleuthkitCase skCase; private SleuthkitCase skCase;
/**
* Should rejected accounts be shown in the accounts section of the tree.
*/
private boolean showRejected = false;
/** /**
* Load the IIN range information from disk. If the map has already been * Load the IIN range information from disk. If the map has already been
* initialized, don't load again. * initialized, don't load again.
@ -95,7 +106,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
synchronized private static void loadIINRanges() { synchronized private static void loadIINRanges() {
if (iinsLoaded == false) { if (iinsLoaded == false) {
try { try {
InputStreamReader in = new InputStreamReader(Accounts.class.getResourceAsStream("ranges.csv")); InputStreamReader in = new InputStreamReader(Accounts.class.getResourceAsStream("ranges.csv")); //NON-NLS
CSVParser rangesParser = CSVFormat.RFC4180.withFirstRecordAsHeader().parse(in); CSVParser rangesParser = CSVFormat.RFC4180.withFirstRecordAsHeader().parse(in);
//parse each row and add to range map //parse each row and add to range map
@ -106,50 +117,70 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
* IINs, but we need a consistent length for the range map, * IINs, but we need a consistent length for the range map,
* we pad all the numbers out to 8 digits * we pad all the numbers out to 8 digits
*/ */
String start = StringUtils.rightPad(record.get("iin_start"), 8, "0"); //pad start with 0's String start = StringUtils.rightPad(record.get("iin_start"), 8, "0"); //pad start with 0's //NON-NLS
//if there is no end listed, use start, since ranges will be closed. //if there is no end listed, use start, since ranges will be closed.
String end = StringUtils.defaultIfBlank(record.get("iin_end"), start); String end = StringUtils.defaultIfBlank(record.get("iin_end"), start); //NON-NLS
end = StringUtils.rightPad(end, 8, "99"); //pad end with 9's end = StringUtils.rightPad(end, 8, "99"); //pad end with 9's //NON-NLS
final String numberLength = record.get("number_length"); final String numberLength = record.get("number_length"); //NON-NLS
try { try {
IINInfo iinRange = new IINInfo(Integer.parseInt(start), IINRange iinRange = new IINRange(Integer.parseInt(start),
Integer.parseInt(end), Integer.parseInt(end),
StringUtils.isBlank(numberLength) ? null : Integer.valueOf(numberLength), StringUtils.isBlank(numberLength) ? null : Integer.valueOf(numberLength),
record.get("scheme"), record.get("scheme"), //NON-NLS
record.get("brand"), record.get("brand"), //NON-NLS
record.get("type"), record.get("type"), //NON-NLS
record.get("country"), record.get("country"), //NON-NLS
record.get("bank_name"), record.get("bank_name"), //NON-NLS
record.get("bank_url"), record.get("bank_url"), //NON-NLS
record.get("bank_phone"), record.get("bank_phone"), //NON-NLS
record.get("bank_city")); record.get("bank_city")); //NON-NLS
iinRanges.put(Range.closed(iinRange.getIINstart(), iinRange.getIINend()), iinRange); iinRanges.put(Range.closed(iinRange.getIINstart(), iinRange.getIINend()), iinRange);
} catch (NumberFormatException numberFormatException) { } catch (NumberFormatException numberFormatException) {
LOGGER.log(Level.WARNING, "Failed to parse IIN range: " + record.toString(), numberFormatException); LOGGER.log(Level.WARNING, "Failed to parse IIN range: " + record.toString(), numberFormatException); //NON-NLS
} }
iinsLoaded = true; iinsLoaded = true;
} }
} catch (IOException ex) { } catch (IOException ex) {
LOGGER.log(Level.WARNING, "Failed to load IIN ranges form ranges.csv", ex); LOGGER.log(Level.WARNING, "Failed to load IIN ranges form ranges.csv", ex); //NON-NLS
MessageNotifyUtil.Notify.warn("Credit Card Number Discovery", "There was an error loading Bank Identification Number information. Accounts will not have their BINs identified."); MessageNotifyUtil.Notify.warn("Credit Card Number Discovery", "There was an error loading Bank Identification Number information. Accounts will not have their BINs identified.");
} }
} }
} }
/**
* Constructor
*
* @param skCase The SleuthkitCase object to use for db queries.
*/
Accounts(SleuthkitCase skCase) {
this.skCase = skCase;
}
/**
* Get the clause that should be used in order to (not) filter out rejected
* results from db queries.
*
* @return A clause that will or will not filter out rejected artifacts
* based on the state of showRejected.
*/
private String getRejectedArtifactFilterClause() {
return showRejected ? "" : " AND blackboard_artifacts.review_status_id != " + BlackboardArtifact.ReviewStatus.REJECTED.getID(); //NON-NLS
}
/**
* Notify all observers that something has changed, causing a refresh of the
* accounts section of the tree.
*/
private void update() { private void update() {
setChanged(); setChanged();
notifyObservers(); notifyObservers();
} }
Accounts(SleuthkitCase skCase) {
this.skCase = skCase;
}
/** /**
* Are there details available about the given IIN? * Are there details available about the given IIN?
* *
@ -179,6 +210,211 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
return v.visit(this); return v.visit(this);
} }
/**
* Gets a new Action that when invoked toggles showing rejected artifacts on
* or off.
*
* @return An Action that will toggle whether rejected artifacts are shown
* in the tree rooted by this Accounts instance.
*/
public Action newToggleShowRejectedAction() {
return new ToggleShowRejected();
}
//Interface for objects that provide details about one or more IINs.
static public interface IINInfo {
/**
* Get the city of the issuer.
*
* @return the city of the issuer.
*/
Optional<String> getBankCity();
/**
* Get the name of the issuer.
*
* @return the name of the issuer.
*/
Optional<String> getBankName();
/**
* Get the phone number of the issuer.
*
* @return the phone number of the issuer.
*/
Optional<String> getBankPhoneNumber();
/**
* Get the URL of the issuer.
*
* @return the URL of the issuer.
*/
Optional<String> getBankURL();
/**
* Get the brand of this IIN range.
*
* @return the brand of this IIN range.
*/
Optional<String> getBrand();
/**
* Get the type of card (credit vs debit) for this IIN range.
*
* @return the type of cards in this IIN range.
*/
Optional<String> getCardType();
/**
* Get the country of the issuer.
*
* @return the country of the issuer.
*/
Optional<String> getCountry();
/**
* Get the length of account numbers in this IIN range.
*
* NOTE: the length is currently unused, and not in the data file for
* any ranges. It could be quite helpfull for validation...
*
* @return the length of account numbers in this IIN range. Or an empty
* Optional if the length is unknown.
*
*/
Optional<Integer> getNumberLength();
/**
* Get the scheme this IIN range uses to, eg amex,visa,mastercard, etc
*
* @return the scheme this IIN range uses.
*/
Optional<String> getScheme();
}
/**
* Details of a range of Issuer/Bank Identifiaction Number(s) (IIN/BIN) used
* by a bank.
*/
static private class IINRange implements IINInfo {
private final int IINStart; //start of IIN range, 8 digits
private final int IINEnd; // end (incluse ) of IIN rnage, 8 digits
private final Integer numberLength; // the length of accounts numbers with this IIN, currently unused
/**
* AMEX, VISA, MASTERCARD, DINERS, DISCOVER, UNIONPAY
*/
private final String scheme;
private final String brand;
/**
* DEBIT, CREDIT
*/
private final String cardType;
private final String country;
private final String bankName;
private final String bankCity;
private final String bankURL;
private final String bankPhoneNumber;
/**
* Constructor
*
* @param IIN_start the first IIN in the range, must be 8 digits
* @param IIN_end the last(inclusive) IIN in the range, must be 8
* digits
* @param number_length the length of account numbers in this IIN range
* @param scheme amex/visa/mastercard/etc
* @param brand the brand of this IIN range
* @param type credit vs debit
* @param country the country of the issuer
* @param bank_name the name of the issuer
* @param bank_url the url of the issuer
* @param bank_phone the phone number of the issuer
* @param bank_city the city of the issuer
*/
private IINRange(int IIN_start, int IIN_end, Integer number_length, String scheme, String brand, String type, String country, String bank_name, String bank_url, String bank_phone, String bank_city) {
this.IINStart = IIN_start;
this.IINEnd = IIN_end;
this.numberLength = number_length;
this.scheme = StringUtils.defaultIfBlank(scheme, null);
this.brand = StringUtils.defaultIfBlank(brand, null);
this.cardType = StringUtils.defaultIfBlank(type, null);
this.country = StringUtils.defaultIfBlank(country, null);
this.bankName = StringUtils.defaultIfBlank(bank_name, null);
this.bankURL = StringUtils.defaultIfBlank(bank_url, null);
this.bankPhoneNumber = StringUtils.defaultIfBlank(bank_phone, null);
this.bankCity = StringUtils.defaultIfBlank(bank_city, null);
}
/**
* Get the first IIN in this range
*
* @return the first IIN in this range.
*/
int getIINstart() {
return IINStart;
}
/**
* Get the last (inclusive) IIN in this range.
*
* @return the last (inclusive) IIN in this range.
*/
int getIINend() {
return IINEnd;
}
@Override
public Optional<Integer> getNumberLength() {
return Optional.ofNullable(numberLength);
}
@Override
public Optional<String> getScheme() {
return Optional.ofNullable(scheme);
}
@Override
public Optional<String> getBrand() {
return Optional.ofNullable(brand);
}
@Override
public Optional<String> getCardType() {
return Optional.ofNullable(cardType);
}
@Override
public Optional<String> getCountry() {
return Optional.ofNullable(country);
}
@Override
public Optional<String> getBankName() {
return Optional.ofNullable(bankName);
}
@Override
public Optional<String> getBankURL() {
return Optional.ofNullable(bankURL);
}
@Override
public Optional<String> getBankPhoneNumber() {
return Optional.ofNullable(bankPhoneNumber);
}
@Override
public Optional<String> getBankCity() {
return Optional.ofNullable(bankCity);
}
}
/** /**
* Base class for factories that are also observers. * Base class for factories that are also observers.
* *
@ -194,13 +430,13 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
@Override @Override
protected void removeNotify() { protected void removeNotify() {
super.removeNotify(); super.removeNotify();
deleteObserver(this); Accounts.this.deleteObserver(this);
} }
@Override @Override
protected void addNotify() { protected void addNotify() {
super.addNotify(); super.addNotify();
addObserver(this); Accounts.this.addObserver(this);
} }
} }
@ -211,8 +447,8 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
public class AccountsRootNode extends DisplayableItemNode { public class AccountsRootNode extends DisplayableItemNode {
AccountsRootNode() { AccountsRootNode() {
super(Children.create(new AccountTypeFactory(), true)); super(Children.create(new AccountTypeFactory(), true), Lookups.singleton(Accounts.this));
super.setName("Accounts"); //NON-NLS super.setName(Accounts.NAME);
super.setDisplayName(Bundle.Accounts_RootNode_displayName()); super.setDisplayName(Bundle.Accounts_RootNode_displayName());
this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/account_menu.png"); //NON-NLS this.setIconBaseWithExtension("org/sleuthkit/autopsy/images/account_menu.png"); //NON-NLS
} }
@ -226,6 +462,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
public <T> T accept(DisplayableItemNodeVisitor<T> v) { public <T> T accept(DisplayableItemNodeVisitor<T> v) {
return v.visit(this); return v.visit(this);
} }
} }
/** /**
@ -345,7 +582,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
/** /**
* Enum for the children under the credit card AccountTypeNode. * Enum for the children under the credit card AccountTypeNode.
*/ */
static private enum CreditCardViewMode { private enum CreditCardViewMode {
BY_FILE, BY_FILE,
BY_BIN; BY_BIN;
} }
@ -440,7 +677,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
"# {0} - number of children", "# {0} - number of children",
"Accounts.ByBINNode.displayName=By BIN ({0})"}) "Accounts.ByBINNode.displayName=By BIN ({0})"})
private void updateDisplayName() { private void updateDisplayName() {
ArrayList<BINInfo> keys = new ArrayList<>(); ArrayList<BinResult> keys = new ArrayList<>();
binFactory.createKeys(keys); binFactory.createKeys(keys);
setDisplayName(Bundle.Accounts_ByBINNode_displayName(keys.size())); setDisplayName(Bundle.Accounts_ByBINNode_displayName(keys.size()));
} }
@ -520,7 +757,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
*/ */
static <X> List<X> unGroupConcat(String groupConcat, Function<String, X> mapper) { static <X> List<X> unGroupConcat(String groupConcat, Function<String, X> mapper) {
return StringUtils.isBlank(groupConcat) ? Collections.emptyList() return StringUtils.isBlank(groupConcat) ? Collections.emptyList()
: Stream.of(groupConcat.split(",")) : Stream.of(groupConcat.split(",")) //NON-NLS
.map(mapper::apply) .map(mapper::apply)
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
@ -542,7 +779,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
+ " LEFT JOIN blackboard_attributes ON blackboard_artifacts.artifact_id = blackboard_attributes.artifact_id " //NON-NLS + " LEFT JOIN blackboard_attributes ON blackboard_artifacts.artifact_id = blackboard_attributes.artifact_id " //NON-NLS
+ " AND blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SOLR_DOCUMENT_ID.getTypeID() //NON-NLS + " AND blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SOLR_DOCUMENT_ID.getTypeID() //NON-NLS
+ " WHERE blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID() //NON-NLS + " WHERE blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID() //NON-NLS
+ " AND blackboard_artifacts.review_status_id != " + BlackboardArtifact.ReviewStatus.REJECTED.getID() //NON-NLS + getRejectedArtifactFilterClause()
+ " GROUP BY blackboard_artifacts.obj_id, solr_document_id " //NON-NLS + " GROUP BY blackboard_artifacts.obj_id, solr_document_id " //NON-NLS
+ " ORDER BY hits DESC "; //NON-NLS + " ORDER BY hits DESC "; //NON-NLS
try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query); try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query);
@ -564,7 +801,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
@Override @Override
protected Node createNodeForKey(FileWithCCN key) { protected Node createNodeForKey(FileWithCCN key) {
//add all account artifacts for the file and the file itself to th elookup //add all account artifacts for the file and the file itself to the lookup
try { try {
List<Object> lookupContents = new ArrayList<>(); List<Object> lookupContents = new ArrayList<>();
for (long artId : key.artifactIDS) { for (long artId : key.artifactIDS) {
@ -611,7 +848,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
this.fileKey = key; this.fileKey = key;
this.fileName = (key.getSolrDocmentID() == null) this.fileName = (key.getSolrDocmentID() == null)
? content.getName() ? content.getName()
: Bundle.Accounts_FileWithCCNNode_unallocatedSpaceFile_displayName(content.getName(), StringUtils.substringAfter(key.getSolrDocmentID(), "_")); : Bundle.Accounts_FileWithCCNNode_unallocatedSpaceFile_displayName(content.getName(), StringUtils.substringAfter(key.getSolrDocmentID(), "_")); //NON-NLS
setName(fileName); setName(fileName);
setDisplayName(fileName); setDisplayName(fileName);
} }
@ -653,7 +890,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
Bundle.Accounts_FileWithCCNNode_noDescription(), Bundle.Accounts_FileWithCCNNode_noDescription(),
fileKey.getStatuses().stream() fileKey.getStatuses().stream()
.map(BlackboardArtifact.ReviewStatus::getDisplayName) .map(BlackboardArtifact.ReviewStatus::getDisplayName)
.collect(Collectors.joining(", ")))); .collect(Collectors.joining(", ")))); //NON-NLS
return s; return s;
} }
@ -671,41 +908,17 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
arrayList.add(new RejectAccounts(getLookup().lookupAll(BlackboardArtifact.class))); arrayList.add(new RejectAccounts(getLookup().lookupAll(BlackboardArtifact.class)));
return arrayList.toArray(new Action[arrayList.size()]); return arrayList.toArray(new Action[arrayList.size()]);
} }
} }
/**
* Node that represents a BIN (Bank Identification Number)
*/
public class BINNode extends DisplayableItemNode implements Observer { public class BINNode extends DisplayableItemNode implements Observer {
private final BINInfo bin; private final BinResult bin;
private final AccountFactory accountFactory; private final AccountFactory accountFactory;
private final IINInfo iinRange;
private String brand;
private String city;
private String bankName;
private String phoneNumber;
private String url;
private String country;
private String scheme;
private String cardType;
private BINNode(BINInfo bin) { private BINNode(BinResult bin) {
super(Children.LEAF); super(Children.LEAF);
this.bin = bin; this.bin = bin;
iinRange = getIINInfo(bin.getBIN());
if (iinRange != null) {
cardType = iinRange.getCardType();
scheme = iinRange.getScheme();
brand = iinRange.getBrand();
city = iinRange.getBankCity();
bankName = iinRange.getBankName();
phoneNumber = iinRange.getBankPhoneNumber();
url = iinRange.getBankURL();
country = iinRange.getCountry();
}
accountFactory = new AccountFactory(bin); accountFactory = new AccountFactory(bin);
setChildren(Children.create(accountFactory, true)); setChildren(Children.create(accountFactory, true));
setName(bin.toString()); setName(bin.toString());
@ -722,7 +935,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
private void updateDisplayName() { private void updateDisplayName() {
ArrayList<Long> keys = new ArrayList<>(); ArrayList<Long> keys = new ArrayList<>();
accountFactory.createKeys(keys); accountFactory.createKeys(keys);
setDisplayName(bin.getBIN().toString() + " (" + keys.size() + ")"); setDisplayName(bin.getBIN().toString() + " (" + keys.size() + ")"); //NON-NLS
} }
@Override @Override
@ -735,68 +948,78 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
return v.visit(this); return v.visit(this);
} }
@Override private Sheet.Set getPropertySet(Sheet s) {
@NbBundle.Messages({
"Accounts.BINNode.binProperty.displayName=Bank Identifier Number",
"Accounts.BINNode.accountsProperty.displayName=Accounts",
"Accounts.BINNode.noDescription=no description"})
protected Sheet createSheet() {
Sheet s = super.createSheet();
Sheet.Set ss = s.get(Sheet.PROPERTIES); Sheet.Set ss = s.get(Sheet.PROPERTIES);
if (ss == null) { if (ss == null) {
ss = Sheet.createPropertiesSet(); ss = Sheet.createPropertiesSet();
s.put(ss); s.put(ss);
} }
return ss;
}
ss.put(new NodeProperty<>(Bundle.Accounts_BINNode_binProperty_displayName(), @Override
@NbBundle.Messages({
"Accounts.BINNode.binProperty.displayName=Bank Identifier Number",
"Accounts.BINNode.accountsProperty.displayName=Accounts",
"Accounts.BINNode.cardTypeProperty.displayName=Payment Card Type",
"Accounts.BINNode.schemeProperty.displayName=Credit Card Scheme",
"Accounts.BINNode.brandProperty.displayName=Brand",
"Accounts.BINNode.bankProperty.displayName=Bank",
"Accounts.BINNode.bankCityProperty.displayName=Bank City",
"Accounts.BINNode.bankCountryProperty.displayName=Bank Country",
"Accounts.BINNode.bankPhoneProperty.displayName=Bank Phone #",
"Accounts.BINNode.bankURLProperty.displayName=Bank URL",
"Accounts.BINNode.noDescription=no description"})
protected Sheet createSheet() {
Sheet sheet = super.createSheet();
Sheet.Set properties = getPropertySet(sheet);
properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_binProperty_displayName(),
Bundle.Accounts_BINNode_binProperty_displayName(), Bundle.Accounts_BINNode_binProperty_displayName(),
Bundle.Accounts_BINNode_noDescription(), Bundle.Accounts_BINNode_noDescription(),
bin.getBIN())); bin.getBIN()));
ss.put(new NodeProperty<>(Bundle.Accounts_BINNode_accountsProperty_displayName(), properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_accountsProperty_displayName(),
Bundle.Accounts_BINNode_accountsProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
bin.getCount()));
ss.put(new NodeProperty<>(Bundle.Accounts_BINNode_accountsProperty_displayName(),
Bundle.Accounts_BINNode_accountsProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
bin.getCount()));
ss.put(new NodeProperty<>(Bundle.Accounts_BINNode_accountsProperty_displayName(),
Bundle.Accounts_BINNode_accountsProperty_displayName(), Bundle.Accounts_BINNode_noDescription(), Bundle.Accounts_BINNode_accountsProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
bin.getCount())); bin.getCount()));
if (StringUtils.isNotBlank(cardType)) { //add optional properties if they are available
ss.put(new NodeProperty<>("Payment Card Type", "Payment Card Type", Bundle.Accounts_BINNode_noDescription(), cardType)); if (bin.hasDetails()) {
bin.getCardType().ifPresent(cardType -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_cardTypeProperty_displayName(),
Bundle.Accounts_BINNode_cardTypeProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
cardType)));
bin.getScheme().ifPresent(scheme -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_schemeProperty_displayName(),
Bundle.Accounts_BINNode_schemeProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
scheme)));
bin.getBrand().ifPresent(brand -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_brandProperty_displayName(),
Bundle.Accounts_BINNode_brandProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
brand)));
bin.getBankName().ifPresent(bankName -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_bankProperty_displayName(),
Bundle.Accounts_BINNode_bankProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
bankName)));
bin.getBankCity().ifPresent(bankCity -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_bankCityProperty_displayName(),
Bundle.Accounts_BINNode_bankCityProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
bankCity)));
bin.getCountry().ifPresent(country -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_bankCountryProperty_displayName(),
Bundle.Accounts_BINNode_bankCountryProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
country)));
bin.getBankPhoneNumber().ifPresent(phoneNumber -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_bankPhoneProperty_displayName(),
Bundle.Accounts_BINNode_bankPhoneProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
phoneNumber)));
bin.getBankURL().ifPresent(url -> properties.put(new NodeProperty<>(Bundle.Accounts_BINNode_bankURLProperty_displayName(),
Bundle.Accounts_BINNode_bankURLProperty_displayName(), Bundle.Accounts_BINNode_noDescription(),
url)));
} }
if (StringUtils.isNotBlank(scheme)) { return sheet;
ss.put(new NodeProperty<>("Credit Card Scheme", "Credit Card Scheme", Bundle.Accounts_BINNode_noDescription(), scheme));
}
if (StringUtils.isNotBlank(brand)) {
ss.put(new NodeProperty<>("Brand", "Brand", Bundle.Accounts_BINNode_noDescription(), brand));
}
if (StringUtils.isNotBlank(bankName)) {
ss.put(new NodeProperty<>("Bank", "Bank", Bundle.Accounts_BINNode_noDescription(), bankName));
}
if (StringUtils.isNotBlank(city)) {
ss.put(new NodeProperty<>("Bank City", "Bank City", Bundle.Accounts_BINNode_noDescription(), city));
}
if (StringUtils.isNotBlank(country)) {
ss.put(new NodeProperty<>("Bank Country", "Bank Country", Bundle.Accounts_BINNode_noDescription(), country));
}
if (StringUtils.isNotBlank(phoneNumber)) {
ss.put(new NodeProperty<>("Bank Phone #", "Bank Phone #", Bundle.Accounts_BINNode_noDescription(), phoneNumber));
}
if (StringUtils.isNotBlank(url)) {
ss.put(new NodeProperty<>("Bank URL", "Bank URL", Bundle.Accounts_BINNode_noDescription(), url));
}
return s;
} }
} }
/** /**
* Factory that generates the children of the ByBin node. * Factory that generates the children of the ByBin node.
*/ */
private class BINFactory extends ObservingChildFactory<BINInfo> { private class BINFactory extends ObservingChildFactory<BinResult> {
@Override @Override
protected boolean createKeys(List<BINInfo> list) { protected boolean createKeys(List<BinResult> list) {
String query String query
= "SELECT SUBSTR(blackboard_attributes.value_text,1,8) AS BIN, " //NON-NLS = "SELECT SUBSTR(blackboard_attributes.value_text,1,8) AS BIN, " //NON-NLS
+ " COUNT(blackboard_artifacts.artifact_id) AS count " //NON-NLS + " COUNT(blackboard_artifacts.artifact_id) AS count " //NON-NLS
@ -804,13 +1027,13 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
+ " JOIN blackboard_attributes ON blackboard_artifacts.artifact_id = blackboard_attributes.artifact_id" //NON-NLS + " JOIN blackboard_attributes ON blackboard_artifacts.artifact_id = blackboard_attributes.artifact_id" //NON-NLS
+ " WHERE blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID() //NON-NLS + " WHERE blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID() //NON-NLS
+ " AND blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ACCOUNT_NUMBER.getTypeID() //NON-NLS + " AND blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ACCOUNT_NUMBER.getTypeID() //NON-NLS
+ " AND blackboard_artifacts.review_status_id != " + BlackboardArtifact.ReviewStatus.REJECTED.getID() //NON-NLS + getRejectedArtifactFilterClause()
+ " GROUP BY BIN " //NON-NLS + " GROUP BY BIN " //NON-NLS
+ " ORDER BY BIN "; //NON-NLS + " ORDER BY BIN "; //NON-NLS
try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query)) { try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query)) {
ResultSet resultSet = results.getResultSet(); ResultSet resultSet = results.getResultSet();
while (resultSet.next()) { while (resultSet.next()) {
list.add(new BINInfo(Integer.valueOf(resultSet.getString("BIN")), //NON-NLS list.add(new BinResult(Integer.valueOf(resultSet.getString("BIN")), //NON-NLS
resultSet.getLong("count"))); //NON-NLS resultSet.getLong("count"))); //NON-NLS
} }
} catch (TskCoreException | SQLException ex) { } catch (TskCoreException | SQLException ex) {
@ -821,26 +1044,28 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
} }
@Override @Override
protected Node createNodeForKey(BINInfo key) { protected Node createNodeForKey(BinResult key) {
return new BINNode(key); return new BINNode(key);
} }
} }
/** /**
* Data model item to back the BINNodes in the tree. Has basic info about a * Data model item to back the BINNodes in the tree. Has the number of
* BIN. * accounts found with the BIN.
*/ */
private class BINInfo { private class BinResult implements IINInfo {
private final Integer bin; private final Integer bin;
/** /**
* The number of accounts with this BIN * The number of accounts with this BIN
*/ */
private final Long count; private final Long count;
private final IINInfo iinInfo;
private BINInfo(Integer bin, Long count) { private BinResult(Integer bin, Long count) {
this.bin = bin; this.bin = bin;
this.count = count; this.count = count;
iinInfo = getIINInfo(bin);
} }
public Integer getBIN() { public Integer getBIN() {
@ -850,6 +1075,55 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
public Long getCount() { public Long getCount() {
return count; return count;
} }
boolean hasDetails() {
return iinInfo != null;
}
@Override
public Optional<Integer> getNumberLength() {
return iinInfo.getNumberLength();
}
@Override
public Optional<String> getBankCity() {
return iinInfo.getBankCity();
}
@Override
public Optional<String> getBankName() {
return iinInfo.getBankName();
}
@Override
public Optional<String> getBankPhoneNumber() {
return iinInfo.getBankPhoneNumber();
}
@Override
public Optional<String> getBankURL() {
return iinInfo.getBankURL();
}
@Override
public Optional<String> getBrand() {
return iinInfo.getBrand();
}
@Override
public Optional<String> getCardType() {
return iinInfo.getCardType();
}
@Override
public Optional<String> getCountry() {
return iinInfo.getCountry();
}
@Override
public Optional<String> getScheme() {
return iinInfo.getScheme();
}
} }
/** /**
@ -857,9 +1131,9 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
*/ */
private class AccountFactory extends ObservingChildFactory<Long> { private class AccountFactory extends ObservingChildFactory<Long> {
private final BINInfo bin; private final BinResult bin;
private AccountFactory(BINInfo bin) { private AccountFactory(BinResult bin) {
this.bin = bin; this.bin = bin;
} }
@ -872,7 +1146,7 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
+ " WHERE blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID() //NON-NLS + " WHERE blackboard_artifacts.artifact_type_id = " + BlackboardArtifact.ARTIFACT_TYPE.TSK_CREDIT_CARD_ACCOUNT.getTypeID() //NON-NLS
+ " AND blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ACCOUNT_NUMBER.getTypeID() //NON-NLS + " AND blackboard_attributes.attribute_type_id = " + BlackboardAttribute.ATTRIBUTE_TYPE.TSK_ACCOUNT_NUMBER.getTypeID() //NON-NLS
+ " AND blackboard_attributes.value_text LIKE \"" + bin.getBIN() + "%\" " //NON-NLS + " AND blackboard_attributes.value_text LIKE \"" + bin.getBIN() + "%\" " //NON-NLS
+ " AND blackboard_artifacts.review_status_id != " + BlackboardArtifact.ReviewStatus.REJECTED.getID() //NON-NLS + getRejectedArtifactFilterClause()
+ " ORDER BY blackboard_attributes.value_text"; //NON-NLS + " ORDER BY blackboard_attributes.value_text"; //NON-NLS
try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query); try (SleuthkitCase.CaseDbQuery results = skCase.executeQuery(query);
ResultSet rs = results.getResultSet();) { ResultSet rs = results.getResultSet();) {
@ -922,13 +1196,13 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
@Override @Override
protected Sheet createSheet() { protected Sheet createSheet() {
Sheet sheet = super.createSheet(); //To change body of generated methods, choose Tools | Templates. Sheet sheet = super.createSheet();
Sheet.Set sheetSet = sheet.get(Sheet.PROPERTIES); Sheet.Set properties = sheet.get(Sheet.PROPERTIES);
if (sheetSet == null) { if (properties == null) {
sheetSet = Sheet.createPropertiesSet(); properties = Sheet.createPropertiesSet();
sheet.put(sheetSet); sheet.put(properties);
} }
sheetSet.put(new NodeProperty<>(Bundle.Accounts_FileWithCCNNode_statusProperty_displayName(), properties.put(new NodeProperty<>(Bundle.Accounts_FileWithCCNNode_statusProperty_displayName(),
Bundle.Accounts_FileWithCCNNode_statusProperty_displayName(), Bundle.Accounts_FileWithCCNNode_statusProperty_displayName(),
Bundle.Accounts_FileWithCCNNode_noDescription(), Bundle.Accounts_FileWithCCNNode_noDescription(),
artifact.getReviewStatus().getDisplayName())); artifact.getReviewStatus().getDisplayName()));
@ -937,6 +1211,20 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
} }
} }
final class ToggleShowRejected extends AbstractAction {
@NbBundle.Messages("ToggleShowRejected.name=Show Rejcted Results")
ToggleShowRejected() {
super(Bundle.ToggleShowRejected_name());
}
@Override
public void actionPerformed(ActionEvent e) {
showRejected = !showRejected;
update();
}
}
private class ApproveAccounts extends AbstractAction { private class ApproveAccounts extends AbstractAction {
private final Collection<? extends BlackboardArtifact> artifacts; private final Collection<? extends BlackboardArtifact> artifacts;
@ -982,165 +1270,4 @@ public class Accounts extends Observable implements AutopsyVisitableItem {
} }
} }
} }
/**
* Details of a (range of) Issuer/Bank Identifiaction Number(s) * (IIN/BIN)
* used by a bank.
*/
static public class IINInfo {
private final int IINStart; //start of IIN range, 8 digits
private final int IINEnd; // end (incluse ) of IIN rnage, 8 digits
private final Integer numberLength; // the length of accounts numbers with this IIN, currently unused
/**
* AMEX, VISA, MASTERCARD, DINERS, DISCOVER, UNIONPAY
*/
private final String scheme;
private final String brand;
/**
* DEBIT, CREDIT
*/
private final String cardType;
private final String country;
private final String bankName;
private final String bankCity;
private final String bankURL;
private final String bankPhoneNumber;
/**
* Constructor
*
* @param IIN_start the first IIN in the range, must be 8 digits
* @param IIN_end the last(inclusive) IIN in the range, must be 8
* digits
* @param number_length the length of account numbers in this IIN range
* @param scheme amex/visa/mastercard/etc
* @param brand the brand of this IIN range
* @param type credit vs debit
* @param country the country of the issuer
* @param bank_name the name of the issuer
* @param bank_url the url of the issuer
* @param bank_phone the phone number of the issuer
* @param bank_city the city of the issuer
*/
private IINInfo(int IIN_start, int IIN_end, Integer number_length, String scheme, String brand, String type, String country, String bank_name, String bank_url, String bank_phone, String bank_city) {
this.IINStart = IIN_start;
this.IINEnd = IIN_end;
this.numberLength = number_length;
this.scheme = scheme;
this.brand = brand;
this.cardType = type;
this.country = country;
this.bankName = bank_name;
this.bankURL = bank_url;
this.bankPhoneNumber = bank_phone;
this.bankCity = bank_city;
}
/**
* Get the first IIN in this range
*
* @return the first IIN in this range.
*/
int getIINstart() {
return IINStart;
}
/**
* Get the last (inclusive) IIN in this range.
*
* @return the last (inclusive) IIN in this range.
*/
int getIINend() {
return IINEnd;
}
/**
* Get the length of account numbers in this IIN range.
*
* NOTE: the length is currently unused, and not in the data file for
* any ranges. It could be quite helpfull for validation...
*
* @return the length of account numbers in this IIN range. Or an empty
* Optional if the length is unknown.
*
*/
public Optional<Integer> getNumberLength() {
return Optional.ofNullable(numberLength);
}
/**
* Get the scheme this IIN range uses to, eg amex,visa,mastercard, etc
*
* @return the scheme this IIN range uses.
*/
public String getScheme() {
return scheme;
}
/**
* Get the brand of this IIN range.
*
* @return the brand of this IIN range.
*/
public String getBrand() {
return brand;
}
/**
* Get the type of card (credit vs debit) for this IIN range.
*
* @return the type of cards in this IIN range.
*/
public String getCardType() {
return cardType;
}
/**
* Get the country of the issuer.
*
* @return the country of the issuer.
*/
public String getCountry() {
return country;
}
/**
* Get the name of the issuer.
*
* @return the name of the issuer.
*/
public String getBankName() {
return bankName;
}
/**
* Get the URL of the issuer.
*
* @return the URL of the issuer.
*/
public String getBankURL() {
return bankURL;
}
/**
* Get the phone number of the issuer.
*
* @return the phone number of the issuer.
*/
public String getBankPhoneNumber() {
return bankPhoneNumber;
}
/**
* Get the city of the issuer.
*
* @return the city of the issuer.
*/
public String getBankCity() {
return bankCity;
}
}
} }

1
Core/src/org/sleuthkit/autopsy/directorytree/Bundle.properties
View File

@ -93,3 +93,4 @@ ExtractUnallocAction.done.notifyMsg.completedExtract.msg=Files were extracted to
ExtractUnallocAction.done.errMsg.title=Error Extracting ExtractUnallocAction.done.errMsg.title=Error Extracting
ExtractUnallocAction.done.errMsg.msg=Error extracting unallocated space\: {0} ExtractUnallocAction.done.errMsg.msg=Error extracting unallocated space\: {0}
ExtractAction.done.notifyMsg.extractErr=Error extracting files\: {0} ExtractAction.done.notifyMsg.extractErr=Error extracting files\: {0}
DirectoryTreeTopComponent.showRejectedCheckBox.text=Show Rejected Results

30
Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.form
View File

@ -16,28 +16,29 @@
<Layout> <Layout>
<DimensionLayout dim="0"> <DimensionLayout dim="0">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Component id="jScrollPane1" alignment="0" pref="262" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <Group type="102" attributes="0">
<EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
<Component id="backButton" min="-2" pref="23" max="-2" attributes="0"/> <Component id="backButton" min="-2" pref="23" max="-2" attributes="0"/>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/> <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
<Component id="forwardButton" min="-2" pref="23" max="-2" attributes="0"/> <Component id="forwardButton" min="-2" pref="23" max="-2" attributes="0"/>
<EmptySpace pref="206" max="32767" attributes="0"/> <EmptySpace pref="46" max="32767" attributes="0"/>
<Component id="showRejectedCheckBox" min="-2" max="-2" attributes="0"/>
<EmptySpace max="-2" attributes="0"/>
</Group> </Group>
<Component id="jSeparator1" alignment="0" pref="262" max="32767" attributes="0"/>
<Component id="jScrollPane1" alignment="0" pref="262" max="32767" attributes="0"/>
</Group> </Group>
</DimensionLayout> </DimensionLayout>
<DimensionLayout dim="1"> <DimensionLayout dim="1">
<Group type="103" groupAlignment="0" attributes="0"> <Group type="103" groupAlignment="0" attributes="0">
<Group type="102" alignment="0" attributes="0"> <Group type="102" alignment="0" attributes="0">
<Group type="103" groupAlignment="0" attributes="0"> <EmptySpace min="-2" pref="5" max="-2" attributes="0"/>
<Component id="backButton" min="-2" pref="26" max="-2" attributes="1"/> <Group type="103" groupAlignment="1" attributes="0">
<Component id="forwardButton" min="-2" pref="26" max="-2" attributes="1"/> <Component id="forwardButton" min="-2" pref="26" max="-2" attributes="1"/>
<Component id="backButton" min="-2" pref="26" max="-2" attributes="1"/>
<Component id="showRejectedCheckBox" min="-2" max="-2" attributes="0"/>
</Group> </Group>
<EmptySpace min="0" pref="0" max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
<Component id="jSeparator1" min="-2" pref="1" max="-2" attributes="0"/> <Component id="jScrollPane1" min="-2" pref="838" max="-2" attributes="0"/>
<EmptySpace min="-2" pref="0" max="-2" attributes="0"/>
<Component id="jScrollPane1" pref="860" max="32767" attributes="0"/>
<EmptySpace max="-2" attributes="0"/> <EmptySpace max="-2" attributes="0"/>
</Group> </Group>
</Group> </Group>
@ -122,7 +123,12 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="forwardButtonActionPerformed"/> <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="forwardButtonActionPerformed"/>
</Events> </Events>
</Component> </Component>
<Component class="javax.swing.JSeparator" name="jSeparator1"> <Component class="javax.swing.JCheckBox" name="showRejectedCheckBox">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/sleuthkit/autopsy/directorytree/Bundle.properties" key="DirectoryTreeTopComponent.showRejectedCheckBox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
</Property>
</Properties>
</Component> </Component>
</SubComponents> </SubComponents>
</Form> </Form>

49
Core/src/org/sleuthkit/autopsy/directorytree/DirectoryTreeTopComponent.java
View File

@ -1,7 +1,7 @@
/* /*
* Autopsy Forensic Browser * Autopsy Forensic Browser
* *
* Copyright 2011-2015 Basis Technology Corp. * Copyright 2011-2016 Basis Technology Corp.
* Contact: carrier <at> sleuthkit <dot> org * Contact: carrier <at> sleuthkit <dot> org
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
@ -57,10 +57,10 @@ import org.sleuthkit.autopsy.corecomponents.DataResultTopComponent;
import org.sleuthkit.autopsy.corecomponents.TableFilterNode; import org.sleuthkit.autopsy.corecomponents.TableFilterNode;
import org.sleuthkit.autopsy.coreutils.Logger; import org.sleuthkit.autopsy.coreutils.Logger;
import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil; import org.sleuthkit.autopsy.coreutils.MessageNotifyUtil;
import org.sleuthkit.autopsy.datamodel.Accounts;
import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode; import org.sleuthkit.autopsy.datamodel.BlackboardArtifactNode;
import org.sleuthkit.autopsy.datamodel.DataSources; import org.sleuthkit.autopsy.datamodel.DataSources;
import org.sleuthkit.autopsy.datamodel.DataSourcesNode; import org.sleuthkit.autopsy.datamodel.DataSourcesNode;
import org.sleuthkit.autopsy.datamodel.DisplayableItemNode;
import org.sleuthkit.autopsy.datamodel.ExtractedContent; import org.sleuthkit.autopsy.datamodel.ExtractedContent;
import org.sleuthkit.autopsy.datamodel.KeywordHits; import org.sleuthkit.autopsy.datamodel.KeywordHits;
import org.sleuthkit.autopsy.datamodel.KnownFileFilterNode; import org.sleuthkit.autopsy.datamodel.KnownFileFilterNode;
@ -164,65 +164,68 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
jScrollPane1 = new BeanTreeView(); jScrollPane1 = new BeanTreeView();
backButton = new javax.swing.JButton(); backButton = new javax.swing.JButton();
forwardButton = new javax.swing.JButton(); forwardButton = new javax.swing.JButton();
jSeparator1 = new javax.swing.JSeparator(); showRejectedCheckBox = new javax.swing.JCheckBox();
jScrollPane1.setBorder(null); jScrollPane1.setBorder(null);
backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back.png"))); // NOI18N NON-NLS backButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back.png"))); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(backButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.backButton.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(backButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.backButton.text")); // NOI18N
backButton.setBorderPainted(false); backButton.setBorderPainted(false);
backButton.setContentAreaFilled(false); backButton.setContentAreaFilled(false);
backButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png"))); // NOI18N NON-NLS backButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_disabled.png"))); // NOI18N
backButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); backButton.setMargin(new java.awt.Insets(2, 0, 2, 0));
backButton.setMaximumSize(new java.awt.Dimension(55, 100)); backButton.setMaximumSize(new java.awt.Dimension(55, 100));
backButton.setMinimumSize(new java.awt.Dimension(5, 5)); backButton.setMinimumSize(new java.awt.Dimension(5, 5));
backButton.setPreferredSize(new java.awt.Dimension(23, 23)); backButton.setPreferredSize(new java.awt.Dimension(23, 23));
backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png"))); // NOI18N NON-NLS backButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_back_hover.png"))); // NOI18N
backButton.addActionListener(new java.awt.event.ActionListener() { backButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
backButtonActionPerformed(evt); backButtonActionPerformed(evt);
} }
}); });
forwardButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward.png"))); // NOI18N NON-NLS forwardButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward.png"))); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(forwardButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.forwardButton.text")); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(forwardButton, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.forwardButton.text")); // NOI18N
forwardButton.setBorderPainted(false); forwardButton.setBorderPainted(false);
forwardButton.setContentAreaFilled(false); forwardButton.setContentAreaFilled(false);
forwardButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png"))); // NOI18N NON-NLS forwardButton.setDisabledIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_disabled.png"))); // NOI18N
forwardButton.setMargin(new java.awt.Insets(2, 0, 2, 0)); forwardButton.setMargin(new java.awt.Insets(2, 0, 2, 0));
forwardButton.setMaximumSize(new java.awt.Dimension(55, 100)); forwardButton.setMaximumSize(new java.awt.Dimension(55, 100));
forwardButton.setMinimumSize(new java.awt.Dimension(5, 5)); forwardButton.setMinimumSize(new java.awt.Dimension(5, 5));
forwardButton.setPreferredSize(new java.awt.Dimension(23, 23)); forwardButton.setPreferredSize(new java.awt.Dimension(23, 23));
forwardButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png"))); // NOI18N NON-NLS forwardButton.setRolloverIcon(new javax.swing.ImageIcon(getClass().getResource("/org/sleuthkit/autopsy/directorytree/btn_step_forward_hover.png"))); // NOI18N
forwardButton.addActionListener(new java.awt.event.ActionListener() { forwardButton.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent evt) { public void actionPerformed(java.awt.event.ActionEvent evt) {
forwardButtonActionPerformed(evt); forwardButtonActionPerformed(evt);
} }
}); });
org.openide.awt.Mnemonics.setLocalizedText(showRejectedCheckBox, org.openide.util.NbBundle.getMessage(DirectoryTreeTopComponent.class, "DirectoryTreeTopComponent.showRejectedCheckBox.text")); // NOI18N
javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this); javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout); this.setLayout(layout);
layout.setHorizontalGroup( layout.setHorizontalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addContainerGap() .addGap(5, 5, 5)
.addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, 0) .addGap(0, 0, 0)
.addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 23, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap(206, Short.MAX_VALUE)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 46, Short.MAX_VALUE)
.addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE) .addComponent(showRejectedCheckBox)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 262, Short.MAX_VALUE) .addContainerGap())
); );
layout.setVerticalGroup( layout.setVerticalGroup(
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
.addGroup(layout.createSequentialGroup() .addGroup(layout.createSequentialGroup()
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGap(5, 5, 5)
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
.addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(backButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)
.addComponent(forwardButton, javax.swing.GroupLayout.PREFERRED_SIZE, 26, javax.swing.GroupLayout.PREFERRED_SIZE)) .addComponent(showRejectedCheckBox))
.addGap(0, 0, 0) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
.addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 1, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 838, javax.swing.GroupLayout.PREFERRED_SIZE)
.addGap(0, 0, 0)
.addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 860, Short.MAX_VALUE)
.addContainerGap()) .addContainerGap())
); );
}// </editor-fold>//GEN-END:initComponents }// </editor-fold>//GEN-END:initComponents
@ -275,11 +278,12 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
this.setCursor(null); this.setCursor(null);
}//GEN-LAST:event_forwardButtonActionPerformed }//GEN-LAST:event_forwardButtonActionPerformed
// Variables declaration - do not modify//GEN-BEGIN:variables // Variables declaration - do not modify//GEN-BEGIN:variables
private javax.swing.JButton backButton; private javax.swing.JButton backButton;
private javax.swing.JButton forwardButton; private javax.swing.JButton forwardButton;
private javax.swing.JScrollPane jScrollPane1; private javax.swing.JScrollPane jScrollPane1;
private javax.swing.JSeparator jSeparator1; private javax.swing.JCheckBox showRejectedCheckBox;
// End of variables declaration//GEN-END:variables // End of variables declaration//GEN-END:variables
/** /**
@ -356,6 +360,7 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
items.add(new Tags()); items.add(new Tags());
items.add(new Reports()); items.add(new Reports());
contentChildren = new RootContentChildren(items); contentChildren = new RootContentChildren(items);
Node root = new AbstractNode(contentChildren) { Node root = new AbstractNode(contentChildren) {
/** /**
* to override the right click action in the white blank * to override the right click action in the white blank
@ -399,6 +404,10 @@ public final class DirectoryTreeTopComponent extends TopComponent implements Dat
tree.expandNode(resultsChilds.findChild(KeywordHits.NAME)); tree.expandNode(resultsChilds.findChild(KeywordHits.NAME));
tree.expandNode(resultsChilds.findChild(ExtractedContent.NAME)); tree.expandNode(resultsChilds.findChild(ExtractedContent.NAME));
Accounts accounts = resultsChilds.findChild(Accounts.NAME).getLookup().lookup(Accounts.class);
showRejectedCheckBox.setAction(accounts.newToggleShowRejectedAction());
showRejectedCheckBox.setSelected(false);
Node views = childNodes.findChild(ViewsNode.NAME); Node views = childNodes.findChild(ViewsNode.NAME);
Children viewsChilds = views.getChildren(); Children viewsChilds = views.getChildren();
for (Node n : viewsChilds.getNodes()) { for (Node n : viewsChilds.getNodes()) {

1
KeywordSearch/build.xml
View File

@ -36,6 +36,7 @@
</target> </target>
<target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy"> <target name="init" depends="basic-init,files-init,build-init,-javac-init,init-ivy">

1
KeywordSearch/nbproject/project.properties
View File

@ -51,6 +51,7 @@ file.reference.vorbis-java-tika-0.1.jar=release/modules/ext/vorbis-java-tika-0.1
file.reference.wstx-asl-3.2.7.jar=release/modules/ext/wstx-asl-3.2.7.jar file.reference.wstx-asl-3.2.7.jar=release/modules/ext/wstx-asl-3.2.7.jar
file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar file.reference.xmlbeans-2.3.0.jar=release/modules/ext/xmlbeans-2.3.0.jar
file.reference.xmpcore-5.1.2.jar=release/modules/ext/xmpcore-5.1.2.jar file.reference.xmpcore-5.1.2.jar=release/modules/ext/xmpcore-5.1.2.jar
file.reference.xmpcore-5.1.2.jar=release/modules/ext/xmpcore-5.1.2.jar
javac.source=1.8 javac.source=1.8
javac.compilerargs=-Xlint -Xlint:-serial javac.compilerargs=-Xlint -Xlint:-serial
license.file=../LICENSE-2.0.txt license.file=../LICENSE-2.0.txt

2
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/KeywordSearchList.java
View File

@ -43,7 +43,7 @@ abstract class KeywordSearchList {
private static final String IP_ADDRESS_REGEX = "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])"; //NON-NLS private static final String IP_ADDRESS_REGEX = "(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])"; //NON-NLS
private static final String EMAIL_ADDRESS_REGEX = "(?=.{8})[a-z0-9%+_-]+(?:\\.[a-z0-9%+_-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z]{2,4}(?<!\\.txt|\\.exe|\\.dll|\\.jpg|\\.xml)"; //NON-NLS private static final String EMAIL_ADDRESS_REGEX = "(?=.{8})[a-z0-9%+_-]+(?:\\.[a-z0-9%+_-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z]{2,4}(?<!\\.txt|\\.exe|\\.dll|\\.jpg|\\.xml)"; //NON-NLS
private static final String URL_REGEX = "((((ht|f)tp(s?))\\://)|www\\.)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,5})(\\:[0-9]+)*(/($|[a-zA-Z0-9\\.\\,\\;\\?\\'\\\\+&amp;%\\$#\\=~_\\-]+))*"; //NON-NLS private static final String URL_REGEX = "((((ht|f)tp(s?))\\://)|www\\.)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,5})(\\:[0-9]+)*(/($|[a-zA-Z0-9\\.\\,\\;\\?\\'\\\\+&amp;%\\$#\\=~_\\-]+))*"; //NON-NLS
private static final String CCN_REGEX = ".*[3456]\\d{11,18}.*"; //12-19 digits. first digit is 3,4,5, or 6 //NON-NLS private static final String CCN_REGEX = ".*[3456]([ -]?\\d){11,18}.*"; //12-19 digits, with possible single spaces or dashes in between. first digit is 3,4,5, or 6 //NON-NLS
protected String filePath; protected String filePath;
Map<String, KeywordList> theLists; //the keyword data Map<String, KeywordList> theLists; //the keyword data

69
KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/TermComponentQuery.java
View File

@ -19,6 +19,7 @@
// //
package org.sleuthkit.autopsy.keywordsearch; package org.sleuthkit.autopsy.keywordsearch;
import com.google.common.base.CharMatcher;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.HashSet; import java.util.HashSet;
@ -65,7 +66,7 @@ final class TermComponentQuery implements KeywordSearchQuery {
*/ */
private static final Pattern TRACK2_PATTERN = Pattern.compile( private static final Pattern TRACK2_PATTERN = Pattern.compile(
"[:;<=>?]?" //(optional)start sentinel //NON-NLS "[:;<=>?]?" //(optional)start sentinel //NON-NLS
+ "(?<accountNumber>[3456]\\d{11,18})" //12-19 digit ccn, first digit is 3, 4, 5, or 6 //NON-NLS + "(?<accountNumber>[3456]([ -]?\\d){11,18})" //12-19 digits, with possible single spaces or dashes in between. first digit is 3,4,5, or 6 //NON-NLS
+ "(?:[:;<=>?]" //separator //NON-NLS + "(?:[:;<=>?]" //separator //NON-NLS
+ "(?:(?<expiration>\\d{4})" //4 digit expiration date YYMM //NON-NLS + "(?:(?<expiration>\\d{4})" //4 digit expiration date YYMM //NON-NLS
+ "(?:(?<serviceCode>\\d{3})" //3 digit service code //NON-NLS + "(?:(?<serviceCode>\\d{3})" //3 digit service code //NON-NLS
@ -85,7 +86,7 @@ final class TermComponentQuery implements KeywordSearchQuery {
"(?:" //begin nested optinal group //NON-NLS "(?:" //begin nested optinal group //NON-NLS
+ "%?" //optional start sentinal: % //NON-NLS + "%?" //optional start sentinal: % //NON-NLS
+ "B)?" //format code //NON-NLS + "B)?" //format code //NON-NLS
+ "(?<accountNumber>[3456]\\d{11,18})" //12-19 digit ccn, first digit is 3, 4, 5, or 6 //NON-NLS + "(?<accountNumber>[3456]([ -]?\\d){11,18})" //12-19 digits, with possible single spaces or dashes in between. first digit is 3,4,5, or 6 //NON-NLS
+ "\\^" //separator //NON-NLS + "\\^" //separator //NON-NLS
+ "(?<name>[^^]{2,26})" //2-26 charachter name, not containing ^ //NON-NLS + "(?<name>[^^]{2,26})" //2-26 charachter name, not containing ^ //NON-NLS
+ "(?:\\^" //separator //NON-NLS + "(?:\\^" //separator //NON-NLS
@ -95,7 +96,7 @@ final class TermComponentQuery implements KeywordSearchQuery {
+ "(?:\\?" // end sentinal: ? //NON-NLS + "(?:\\?" // end sentinal: ? //NON-NLS
+ "(?<LRC>.)" //longitudinal redundancy check //NON-NLS + "(?<LRC>.)" //longitudinal redundancy check //NON-NLS
+ "?)?)?)?)?)?");//close nested optional groups //NON-NLS + "?)?)?)?)?)?");//close nested optional groups //NON-NLS
private static final Pattern CCN_PATTERN = Pattern.compile("(?<ccn>[3456]\\d{11,18})"); //12-19 digit ccn, first digit is 3, 4, 5, or 6 //NON-NLS private static final Pattern CCN_PATTERN = Pattern.compile("(?<ccn>[3456]([ -]?\\d){11,18})"); //12-19 digits, with possible single spaces or dashes in between. first digit is 3,4,5, or 6 //NON-NLS
private static final LuhnCheckDigit LUHN_CHECK = new LuhnCheckDigit(); private static final LuhnCheckDigit LUHN_CHECK = new LuhnCheckDigit();
//corresponds to field in Solr schema, analyzed with white-space tokenizer only //corresponds to field in Solr schema, analyzed with white-space tokenizer only
@ -114,7 +115,6 @@ final class TermComponentQuery implements KeywordSearchQuery {
TermComponentQuery(KeywordList keywordList, Keyword keyword) { TermComponentQuery(KeywordList keywordList, Keyword keyword) {
this.keyword = keyword; this.keyword = keyword;
this.keywordList = keywordList; this.keywordList = keywordList;
this.escapedQuery = keyword.getQuery(); this.escapedQuery = keyword.getQuery();
} }
@ -209,28 +209,26 @@ final class TermComponentQuery implements KeywordSearchQuery {
String ccn = newArtifact.getAttribute(ACCOUNT_NUMBER_TYPE).getValueString(); String ccn = newArtifact.getAttribute(ACCOUNT_NUMBER_TYPE).getValueString();
final int iin = Integer.parseInt(ccn.substring(0, 8)); final int iin = Integer.parseInt(ccn.substring(0, 8));
Accounts.IINInfo iinRange = Accounts.getIINInfo(iin); Accounts.IINInfo iinInfo = Accounts.getIINInfo(iin);
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_CREDIT_CARD_SCHEME, MODULE_NAME, iinRange.getScheme()));
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PAYMENT_CARD_TYPE, MODULE_NAME, iinRange.getCardType()));
if (StringUtils.isNotBlank(iinRange.getBrand())) {
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_BRAND, MODULE_NAME, iinRange.getBrand()));
}
if (StringUtils.isNotBlank(iinRange.getBankName())) {
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_BANK_NAME, MODULE_NAME, iinRange.getBankName()));
}
if (StringUtils.isNotBlank(iinRange.getBankPhoneNumber())) {
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_PHONE_NUMBER, MODULE_NAME, iinRange.getBankPhoneNumber()));
}
if (StringUtils.isNotBlank(iinRange.getBankURL())) {
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL, MODULE_NAME, iinRange.getBankURL()));
}
if (StringUtils.isNotBlank(iinRange.getCountry())) {
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_COUNTRY, MODULE_NAME, iinRange.getCountry()));
}
if (StringUtils.isNotBlank(iinRange.getBankCity())) {
newArtifact.addAttribute(new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_CITY, MODULE_NAME, iinRange.getBankCity()));
}
if (iinInfo != null) {
iinInfo.getScheme().ifPresent(scheme
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_CREDIT_CARD_SCHEME, scheme));
iinInfo.getCardType().ifPresent(cardType
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_PAYMENT_CARD_TYPE, cardType));
iinInfo.getBrand().ifPresent(brand
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_BRAND, brand));
iinInfo.getBankName().ifPresent(bankName
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_BANK_NAME, bankName));
iinInfo.getBankPhoneNumber().ifPresent(phoneNumber
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_PHONE_NUMBER, phoneNumber));
iinInfo.getBankURL().ifPresent(url
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_URL, url));
iinInfo.getCountry().ifPresent(country
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_COUNTRY, country));
iinInfo.getBankCity().ifPresent(city
-> addAttributeSafe(newArtifact, ATTRIBUTE_TYPE.TSK_CITY, city));
}
} else { } else {
//make keyword hit artifact //make keyword hit artifact
newArtifact = hit.getContent().newArtifact(ARTIFACT_TYPE.TSK_KEYWORD_HIT); newArtifact = hit.getContent().newArtifact(ARTIFACT_TYPE.TSK_KEYWORD_HIT);
@ -269,6 +267,22 @@ final class TermComponentQuery implements KeywordSearchQuery {
} }
} }
/**
* Add an attribute of the given type and value to the given artifact,
* catching and logging any exceptions.
*
* @param newArtifact The artifact to add an attribute to.
* @param AtributeType The type of attribute to add.
* @param attributeValue The value of the attribute to add.
*/
static private void addAttributeSafe(BlackboardArtifact newArtifact, ATTRIBUTE_TYPE AtributeType, String attributeValue) {
try {
newArtifact.addAttribute(new BlackboardAttribute(AtributeType, MODULE_NAME, attributeValue));
} catch (IllegalArgumentException | TskCoreException ex) {
LOGGER.log(Level.SEVERE, "Error adding bb attribute to artifact", ex); //NON-NLS
}
}
@Override @Override
public QueryResults performQuery() throws NoOpenCoreException { public QueryResults performQuery() throws NoOpenCoreException {
/* /*
@ -311,7 +325,7 @@ final class TermComponentQuery implements KeywordSearchQuery {
//If the keyword is a credit card number, pass it through luhn validator //If the keyword is a credit card number, pass it through luhn validator
Matcher matcher = CCN_PATTERN.matcher(term.getTerm()); Matcher matcher = CCN_PATTERN.matcher(term.getTerm());
matcher.find(); matcher.find();
final String ccn = matcher.group("ccn"); final String ccn = CharMatcher.anyOf(" -").removeFrom(matcher.group("ccn"));
if (false == LUHN_CHECK.isValid(ccn)) { if (false == LUHN_CHECK.isValid(ccn)) {
continue; //if the hit does not pass the luhn check, skip it. continue; //if the hit does not pass the luhn check, skip it.
} }
@ -371,6 +385,9 @@ final class TermComponentQuery implements KeywordSearchQuery {
BlackboardAttribute.Type type = new BlackboardAttribute.Type(attrType); BlackboardAttribute.Type type = new BlackboardAttribute.Type(attrType);
if (artifact.getAttribute(type) == null) { if (artifact.getAttribute(type) == null) {
String value = matcher.group(groupName); String value = matcher.group(groupName);
if (attrType.equals(ATTRIBUTE_TYPE.TSK_ACCOUNT_NUMBER)) {
value = CharMatcher.anyOf(" -").removeFrom(value);
}
if (StringUtils.isNotBlank(value)) { if (StringUtils.isNotBlank(value)) {
artifact.addAttribute(new BlackboardAttribute(type, MODULE_NAME, value)); artifact.addAttribute(new BlackboardAttribute(type, MODULE_NAME, value));
} }