Add login functionality (no hashing)

.gitignore

@@ -1,8 +1,8 @@
 __pycache__/
 build/
 config.yaml
-0xf44ee3942e7dgendata.csv
-0xf44ee3942e7agendata.csv
+*.csv
 admin-key.ppk
 token.txt
-*.zip
+*.zip
+output.log

auth.py

@@ -0,0 +1,26 @@
+import ssh
+import csv
+from util import fprint
+from util import find_data_file
+from time import sleep
+
+def login(config, user, password, sysid):
+    fprint("Attempting to login as " + user)
+    filename = sysid + "login.csv"
+    with open(find_data_file(filename), "w", newline="") as f:
+        writer = csv.writer(f)
+        writer.writerows([[user,password,sysid],])
+    fprint("done creating csv")
+    ssh.sftp_send_data(config, filename, 'sendlogin')
+    command = "python3 login_service.py " + sysid
+    ssh.run_ssh(config, command, 'scripts')
+    sleep(1)
+    filename = sysid + "success.txt"
+    if ssh.check_for_file(config, filename, 'receivelogin') == False:
+        filename = sysid + "fail.txt"
+        if ssh.check_for_file(config, filename, 'receivelogin') == False:
+            raise ValueError("Unable to determine login status")
+        else:
+            return False
+    else:
+        return True

config.yml

@@ -5,8 +5,10 @@ sftp:
   keyfile: keyfile-admin.pem
   filepath: 
     send: /home/ec2-user/Incoming/Incoming_Data
-    login: /home/ec2-user/Incoming/Login
-    recieve: /home/ec2-user/Outgoing
+    sendlogin: /home/ec2-user/Incoming/Login
+    receive: /home/ec2-user/Outgoing/Outgoing_Data
+    receivelogin: /home/ec2-user/Outgoing/Login
+    scripts: /home/ec2-user/scripts
 
 ui:
   darkmode: true

ippigeon.py

@@ -1,4 +1,4 @@
-
+import os
 import sys
 import subprocess
 from multiprocessing import Process, Manager, Pool, TimeoutError, freeze_support, active_children
@@ -12,6 +12,7 @@ import taskbartool
 import util
 import netstat
 import ssh
+import auth
 
 displaydata = None
 settings = None
@@ -47,10 +48,15 @@ def netstat_done(res):
 
 def process_done(res):
     fprint("uploading to sftp...")
-    ssh.sftp_send_data(res, config, datafile)
-    #procdata_res = pool.apply_async(ssh.sftp_send_data, (res, config, datafile))
+    #ssh.sftp_send_data(res, config, datafile)
+    procdata_res = pool.apply_async(ssh.sftp_send_data, (config, datafile, 'send'))
     
-
+def login_done(res):
+    if not res:
+        fprint("Login failure")
+        settings["message"] = "Login failure"
+    else:
+        fprint("Login result in main: " + str(res))
 
 
 def killall():
@@ -62,8 +68,8 @@ def killall():
 
 def mainloop(pool):
     # worker pool: netstat, netstat cleanup, upload, download, ui tasks
-    fprint("start loop")
     
+    global counter
     global netdata_res
     global procdata_res
     global rawdata
@@ -73,13 +79,25 @@ def mainloop(pool):
         #print("killing")
         killall()
     #print(res.get(timeout=1))
-    if netdata_res is None or netdata_res.ready():
-        #rawdata = netdata_res.get()
-        #procdata_res = pool.apply_async(process_netstat, (rawdata))
-        fprint("netstat starting")
-        netdata_res = pool.apply_async(netstat.start, callback=netstat_done)
-        #fprint(netdata_res.successful())
-    sleep(interval)
+    if counter == 0: # runs every INTERVAL
+        fprint("start loop")
+        if netdata_res is None or netdata_res.ready():
+            #rawdata = netdata_res.get()
+            #procdata_res = pool.apply_async(process_netstat, (rawdata))
+            fprint("netstat starting")
+            netdata_res = pool.apply_async(netstat.start, callback=netstat_done)
+            #fprint(netdata_res.successful())
+    
+    # runs every 50ms
+    if settings["login"] == True:
+        login_res = pool.apply_async(auth.login, (config, settings["username"], settings["password"], sysid), callback=login_done)
+        #fprint(auth.login(config, settings["username"], settings["password"], sysid))
+        settings["login"] = False
+
+    sleep(interval / (interval * 20.0))
+    counter += 1
+    if counter == interval * 20:
+        counter = 0
 
 class Logger(object):
     def __init__(self, filename="output.log"):
