Work in progress

malwaredb · Jul 15, 2020 · de88f89 · de88f89
1 parent 65d29d5
commit de88f89
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.so
+*.a
diff --git a/Makefile b/Makefile
@@ -1,7 +1,24 @@
+INCLUDESRV=$(shell pg_config --includedir-server)
+INCLUDEDIR=$(shell pg_config --includedir)
+INSTALLDIR=$(shell pg_config --pkglibdir)
+
+all: sdhash_psql.so
 INCLUDES = -I sdhash/sdbf/
 MISC = -Wall
 
-all: main
+all: main sdhash_psql.so
+
+sdhash_psql.o: sdhash_psql.c sdhash_helper.h
+	gcc -I$(INCLUDESRV) -I$(INCLUDEDIR) -fPIC -c sdhash_psql.c ${MISC}
+
+sdhash_psql.so: sdhash_psql.o sdhash_helper.o
+	gcc -fopenmp -shared -Wl,--no-as-needed -o sdhash_psql.so sdhash_psql.o sdhash_helper.o sdhash/libsdbf.a sdhash/external/stage/lib/libboost_thread.a sdhash/external/stage/lib/libboost_filesystem.a -lcrypto -lm -lc
+
+install: sdhash_psql.so
+	install -g root -o root sdhash_psql.so $(INSTALLDIR)/sdhash_psql.so
+
+sdhash_helper.o: sdhash_helper.h sdhash_helper.cpp
+	g++ -c sdhash_helper.cpp -fPIC ${INCLUDES} ${MISC}
 
 main.o: main.cpp
 	g++ -c main.cpp ${INCLUDES} ${MISC}
@@ -11,4 +28,4 @@ main: main.o
 
 .phony: clean
 clean:
-	rm *.o main
+	rm *.o *.so main
diff --git a/sdhash b/sdhash
diff --git a/sdhash_psql.c b/sdhash_psql.c
@@ -0,0 +1,20 @@
+#include "postgres.h"
+#include "fmgr.h"
+#include "sdhash_helper.h"
+
+PG_MODULE_MAGIC;
+
+#define MAX_SIZE 10000000
+
+PG_FUNCTION_INFO_V1(pg_sdhash_compare);
+Datum pg_sdhash_compare(PG_FUNCTION_ARGS);
+
+Datum pg_sdhash_compare(PG_FUNCTION_ARGS) {
+  text *arg1 = PG_GETARG_TEXT_P(0);
+  text *arg2 = PG_GETARG_TEXT_P(1);
+  int32 score = sdhash_similarity((char *) VARDATA(arg1), (char *) VARDATA(arg2));
+  PG_RETURN_INT32(score);
+}
+// 
+// CREATE OR REPLACE FUNCTION fuzzy_compare(TEXT, TEXT) RETURNS INTEGER AS 'ssdeep_psql.so', 'pg_fuzzy_compare' LANGUAGE 'C';
+//
diff --git a/sdhash_psql.sql b/sdhash_psql.sql
@@ -0,0 +1 @@
+CREATE OR REPLACE FUNCTION sdhash_compare(TEXT, TEXT) RETURNS INTEGER AS 'sdhash_psql.so', 'pg_sdhash_compare' LANGUAGE 'c';
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    *.o
+    *.so
+    *.a
+0 −11		ChangeLog
+0 −1		INSTALL
+0 −4		INSTALL.macosx
+2 −10		Makefile
+1 −7		README.md
+0 −17		blooms.proto
+2 −38		sdbf/bf_utils.cc
+9 −35		sdbf/bloom_filter.cc
+0 −1		sdbf/bloom_filter.h
+0 −106		sdbf/bloom_vector.cc
+0 −26		sdbf/bloom_vector.h
+0 −912		sdbf/blooms.pb.cc
+0 −642		sdbf/blooms.pb.h
+0 −26		sdbf/sdbf_class.cc
+0 −5		sdbf/sdbf_class.h
+0 −22		sdbf/sdbf_conf.cc
+0 −2		sdbf/sdbf_conf.h
+6 −32		sdbf/sdbf_core.cc
+1 −3		sdbf/sdbf_defines.h
+4 −37		sdbf/sdbf_set.cc
+4 −5		sdbf/sdbf_set.h
+2 −2		sdhash-server/src/sdhash-srv-main.cc
+59 −196		sdhash-src/sdhash.cc
+1 −1		sdhash-src/sdhash.h
+0 −121		sdhash-src/sdhash_threads.cc
+0 −4		sdhash-src/sdhash_threads.h
+0 −139		test/bloom-test.cc
+0 −155		test/modp_b16.cc
+0 −152		test/modp_b16.h
+0 −108		test/modp_b16_data.h
+0 −43		test/modp_stdint.h
+0 −36		test/scbtest.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		CREATE OR REPLACE FUNCTION sdhash_compare(TEXT, TEXT) RETURNS INTEGER AS 'sdhash_psql.so', 'pg_sdhash_compare' LANGUAGE 'c';