4941 Commits

Author SHA1 Message Date
Samuel H. Kenyon
cba5688987 Mismatch configuration is now loaded from an XML file. 2013-12-13 17:32:08 -05:00
Jeff Wallace
2c7eb4ce88 Link to content in HTML reports for blackboard artifact tags that refer to image files. 2013-12-13 16:22:55 -05:00
raman-bt
be83a65e2e Content viewer displays the "associated artifact", in case the selected node has an artifact with ASSOCAITED_ARTIFACT attribute. 2013-12-13 15:48:55 -05:00
Jeff Wallace
199c347a79 Updated attributes associated with encryption artifact. 2013-12-13 13:28:17 -05:00
raman-bt
eae37fdc76 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into develop 2013-12-13 13:17:28 -05:00
Jeff Wallace
78d44473f8 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into encryption
Conflicts:
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-13 13:03:50 -05:00
Samuel H. Kenyon
0d1d674780 FileExtMismatchIngestModule now has its own artifact type. Also moved file type id detector up in the pipeline. 2013-12-12 18:57:46 -05:00
Samuel H. Kenyon
74f1b21019 Added more allowed plaintext filename extensions. 2013-12-12 18:01:28 -05:00
Jeff Wallace
3f2e8d4fa2 Merge branch 'develop' of https://github.com/sleuthkit/autopsy into newMboxParser
Conflicts:
	Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
2013-12-12 15:34:33 -05:00
Jeff Wallace
7290b1f052 line endings 2013-12-12 15:13:48 -05:00
Jeff Wallace
d11df43a1d Merge branch 'develop' of https://github.com/sleuthkit/autopsy into ewfVerifyIngest
Conflicts:
	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
	nbproject/project.properties
2013-12-12 14:58:21 -05:00
Jeff Wallace
183c333e28 line endings 2013-12-12 14:54:33 -05:00
Jeff Wallace
d414130570 line endings 2013-12-12 14:53:45 -05:00
Jeff Wallace
c9b92a6f9f Add thumbnails for content and blackboard artifact tags for the html report. 2013-12-12 14:30:55 -05:00
Jeff Wallace
20b093a022 Extracted thumbnail generation to a utility class. 2013-12-12 11:04:49 -05:00
Richard Cordovano
c842c11119 Merge pull request #396 from rcordovano/report_fix_merge
Report performance improvements merge from master
2013-12-11 14:54:21 -08:00
Richard Cordovano
175e4eea6b Finish merge cleanup 2013-12-11 17:36:44 -05:00
Jeff Wallace
a635f9fc85 Removed stopwatch and debug printlns.
Conflicts:

	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-11 17:34:33 -05:00
Jeff Wallace
60ae393da2 Moved methods only used by ArtifactData into the ArtifactData class. Cache rowData for each ArtifactData.
Conflicts:

	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-11 17:31:32 -05:00
Jeff Wallace
32be04828f Performance improvement for artifact sorting.
Conflicts:

	Core/src/org/sleuthkit/autopsy/report/ReportGenerator.java
