FD3-495 FD3-511 fix cambio tenencia

app/config/config.yml

@@ -118,6 +118,8 @@ sonata_admin:
         user_block: BaseOAuthClientBundle:Core:oauth_user_block.html.twig
         list: BaseAdminBundle::standard_list.html.twig
     persist_filters: true
+    security:
+        handler: sonata.admin.security.handler.role
 
 doctrine_migrations:
     dir_name: "%kernel.root_dir%/DoctrineMigrations"

app/config/roles.yml

@@ -0,0 +1,57 @@
+security:
+
+    role_hierarchy:
+
+        # HOST
+        ROLE_SONATA_HOST_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_HOST_LIST, ROLE_SONATA_ADMIN_HOST_VIEW]
+        ROLE_SONATA_HOST_EDITOR: [ROLE_SONATA_HOST_READER, ROLE_SONATA_ADMIN_HOST_CREATE, ROLE_SONATA_ADMIN_HOST_EDIT]
+        ROLE_SONATA_HOST_ADMIN: [ROLE_SONATA_HOST_EDITOR, ROLE_SONATA_ADMIN_HOST_DELETE, ROLE_SONATA_ADMIN_HOST_EXPORT]
+
+        # HOST_TYPE
+        ROLE_SONATA_HOST_TYPE_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_HOST_TYPE_LIST, ROLE_SONATA_ADMIN_HOST_TYPE_VIEW]
+        ROLE_SONATA_HOST_TYPE_EDITOR: [ROLE_SONATA_HOST_TYPE_READER, ROLE_SONATA_ADMIN_HOST_TYPE_CREATE, ROLE_SONATA_ADMIN_HOST_TYPE_EDIT]
+        ROLE_SONATA_HOST_TYPE_ADMIN: [ROLE_SONATA_HOST_TYPE_EDITOR, ROLE_SONATA_ADMIN_HOST_TYPE_DELETE, ROLE_SONATA_ADMIN_HOST_TYPE_EXPORT]
+
+        # NET_GROUP
+        ROLE_SONATA_NET_GROUP_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_NET_GROUP_LIST, ROLE_SONATA_ADMIN_NET_GROUP_VIEW]
+        ROLE_SONATA_NET_GROUP_EDITOR: [ROLE_SONATA_NET_GROUP_READER, ROLE_SONATA_ADMIN_NET_GROUP_CREATE, ROLE_SONATA_ADMIN_NET_GROUP_EDIT]
+        ROLE_SONATA_NET_GROUP_ADMIN: [ROLE_SONATA_NET_GROUP_EDITOR, ROLE_SONATA_ADMIN_NET_GROUP_DELETE, ROLE_SONATA_ADMIN_NET_GROUP_EXPORT]
+
+        # IPV_4_POOL
+        ROLE_SONATA_IPV_4_POOL_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_IPV_4_POOL_LIST, ROLE_SONATA_ADMIN_IPV_4_POOL_VIEW]
+        ROLE_SONATA_IPV_4_POOL_EDITOR: [ROLE_SONATA_IPV_4_POOL_READER, ROLE_SONATA_ADMIN_IPV_4_POOL_CREATE, ROLE_SONATA_ADMIN_IPV_4_POOL_EDIT]
+        ROLE_SONATA_IPV_4_POOL_ADMIN: [ROLE_SONATA_IPV_4_POOL_EDITOR, ROLE_SONATA_ADMIN_IPV_4_POOL_DELETE, ROLE_SONATA_ADMIN_IPV_4_POOL_EXPORT]
+
+        # SUB_NET
+        ROLE_SONATA_SUB_NET_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_SUB_NET_LIST, ROLE_SONATA_ADMIN_SUB_NET_VIEW]
+        ROLE_SONATA_SUB_NET_EDITOR: [ROLE_SONATA_SUB_NET_READER, ROLE_SONATA_ADMIN_SUB_NET_CREATE, ROLE_SONATA_ADMIN_SUB_NET_EDIT]
+        ROLE_SONATA_SUB_NET_ADMIN: [ROLE_SONATA_SUB_NET_EDITOR, ROLE_SONATA_ADMIN_SUB_NET_DELETE, ROLE_SONATA_ADMIN_SUB_NET_EXPORT]
+
+        # DHCP
+        ROLE_SONATA_DHCP_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_DHCP_LIST, ROLE_SONATA_ADMIN_DHCP_VIEW]
+        ROLE_SONATA_DHCP_EDITOR: [ROLE_SONATA_DHCP_READER, ROLE_SONATA_ADMIN_DHCP_CREATE, ROLE_SONATA_ADMIN_DHCP_EDIT]
+        ROLE_SONATA_DHCP_ADMIN: [ROLE_SONATA_DHCP_EDITOR, ROLE_SONATA_ADMIN_DHCP_DELETE, ROLE_SONATA_ADMIN_DHCP_EXPORT]
+
+        # DHCP_MODEL
+        ROLE_SONATA_DHCP_MODEL_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_DHCP_MODEL_LIST, ROLE_SONATA_ADMIN_DHCP_MODEL_VIEW]
+        ROLE_SONATA_DHCP_MODEL_EDITOR: [ROLE_SONATA_DHCP_MODEL_READER, ROLE_SONATA_ADMIN_DHCP_MODEL_CREATE, ROLE_SONATA_ADMIN_DHCP_MODEL_EDIT]
+        ROLE_SONATA_DHCP_MODEL_ADMIN: [ROLE_SONATA_DHCP_MODEL_EDITOR, ROLE_SONATA_ADMIN_DHCP_MODEL_DELETE, ROLE_SONATA_ADMIN_DHCP_MODEL_EXPORT]
+
+        # WORKFLOW
+        ROLE_SONATA_WORKFLOW_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_WORKFLOW_LIST, ROLE_SONATA_ADMIN_WORKFLOW_VIEW]
+        ROLE_SONATA_WORKFLOW_EDITOR: [ROLE_SONATA_WORKFLOW_READER, ROLE_SONATA_ADMIN_WORKFLOW_CREATE, ROLE_SONATA_ADMIN_WORKFLOW_EDIT]
+        ROLE_SONATA_WORKFLOW_ADMIN: [ROLE_SONATA_WORKFLOW_EDITOR, ROLE_SONATA_ADMIN_WORKFLOW_DELETE, ROLE_SONATA_ADMIN_WORKFLOW_EXPORT]
+
+        # ACTION
+        ROLE_SONATA_ACTION_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_ACTION_LIST, ROLE_SONATA_ADMIN_ACTION_VIEW]
+        ROLE_SONATA_ACTION_EDITOR: [ROLE_SONATA_ACTION_READER, ROLE_SONATA_ADMIN_ACTION_CREATE, ROLE_SONATA_ADMIN_ACTION_EDIT]
+        ROLE_SONATA_ACTION_ADMIN: [ROLE_SONATA_ACTION_EDITOR, ROLE_SONATA_ADMIN_ACTION_DELETE, ROLE_SONATA_ADMIN_ACTION_EXPORT]
+
+        # TEMPLATE
+        ROLE_SONATA_TEMPLATE_READER: [ROLE_ADMIN, ROLE_SONATA_ADMIN_TEMPLATE_LIST, ROLE_SONATA_ADMIN_TEMPLATE_VIEW]
+        ROLE_SONATA_TEMPLATE_EDITOR: [ROLE_SONATA_TEMPLATE_READER, ROLE_SONATA_ADMIN_TEMPLATE_CREATE, ROLE_SONATA_ADMIN_TEMPLATE_EDIT]
+        ROLE_SONATA_TEMPLATE_ADMIN: [ROLE_SONATA_TEMPLATE_EDITOR, ROLE_SONATA_ADMIN_TEMPLATE_DELETE, ROLE_SONATA_ADMIN_TEMPLATE_EXPORT]
+
+        ROLE_ADMIN_TENANCIES: ROLE_ADMIN_TENANCIES
+        ROLE_ADMIN: [ROLE_USER, ROLE_SONATA_ADMIN]
+        ROLE_SUPER_ADMIN: [ROLE_ADMIN, ROLE_USER_CREATE, ROLE_ADMIN_TENANCIES, ROLE_ALLOWED_TO_SWITCH]

