Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[iOS] - Update telemetry certificate pinning #11845

Merged
merged 11 commits into from
May 7, 2018
Merged

Conversation

rclee
Copy link
Contributor

@rclee rclee commented May 4, 2018

This is update our certificate pinning for china.

@1ec5
Copy link
Contributor

1ec5 commented May 4, 2018

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.

@rclee rclee changed the base branch from master to release-agua May 4, 2018 23:30
@rclee
Copy link
Contributor Author

rclee commented May 4, 2018

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

@@ -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";
Copy link
Contributor

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?

@lilykaiser
Copy link

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.

@fabian-guerra fabian-guerra added iOS Mapbox Maps SDK for iOS ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels May 7, 2018
@1ec5
Copy link
Contributor

1ec5 commented May 7, 2018

ff4c5e1 comments out some more code so that we don’t end up evaluating a certificate that hasn’t been loaded.

@rclee
Copy link
Contributor Author

rclee commented May 7, 2018

@1ec5 Thanks for catching that. We should be loading both CN certs. Fixed here: d661aaf

Copy link
Contributor

@1ec5 1ec5 left a 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”?

@friedbunny friedbunny added telemetry Integration with Mapbox Telemetry libraries and removed ⚠️ DO NOT MERGE Work in progress, proof of concept, or on hold labels May 7, 2018
@rclee rclee merged commit 0141f65 into release-agua May 7, 2018
@rclee rclee deleted the rclee-update-certs branch May 7, 2018 21:58
fabian-guerra pushed a commit that referenced this pull request Jun 22, 2018
* 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
fabian-guerra pushed a commit that referenced this pull request Jun 22, 2018
* 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
rclee added a commit to mapbox/mapbox-events-ios that referenced this pull request Jun 26, 2018
rclee added a commit to mapbox/mapbox-events-ios that referenced this pull request Jun 27, 2018
* Add china certificates and endpoint

Brings in changes from mapbox/mapbox-gl-native#11860 and mapbox/mapbox-gl-native#11845
rclee added a commit to mapbox/mapbox-events-ios that referenced this pull request Jun 27, 2018
* Add china certificates and endpoint

Brings in changes from mapbox/mapbox-gl-native#11860 and mapbox/mapbox-gl-native#11845

Set baseURL
rclee added a commit that referenced this pull request Jun 27, 2018
rclee added a commit that referenced this pull request Jun 27, 2018
fabian-guerra pushed a commit that referenced this pull request Jun 27, 2018
fabian-guerra pushed a commit that referenced this pull request Jun 27, 2018
fabian-guerra pushed a commit that referenced this pull request Jun 28, 2018
fabian-guerra pushed a commit that referenced this pull request Jun 28, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
iOS Mapbox Maps SDK for iOS telemetry Integration with Mapbox Telemetry libraries
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants