From 41fd848fa0335ca85d8a4cd3cc2b84b7ecf00bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Mon, 29 Nov 2021 19:05:13 +0100 Subject: [PATCH] Fixed potential injection by switching map container to PHP Some HTML files were importing iframe_api.js automatically by detecting the referrer document. While this was done in a safe way (the map container does not use cookies), it is not a best practice to load a script originating from document.referrer. This PR solves the issue by using PHP to inject the correct domain name in the HTML files. --- deeployer.libsonnet | 5 ++- docker-compose.single-domain.yaml | 3 +- docker-compose.yaml | 3 +- .../website_in_map_script.json | 10 ++--- ..._script.html => website_in_map_script.php} | 6 +-- maps/tests/Metadata/cowebsiteAllowApi.html | 18 -------- maps/tests/Metadata/cowebsiteAllowApi.js | 2 +- maps/tests/Metadata/cowebsiteAllowApi.php | 14 ++++++ maps/tests/Metadata/customIframeMenuApi.html | 20 --------- maps/tests/Metadata/customIframeMenuApi.php | 16 +++++++ maps/tests/Metadata/customMenu.html | 18 -------- maps/tests/Metadata/customMenu.js | 4 +- maps/tests/Metadata/customMenu.json | 4 +- maps/tests/Metadata/customMenu.php | 14 ++++++ maps/tests/Metadata/playerMove.html | 18 -------- maps/tests/Metadata/playerMove.json | 42 +++++++++--------- maps/tests/Metadata/playerMove.php | 14 ++++++ maps/tests/Metadata/setProperty.json | 44 +++++++++---------- .../{setProperty.html => setProperty.php} | 8 +--- maps/tests/Metadata/setTiles.html | 6 +-- maps/tests/Metadata/setTiles.json | 2 +- maps/tests/Metadata/showHideLayer.html | 8 +--- maps/tests/Metadata/showHideLayer.json | 44 +++++++++---------- maps/tests/Variables/shared_variables.json | 20 ++++----- ...ed_variables.html => shared_variables.php} | 6 +-- maps/tests/{iframe.html => iframe.php} | 8 +--- maps/tests/iframe_api.json | 14 +++--- 27 files changed, 167 insertions(+), 204 deletions(-) rename maps/tests/EmbeddedWebsite/{website_in_map_script.html => website_in_map_script.php} (89%) delete mode 100644 maps/tests/Metadata/cowebsiteAllowApi.html create mode 100644 maps/tests/Metadata/cowebsiteAllowApi.php delete mode 100644 maps/tests/Metadata/customIframeMenuApi.html create mode 100644 maps/tests/Metadata/customIframeMenuApi.php delete mode 100644 maps/tests/Metadata/customMenu.html create mode 100644 maps/tests/Metadata/customMenu.php delete mode 100644 maps/tests/Metadata/playerMove.html create mode 100644 maps/tests/Metadata/playerMove.php rename maps/tests/Metadata/{setProperty.html => setProperty.php} (52%) rename maps/tests/Variables/{shared_variables.html => shared_variables.php} (78%) rename maps/tests/{iframe.html => iframe.php} (61%) diff --git a/deeployer.libsonnet b/deeployer.libsonnet index d3280ed2..0bbda264 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -101,7 +101,10 @@ "host": { "url": "maps-"+url }, - "ports": [80] + "ports": [80], + "env": { + "FRONT_URL": "https://play-"+url + } }, "redis": { "image": "redis:6", diff --git a/docker-compose.single-domain.yaml b/docker-compose.single-domain.yaml index 52875ce8..14c14e3e 100644 --- a/docker-compose.single-domain.yaml +++ b/docker-compose.single-domain.yaml @@ -92,11 +92,12 @@ services: - "traefik.http.routers.pusher-ssl.service=pusher" maps: - image: thecodingmachine/nodejs:12-apache + image: thecodingmachine/php:8.1-v4-apache-node12 environment: DEBUG_MODE: "$DEBUG_MODE" HOST: "0.0.0.0" NODE_ENV: development + FRONT_URL: http://play.workadventure.localhost #APACHE_DOCUMENT_ROOT: dist/ #APACHE_EXTENSIONS: headers #APACHE_EXTENSION_HEADERS: 1 diff --git a/docker-compose.yaml b/docker-compose.yaml index ed5389c0..3a0e9b7b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -96,11 +96,12 @@ services: - "traefik.http.routers.pusher-ssl.service=pusher" maps: - image: thecodingmachine/nodejs:12-apache + image: thecodingmachine/php:8.1-v4-apache-node12 environment: DEBUG_MODE: "$DEBUG_MODE" HOST: "0.0.0.0" NODE_ENV: development + FRONT_URL: http://play.workadventure.localhost #APACHE_DOCUMENT_ROOT: dist/ #APACHE_EXTENSIONS: headers #APACHE_EXTENSION_HEADERS: 1 diff --git a/maps/tests/EmbeddedWebsite/website_in_map_script.json b/maps/tests/EmbeddedWebsite/website_in_map_script.json index 00ce95cb..3b667c11 100644 --- a/maps/tests/EmbeddedWebsite/website_in_map_script.json +++ b/maps/tests/EmbeddedWebsite/website_in_map_script.json @@ -12,8 +12,8 @@ { "name":"openWebsite", "type":"string", - "value":"website_in_map_script.html" - }, + "value":"website_in_map_script.php" + }, { "name":"openWebsiteAllowApi", "type":"bool", @@ -24,7 +24,7 @@ "width":30, "x":0, "y":0 - }, + }, { "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":30, @@ -36,7 +36,7 @@ "width":30, "x":0, "y":0 - }, + }, { "draworder":"topdown", "id":3, @@ -90,4 +90,4 @@ "type":"map", "version":1.5, "width":30 -} \ No newline at end of file +} diff --git a/maps/tests/EmbeddedWebsite/website_in_map_script.html b/maps/tests/EmbeddedWebsite/website_in_map_script.php similarity index 89% rename from maps/tests/EmbeddedWebsite/website_in_map_script.html rename to maps/tests/EmbeddedWebsite/website_in_map_script.php index 1180a2de..c822b8ca 100644 --- a/maps/tests/EmbeddedWebsite/website_in_map_script.html +++ b/maps/tests/EmbeddedWebsite/website_in_map_script.php @@ -1,12 +1,8 @@ + - - -

Website opened by script.

- - diff --git a/maps/tests/Metadata/cowebsiteAllowApi.js b/maps/tests/Metadata/cowebsiteAllowApi.js index 56c7b767..aa2ad5a9 100644 --- a/maps/tests/Metadata/cowebsiteAllowApi.js +++ b/maps/tests/Metadata/cowebsiteAllowApi.js @@ -1 +1 @@ -WA.nav.openCoWebSite("cowebsiteAllowApi.html", true, ""); +WA.nav.openCoWebSite("cowebsiteAllowApi.php", true, ""); diff --git a/maps/tests/Metadata/cowebsiteAllowApi.php b/maps/tests/Metadata/cowebsiteAllowApi.php new file mode 100644 index 00000000..c3d1ddff --- /dev/null +++ b/maps/tests/Metadata/cowebsiteAllowApi.php @@ -0,0 +1,14 @@ + + + + + + + +

Website opened by script.

+ + diff --git a/maps/tests/Metadata/customIframeMenuApi.html b/maps/tests/Metadata/customIframeMenuApi.html deleted file mode 100644 index afe840cc..00000000 --- a/maps/tests/Metadata/customIframeMenuApi.html +++ /dev/null @@ -1,20 +0,0 @@ - - - - - API in iframe menu - - - -

This is an iframe in a custom menu.

- - \ No newline at end of file diff --git a/maps/tests/Metadata/customIframeMenuApi.php b/maps/tests/Metadata/customIframeMenuApi.php new file mode 100644 index 00000000..977c36d1 --- /dev/null +++ b/maps/tests/Metadata/customIframeMenuApi.php @@ -0,0 +1,16 @@ + + + + + API in iframe menu + + + + +

This is an iframe in a custom menu.

+ + diff --git a/maps/tests/Metadata/customMenu.html b/maps/tests/Metadata/customMenu.html deleted file mode 100644 index 4b38f0b9..00000000 --- a/maps/tests/Metadata/customMenu.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - -

Add a custom menu

- - \ No newline at end of file diff --git a/maps/tests/Metadata/customMenu.js b/maps/tests/Metadata/customMenu.js index ba66ee0d..7cedb632 100644 --- a/maps/tests/Metadata/customMenu.js +++ b/maps/tests/Metadata/customMenu.js @@ -7,9 +7,9 @@ WA.ui.registerMenuCommand('custom callback menu', () => { WA.ui.registerMenuCommand('custom iframe menu', {iframe: 'customIframeMenu.html'}); WA.room.onEnterZone('iframeMenu', () => { - menuIframeApi = WA.ui.registerMenuCommand('IFRAME USE API', {iframe: 'customIframeMenuApi.html', allowApi: true}); + menuIframeApi = WA.ui.registerMenuCommand('IFRAME USE API', {iframe: 'customIframeMenuApi.php', allowApi: true}); }) WA.room.onLeaveZone('iframeMenu', () => { menuIframeApi.remove(); -}) \ No newline at end of file +}) diff --git a/maps/tests/Metadata/customMenu.json b/maps/tests/Metadata/customMenu.json index c107aaf2..fdb69168 100644 --- a/maps/tests/Metadata/customMenu.json +++ b/maps/tests/Metadata/customMenu.json @@ -54,7 +54,7 @@ { "name":"openWebsite", "type":"string", - "value":"customMenu.html" + "value":"customMenu.php" }, { "name":"openWebsiteAllowApi", @@ -97,4 +97,4 @@ "type":"map", "version":"1.6", "width":10 -} \ No newline at end of file +} diff --git a/maps/tests/Metadata/customMenu.php b/maps/tests/Metadata/customMenu.php new file mode 100644 index 00000000..68205085 --- /dev/null +++ b/maps/tests/Metadata/customMenu.php @@ -0,0 +1,14 @@ + + + + + + + +