app/config/security.yml

@@ -1,15 +1,16 @@
+imports:
+    - { resource: roles.yml }
+
 security:
 
     providers:
         oauth:
             id: base_oauth_bundle.oauth_user_provider
 
-    role_hierarchy:
-        ROLE_ADMIN: [ROLE_USER, ROLE_ALLOWED_TO_SWITCH]
-        ROLE_SUPER_ADMIN: ROLE_ADMIN
-
     firewalls:
         dev:
+            context: ik_share
+            stateless: false
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
 

composer.json

@@ -143,7 +143,7 @@
         "hwi/oauth-bundle": "^0.5.3",
         "ik/audit-bundle": "v0.2.4",
         "ik/auth-bundle": "v0.2.4",
-        "ik/base-admin-bundle": "v0.2.4",
+        "ik/base-admin-bundle": "dev-master",
         "ik/device-bundle": "v0.2.4",
         "ik/extra-data-bundle": "v0.2.4",
         "ik/migrations-bundle": "v0.2.4",
@@ -237,4 +237,4 @@
         ],
         "branch-alias": null
     }
-}
+}

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": "c6e6c36bec834842c6a5627ab6d0f4d9",
+    "content-hash": "6359e2534faaee9cb776dac838dc934d",
     "packages": [
         {
             "name": "behat/transliterator",
@@ -1461,11 +1461,11 @@
         },
         {
             "name": "ik/base-admin-bundle",
-            "version": "v0.2.4",
+            "version": "dev-master",
             "source": {
                 "type": "git",
                 "url": "ssh://git@200.50.168.30:222/VendorSoftwareFlowdat3/BaseAdmin.git",
-                "reference": "807fa103f9a0e7d0e22f490de61e1d96645822bc"
+                "reference": "0456c67f0aca5150d7e3d0cdf6979044efd90781"
             },
             "type": "library",
             "autoload": {
@@ -1480,7 +1480,7 @@
                 "bootstrap",
                 "sonata"
             ],
-            "time": "2018-02-26T17:55:49+00:00"
+            "time": "2018-04-10T11:47:25+00:00"
         },
         {
             "name": "ik/device-bundle",
@@ -6274,6 +6274,7 @@
     "minimum-stability": "stable",
     "stability-flags": {
         "dwoo/dwoo": 20,
+        "ik/base-admin-bundle": 20,
         "sonata-project/admin-bundle": 20,
         "voryx/restgeneratorbundle": 20
     },

src/DHCPBundle/Resources/config/services.yml

@@ -1,5 +1,5 @@
 services:
-    dhcp.admin.dhcp:
+    sonata.admin.dhcp:
         class: DHCPBundle\Admin\DHCPAdmin
         arguments: [~, DHCPBundle\Entity\DHCP, BaseAdminBundle:CRUD]
         tags:
@@ -8,7 +8,7 @@ services:
             - [setTranslationDomain, [DHCPBundle]]
         public: true
 
-    dhcp.admin.dhcp_model:
+    sonata.admin.dhcp_model:
         class: DHCPBundle\Admin\DHCPModelAdmin
         arguments: [~, DHCPBundle\Entity\DHCPModel, BaseAdminBundle:CRUD]
         tags:

src/IPv4Bundle/Resources/config/services.yml

@@ -1,6 +1,6 @@
 services:
 
-    i_pv4.admin.host:
+    sonata.admin.host:
         class: IPv4Bundle\Admin\HostAdmin
         arguments: [~, IPv4Bundle\Entity\Host, BaseAdminBundle:CRUD]
         tags:
@@ -9,7 +9,7 @@ services:
             - [setTranslationDomain, [IPv4Bundle]]
         public: true
 
-    i_pv4.admin.host_type:
+    sonata.admin.host_type:
         class: IPv4Bundle\Admin\HostTypeAdmin
         arguments: [~, IPv4Bundle\Entity\HostType, BaseAdminBundle:CRUD]
         tags:
@@ -18,7 +18,7 @@ services:
             - [setTranslationDomain, [IPv4Bundle]]
         public: true
 
-    i_pv4.admin.net_group:
+    sonata.admin.net_group:
         class: IPv4Bundle\Admin\NetGroupAdmin
         arguments: [~, IPv4Bundle\Entity\NetGroup, BaseAdminBundle:CRUD]
         tags:
@@ -27,7 +27,7 @@ services:
             - [setTranslationDomain, [IPv4Bundle]]
         public: true
 
-    i_pv4.admin.pool:
+    sonata.admin.ipv_4.pool:
         class: IPv4Bundle\Admin\PoolAdmin
         arguments: [~, IPv4Bundle\Entity\Pool, BaseAdminBundle:CRUD]
         tags:
@@ -36,7 +36,7 @@ services:
             - [setTranslationDomain, [IPv4Bundle]]
         public: true
 
-    i_pv4.admin.sub_net:
+    sonata.admin.sub_net:
         class: IPv4Bundle\Admin\SubNetAdmin
         arguments: [~, IPv4Bundle\Entity\SubNet, BaseAdminBundle:CRUD]
         tags:
@@ -50,4 +50,3 @@ services:
        tags:
            - { name: kernel.event_listener, event: sonata.admin.event.configure.form, method: configureFormFields }
            - { name: kernel.event_listener, event: sonata.admin.event.configure.show, method: configureShowFields }
-