@@ -114,7 +132,9 @@ if __name__ == '__main__':
                 #print(config['sftp']['host'])
             interval = config['core']['interval']
             displaydata = manager.list(range(2)) # data to be printed
-            settings = manager.list(range(20)) # configuration 
+            settings = manager.dict() # configuration 
+            settings["login"] = False
+            settings["loggedin"] = False
             killme = manager.Value('d', 0)
             #killme = False
             # launch background UI app as process
@@ -128,6 +148,7 @@ if __name__ == '__main__':
 
 
             # launch loop - non-blocking!
+            counter = 0
             while(keeprunning):
                 mainloop(pool)
 

release.sh

@@ -1,21 +1,27 @@
 #!/bin/bash
-set -xeuo pipefail
+#set -x
 
 TOKEN=$(< token.txt)
-git commit -a
+EDITOR=nano git commit -a
+git push
 
 COMMIT=$(git log | head -n 1 | cut -d' ' -f2)
 echo $COMMIT
 export PATH=$PATH:"C:\Program Files\7-Zip"
-
-7z a -r release-$COMMIT.zip ./build/exe.win-amd64-3.10/*
-
+TAG=$(date +%s)
+"C:/Program Files/Python310/python.exe" setup.py build
+sleep 2
+mv ./build/exe.win-amd64-3.10/ ./build/ippigeon-win
+7z a -r release-$COMMIT.zip ./build/ippigeon-win
+7z a -sfx7z.sfx IPPigeon-install.exe ./build/ippigeon-win
+mv ./build/ippigeon-win/ ./build/exe.win-amd64-3.10
+#sleep 30
 DATA='{
   "body": "Autogenerated release",
-  "draft": true,
+  "draft": false,
   "name": "Development release",
   "prerelease": true,
-  "tag_name": "testing",
+  "tag_name": "'$TAG'",
   "target_commitish": "'$COMMIT'"
 }'
 OUT=$(curl -X 'POST' \
@@ -26,9 +32,26 @@ OUT=$(curl -X 'POST' \
 
 ID=$(echo $OUT | cut -d',' -f 1 | cut -d':' -f 2)
 
-OUT=curl -X 'POST' \
+OUT=$(curl -X 'POST' \
   'https://git.deck.sh/api/v1/repos/Interfaz/ff/releases/'$ID'/assets?token='$TOKEN'' \
   -H 'accept: application/json' \
   -H 'Content-Type: multipart/form-data' \
-  -F 'attachment=@'release-$COMMIT.zip';type=application/x-zip-compressed'
+  -F 'attachment=@IPPigeon-install.exe;type=application/octet-stream')
 
+URL=$(echo $OUT | cut -d',' -f 7 | cut -d\" -f4)
+
+
+
+OUT=$(curl -X 'POST' \
+  'https://git.deck.sh/api/v1/repos/Interfaz/ff/releases/'$ID'/assets?token='$TOKEN'' \
+  -H 'accept: application/json' \
+  -H 'Content-Type: multipart/form-data' \
+  -F 'attachment=@'release-$COMMIT.zip';type=application/x-zip-compressed')
+
+URLZIP=$(echo $OUT | cut -d',' -f 7 | cut -d\" -f4)
+curl -d "Self extracting installer: $URL
+
+Portable Zip: $URLZIP" https://notify.deck.sh/ipro-release
+
+rm release-$COMMIT.zip
+rm IPPigeon-install.exe

run.sh

@@ -0,0 +1,2 @@
+"C:/Program Files/Python310/python.exe" setup.py build
+

setup.py

@@ -2,10 +2,10 @@ import sys
 from cx_Freeze import setup, Executable
 
 debug = True
-debug = not debug
+#debug = not debug
 # Dependencies are automatically detected, but it might need fine tuning.
 # "packages": ["os"] is used as example only
-build_exe_options = {"packages": ["os"], "excludes": ["tkinter"], "include_msvcr": True, "include_files": ["icon.png", "IPPigeon.lnk", "config.yml", "keyfile-admin.pem"], "optimize": 2}
+build_exe_options = {"packages": ["os"], "excludes": ["tkinter"], "include_msvcr": True, "include_files": ["icon.png", "config.yml", "keyfile-admin.pem"], "optimize": 2}
 
 # base="Win32GUI" should be used only for Windows GUI app
 base = None
@@ -17,5 +17,5 @@ setup(
     version="0.2.4",
     description="IP Pigeon client application",
     options={"build_exe": build_exe_options},
-    executables=[Executable("ippigeon.py", base=base)],
+    executables=[Executable("ippigeon.py", base=base, icon="icon.ico", uac_admin=True, target_name="IPPigeon.exe")],
 )

ssh.py

@@ -1,14 +1,39 @@
+#from __future__ import with_statement
 from fabric import Connection
 from util import find_data_file
 from util import setup_child
 from util import fprint
+from invoke import exceptions
+import sys
 
-def sftp_send_data(res, config, filename):
+def sftp_send_data(config, filename, filetype):
     setup_child()
     fprint("Connecting over SSH to " + config['sftp']['host'])
     c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
     fprint("Sending data over SFTP: " + filename)
-    fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath']['send']))
-    fprint("Data sent over SFTP sucessfully")
-    #command = 'ls ' + config['sftp']['filepath']['send']
-    #fprint(c.run(command))
+    fprint(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
+    fprint("Data sent over SFTP successfully")
+    #command = 'ls ' + config['sftp']['filepath'][filetype]
+    #fprint(c.run(command))
+
+def check_for_file(config, filename, location):
+    setup_child()
+    fprint("Connecting over SSH to " + config['sftp']['host'])
+    c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
+    fprint("Checking for existence of file " + config['sftp']['filepath'][location] + "/" + filename)
+    try:
+        res = c.run("ls -l " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
+        fprint("File " + filename + " exists!")
+        return c.run("cat " + config['sftp']['filepath'][location] + "/" + filename, hide=True)
+    except exceptions.UnexpectedExit:
+        return False
+
+def run_ssh(config, command, location):
+    setup_child()
+    fprint("Connecting over SSH to " + config['sftp']['host'])
+    c = Connection(host=config['sftp']['host'], user=config['sftp']['user'], port=config['sftp']['port'], connect_kwargs={"key_filename": find_data_file(config['sftp']['keyfile']),})
+    fprint("cd to " + config['sftp']['filepath'][location])
+    with c.cd(config['sftp']['filepath'][location]):
+        fprint("Running ssh command: " + command)
+        res = c.run(command, hide=True, asynchronous=True)
+        return res

taskbartool.py

@@ -31,6 +31,7 @@ class TaskBarIcon(wx.adv.TaskBarIcon):
     def CreatePopupMenu(self):
         menu = wx.Menu()
         create_menu_item(menu, 'Control Panel', self.on_open)
+        create_menu_item(menu, 'Login test', self.on_login)
         menu.AppendSeparator()
         create_menu_item(menu, 'Exit', self.on_exit)
         return menu
@@ -46,6 +47,11 @@ class TaskBarIcon(wx.adv.TaskBarIcon):
         foreground()
         #self.close_popup()
 
+    def on_login(self, event):
+        settings["username"] = "Cole"
+        settings["password"] = "12345"
+        settings["login"] = True
+
     def on_exit(self, event):
         wx.CallAfter(self.Destroy)
         self.close_popup()
@@ -65,6 +71,8 @@ class TaskbarApp(wx.App):
 
 def background(data, sets, kill):
     global killme
+    global settings
+    global displaydata
     killme = kill
     app = TaskbarApp(False)
     displaydata = data

util.py

@@ -70,7 +70,7 @@ def run_ps(cmd):
         startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW    # , "-WindowStyle", "hidden"
         fprint("running PS command: " + cmd)
         completed = subprocess.run(["powershell", "-Command", cmd], capture_output=True, startupinfo=startupinfo)
-        fprint("ran PS command sucessfully")
+        fprint("ran PS command successfully")
         #completed = subprocess.run(["powershell", "-WindowStyle", "hidden", "-Command", cmd], capture_output=True, startupinfo=startupinfo)
     
         return completed