Add login success print test

.gitignore

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

auth.py

@@ -0,0 +1,28 @@
+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"
+    output = ssh.check_for_file(config, filename, 'receivelogin')
+    if output == 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
+        fprint(output)

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
+    sendlogin: /home/ec2-user/Incoming/Login
-    recieve: /home/ec2-user/Outgoing
+    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
@@ -40,6 +41,16 @@ if win32:
     _, username = res.strip().rsplit("\n", 1)
     userid, sysdom = username.rsplit("\\", 1)
 
+if linux:
+    sysid = hex(uuid.getnode())
+    #fprint(sysid)
+    datafile += sysid
+    datafile += "gendata.csv"
+    res = subprocess.check_output(["who",], universal_newlines=True)
+    userid = res.strip().split(" ")[0]
+    sysdom = subprocess.check_output(["hostname",], universal_newlines=True).strip()
+    #fprint(hostname)
+
 def netstat_done(res):
     fprint("netstat done, processing")
     procdata_res = pool.apply_async(netstat.process, (res,), callback=process_done)
@@ -47,10 +58,15 @@ def netstat_done(res):
 
 def process_done(res):
     fprint("uploading to sftp...")
-    ssh.sftp_send_data(res, config, datafile)
+    #ssh.sftp_send_data(res, config, datafile)
-    #procdata_res = pool.apply_async(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 +78,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 +89,25 @@ def mainloop(pool):
         #print("killing")
         killall()
     #print(res.get(timeout=1))
-    if netdata_res is None or netdata_res.ready():
+    if counter == 0: # runs every INTERVAL
-        #rawdata = netdata_res.get()
+        fprint("start loop")
-        #procdata_res = pool.apply_async(process_netstat, (rawdata))
+        if netdata_res is None or netdata_res.ready():
-        fprint("netstat starting")
+            #rawdata = netdata_res.get()
-        netdata_res = pool.apply_async(netstat.start, callback=netstat_done)
+            #procdata_res = pool.apply_async(process_netstat, (rawdata))
-        #fprint(netdata_res.successful())
+            fprint("netstat starting")
-    sleep(interval)
+            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"):
@@ -96,7 +124,7 @@ class Logger(object):
             sleep(0)
         
     def flush(self):
-        print("")
+        print("",end="")
 
 if __name__ == '__main__':
     freeze_support() # required if packaged into single EXE
@@ -114,7 +142,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 +158,7 @@ if __name__ == '__main__':
 
 
             # launch loop - non-blocking!
+            counter = 0
             while(keeprunning):
                 mainloop(pool)
 

netstat.py

@@ -1,8 +1,9 @@
 from util import find_data_file
 from util import setup_child
 from util import fprint
-from util import run_ps
+from util import run_cmd
 from util import win32
+from util import linux
 import util
 import time
 import csv
@@ -69,12 +70,56 @@ def process(data):
             writer.writerows(output2)
         fprint("done creating csv")
     
+    if linux:
+        output = data.stdout.decode().split('\n') # split stdout into lines
+        output = [i for i in output if i]
+        if output[0].find("Not all processes could be identified") >= 0:
+            fprint("Not enough permissions")
+            raise PermissionError("Unable to acquire netstat data without admin!")
+        output2 = list()
+        output2.append([util.sysid, util.userid, util.sysdom, util.time()]) # add metadata
+        for line in output:
+            string_split = line.split(" ")
+            string_split = [i for i in string_split if i]
+            #fprint("Input: " + str(string_split))
+
+            if string_split[0].find("Active") >= 0 or string_split[0].find("Proto") >= 0:
+                continue
+            
+            if len(string_split) == 6: # no connection status
+                #fprint(string_split)
+                string_split.append(string_split[-1])
+                string_split[-2] = "UNKNOWN"
+                #fprint(string_split)
+            
+            procname = string_split[6]
+            if procname != "-":
+                string_split2 = procname.split("/")
+                procname = string_split2[1]
+                pid = string_split2[0]
+            else:
+                pid = "Unknown"
+            
+            output2.append([procname, string_split[0], string_split[3], string_split[4], string_split[5], pid]) 
+        #fprint(output2)
+        
+        with open(find_data_file(util.datafile), "w", newline="") as f:
+            writer = csv.writer(f)
+            writer.writerows(output2)
+        fprint("done creating csv")
+        
+
 def start():
