Added first tools that use the DB.

.gitattributes

@@ -42,14 +42,15 @@ examples/memcpy.c -text
 examples/myhanoi.c -text
 examples/print_ptr.c -text
 examples/recover_example.c -text
+tools/db/drop_my_tables.sh -text
 tools/db/pdb.create.tbl -text
 tools/db/pdb.createprogram.tbl -text
 tools/db/pdb.drop.tbl -text
-tools/db/pdb_create_program_tables -text
-tools/db/pdb_info -text
-tools/db/pdb_register -text
-tools/db/pdb_setup -text
-tools/db/pdb_teardown -text
+tools/db/pdb_create_program_tables.sh -text
+tools/db/pdb_info.sh -text
+tools/db/pdb_register.sh -text
+tools/db/pdb_setup.sh -text
+tools/db/pdb_teardown.sh -text
 tools/do_concolic.sh -text
 tools/generate_exe.sh -text
 tools/generate_io_baseline.sh -text

examples/Makefile

@@ -63,6 +63,7 @@ clean:
 	rm -Rf peasoup_executable_directory.*
 	rm -f strata.log.*
 	rm -f *.sym
+	if [ ! "X" = "X"${PGUSER} ]; then sh ../tools/db/drop_my_tables.sh; sh ../tools/db/pdb_setup.sh; fi
 
 concclean:
 	rm -Rf concolic.files_*

tools/db/drop_my_tables.sh

+#!/bin/bash
+
+psql << 'EOF'
+CREATE LANGUAGE plpgsql;
+CREATE OR REPLACE FUNCTION drop_tables(username IN VARCHAR) RETURNS void AS $$
+DECLARE
+    statements CURSOR FOR
+        SELECT tablename FROM pg_tables
+        WHERE tableowner = username;
+BEGIN
+    FOR stmt IN statements LOOP
+        EXECUTE 'DROP TABLE IF EXISTS ' || quote_ident(stmt.tablename) || ' CASCADE;';
+    END LOOP;
+END;
+$$
+LANGUAGE plpgsql;
+EOF
+
+psql -c "SELECT drop_tables('$PGUSER');"

tools/db/pdb.create.tbl

-CREATE TABLE program_info
+CREATE TABLE doip
 (
-  program_id       SERIAL PRIMARY KEY,       
-  name             text    NOT NULL CHECK (name <> ''),
-  orig_program_id  integer DEFAULT -1 
+	doip_id 	SERIAL PRIMARY KEY,
+	confidence 	integer,  
+	tool_name	text,
+	comment		text
+);
+
+
+CREATE TABLE variant_info
+(
+  schema_version_id 		integer DEFAULT 1,
+  variant_id       		SERIAL PRIMARY KEY,       
+  name             		text    NOT NULL CHECK (name <> ''),
+  orig_variant_id  		integer DEFAULT -1,
+  address_table_name 		text,
+  function_table_name 		text,
+  instruction_table_name 	text,
+  doip_id                   	integer DEFAULT -1
+
 );
 
 CREATE TABLE file_info
 (
   file_id          SERIAL PRIMARY KEY,
-  orig_file_id     integer DEFAULT -1,
   url              text NOT NULL CHECK (url <> ''),
   hash             text,
-  arch             text
+  arch             text,
+  type		   text DEFAULT 'ELF-Static',
+  doip_id          integer DEFAULT -1
+
 );
 
-CREATE TABLE program_dependency
+CREATE TABLE variant_dependency
 (
-  program_id       integer REFERENCES program_info,
-  file_id          integer REFERENCES file_info
+  variant_id       integer REFERENCES variant_info,
+  file_id          integer REFERENCES file_info,
+  doip_id          integer DEFAULT -1
+
 );
+

