Skip to content

Commit 6a99883

Browse files
author
He, Joan(johe)
committed
Merge pull request #616 from magento-extensibility/develop
[Extensibility] Bugs
2 parents 2340f4f + 381b7ee commit 6a99883

File tree

34 files changed

+652
-97
lines changed

34 files changed

+652
-97
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,4 @@ atlassian*
4747
/var/*
4848
!/var/.htaccess
4949
/vendor
50+
!/vendor/.htaccess

‎.htaccess

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,83 @@
171171
</IfModule>
172172

173173
###########################################
174-
## Deny access to release notes to prevent disclosure of the installed Magento version
174+
## Deny access to root files to hide sensitive application information
175+
RedirectMatch 404 /\.git
175176

176-
<Files RELEASE_NOTES.txt>
177-
Order allow,deny
178-
Deny from all
177+
<Files composer.json>
178+
order allow,deny
179+
deny from all
179180
</Files>
180-
############################################
181+
<Files composer.lock>
182+
order allow,deny
183+
deny from all
184+
</Files>
185+
<Files .gitignore>
186+
order allow,deny
187+
deny from all
188+
</Files>
189+
<Files .htaccess>
190+
order allow,deny
191+
deny from all
192+
</Files>
193+
<Files .htaccess.sample>
194+
order allow,deny
195+
deny from all
196+
</Files>
197+
<Files .php_cs>
198+
order allow,deny
199+
deny from all
200+
</Files>
201+
<Files .travis.yml>
202+
order allow,deny
203+
deny from all
204+
</Files>
205+
<Files CHANGELOG.md>
206+
order allow,deny
207+
deny from all
208+
</Files>
209+
<Files CONTRIBUTING.md>
210+
order allow,deny
211+
deny from all
212+
</Files>
213+
<Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
214+
order allow,deny
215+
deny from all
216+
</Files>
217+
<Files COPYING.txt>
218+
order allow,deny
219+
deny from all
220+
</Files>
221+
<Files Gruntfile.js>
222+
order allow,deny
223+
deny from all
224+
</Files>
225+
<Files LICENSE.txt>
226+
order allow,deny
227+
deny from all
228+
</Files>
229+
<Files LICENSE_AFL.txt>
230+
order allow,deny
231+
deny from all
232+
</Files>
233+
<Files nginx.conf.sample>
234+
order allow,deny
235+
deny from all
236+
</Files>
237+
<Files package.json>
238+
order allow,deny
239+
deny from all
240+
</Files>
241+
<Files php.ini.sample>
242+
order allow,deny
243+
deny from all
244+
</Files>
245+
<Files README.md>
246+
order allow,deny
247+
deny from all
248+
</Files>
249+
250+
################################
181251
## If running in cluster environment, uncomment this
182252
## http://developer.yahoo.com/performance/rules.html#etags
183253

‎.htaccess.sample

Lines changed: 79 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 256M
39+
php_value memory_limit 768M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -65,13 +65,6 @@
6565
SecFilterScanPOST Off
6666
</IfModule>
6767

68-
<IfModule mod_headers.c>
69-
############################################
70-
## prevent clickjacking
71-
72-
Header set X-Frame-Options SAMEORIGIN
73-
</IfModule>
74-
7568
<IfModule mod_deflate.c>
7669

7770
############################################
@@ -136,9 +129,11 @@
136129
RewriteRule .* - [L,R=405]
137130

138131
############################################
139-
## always send 404 on missing files in these folders
132+
## redirect for mobile user agents
140133

141-
RewriteCond %{REQUEST_URI} !^/pub/(media|js)/
134+
#RewriteCond %{REQUEST_URI} !^/mobiledirectoryhere/.*$
135+
#RewriteCond %{HTTP_USER_AGENT} "android|blackberry|ipad|iphone|ipod|iemobile|opera mobile|palmos|webos|googlebot-mobile" [NC]
136+
#RewriteRule ^(.*)$ /mobiledirectoryhere/ [L,R=302]
142137

143138
############################################
144139
## never rewrite for existing files, directories and links
@@ -175,16 +170,84 @@
175170
</IfModule>
176171

177172
###########################################
178-
## Deny access to release notes to prevent disclosure of the installed Magento version
173+
## Deny access to root files to hide sensitive application information
174+
RedirectMatch 404 /\.git
179175

180-
<Files RELEASE_NOTES.txt>
181-
Order allow,deny
182-
Deny from all
176+
<Files composer.json>
177+
order allow,deny
178+
deny from all
179+
</Files>
180+
<Files composer.lock>
181+
order allow,deny
182+
deny from all
183+
</Files>
184+
<Files .gitignore>
185+
order allow,deny
186+
deny from all
187+
</Files>
188+
<Files .htaccess>
189+
order allow,deny
190+
deny from all
191+
</Files>
192+
<Files .htaccess.sample>
193+
order allow,deny
194+
deny from all
195+
</Files>
196+
<Files .php_cs>
197+
order allow,deny
198+
deny from all
199+
</Files>
200+
<Files .travis.yml>
201+
order allow,deny
202+
deny from all
203+
</Files>
204+
<Files CHANGELOG.md>
205+
order allow,deny
206+
deny from all
207+
</Files>
208+
<Files CONTRIBUTING.md>
209+
order allow,deny
210+
deny from all
211+
</Files>
212+
<Files CONTRIBUTOR_LICENSE_AGREEMENT.html>
213+
order allow,deny
214+
deny from all
215+
</Files>
216+
<Files COPYING.txt>
217+
order allow,deny
218+
deny from all
219+
</Files>
220+
<Files Gruntfile.js>
221+
order allow,deny
222+
deny from all
223+
</Files>
224+
<Files LICENSE.txt>
225+
order allow,deny
226+
deny from all
227+
</Files>
228+
<Files LICENSE_AFL.txt>
229+
order allow,deny
230+
deny from all
231+
</Files>
232+
<Files nginx.conf.sample>
233+
order allow,deny
234+
deny from all
235+
</Files>
236+
<Files package.json>
237+
order allow,deny
238+
deny from all
239+
</Files>
240+
<Files php.ini.sample>
241+
order allow,deny
242+
deny from all
243+
</Files>
244+
<Files README.md>
245+
order allow,deny
246+
deny from all
183247
</Files>
184248

185-
############################################
249+
################################
186250
## If running in cluster environment, uncomment this
187251
## http://developer.yahoo.com/performance/rules.html#etags
188252

189253
#FileETag none
190-

‎app/code/Magento/CatalogRule/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
"magento/module-customer": "1.0.0-beta",
1010
"magento/module-backend": "1.0.0-beta",
1111
"magento/module-eav": "1.0.0-beta",
12-
"magento/module-import-export": "1.0.0-beta",
1312
"magento/framework": "1.0.0-beta",
1413
"magento/magento-composer-installer": "*"
1514
},
15+
"suggest": {
16+
"magento/module-import-export": "1.0.0-beta"
17+
},
1618
"type": "magento2-module",
1719
"version": "1.0.0-beta",
1820
"license": [

‎app/code/Magento/CatalogRuleConfigurable/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-catalog-rule": "1.0.0-beta",
76
"magento/module-configurable-product": "1.0.0-beta",
87
"magento/framework": "1.0.0-beta",
98
"magento/magento-composer-installer": "*"
109
},
10+
"suggest": {
11+
"magento/module-catalog-rule": "1.0.0-beta"
12+
},
1113
"type": "magento2-module",
1214
"version": "1.0.0-beta",
1315
"license": [

‎app/code/Magento/ConfigurableProduct/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"magento/module-store": "1.0.0-beta",
77
"magento/module-catalog": "1.0.0-beta",
88
"magento/module-catalog-inventory": "1.0.0-beta",
9-
"magento/module-sales": "1.0.0-beta",
109
"magento/module-checkout": "1.0.0-beta",
1110
"magento/module-msrp": "1.0.0-beta",
1211
"magento/module-backend": "1.0.0-beta",
@@ -20,7 +19,8 @@
2019
"magento/magento-composer-installer": "*"
2120
},
2221
"suggest": {
23-
"magento/module-webapi": "1.0.0-beta"
22+
"magento/module-webapi": "1.0.0-beta",
23+
"magento/module-sales": "1.0.0-beta"
2424
},
2525
"type": "magento2-module",
2626
"version": "1.0.0-beta",

‎app/code/Magento/Cron/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
6-
"magento/module-config": "1.0.0-beta",
76
"magento/module-store": "1.0.0-beta",
87
"magento/framework": "1.0.0-beta",
98
"magento/magento-composer-installer": "*"
109
},
10+
"suggest": {
11+
"magento/module-config": "1.0.0-beta"
12+
},
1113
"type": "magento2-module",
1214
"version": "1.0.0-beta",
1315
"license": [

‎app/code/Magento/Dhl/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
"magento/module-backend": "1.0.0-beta",
1010
"magento/module-directory": "1.0.0-beta",
1111
"magento/module-sales": "1.0.0-beta",
12-
"magento/module-checkout": "1.0.0-beta",
1312
"magento/module-catalog": "1.0.0-beta",
1413
"magento/module-catalog-inventory": "1.0.0-beta",
1514
"magento/module-quote": "1.0.0-beta",
1615
"magento/framework": "1.0.0-beta",
1716
"lib-libxml": "*",
1817
"magento/magento-composer-installer": "*"
1918
},
19+
"suggest": {
20+
"magento/module-checkout": "1.0.0-beta"
21+
},
2022
"type": "magento2-module",
2123
"version": "1.0.0-beta",
2224
"license": [

‎app/code/Magento/GiftMessage/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"magento/module-store": "1.0.0-beta",
77
"magento/module-catalog": "1.0.0-beta",
88
"magento/module-checkout": "1.0.0-beta",
9-
"magento/module-multishipping": "1.0.0-beta",
109
"magento/module-sales": "1.0.0-beta",
1110
"magento/module-backend": "1.0.0-beta",
1211
"magento/module-customer": "1.0.0-beta",
@@ -15,6 +14,9 @@
1514
"magento/framework": "1.0.0-beta",
1615
"magento/magento-composer-installer": "*"
1716
},
17+
"suggest": {
18+
"magento/module-multishipping": "1.0.0-beta"
19+
},
1820
"type": "magento2-module",
1921
"version": "1.0.0-beta",
2022
"license": [

‎app/code/Magento/Msrp/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"require": {
55
"php": "~5.5.0|~5.6.0|~7.0.0",
66
"magento/module-store": "1.0.0-beta",
7-
"magento/module-bundle": "1.0.0-beta",
87
"magento/module-catalog": "1.0.0-beta",
98
"magento/module-downloadable": "1.0.0-beta",
109
"magento/module-eav": "1.0.0-beta",
@@ -14,6 +13,9 @@
1413
"magento/framework": "1.0.0-beta",
1514
"magento/magento-composer-installer": "*"
1615
},
16+
"suggest": {
17+
"magento/module-bundle": "1.0.0-beta"
18+
},
1719
"type": "magento2-module",
1820
"version": "1.0.0-beta",
1921
"license": [

‎app/code/Magento/OfflineShipping/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
"magento/module-sales": "1.0.0-beta",
1212
"magento/module-sales-rule": "1.0.0-beta",
1313
"magento/module-directory": "1.0.0-beta",
14-
"magento/module-checkout": "1.0.0-beta",
1514
"magento/module-quote": "1.0.0-beta",
1615
"magento/framework": "1.0.0-beta",
1716
"magento/magento-composer-installer": "*"
1817
},
18+
"suggest": {
19+
"magento/module-checkout": "1.0.0-beta"
20+
},
1921
"type": "magento2-module",
2022
"version": "1.0.0-beta",
2123
"license": [

‎app/code/Magento/Swagger/view/frontend/layout/swagger_index_index.xml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@
3737
</head>
3838
<body>
3939
<!--Remove Magento page content-->
40-
<remove name="page.wrapper"/>
41-
<remove name="after.body.start"/>
42-
<remove name="page.bottom"/>
40+
<referenceContainer name="page.wrapper" remove="true"/>
41+
<referenceBlock name="requirejs-config" remove="true"/>
4342
<referenceContainer name="root">
4443
<block name="swaggerUiContent" class="Magento\Framework\View\Element\Template" template="Magento_Swagger::swagger-ui/index.phtml"/>
4544
</referenceContainer>

‎app/code/Magento/Swagger/view/frontend/templates/swagger-ui/index.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $schemaUrl = rtrim($block->getBaseUrl(), '/') . '/rest/default/schema?services=a
1818
?>
1919

2020
<!DOCTYPE html>
21-
<script language="text/javascript">
21+
<script>
2222
$(function () {
2323
var url = window.location.search.match(/url=([^&]+)/);
2424
if (url && url.length > 1) {

‎app/code/Magento/Swatches/composer.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@
1111
"magento/module-backend": "1.0.0-beta",
1212
"magento/module-media-storage": "1.0.0-beta",
1313
"magento/module-config": "1.0.0-beta",
14-
"magento/module-layered-navigation": "1.0.0-beta",
1514
"magento/module-theme": "1.0.0-beta",
1615
"magento/framework": "1.0.0-beta",
1716
"magento/magento-composer-installer": "*"
1817
},
18+
"suggest": {
19+
"magento/module-layered-navigation": "1.0.0-beta"
20+
},
1921
"type": "magento2-module",
2022
"version": "1.0.0-beta",
2123
"license": [

‎dev/tests/functional/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"require": {
3-
"magento/mtf": "1.0.0-rc32",
3+
"magento/mtf": "1.0.0-rc33",
44
"php": "~5.5.0|~5.6.0|~7.0.0",
55
"phpunit/phpunit": "4.1.0",
66
"phpunit/phpunit-selenium": ">=1.2"

0 commit comments

Comments
 (0)