filesでのOriginチェックを除外。デバイス確認画面のOriginをAndroid側と合わせた。

TakayukiHoshi1984 · TakayukiHoshi1984 · commit 606ff0bfcfba · 2017-09-15T15:15:40.000+09:00
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHDeviceUtil.m b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/classes/GHDeviceUtil.m
@@ -95,7 +95,7 @@ - (void)discoverDevices:(DiscoverDeviceCompletion)completion
     [request setApi: DConnectMessageDefaultAPI];
     [request setProfile: DConnectServiceDiscoveryProfileName];
     [request setAccessToken:accessToken];
-    [request setString:@"file://" forKey:DConnectMessageOrigin];
+    [request setString:@"http://localhost" forKey:DConnectMessageOrigin];
     [manager sendRequest: request callback:^(DConnectResponseMessage *response) {
         if (response != nil) {
             if ([response result] == DConnectMessageResultTypeOk) {
@@ -129,7 +129,7 @@ - (void)callRequestAccessTokenAPI:(DiscoverDeviceCompletion)completion {
     
     
 
-    [DConnectUtil asyncAuthorizeWithOrigin: @"file://"
+    [DConnectUtil asyncAuthorizeWithOrigin: @"http://localhost"
                                    appName: @"Browser"
                                     scopes: scopes
                                    success: ^(NSString *clientId, NSString *accessToken) {
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/resource.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/resource.js
@@ -20,7 +20,7 @@ var main = (function(parent, global) {
             }
         } else  if (mimeType.indexOf('image') != -1 && uri.indexOf('mp4') != -1) {
            var mediaId = uri.replace("http://localhost:4035/gotapi/files?uri=", "");
-           util.doMediaPlayerMediaPut(util.getServiceId(), util.getAccessTokenQuery(), mediaId,null);
+           util.doMediaPlayerMediaPut(util.getServiceId(), util.getAccessTokenQuery(), decodeURIComponent(mediaId),null);
         } else {
             sendRequest('GET', uri, null, function(status, responseText) {
                 var elem = document.getElementById('text');
@@ -60,7 +60,7 @@ var main = (function(parent, global) {
              switch (xhr.readyState) {
              case 1:
                  try {
-                     xhr.setRequestHeader("X-GotAPI-Origin".toLowerCase(), "http://ios_assets");
+                     xhr.setRequestHeader("X-GotAPI-Origin".toLowerCase(), "file://");
                  } catch (e) {
                      return;
                  }
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/util.js b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/demo/js/util.js
@@ -418,6 +418,7 @@ var util = (function(parent, global) {
         builder.setAccessToken(accessToken);
         builder.addParameter('mediaId', id);
         var uri = builder.build();
+        dConnect.setExtendedOrigin("file://");
         dConnect.put(uri, null, null, function(json) {
             var builder = new dConnect.URIBuilder();
             builder.setProfile('mediaplayer');
@@ -430,10 +431,10 @@ var util = (function(parent, global) {
                 callback();
             }
         }, function(errorCode, errorMessage) {
-            console.log("error:" + errorMessage);
+            console.log("Play error:" + errorMessage);
       });
      }, function(errorCode, errorMessage) {
-         console.log("error:" + errorMessage);
+         console.log("Set Media error:" + errorMessage);
      });
     }
     parent.doMediaPlayerMediaPut = doMediaPlayerMediaPut;
diff --git a/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_take_photo.html b/dConnectSDK/dConnectBrowserForIOS9/dConnectBrowserForIOS9/help/tutorial/demo/demo_take_photo.html
@@ -21,7 +21,7 @@
             <select name="previewSize" onchange="demoTakePhoto.onChangeOption()"></select>
         </form>
         <div style="margin:12px;">
-            <img id="preview" crossOrigin="Anonymous">
+            <img id="preview" crossOrigin="anonymous">
         </div>
         <button onclick="demoTakePhoto.onTakePhoto()">撮影</button>
     </div>
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectManager.m b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/DConnectManager.m
@@ -514,8 +514,7 @@ - (void) didReceiveRequest:(DConnectRequestMessage *) request
     dispatch_async(_requestQueue, ^{
         // 指定されたプロファイルを取得する
         NSString *profileName = [request profile];
-        
-        if (![_self allowsOriginOfRequest:request]) {
+        if (![_self allowsOriginOfRequest:request] && ![@"files" isEqualToString:profileName]) {
             [response setErrorToInvalidOrigin];
             DConnectProfile *profile = [_self profileWithName:profileName];
             if (profile && [profile isKindOfClass:[DConnectManagerAuthorizationProfile class]]) {
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectOriginDao.h b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectOriginDao.h
@@ -17,7 +17,9 @@
 + (void) createWithDatabase:(DConnectSQLiteDatabase *)database;
 
 + (NSArray *) originsWithDatabase:(DConnectSQLiteDatabase *)database;
-
++ (NSArray *) queryWithOrigin:(id<DConnectOrigin>)origin
+                        title:(NSString *)title
+                   toDatabase:(DConnectSQLiteDatabase *)database;
 + (DConnectOriginInfo *) insertWithOrigin:(id<DConnectOrigin>)origin
                                     title:(NSString *)title
                                toDatabase:(DConnectSQLiteDatabase *)database;
@@ -28,4 +30,4 @@
 + (void) deleteWithOriginInfo:(DConnectOriginInfo *)info
                    onDatabase:(DConnectSQLiteDatabase *)database;
 
-@end
+@end
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectOriginDao.m b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectOriginDao.m
@@ -62,6 +62,37 @@ + (NSArray *) originsWithDatabase:(DConnectSQLiteDatabase *)database
     return result;
 }
 
++ (NSArray *) queryWithOrigin:(id<DConnectOrigin>)origin
+                                    title:(NSString *)title
+                               toDatabase:(DConnectSQLiteDatabase *)database
+{
+    NSString *sql = DCEForm(@"SELECT %@, %@, %@, %@ FROM %@ WHERE %@='%@' AND %@='%@'",
+                            DConnectOriginDaoClmId,
+                            DConnectOriginDaoClmOrigin,
+                            DConnectOriginDaoClmTitle,
+                            DConnectOriginDaoClmDate,
+                            DConnectOriginDaoTableName,
+                            DConnectOriginDaoClmOrigin,
+                            origin.stringify,
+                            DConnectOriginDaoClmTitle,
+                            title);
+    DConnectSQLiteCursor *cursor = [database queryWithSQL:sql];
+    NSMutableArray *result = [NSMutableArray array];
+    if ([cursor moveToFirst]) {
+        do {
+            DConnectOriginInfo *info = [DConnectOriginInfo new];
+            info.rowId = [cursor longLongValueAtIndex:0];
+            info.origin = [DConnectOriginParser parse:[cursor stringValueAtIndex:1]];
+            info.title = [cursor stringValueAtIndex:2];
+            info.date = [cursor longLongValueAtIndex:3];
+            [result addObject:info];
+        } while ([cursor moveToNext]);
+    }
+    [cursor close];
+    return result;
+}
+
+
 + (DConnectOriginInfo *) insertWithOrigin:(id<DConnectOrigin>)origin
                                     title:(NSString *)title
                                toDatabase:(DConnectSQLiteDatabase *)database
@@ -126,4 +157,4 @@ + (void) deleteWithOriginInfo:(DConnectOriginInfo *)info
     }
 }
 
-@end
+@end
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectWhitelist.h b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectWhitelist.h
@@ -17,7 +17,8 @@
 - (NSArray *) origins;
 
 - (BOOL) allows:(id<DConnectOrigin>) origin;
-
+- (BOOL) existOrigin:(id<DConnectOrigin>) origin
+               title:(NSString *)title;
 - (DConnectOriginInfo *) addOrigin:(id<DConnectOrigin>) origin title:(NSString *)title;
 
 - (void) updateOrigin:(DConnectOriginInfo *) info;
diff --git a/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectWhitelist.m b/dConnectSDK/dConnectSDKForIOS/DConnectSDK/Classes/policy/DConnectWhitelist.m
@@ -10,8 +10,11 @@
 #import "DConnectWhitelist.h"
 #import "DConnectSQLiteOpenHelper.h"
 #import "DConnectOriginDao.h"
+#import "DConnectOriginParser.h"
 
 NSString *const DConnectWhitelistDBName = @"__dconnect_whitelist.db";
+static NSString *const DConnectWhitelistDefaultURL = @"http://localhost:80";
+static NSString *const DConnectWhitelistDefaultTitle = @"Manager(HTTP)";
 const int DCONNECT_WHITELIST_DB_VERSION = 1;
 
 @interface DConnectWhitelist () <DConnectSQLiteOpenHelperDelegate>
@@ -42,6 +45,10 @@ + (DConnectWhitelist *) sharedWhitelist
     dispatch_once(&onceToken, ^{
         sharedWhitelist = [[DConnectWhitelist alloc] init];
     });
+    id<DConnectOrigin> origin = [DConnectOriginParser parse:DConnectWhitelistDefaultURL];
+    if (![sharedWhitelist existOrigin:origin title:DConnectWhitelistDefaultTitle]) {
+        [sharedWhitelist addOrigin:origin title:DConnectWhitelistDefaultTitle];
+    }
     return sharedWhitelist;
 }
 
@@ -93,7 +100,20 @@ - (void) updateOrigin:(DConnectOriginInfo *) info
                                      onDatabase:database];
     }];
 }
-
+- (BOOL) existOrigin:(id<DConnectOrigin>) origin
+               title:(NSString *)title
+{
+    NSMutableArray *result = [NSMutableArray array];
+    [_helper execQueryInQueue:^(DConnectSQLiteDatabase *database) {
+        if (!database) {
+            return;
+        }
+        [result addObjectsFromArray:[DConnectOriginDao queryWithOrigin:origin
+                                                                 title:title
+                                                            toDatabase:database]];
+    }];
+    return [result count] > 0;
+}
 - (void) removeOrigin:(DConnectOriginInfo *) info
 {
     [_helper execQueryInQueue:^(DConnectSQLiteDatabase *database) {
@@ -136,4 +156,4 @@ - (void) openHelper:(DConnectSQLiteOpenHelper *)helper didUpgradeDatabase:(DConn
     
 }
 
-@end
+@end
