Fixed an issue that would prevent attachments from being downloaded v… #332
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
…ia SSL connections when using a custom CA ceritficate that was included in the bundle
manuroe
reviewed
Jul 19, 2017
There was a problem hiding this comment.
Thanks for the PR.
I have 2 cosmetic remarks and as per https://github.com/matrix-org/synapse/blob/master/CONTRIBUTING.rst, we also need you to sign off code changes. You can do a it in a comment like at #274 (comment)
| @@ -232,6 +233,14 @@ - (void)connection:(NSURLConnection *)connection willSendRequestForAuthenticatio | |||
| NSURLProtectionSpace *protectionSpace = [challenge protectionSpace]; | |||
| if ([protectionSpace.authenticationMethod isEqualToString:NSURLAuthenticationMethodServerTrust]) | |||
| { | |||
| NSSet <NSData *> *certificates = [AFSecurityPolicy certificatesInBundle:[NSBundle mainBundle]]; | |||
| if (certificates && certificates.count > 0) { | |||
There was a problem hiding this comment.
For code consistency, could you please add a new line before the opening bracket?
| NSSet <NSData *> *certificates = [AFSecurityPolicy certificatesInBundle:[NSBundle mainBundle]]; | ||
| if (certificates && certificates.count > 0) { | ||
| NSMutableArray *pinnedCertificates = [NSMutableArray array]; | ||
| for (NSData *certificateData in certificates) { |
|
oh, can you also change the base branch of this PR from "master" to "develop", please? |
…ed-off-by: Javier Quevedo <jquevedo@gmail.com>
|
Signed-off-by: Javier Quevedo jquevedo@gmail.com |
manuroe
approved these changes
Jul 19, 2017
|
Great. Thanks for accepting it. Next one will go to develop instead of master :) |
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.
…ia SSL connections when using a custom CA ceritficate that was included in the bundle.
Explanation:
All of the network operations use AFNetworking except for the download of files, which uses NSURLRequest. AFNetworking automatically checks which certificates are in the bundle and uses them to validate SSL connections. On the contrary, the MXMediaLoader class was relying only on those certificates that were manually accepted by the user. This could create a situation where all network connections worked, except for downloading media/attachments.
The MXMediaLoader now is capable of asking AFNetworking for those pinned certificates, and adds the CA to the chain of trust at the time of preparing the SSL negotiation.