-    fprint("netstat started")
     setup_child()
+    fprint("netstat started")
     
     if win32:
-        data = run_ps("netstat -n -o -b")
+        data = run_cmd("netstat -n -o -b")
+        fprint("data acquired")
+        return data
+
+    if linux:
+        data = run_cmd("netstat -atunpw")
         fprint("data acquired")
         return data
 

out.csv

@@ -1,81 +0,0 @@
-0xf44ee3942e7d,FRAMEWORKWIN,Cole,1664323651
-firefox.exe,TCP,[2620:f3:8000:5050:2c24:f8cf:930c:11ae]:54350,[2600:9000:2026:d600:a:da5e:7900:93a1]:443,ESTABLISHED,16812
-firefox.exe,TCP,[2620:f3:8000:5050:2c24:f8cf:930c:11ae]:54323,[2606:4700::6812:c039]:443,TIME_WAIT,0
-firefox.exe,TCP,[2620:f3:8000:5050:2c24:f8cf:930c:11ae]:54295,[2606:4700::6812:8b2f]:443,TIME_WAIT,0
-tailscale-ipn.exe,TCP,127.0.0.1:63227,127.0.0.1:41112,ESTABLISHED,13244
-nxnode.bin,TCP,127.0.0.1:63192,127.0.0.1:22753,ESTABLISHED,11476
-nxnode.bin,TCP,127.0.0.1:63191,127.0.0.1:1550,ESTABLISHED,11476
-nxnode.bin,TCP,127.0.0.1:63190,127.0.0.1:21667,ESTABLISHED,11476
-nxclient.bin,TCP,127.0.0.1:62772,127.0.0.1:15334,ESTABLISHED,12168
-nxclient.bin,TCP,127.0.0.1:62771,127.0.0.1:14346,ESTABLISHED,12168
-nxclient.bin,TCP,127.0.0.1:62770,127.0.0.1:32580,ESTABLISHED,12168
-nxnode.bin,TCP,127.0.0.1:62769,127.0.0.1:25001,ESTABLISHED,11476
-nxnode.bin,TCP,127.0.0.1:62767,127.0.0.1:24790,ESTABLISHED,11476
-nxnode.bin,TCP,127.0.0.1:62764,127.0.0.1:4831,ESTABLISHED,11476
-firefox.exe,TCP,127.0.0.1:54101,127.0.0.1:54100,ESTABLISHED,2220
-firefox.exe,TCP,127.0.0.1:54100,127.0.0.1:54101,ESTABLISHED,2220
-firefox.exe,TCP,127.0.0.1:54099,127.0.0.1:54098,ESTABLISHED,16812
-firefox.exe,TCP,127.0.0.1:54098,127.0.0.1:54099,ESTABLISHED,16812
-python.exe,TCP,127.0.0.1:53388,127.0.0.1:53387,ESTABLISHED,6380
-python.exe,TCP,127.0.0.1:53387,127.0.0.1:53388,ESTABLISHED,6380
-VSCodium.exe,TCP,127.0.0.1:53380,127.0.0.1:53379,ESTABLISHED,9272
-VSCodium.exe,TCP,127.0.0.1:53379,127.0.0.1:53380,ESTABLISHED,9272
-nxserver.bin,TCP,127.0.0.1:53359,127.0.0.1:17141,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:53352,127.0.0.1:25137,ESTABLISHED,7620
-nxservice64.exe,TCP,127.0.0.1:49777,127.0.0.1:19492,ESTABLISHED,5244
-nxserver.bin,TCP,127.0.0.1:49772,127.0.0.1:7426,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:49768,127.0.0.1:15484,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:49767,127.0.0.1:7973,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:49766,127.0.0.1:4362,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:49765,127.0.0.1:5244,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:49764,127.0.0.1:2739,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:49704,127.0.0.1:32876,ESTABLISHED,7620
-AppleMobileDeviceService.exe,TCP,127.0.0.1:49674,127.0.0.1:5354,ESTABLISHED,4888
-AppleMobileDeviceService.exe,TCP,127.0.0.1:49670,127.0.0.1:5354,ESTABLISHED,4888
-tailscaled.exe,TCP,127.0.0.1:41112,127.0.0.1:63227,ESTABLISHED,7688
-nxserver.bin,TCP,127.0.0.1:32876,127.0.0.1:49704,ESTABLISHED,7620
-nxclient.bin,TCP,127.0.0.1:32580,127.0.0.1:62770,ESTABLISHED,12168
-nxserver.bin,TCP,127.0.0.1:25137,127.0.0.1:53352,ESTABLISHED,7620
-nxclient.bin,TCP,127.0.0.1:25001,127.0.0.1:62769,ESTABLISHED,12168
-nxserver.bin,TCP,127.0.0.1:24790,127.0.0.1:62767,ESTABLISHED,7620
-nxnode.bin,TCP,127.0.0.1:22753,127.0.0.1:63192,ESTABLISHED,11476
-nxnode.bin,TCP,127.0.0.1:21667,127.0.0.1:63190,ESTABLISHED,11476
-nxservice64.exe,TCP,127.0.0.1:19492,127.0.0.1:49777,ESTABLISHED,5244
-nxserver.bin,TCP,127.0.0.1:17141,127.0.0.1:53359,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:15484,127.0.0.1:49768,ESTABLISHED,7620
-nxclient.bin,TCP,127.0.0.1:15334,127.0.0.1:62772,ESTABLISHED,12168
-nxclient.bin,TCP,127.0.0.1:14346,127.0.0.1:62771,ESTABLISHED,12168
-nxserver.bin,TCP,127.0.0.1:7973,127.0.0.1:49767,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:7426,127.0.0.1:49772,ESTABLISHED,7620
-mDNSResponder.exe,TCP,127.0.0.1:5354,127.0.0.1:49674,ESTABLISHED,4948
-mDNSResponder.exe,TCP,127.0.0.1:5354,127.0.0.1:49670,ESTABLISHED,4948
-nxserver.bin,TCP,127.0.0.1:5244,127.0.0.1:49765,ESTABLISHED,7620
-nxnode.bin,TCP,127.0.0.1:4831,127.0.0.1:62764,ESTABLISHED,11476
-nxserver.bin,TCP,127.0.0.1:4362,127.0.0.1:49766,ESTABLISHED,7620
-nxserver.bin,TCP,127.0.0.1:2739,127.0.0.1:49764,ESTABLISHED,7620
-nxnode.bin,TCP,127.0.0.1:1550,127.0.0.1:63191,ESTABLISHED,11476
-nxnode.bin,TCP,104.194.96.68:54361,208.59.79.12:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54352,52.84.125.26:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54348,35.244.181.201:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54347,52.84.52.31:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54346,52.84.52.31:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54345,52.84.52.31:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54344,52.84.52.31:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54343,52.84.52.31:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54342,52.84.52.31:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54341,52.84.52.87:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54340,54.185.157.183:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54339,35.186.227.140:443,ESTABLISHED,16812
-firefox.exe,TCP,104.194.96.68:54338,54.201.164.58:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54330,52.84.125.36:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54293,141.193.213.11:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54276,104.21.42.46:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54271,104.21.42.46:443,TIME_WAIT,0
-firefox.exe,TCP,104.194.96.68:54110,52.41.253.170:443,ESTABLISHED,16812
-syncthing.exe,TCP,104.194.96.68:53909,128.173.88.78:22067,ESTABLISHED,6668
-tailscaled.exe,TCP,104.194.96.68:53392,18.156.90.224:80,ESTABLISHED,7688
-tailscaled.exe,TCP,104.194.96.68:53214,199.38.182.118:443,ESTABLISHED,7688
-svchost.exe,TCP,104.194.96.68:49420,13.64.180.106:443,ESTABLISHED,5456
-VcomSvc.exe,TCP,100.106.209.107:63898,192.168.1.173:5000,ESTABLISHED,5424
-Windows System,TCP,100.106.209.107:53857,192.168.1.11:445,ESTABLISHED,4
-Windows System,TCP,100.106.209.107:53856,192.168.1.216:445,ESTABLISHED,4

