New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix owntracks topic in encrypted ios #19220

Merged
merged 2 commits into from Dec 12, 2018

Conversation

@balloob
Copy link
Member

balloob commented Dec 12, 2018

Description:

On iOS, the encrypted payload does not contain a topic. It is available in the decrypted payload.

This adjusts the check to not throw away the message if it's encrypted but process it instead. It will still attach the topic on encrypted messages if it's able to derive it from the Android headers (as Android never includes topic)

Thanks to @arsaboo and @bramkragten for helping with testing

Related issue (if applicable): fixes #18927

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.

If the code does not interact with devices:

  • Tests have been added to verify that the new code works.

balloob added some commits Dec 12, 2018

@balloob balloob merged commit 7d9e257 into dev Dec 12, 2018

6 checks passed

Hound No violations found. Woof!
WIP ready for review
Details
cla-bot Everyone involved has signed the CLA
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
coverage/coveralls Coverage decreased (-0.004%) to 92.874%
Details

@wafflebot wafflebot bot removed the in progress label Dec 12, 2018

@delete-merged-branch delete-merged-branch bot deleted the fix-owntracks-topic branch Dec 12, 2018

balloob added a commit that referenced this pull request Dec 12, 2018

Fix owntracks topic in encrypted ios (#19220)
* Fix owntracks topic

* Warn if per-topic secret and using HTTP

@balloob balloob referenced this pull request Dec 12, 2018

Merged

0.84.1 #19228

@raccettura

This comment has been minimized.

Copy link
Contributor

raccettura commented Dec 12, 2018

I bet this is my problem! For my debug attempt I decrypted it.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment