Commit Graph
18776 Commits
Author SHA1 Message Date
Richard Cordovano 6eb83b2ced Merge pull request #737 from shahit2/develop
added double clicking to open .aut files
2015-01-24 14:57:15 -05:00
Richard Cordovano 50c8ab4723 Merge pull request #1014 from APriestman/stix
Stix
2015-01-24 13:46:20 -05:00
Richard Cordovano 1c215d32bb Merge pull request #1013 from esaunders/art_kws_integration
Artifact keyword search integration
2015-01-24 13:36:35 -05:00
APriestman 4c217ea0f7 Merge remote-tracking branch 'upstream/develop' into stix 2015-01-23 13:32:25 -05:00
APriestman 8ac91c2cb8 Combine OS attributes found in the registry. 2015-01-23 13:30:27 -05:00
Eamonn Saunders 65e2246209 Removed Content parameter from TextMarkupLookup.createInstance() method. 2015-01-22 12:33:36 -05:00
Eamonn Saunders 40f5191c15 Data type and comment cleanup. 2015-01-16 12:25:24 -05:00
Eamonn Saunders ae63179745 Removed unused imports. 2015-01-16 11:38:35 -05:00
Eamonn Saunders 8973e8e16e Changed data type of objectId in HighlightedTextMarkup contructors from Long to long. 2015-01-16 11:31:12 -05:00
Eamonn Saunders 4756073248 Backed out artifact indexing code. 2015-01-16 11:30:23 -05:00
esaunders 491de990a1 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into art_kws_integration 2015-01-15 16:06:46 -05:00
Eamonn Saunders 241b06c1a6 - Removed references to the artifact id mask (0x8000000000000000)
- Modified SolrSearchService.indexArtifacts() to ignore artifacts with an artifact_id > 0.
2015-01-15 16:04:54 -05:00
Eamonn Saunders 5aaf9f7363 Added comments for BlackboardArtifactNode.setDisplayName() 2015-01-14 16:36:53 -05:00
Eamonn Saunders f1d9e34d52 When creating a KeyValueQueryContent object in KeywordSearchResultsFactory.createFlatKeys() the name is now set to either a file name or a string indicating which type of artifact produced the keyword hit. 2015-01-14 16:24:16 -05:00
Eamonn Saunders d4663b5f62 Modified display name so that there is some indication in the UI when a keyword hit was on an artifact instead of a file. 2015-01-14 14:36:39 -05:00
Brian Carrier 25258717df Added comments to why dataresultviewertable drops first property. Made ImageNode name be more useful 2015-01-14 12:38:07 -05:00
Brian Carrier 3345c835af Merge branch 'develop' of github.com:sleuthkit/autopsy into develop 2015-01-14 10:19:01 -05:00
Brian Carrier 34bbdb1f57 Changed file extraction so that it replaces : with _ so that attributes are not hidden as ADS 2015-01-14 10:18:43 -05:00
Eamonn Saunders 2aeab97440 Text produced for artifact indexing now includes attribute names and formatted datetimes. 2015-01-13 15:05:17 -05:00
Richard Cordovano a8e24c955d Merge pull request #1012 from rcordovano/user_def_file_types_panel_ordering
Supply missing position attribute in top level registration of FileTypeI...
2015-01-13 11:49:07 -05:00
Richard Cordovano ac1b6a8d8c Supply missing position attribute in top level registration of FileTypeIdOptionsPanelController 2015-01-13 11:47:37 -05:00
Eamonn Saunders 0e80551dda Merge richard/artifact_keyword_search into art_kws_integration 2015-01-09 17:39:45 -05:00
Eamonn Saunders 5b2eb2f8aa - Modified getSolrContent() to call the new Server.getSolrContent() method that takes an object id and a chunk id. 2015-01-09 17:39:09 -05:00
Eamonn Saunders 2240100b72 - Added package scoped methods that get Solr Content given an object id and an optional chunk id.
- Modified getSolrContent() to more robustly handle the situation where the indexed text field may or may not contain a file name.
2015-01-09 17:38:04 -05:00
Eamonn Saunders d7eadb2d0c Added a package scoped getObjectId() method. 2015-01-09 17:34:36 -05:00
Eamonn Saunders 8b55bcde1d Implented an alternate mechanism for determining document/object id. If the node has a HighlightedTextMarkup object, we will use its object id, otherwise we use the Content id. 2015-01-09 17:32:57 -05:00
Richard Cordovano 76884f79c1 Remove KeywordSearchServiceFactory interface and Solr implementation 2015-01-09 15:19:49 -05:00
Richard Cordovano 60ab0a1188 Add Solr Object id to KeyValueQueryContent 2015-01-09 13:51:14 -05:00
Eamonn Saunders 4a098b7694 Exported keywordsearchservice package. 2015-01-09 13:33:17 -05:00
Eamonn Saunders ba73f4ed9a Escape id string being passed into Lucene. 2015-01-09 13:27:31 -05:00
Eamonn Saunders 530b82c30b Merge richard/artifact_keyword_search into art_kws_integration
Resolved conflict in
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedTextMarkup.java
2015-01-09 12:36:41 -05:00
Eamonn Saunders 8c5593bd98 Merge richard/artifact_keyword_search into art_kws_integration
Resolved conflict in
	KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/HighlightedTextMarkup.java
