From e2a040798a59835f9ecbbca1a250bdd11eda92c7 Mon Sep 17 00:00:00 2001
From: Eugeny Ablesov <133771006+EvgenyAblesov@users.noreply.github.com>
Date: Tue, 30 May 2023 15:20:09 +0300
Subject: [PATCH] Ablesov/fix tinycheck installation (#135)

* Update requirements.txt

Fix:
pymisp - use older version to keep code compatibility
sqlalchemy - use 1.4 latest build (api 2.0 incompatible with codebase)

M2Crypto - removed (not used)
pyOpenSSL - removed (not used)

* Update scheme.sql

pymisp warning fix

* Update main.py

Unused reference to pyOpenSSL removed
---
 assets/requirements.txt |  5 ++---
 assets/scheme.sql       | 32 ++++++++++++++++----------------
 server/backend/main.py  |  6 ++----
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/assets/requirements.txt b/assets/requirements.txt
index 11813be..0979a66 100644
--- a/assets/requirements.txt
+++ b/assets/requirements.txt
@@ -1,6 +1,6 @@
+pymisp==2.4.165.1
+sqlalchemy==1.4.48
 ipwhois
-M2Crypto
-pyOpenSSL
 pydig
 pymisp
 netaddr
@@ -8,7 +8,6 @@ pyyaml
 flask
 flask_httpauth
 pyjwt
-sqlalchemy
 psutil
 pyudev
 wifi
diff --git a/assets/scheme.sql b/assets/scheme.sql
index a689cb6..25ce055 100644
--- a/assets/scheme.sql
+++ b/assets/scheme.sql
@@ -1,30 +1,30 @@
 CREATE TABLE "iocs" (
 	"id"	INTEGER UNIQUE,
-	"value"	TEXT NOT NULL,
-	"type"	TEXT NOT NULL,
-	"tlp"	TEXT NOT NULL,
-	"tag"	TEXT NOT NULL,
-	"source"	TEXT NOT NULL,
-	"added_on"	NUMERIC NOT NULL,
+	"value"	   TEXT NOT NULL,
+	"type"	   TEXT NOT NULL,
+	"tlp"	   TEXT NOT NULL,
+	"tag"	   TEXT NOT NULL,
+	"source"   TEXT NOT NULL,
+	"added_on" TEXT NOT NULL,
 	PRIMARY KEY("id" AUTOINCREMENT)
 );
 
 CREATE TABLE "whitelist" (
 	"id"	INTEGER UNIQUE,
-	"element"	TEXT NOT NULL UNIQUE,
-	"type"	TEXT NOT NULL,
-	"source"	TEXT NOT NULL,
-	"added_on"	INTEGER NOT NULL,
+	"element"  TEXT NOT NULL UNIQUE,
+	"type"	   TEXT NOT NULL,
+	"source"   TEXT NOT NULL,
+	"added_on" TEXT NOT NULL,
 	PRIMARY KEY("id" AUTOINCREMENT)
 );
 
 CREATE TABLE "misp" (
-	"id" 	INTEGER UNIQUE,
-	"name" 	TEXT,
-	"url"	TEXT NOT NULL,
-	"apikey"	TEXT NOT NULL,
+	"id" 	 INTEGER UNIQUE,
+	"name" 	     TEXT,
+	"url"	     TEXT NOT NULL,
+	"apikey"     TEXT NOT NULL,
 	"verifycert" INTEGER NOT NULL DEFAULT 0,
-	"added_on" NUMERIC NOT NULL,
-	"last_sync" NUMERIC NOT NULL DEFAULT 0,
+	"added_on"   TEXT NOT NULL,
+	"last_sync"  TEXT NOT NULL DEFAULT 0,
 	PRIMARY KEY("id" AUTOINCREMENT)
 );
diff --git a/server/backend/main.py b/server/backend/main.py
index eedf327..ac9be72 100644
--- a/server/backend/main.py
+++ b/server/backend/main.py
@@ -10,7 +10,6 @@ from app.blueprints.misp import misp_bp
 import datetime
 import secrets
 import jwt
-from OpenSSL import SSL
 from app.utils import read_config
 from sys import path
 
@@ -64,7 +63,6 @@ if __name__ == '__main__':
     ssl_key = "{}/{}".format(path[0], 'key.pem')
 
     if read_config(("backend", "remote_access")):
-        app.run(host="0.0.0.0", port=443,
-                ssl_context=(ssl_cert, ssl_key))
+        app.run(host="0.0.0.0", port=443, ssl_context=(ssl_cert, ssl_key))
     else:
-        app.run(port=443, ssl_context=(ssl_cert, ssl_key))
+        app.run(port=443)