Jelajahi Sumber

Agregado de una variable como parametro para el nombre del servicio nginx

Modificacion del security para que los firewalls compartan informacion

Agregado de los trusted proxies
Your Name 7 tahun lalu
induk
melakukan
d33762d2b2
5 mengubah file dengan 36 tambahan dan 19 penghapusan
  1. 4 1
      app/config/parameters.yml.dist
  2. 3 0
      app/config/parameters.yml.docker
  3. 15 4
      app/config/security.yml
  4. 2 2
      composer.json
  5. 12 12
      composer.lock

+ 4 - 1
app/config/parameters.yml.dist

@@ -41,4 +41,7 @@ parameters:
     env(CLIENT): ''
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.fd3.flowdat.com'
-    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+    session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+
+    # nombre del servicio del nginx
+    nginx_name: nginx-proxy

+ 3 - 0
app/config/parameters.yml.docker

@@ -40,3 +40,6 @@ parameters:
     cookie_domain_client: '%env(CLIENT)%'
     cookie_domain: '%cookie_domain_client%.flowdat.com'
     session_names: [flowdat_base_session, flowdat_ftth_session, flowdat_mapas_session, flowdat_stats_session, flowdat_radius_session, flowdat_cablemodem_session]
+
+    # nombre del servicio del nginx
+    nginx_name: nginx-proxy

+ 15 - 4
app/config/security.yml

@@ -8,17 +8,28 @@ security:
         ROLE_SUPER_ADMIN: ROLE_ADMIN
             
     firewalls:       
-                                
         dev:
+            # es una llave que se utiliza para guardar y traer los datos de la session. Los firewalls que posean
+            # el mismo context, van a compartir la informacion. PARA QUE FUNCION "stateless" debe estar en FALSE
+            context: ik_share
+            stateless: false
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
             
         api:
-          pattern: ^/api
-          stateless: true
-          oauth_proxy: true
+            # es una llave que se utiliza para guardar y traer los datos de la session. Los firewalls que posean
+            # el mismo context, van a compartir la informacion. PARA QUE FUNCION "stateless" debe estar en FALSE
+            context: ik_share
+            stateless: false
+            pattern: ^/api
+            stateless: true
+            oauth_proxy: true
 
         secured_area:
+            # es una llave que se utiliza para guardar y traer los datos de la session. Los firewalls que posean
+            # el mismo context, van a compartir la informacion. PARA QUE FUNCION "stateless" debe estar en FALSE
+            context: ik_share
+            stateless: false
             pattern: ^/
             logout:
                 path:   /logout

+ 2 - 2
composer.json

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

+ 12 - 12
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": "1239b04e715448f48863a01c573197e0",
+    "content-hash": "bba2dda7004f0656f9f2a36c1f8a1445",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1391,11 +1391,11 @@
         },
         {
             "name": "ik/auth-bundle",
-            "version": "dev-master",
+            "version": "dev-FD3-284",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/AuthBundle.git",
-                "reference": "97432185940d65ea97f0bf5778dbcceeb78578e4"
+                "reference": "ac4a13da24089c9b7c5e88575538dfcebb501057"
             },
             "type": "library",
             "autoload": {
@@ -1410,15 +1410,15 @@
                 "auth",
                 "bundle"
             ],
-            "time": "2017-09-22T13:27:29+00:00"
+            "time": "2017-11-03T12:44:12+00:00"
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "dev-master",
+            "version": "dev-FD3-284",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "ccf944e46dc4fe66c32c9ecec0fa3ffa0f919594"
+                "reference": "eb512db3d1778c9a4687d51b3519b492529bb5fe"
             },
             "type": "library",
             "autoload": {
@@ -1433,7 +1433,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2017-10-24T12:41:46+00:00"
+            "time": "2017-11-03T13:54:39+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -1441,7 +1441,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@gogs.infra.flowdat.com:222/VendorSoftwareFlowdat3/DeviceBundle.git",
-                "reference": "4a05cb8892cb401ab3b1b6ab28446caf428e75ea"
+                "reference": "584909edec2acc3eb9b565366f01ed5265369738"
             },
             "type": "library",
             "autoload": {
@@ -1456,7 +1456,7 @@
                 "bundle",
                 "validators"
             ],
-            "time": "2017-10-20T14:49:48+00:00"
+            "time": "2017-10-27T15:31:53+00:00"
         },
         {
             "name": "ik/extra-data-bundle",
@@ -1651,7 +1651,7 @@
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/WorkflowBundle.git",
-                "reference": "e1a027927aa7c67bbed5e10d9c594034f368d31f"
+                "reference": "77f0236374c818f06818e44317aae86be6563dba"
             },
             "require": {
                 "php-amqplib/rabbitmq-bundle": "^1.12"
@@ -1681,7 +1681,7 @@
                 "bundle",
                 "workflow"
             ],
-            "time": "2017-10-20T18:13:35+00:00"
+            "time": "2017-11-03T15:37:14+00:00"
         },
         {
             "name": "incenteev/composer-parameter-handler",
@@ -6287,7 +6287,7 @@
         "voryx/restgeneratorbundle": 20
     },
     "prefer-stable": false,
-    "prefer-lowest": true,
+    "prefer-lowest": false,
     "platform": {
         "php": ">=5.5.9"
     },