Remove discarded first draft files for Jython ingest modules, improve samples

Core/src/org/sleuthkit/autopsy/examples/SampleJythonIngestModule.py

@@ -1,10 +1,67 @@
 import jarray
-from org.sleuthkit.autopsy.ingest import FileIngestModule
+from java.lang import System
+from org.sleuthkit.datamodel import SleuthkitCase
 from org.sleuthkit.datamodel import AbstractFile
 from org.sleuthkit.datamodel import ReadContentInputStream
 from org.sleuthkit.datamodel import BlackboardArtifact
 from org.sleuthkit.datamodel import BlackboardAttribute
+from org.sleuthkit.autopsy.ingest import IngestModule
+from org.sleuthkit.autopsy.ingest import DataSourceIngestModule
+from org.sleuthkit.autopsy.ingest import FileIngestModule
 from org.sleuthkit.autopsy.ingest import IngestModuleFactoryAdapter
+from org.sleuthkit.autopsy.ingest import IngestMessage
+from org.sleuthkit.autopsy.ingest import IngestServices
+from org.sleuthkit.autopsy.casemodule import Case
+from org.sleuthkit.autopsy.casemodule.services import Services
+from org.sleuthkit.autopsy.casemodule.services import FileManager
+
+class SampleJythonDataSourceIngestModule(DataSourceIngestModule):
+
+    def __init__(self):
+        self.context = None
+
+    def startUp(self, context):
+        self.context = context
+
+    def process(self, dataSource, progressBar):
+		if self.context.isJobCancelled():
+			return IngestModule.ProcessResult.OK
+
+		# There are two tasks to do.
+		progressBar.switchToDeterminate(2)
+
+		autopsyCase = Case.getCurrentCase()
+		sleuthkitCase = autopsyCase.getSleuthkitCase()
+		services = Services(sleuthkitCase)
+		fileManager = services.getFileManager()
+
+		#Get count of files with .doc extension.
+		fileCount = 0;
+		docFiles = fileManager.findFiles(dataSource, "%.doc")
+		for docFile in docFiles:
+			fileCount += 1
+		progressBar.progress(1)
+
+		if self.context.isJobCancelled():
+			return IngestModule.ProcessResult.OK
+
+		# Get files by creation time.
+		currentTime = System.currentTimeMillis() / 1000
+		minTime = currentTime - (14 * 24 * 60 * 60) # Go back two weeks.
+		otherFiles = sleuthkitCase.findFilesWhere("crtime > %d" % minTime)
+		for otherFile in otherFiles:
+			fileCount += 1
+		progressBar.progress(1);
+
+		if self.context.isJobCancelled():
+			return IngestModule.ProcessResult.OK;
+
+		#Post a message to the ingest messages in box.
+		# message = IngestMessage.createMessage(IngestMessage.MessageType.DATA, "SampleJythonDataSourceIngestModule", "Found %d files" % fileCount)
+		# IngestServices.getInstance().postMessage(message)
+
+		return IngestModule.ProcessResult.OK;
+
         
 class SampleJythonFileIngestModule(FileIngestModule):
 
@@ -12,6 +69,12 @@ class SampleJythonFileIngestModule(FileIngestModule):
         pass
 
     def process(self, file):
+		# If the file has a txt extension, post an artifact to the blackboard.
+		if file.getName().endswith("txt"):
+			art = file.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)
+			att = BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID(), "SampleJythonFileIngestModule", "Text file")
+			art.addAttribute(att)
+
 			# Read the contents of the file.
 			inputStream = ReadContentInputStream(file)
 			buffer = jarray.zeros(1024, "b")
@@ -21,12 +84,15 @@ class SampleJythonFileIngestModule(FileIngestModule):
 				totLen = totLen + len
 				len = inputStream.read(buffer)
 
-        # If the file has a txtr extension, post an artifact to the blackboard.
+			# Send the size of the file to the ingest messages in box. 
-        if file.getName().endswith("txt"):
+			#msgText = "Size of %s is %d bytes" % ((file.getName(), totLen))
-            # Make an artifact
+			#message = IngestMessage.createMessage(IngestMessage.MessageType.DATA, "SampleJythonFileIngestModule", msgText)
-            art = file.newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_INTERESTING_FILE_HIT)
+			#ingestServices = IngestServices.getInstance().postMessage(message)
-            att = BlackboardAttribute(BlackboardAttribute.ATTRIBUTE_TYPE.TSK_SET_NAME.getTypeID(), "pythonModule", "Text FILE")
+
-            art.addAttribute(att)
+		return IngestModule.ProcessResult.OK
+
+    def shutDown(self):
+        pass
 
 class SampleJythonIngestModuleFactory(IngestModuleFactoryAdapter):
 
@@ -39,6 +105,12 @@ class SampleJythonIngestModuleFactory(IngestModuleFactoryAdapter):
     def getModuleVersionNumber(self):
         return "1.0"
 
+    def isDataSourceIngestModuleFactory(self):
+        return True
+
+    def createDataSourceIngestModule(self, ingestOptions):
+        return SampleJythonDataSourceIngestModule()
+
     def isFileIngestModuleFactory(self):
         return True
 

Core/src/org/sleuthkit/autopsy/examples/SampleJythonIngestModuleMetadata.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<IngestModule>
-	<DisplayName>Sample Jython Ingest Module</DisplayName>
-	<Description>A sample Jython ingest module.</Description>
-	<Version>1.0</Version>
-	<DataSourceIngestModuleClassName>SampleJythonDataSourceIngestModule</DataSourceIngestModule>
-	<FileIngestModuleClassName>SampleJythonFileIngestModule</FileIngestModule>
-</IngestModule>

Core/src/org/sleuthkit/autopsy/ingest/IngestModuleFactoryLoader.java

@@ -31,7 +31,6 @@ import org.python.util.PythonInterpreter;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.examples.SampleExecutableIngestModuleFactory;
 import org.sleuthkit.autopsy.examples.SampleIngestModuleFactory;
-import org.sleuthkit.autopsy.ingest.JythonIngestModuleFactory.JythonIngestModuleFactoryException;
 import org.sleuthkit.autopsy.modules.android.AndroidModuleFactory;
 import org.sleuthkit.autopsy.modules.e01verify.E01VerifierModuleFactory;
 import org.sleuthkit.autopsy.modules.exif.ExifParserModuleFactory;