Removed HBAC deny rule warning.

The HBAC deny rule is no longer supported so it's no longer necessary
to show the warning.

Ticket #1444

8 files changed, 29 insertions, 115 deletions

diff --git a/install/ui/hbac.js b/install/ui/hbac.js
index fb57dd15..e05e43f6 100644
--- a/install/ui/hbac.js
+++ b/install/ui/hbac.js
@@ -554,47 +554,3 @@ IPA.hbacrule_details_facet = function(spec) {
 
     return that;
 };
-
-
-IPA.hbac_deny_warning_dialog = function(container) {
-    var dialog = IPA.dialog({
-        'title': 'HBAC Deny Rules found'
-    });
-
-    var link_path = "config";
-    if (IPA.use_static_files){
-        link_path = "html";
-    }
-
-    dialog.create = function() {
-        dialog.container.append(
-            "HBAC rules with type deny have been found."+
-                "  These rules have been deprecated." +
-                "  Please remove them, and restructure the HBAC rules." );
-        $('<p/>').append($('<a/>',{
-            text: 'Click here for more information',
-            href: '../' +link_path +'/hbac-deny-remove.html',
-            target: "_blank",
-            style: 'target: tab; color: blue; '
-        })).appendTo(dialog.container);
-    };
-
-    dialog.create_button({
-        name: 'edit',
-        label: 'Edit HBAC Rules',
-        click: function() {
-            dialog.close();
-            IPA.nav.show_page('hbacrule', 'search');
-        }
-    });
-
-    dialog.create_button({
-        name: 'ignore',
-        label: 'Ignore for now',
-        click: function() {
-            dialog.close();
-        }
-    });
-
-    dialog.open();
-};
diff --git a/install/ui/ipa.css b/install/ui/ipa.css
index 0652b375..86d3b9db 100644
--- a/install/ui/ipa.css
+++ b/install/ui/ipa.css
@@ -696,11 +696,6 @@ span.main-nav-off > a:visited {
     padding-left: 0.5em;
 }
 
-.hbac-deny-rule {
-    color: red;
-}
-
-
 .search-table tfoot td {
     padding: 0.5em 0 0 1em;
     border-top: 1px solid #dfdfdf;
diff --git a/install/ui/ipa.js b/install/ui/ipa.js
index 381f128c..15088f61 100644
--- a/install/ui/ipa.js
+++ b/install/ui/ipa.js
@@ -169,15 +169,6 @@ var IPA = ( function () {
             }
         }));
 
-        batch.add_command(IPA.command({
-            entity: 'hbacrule',
-            method: 'find',
-            options:{"accessruletype":"deny"},
-            on_success: function(data, text_status, xhr) {
-                that.hbac_deny_rules = data;
-            }
-        }));
-
         batch.execute();
     };
 
diff --git a/install/ui/test/bin/update_ipa_init.sh b/install/ui/test/bin/update_ipa_init.sh
index 2fc9c217..26cbc967 100755
--- a/install/ui/test/bin/update_ipa_init.sh
+++ b/install/ui/test/bin/update_ipa_init.sh
@@ -15,7 +15,30 @@ then
         exit 1
 fi
 
-
+json="{
+    \"method\": \"batch\",
+    \"params\": [
+        [
+            {
+                \"method\": \"i18n_messages\",
+                \"params\": [[], {}]
+            },
+            {
+                \"method\": \"user_find\",
+                \"params\":[[], { \"whoami\": true, \"all\": true }]
+            },
+            {
+                \"method\": \"env\",
+                \"params\": [[], {}]
+            },
+            {
+                \"method\": \"dns_is_enabled\",
+                \"params\": [[], {}]
+            }
+        ],
+        {}
+    ]
+}"
 
 curl -v\
  -H "Content-Type: application/json"\
@@ -24,6 +47,6 @@ curl -v\
  --delegation always\
  -u :\
  --cacert /etc/ipa/ca.crt\
- -d '{"method":"batch","params":[[{"method":"json_metadata","params":[[],{}]},{"method":"i18n_messages","params":[[],{}]},{"method":"user_find","params":[[],{"whoami":true,"all":true}]},{"method":"env","params":[[],{}]},{"method":"dns_is_enabled","params":[[],{}]},{"method":"hbacrule_find","params":[[],{"accessruletype":"deny"}]}],{}]}'\
+ -d "$json"\
  -X POST\
  https://`hostname`/ipa/json | sed 's/[ \t]*$//' >   $INIT_FILE