2013-12-11 16:45:29 -05:00
raman-bt
2dd64c940d Display Interesting Items (Interesting Files, Interesting Artifacts) directly in the "Results" tree instead of under "Extracted Content". 2013-12-11 12:41:10 -05:00
Richard Cordovano
565cac3af8 Merge pull request #392 from rcordovano/hashdb_config_update_backup
Notify user, make backup during hashdb config file format update
2013-12-10 08:32:38 -08:00
Richard Cordovano
0cb7f57a69 Notify user, make backup during hashdb config file format update
Added code to the HashDbManager class to make a back up copy of old format/schema hash database configuration files. A message box is displayed to the user to let the user know the back up has occurred and where the back up file is located.
2013-12-10 11:27:53 -05:00
Richard Cordovano
ba60ced898 Merge pull request #390 from rcordovano/lazy_props
Fix DataResultViewerTable lazy node creation bugs
2013-12-10 06:00:45 -08:00
Richard Cordovano
53cbe9ca61 Merge pull request #389 from rcordovano/case_wizard
Adapt hashdb, keywordsearch config panels for wider use
2013-12-10 05:53:08 -08:00
Richard Cordovano
f4bab2d8bc Fix DataResultViewerTable lazy node creation bugs 2013-12-09 17:48:20 -05:00
Richard Cordovano
49374b5354 Adapt hashdb, keywordsearch config panels for wide use
Made these core configuration mechanisms uniform in support for wider use.
The simple and advanced config panels are now all public with public load/store methods.
2013-12-08 08:54:48 -05:00
Samuel H. Kenyon
f39ca5e573 Added some more video formats to SigTypeToExtMap. 2013-12-06 18:18:03 -05:00
Samuel H. Kenyon
97e20f799e Added another extension (.milk == winamp viz config file). 2013-12-06 12:31:17 -05:00
Samuel H. Kenyon
ccd01c2242 Update pipeline config file to force the order of FileTypeIdIngestModule before FileExtMismatchIngestModule. 2013-12-05 18:48:09 -05:00
Samuel H. Kenyon
860575fe7e Add some more extensions that are often plaintext. 2013-12-05 14:40:56 -05:00
Samuel H. Kenyon
3406d93bd6 Treat plaintext extension config file as a resource when opening, not as a file. 2013-12-05 14:39:48 -05:00
Samuel H. Kenyon
03397b2d58 Hopefully this ensures that the file id and mismatch modules will run in the correct ord.er 2013-12-05 13:44:15 -05:00
Jeff Wallace
5fac795587 Updated name of encrption artifact. 2013-12-05 12:09:25 -05:00
Richard Cordovano
95fb091c6b Merge pull request #386 from rcordovano/merge_in_develop-rc1
Merge in develop rc1
2013-12-05 07:41:01 -08:00
Richard Cordovano
4451064cfd Merge branch 'develop-rc1' into merge_in_develop-rc1 2013-12-05 10:37:40 -05:00
Richard Cordovano
f3d164b106 Merge remote-tracking branch 'upstream/develop' into develop 2013-12-05 10:34:44 -05:00
Richard Cordovano
eed57063c7 Fix for scheduling of derived files 2013-12-04 20:46:53 -05:00
Samuel H. Kenyon
800c14e7d5 New more extensive plaintext file extension list. 2013-12-04 17:07:31 -05:00
Samuel H. Kenyon
60d5f9f5aa Load plaintext extensions from a file. 2013-12-04 16:34:37 -05:00
Richard Cordovano
60a241e39c Merge pull request #385 from jawallace/develop-rc1-logical-file-fix
Fixed npe while getting data source name for local files.
2013-12-04 13:20:29 -08:00
Jeff Wallace
a7973e6ce6 Fixed npe while getting data source name for local files. 2013-12-04 16:01:44 -05:00
Jeff Wallace
e5e2c0fc2f Updated uses of new encryption artifact. 2013-12-04 15:58:54 -05:00
Richard Cordovano
bc794f175d Merge pull request #384 from rcordovano/develop-rc1
Corrected handling of always calc hashes flag
2013-12-04 12:33:43 -08:00
Richard Cordovano
509684cebc Corrected handling of always calc hashes flag 2013-12-04 15:31:46 -05:00
Brian Carrier
a77444a8d3 Merge branch 'master' into develop 2013-12-04 12:20:51 -05:00
Brian Carrier
705c0e259d Merge pull request #380 from jawallace/data_source_name
Fixed npe while getting data source name for local files.
2013-12-04 09:19:46 -08:00
Richard Cordovano
8b243e8215 Merge pull request #382 from rcordovano/develop-rc1
Added updating of simple hash db config panel
2013-12-03 13:34:41 -08:00
Richard Cordovano
170e9720ef Added updating of simple hash db config panel 2013-12-03 16:30:17 -05:00
Brian Carrier
81230d4f97 resolved merge conflicts 2013-12-03 14:56:44 -05:00