mia/bumper
1
0
Fork 0
Code Issues 47 Pull requests 11 Projects Releases Packages Wiki Activity Actions

add new endpoints for app v2 #116

Merged
edenhaus merged 17 commits from ecovacs-home into master 2021-06-05 15:06:19 +02:00
Conversation 27 Commits 17 Files changed 21 +43 -16
4 changed files with 43 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit dc49e960db - Show all commits

6
.dockerignore
View file

@ -20,3 +20,9 @@ certs
# Other # Other
*.yml *.yml
# Github
.github
# Python virtual environment
venv

4
create_certs/Bumper_SAN.txt
View file

@ -4,3 +4,7 @@ ecouser.net
*.ecouser.net *.ecouser.net
ecovacs.net ecovacs.net
*.ecovacs.net *.ecovacs.net
*.ww.ecouser.net
*.dc-eu.ww.ecouser.net
*.dc.ww.ecouser.net
*.area.ww.ecouser.net
edenhaus commented 2021-04-19 21:06:35 +02:00 (Migrated from github.com)
Copy link

@bmartin5692 Can you please verify, which domains the app is using in the us? :)

@bmartin5692 Can you please verify, which domains the app is using in the us? :)
puddly commented 2021-05-26 22:42:05 +02:00 (Migrated from github.com)
Copy link

If it's of any help, here are all of the DNS queries and TLS server names for requests the app makes when communicating with my older Deebot 901:

bigdata-international.ecovacs.com
recommender.ecovacs.com
gl-us-api.ecovacs.com
api-app.ecouser.net
mq-ww.ecouser.net
If it's of any help, here are all of the DNS queries and TLS server names for requests the app makes when communicating with my older Deebot 901: ``` bigdata-international.ecovacs.com recommender.ecovacs.com gl-us-api.ecovacs.com api-app.ecouser.net mq-ww.ecouser.net ```
edenhaus commented 2021-05-27 09:31:01 +02:00 (Migrated from github.com)
Copy link

@puddly your urls are already covered by the wildcards domain above

@puddly your urls are already covered by the wildcards domain above
puddly commented 2021-05-27 09:40:00 +02:00 (Migrated from github.com)
Copy link

Indeed they are. I'm located in the USA and and your v2 changes work fine with the latest version of the app on Android (thank you!), so either the app "upgrades" to different domains when communicating with newer-generation bots, or these existing domains in your PR are enough.

Indeed they are. I'm located in the USA and and your v2 changes work fine with the latest version of the app on Android (thank you!), so either the app "upgrades" to different domains when communicating with newer-generation bots, or these existing domains in your PR are enough.

36
docs/Create_Certs.md
View file

@ -53,9 +53,9 @@ I get it, you don't trust create_certs and want to do it manually. The easiest
### Create a Root CA ### Create a Root CA
1. Create csrconfig.txt for use in later commands 1. Create csrconfig_ca.txt for use in later commands
***csrconfig.txt*** ***csrconfig_ca.txt***
```` ````
[ req ] [ req ]
default_md = sha256 default_md = sha256
@ -70,9 +70,9 @@ keyUsage=critical,keyCertSign,cRLSign
basicConstraints=critical,CA:true,pathlen:1 basicConstraints=critical,CA:true,pathlen:1
```` ````
1. Create certconfig.txt for use in later commands 1. Create certconfig_ca.txt for use in later commands
***certconfig.txt*** ***certconfig_ca.txt***
```` ````
[ req ] [ req ]
default_md = sha256 default_md = sha256
@ -91,21 +91,21 @@ basicConstraints=critical,CA:true,pathlen:1
1. Generate the RSA private key 1. Generate the RSA private key
`openssl genpkey -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -out priv.key` `openssl genrsa -out ca.key 4096`
1. Create the CSR 1. Create the CSR
`openssl req -new -nodes -key priv.key -config csrconfig.txt -out cert.csr` `openssl req -new -nodes -key ca.key -config csrconfig_ca.txt -out ca.csr`
1. Self-sign your CSR 1. Self-sign your CSR
`openssl req -x509 -nodes -in cert.csr -days 3650 -key priv.key -config certconfig.txt -extensions req_ext -out cert.crt` `openssl req -x509 -nodes -in ca.csr -days 1095 -key ca.key -config certconfig_ca.txt -extensions req_ext -out ca.crt`
### Create the Server Certificate ### Create the Server Certificate
1. Create csrconfig.txt for use in later commands 1. Create csrconfig_bumper.txt for use in later commands
***csrconfig.txt*** ***csrconfig_bumper.txt***
```` ````
[ req ] [ req ]
default_md = sha256 default_md = sha256
@ -127,11 +127,15 @@ DNS.2 = ecouser.net
DNS.3 = *.ecouser.net DNS.3 = *.ecouser.net
DNS.4 = ecovacs.net DNS.4 = ecovacs.net
DNS.5 = *.ecovacs.net DNS.5 = *.ecovacs.net
DNS.6 = *.ww.ecouser.net
DNS.7 = *.dc-eu.ww.ecouser.net
DNS.8 = *.dc.ww.ecouser.net
DNS.9 = *.area.ww.ecouser.net
```` ````
1. Create certconfig.txt for use in later commands 1. Create certconfig_bumper.txt for use in later commands
***certconfig.txt*** ***certconfig_bumper.txt***
```` ````
[ req ] [ req ]
default_md = sha256 default_md = sha256
@ -155,19 +159,23 @@ DNS.2 = ecouser.net
DNS.3 = *.ecouser.net DNS.3 = *.ecouser.net
DNS.4 = ecovacs.net DNS.4 = ecovacs.net
DNS.5 = *.ecovacs.net DNS.5 = *.ecovacs.net
DNS.6 = *.ww.ecouser.net
DNS.7 = *.dc-eu.ww.ecouser.net
DNS.8 = *.dc.ww.ecouser.net
DNS.9 = *.area.ww.ecouser.net
```` ````
1. Generate the RSA private key 1. Generate the RSA private key
`openssl genpkey -outform PEM -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -out priv.key` `openssl genrsa -out bumper.key 4096`
1. Create the CSR 1. Create the CSR
`openssl req -new -nodes -key priv.key -config csrconfig.txt -out cert.csr` `openssl req -new -nodes -key bumper.key -config csrconfig_bumper.txt -out bumper.csr`
1. Sign your CSR with a root CA cert 1. Sign your CSR with a root CA cert
`openssl x509 -req -in cert.csr -days 3650 -CA ca.crt -CAkey priv.key -extfile certconfig.txt -extensions req_ext -CAserial /tmp/tmp-10593TSH1OlVSxC7C -CAcreateserial -out cert.crt` `openssl x509 -req -in bumper.csr -days 365 -CA ca.crt -CAkey ca.key -extfile certconfig_bumper.txt -extensions req_ext -CAcreateserial -out bumper.crt`
## Using a Custom CA/Self ## Using a Custom CA/Self

