From d3f66e2ee684523871ca061a11bf38df2805e5fc Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Fri, 4 Dec 2015 11:28:17 -0200 Subject: [PATCH 1/6] Updated two-factor-bundle but avoiding v1.5 --- app/SymfonyRequirements.php | 4 +- app/config/config.yml | 1 + app/config/parameters.yml.dist | 3 + composer.json | 2 +- composer.lock | 366 +++++++++++++++++---------------- 5 files changed, 198 insertions(+), 178 deletions(-) diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 2ba7950c4..28b0dcdbf 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -552,10 +552,10 @@ function_exists('simplexml_import_dom'), require_once __DIR__.'/../vendor/autoload.php'; try { - $r = new \ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); + $r = new ReflectionClass('Sensio\Bundle\DistributionBundle\SensioDistributionBundle'); $contents = file_get_contents(dirname($r->getFileName()).'/Resources/skeleton/app/SymfonyRequirements.php'); - } catch (\ReflectionException $e) { + } catch (ReflectionException $e) { $contents = ''; } $this->addRecommendation( diff --git a/app/config/config.yml b/app/config/config.yml index ddb919138..52ff89ffb 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -377,6 +377,7 @@ scheb_two_factor: google: enabled: true server_name: %site_domain% + issuer: %two_factor_issuer% template: PROCERGSLoginCidadaoCoreBundle:TwoFactorAuthentication:form.html.twig persister: ~ diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 576e18005..50b212543 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -90,3 +90,6 @@ parameters: # JWKS Config jwks_dir: %kernel.root_dir%/../app/config/jwks jwks_private_key_file: private.pem + + # Two Factor Auth + two_factor_issuer: Login Cidadão diff --git a/composer.json b/composer.json index 6b7277bb8..4e79339b5 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "jms/security-extra-bundle": "dev-master", "procergs/login-cidadao-badges-bundle": "dev-master", "procergs/login-cidadao-igp-bundle": "dev-master", - "scheb/two-factor-bundle": "dev-master", + "scheb/two-factor-bundle": "^1.4,<1.5", "procergs/tos-bundle": "^1.0", "symfony/phpunit-bridge": "^2.7", "bshaffer/oauth2-server-bundle": "dev-develop", diff --git a/composer.lock b/composer.lock index 2aecfabd4..89f230354 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "866be921f493bb9748d78d704a8fd451", - "content-hash": "7e78f476bcf5b8922cad4def9b91ff79", + "hash": "9c40fede22322f287e7c6916cd720476", + "content-hash": "217173fcf8977f75c1f3c24b1d141089", "packages": [ { "name": "bshaffer/oauth2-server-bundle", @@ -281,16 +281,16 @@ }, { "name": "doctrine/cache", - "version": "v1.4.2", + "version": "v1.5.2", "source": { "type": "git", "url": "https://github.com/doctrine/cache.git", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca" + "reference": "47c7128262da274f590ae6f86eb137a7a64e82af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/cache/zipball/8c434000f420ade76a07c64cbe08ca47e5c101ca", - "reference": "8c434000f420ade76a07c64cbe08ca47e5c101ca", + "url": "https://api.github.com/repos/doctrine/cache/zipball/47c7128262da274f590ae6f86eb137a7a64e82af", + "reference": "47c7128262da274f590ae6f86eb137a7a64e82af", "shasum": "" }, "require": { @@ -311,8 +311,8 @@ } }, "autoload": { - "psr-0": { - "Doctrine\\Common\\Cache\\": "lib/" + "psr-4": { + "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache" } }, "notification-url": "https://packagist.org/downloads/", @@ -347,7 +347,7 @@ "cache", "caching" ], - "time": "2015-08-31 12:36:41" + "time": "2015-12-03 10:50:37" }, { "name": "doctrine/collections", @@ -551,16 +551,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "v1.5.2", + "version": "1.6.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3" + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", - "reference": "d63be7eb9a95d46720f7d6badac4e5bc2bcff2e3", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", + "reference": "c4ffef2b2296e9d0179eb0b5248e5ae25c9bba3b", "shasum": "" }, "require": { @@ -625,52 +625,55 @@ "orm", "persistence" ], - "time": "2015-08-31 14:47:06" + "time": "2015-11-16 17:11:46" }, { "name": "doctrine/doctrine-cache-bundle", - "version": "v1.0.1", - "target-dir": "Doctrine/Bundle/DoctrineCacheBundle", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineCacheBundle.git", - "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d" + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", - "reference": "e4b6f810aa047f9cbfe41c3d6a3d7e83d7477a9d", + "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/030ff41ef1db66370b36467086bfb817a661fe6a", + "reference": "030ff41ef1db66370b36467086bfb817a661fe6a", "shasum": "" }, "require": { - "doctrine/cache": "~1.3", + "doctrine/cache": "^1.4.2", "doctrine/inflector": "~1.0", "php": ">=5.3.2", - "symfony/doctrine-bridge": "~2.2", - "symfony/framework-bundle": "~2.2", - "symfony/security": "~2.2" + "symfony/doctrine-bridge": "~2.2|~3.0" }, "require-dev": { "instaclick/coding-standard": "~1.1", "instaclick/object-calisthenics-sniffs": "dev-master", "instaclick/symfony2-coding-standard": "dev-remaster", - "phpunit/phpunit": "~3.7", + "phpunit/phpunit": "~4", "satooshi/php-coveralls": "~0.6.1", - "squizlabs/php_codesniffer": "dev-master", - "symfony/console": "~2.2", - "symfony/finder": "~2.2", - "symfony/validator": "~2.2", - "symfony/yaml": "~2.2" + "squizlabs/php_codesniffer": "~1.5", + "symfony/console": "~2.2|~3.0", + "symfony/finder": "~2.2|~3.0", + "symfony/framework-bundle": "~2.2|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/security-acl": "~2.3|~3.0", + "symfony/validator": "~2.2|~3.0", + "symfony/yaml": "~2.2|~3.0" + }, + "suggest": { + "symfony/security-acl": "For using this bundle to cache ACLs" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { - "psr-0": { - "Doctrine\\Bundle\\DoctrineCacheBundle": "" + "psr-4": { + "Doctrine\\Bundle\\DoctrineCacheBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -703,26 +706,26 @@ "email": "fabien@symfony.com" } ], - "description": "Symfony2 Bundle for Doctrine Cache", + "description": "Symfony Bundle for Doctrine Cache", "homepage": "http://www.doctrine-project.org", "keywords": [ "cache", "caching" ], - "time": "2014-11-28 09:43:36" + "time": "2015-11-27 04:59:07" }, { "name": "doctrine/inflector", - "version": "v1.0.1", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604" + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/0bcb2e79d8571787f18b7eb036ed3d004908e604", - "reference": "0bcb2e79d8571787f18b7eb036ed3d004908e604", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae", + "reference": "90b2128806bfde671b6952ab8bea493942c1fdae", "shasum": "" }, "require": { @@ -734,7 +737,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -776,7 +779,7 @@ "singularize", "string" ], - "time": "2014-12-20 21:24:13" + "time": "2015-11-06 14:35:42" }, { "name": "doctrine/instantiator", @@ -1318,12 +1321,12 @@ "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSUserBundle.git", - "reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83" + "reference": "45d6f40178216a840885b4ca6d7de9e67068568a" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/FriendsOfSymfony/FOSUserBundle/zipball/45d6f40178216a840885b4ca6d7de9e67068568a", - "reference": "d5b28c367d393f9d9fbc48c4138b2a74d51c0c83", + "reference": "45d6f40178216a840885b4ca6d7de9e67068568a", "shasum": "" }, "require": { @@ -1377,7 +1380,7 @@ "keywords": [ "User management" ], - "time": "2015-09-15 13:15:07" + "time": "2015-11-03 10:24:23" }, { "name": "gree/jose", @@ -1485,12 +1488,12 @@ "source": { "type": "git", "url": "https://github.com/hwi/HWIOAuthBundle.git", - "reference": "e5995827e95cb6401f050010469f4c4f2e11bd93" + "reference": "1239889d504b151e120625d744aa6fbbcf6b6d16" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/1239889d504b151e120625d744aa6fbbcf6b6d16", - "reference": "e5995827e95cb6401f050010469f4c4f2e11bd93", + "reference": "1239889d504b151e120625d744aa6fbbcf6b6d16", "shasum": "" }, "require": { @@ -1592,25 +1595,25 @@ "yahoo", "yandex" ], - "time": "2015-09-05 06:58:06" + "time": "2015-11-22 17:50:20" }, { "name": "incenteev/composer-parameter-handler", - "version": "v2.1.1", + "version": "v2.1.2", "source": { "type": "git", "url": "https://github.com/Incenteev/ParameterHandler.git", - "reference": "84a205fe80a46101607bafbc423019527893ddd0" + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/84a205fe80a46101607bafbc423019527893ddd0", - "reference": "84a205fe80a46101607bafbc423019527893ddd0", + "url": "https://api.github.com/repos/Incenteev/ParameterHandler/zipball/d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", + "reference": "d7ce7f06136109e81d1cb9d57066c4d4a99cf1cc", "shasum": "" }, "require": { "php": ">=5.3.3", - "symfony/yaml": "~2.0" + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { "composer/composer": "1.0.*@dev", @@ -1643,7 +1646,7 @@ "keywords": [ "parameters management" ], - "time": "2015-06-03 08:27:03" + "time": "2015-11-10 17:04:01" }, { "name": "jdorn/sql-formatter", @@ -2071,16 +2074,16 @@ }, { "name": "jms/serializer", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://github.com/schmittjoh/serializer.git", - "reference": "a29d9a204efc3ca3f39a9d182a83fd34462fef3f" + "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/a29d9a204efc3ca3f39a9d182a83fd34462fef3f", - "reference": "a29d9a204efc3ca3f39a9d182a83fd34462fef3f", + "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/fe13a1f993ea3456e195b7820692f2eb2b6bbb48", + "reference": "fe13a1f993ea3456e195b7820692f2eb2b6bbb48", "shasum": "" }, "require": { @@ -2091,6 +2094,9 @@ "php": ">=5.4.0", "phpcollection/phpcollection": "~0.1" }, + "conflict": { + "twig/twig": "<1.12" + }, "require-dev": { "doctrine/orm": "~2.1", "doctrine/phpcr-odm": "~1.0.1", @@ -2102,7 +2108,7 @@ "symfony/translation": "~2.0", "symfony/validator": "~2.0", "symfony/yaml": "2.*", - "twig/twig": ">=1.8,<2.0-dev" + "twig/twig": "~1.12|~2.0" }, "suggest": { "symfony/yaml": "Required if you'd like to serialize data to YAML format." @@ -2110,7 +2116,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.17-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2137,27 +2143,28 @@ "serialization", "xml" ], - "time": "2015-06-16 11:50:24" + "time": "2015-10-27 09:24:41" }, { "name": "jms/serializer-bundle", - "version": "1.0.0", + "version": "1.1.0", "target-dir": "JMS/SerializerBundle", "source": { "type": "git", "url": "https://github.com/schmittjoh/JMSSerializerBundle.git", - "reference": "0be35615b5bae1ce42567244a321aa1be3ed0280" + "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/0be35615b5bae1ce42567244a321aa1be3ed0280", - "reference": "0be35615b5bae1ce42567244a321aa1be3ed0280", + "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/3e396c980545350c2efb65a50041d2a9f9d6562e", + "reference": "3e396c980545350c2efb65a50041d2a9f9d6562e", "shasum": "" }, "require": { "jms/serializer": "^1.0.0", - "php": ">=5.3.2", - "symfony/framework-bundle": "~2.1" + "php": ">=5.4.0", + "phpoption/phpoption": "^1.1.0", + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { "doctrine/doctrine-bundle": "*", @@ -2179,7 +2186,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "1.1-dev" } }, "autoload": { @@ -2206,7 +2213,7 @@ "serialization", "xml" ], - "time": "2015-06-23 19:27:08" + "time": "2015-11-10 12:26:42" }, { "name": "knplabs/gaufrette", @@ -2298,12 +2305,12 @@ "source": { "type": "git", "url": "https://github.com/KnpLabs/KnpGaufretteBundle.git", - "reference": "7edea6cfcc4718573f9cbd7bd1adcaf3c2319e8b" + "reference": "0b2750033a353c0a2a6d05f7f0d2a60581257d20" }, "dist": { "type": "zip", "url": "https://api.github.com/repos/KnpLabs/KnpGaufretteBundle/zipball/0b2750033a353c0a2a6d05f7f0d2a60581257d20", - "reference": "7edea6cfcc4718573f9cbd7bd1adcaf3c2319e8b", + "reference": "0b2750033a353c0a2a6d05f7f0d2a60581257d20", "shasum": "" }, "require": { @@ -2348,42 +2355,41 @@ "filesystem", "media" ], - "time": "2015-09-18 12:09:25" + "time": "2015-11-10 09:25:29" }, { "name": "kriswallsmith/assetic", - "version": "v1.3.1", + "version": "v1.3.2", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5" + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", - "reference": "cb92b179dddfb8a3f341d53bd27e088f24d9c2e5", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/9928f7c4ad98b234e3559d1049abd13387f86db5", + "reference": "9928f7c4ad98b234e3559d1049abd13387f86db5", "shasum": "" }, "require": { "php": ">=5.3.1", - "symfony/process": "~2.1" + "symfony/process": "~2.1|~3.0" }, "conflict": { - "twig/twig": "<1.12" + "twig/twig": "<1.23" }, "require-dev": { - "cssmin/cssmin": "*", - "joliclic/javascript-packer": "*", - "kamicane/packager": "*", + "cssmin/cssmin": "3.0.1", + "joliclic/javascript-packer": "1.1", + "kamicane/packager": "1.0", "leafo/lessphp": "^0.3.7", - "leafo/scssphp": "*@dev", - "leafo/scssphp-compass": "*@dev", - "mrclay/minify": "*", + "leafo/scssphp": "~0.1", + "mrclay/minify": "~2.2", "patchwork/jsqueeze": "~1.0|~2.0", "phpunit/phpunit": "~4.8", "psr/log": "~1.0", - "ptachoire/cssembed": "*", - "symfony/phpunit-bridge": "~2.7", + "ptachoire/cssembed": "~1.0", + "symfony/phpunit-bridge": "~2.7|~3.0", "twig/twig": "~1.8|~2.0" }, "suggest": { @@ -2426,7 +2432,7 @@ "compression", "minification" ], - "time": "2015-10-15 01:33:42" + "time": "2015-11-12 13:51:40" }, { "name": "kriswallsmith/buzz", @@ -2478,16 +2484,16 @@ }, { "name": "league/uri", - "version": "4.0.0", + "version": "4.0.1", "source": { "type": "git", "url": "https://github.com/thephpleague/uri.git", - "reference": "a22120c5937814dbadaffccef32bf11040f46c0b" + "reference": "671150fbd1d4120746195d6bec1aa78b95b14104" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/uri/zipball/a22120c5937814dbadaffccef32bf11040f46c0b", - "reference": "a22120c5937814dbadaffccef32bf11040f46c0b", + "url": "https://api.github.com/repos/thephpleague/uri/zipball/671150fbd1d4120746195d6bec1aa78b95b14104", + "reference": "671150fbd1d4120746195d6bec1aa78b95b14104", "shasum": "" }, "require": { @@ -2528,6 +2534,8 @@ "description": "URI manipulation library", "homepage": "http://url.thephpleague.com", "keywords": [ + "data", + "data-uri", "ftp", "http", "parse_url", @@ -2537,7 +2545,7 @@ "url", "ws" ], - "time": "2015-09-23 11:09:45" + "time": "2015-11-03 07:54:30" }, { "name": "michelf/php-markdown", @@ -2674,26 +2682,30 @@ "source": { "type": "git", "url": "https://github.com/nelmio/NelmioApiDocBundle.git", - "reference": "9af37448fa2f82856d068205afa96e9874527672" + "reference": "97707ea5f438622ce31ab836e1d78bb70bfe101d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/97707ea5f438622ce31ab836e1d78bb70bfe101d", - "reference": "9af37448fa2f82856d068205afa96e9874527672", + "url": "https://api.github.com/repos/nelmio/NelmioApiDocBundle/zipball/49238f44aa73f545c0a927b00251c89a0acf3005", + "reference": "97707ea5f438622ce31ab836e1d78bb70bfe101d", "shasum": "" }, "require": { "michelf/php-markdown": "~1.4", + "php": ">=5.3", "symfony/console": "~2.3", "symfony/framework-bundle": "~2.3", "symfony/twig-bundle": "~2.3" }, "conflict": { "jms/serializer": "<0.12", - "jms/serializer-bundle": "<0.11" + "jms/serializer-bundle": "<0.11", + "twig/twig": "<1.12" }, "require-dev": { - "dunglas/api-bundle": "~1.0@beta", + "doctrine/doctrine-bundle": "~1.5", + "doctrine/orm": "~2.3", + "dunglas/api-bundle": "~1.0@dev", "friendsofsymfony/rest-bundle": "~1.0", "jms/serializer-bundle": ">=0.11", "sensio/framework-extra-bundle": "~3.0", @@ -2716,7 +2728,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.9.x-dev" + "dev-master": "2.10.x-dev" } }, "autoload": { @@ -2745,7 +2757,7 @@ "documentation", "rest" ], - "time": "2015-09-30 21:35:45" + "time": "2015-11-25 09:13:47" }, { "name": "nelmio/cors-bundle", @@ -3312,7 +3324,7 @@ }, { "name": "scheb/two-factor-bundle", - "version": "dev-master", + "version": "v1.4.7", "source": { "type": "git", "url": "https://github.com/scheb/two-factor-bundle.git", @@ -3320,7 +3332,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/b0da3a85b181237c3bebde88c99b18745313360b", + "url": "https://api.github.com/repos/scheb/two-factor-bundle/zipball/ef6830dbbf62b22efd335db8f64bf0f51d4284a2", "reference": "ef6830dbbf62b22efd335db8f64bf0f51d4284a2", "shasum": "" }, @@ -3361,17 +3373,17 @@ }, { "name": "sensio/distribution-bundle", - "version": "v3.0.32", + "version": "v3.0.34", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "e46293aa6dd94f054c500ef990538d822c763ebd" + "reference": "587f3cd08bf8856cfc888b255f34f18b85930657" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/e46293aa6dd94f054c500ef990538d822c763ebd", - "reference": "e46293aa6dd94f054c500ef990538d822c763ebd", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/587f3cd08bf8856cfc888b255f34f18b85930657", + "reference": "587f3cd08bf8856cfc888b255f34f18b85930657", "shasum": "" }, "require": { @@ -3417,29 +3429,29 @@ "configuration", "distribution" ], - "time": "2015-10-20 06:53:22" + "time": "2015-11-26 18:10:17" }, { "name": "sensio/framework-extra-bundle", - "version": "v3.0.10", + "version": "v3.0.11", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioFrameworkExtraBundle.git", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c" + "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/18fc2063c4d6569cdca47a39fbac32342eb65f3c", - "reference": "18fc2063c4d6569cdca47a39fbac32342eb65f3c", + "url": "https://api.github.com/repos/sensiolabs/SensioFrameworkExtraBundle/zipball/a79e205737b58d557c05caef6dfa8f94d8084bca", + "reference": "a79e205737b58d557c05caef6dfa8f94d8084bca", "shasum": "" }, "require": { "doctrine/common": "~2.2", - "symfony/framework-bundle": "~2.3" + "symfony/framework-bundle": "~2.3|~3.0" }, "require-dev": { - "symfony/expression-language": "~2.4", - "symfony/security-bundle": "~2.4" + "symfony/expression-language": "~2.4|~3.0", + "symfony/security-bundle": "~2.4|~3.0" }, "suggest": { "symfony/expression-language": "", @@ -3472,24 +3484,24 @@ "annotations", "controllers" ], - "time": "2015-08-03 11:59:27" + "time": "2015-10-28 15:47:04" }, { "name": "sensiolabs/security-checker", - "version": "v3.0.1", + "version": "v3.0.2", "source": { "type": "git", "url": "https://github.com/sensiolabs/security-checker.git", - "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9" + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/7735fd97ff7303d9df776b8dbc970f949399abc9", - "reference": "7735fd97ff7303d9df776b8dbc970f949399abc9", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/21696b0daa731064c23cfb694c60a2584a7b6e93", + "reference": "21696b0daa731064c23cfb694c60a2584a7b6e93", "shasum": "" }, "require": { - "symfony/console": "~2.0" + "symfony/console": "~2.0|~3.0" }, "bin": [ "security-checker" @@ -3516,7 +3528,7 @@ } ], "description": "A security checker for your composer.lock", - "time": "2015-08-11 12:11:25" + "time": "2015-11-07 08:07:40" }, { "name": "simplethings/entity-audit-bundle", @@ -3666,25 +3678,25 @@ }, { "name": "symfony/assetic-bundle", - "version": "v2.7.0", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/assetic-bundle.git", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5" + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", - "reference": "3ae5c8ca3079b6e0033cc9fbfb6500e2bc964da5", + "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", + "reference": "d885ec8451d5a7b077bda81bb19ac9fbff9cdc76", "shasum": "" }, "require": { "kriswallsmith/assetic": "~1.3", "php": ">=5.3.0", - "symfony/console": "~2.3", - "symfony/dependency-injection": "~2.3", - "symfony/framework-bundle": "~2.3", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/framework-bundle": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "conflict": { "kriswallsmith/spork": "<=0.2", @@ -3693,11 +3705,11 @@ "require-dev": { "kriswallsmith/spork": "~0.3", "patchwork/jsqueeze": "~1.0", - "symfony/class-loader": "~2.3", - "symfony/css-selector": "~2.3", - "symfony/dom-crawler": "~2.3", - "symfony/phpunit-bridge": "~2.7", - "symfony/twig-bundle": "~2.3" + "symfony/class-loader": "~2.3|~3.0", + "symfony/css-selector": "~2.3|~3.0", + "symfony/dom-crawler": "~2.3|~3.0", + "symfony/phpunit-bridge": "~2.7|~3.0", + "symfony/twig-bundle": "~2.3|~3.0" }, "suggest": { "kriswallsmith/spork": "to be able to dump assets in parallel", @@ -3732,33 +3744,33 @@ "compression", "minification" ], - "time": "2015-09-01 00:05:29" + "time": "2015-11-17 09:45:47" }, { "name": "symfony/monolog-bundle", - "version": "2.8.1", + "version": "v2.8.2", "source": { "type": "git", "url": "https://github.com/symfony/monolog-bundle.git", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a" + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/7117b9a145722e3c5768db4585f6ad0643ed5c4a", - "reference": "7117b9a145722e3c5768db4585f6ad0643ed5c4a", + "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/84785c4d44801c4dd82829fa2e1820cacfe2c46f", + "reference": "84785c4d44801c4dd82829fa2e1820cacfe2c46f", "shasum": "" }, "require": { "monolog/monolog": "~1.8", "php": ">=5.3.2", - "symfony/config": "~2.3|3.*", - "symfony/dependency-injection": "~2.3|3.*", - "symfony/http-kernel": "~2.3|3.*", - "symfony/monolog-bridge": "~2.3|3.*" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/monolog-bridge": "~2.3|~3.0" }, "require-dev": { - "symfony/console": "~2.3|3.*", - "symfony/yaml": "~2.3" + "symfony/console": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "type": "symfony-bundle", "extra": { @@ -3791,20 +3803,20 @@ "log", "logging" ], - "time": "2015-10-02 11:51:59" + "time": "2015-11-17 10:02:29" }, { "name": "symfony/phpunit-bridge", - "version": "v2.7.5", + "version": "v2.8.0", "source": { "type": "git", "url": "https://github.com/symfony/phpunit-bridge.git", - "reference": "d01f81ca48d76f5af818017f81b2ef93e892e425" + "reference": "fb79ac646c342fdff19864619943a6c58bb28893" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/d01f81ca48d76f5af818017f81b2ef93e892e425", - "reference": "d01f81ca48d76f5af818017f81b2ef93e892e425", + "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/fb79ac646c342fdff19864619943a6c58bb28893", + "reference": "fb79ac646c342fdff19864619943a6c58bb28893", "shasum": "" }, "require": { @@ -3816,7 +3828,7 @@ "type": "symfony-bridge", "extra": { "branch-alias": { - "dev-master": "2.7-dev" + "dev-master": "2.8-dev" } }, "autoload": { @@ -3825,7 +3837,10 @@ ], "psr-4": { "Symfony\\Bridge\\PhpUnit\\": "" - } + }, + "exclude-from-classmap": [ + "/Tests/" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -3843,32 +3858,32 @@ ], "description": "Symfony PHPUnit Bridge", "homepage": "https://symfony.com", - "time": "2015-06-30 08:16:45" + "time": "2015-11-27 22:51:43" }, { "name": "symfony/swiftmailer-bundle", - "version": "v2.3.8", + "version": "v2.3.9", "source": { "type": "git", "url": "https://github.com/symfony/swiftmailer-bundle.git", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797" + "reference": "3d21ada19f23631f558ad6df653b168e35362e78" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/970b13d01871207e81d17b17ddda025e7e21e797", - "reference": "970b13d01871207e81d17b17ddda025e7e21e797", + "url": "https://api.github.com/repos/symfony/swiftmailer-bundle/zipball/3d21ada19f23631f558ad6df653b168e35362e78", + "reference": "3d21ada19f23631f558ad6df653b168e35362e78", "shasum": "" }, "require": { "php": ">=5.3.2", "swiftmailer/swiftmailer": ">=4.2.0,~5.0", - "symfony/swiftmailer-bridge": "~2.1" + "symfony/config": "~2.3|~3.0", + "symfony/dependency-injection": "~2.3|~3.0", + "symfony/http-kernel": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0" }, "require-dev": { - "symfony/config": "~2.1", - "symfony/dependency-injection": "~2.1", - "symfony/http-kernel": "~2.1", - "symfony/yaml": "~2.1" + "symfony/phpunit-bridge": "~2.7|~3.0" }, "suggest": { "psr/log": "Allows logging" @@ -3900,27 +3915,27 @@ ], "description": "Symfony SwiftmailerBundle", "homepage": "http://symfony.com", - "time": "2014-12-01 17:44:50" + "time": "2015-11-28 10:59:29" }, { "name": "symfony/symfony", - "version": "v2.7.5", + "version": "v2.7.7", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0" + "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/619528a274647cffc1792063c3ea04c4fa8266a0", - "reference": "619528a274647cffc1792063c3ea04c4fa8266a0", + "url": "https://api.github.com/repos/symfony/symfony/zipball/cc69dbd24b4b2e6de60b2414ef95da2794f459a2", + "reference": "cc69dbd24b4b2e6de60b2414ef95da2794f459a2", "shasum": "" }, "require": { "doctrine/common": "~2.4", "php": ">=5.3.9", "psr/log": "~1.0", - "twig/twig": "~1.20|~2.0" + "twig/twig": "~1.23|~2.0" }, "replace": { "symfony/asset": "self.version", @@ -3976,8 +3991,7 @@ "egulias/email-validator": "~1.2", "ircmaxell/password-compat": "~1.0", "monolog/monolog": "~1.11", - "ocramius/proxy-manager": "~0.4|~1.0", - "symfony/phpunit-bridge": "self.version" + "ocramius/proxy-manager": "~0.4|~1.0" }, "type": "library", "extra": { @@ -4001,6 +4015,9 @@ ], "files": [ "src/Symfony/Component/Intl/Resources/stubs/functions.php" + ], + "exclude-from-classmap": [ + "**/Tests/" ] }, "notification-url": "https://packagist.org/downloads/", @@ -4022,20 +4039,20 @@ "keywords": [ "framework" ], - "time": "2015-09-25 11:16:52" + "time": "2015-11-23 11:58:08" }, { "name": "twig/twig", - "version": "v1.22.3", + "version": "v1.23.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ebfc36b7e77b0c1175afe30459cf943010245540" + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ebfc36b7e77b0c1175afe30459cf943010245540", - "reference": "ebfc36b7e77b0c1175afe30459cf943010245540", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d9b6333ae8dd2c8e3fd256e127548def0bc614c6", + "reference": "d9b6333ae8dd2c8e3fd256e127548def0bc614c6", "shasum": "" }, "require": { @@ -4048,7 +4065,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.22-dev" + "dev-master": "1.23-dev" } }, "autoload": { @@ -4083,7 +4100,7 @@ "keywords": [ "templating" ], - "time": "2015-10-13 07:07:02" + "time": "2015-11-05 12:49:06" }, { "name": "vich/uploader-bundle", @@ -4310,7 +4327,6 @@ "jms/security-extra-bundle": 20, "procergs/login-cidadao-badges-bundle": 20, "procergs/login-cidadao-igp-bundle": 20, - "scheb/two-factor-bundle": 20, "bshaffer/oauth2-server-bundle": 20 }, "prefer-stable": false, From 94a821cc0b3589a4f7345cd6256e8039ef073d88 Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Sun, 6 Dec 2015 01:58:04 -0200 Subject: [PATCH 2/6] Fixes #302 --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/app/config/config.yml b/app/config/config.yml index 52ff89ffb..d9675ba2b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -385,6 +385,7 @@ scheb_two_factor: security_tokens: - Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken + - HWI\Bundle\OAuthBundle\Security\Core\Authentication\Token\OAuthToken - FOS\FacebookBundle\Security\Authentication\Token\FacebookUserToken nelmio_cors: From 00fae5514c4bb1c0a894b437eb022da5168fd45b Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Mon, 7 Dec 2015 14:58:07 -0200 Subject: [PATCH 3/6] Moved trusted_proxies to parameters.yml #304 --- app/config/config.yml | 2 +- app/config/parameters.yml.dist | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/config/config.yml b/app/config/config.yml index d9675ba2b..3b4f874f3 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -20,7 +20,7 @@ framework: engines: ['twig'] #assets_version: SomeVersionScheme default_locale: "%locale%" - trusted_proxies: ~ + trusted_proxies: %trusted_proxies% session: ~ fragments: ~ http_method_override: true diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 50b212543..6c64ba46e 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -6,6 +6,9 @@ parameters: database_user: root database_password: ~ + # Trusted proxies (http://symfony.com/doc/current/cookbook/request/load_balancer_reverse_proxy.html) + trusted_proxies: ~ + memcached_host: 127.0.0.1 memcached_port: 11211 session_prefix: lc_sess_ From 3e4b529e8a57cecbd91b9de956a19e780100e4ad Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Mon, 7 Dec 2015 18:05:43 -0200 Subject: [PATCH 4/6] Removed unused code #305 --- .../CoreBundle/Controller/Admin/ClientController.php | 3 --- .../CoreBundle/Controller/Admin/DefaultController.php | 6 ------ .../CoreBundle/Controller/Admin/SuggestionController.php | 3 --- .../CoreBundle/Controller/Dev/ClientController.php | 4 ---- .../CoreBundle/Controller/Dev/DefaultController.php | 6 ------ .../CoreBundle/Controller/Dev/NotificationController.php | 6 ------ .../CoreBundle/Controller/Dev/ShoutController.php | 3 --- 7 files changed, 31 deletions(-) diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/ClientController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/ClientController.php index 82e833995..a19c082a1 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/ClientController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/ClientController.php @@ -6,10 +6,7 @@ use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; -use PROCERGS\LoginCidadao\CoreBundle\Entity\SentEmail; use PROCERGS\OAuthBundle\Entity\Client; use PROCERGS\LoginCidadao\CoreBundle\Helper\GridHelper; use PROCERGS\LoginCidadao\NotificationBundle\Entity\Notification; diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/DefaultController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/DefaultController.php index 78638b26c..784e8312b 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/DefaultController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/DefaultController.php @@ -5,12 +5,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; -use PROCERGS\LoginCidadao\CoreBundle\Entity\SentEmail; -use PROCERGS\OAuthBundle\Entity\Client; /** * @Route("/admin") diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/SuggestionController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/SuggestionController.php index d94a0a1be..ace66e75a 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/SuggestionController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Admin/SuggestionController.php @@ -5,9 +5,6 @@ use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; use PROCERGS\LoginCidadao\CoreBundle\Form\Type\SuggestionFilterFormType; use PROCERGS\LoginCidadao\CoreBundle\Helper\GridHelper; diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ClientController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ClientController.php index 345db70f1..a64c83930 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ClientController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ClientController.php @@ -6,10 +6,6 @@ use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; -use PROCERGS\LoginCidadao\CoreBundle\Entity\SentEmail; use PROCERGS\OAuthBundle\Entity\Client; use PROCERGS\LoginCidadao\CoreBundle\Helper\GridHelper; diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/DefaultController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/DefaultController.php index 36e1f29cf..31c42b4f8 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/DefaultController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/DefaultController.php @@ -5,12 +5,6 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; -use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; -use PROCERGS\LoginCidadao\CoreBundle\Entity\SentEmail; -use PROCERGS\OAuthBundle\Entity\Client; /** * @Route("/dev") diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/NotificationController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/NotificationController.php index 22f148285..f3c8e72a1 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/NotificationController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/NotificationController.php @@ -6,16 +6,10 @@ use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; -use PROCERGS\LoginCidadao\CoreBundle\Entity\SentEmail; -use PROCERGS\OAuthBundle\Entity\Client; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ClientNotCatFormType; use Michelf\MarkdownExtra; use PROCERGS\LoginCidadao\NotificationBundle\Entity\Category; use PROCERGS\LoginCidadao\NotificationBundle\Entity\Placeholder; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\PlaceholderFormType; use PROCERGS\LoginCidadao\CoreBundle\Helper\GridHelper; /** diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ShoutController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ShoutController.php index d121acc93..3d86411b1 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ShoutController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/Dev/ShoutController.php @@ -6,9 +6,6 @@ use Symfony\Component\Routing\Annotation\Route; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\RedirectResponse; -use Symfony\Component\HttpFoundation\Response; -use PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType; use PROCERGS\OAuthBundle\Entity\Client; use PROCERGS\LoginCidadao\CoreBundle\Helper\GridHelper; From 50a320b4b13e073d945514180b70e146c9b3b4ff Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Mon, 7 Dec 2015 19:18:24 -0200 Subject: [PATCH 5/6] Contact form's captcha can be disabled. closes #305 --- app/config/parameters.yml.dist | 3 ++ .../Controller/DefaultController.php | 2 +- .../CoreBundle/Form/Type/ContactFormType.php | 33 ++++++++++++------- .../CoreBundle/Resources/config/services.yml | 7 ++++ .../Resources/views/Info/contact.html.twig | 2 ++ 5 files changed, 35 insertions(+), 12 deletions(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 50b212543..71df2525a 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -93,3 +93,6 @@ parameters: # Two Factor Auth two_factor_issuer: Login Cidadão + + # Enables or disables the contact form's captcha + contact_form.captcha: true diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/DefaultController.php b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/DefaultController.php index 1c072a0dd..34a5c9076 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Controller/DefaultController.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Controller/DefaultController.php @@ -80,7 +80,7 @@ public function helpAction(Request $request) */ public function contactAction(Request $request) { - $form = $this->createForm(new ContactFormType()); + $form = $this->createForm('contact_form_type'); $form->handleRequest($request); $translator = $this->get('translator'); $message = $translator->trans('contact.form.sent'); diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Form/Type/ContactFormType.php b/src/PROCERGS/LoginCidadao/CoreBundle/Form/Type/ContactFormType.php index c0e894950..9116196ab 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Form/Type/ContactFormType.php +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Form/Type/ContactFormType.php @@ -8,6 +8,13 @@ class ContactFormType extends AbstractType { + /** @var boolean */ + private $enableCaptcha; + + public function __construct($enableCaptcha = true) + { + $this->enableCaptcha = $enableCaptcha; + } public function buildForm(FormBuilderInterface $builder, array $options) { @@ -26,18 +33,22 @@ public function buildForm(FormBuilderInterface $builder, array $options) 'required' => true, 'label' => 'form.message', 'mapped' => false - ))->add('recaptcha', 'ewz_recaptcha', - array( - 'attr' => array( - 'options' => array( - 'theme' => 'clean' - ) - ), - 'mapped' => false, - 'constraints' => array( - new True() - ) )); + + if ($this->enableCaptcha) { + $builder->add('recaptcha', 'ewz_recaptcha', + array( + 'attr' => array( + 'options' => array( + 'theme' => 'clean' + ) + ), + 'mapped' => false, + 'constraints' => array( + new True() + ) + )); + } } public function getName() diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Resources/config/services.yml b/src/PROCERGS/LoginCidadao/CoreBundle/Resources/config/services.yml index 9e4f2d6f6..637b2e4eb 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Resources/config/services.yml +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Resources/config/services.yml @@ -12,6 +12,7 @@ parameters: procergs_logincidadao.city.selector.form.type.class: PROCERGS\LoginCidadao\CoreBundle\Form\Type\CitySelectorType procergs_logincidadao.state.selector.form.type.class: PROCERGS\LoginCidadao\CoreBundle\Form\Type\StateSelectorType procergs_logincidadao.country.selector.form.type.class: PROCERGS\LoginCidadao\CoreBundle\Form\Type\CountrySelectorType + lc.contact.form.class: PROCERGS\LoginCidadao\CoreBundle\Form\Type\ContactFormType procergs_logincidadao.user_provider.class: PROCERGS\LoginCidadao\CoreBundle\Security\User\Provider\LoginCidadaoProvider procergs_logincidadao.user_manager.class: PROCERGS\LoginCidadao\CoreBundle\Security\User\Manager\UserManager procergs_logincidadao.user_register.class: PROCERGS\LoginCidadao\CoreBundle\EventListener\RegisterListner @@ -350,3 +351,9 @@ services: - @translator tags: - { name: form.type, alias: lc_location } + + lc.contact.form: + class: %lc.contact.form.class% + arguments: [%contact_form.captcha%] + tags: + - { name: form.type, alias: contact_form_type } diff --git a/src/PROCERGS/LoginCidadao/CoreBundle/Resources/views/Info/contact.html.twig b/src/PROCERGS/LoginCidadao/CoreBundle/Resources/views/Info/contact.html.twig index 8355da846..0f4a42da4 100644 --- a/src/PROCERGS/LoginCidadao/CoreBundle/Resources/views/Info/contact.html.twig +++ b/src/PROCERGS/LoginCidadao/CoreBundle/Resources/views/Info/contact.html.twig @@ -27,11 +27,13 @@
{{ form_row(form.message, { 'attr' : {'placeholder' : 'form.message'|trans, 'class' :'form-control', 'rows': '3' }, 'label_attr' : {'class': 'sr-only'} } ) }}
+ {% if form.recaptcha is defined %}
{{ include("PROCERGSLoginCidadaoCoreBundle::common.recaptcha.html.twig") }} {% form_theme form 'EWZRecaptchaBundle:Form:ewz_recaptcha_widget.html.twig' %} {{ form_row(form.recaptcha, { 'attr': {'options' : {'theme' : 'custom' } }, 'label_attr': { 'class': 'sr-only' } }) }}
+ {% endif %} {{ form_end(form) }} From 7c0d7f91e5b8b78e55064347d6d4e7252494c3cf Mon Sep 17 00:00:00 2001 From: Guilherme Donato Date: Tue, 8 Dec 2015 11:06:39 -0200 Subject: [PATCH 6/6] Access to app_dev.php can be restricted via parameters.yml. resolves #310 --- app/config/parameters.yml.dist | 2 ++ web/app_dev.php | 33 ++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index bd8971005..d4b701eea 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -8,6 +8,8 @@ parameters: # Trusted proxies (http://symfony.com/doc/current/cookbook/request/load_balancer_reverse_proxy.html) trusted_proxies: ~ + # IPs allowed to access dev environment + dev_allowed: [ 127.0.0.0/8 ] memcached_host: 127.0.0.1 memcached_port: 11211 diff --git a/web/app_dev.php b/web/app_dev.php index bbe4ada05..8bd15fde8 100644 --- a/web/app_dev.php +++ b/web/app_dev.php @@ -1,22 +1,14 @@ loadClassCache(); + +try { + $path = implode(DIRECTORY_SEPARATOR, + array($kernel->getRootDir(), 'config', 'parameters.yml')); + + $params = Yaml::parse(file_get_contents($path)); + Request::setTrustedProxies($params['parameters']['trusted_proxies']); +} catch (Exception $ex) { + http_response_code(500); + exit('Invalid configuration'); +} + $request = Request::createFromGlobals(); + +$allowed = $params['parameters']['dev_allowed']; +if (!IpUtils::checkIp($request->getClientIp(), $allowed)) { + header('HTTP/1.0 403 Forbidden'); + exit('You are not allowed to access this file.'); +} + $response = $kernel->handle($request); $response->send(); $kernel->terminate($request, $response);