tools/db/pdb.createprogram.tbl

 CREATE TABLE #PROGNAME#_address
 (
-  address_id         SERIAL PRIMARY KEY,
-  file_id            integer REFERENCES file_info,
-  vaddress_offset    text
+  address_id         	SERIAL PRIMARY KEY,
+  file_id            	integer REFERENCES file_info,
+  vaddress_offset    	integer,
+  doip_id		integer DEFAULT -1
 );
 
 CREATE TABLE #PROGNAME#_function
 (
-  function_id        SERIAL PRIMARY KEY,
-  file_id            integer REFERENCES file_info,
-  name               text,
-  stack_frame_size   integer
+  function_id        	SERIAL PRIMARY KEY,
+  file_id            	integer REFERENCES file_info,
+  name               	text,
+  stack_frame_size   	integer,
+  doip_id	   	integer DEFAULT -1
 );
 
 CREATE TABLE #PROGNAME#_instruction
 (
+  instruction_id	    SERIAL PRIMARY KEY,
   address_id                integer REFERENCES #PROGNAME#_address,
-  parent_function_id        integer REFERENCES #PROGNAME#_function,
+  parent_function_id        integer,
   file_id                   integer REFERENCES file_info,
-  orig_address_id           integer REFERENCES #PROGNAME#_address,
-  fallthrough_address_id    integer REFERENCES #PROGNAME#_address,
-  target_address_id         integer REFERENCES #PROGNAME#_address,
-  data                      text
+  orig_address_id           integer,
+  fallthrough_address_id    integer,
+  target_address_id         integer,
+  data                      bytea,
+  comment                   text,
+  doip_id		    integer DEFAULT -1
 );

tools/db/pdb_create_program_tables → tools/db/pdb_create_program_tables.sh

+#!/bin/sh
+
 #
 # pdb_create_program_tables <programName>
 #
@@ -7,7 +9,9 @@ PROGRAM_NAME=$1
 
 DB_SCRIPT=$$.script.tmp
 
-cat pdb.createprogram.tbl | sed "s/#PROGNAME#/$PROGRAM_NAME/g" > $DB_SCRIPT
+PROGRAM_NAME=`echo $PROGRAM_NAME | sed "s/[\.;+\\-\ ]/_/g"`
+
+cat $PEASOUP_HOME/tools/db/pdb.createprogram.tbl | sed "s/#PROGNAME#/$PROGRAM_NAME/g" > $DB_SCRIPT
 
 psql -f $DB_SCRIPT
 

tools/db/pdb_info → tools/db/pdb_info.sh

+#!/bin/sh
+
 psql -c "\d"

tools/db/pdb_register → tools/db/pdb_register.sh

+#!/bin/sh 
+
 #
 # pdb_register <peasoup_program_name> <peasoup_program_directory> 
 #
@@ -18,7 +20,7 @@ usage()
 log_error()
 {
   echo "pdb_register: ERROR: $1"
-  exit 1
+  exit -1
 }
 
 log_message()
@@ -51,21 +53,21 @@ fi
 MD5HASH=`md5sum $FILENAME | cut -f1 -d' '`
 
 #============================================
-# Update program_info table
+# Update variant_info table
 #============================================
 
 # -q: quiet mode
 # -t: tuple only
 # -c: run command
 
-PROGRAM_ID=`psql -q -t -c "INSERT INTO program_info (name) VALUES ('$PROGRAM_NAME') RETURNING program_id;" | sed "s/^[ \t]*//"`
+PROGRAM_ID=`psql -q -t -c "INSERT INTO variant_info (schema_version_id,name,address_table_name,function_table_name,instruction_table_name) VALUES ('1', '$PROGRAM_NAME', '${PROGRAM_NAME}_ADDRESS', '${PROGRAM_NAME}_function', '${PROGRAM_NAME}_instruction') RETURNING variant_id;" | sed "s/^[ \t]*//"`
 
 if [ ! $? -eq 0 ]; then
   log_error "Failed to register program"
 fi
 
 # Update original program id
-psql -q -t -c "UPDATE program_info SET orig_program_id = '$PROGRAM_ID' WHERE program_id = '$PROGRAM_ID';"
+psql -q -t -c "UPDATE variant_info SET orig_variant_id = '$PROGRAM_ID' WHERE variant_id = '$PROGRAM_ID';"
 
 #============================================
 # Update file_info table
@@ -73,12 +75,11 @@ psql -q -t -c "UPDATE program_info SET orig_program_id = '$PROGRAM_ID' WHERE pro
 
 FILE_ID=`psql -q -t -c "INSERT INTO file_info (url, arch, hash) VALUES ('$URL', '$ARCH', '$MD5HASH') RETURNING file_id;" | sed "s/^[ \t]*//"`
 
