Merge pull request #5118 from dannysmyda/Fix-TskDbDiff-Split-Bug

Fix TskDbDiff CSV Splitting
This commit is contained in:
Richard Cordovano 2019-08-13 15:17:25 -04:00 committed by GitHub
commit 78e204aedd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -11,6 +11,7 @@ import sys
import psycopg2 import psycopg2
import psycopg2.extras import psycopg2.extras
import socket import socket
import csv
class TskDbDiff(object): class TskDbDiff(object):
"""Compares two TSK/Autospy SQLite databases. """Compares two TSK/Autospy SQLite databases.
@ -436,8 +437,8 @@ def normalize_db_entry(line, files_table, vs_parts_table, vs_info_table, fs_info
ig_groups_seen_index = line.find('INSERT INTO "image_gallery_groups_seen"') > -1 or line.find('INSERT INTO image_gallery_groups_seen ') > -1 ig_groups_seen_index = line.find('INSERT INTO "image_gallery_groups_seen"') > -1 or line.find('INSERT INTO image_gallery_groups_seen ') > -1
parens = line[line.find('(') + 1 : line.rfind(')')] parens = line[line.find('(') + 1 : line.rfind(')')]
fields_list = parens.replace(" ", "").split(',') fields_list = list(csv.reader([parens.replace(" ", "")], quotechar="'"))[0]
# remove object ID # remove object ID
if files_index: if files_index:
newLine = ('INSERT INTO "tsk_files" VALUES(' + ', '.join(fields_list[1:]) + ');') newLine = ('INSERT INTO "tsk_files" VALUES(' + ', '.join(fields_list[1:]) + ');')