183f5c10f4
Change shebang of psk-frontend.py to python2
...
psk-frontend.py should be executed with python2 until sslpsk is working with python3. Some distributions start defaulting to python3 which currently breaks this script.
2019-11-09 20:22:36 +01:00
4aa350c149
Modify extended schema to cover more cases, fix #354 #363 #369 #372
2019-11-07 10:37:51 -05:00
c13abf44ce
Merge pull request #351 from Churro/ip
...
Replace ifconfig and explicitly add route to 10.42.42.0/24
2019-11-02 18:07:44 -04:00
e459fcc3a6
Attempt to stop process nicely before sending SIGKILL
2019-10-31 18:40:36 -04:00
1b02f66e2c
Filter out units which are not service or the user instance
2019-10-31 18:27:12 -04:00
73a344f043
Be explicit when stopping a service vs terminating process
2019-10-30 15:28:14 -04:00
9e434467c8
Confirmed that sudo is not needed by ps
2019-10-30 15:25:37 -04:00
9fa4599024
Don't print ps header so no need for grep
2019-10-30 15:22:43 -04:00
322e42514f
Missed sudo on ps, might be redundant but couldn't hurt
2019-10-30 15:11:25 -04:00
17525e94f6
Missing newline after user prompt
2019-10-29 19:10:25 -04:00
ccad30f600
Port checks for DHCP and Tuya protocol
2019-10-29 19:01:08 -04:00
ffe9ab7ded
Wait for process to end before proceeding
2019-10-29 18:51:05 -04:00
50f4995b0a
Moved disclaimer to setup_checks
2019-10-29 18:32:28 -04:00
70c70fea1e
Moved config check from setup_ap to setup_checks
2019-10-29 18:28:21 -04:00
b87b272987
Added new script responsible for setup checks
...
Added port checking implementation
2019-10-29 18:25:17 -04:00
c70e102542
Replace ifconfig and explicitly add route to 10.42.42.0/24
2019-10-27 01:34:41 +02:00
c3952af957
Encode AES key
...
Closes #332
2019-10-23 23:31:58 -04:00
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
4f8e380956
Merge branch 'no-pw' into development
2019-10-13 23:10:59 -04:00
ce30b6ee7e
Merge branch 'fix-net-inf' into development
2019-10-12 18:06:52 -04:00
5e3db7e4d9
Added check for AP mode support
2019-10-12 17:09:46 -04:00
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
ec43e49d16
Replace hardcoded gateway with supplied argument
2019-10-09 23:09:47 -04:00
f72196113d
Change smartconfig notice, fixing typo
2019-10-05 18:57:59 -04:00
da75a2f6b0
Merge branch 'simple-dict' into development
2019-10-05 18:47:13 -04:00
b8a50aa918
Merge branch 'fix-191' into development
2019-10-05 18:46:43 -04:00
8b799fe05f
Merge branch 'fix-net-inf' into development
2019-10-05 18:46:12 -04:00
d9a29ca421
Merge branch 'improve-flow' into development
2019-10-05 18:44:04 -04:00
2fe5cd4fcd
A simple dictionary to track activated ids, instead of a boilerplate class
2019-10-05 17:47:51 -04:00
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
38d1981a9e
Let the user know when they are connected, rather than hello world
2019-10-04 14:33:11 -04:00
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
ec789ad702
Fix for #191 with thanks to @linusbarth
2019-10-04 13:31:14 -04:00
155dfdaceb
Merge branch 'master' into fix-net-inf
2019-10-03 22:10:30 -04:00
1762c6a66e
Fix schema generation using a global object as an in memory db
2019-10-03 21:16:20 -04:00
b4e893c030
Removed ETH and added GATEWAY to config
2019-10-03 14:41:30 -04:00
8d3de795e5
Merge branch 'master' into fix-net-inf
2019-10-03 14:24:12 -04:00
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
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
0b48ababcb
Merge branch 'master' into improve-flow
2019-10-03 13:03:09 -04:00
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
966d6ab34c
Call super
2019-10-01 23:09:53 -04:00
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
84f9a59023
Remove trigger_upgrade and run mq_pub_15 directly from fake-registration-server
2019-09-29 16:53:28 -04:00
c8cecdbf6b
Use paho mqtt publish.single helper function
...
Also fixes socket error on disconnect
2019-09-29 16:44:18 -04:00
612e53b2c6
Replace pyaes with Crypto.Cipher.AES
2019-09-29 16:41:36 -04:00
b427d48741
Typo
2019-09-28 17:24:05 -04:00
5de40b0a70
Warn users if their Tuya device is not ESP based
2019-09-28 17:22:09 -04:00
2c023f5b18
Print ID as hex, before calculating PSK
2019-09-26 20:09:58 -04:00
f2d20de93e
Python2 friendly print
2019-09-26 16:37:43 -04:00
Felix
Colin Kuebler
Johannes Feichtner