2015-01-09 12:36:20 -05:00
Eamonn Saunders 8ffea0d8d3 Changed getObjectId() to getDocumentId() and correctly mask artifact id. 2015-01-09 12:13:26 -05:00
Eamonn Saunders b4b7e5ca0f Escape the content id string being used in the query filter. 2015-01-09 12:11:22 -05:00
Eamonn Saunders cc97d0dc4b Escape the object id being used in the query filter. 2015-01-09 12:10:11 -05:00
Eamonn Saunders 11c2e2b71b Apply masking to associated artifact id. 2015-01-09 12:08:52 -05:00
Eamonn Saunders a3bdef06a7 Use existing Lucene query escaping method. 2015-01-09 12:08:02 -05:00
Eamonn Saunders d43caca0d5 - Modified SolrSearchService to create 2 index entries for an artifact (a base entry with the masked artifact id and a chunk entry with the content). 2015-01-09 12:02:27 -05:00
Richard Cordovano 7ff428b7c0 Complete first attempt at search/artifact generation for artifact keyword search prototype 2015-01-09 11:48:08 -05:00
Brian Carrier 40731f78b3 Expanded on making report panel more 2015-01-08 23:03:56 -05:00
Richard Cordovano b992035188 Interim checkin: first draft of artifact keyword search hit artifact generation 2015-01-07 17:04:41 -05:00
Eamonn Saunders a9aacc1287 Merge artifact_content_viewer into art_kws_integration 2015-01-07 13:03:45 -05:00
Eamonn Saunders dba254a033 Merge index_artifacts into art_kws_integration 2015-01-07 13:01:56 -05:00
Eamonn Saunders 459d6c8f81 - Added comments and made minor modifications to ExtractedContentViewer.getObjectId() 2015-01-07 12:58:10 -05:00
Eamonn Saunders 7c2a548dd8 Modifications to support displaying indexed artifact text in content viewer:
- Modified HighlightedTestMarkup constructor to take an object id instead of a Content object. The object id can either be for a file or an artifact. The highlighter uses the object id to get the indexed text from Solr.
- Modified RawTextMarkup constructor to take both a Content object and an object id. RawTextMarkup needs the Content object to display messages about whether the file was skipped (because it is a known file) or whether the file content has yet to be indexed.
- Added a method to ExtractedContentViewer to get the correct object id. If the node contains a keyword hit blackboard artifact that contains a TSK_ASSOCIATED_ARTIFACT attribute, the object id is the artifact id of the associated artifact. Otherwise the object id is obtained from the Content object.
2015-01-07 12:52:55 -05:00
Richard Cordovano dfe4c27d30 Interim checkin of changes to the keyword search and hit artifact generation 2015-01-07 11:27:14 -05:00
Richard Cordovano 88a6fba349 Merge pull request #1011 from karlmortensen/close_file_handles
close file handles appropriately
2015-01-05 10:04:59 -05:00
Eamonn Saunders 6576d8c8c6 Initial version of blackboard artifact indexing:
- Added KeywordSearchService and KeywordSearchServiceFactory interfaces to Autopsy core.
- Modified Services.java to load a keyword search service provider and added the getKeywordSearchService() method.
- Added SolrSearchService and SolrSearchServiceFactory to keyword search module.
- Changed Ingester.ingest(ContentStream ...) from private to package scope.
- SolrSearchService.indexArtifact concatenates all attribute values into a single string, sets the document id to art-<artifact-id> and calls Ingester.ingest()
- Modified ExifParserFileIngestModule to pass EXIF artifacts to the artifact indexer.
2015-01-02 13:33:26 -05:00
Karl Mortensen e21acc818c close file handles appropriately 2015-01-02 11:51:26 -05:00
Richard Cordovano 2401b22a8e Merge pull request #1009 from rcordovano/ingest_job_class_synch_fix
Add missing synchronized keyword to IngestJob method
2014-12-29 10:26:14 -05:00