Add a custom menu

+ + diff --git a/maps/tests/Metadata/playerMove.html b/maps/tests/Metadata/playerMove.html deleted file mode 100644 index 46a36845..00000000 --- a/maps/tests/Metadata/playerMove.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - -

Log in the console the movement of the current player in the zone of the iframe

- - \ No newline at end of file diff --git a/maps/tests/Metadata/playerMove.json b/maps/tests/Metadata/playerMove.json index db590b05..109c78c0 100644 --- a/maps/tests/Metadata/playerMove.json +++ b/maps/tests/Metadata/playerMove.json @@ -13,7 +13,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51], "height":10, @@ -25,7 +25,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 128, 128, 128, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":10, @@ -36,8 +36,8 @@ { "name":"openWebsite", "type":"string", - "value":"playerMove.html" - }, + "value":"playerMove.php" + }, { "name":"openWebsiteAllowApi", "type":"bool", @@ -48,7 +48,7 @@ "width":10, "x":0, "y":0 - }, + }, { "draworder":"topdown", "id":5, @@ -105,7 +105,7 @@ "type":"bool", "value":true }] - }, + }, { "id":1, "properties":[ @@ -114,7 +114,7 @@ "type":"bool", "value":true }] - }, + }, { "id":2, "properties":[ @@ -123,7 +123,7 @@ "type":"bool", "value":true }] - }, + }, { "id":3, "properties":[ @@ -132,7 +132,7 @@ "type":"bool", "value":true }] - }, + }, { "id":4, "properties":[ @@ -141,7 +141,7 @@ "type":"bool", "value":true }] - }, + }, { "id":8, "properties":[ @@ -150,7 +150,7 @@ "type":"bool", "value":true }] - }, + }, { "id":9, "properties":[ @@ -159,7 +159,7 @@ "type":"bool", "value":true }] - }, + }, { "id":10, "properties":[ @@ -168,7 +168,7 @@ "type":"bool", "value":true }] - }, + }, { "id":11, "properties":[ @@ -177,7 +177,7 @@ "type":"bool", "value":true }] - }, + }, { "id":12, "properties":[ @@ -186,7 +186,7 @@ "type":"bool", "value":true }] - }, + }, { "id":16, "properties":[ @@ -195,7 +195,7 @@ "type":"bool", "value":true }] - }, + }, { "id":17, "properties":[ @@ -204,7 +204,7 @@ "type":"bool", "value":true }] - }, + }, { "id":18, "properties":[ @@ -213,7 +213,7 @@ "type":"bool", "value":true }] - }, + }, { "id":19, "properties":[ @@ -222,7 +222,7 @@ "type":"bool", "value":true }] - }, + }, { "id":20, "properties":[ @@ -233,7 +233,7 @@ }] }], "tilewidth":32 - }, + }, { "columns":8, "firstgid":65, @@ -251,4 +251,4 @@ "type":"map", "version":1.4, "width":10 -} \ No newline at end of file +} diff --git a/maps/tests/Metadata/playerMove.php b/maps/tests/Metadata/playerMove.php new file mode 100644 index 00000000..a9cf0495 --- /dev/null +++ b/maps/tests/Metadata/playerMove.php @@ -0,0 +1,14 @@ + + + + + + + +

Log in the console the movement of the current player in the zone of the iframe

+ + diff --git a/maps/tests/Metadata/setProperty.json b/maps/tests/Metadata/setProperty.json index 06addc2f..db6087bb 100644 --- a/maps/tests/Metadata/setProperty.json +++ b/maps/tests/Metadata/setProperty.json @@ -13,7 +13,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[33, 34, 34, 34, 34, 34, 34, 34, 34, 35, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 41, 42, 42, 42, 42, 42, 42, 42, 42, 43, 49, 50, 50, 50, 50, 50, 50, 50, 50, 51], "height":10, @@ -25,7 +25,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 128, 128, 128, 128, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":10, @@ -36,8 +36,8 @@ { "name":"openWebsite", "type":"string", - "value":"setProperty.html" - }, + "value":"setProperty.php" + }, { "name":"openWebsiteAllowApi", "type":"bool", @@ -48,7 +48,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 101, 101, 101, 101, 101, 0, 0, 0, 0, 0, 101, 101, 101, 101, 101, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":10, @@ -60,7 +60,7 @@ "width":10, "x":0, "y":0 - }, + }, { "draworder":"topdown", "id":5, @@ -117,7 +117,7 @@ "type":"bool", "value":true }] - }, + }, { "id":1, "properties":[ @@ -126,7 +126,7 @@ "type":"bool", "value":true }] - }, + }, { "id":2, "properties":[ @@ -135,7 +135,7 @@ "type":"bool", "value":true }] - }, + }, { "id":3, "properties":[ @@ -144,7 +144,7 @@ "type":"bool", "value":true }] - }, + }, { "id":4, "properties":[ @@ -153,7 +153,7 @@ "type":"bool", "value":true }] - }, + }, { "id":8, "properties":[ @@ -162,7 +162,7 @@ "type":"bool", "value":true }] - }, + }, { "id":9, "properties":[ @@ -171,7 +171,7 @@ "type":"bool", "value":true }] - }, + }, { "id":10, "properties":[ @@ -180,7 +180,7 @@ "type":"bool", "value":true }] - }, + }, { "id":11, "properties":[ @@ -189,7 +189,7 @@ "type":"bool", "value":true }] - }, + }, { "id":12, "properties":[ @@ -198,7 +198,7 @@ "type":"bool", "value":true }] - }, + }, { "id":16, "properties":[ @@ -207,7 +207,7 @@ "type":"bool", "value":true }] - }, + }, { "id":17, "properties":[ @@ -216,7 +216,7 @@ "type":"bool", "value":true }] - }, + }, { "id":18, "properties":[ @@ -225,7 +225,7 @@ "type":"bool", "value":true }] - }, + }, { "id":19, "properties":[ @@ -234,7 +234,7 @@ "type":"bool", "value":true }] - }, + }, { "id":20, "properties":[ @@ -245,7 +245,7 @@ }] }], "tilewidth":32 - }, + }, { "columns":8, "firstgid":65, @@ -263,4 +263,4 @@ "type":"map", "version":1.4, "width":10 -} \ No newline at end of file +} diff --git a/maps/tests/Metadata/setProperty.html b/maps/tests/Metadata/setProperty.php similarity index 52% rename from maps/tests/Metadata/setProperty.html rename to maps/tests/Metadata/setProperty.php index c61aa5fa..f23504f1 100644 --- a/maps/tests/Metadata/setProperty.html +++ b/maps/tests/Metadata/setProperty.php @@ -1,12 +1,8 @@ + + diff --git a/maps/tests/iframe_api.json b/maps/tests/iframe_api.json index db840b3f..11f2202b 100644 --- a/maps/tests/iframe_api.json +++ b/maps/tests/iframe_api.json @@ -20,7 +20,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":10, @@ -32,7 +32,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 34, 34, 34, 34, 34, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":10, @@ -43,8 +43,8 @@ { "name":"openWebsite", "type":"string", - "value":"iframe.html" - }, + "value":"iframe.php" + }, { "name":"openWebsiteAllowApi", "type":"bool", @@ -55,7 +55,7 @@ "width":10, "x":0, "y":0 - }, + }, { "data":[0, 0, 93, 0, 104, 0, 0, 0, 0, 0, 0, 0, 104, 0, 115, 0, 0, 0, 93, 0, 0, 0, 115, 0, 0, 0, 93, 0, 104, 0, 0, 0, 0, 0, 0, 0, 104, 0, 115, 93, 0, 0, 0, 0, 0, 0, 115, 0, 0, 104, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], "height":10, @@ -67,7 +67,7 @@ "width":10, "x":0, "y":0 - }, + }, { "draworder":"topdown", "id":3, @@ -121,4 +121,4 @@ "type":"map", "version":1.4, "width":10 -} \ No newline at end of file +}