-# Update original file id
-psql -q -t -c "UPDATE file_info SET orig_file_id = '$FILE_ID' WHERE file_id = '$FILE_ID';"
-
 log_message "To do: if shared libs, then need to add them to this table"
 
 #============================================
 # Update program_dependency table
 #============================================
-FILE_ID=`psql -q -t -c "INSERT INTO program_dependency (program_id, file_id) VALUES ('$PROGRAM_ID', '$FILE_ID')"`
+FILE_ID=`psql -q -t -c "INSERT INTO variant_dependency (variant_id, file_id) VALUES ('$PROGRAM_ID', '$FILE_ID')"`
+
+exit $PROGRAM_ID

tools/db/pdb_setup

-psql -f pdb.create.tbl

tools/db/pdb_setup.sh

+#!/bin/sh
+
+psql -f $PEASOUP_HOME/tools/db/pdb.create.tbl

tools/db/pdb_teardown

-psql -f pdb.drop.tbl

tools/db/pdb_teardown.sh

+#!/bin/sh 
+
+psql -f $PEASOUP_HOME/tools/db/pdb.drop.tbl

tools/ps_analyze.sh

-#!/bin/sh
+#!/bin/sh -x
 # This script depends on having the following environment variables defined
 # STRATA - The path to the strata installation
 # An example of these environment variables and their settings are listed in
@@ -71,6 +71,49 @@ echo Running IDA Pro static analysis phase ...
 $SMPSA_HOME/SMP-analyze.sh a.ncexe
 echo Done.
 
+
+#
+# Populate IR Database
+#
+if [ ! "X" = "X"$PGUSER ]; then
+	echo "Registering with IR database: program: $orig_exe server:$PGHOST db:$PGDATABASE"
+	
+	DB_PROGRAM_NAME=`echo $orig_exe.$$ | sed "s/[\.;+\\-\ ]/_/g"`
+	
+	MD5HASH=`md5sum a.ncexe | cut -f1 -d' '`
+	$PEASOUP_HOME/tools/db/pdb_register.sh $DB_PROGRAM_NAME $current_dir	# register the program.
+	varid=$?
+	
+	$PEASOUP_HOME/tools/db/pdb_create_program_tables.sh $DB_PROGRAM_NAME # create the tables for the program.
+	
+	echo "RUNNING MEDS2PDB:"
+	date
+	time $SECURITY_TRANSFORMS_HOME/tools/meds2pdb/meds2pdb $DB_PROGRAM_NAME a.ncexe $MD5HASH a.ncexe.annot 	# import meds information
+	date
+
+	if [ $varid > 0 ]; then
+		$SECURITY_TRANSFORMS_HOME/libIRDB/test/clone.exe $varid		# create a clone
+		cloneid=$?
+	
+		if [ $cloneid > 0 ]; then
+			$SECURITY_TRANSFORMS_HOME/libIRDB/test/fill_in_cfg.exe $cloneid		# finish the initial IR 
+			$SECURITY_TRANSFORMS_HOME/libIRDB/test/fix_calls.exe $cloneid		# fix call insns so they are OK for spri emitting
+			$SECURITY_TRANSFORMS_HOME/libIRDB/test/ilr.exe $cloneid			# perform ILR 
+			$SECURITY_TRANSFORMS_HOME/libIRDB/test/generate_spri.exe $cloneid a.ncexe.aspri	# generate the spri code
+		fi
+	fi
+	echo	-------------------------------------------------------------------------------
+	echo    ---------            Orig Variant ID is $varid         ------------------------
+	echo	-------------------------------------------------------------------------------
+	echo    ---------            Cloned Variant ID is $cloneid     ------------------------
+	echo	-------------------------------------------------------------------------------
+
+fi
+
+
+#
+# Run concolic engine
+#
 echo Running concolic testing to generate inputs ...
 #$PEASOUP_HOME/tools/do_concolic.sh a  --iterations 25 --logging tracer,instance_times,trace
 $PEASOUP_HOME/tools/do_concolic.sh a  --iterations 25 --logging tracer,trace,inputs 
@@ -86,7 +129,6 @@ echo Done.
 #-----------------------------------------
 # Start P1 transform 
 #-----------------------------------------
-#
 #echo Starting the P1 transform
 #date
 #$PEASOUP_HOME/tools/p1xform.sh $newdir > p1xform.out 2> p1xform.err