浏览代码

Se sobreescribio el handle del AppKernel para cargar los trusted proxies.

Se quito la rama FD3-284 del base-admin-bundle
gabriel 7 年之前
父节点
当前提交
88bb8acdb7
共有 3 个文件被更改,包括 32 次插入11 次删除
  1. 25 4
      app/AppKernel.php
  2. 1 1
      composer.json
  3. 6 6
      composer.lock

+ 25 - 4
app/AppKernel.php

@@ -2,6 +2,8 @@
 
 use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
+use Symfony\Component\HttpKernel\HttpKernelInterface;
+use Symfony\Component\HttpFoundation\Request;
 
 class AppKernel extends Kernel
 {
@@ -53,7 +55,7 @@ class AppKernel extends Kernel
 
         }
 
-	$bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
+        $bundles[] = new Symfony\Bundle\WebServerBundle\WebServerBundle();
 
         return $bundles;
     }
@@ -65,16 +67,35 @@ class AppKernel extends Kernel
 
     public function getCacheDir()
     {
-        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+        return dirname(__DIR__) . '/var/cache/' . $this->getEnvironment();
     }
 
     public function getLogDir()
     {
-        return dirname(__DIR__).'/var/logs';
+        return dirname(__DIR__) . '/var/logs';
     }
 
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir() . '/config/config_' . $this->getEnvironment() . '.yml');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function handle(Request $request, $type = HttpKernelInterface::MASTER_REQUEST, $catch = true)
+    {
+        if (false === $this->booted) {
+            $this->boot();
+        }
+        // se puede sacar la variable nginx-proxy porque es el nombre del docker y puede variar
+        // con REMOTRA_ADDR obtengo el mismo valor (http://symfony.com/doc/current/deployment/proxies.html)
+        //gethostbyname("nginx-proxy") == $request->server->get('REMOTE_ADDR')
+        if ($this->container->hasParameter("nginx_name")) {
+            Request::setTrustedProxies(
+                array('127.0.0.1', $this->container->getParameter("nginx_name")),
+                Request::HEADER_X_FORWARDED_FOR);
+        }
+        return parent::handle($request, $type, $catch);
     }
 }

+ 1 - 1
composer.json

@@ -126,7 +126,7 @@
         "doctrine/orm": "^2.5",
         "ik/audit-bundle": "dev-master",
         "ik/auth-bundle": "dev-FD3-284",
-        "ik/base-admin-bundle": "dev-FD3-284",
+        "ik/base-admin-bundle": "dev-master",
         "ik/device-bundle": "dev-master",
         "ik/extra-data-bundle": "dev-master",
         "ik/leaflet-bundle": "dev-master",

+ 6 - 6
composer.lock

@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "13f5c60b9377a7b7340921346e570fcc",
+    "content-hash": "e7b23c41b7c1bed831248d08a01d583b",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1413,11 +1413,11 @@
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "dev-FD3-284",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "eb512db3d1778c9a4687d51b3519b492529bb5fe"
+                "reference": "53d81ce96e6b94af88c2546c5470fc3ad050a7bc"
             },
             "type": "library",
             "autoload": {
@@ -1432,7 +1432,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-11-03T13:54:39+00:00"
+            "time": "2017-10-27T15:27:11+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1650,7 +1650,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "2094aebf7b1d5b0ea09f68a6d5fe9c29a57393bf"
+                "reference": "2adbaaabc41470ae0df29bfeae00c98ea65e7e71"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1680,7 +1680,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-11-03T13:23:43+00:00"
+            "time": "2017-11-03T16:52:11+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",