Ready for release

There was still some bugs that make the application crashed when used
with the password protection.

I also added a banner at start with the version, as I tend to forget to
increment the version I simply used the commit hash.
Obviously the commit hash will always be one version behind but this
should do the trick for now.

Author: remisarrailh

README.md

@@ -42,6 +42,32 @@ The easiest way to use this software is to download the compiled version.
 You can find it here:    
 https://github.com/madnerdorg/libreconnect/releases
 
+# Use password
+You can use a password, just send it using the websocket.    
+For example:    
+```
+usb_scanner --password HorseBatteryStaple
+```
+As for now you can only use the same password for each connector.    
+
+# IP Ban
+I also implement ip ban to disallow force brute.
+```
+usb_scanner --bantime seconds
+```
+
+# Power management
+If you want to be able to turn on/off your system (this is useful if you don't have access to a terminal for ex.)    
+You can use special commands.
+```
+usb_scanner --power
+```
+Then send using the websocket:
+```
+Turn off server: @poweroff
+Reboot server: @reboot
+```
+
 # Use python version
 I recommended using miniconda if you are on windows (https://conda.io/miniconda.html)  
 This will work on python 2/3.
@@ -71,30 +97,11 @@ openssl x509 -req -days 3650 -in keys/server.csr -signkey keys/server.key -out k
 openssl x509 -in keys/server.crt -out keys/server.pem    
 ```
 
-# Use password
-You can use a password, just send it using the websocket.    
-For example:    
-```
-usb_scanner --password HorseBatteryStaple
-```
-As for now you can only use the same password for each connector.    
-
-# IP Ban
-I also implement ip ban to disallow force brute.
-```
-usb_scanner --bantime seconds
-```
-
-# Power management
-If you want to be able to turn on/off your system (this is useful if you don't have access to a terminal for ex.)    
-You can use special commands.
+# Compile
+I used pyinstaller to compile, it seems it doesn't works with python 3.6
 ```
-usb_scanner --power
-```
-Then send using the websocket:
-```
-Turn off server: @poweroff
-Reboot server: @reboot
+pip install pyinstaller
+pip install pypiwin32
 ```
 
 # Source    

connector.py

@@ -203,10 +203,8 @@ def onMessage(self, payload, isBinary):
                                     self.sendMessage(str("@banned").encode())
                                 else:
                                     suspected_clients[suspect]["retry"] = user["retry"] + 1
-                                    self.sendMessage("@wrongpassword:" +
-                                                     str(suspected_clients[suspect]["retry"]) +
-                                                     "/" +
-                                                     str(maxretry)).encode()
+                                    error_message = "@wrongpassword:" + str(suspected_clients[suspect]["retry"]) + "/" + str(maxretry)
+                                    self.sendMessage(error_message.encode())
                                     print("Recorded suspect: " +
                                           str(suspected_clients[suspect]["retry"]))
                             else:

scripts/compile.bat

@@ -1,4 +1,6 @@
 @echo off
 cd ..
 pip install pyinstaller
+pip install pypiwin32
 pyinstaller --onefile connector.py
+pyinstaller --onefile usb_scanner.py

scripts/compile.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 pip install pyinstaller
-cd ..;pyinstaller --onefile connector.py
+cd ..;pyinstaller --onefile connector.py;pyinstaller --onefile usb_scanner.py

scripts/compile_service.bat

@@ -1,6 +1,7 @@
 @echo off
 cd ..
-pip install websocket
 pip install pyserial
-pip install websocket_server
+pip install twisted
+pip install autobahn
+pip install service_identity
 pause

scripts/install.bat

@@ -1,4 +1,5 @@
 #!/bin/bash
-pip install websocket
 pip install pyserial
-pip install websocket_server
+pip install twisted
+pip install autobahn
+pip install service_identity

scripts/install.sh

@@ -14,6 +14,8 @@
 import subprocess
 import os
 
+
+version = "97f9aff"
 # We use 115200 as default baudrate
 baudrate = 115200
 # Check serial ports every x seconds
@@ -25,6 +27,10 @@
 devices_name = []
 devices_websocket = []
 
+print("LibreConnect - version " + version)
+print("By madnerd.org (https://github.com/madnerdorg/libreconnect)")
+print("----------------------------------------------------------")
+
 # Check if python file existed, if not default to compiled version
 if os.path.exists("connector.py"):
     connector_software = "python connector.py"