diff --git a/install/ui/test/data/hbacrule_find.json b/install/ui/test/data/hbacrule_find.json
index 3801a7d4..1775119c 100644
--- a/install/ui/test/data/hbacrule_find.json
+++ b/install/ui/test/data/hbacrule_find.json
@@ -2,7 +2,7 @@
     "error": null,
     "id": null,
     "result": {
-        "count": 4,
+        "count": 1,
         "result": [
             {
                 "accessruletype": [
@@ -30,45 +30,9 @@
                 "usercategory": [
                     "all"
                 ]
-            },
-            {
-                "accessruletype": [
-                    "deny"
-                ],
-                "cn": [
-                    "deny1"
-                ],
-                "dn": "ipauniqueid=8af3e23c-a7e2-11e0-b394-525400b55a47,cn=hbac,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
-                "ipaenabledflag": [
-                    "TRUE"
-                ]
-            },
-            {
-                "accessruletype": [
-                    "deny"
-                ],
-                "cn": [
-                    "deny2"
-                ],
-                "dn": "ipauniqueid=8f05d042-a7e2-11e0-b394-525400b55a47,cn=hbac,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
-                "ipaenabledflag": [
-                    "TRUE"
-                ]
-            },
-            {
-                "accessruletype": [
-                    "deny"
-                ],
-                "cn": [
-                    "deny3"
-                ],
-                "dn": "ipauniqueid=92dcf9fc-a7e2-11e0-8dac-525400b55a47,cn=hbac,dc=server15,dc=ayoung,dc=boston,dc=devel,dc=redhat,dc=com",
-                "ipaenabledflag": [
-                    "TRUE"
-                ]
             }
         ],
-        "summary": "4 HBAC rules matched",
+        "summary": "1 HBAC rule matched",
         "truncated": false
     }
 }
diff --git a/install/ui/test/data/hbacrule_show.json b/install/ui/test/data/hbacrule_show.json
index 2c0b64b3..293ed003 100644
--- a/install/ui/test/data/hbacrule_show.json
+++ b/install/ui/test/data/hbacrule_show.json
@@ -4,7 +4,7 @@
     "result": {
         "result": {
             "accessruletype": [
-                "deny"
+                "allow"
             ],
             "accesstime": [
                 "periodic daily 0800-1400",
diff --git a/install/ui/test/data/ipa_init.json b/install/ui/test/data/ipa_init.json
index 78b18ee1..dfd1fa68 100644
--- a/install/ui/test/data/ipa_init.json
+++ b/install/ui/test/data/ipa_init.json
@@ -2,7 +2,7 @@
     "error": null,
     "id": null,
     "result": {
-        "count": 5,
+        "count": 4,
         "results": [
             {
                 "error": null,
@@ -204,11 +204,9 @@
                         },
                         "hbacrule": {
                             "active": "Active",
-                            "allow": "Allow",
                             "any_host": "Any Host",
                             "any_service": "Any Service",
                             "anyone": "Anyone",
-                            "deny": "Deny",
                             "host": "Accessing",
                             "inactive": "Inactive",
                             "ipaenabledflag": "Rule status",
@@ -533,13 +531,6 @@
                 "result": true,
                 "summary": null,
                 "value": ""
-            },
-            {
-                "count": 0,
-                "error": null,
-                "result": [],
-                "summary": "0 HBAC rules matched",
-                "truncated": false
             }
         ]
     }
diff --git a/install/ui/webui.js b/install/ui/webui.js
index 189cddda..daa22b22 100644
--- a/install/ui/webui.js
+++ b/install/ui/webui.js
@@ -167,12 +167,6 @@ $(function() {
         IPA.nav.update();
 
         $('#login_header').html(IPA.messages.login.header);
-
-        if (IPA.hbac_deny_rules  && IPA.hbac_deny_rules.count > 0){
-            if (IPA.nav.name === 'admin'){
-                IPA.hbac_deny_warning_dialog();
-            }
-        }
     }