Commit Graph

89 Commits

Author SHA1 Message Date
Colin Kuebler
ffe9ab7ded Wait for process to end before proceeding 2019-10-29 18:51:05 -04:00
Colin Kuebler
50f4995b0a Moved disclaimer to setup_checks 2019-10-29 18:32:28 -04:00
Colin Kuebler
70c70fea1e Moved config check from setup_ap to setup_checks 2019-10-29 18:28:21 -04:00
Colin Kuebler
b87b272987 Added new script responsible for setup checks
Added port checking implementation
2019-10-29 18:25:17 -04:00
Colin Kuebler
c3952af957 Encode AES key
Closes #332
2019-10-23 23:31:58 -04:00
Colin Kuebler
8c5b4da98a Organized setup_ap into three functions, check_config, setup, and cleanup
Use bash trap to guarantee cleanup on script exit
This means the user can ^C out and it will do the right thing
2019-10-13 23:19:06 -04:00
Colin Kuebler
4f8e380956 Merge branch 'no-pw' into development 2019-10-13 23:10:59 -04:00
Colin Kuebler
ce30b6ee7e Merge branch 'fix-net-inf' into development 2019-10-12 18:06:52 -04:00
Colin Kuebler
5e3db7e4d9 Added check for AP mode support 2019-10-12 17:09:46 -04:00
Colin Kuebler
e3168b8339 Remove hostapd.conf writer from setup_ap, and instead include a static file
Cut hostapd.conf down to bare configuration
Added hostapd ctrl interface
Reduce log noise by specifying hostapd log level info
Specify interface for hostapd by argument rather than config
No password on vtrust-flash
Updated smartconfig for no password
2019-10-12 16:07:46 -04:00
Colin Kuebler
ec43e49d16 Replace hardcoded gateway with supplied argument 2019-10-09 23:09:47 -04:00
Colin Kuebler
f72196113d Change smartconfig notice, fixing typo 2019-10-05 18:57:59 -04:00
Colin Kuebler
da75a2f6b0 Merge branch 'simple-dict' into development 2019-10-05 18:47:13 -04:00
Colin Kuebler
b8a50aa918 Merge branch 'fix-191' into development 2019-10-05 18:46:43 -04:00
Colin Kuebler
8b799fe05f Merge branch 'fix-net-inf' into development 2019-10-05 18:46:12 -04:00
Colin Kuebler
d9a29ca421 Merge branch 'improve-flow' into development 2019-10-05 18:44:04 -04:00
Colin Kuebler
2fe5cd4fcd A simple dictionary to track activated ids, instead of a boilerplate class 2019-10-05 17:47:51 -04:00
Colin Kuebler
707636357c Connect psk frontend to gateway instead of 0.0.0.0 to mitigate potential address conflict 2019-10-05 17:45:30 -04:00
Colin Kuebler
38d1981a9e Let the user know when they are connected, rather than hello world 2019-10-04 14:33:11 -04:00
Colin Kuebler
0578b32ab5 Enable captive portal detection by responding to unknown requests with 302 (temporary redirect)
This should fix mobile devices that disconnect when there is no internet access
2019-10-04 14:29:17 -04:00
Colin Kuebler
ec789ad702 Fix for #191 with thanks to @linusbarth 2019-10-04 13:31:14 -04:00
Colin Kuebler
155dfdaceb Merge branch 'master' into fix-net-inf 2019-10-03 22:10:30 -04:00
Colin Kuebler
1762c6a66e Fix schema generation using a global object as an in memory db 2019-10-03 21:16:20 -04:00
Colin Kuebler
b4e893c030 Removed ETH and added GATEWAY to config 2019-10-03 14:41:30 -04:00
Colin Kuebler
8d3de795e5 Merge branch 'master' into fix-net-inf 2019-10-03 14:24:12 -04:00
Colin Kuebler
4cc1e2e875 Don't modify NetworkManager.conf, just stop NetworkManager temporarily
Seems to fix issues I was having while already connected to a network when starting AP
No longer a need to backup/restore NetworkManager config
We aren't routing traffic to the internet, so no need for iptable modifications
Stop dnsmasq before restarting NetworkManager
2019-10-03 14:15:38 -04:00
Colin Kuebler
0f8764fa10 Revert changes to mosquitto, apparently the config is not respected and I haven't been able to figure out why 2019-10-03 13:23:44 -04:00
Colin Kuebler
0b48ababcb Merge branch 'master' into improve-flow 2019-10-03 13:03:09 -04:00
Colin Kuebler
0c3e2d8a4d Use pkill to find and cancel smartconfig process, both in start_flash and after receiving registration call 2019-10-02 15:22:57 -04:00
Colin Kuebler
966d6ab34c Call super 2019-10-01 23:09:53 -04:00
Colin Kuebler
84731def1e Keep track of activation attempts per device to dynamically alter behavior
Try extended schema first, then minimal schema
2019-10-01 22:56:07 -04:00
Colin Kuebler
84f9a59023 Remove trigger_upgrade and run mq_pub_15 directly from fake-registration-server 2019-09-29 16:53:28 -04:00
Colin Kuebler
c8cecdbf6b Use paho mqtt publish.single helper function
Also fixes socket error on disconnect
2019-09-29 16:44:18 -04:00
Colin Kuebler
612e53b2c6 Replace pyaes with Crypto.Cipher.AES 2019-09-29 16:41:36 -04:00
Colin Kuebler
b427d48741 Typo 2019-09-28 17:24:05 -04:00
Colin Kuebler
5de40b0a70 Warn users if their Tuya device is not ESP based 2019-09-28 17:22:09 -04:00
Colin Kuebler
2c023f5b18 Print ID as hex, before calculating PSK 2019-09-26 20:09:58 -04:00
Colin Kuebler
f2d20de93e Python2 friendly print 2019-09-26 16:37:43 -04:00
Colin Kuebler
6983f67f92 Pretty print IP and port 2019-09-26 14:44:08 -04:00
Colin Kuebler
cba1111814 Simplify schema expression 2019-09-26 14:43:32 -04:00
Colin Kuebler
4195c53daf Experimental workaround, some users are reporting better luck with python vs python3 for psk-frontend 2019-09-26 13:55:01 -04:00
Colin Kuebler
153c8ed842 Start dnsmasq with command line options rather than a config file
No need to backup or restore dnsmasq.conf
Use wildcard to resolve all dns queries to 10.42.42.1
Write hostapd.conf locally so we don't need to backup/restore
Use sudo when writing NetworkManager.conf
Added and tweaked some log messages
Use pkill to stop hostapd so the cleanup portion of setup_ap is run
2019-09-26 12:47:39 -04:00
Colin Kuebler
bb39283d95 Do not imply that payload decryption failure is an issue, it is expected for .active endpoints 2019-09-25 16:56:44 -04:00
Colin Kuebler
ec453412de Activation workaround by extending dummy schema - some devices crash if schema is shorter than expected
Added missing URLs in activation response
Readded .updatestatus to avoid .upgrade from catching this endpoint
Verify payload decryption is JSON
2019-09-25 10:25:40 -04:00
Colin Kuebler
97ecf0e305 Log SSL exceptions for debugging 2019-09-24 21:07:40 -04:00
Colin Kuebler
c0e57847a9 Fix variable rename missed 2019-09-23 16:39:31 -04:00
Colin Kuebler
ac19da4d83 Revert python to python3 as per discussion in #273 2019-09-23 16:36:20 -04:00
Colin Kuebler
5df7637452 Combined reply_encrypted in reply with encrypted flag
Tidying up by removing some redundant endpoints and adding comments
Now all but the activation endpoints use encryption when requested
2019-09-23 00:01:31 -04:00
Colin Kuebler
2a83af3d29 Set defaults for query params to prevent exceptions when missing 2019-09-22 18:50:24 -04:00
Colin Kuebler
a88db23ee4 Reorganized imports and made secKey configurable via command line option 2019-09-22 18:49:43 -04:00