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
e1126b87b7
Closing AP should be the last thing we do, as the other scripts are bound to this interface
2019-10-03 13:24:55 -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
901aa93f5c
Merge pull request #284 from digiblur/master
...
added digiMIN build tag to thirdparty.bin
2019-10-03 10:09:03 -04:00
61ecf09f2e
added digiMIN build tag to thirdparty.bin
...
Since this bin is missing several features like Autodiscovery I wanted it to be easy to spot for support tickets that the user wasn't running the full sonoff.bin version
2019-10-02 18:51:46 -05:00
d9211e0f17
Merge pull request #279 from kueblc/new-api
...
Support for devices using the new TLS SDK
2019-10-02 13:10:19 -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
6103c5cff3
Removed pyaes from install script
...
Removed dependency list from README as it's out of date and redundant anyway
2019-09-29 16:48:27 -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
466a9dbb39
Add python-dev for installing sslpsk in python2
2019-09-29 15:50:37 -04:00
85f4bd3fa2
Added python-setuptools for python-pip
2019-09-29 12:34:29 -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
624b6c44ed
Merge pull request #281 from meingraham/patch-1
...
Tasmota Recommendations
2019-09-28 08:50:36 -04:00
9a7094f8ba
Tasmota Recommendations
2019-09-28 08:40:36 -04:00
2c023f5b18
Print ID as hex, before calculating PSK
2019-09-26 20:09:58 -04:00
68962299ab
Update README to indicate that OTA flashing works once again but remain cautious
2019-09-26 20:08:14 -04:00
99a936768c
Added python-pip, thanks @AlphaSierraHotel
2019-09-26 16:39:19 -04:00
f2d20de93e
Python2 friendly print
2019-09-26 16:37:43 -04:00
6983f67f92
Pretty print IP and port
2019-09-26 14:44:08 -04:00
cba1111814
Simplify schema expression
2019-09-26 14:43:32 -04:00
df06f2b24d
Merge pull request #277 from digiblur/master
...
Change thirdparty.bin to WiFi Manager default Tasmota
2019-09-26 14:07:29 -04:00
4195c53daf
Experimental workaround, some users are reporting better luck with python vs python3 for psk-frontend
2019-09-26 13:55:01 -04:00
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
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
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
d0f9a1330f
Update bin to WiFi Manager as default of Tasmota
2019-09-24 20:33:16 -05:00
4ebfd4be38
Delete thirdparty.bin
2019-09-24 20:32:20 -05:00
97ecf0e305
Log SSL exceptions for debugging
2019-09-24 21:07:40 -04:00
c0e57847a9
Fix variable rename missed
2019-09-23 16:39:31 -04:00
ac19da4d83
Revert python to python3 as per discussion in #273
2019-09-23 16:36:20 -04:00
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
2a83af3d29
Set defaults for query params to prevent exceptions when missing
2019-09-22 18:50:24 -04:00
a88db23ee4
Reorganized imports and made secKey configurable via command line option
2019-09-22 18:49:43 -04:00
2104d47be5
Redirect GET requests to our POST handler
2019-09-22 18:29:02 -04:00
da42236a1d
Implemented encrypted response support
...
Removed additional config.get payload, does not appear to be necessary and in some cases was causing problems
Revert upgrade type to 0 since we are trying to update the firmware on the main ESP82xx, not an external MCU
2019-09-22 18:25:30 -04:00
27f1a33605
Enhance logging
...
Print request details, method, headers, and decrypted payload
Print response payload
2019-09-22 18:19:04 -04:00
60c7ccbba7
Print out PSK identity for debugging purposes
2019-09-22 18:13:14 -04:00
769901a673
Added endpoint for /d.json based on reports in #273
2019-09-21 18:32:47 -04:00
5fe523aafe
Merge branch 'master' into new-api
...
Attempted to integrate new API responses with old ones, based on et=1 param
**Untested**
2019-09-21 18:27:31 -04:00
2039394c17
Pass the protocol version from trigger_upgrade to mq_pub_15
2019-09-21 17:34:52 -04:00
5114b1ef7d
Merge branch 'master' into fix-net-inf
2019-09-21 17:28:55 -04:00
95632b143f
Merge pull request #226 from kueblc/enhance-api
...
Server enhancements, API additions
2019-09-21 17:22:44 -04:00
41ac947ce7
Readded old protocol 2.1 encoding back into mq_pub_15
...
Added optional argument "--protocol" which specifies whether to use the old or new MQTT encoding
Cleaned up a bit, adding some descriptive variable names and reducing code clutter
2019-09-21 17:08:46 -04:00
468a976d05
Added libssl-dev as prereq for py sslpsk
2019-09-21 16:10:44 -04:00
2903bd286e
Added python3-dev and pycrypto as per #274
2019-09-21 16:06:16 -04:00
Colin Kuebler
digiblur
Michael Ingraham