From 52d90da75e70f383161be06d5d1b52864c329954 Mon Sep 17 00:00:00 2001 From: Jitae Kim Date: Thu, 3 Nov 2016 08:04:42 -0700 Subject: [PATCH] Modify image url from http to https on examples Summary: Modify image url from http to https on examples > App Transport Security (ATS) is enabled by default for apps linked against the iOS 9.0 or OS X v10.11 SDKs or later, as indicated by the default Boolean value of NO for the NSAllowsArbitraryLoads key. This key is at the root level of the NSAppTransportSecurity dictionary. With ATS enabled, HTTP connections must use HTTPS (RFC 2818). Attempts to connect using insecure HTTP fail. ATS employs the Transport Layer Security (TLS) protocol version 1.2 (RFC 5246). For background on secure Internet connections, read HTTPS Server Trust Evaluation. https://developer.apple.com/library/content/documentation/General/Reference/InfoPlistKeyReference/Articles/CocoaKeys.html#//apple_ref/doc/uid/TP40009251-SW35 Closes https://github.com/facebook/react-native/pull/10714 Differential Revision: D4124471 Pulled By: hramos fbshipit-source-id: a7cc9d0267906747b00a1d88245af52c967c7b11 --- .../UIExplorerUnitTests/RCTImageLoaderTests.m | 4 ++-- Examples/UIExplorer/js/ImageExample.js | 24 +++++++++---------- .../js/ViewPagerAndroidExample.android.js | 10 ++++---- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m index 8103155d2ad..88c6d8a2fc2 100644 --- a/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m +++ b/Examples/UIExplorer/UIExplorerUnitTests/RCTImageLoaderTests.m @@ -57,7 +57,7 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2) NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_bundleURL moduleProvider:^{ return @[loader]; } launchOptions:nil]; - NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://facebook.github.io/react/img/logo_og.png"]]; + NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://facebook.github.io/react/img/logo_og.png"]]; [bridge.imageLoader loadImageWithURLRequest:urlRequest size:CGSizeMake(100, 100) scale:1.0 clipped:YES resizeMode:RCTResizeModeContain progressBlock:^(int64_t progress, int64_t total) { XCTAssertEqual(progress, 1); XCTAssertEqual(total, 1); @@ -88,7 +88,7 @@ RCTDefineImageDecoder(RCTImageLoaderTestsDecoder2) NS_VALID_UNTIL_END_OF_SCOPE RCTBridge *bridge = [[RCTBridge alloc] initWithBundleURL:_bundleURL moduleProvider:^{ return @[loader1, loader2]; } launchOptions:nil]; - NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://facebook.github.io/react/img/logo_og.png"]]; + NSURLRequest *urlRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"https://facebook.github.io/react/img/logo_og.png"]]; [bridge.imageLoader loadImageWithURLRequest:urlRequest size:CGSizeMake(100, 100) scale:1.0 clipped:YES resizeMode:RCTResizeModeContain progressBlock:^(int64_t progress, int64_t total) { XCTAssertEqual(progress, 1); XCTAssertEqual(total, 1); diff --git a/Examples/UIExplorer/js/ImageExample.js b/Examples/UIExplorer/js/ImageExample.js index 8b4f542eef9..6eef138aa39 100644 --- a/Examples/UIExplorer/js/ImageExample.js +++ b/Examples/UIExplorer/js/ImageExample.js @@ -36,7 +36,7 @@ var { var base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABLCAQAAACSR7JhAAADtUlEQVR4Ac3YA2Bj6QLH0XPT1Fzbtm29tW3btm3bfLZtv7e2ObZnms7d8Uw098tuetPzrxv8wiISrtVudrG2JXQZ4VOv+qUfmqCGGl1mqLhoA52oZlb0mrjsnhKpgeUNEs91Z0pd1kvihA3ULGVHiQO2narKSHKkEMulm9VgUyE60s1aWoMQUbpZOWE+kaqs4eLEjdIlZTcFZB0ndc1+lhB1lZrIuk5P2aib1NBpZaL+JaOGIt0ls47SKzLC7CqrlGF6RZ09HGoNy1lYl2aRSWL5GuzqWU1KafRdoRp0iOQEiDzgZPnG6DbldcomadViflnl/cL93tOoVbsOLVM2jylvdWjXolWX1hmfZbGR/wjypDjFLSZIRov09BgYmtUqPQPlQrPapecLgTIy0jMgPKtTeob2zWtrGH3xvjUkPCtNg/tm1rjwrMa+mdUkPd3hWbH0jArPGiU9ufCsNNWFZ40wpwn+62/66R2RUtoso1OB34tnLOcy7YB1fUdc9e0q3yru8PGM773vXsuZ5YIZX+5xmHwHGVvlrGPN6ZSiP1smOsMMde40wKv2VmwPPVXNut4sVpUreZiLBHi0qln/VQeI/LTMYXpsJtFiclUN+5HVZazim+Ky+7sAvxWnvjXrJFneVtLWLyPJu9K3cXLWeOlbMTlrIelbMDlrLenrjEQOtIF+fuI9xRp9ZBFp6+b6WT8RrxEpdK64BuvHgDk+vUy+b5hYk6zfyfs051gRoNO1usU12WWRWL73/MMEy9pMi9qIrR4ZpV16Rrvduxazmy1FSvuFXRkqTnE7m2kdb5U8xGjLw/spRr1uTov4uOgQE+0N/DvFrG/Jt7i/FzwxbA9kDanhf2w+t4V97G8lrT7wc08aA2QNUkuTfW/KimT01wdlfK4yEw030VfT0RtZbzjeMprNq8m8tnSTASrTLti64oBNdpmMQm0eEwvfPwRbUBywG5TzjPCsdwk3IeAXjQblLCoXnDVeoAz6SfJNk5TTzytCNZk/POtTSV40NwOFWzw86wNJRpubpXsn60NJFlHeqlYRbslqZm2jnEZ3qcSKgm0kTli3zZVS7y/iivZTweYXJ26Y+RTbV1zh3hYkgyFGSTKPfRVbRqWWVReaxYeSLarYv1Qqsmh1s95S7G+eEWK0f3jYKTbV6bOwepjfhtafsvUsqrQvrGC8YhmnO9cSCk3yuY984F1vesdHYhWJ5FvASlacshUsajFt2mUM9pqzvKGcyNJW0arTKN1GGGzQlH0tXwLDgQTurS8eIQAAAABJRU5ErkJggg=='; var ImageCapInsetsExample = require('./ImageCapInsetsExample'); -const IMAGE_PREFETCH_URL = 'http://facebook.github.io/origami/public/images/blog-hero.jpg?r=1&t=' + Date.now(); +const IMAGE_PREFETCH_URL = 'https://facebook.github.io/origami/public/images/blog-hero.jpg?r=1&t=' + Date.now(); var prefetchTask = Image.prefetch(IMAGE_PREFETCH_URL); var NetworkImageCallbackExample = React.createClass({ @@ -200,9 +200,9 @@ var MultipleSourcesExample = React.createClass({ @@ -242,7 +242,7 @@ exports.examples = [ render: function() { return ( ); @@ -267,7 +267,7 @@ exports.examples = [ title: 'Image Loading Events', render: function() { return ( - ); }, @@ -276,7 +276,7 @@ exports.examples = [ title: 'Error Handler', render: function() { return ( - + ); }, platform: 'ios', @@ -285,7 +285,7 @@ exports.examples = [ title: 'Image Download Progress', render: function() { return ( - + ); }, platform: 'ios', @@ -297,7 +297,7 @@ exports.examples = [ return ( ); @@ -559,7 +559,7 @@ exports.examples = [ return ( ); }, @@ -649,8 +649,8 @@ exports.examples = [ }, ]; -var fullImage = {uri: 'http://facebook.github.io/react/img/logo_og.png'}; -var smallImage = {uri: 'http://facebook.github.io/react/img/logo_small_2x.png'}; +var fullImage = {uri: 'https://facebook.github.io/react/img/logo_og.png'}; +var smallImage = {uri: 'https://facebook.github.io/react/img/logo_small_2x.png'}; var styles = StyleSheet.create({ base: { diff --git a/Examples/UIExplorer/js/ViewPagerAndroidExample.android.js b/Examples/UIExplorer/js/ViewPagerAndroidExample.android.js index f9efdacd3bf..c5c1efabf9e 100644 --- a/Examples/UIExplorer/js/ViewPagerAndroidExample.android.js +++ b/Examples/UIExplorer/js/ViewPagerAndroidExample.android.js @@ -38,11 +38,11 @@ import type { ViewPagerScrollState } from 'ViewPagerAndroid'; var PAGES = 5; var BGCOLOR = ['#fdc08e', '#fff6b9', '#99d1b7', '#dde5fe', '#f79273']; var IMAGE_URIS = [ - 'http://apod.nasa.gov/apod/image/1410/20141008tleBaldridge001h990.jpg', - 'http://apod.nasa.gov/apod/image/1409/volcanicpillar_vetter_960.jpg', - 'http://apod.nasa.gov/apod/image/1409/m27_snyder_960.jpg', - 'http://apod.nasa.gov/apod/image/1409/PupAmulti_rot0.jpg', - 'http://apod.nasa.gov/apod/image/1510/lunareclipse_27Sep_beletskycrop4.jpg', + 'https://apod.nasa.gov/apod/image/1410/20141008tleBaldridge001h990.jpg', + 'https://apod.nasa.gov/apod/image/1409/volcanicpillar_vetter_960.jpg', + 'https://apod.nasa.gov/apod/image/1409/m27_snyder_960.jpg', + 'https://apod.nasa.gov/apod/image/1409/PupAmulti_rot0.jpg', + 'https://apod.nasa.gov/apod/image/1510/lunareclipse_27Sep_beletskycrop4.jpg', ]; class LikeCount extends React.Component {