-
Notifications
You must be signed in to change notification settings - Fork 731
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
Handling SSL/TLS errors during WellKnown lookup #5965
Conversation
…s when triggered via the sign in with matrix id flow
cf00e00
to
e97cdb0
Compare
) | ||
) | ||
} | ||
|
||
private fun HomeServerConnectionConfig?.orWellKnownDefaults() = this ?: HomeServerConnectionConfig.Builder() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wasn't too sure about this, I had originally planned to make the service entry point non null but it feels strange to pass the matrix id
and a homeserver config (with the url already calculated from the matrix id)
Ideally the getWellKnownData
could take the certificate parts of the homeserver config rather than the entire model
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also tried with non-null parameter in my local but it produces ugly code as so said.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe keep your original plan and add a in the builder something like HomeServerConnectionConfig.Builder.from(matrixId)
or withMatrixId(matrixId)
to avoid using dummy.org
? But it's maybe more confusing :/.
This is not a blocker for me.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm happy to add a build method and then remove the matrixId
from the getWellKnownData
👍
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I had a go at using the builder for this however the direct usage of Android's Uri
breaks the OnboardingViewModel tests
https://github.com/vector-im/element-android/compare/feature/adm/matrix-id-via-builder
there's a bit more refactoring needed to take into account using fake uris
will merge as is for the time being
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the fix!
Just a small can-be-ignored remark.
) | ||
) | ||
} | ||
|
||
private fun HomeServerConnectionConfig?.orWellKnownDefaults() = this ?: HomeServerConnectionConfig.Builder() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe keep your original plan and add a in the builder something like HomeServerConnectionConfig.Builder.from(matrixId)
or withMatrixId(matrixId)
to avoid using dummy.org
? But it's maybe more confusing :/.
This is not a blocker for me.
Matrix SDKIntegration Tests Results:
|
Type of change
Content
Applies the SSL/TLS certificate handling logic to the
sign in with matrix id
flowHomeserverConnectionConfig
which in turn meant the SSL/TLS socket factory was never appliedMotivation and context
To make the
sign in with matrix id
andother
sign in flows consistentScreenshots / GIFs
Tests
sign in with matrix id
other
a certificate error is shownTested devices