9
docs/DNS_Setup.md
View file

@ -26,6 +26,7 @@ If overriding DNS for the top-level domains isn't an option, you'll need to conf
**Note:** Depending on country, your phone/robot may be using a different domain. Most of these domains contain country-specific placeholders. **Note:** Depending on country, your phone/robot may be using a different domain. Most of these domains contain country-specific placeholders.
Not all domains have been documented at this point, and this list will be updated as more are identified/seen. The preferred way to ensure Bumper works is to override the full domains as above. Not all domains have been documented at this point, and this list will be updated as more are identified/seen. The preferred way to ensure Bumper works is to override the full domains as above.
**Note:** The app dynamically gets the required domains from the endpoint `api/appsvr/service/list` and therefore ecovacs can use different domains for different models.
Replacement Examples: Replacement Examples:
@ -46,6 +47,7 @@ Replacement Examples:
| `eco-{countrycode}-api.ecovacs.com` | Used for Login | | `eco-{countrycode}-api.ecovacs.com` | Used for Login |
| `gl-{countrycode}-api.ecovacs.com` | Used by EcoVacs Home app | | `gl-{countrycode}-api.ecovacs.com` | Used by EcoVacs Home app |
| `gl-{countrycode}-openapi.ecovacs.com` | Used by EcoVacs Home app | | `gl-{countrycode}-openapi.ecovacs.com` | Used by EcoVacs Home app |
| `portal.ecouser.net` | Used for Login and Rest API |
| `portal-{countrycode}.ecouser.net` | Used for Login and Rest API | | `portal-{countrycode}.ecouser.net` | Used for Login and Rest API |
| `portal-{region}.ecouser.net` | Used for Login and Rest API | | `portal-{region}.ecouser.net` | Used for Login and Rest API |
| `portal-ww.ecouser.net` | Used for various Rest APIs | | `portal-ww.ecouser.net` | Used for various Rest APIs |
@ -59,4 +61,11 @@ Replacement Examples:
| `recommender.ecovacs.com` | Used by Ecovacs Home app | | `recommender.ecovacs.com` | Used by Ecovacs Home app |
| `bigdata-international.ecovacs.com` | Telemetry/tracking | | `bigdata-international.ecovacs.com` | Telemetry/tracking |
| `bigdata-northamerica.ecovacs.com` | Telemetry/tracking | | `bigdata-northamerica.ecovacs.com` | Telemetry/tracking |
| `bigdata-europe.ecovacs.com` | Telemetry/tracking |
| `bigdata-{unknown regions}.ecovacs.com` | Telemetry/tracking | | `bigdata-{unknown regions}.ecovacs.com` | Telemetry/tracking |
| `api-app.ww.ecouser.net` | Api for App (v2+) |
| `api-app.dc-{region}.ww.ecouser.net` | Api for App (v2+) |
| `users-base.dc-{region}.ww.ecouser.net` | Accounts for App (v2+) |
| `jmq-ngiot-{region}.dc.ww.ecouser.net` | MQTT for App (v2+) |
| `api-rop.dc-{region}.ww.ecouser.net` | App (v2+) |
| `jmq-ngiot-{region}.area.ww.ecouser.net`| App (v2+) |