-
Notifications
You must be signed in to change notification settings - Fork 1.3k
[iOS] - Update telemetry certificate pinning #11845
Conversation
Looks like you’ll need to rebase this branch atop the latest release-agua commit and change the target branch to release-agua instead of master. |
Was hoping no-one would see that. Made the PR then saw what I did but couldn't change it because of bad train internet haha. Look good now? @1ec5 |
platform/ios/src/MGLAPIClient.m
Outdated
@@ -4,7 +4,7 @@ | |||
#import "MGLAccountManager.h" | |||
|
|||
static NSString * const MGLAPIClientUserAgentBase = @"MapboxEventsiOS"; | |||
static NSString * const MGLAPIClientBaseURL = @"https://events.mapbox.com"; | |||
static NSString * const MGLAPIClientBaseURL = @"https://events.mapbox.cn"; |
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.
This library will be available for all our customers, they may download it even tho they are not in China. Is it possible to configure the URL so we don't have to hard code it?
After discussion with the @mapbox/maps-ios team, let's make a build with the CN endpoint instead of releasing this update broadly, to prevent accidental updates by Global customers. |
ff4c5e1 comments out some more code so that we don’t end up evaluating a certificate that hasn’t been loaded. |
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.
Looks good. Note that we’ll need to merge these changes back into master and probably get it into the release-boba branch as well.
For the iOS changelog, how about “Improved compatibility with Mapbox China APIs”?
* Update telemetry certificate pinning * Load both CN certificates * [ios] Use China events endpoint with China API endpoint * Update CHANGELOG.md # Conflicts: # platform/ios/CHANGELOG.md # platform/ios/ios.xcodeproj/project.pbxproj # platform/ios/src/MGLAPIClient.m
* Update telemetry certificate pinning * Load both CN certificates * [ios] Use China events endpoint with China API endpoint * Update CHANGELOG.md # Conflicts: # platform/ios/CHANGELOG.md # platform/ios/ios.xcodeproj/project.pbxproj # platform/ios/src/MGLAPIClient.m
Brings in changes from mapbox/mapbox-gl-native#11860 and mapbox/mapbox-gl-native#11845
* Add china certificates and endpoint Brings in changes from mapbox/mapbox-gl-native#11860 and mapbox/mapbox-gl-native#11845
* Add china certificates and endpoint Brings in changes from mapbox/mapbox-gl-native#11860 and mapbox/mapbox-gl-native#11845 Set baseURL
This is update our certificate pinning for china.