You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ia...@apache.org on 2014/10/24 22:17:42 UTC
[1/5] ios commit: Seperate config.xml parsing logic
Repository: cordova-ios
Updated Branches:
refs/heads/unplug-whitelist [created] 2e12c3e8a
Seperate config.xml parsing logic
Separates the logic of finding config.xml and feeding its contents to a parser from the task of choosing that parser and using its results
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/0c013f69
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/0c013f69
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/0c013f69
Branch: refs/heads/unplug-whitelist
Commit: 0c013f6915580b69d35332c16fbd7079675a1e93
Parents: 01b3d19
Author: Ian Clelland <ic...@chromium.org>
Authored: Thu Oct 23 16:02:59 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Thu Oct 23 16:02:59 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVViewController.h | 2 ++
CordovaLib/Classes/CDVViewController.m | 12 ++++++++----
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0c013f69/CordovaLib/Classes/CDVViewController.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h
index 51863a5..73315a6 100644
--- a/CordovaLib/Classes/CDVViewController.h
+++ b/CordovaLib/Classes/CDVViewController.h
@@ -81,4 +81,6 @@
- (BOOL)URLisAllowed:(NSURL*)url;
- (void)processOpenUrl:(NSURL*)url;
+- (void)parseSettingsWithParser:(NSObject<NSXMLParserDelegate> *)delegate;
+
@end
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/0c013f69/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index acb88f7..f7e43f3 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -160,10 +160,8 @@
return [self.whitelist URLIsAllowed:url];
}
-- (void)loadSettings
+- (void)parseSettingsWithParser:(NSObject<NSXMLParserDelegate> *)delegate
{
- CDVConfigParser* delegate = [[CDVConfigParser alloc] init];
-
// read from config.xml in the app bundle
NSString* path = [[NSBundle mainBundle] pathForResource:@"config" ofType:@"xml"];
@@ -179,8 +177,14 @@
NSLog(@"Failed to initialize XML parser.");
return;
}
- [configParser setDelegate:((id < NSXMLParserDelegate >)delegate)];
+ [configParser setDelegate:delegate];
[configParser parse];
+}
+
+- (void)loadSettings
+{
+ CDVConfigParser* delegate = [[CDVConfigParser alloc] init];
+ [self parseSettingsWithParser:delegate];
// Get the plugin dictionary, whitelist and settings from the delegate.
self.pluginsMap = delegate.pluginsDict;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/5] ios commit: Defer whitelist decisions to plugins
Posted by ia...@apache.org.
Defer whitelist decisions to plugins
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/04a538e9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/04a538e9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/04a538e9
Branch: refs/heads/unplug-whitelist
Commit: 04a538e9125ccc6e4086c2ef04aee3ba31a9715b
Parents: c184a88
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Oct 24 16:12:04 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Oct 24 16:12:04 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVCommandDelegateImpl.m | 3 +-
CordovaLib/Classes/CDVURLProtocol.m | 7 +--
CordovaLib/Classes/CDVViewController.h | 2 +-
CordovaLib/Classes/CDVViewController.m | 72 ++++++++++--------------
4 files changed, 34 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/04a538e9/CordovaLib/Classes/CDVCommandDelegateImpl.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVCommandDelegateImpl.m b/CordovaLib/Classes/CDVCommandDelegateImpl.m
index fc3346d..033f3ed 100644
--- a/CordovaLib/Classes/CDVCommandDelegateImpl.m
+++ b/CordovaLib/Classes/CDVCommandDelegateImpl.m
@@ -169,8 +169,7 @@
- (BOOL)URLIsWhitelisted:(NSURL*)url
{
- return ![_viewController.whitelist schemeIsAllowed:[url scheme]] ||
- [_viewController.whitelist URLIsAllowed:url logFailure:NO];
+ return [_viewController shouldAllowNavigationToURL:url];
}
- (NSDictionary*)settings
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/04a538e9/CordovaLib/Classes/CDVURLProtocol.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVURLProtocol.m b/CordovaLib/Classes/CDVURLProtocol.m
index fce5783..28adc2c 100644
--- a/CordovaLib/Classes/CDVURLProtocol.m
+++ b/CordovaLib/Classes/CDVURLProtocol.m
@@ -131,12 +131,7 @@ static CDVViewController *viewControllerForRequest(NSURLRequest* request)
// For this reason, we return NO when cmds exist.
return !hasCmds;
}
- // we only care about http and https connections.
- // CORS takes care of http: trying to access file: URLs.
- if ([gWhitelist schemeIsAllowed:[theUrl scheme]]) {
- // if it FAILS the whitelist, we return TRUE, so we can fail the connection later
- return ![gWhitelist URLIsAllowed:theUrl];
- }
+ return ![viewController shouldAllowNavigationToURL:theUrl];
}
return NO;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/04a538e9/CordovaLib/Classes/CDVViewController.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h
index 4ee9967..fbf5260 100644
--- a/CordovaLib/Classes/CDVViewController.h
+++ b/CordovaLib/Classes/CDVViewController.h
@@ -78,7 +78,7 @@
- (void)registerPlugin:(CDVPlugin*)plugin withClassName:(NSString*)className;
- (void)registerPlugin:(CDVPlugin*)plugin withPluginName:(NSString*)pluginName;
-- (BOOL)URLisAllowed:(NSURL*)url;
+- (BOOL)URLisAllowed:(NSURL*)url __attribute__((deprecated));
- (BOOL)shouldAllowNavigationToURL:(NSURL *)url;
- (BOOL)shouldOpenExternalURL:(NSURL *)url;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/04a538e9/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index 135794e..a33beeb 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -153,11 +153,7 @@
- (BOOL)URLisAllowed:(NSURL*)url
{
- if (self.whitelist == nil) {
- return YES;
- }
-
- return [self.whitelist URLIsAllowed:url];
+ return [self shouldAllowNavigationToURL:url];
}
- (void)parseSettingsWithParser:(NSObject<NSXMLParserDelegate> *)delegate
@@ -718,59 +714,31 @@
}
/*
- * If a URL is being loaded that's a file/http/https URL, just load it internally
- */
- if ([url isFileURL]) {
- return YES;
- }
-
- /*
* If we loaded the HTML from a string, we let the app handle it
*/
- else if (self.loadFromString == YES) {
+ if (self.loadFromString == YES) {
self.loadFromString = NO;
return YES;
}
/*
- * all tel: scheme urls we let the UIWebview handle it using the default behavior
- */
- else if ([[url scheme] isEqualToString:@"tel"]) {
- return YES;
- }
-
- /*
- * all about: scheme urls are not handled
- */
- else if ([[url scheme] isEqualToString:@"about"]) {
- return NO;
- }
-
- /*
- * all data: scheme urls are handled
- */
- else if ([[url scheme] isEqualToString:@"data"]) {
- return YES;
- }
-
- /*
* Handle all other types of urls (tel:, sms:), and requests to load a url in the main webview.
*/
- else {
- if ([self.whitelist schemeIsAllowed:[url scheme]]) {
- return [self.whitelist URLIsAllowed:url];
- } else {
+ BOOL shouldAllowNavigation = [self shouldAllowNavigationToURL:url];
+ if (shouldAllowNavigation) {
+ return YES;
+ } else {
+ BOOL shouldOpenExternalURL = [self shouldOpenExternalURL:url];
+ if (shouldOpenExternalURL) {
if ([[UIApplication sharedApplication] canOpenURL:url]) {
[[UIApplication sharedApplication] openURL:url];
} else { // handle any custom schemes to plugins
[[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:CDVPluginHandleOpenURLNotification object:url]];
}
}
-
- return NO;
}
- return YES;
+ return NO;
}
- (BOOL)shouldAllowNavigationToURL:(NSURL *)url
@@ -793,6 +761,28 @@
}
/* Default Policy */
+
+ /*
+ * If a URL is being loaded that's a file/http/https URL, just load it internally
+ */
+ if ([url isFileURL]) {
+ return YES;
+ }
+
+ /*
+ * all about: scheme urls are not handled
+ */
+ else if ([[url scheme] isEqualToString:@"about"]) {
+ return NO;
+ }
+
+ /*
+ * all data: scheme urls are handled
+ */
+ else if ([[url scheme] isEqualToString:@"data"]) {
+ return YES;
+ }
+
return NO;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/5] ios commit: Add hooks for whitelist plugins
Posted by ia...@apache.org.
Add hooks for whitelist plugins
This allows plugins to implement two methods:
- (BOOL)shouldAllowNavigationToURL:(NSURL *)url
- (BOOL)shouldOpenExternalURL:(NSURL *)url
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/c184a885
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/c184a885
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/c184a885
Branch: refs/heads/unplug-whitelist
Commit: c184a885dc50361717270d12faa91c2c139c3bcb
Parents: 0c013f6
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Oct 24 16:09:07 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Oct 24 16:09:07 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVViewController.h | 3 ++
CordovaLib/Classes/CDVViewController.m | 46 +++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c184a885/CordovaLib/Classes/CDVViewController.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h
index 73315a6..4ee9967 100644
--- a/CordovaLib/Classes/CDVViewController.h
+++ b/CordovaLib/Classes/CDVViewController.h
@@ -79,6 +79,9 @@
- (void)registerPlugin:(CDVPlugin*)plugin withPluginName:(NSString*)pluginName;
- (BOOL)URLisAllowed:(NSURL*)url;
+- (BOOL)shouldAllowNavigationToURL:(NSURL *)url;
+- (BOOL)shouldOpenExternalURL:(NSURL *)url;
+
- (void)processOpenUrl:(NSURL*)url;
- (void)parseSettingsWithParser:(NSObject<NSXMLParserDelegate> *)delegate;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/c184a885/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index f7e43f3..135794e 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -773,6 +773,52 @@
return YES;
}
+- (BOOL)shouldAllowNavigationToURL:(NSURL *)url
+{
+ BOOL anyPluginsResponded = NO;
+ BOOL shouldAllowNavigation = NO;
+ for (NSString* pluginName in pluginObjects) {
+ CDVPlugin* plugin = [pluginObjects objectForKey:pluginName];
+ SEL selector = NSSelectorFromString(@"shouldAllowNavigationToURL:");
+ if ([plugin respondsToSelector:selector]) {
+ anyPluginsResponded = YES;
+ shouldAllowNavigation = ((BOOL (*)(id, SEL, id))objc_msgSend)(plugin, selector, url);
+ if (shouldAllowNavigation == NO) {
+ break;
+ }
+ }
+ }
+ if (anyPluginsResponded) {
+ return shouldAllowNavigation;
+ }
+
+ /* Default Policy */
+ return NO;
+}
+
+- (BOOL)shouldOpenExternalURL:(NSURL *)url
+{
+ BOOL anyPluginsResponded = NO;
+ BOOL shouldOpenExternalURL = NO;
+ for (NSString* pluginName in pluginObjects) {
+ CDVPlugin* plugin = [pluginObjects objectForKey:pluginName];
+ SEL selector = NSSelectorFromString(@"shouldOpenExternalURL:");
+ if ([plugin respondsToSelector:selector]) {
+ anyPluginsResponded = YES;
+ shouldOpenExternalURL = ((BOOL (*)(id, SEL, id))objc_msgSend)(plugin, selector, url);
+ if (shouldOpenExternalURL == NO) {
+ break;
+ }
+ }
+ }
+ if (anyPluginsResponded) {
+ return shouldOpenExternalURL;
+ }
+
+ /* Default policy */
+ return NO;
+}
+
#pragma mark GapHelpers
- (void)javascriptAlert:(NSString*)text
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/5] ios commit: Remove whitelist config.xml parsing
Posted by ia...@apache.org.
Remove whitelist config.xml parsing
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/2e12c3e8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/2e12c3e8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/2e12c3e8
Branch: refs/heads/unplug-whitelist
Commit: 2e12c3e8a686df75b0292f8630aa837fb51a61b0
Parents: 376a5ba
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Oct 24 16:14:15 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Oct 24 16:14:15 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVConfigParser.h | 1 -
CordovaLib/Classes/CDVConfigParser.m | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e12c3e8/CordovaLib/Classes/CDVConfigParser.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVConfigParser.h b/CordovaLib/Classes/CDVConfigParser.h
index 2e06c88..bae3d0f 100644
--- a/CordovaLib/Classes/CDVConfigParser.h
+++ b/CordovaLib/Classes/CDVConfigParser.h
@@ -24,7 +24,6 @@
@property (nonatomic, readonly, strong) NSMutableDictionary* pluginsDict;
@property (nonatomic, readonly, strong) NSMutableDictionary* settings;
-@property (nonatomic, readonly, strong) NSMutableArray* whitelistHosts;
@property (nonatomic, readonly, strong) NSMutableArray* startupPluginNames;
@property (nonatomic, readonly, strong) NSString* startPage;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/2e12c3e8/CordovaLib/Classes/CDVConfigParser.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVConfigParser.m b/CordovaLib/Classes/CDVConfigParser.m
index 4b73b60..ab32b4a 100644
--- a/CordovaLib/Classes/CDVConfigParser.m
+++ b/CordovaLib/Classes/CDVConfigParser.m
@@ -23,7 +23,6 @@
@property (nonatomic, readwrite, strong) NSMutableDictionary* pluginsDict;
@property (nonatomic, readwrite, strong) NSMutableDictionary* settings;
-@property (nonatomic, readwrite, strong) NSMutableArray* whitelistHosts;
@property (nonatomic, readwrite, strong) NSMutableArray* startupPluginNames;
@property (nonatomic, readwrite, strong) NSString* startPage;
@@ -31,7 +30,7 @@
@implementation CDVConfigParser
-@synthesize pluginsDict, settings, whitelistHosts, startPage, startupPluginNames;
+@synthesize pluginsDict, settings, startPage, startupPluginNames;
- (id)init
{
@@ -39,10 +38,6 @@
if (self != nil) {
self.pluginsDict = [[NSMutableDictionary alloc] initWithCapacity:30];
self.settings = [[NSMutableDictionary alloc] initWithCapacity:30];
- self.whitelistHosts = [[NSMutableArray alloc] initWithCapacity:30];
- [self.whitelistHosts addObject:@"file:///*"];
- [self.whitelistHosts addObject:@"content:///*"];
- [self.whitelistHosts addObject:@"data:///*"];
self.startupPluginNames = [[NSMutableArray alloc] initWithCapacity:8];
featureName = nil;
}
@@ -66,8 +61,6 @@
if (paramIsOnload || attribIsOnload) {
[self.startupPluginNames addObject:featureName];
}
- } else if ([elementName isEqualToString:@"access"]) {
- [whitelistHosts addObject:attributeDict[@"origin"]];
} else if ([elementName isEqualToString:@"content"]) {
self.startPage = attributeDict[@"src"];
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/5] ios commit: Remove whitelist objects from CDVURLProtocol and
CDVViewController classes
Posted by ia...@apache.org.
Remove whitelist objects from CDVURLProtocol and CDVViewController classes
Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/376a5ba9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/376a5ba9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/376a5ba9
Branch: refs/heads/unplug-whitelist
Commit: 376a5ba938e9338092a98bfd3833c35c16675a5f
Parents: 04a538e
Author: Ian Clelland <ic...@chromium.org>
Authored: Fri Oct 24 16:13:47 2014 -0400
Committer: Ian Clelland <ic...@chromium.org>
Committed: Fri Oct 24 16:13:47 2014 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVURLProtocol.m | 14 +-------------
CordovaLib/Classes/CDVViewController.h | 2 --
CordovaLib/Classes/CDVViewController.m | 4 +---
3 files changed, 2 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/376a5ba9/CordovaLib/Classes/CDVURLProtocol.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVURLProtocol.m b/CordovaLib/Classes/CDVURLProtocol.m
index 28adc2c..dfc7444 100644
--- a/CordovaLib/Classes/CDVURLProtocol.m
+++ b/CordovaLib/Classes/CDVURLProtocol.m
@@ -23,10 +23,8 @@
#import <MobileCoreServices/MobileCoreServices.h>
#import "CDVURLProtocol.h"
#import "CDVCommandQueue.h"
-#import "CDVWhitelist.h"
#import "CDVViewController.h"
-static CDVWhitelist* gWhitelist = nil;
// Contains a set of NSNumbers of addresses of controllers. It doesn't store
// the actual pointer to avoid retaining.
static NSMutableSet* gRegisteredControllers = nil;
@@ -77,16 +75,6 @@ static CDVViewController *viewControllerForRequest(NSURLRequest* request)
if (gRegisteredControllers == nil) {
[NSURLProtocol registerClass:[CDVURLProtocol class]];
gRegisteredControllers = [[NSMutableSet alloc] initWithCapacity:8];
- // The whitelist doesn't change, so grab the first one and store it.
- gWhitelist = viewController.whitelist;
-
- // Note that we grab the whitelist from the first viewcontroller for now - but this will change
- // when we allow a registered viewcontroller to have its own whitelist (e.g InAppBrowser)
- // Differentiating the requests will be through the 'vc' http header below as used for the js->objc bridge.
- // The 'vc' value is generated by casting the viewcontroller object to a (long long) value (see CDVViewController::webViewDidFinishLoad)
- if (gWhitelist == nil) {
- NSLog(@"WARNING: NO whitelist has been set in CDVURLProtocol.");
- }
}
@synchronized(gRegisteredControllers) {
@@ -176,7 +164,7 @@ static CDVViewController *viewControllerForRequest(NSURLRequest* request)
return;
}
- NSString* body = [gWhitelist errorStringForURL:url];
+ NSString* body = [NSString stringWithFormat:@"Access not allowed to URL: %@", url];
[self sendResponseWithResponseCode:401 data:[body dataUsingEncoding:NSASCIIStringEncoding] mimeType:nil];
}
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/376a5ba9/CordovaLib/Classes/CDVViewController.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.h b/CordovaLib/Classes/CDVViewController.h
index fbf5260..a2fb2b0 100644
--- a/CordovaLib/Classes/CDVViewController.h
+++ b/CordovaLib/Classes/CDVViewController.h
@@ -23,7 +23,6 @@
#import "CDVInvokedUrlCommand.h"
#import "CDVCommandDelegate.h"
#import "CDVCommandQueue.h"
-#import "CDVWhitelist.h"
#import "CDVScreenOrientationDelegate.h"
#import "CDVPlugin.h"
@@ -41,7 +40,6 @@
@property (nonatomic, readonly, strong) NSDictionary* pluginsMap;
@property (nonatomic, readonly, strong) NSMutableDictionary* settings;
@property (nonatomic, readonly, strong) NSXMLParser* configParser;
-@property (nonatomic, readonly, strong) CDVWhitelist* whitelist; // readonly for public
@property (nonatomic, readonly, assign) BOOL loadFromString;
@property (nonatomic, readwrite, copy) NSString* wwwFolderName;
http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/376a5ba9/CordovaLib/Classes/CDVViewController.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVViewController.m b/CordovaLib/Classes/CDVViewController.m
index a33beeb..888367d 100644
--- a/CordovaLib/Classes/CDVViewController.m
+++ b/CordovaLib/Classes/CDVViewController.m
@@ -34,7 +34,6 @@
@property (nonatomic, readwrite, strong) NSXMLParser* configParser;
@property (nonatomic, readwrite, strong) NSMutableDictionary* settings;
-@property (nonatomic, readwrite, strong) CDVWhitelist* whitelist;
@property (nonatomic, readwrite, strong) NSMutableDictionary* pluginObjects;
@property (nonatomic, readwrite, strong) NSArray* startupPluginNames;
@property (nonatomic, readwrite, strong) NSDictionary* pluginsMap;
@@ -50,7 +49,7 @@
@implementation CDVViewController
@synthesize webView, supportedOrientations;
-@synthesize pluginObjects, pluginsMap, whitelist, startupPluginNames;
+@synthesize pluginObjects, pluginsMap, startupPluginNames;
@synthesize configParser, settings, loadFromString;
@synthesize wwwFolderName, startPage, initialized, openURL, baseUserAgent;
@synthesize commandDelegate = _commandDelegate;
@@ -185,7 +184,6 @@
// Get the plugin dictionary, whitelist and settings from the delegate.
self.pluginsMap = delegate.pluginsDict;
self.startupPluginNames = delegate.startupPluginNames;
- self.whitelist = [[CDVWhitelist alloc] initWithArray:delegate.whitelistHosts];
self.settings = delegate.settings;
// And the start folder/page.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org