Initial rough dialback support #18
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
related to #18 |
jhass
force-pushed
the
dialback
branch
2 times, most recently
from
38cc260
to
e703cdd
Compare
|
It still wont work for me :( It close connection after // edit shortened |
|
Ah yes, that's probably the open point "Stop offering SASL external if cert invalid" |
| @@ -201,6 +202,12 @@ def router | |||
| @config.router | |||
| end | |||
|
|
|||
| # Returns the current +State+ of the stream's state machine. Provided as a | |||
| # method so subclasses can override the behavior. | |||
| def state | |||
There was a problem hiding this comment.
forgot to remove the state definition at line 301?
| secret = Kit.auth_token | ||
| dialback_key = Kit.dialback_key(secret, stream.remote_domain, stream.domain, stream.id) | ||
|
|
||
| stream.write(%Q(<db:result from="#{stream.domain}" to="#{stream.remote_domain}">#{dialback_key}</db:result>)) |
There was a problem hiding this comment.
This is where the initiating server initiates the dialback procedure, since it isn't offered SASL authentication because the server it connects to couldn't validate our certificate on one of its outbound connections. Is that the part you're missing maybe?
zauberstuhl
changed the title
in respect of XEP-0220
We added it to find it later so we have to remove it after reusing, otherwise stanza will be pushed into void.
In respect of falling back to dialback we have to accept the certificate and remember the failed validation later.
If it is required we have to close the stream instead of restarting and falling back to dialback.
or continue with SASL authentication. Close the stream if force_s2s_encryption is set!
* Added missing namespaces * Removed test skip flags
* Moving callback to auth layer
zauberstuhl
changed the title
zauberstuhl
pushed a commit
that referenced
this pull request
Feb 24, 2015
Initial rough dialback support
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No cluster support (Only if upstream interested?)see Cluster dialback support for vines #52Investigate also adding Bidi (XEP-0288) support (Only if upstream interested?)see Adding Bidi (XEP-0288) support to Vines #53