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

Fixed regression.py and USB_DATA.

Browse Source 
Signed-off-by: Smoss <Smoss117@gmail.com>
This commit is contained in:
Smoss 2013-06-24 12:20:31 -04:00
parent 9eac53937d
commit 46088288a9
4 changed files with 1738 additions and 1731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/ExtractUSB.java
View File

@ -20,15 +20,14 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/** /**
* In order to update the USB database you must first copy it from a the internet * In order to update the USB database you must first copy it from
* into a text file named "USB_DATA". Then remove all lines from below the entry * http://www.linux-usb.org/usb.ids into a text file named "USB_DATA". Then
* "ee38 Digital Storage Oscilloscope" and put them in another folder, for now * remove all lines from below the entry "ee38 Digital Storage Oscilloscope" and
* labeled "OTHER_USB_DATA", this data is currently unused but may be used in the * put them in another folder, for now labeled "OTHER_USB_DATA", this data is
* future. Then remove the whole line * currently unused but may be used in the future. Then remove the whole line "
* " 4004 Minolta Dimage Scan Elite II AF-2920 (2888)" and the line "#typo?" * 4004 Minolta Dimage Scan Elite II AF-2920 (2888)" and the line "#typo?" above
* above it. * it. The file is from the date May 24th, 2013.
*/ */
package org.sleuthkit.autopsy.recentactivity; package org.sleuthkit.autopsy.recentactivity;
@ -41,6 +40,7 @@ import java.util.Scanner;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.sleuthkit.autopsy.coreutils.PlatformUtil; import org.sleuthkit.autopsy.coreutils.PlatformUtil;
public class ExtractUSB { public class ExtractUSB {
private HashMap<String, USBInfo> devices; private HashMap<String, USBInfo> devices;
@ -105,6 +105,9 @@ public class ExtractUSB {
} else { } else {
line = dat.nextLine(); line = dat.nextLine();
} }
if (line.startsWith("C 00")) {
return;
}
} }
} }
} }
@ -126,7 +129,8 @@ public class ExtractUSB {
public String getProduct() { public String getProduct() {
return product; return product;
} }
public String toString(){
public String toString() {
return vendor + product; return vendor + product;
} }
} }

1698
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/OTHER_USB_DATA.txt
View File

File diff suppressed because it is too large Load Diff

1741
RecentActivity/src/org/sleuthkit/autopsy/recentactivity/USB_DATA.txt
View File

File diff suppressed because it is too large Load Diff

8
test/script/regression.py
View File

@ -751,10 +751,10 @@ class TestData:
class Reports: class Reports:
def generate_reports(csv_path, database, test_img): def generate_reports(csv_path, database, test_img):
Reports.generate_html(database, test_img) Reports._generate_html(database, test_img)
Reports.generate_csv(csv_path, database, test_img) Reports._generate_csv(csv_path, database, test_img)
# Generates the HTML log file # Generates the HTML log file
def generate_html(database, test_img): def _generate_html(database, test_img):
# If the file doesn't exist yet, this is the first test_case to run for # If the file doesn't exist yet, this is the first test_case to run for
# this test, so we need to make the start of the html log # this test, so we need to make the start of the html log
global imgfail global imgfail
@ -924,7 +924,7 @@ class Reports:
links.append("<a href='#" + name + "(0)'>" + name + "</a>") links.append("<a href='#" + name + "(0)'>" + name + "</a>")
html.write("<p align='center'>" + (" | ".join(links)) + "</p>") html.write("<p align='center'>" + (" | ".join(links)) + "</p>")
# Generate the CSV log file # Generate the CSV log file
def generate_csv(csv_path, database, test_img): def _generate_csv(csv_path, database, test_img):
try: try:
# If the CSV file hasn't already been generated, this is the # If the CSV file hasn't already been generated, this is the
# first run, and we need to add the column names # first run, and we need to add the column names