Merged server and client repos, renamed to ovtp

Author: jok4r

.gitignore

@@ -1,2 +1 @@
-.idea
 .DS_Store

overengine_client/__init__.py

@@ -0,0 +1,2 @@
+from . import client
+from . import server

overengine_client/__main__.py

@@ -0,0 +1,16 @@
+import sys
+from ovtp.client import run_client
+from ovtp.server import run_server
+
+
+if len(sys.argv) < 2 or sys.argv[1] in ['-h', '--help']:
+    print("Usage: python3 -m ovtp [client | server]")
+    sys.exit(0)
+
+if sys.argv[1] == 'client':
+    run_client()
+elif sys.argv[1] == 'server':
+    run_server()
+else:
+    print("Unknown mode")
+    sys.exit(1)

ovtp/__init__.py

@@ -0,0 +1,2 @@
+from .ovtp_client import OvtpClient
+from .main import run_client

ovtp/__main__.py

@@ -0,0 +1,29 @@
+import signal
+import datetime
+import asyncio
+import os
+from ovtp.client import OvtpClient
+
+
+def signal_handler(sig, frame):
+    print("Pressed Ctrl+C, exiting...")
+    os.kill(os.getpid(), signal.SIGTERM)
+
+
+def run_client():
+    print("Running script on %s" % datetime.datetime.now())
+    signal.signal(signal.SIGINT, signal_handler)
+    print('Press Ctrl+C for exit')
+    server_ip = input('Server ip: ')
+    oec = OvtpClient(server_ip, verbose=False, debug=False)
+    input_text = 'Select mode (m - message, df - download file, uf - upload file, vfs - verify file sign)'
+    main_mode = input(input_text + ' or d, v, dv - debug, verbose: ')
+    if main_mode in ['d', 'v', 'dv']:
+        if main_mode in ['d', 'dv']:
+            oec.debug = True
+        if main_mode in ['v', 'dv']:
+            oec.verbose = True
+        main_mode = input(f'{input_text}: ')
+        if main_mode not in ['m', 'df', 'uf', 'vfs']:
+            raise ValueError(f"Incorrect mode: {main_mode}")
+    asyncio.run(oec.manual_send(main_mode))

ovtp/client/__init__.py

@@ -6,7 +6,7 @@
 import datetime
 import asyncio
 import oe_common
-import oe_aes_cipher
+import ov_aes_cipher
 import ovcfg
 import json
 
@@ -16,13 +16,13 @@
     'default_server_port': 888,
     'local_ip': '0.0.0.0'
 }
-cfg = ovcfg.Config(std_config=sc, file='client.json', cfg_dir_name='overengine').import_config()
+cfg = ovcfg.Config(std_config=sc, file='client.json', cfg_dir_name='ovtp').import_config()
 # server_port = cfg['server_port']
 # server_ip = cfg['server_address']
 # local_ip = cfg['local_ip']
 
 
-class OverEngineClient:
+class OvtpClient:
     def __init__(self, server_ip, server_port=None, debug=False, verbose=False):
         self.uid = oe_common.get_rnd_string(10).lower()
         self.cr = ovcrypt.OvCrypt()
@@ -207,7 +207,7 @@ async def get_file(self, path_from, path_to=None):
         if not path_to:
             path_to = path_from
         await self.check_connection()
-        self.aes = oe_aes_cipher.AESCipher(key=oe_common.get_rnd_string(60))
+        self.aes = ov_aes_cipher.AESCipher(key=oe_common.get_rnd_string(60))
         self.writer.write(self._get_ov_header(
             'get_file',
             filename=path_from,
@@ -265,7 +265,7 @@ async def send_file(self, path_from, path_to=None):
             path_to = path_from
         await self.check_connection()
         self._validate_input('file', path_from)
-        self.aes = oe_aes_cipher.AESCipher(key=oe_common.get_rnd_string(60))
+        self.aes = ov_aes_cipher.AESCipher(key=oe_common.get_rnd_string(60))
         with open(path_from, 'rb') as f:
             file_size = os.path.getsize(path_from)
             '''if file_size > 1024*1024*500:  # 500 Mb
@@ -373,7 +373,7 @@ async def send_data(self, address, data=b'', data_type='message', timeout=2, ret
         # sa = []
         # self._validate_input(data_type, filename)
         rnd_key = oe_common.get_rnd_string(60)
-        self.aes = oe_aes_cipher.AESCipher(rnd_key)
+        self.aes = ov_aes_cipher.AESCipher(rnd_key)
         sign = None
         data_hash = None
         if data_type == 'public_key':

ovtp/client/main.py

@@ -0,0 +1,2 @@
+from .ovtp_server import OvtpServer
+from .main import run_server

overengine_client/overengine_client.py ovtp/client/ovtp_client.py

@@ -0,0 +1,32 @@
+import datetime
+import signal
+import asyncio
+import sys
+from ovtp.server import OvtpServer
+
+
+def signal_handler(sig, frame):
+    print("Pressed Ctrl+C, exiting...")
+    exit(0)
+
+
+def callback(status, response):
+    print(f'status: {status}, response: {response}')
+
+
+def run_server():
+    print("Running script %s" % datetime.datetime.now())
+    signal.signal(signal.SIGINT, signal_handler)
+    print('Press Ctrl+C for exit')
+    over_engine_server = OvtpServer(callback, verbose=False, debug=False)
+    if len(sys.argv) > 1 and sys.argv[1] == '--daemon':
+        print('Running in daemon mode')
+    else:
+        print('Running in normal mode. To run in daemon mode, run with --daemon')
+        main_mode = input('Select mode d, v, dv - debug, verbose: ')
+        if main_mode in ['d', 'v', 'dv']:
+            if main_mode in ['d', 'dv']:
+                over_engine_server.debug = True
+            if main_mode in ['v', 'dv']:
+                over_engine_server.verbose = True
+    asyncio.run(over_engine_server.run_server())