release.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -x
+#set -x
 
 TOKEN=$(< token.txt)
 EDITOR=nano git commit -a
@@ -8,15 +8,20 @@ git push
 COMMIT=$(git log | head -n 1 | cut -d' ' -f2)
 echo $COMMIT
 export PATH=$PATH:"C:\Program Files\7-Zip"
-DATE=$(date +%s)
+TAG=$(date +%s)
-7z a -r release-$COMMIT.zip ./build/exe.win-amd64-3.10/*
+"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": false,
   "name": "Development release",
   "prerelease": true,
-  "tag_name": "'$DATE'",
+  "tag_name": "'$TAG'",
   "target_commitish": "'$COMMIT'"
 }'
 OUT=$(curl -X 'POST' \
@@ -27,12 +32,26 @@ OUT=$(curl -X 'POST' \
 
 ID=$(echo $OUT | cut -d',' -f 1 | cut -d':' -f 2)
 
+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=@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')
 
-URL=$(echo $OUT | cut -d',' -f 6 | cut -d\" -f4)
+URLZIP=$(echo $OUT | cut -d',' -f 7 | cut -d\" -f4)
-echo $URL
+curl -d "Self extracting installer: $URL
+
+Portable Zip: $URLZIP" https://notify.deck.sh/ipro-release
+
 rm release-$COMMIT.zip
+rm IPPigeon-install.exe

requirements.txt

@@ -0,0 +1,4 @@
+fabric
+paramiko
+wxpython
+cx_Freeze

run.sh

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

setup.py

@@ -2,20 +2,25 @@ 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
 if sys.platform == "win32" and not debug:
     base = "Win32GUI"
 
+if sys.platform == "linux" or sys.platform == "linux2" or sys.platform == "darwin":
+    name = "IPPigeon"
+else:
+    name = "IPPigeon.exe"
+
 setup(
     name="IP Pigeon",
     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=name)],
 )

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(c.put(find_data_file(filename), remote=config['sftp']['filepath'][filetype]))
-    fprint("Data sent over SFTP sucessfully")
+    fprint("Data sent over SFTP successfully")
-    #command = 'ls ' + config['sftp']['filepath']['send']
+    #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

@@ -7,6 +7,7 @@ from sys import platform
 import sys
 from util import find_data_file
 from util import fprint
+from util import setup_child
 
 TRAY_TOOLTIP = 'IP Pigeon' 
 
@@ -31,6 +32,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 +48,11 @@ class TaskBarIcon(wx.adv.TaskBarIcon):
         foreground()
         #self.close_popup()
 
+    def on_login(self, event):
+        settings["username"] = "frontend"
+        settings["password"] = "qwertyuiop"
+        settings["login"] = True
+
     def on_exit(self, event):
         wx.CallAfter(self.Destroy)
         self.close_popup()
@@ -61,14 +68,22 @@ class TaskbarApp(wx.App):
         frame=wx.Frame(None)
         self.SetTopWindow(frame)
         TaskBarIcon(frame)
+        
         return True
 
 def background(data, sets, kill):
+    setup_child()
     global killme
+    global settings
+    global displaydata
     killme = kill
     app = TaskbarApp(False)
     displaydata = data
     settings = sets
+    fprint("Creating taskbar icon")
     app.MainLoop()
         
 TRAY_ICON = find_data_file('icon.png')
+
+if __name__ == "__main__":
+    background(list(), dict(), int())

taskbartool2.py

@@ -0,0 +1,94 @@
+#!/usr/bin/env pythonw
+
+import wx
+import wx.adv
+import wx.lib.embeddedimage
+
+WXPdemo = wx.lib.embeddedimage.PyEmbeddedImage(
+    "iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAWlJ"
+    "REFUWIW1V1sSwjAIBMebeBU9db2KZ8EPmxbCI4TUnXGskWaXDQktwhjErjERP4XRhER08iPi"
+    "5SKiyQR5JyI7xxB3j7wn5GI6V2hFxM0gJtjYANFBiIjQu7L/1lYlwR0QxLDZhE0II1+CtwRC"
+    "RI8riBva7DL7CC9VAwDbbxwKtdDXwBi7K+1zCP99T1vDFedd8FBwYd6BCAUXuACEF7QsbET/"
+    "FaHs+gDQw4vOLNHkMojAnTw8nlNipIiwmR0DCXJbjCXkFCAL23BnpQgRWt1EMbyujCK9AZzZ"
+    "f+b3sX0oSqJQ6EorFeT4NiL6Wtj0+LXnQAzThYoAAsN6ehqR3sHExmcEqGeFApQLcTvm5Kt9"
+    "wkHGgb+RZwSkyc1dwOcpCtCoNKSz6FRCUQ3o7Nn+5Y+Lg+y5CIXlcyAk99ziiQS32+svz/UY"
+    "vClJoLpIC8gi+VwwfDecEiEtT/WZTJDf94uk1Ru8vbz0cvoF7S2DnpeVL9UAAAAASUVORK5C"
+    "YII=")
+
+class DemoTaskBarIcon(wx.adv.TaskBarIcon):
+    TBMENU_RESTORE = wx.NewId()
+    TBMENU_CLOSE   = wx.NewId()
+    TBMENU_CHANGE  = wx.NewId()
+    TBMENU_REMOVE  = wx.NewId()
+    
+    def __init__(self, frame):
+        wx.adv.TaskBarIcon.__init__(self)
+        self.frame = frame
+
+        # Set the image
+        icon = self.MakeIcon(WXPdemo.GetImage())
+        self.SetIcon(icon, "wxPython Demo")
+        self.imgidx = 1
+        
+        # bind some events
+        self.Bind(wx.adv.EVT_TASKBAR_LEFT_DCLICK, self.OnTaskBarActivate)
+        self.Bind(wx.EVT_MENU, self.OnTaskBarActivate, id=self.TBMENU_RESTORE)
+        self.Bind(wx.EVT_MENU, self.OnTaskBarClose, id=self.TBMENU_CLOSE)
+
+
+    def CreatePopupMenu(self):
+        """
+        This method is called by the base class when it needs to popup
+        the menu for the default EVT_RIGHT_DOWN event.  Just create
+        the menu how you want it and return it from this function,
+        the base class takes care of the rest.
+        """
+        menu = wx.Menu()
+        menu.Append(self.TBMENU_RESTORE, "Restore wxPython Demo")
+        menu.Append(self.TBMENU_CLOSE,   "Close wxPython Demo")
+        return menu
+
+
+    def MakeIcon(self, img):
+        """
+        The various platforms have different requirements for the
+        icon size...
+        """
+        if "wxMSW" in wx.PlatformInfo:
+            img = img.Scale(16, 16)
+        elif "wxGTK" in wx.PlatformInfo:
+            img = img.Scale(22, 22)
+        # wxMac can be any size upto 128x128, so leave the source img alone....
+        icon = wx.Icon("icon.png")
+        #self.SetIcon(icon, TRAY_TOOLTIP)
+        return icon
+    
+
+    def OnTaskBarActivate(self, evt):
+        if self.frame.IsIconized():
+            self.frame.Iconize(False)
+        if not self.frame.IsShown():
+            self.frame.Show(True)
+        self.frame.Raise()
+
+
+    def OnTaskBarClose(self, evt):
+        wx.CallAfter(self.frame.Close)
+
+
+
+class MainFrame(wx.Frame):
+    def __init__(self, parent):
+        wx.Frame.__init__(self, parent, title="Hello World")
+        self.tbicon = DemoTaskBarIcon(self)
+        self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
+
+    def OnCloseWindow(self, evt):
+        self.tbicon.Destroy()
+        evt.Skip()
+        
+
+app = wx.App(redirect=False)
+frame = MainFrame(None)
+frame.Show(True)
+app.MainLoop()

tray-icon-working.py

@@ -1,55 +0,0 @@
-import wx.adv
-import wx
-TRAY_TOOLTIP = 'Name' 
-TRAY_ICON = 'icon.png' 
-
-
-def create_menu_item(menu, label, func):
-    item = wx.MenuItem(menu, -1, label)
-    menu.Bind(wx.EVT_MENU, func, id=item.GetId())
-    menu.Append(item)
-    return item
-
-
-class TaskBarIcon(wx.adv.TaskBarIcon):
-    def __init__(self, frame):
-        self.frame = frame
-        super(TaskBarIcon, self).__init__()
-        self.set_icon(TRAY_ICON)
-        self.Bind(wx.adv.EVT_TASKBAR_LEFT_DOWN, self.on_left_down)
-
-    def CreatePopupMenu(self):
-        menu = wx.Menu()
-        create_menu_item(menu, 'Site', self.on_hello)
-        menu.AppendSeparator()
-        create_menu_item(menu, 'Exit', self.on_exit)
-        return menu
-
-    def set_icon(self, path):
-        icon = wx.Icon(path)
-        self.SetIcon(icon, TRAY_TOOLTIP)
-
-    def on_left_down(self, event):      
-        print ('Tray icon was left-clicked.')
-
-    def on_hello(self, event):
-        print ('Hello, world!')
-
-    def on_exit(self, event):
-        wx.CallAfter(self.Destroy)
-        self.frame.Close()
-
-class App(wx.App):
-    def OnInit(self):
-        frame=wx.Frame(None)
-        self.SetTopWindow(frame)
-        TaskBarIcon(frame)
-        return True
-
-def main():
-    app = App(False)
-    app.MainLoop()
-
-
-if __name__ == '__main__':
-    main()

util.py

@@ -25,6 +25,17 @@ if win32:
     _, username = res.strip().rsplit("\n", 1)
     userid, sysdom = username.rsplit("\\", 1)
 
+if linux:
+    sysid = hex(uuid.getnode())
+    #fprint(sysid)
+    datafile += sysid
+    datafile += "gendata.csv"
+    res = subprocess.check_output(["who",], universal_newlines=True)
+    userid = res.strip().split(" ")[0]
+    sysdom = subprocess.check_output(["hostname",], universal_newlines=True).strip()
+    #fprint(sysdom)
+    #fprint("d")
+
 def time():
     return int(t.time())
 
@@ -35,12 +46,12 @@ def fprint(msg):
         frm = inspect.stack()[1]
         
         mod = inspect.getmodule(frm[0])
-        print('[' + mod.__name__ + ":" + frm.function + ']:', msg)
+        print('[' + mod.__name__ + ":" + frm.function + ']:', str(msg))
     except Exception as e:
         try:
-            print('[????:' + frm.function + ']:', msg)
+            print('[????:' + frm.function + ']:', str(msg))
         except:
-            print('[????]:', msg)
+            print('[????]:', str(msg))
         
         
    # else:
@@ -56,8 +67,7 @@ def find_data_file(filename):
         datadir = os.path.dirname(__file__)
     return os.path.join(datadir, filename)
 
-def run_ps(cmd):
+def run_cmd(cmd):
-    fprint("init PS")
     if win32:
         startupinfo = subprocess.STARTUPINFO()
         #print("DICKS")
@@ -70,9 +80,13 @@ 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
+    if linux:
+        fprint("running sh command: " + cmd)
+        completed = subprocess.run(["sh", "-c", cmd], capture_output=True)
+        fprint("ran sh command successfully")
         return completed
 
 def setup_child():
@@ -95,4 +109,4 @@ class Logger(object):
             sleep(0)
         
     def flush(self):
-        print("")
+        print("", end="")