FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HTTP/HTTPS mixed content errors #612 (#613)

Browse Source 
* Configure TrustProxies middleware
* Add trusted proxies to deps
* Replace jquery request with axios request code
* Trust current user IP for forwarded headers
* Update dependencies
* Downgrade self-updater package for PHP 7.2
This commit is contained in:
Nabeel S
2020-03-03 10:20:13 -05:00
committed by GitHub
parent dcf9f48364
commit 89481b5fa1
26 changed files with 219 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
composer.lock generated
View File

@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "3ecbeb1fd297e2827adb61806383aa5b",
"content-hash": "add2551f0dcadfb273fa70e8264c7ce5",
"packages": [
{
"name": "akaunting/money",
@@ -558,16 +558,16 @@
},
{
"name": "codedge/laravel-selfupdater",
"version": "2.5.1",
"version": "2.5.2",
"source": {
"type": "git",
"url": "https://github.com/codedge/laravel-selfupdater.git",
"reference": "6f8c2be280bff00dc8a6c2ef01d4836ad1cae4ed"
"reference": "0d7d4eb7ea9e9ab42177df560d0b2e06296a84bd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/6f8c2be280bff00dc8a6c2ef01d4836ad1cae4ed",
"reference": "6f8c2be280bff00dc8a6c2ef01d4836ad1cae4ed",
"url": "https://api.github.com/repos/codedge/laravel-selfupdater/zipball/0d7d4eb7ea9e9ab42177df560d0b2e06296a84bd",
"reference": "0d7d4eb7ea9e9ab42177df560d0b2e06296a84bd",
"shasum": ""
},
"require": {
@@ -622,7 +622,7 @@
"self-update",
"update"
],
"time": "2020-02-10T12:01:41+00:00"
"time": "2020-03-02T22:07:04+00:00"
},
{
"name": "composer/ca-bundle",
@@ -1007,16 +1007,16 @@
},
{
"name": "composer/xdebug-handler",
"version": "1.4.0",
"version": "1.4.1",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
"reference": "cbe23383749496fe0f373345208b79568e4bc248"
"reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/cbe23383749496fe0f373345208b79568e4bc248",
"reference": "cbe23383749496fe0f373345208b79568e4bc248",
"url": "https://api.github.com/repos/composer/xdebug-handler/zipball/1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"reference": "1ab9842d69e64fb3a01be6b656501032d1b78cb7",
"shasum": ""
},
"require": {
@@ -1047,7 +1047,7 @@
"Xdebug",
"performance"
],
"time": "2019-11-06T16:40:04+00:00"
"time": "2020-03-01T12:26:26+00:00"
},
{
"name": "doctrine/cache",
@@ -1589,23 +1589,23 @@
},
{
"name": "facade/flare-client-php",
"version": "1.3.1",
"version": "1.3.2",
"source": {
"type": "git",
"url": "https://github.com/facade/flare-client-php.git",
"reference": "24444ea0e1556f0a4b5fc8e61802caf72ae9a408"
"reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/24444ea0e1556f0a4b5fc8e61802caf72ae9a408",
"reference": "24444ea0e1556f0a4b5fc8e61802caf72ae9a408",
"url": "https://api.github.com/repos/facade/flare-client-php/zipball/db1e03426e7f9472c9ecd1092aff00f56aa6c004",
"reference": "db1e03426e7f9472c9ecd1092aff00f56aa6c004",
"shasum": ""
},
"require": {
"facade/ignition-contracts": "~1.0",
"illuminate/pipeline": "~5.5|~5.6|~5.7|~5.8|^6.0",
"illuminate/pipeline": "^5.5|^6.0|^7.0",
"php": "^7.1",
"symfony/http-foundation": "~3.3|~4.1",
"symfony/http-foundation": "^3.3|^4.1|^5.0",
"symfony/var-dumper": "^3.4|^4.0|^5.0"
},
"require-dev": {
@@ -1639,7 +1639,7 @@
"flare",
"reporting"
],
"time": "2019-12-15T18:28:38+00:00"
"time": "2020-03-02T15:52:04+00:00"
},
{
"name": "facade/ignition",
@@ -1756,6 +1756,60 @@
],
"time": "2019-08-30T14:06:08+00:00"
},
{
"name": "fideloper/proxy",
"version": "4.3.0",
"source": {
"type": "git",
"url": "https://github.com/fideloper/TrustedProxy.git",
"reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/fideloper/TrustedProxy/zipball/ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
"reference": "ec38ad69ee378a1eec04fb0e417a97cfaf7ed11a",
"shasum": ""
},
"require": {
"illuminate/contracts": "^5.0|^6.0|^7.0|^8.0",
"php": ">=5.4.0"
},
"require-dev": {
"illuminate/http": "^5.0|^6.0|^7.0|^8.0",
"mockery/mockery": "^1.0",
"phpunit/phpunit": "^6.0"
},
"type": "library",
"extra": {
"laravel": {
"providers": [
"Fideloper\\Proxy\\TrustedProxyServiceProvider"
]
}
},
"autoload": {
"psr-4": {
"Fideloper\\Proxy\\": "src/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Chris Fidao",
"email": "fideloper@gmail.com"
}
],
"description": "Set trusted proxies for Laravel",
"keywords": [
"load balancing",
"proxy",
"trusted proxy"
],
"time": "2020-02-22T01:51:47+00:00"
},
{
"name": "filp/whoops",
"version": "2.7.1",
@@ -3377,16 +3431,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.30.0",
"version": "2.31.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4"
"reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/912dff66d2690ca66abddb9b291a1df5f371d3b4",
"reference": "912dff66d2690ca66abddb9b291a1df5f371d3b4",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
"reference": "bbc0ab53f41a4c6f223c18efcdbd9bc725eb5d2d",
"shasum": ""
},
"require": {
@@ -3443,7 +3497,7 @@
"datetime",
"time"
],
"time": "2020-02-07T15:25:46+00:00"
"time": "2020-03-01T11:11:58+00:00"
},
{
"name": "nikic/php-parser",
@@ -4673,16 +4727,16 @@
},
{
"name": "scrivo/highlight.php",
"version": "v9.18.1.0",
"version": "v9.18.1.1",
"source": {
"type": "git",
"url": "https://github.com/scrivo/highlight.php.git",
"reference": "a57c858cb753f543965a1e17af386a648012ed8f"
"reference": "52fc21c99fd888e33aed4879e55a3646f8d40558"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/scrivo/highlight.php/zipball/a57c858cb753f543965a1e17af386a648012ed8f",
"reference": "a57c858cb753f543965a1e17af386a648012ed8f",
"url": "https://api.github.com/repos/scrivo/highlight.php/zipball/52fc21c99fd888e33aed4879e55a3646f8d40558",
"reference": "52fc21c99fd888e33aed4879e55a3646f8d40558",
"shasum": ""
},
"require": {
@@ -4692,6 +4746,7 @@
},
"require-dev": {
"phpunit/phpunit": "^4.8|^5.7",
"sabberworm/php-css-parser": "^8.3",
"symfony/finder": "^2.8|^3.4",
"symfony/var-dumper": "^2.8|^3.4"
},
@@ -4737,7 +4792,7 @@
"highlight.php",
"syntax"
],
"time": "2020-02-03T02:19:36+00:00"
"time": "2020-03-02T05:59:21+00:00"
},
{
"name": "sebastiaanluca/laravel-helpers",
@@ -4999,37 +5054,37 @@
},
{
"name": "spatie/laravel-backup",
"version": "6.7.8",
"version": "6.8.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-backup.git",
"reference": "48f9310a2396db79d396dd63e20f657e8b11ce4e"
"reference": "b2cf3f9f35613a20a39e1c35803b77858b455382"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/laravel-backup/zipball/48f9310a2396db79d396dd63e20f657e8b11ce4e",
"reference": "48f9310a2396db79d396dd63e20f657e8b11ce4e",
"url": "https://api.github.com/repos/spatie/laravel-backup/zipball/b2cf3f9f35613a20a39e1c35803b77858b455382",
"reference": "b2cf3f9f35613a20a39e1c35803b77858b455382",
"shasum": ""
},
"require": {
"illuminate/console": "^5.8.15|^6.0",
"illuminate/contracts": "^5.8.15|^6.0",
"illuminate/events": "^5.8.15|^6.0",
"illuminate/filesystem": "^5.8.15|^6.0",
"illuminate/notifications": "^5.8.15|^6.0",
"illuminate/support": "^5.8.15|^6.0",
"illuminate/console": "^5.8.15|^6.0|^7.0",
"illuminate/contracts": "^5.8.15|^6.0|^7.0",
"illuminate/events": "^5.8.15|^6.0|^7.0",
"illuminate/filesystem": "^5.8.15|^6.0|^7.0",
"illuminate/notifications": "^5.8.15|^6.0|^7.0",
"illuminate/support": "^5.8.15|^6.0|^7.0",
"league/flysystem": "^1.0.49",
"php": "^7.2",
"spatie/db-dumper": "^2.12",
"spatie/temporary-directory": "^1.1",
"symfony/finder": "^4.2"
"symfony/finder": "^4.2|^5.0"
},
"require-dev": {
"laravel/slack-notification-channel": "^1.0",
"league/flysystem-aws-s3-v3": "^1.0",
"mockery/mockery": "^1.0",
"orchestra/testbench": "3.8.*|4.*",
"phpunit/phpunit": "^8.4"
"mockery/mockery": "^1.3",
"orchestra/testbench": "3.8.*|4.*|5.*",
"phpunit/phpunit": "^8.4|^9.0"
},
"suggest": {
"laravel/slack-notification-channel": "Required for sending notifications via Slack"
@@ -5070,7 +5125,7 @@
"laravel-backup",
"spatie"
],
"time": "2020-02-19T16:54:03+00:00"
"time": "2020-03-02T21:43:50+00:00"
},
{
"name": "spatie/temporary-directory",