diff options
author | Endi Sukma Dewata <edewata@redhat.com> | 2011-12-07 10:34:15 -0600 |
---|---|---|
committer | Petr Vobornik <pvoborni@redhat.com> | 2011-12-09 15:55:02 +0100 |
commit | b70ebe5c9f718d184ae6a60931fdccf0e22b9c48 (patch) | |
tree | f1c7339c3939131750d053fa6b511ec777f5a996 | |
parent | a1c9e3618c9d0e03fc926031f2c65d92da7a8b03 (diff) | |
download | freeipa-b70ebe5c9f718d184ae6a60931fdccf0e22b9c48.tar.gz freeipa-b70ebe5c9f718d184ae6a60931fdccf0e22b9c48.tar.xz freeipa-b70ebe5c9f718d184ae6a60931fdccf0e22b9c48.zip |
Fixed matched/unmatched checkboxes in HBAC Test
The checkboxes in HBAC Test run page have been fixed to show/hide
matched or unmatched rules. The New Test button has been fixed to
deselect the inputs in all facets. The test data has been updated
as well.
Ticket #388
-rw-r--r-- | install/ui/facet.js | 15 | ||||
-rw-r--r-- | install/ui/hbactest.js | 87 | ||||
-rw-r--r-- | install/ui/test/data/hbacrule_find_pkeys.json | 122 | ||||
-rw-r--r-- | install/ui/test/data/hbacrule_get_records.json | 578 | ||||
-rw-r--r-- | install/ui/test/data/hbactest.json | 24 | ||||
-rw-r--r-- | install/ui/test/data/hbactest_matched.json | 408 | ||||
-rw-r--r-- | install/ui/test/data/hbactest_unmatched.json | 249 |
7 files changed, 1405 insertions, 78 deletions
diff --git a/install/ui/facet.js b/install/ui/facet.js index df5743b1c..e16ee6704 100644 --- a/install/ui/facet.js +++ b/install/ui/facet.js @@ -107,7 +107,7 @@ IPA.facet = function(spec) { that.load = function(data) { that.data = data; - that.header.load(data.result.result); + that.header.load(data); }; that.refresh = function() { @@ -367,6 +367,8 @@ IPA.facet_header = function(spec) { }; that.load = function(data) { + if (!data) return; + var result = data.result.result; if (!that.facet.disable_facet_tabs) { var pkey = that.facet.pkey; @@ -392,7 +394,7 @@ IPA.facet_header = function(spec) { var facet = facets[j]; var link = $('li[name='+facet.name+'] a', span); - var values = data ? data[facet.name] : null; + var values = result ? result[facet.name] : null; if (values) { link.text(facet.label+' ('+values.length+')'); } else { @@ -472,6 +474,13 @@ IPA.table_facet = function(spec) { that.load = function(data) { that.facet_load(data); + if (!data) { + that.table.empty(); + that.table.summary.text(''); + that.table.pagination_control.css('visibility', 'hidden'); + return; + } + that.table.current_page = 1; that.table.total_pages = 1; @@ -483,6 +492,8 @@ IPA.table_facet = function(spec) { that.table.current_page_input.val(that.table.current_page); that.table.total_pages_span.text(that.table.total_pages); + + that.table.pagination_control.css('visibility', 'visible'); }; diff --git a/install/ui/hbactest.js b/install/ui/hbactest.js index d9a854f11..916a23803 100644 --- a/install/ui/hbactest.js +++ b/install/ui/hbactest.js @@ -117,7 +117,6 @@ IPA.hbac.test_entity = function(spec) { label: IPA.messages.objects.hbactest.run_test, managed_entity_name: 'hbacrule', disable_breadcrumb: true, - pagination: true, facet_group: 'default', columns: [ 'cn', @@ -198,13 +197,6 @@ IPA.hbac.test_facet = function(spec) { }).appendTo(buttons); }; - that.find = function() { - var filter = that.filter.val(); - var state = {}; - state[that.entity.name+'-'+that.name+'-filter'] = filter; - IPA.nav.push_state(state); - }; - that.prev = function() { var facet_group = that.entity.get_facet_group('default'); var index = facet_group.get_facet_index(that.name); @@ -262,7 +254,6 @@ IPA.hbac.test_facet = function(spec) { } command.on_success = function(data, text_status, xhr) { - if (that.filter) that.filter.focus(); that.load(data); }; @@ -368,7 +359,7 @@ IPA.hbac.test_select_facet = function(spec) { td.append(' '); that.external_text = $('<input/>', { - name: 'external', + name: id, focus: function() { that.external_radio.click(); } @@ -381,6 +372,13 @@ IPA.hbac.test_select_facet = function(spec) { that.create_buttons(footer); }; + that.find = function() { + var filter = that.filter.val(); + var state = {}; + state[that.entity.name+'-'+that.name+'-filter'] = filter; + IPA.nav.push_state(state); + }; + that.get_selected_values = function() { var values = that.table.get_selected_values(); if (values && values.length) return values; @@ -393,8 +391,9 @@ IPA.hbac.test_select_facet = function(spec) { }; that.reset = function() { - that.table.set_values([]); + delete that.selected_values; if (that.external_radio) that.external_radio.attr('checked', false); + if (that.external_text) that.external_text.val(''); }; that.save = function(record) { @@ -475,9 +474,9 @@ IPA.hbac.test_rules_facet = function(spec) { }; that.reset = function() { - that.table.set_values([]); + delete that.selected_values; if (that.enabled) that.enabled.attr('checked', false); - if (that.disabled) that.enabled.attr('checked', false); + if (that.disabled) that.disabled.attr('checked', false); }; that.save = function(record) { @@ -505,6 +504,8 @@ IPA.hbac.test_run_facet = function(spec) { var init = function() { that.table.selectable = false; + that.show_matched = true; + that.show_unmatched = true; }; that.create_content = function(container) { @@ -547,10 +548,15 @@ IPA.hbac.test_run_facet = function(spec) { header.append(' '); - that.matched = $('<input/>', { + that.matched_checkbox = $('<input/>', { id: 'hbactest-rules-matched', type: 'checkbox', - name: 'matched' + name: 'matched', + checked: true, + change: function() { + that.show_matched = that.matched_checkbox.is(':checked'); + that.refresh(); + } }).appendTo(header); $('<label/>', { @@ -558,10 +564,15 @@ IPA.hbac.test_run_facet = function(spec) { text: IPA.messages.objects.hbactest.matched }).appendTo(header); - that.unmatched = $('<input/>', { + that.unmatched_checkbox = $('<input/>', { id: 'hbactest-rules-unmatched', type: 'checkbox', - name: 'disabled' + name: 'disabled', + checked: true, + change: function() { + that.show_unmatched = that.unmatched_checkbox.is(':checked'); + that.refresh(); + } }).appendTo(header); $('<label/>', { @@ -634,12 +645,26 @@ IPA.hbac.test_run_facet = function(spec) { }; that.reset = function() { - that.test_result.text(''); - that.table.empty(); - that.table.set_values([]); + delete that.data; + that.show_matched = true; + that.show_unmatched = true; + if (that.matched_checkbox) that.matched_checkbox.attr('checked', true); + if (that.unmatched_checkbox) that.unmatched_checkbox.attr('checked', true); + that.refresh(); }; that.refresh = function() { + if (that.data) { + var message = that.data.result.value ? + IPA.messages.objects.hbactest.access_granted : + IPA.messages.objects.hbactest.access_denied; + that.test_result.text(message); + + } else { + that.test_result.text(''); + } + + that.load(that.data); }; that.run = function() { @@ -666,12 +691,8 @@ IPA.hbac.test_run_facet = function(spec) { command.set_options(options); command.on_success = function(data, text_status, xhr) { - var message = data.result.value ? - IPA.messages.objects.hbactest.access_granted : - IPA.messages.objects.hbactest.access_denied; - that.test_result.text(message); - - that.load(data); + that.data = data; + that.refresh(); }; command.execute(); @@ -682,7 +703,7 @@ IPA.hbac.test_run_facet = function(spec) { that.matched = {}; var matched = data.result.matched; - if (matched) { + if (that.show_matched && matched) { for (var i=0; i<matched.length; i++) { var pkey = matched[i]; pkeys.push(pkey); @@ -691,7 +712,7 @@ IPA.hbac.test_run_facet = function(spec) { } var notmatched = data.result.notmatched; - if (notmatched) { + if (that.show_unmatched && notmatched) { for (i=0; i<notmatched.length; i++) { pkey = notmatched[i]; pkeys.push(pkey); @@ -702,6 +723,16 @@ IPA.hbac.test_run_facet = function(spec) { return pkeys; }; + that.get_records_command_name = function() { + if (that.show_matched && !that.show_unmatched) { + return 'hbactest_matched'; + } + if (!that.show_matched && that.show_unmatched) { + return 'hbactest_unmatched'; + } + return that.managed_entity_name+'_get_records'; + }; + that.load_records = function(records) { var pkey_name = that.table.entity.metadata.primary_key; that.table.empty(); diff --git a/install/ui/test/data/hbacrule_find_pkeys.json b/install/ui/test/data/hbacrule_find_pkeys.json index 9f3021b52..ae74c7de3 100644 --- a/install/ui/test/data/hbacrule_find_pkeys.json +++ b/install/ui/test/data/hbacrule_find_pkeys.json @@ -2,28 +2,136 @@ "error": null, "id": null, "result": { - "count": 3, + "count": 21, "result": [ { "cn": [ "allow_all" ], - "dn": "ipauniqueid=ca842a42-a445-11e0-87ff-525400b55a47,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "ipauniqueid=007ff62a-20fc-11e1-b5f6-000c29e9f1b6,cn=hbac,dc=example,dc=com" }, { "cn": [ - "rule1" + "rule01" ], - "dn": "ipauniqueid=4ed8b682-edf511df-b3f78f4b-11cc007b,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "ipauniqueid=ce568648-211c-11e1-8846-000c29e9f1b6,cn=hbac,dc=example,dc=com" }, { "cn": [ - "rule2" + "rule02" ], - "dn": "ipauniqueid=12e2e4ba-120d-11e1-bbf7-525400e135d8,cn=hbac,dc=dev,dc=example,dc=com" + "dn": "ipauniqueid=d0133224-211c-11e1-b881-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule03" + ], + "dn": "ipauniqueid=d21db45e-211c-11e1-bef8-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule04" + ], + "dn": "ipauniqueid=d4209604-211c-11e1-9192-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule05" + ], + "dn": "ipauniqueid=d59dba70-211c-11e1-9ce3-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule06" + ], + "dn": "ipauniqueid=d7d49c8c-211c-11e1-9192-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule07" + ], + "dn": "ipauniqueid=da048e36-211c-11e1-a6a9-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule08" + ], + "dn": "ipauniqueid=e15223c4-211c-11e1-b9de-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule09" + ], + "dn": "ipauniqueid=e324f8c0-211c-11e1-9eb4-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule10" + ], + "dn": "ipauniqueid=e5161178-211c-11e1-b2b4-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule11" + ], + "dn": "ipauniqueid=e70cf4c4-211c-11e1-bb9f-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule12" + ], + "dn": "ipauniqueid=f18be298-211c-11e1-b881-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule13" + ], + "dn": "ipauniqueid=f449a204-211c-11e1-aad4-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule14" + ], + "dn": "ipauniqueid=f792fd84-211c-11e1-9cac-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule15" + ], + "dn": "ipauniqueid=fef03790-211c-11e1-bd50-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule16" + ], + "dn": "ipauniqueid=015f362a-211d-11e1-8e68-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule17" + ], + "dn": "ipauniqueid=124d7690-211d-11e1-9ce3-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule18" + ], + "dn": "ipauniqueid=145e2d30-211d-11e1-b05c-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule19" + ], + "dn": "ipauniqueid=17685668-211d-11e1-bb9f-000c29e9f1b6,cn=hbac,dc=example,dc=com" + }, + { + "cn": [ + "rule20" + ], + "dn": "ipauniqueid=19537b06-211d-11e1-9569-000c29e9f1b6,cn=hbac,dc=example,dc=com" } ], - "summary": "3 HBAC rules matched", + "summary": "21 HBAC rules matched", "truncated": false } } diff --git a/install/ui/test/data/hbacrule_get_records.json b/install/ui/test/data/hbacrule_get_records.json index 743885de8..2ae32f52a 100644 --- a/install/ui/test/data/hbacrule_get_records.json +++ b/install/ui/test/data/hbacrule_get_records.json @@ -2,7 +2,7 @@ "error": null, "id": null, "result": { - "count": 3, + "count": 20, "results": [ { "error": null, @@ -16,13 +16,20 @@ "description": [ "Allow all users to access any host from any host" ], - "dn": "ipauniqueid=ca842a42-a445-11e0-87ff-525400b55a47,cn=hbac,dc=dev,dc=example,dc=com", + "dn": "ipauniqueid=007ff62a-20fc-11e1-b5f6-000c29e9f1b6,cn=hbac,dc=example,dc=com", "hostcategory": [ "all" ], "ipaenabledflag": [ "TRUE" ], + "ipauniqueid": [ + "007ff62a-20fc-11e1-b5f6-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], "servicecategory": [ "all" ], @@ -43,44 +50,70 @@ "allow" ], "cn": [ - "rule1" + "rule01" ], - "description": [ - "Test Rule" + "dn": "ipauniqueid=ce568648-211c-11e1-8846-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" ], - "dn": "ipauniqueid=4ed8b682-edf511df-b3f78f4b-11cc007b,cn=hbac,dc=dev,dc=example,dc=com", "ipaenabledflag": [ "TRUE" ], - "memberhost_host": [ - "dev.example.com" + "ipauniqueid": [ + "ce568648-211c-11e1-8846-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule01" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule02" ], - "memberhost_hostgroup": [ - "production" + "dn": "ipauniqueid=d0133224-211c-11e1-b881-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" ], - "memberservice_hbacsvc": [ - "ftp", - "sshd" + "ipaenabledflag": [ + "TRUE" ], - "memberservice_hbacsvcgroup": [ - "sudo" + "ipauniqueid": [ + "d0133224-211c-11e1-b881-000c29e9f1b6" ], - "memberuser_group": [ - "editors" + "objectclass": [ + "ipaassociation", + "ipahbacrule" ], - "memberuser_user": [ - "admin", - "test" + "servicecategory": [ + "all" ], - "sourcehost_host": [ - "dev.example.com" + "sourcehostcategory": [ + "all" ], - "sourcehost_hostgroup": [ - "staging" + "usercategory": [ + "all" ] }, "summary": null, - "value": "rule1" + "value": "rule02" }, { "error": null, @@ -89,33 +122,502 @@ "allow" ], "cn": [ - "rule2" + "rule03" ], - "description": [ - "Test Rule" + "dn": "ipauniqueid=d21db45e-211c-11e1-bef8-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d21db45e-211c-11e1-bef8-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule03" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule04" + ], + "dn": "ipauniqueid=d4209604-211c-11e1-9192-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" ], - "dn": "ipauniqueid=12e2e4ba-120d-11e1-bbf7-525400e135d8,cn=hbac,dc=dev,dc=example,dc=com", "ipaenabledflag": [ "FALSE" ], - "memberhost_host": [ - "test.example.com" + "ipauniqueid": [ + "d4209604-211c-11e1-9192-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule04" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule05" + ], + "dn": "ipauniqueid=d59dba70-211c-11e1-9ce3-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d59dba70-211c-11e1-9ce3-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" ], - "memberhost_hostgroup": [ - "staging" + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule05" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule06" + ], + "dn": "ipauniqueid=d7d49c8c-211c-11e1-9192-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d7d49c8c-211c-11e1-9192-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule06" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule07" + ], + "dn": "ipauniqueid=da048e36-211c-11e1-a6a9-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "da048e36-211c-11e1-a6a9-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule07" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule08" + ], + "dn": "ipauniqueid=e15223c4-211c-11e1-b9de-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" ], - "memberuser_group": [ - "ipausers" + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e15223c4-211c-11e1-b9de-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" ], "servicecategory": [ "all" ], - "sourcehost_host": [ - "test.example.com" + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule08" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule09" + ], + "dn": "ipauniqueid=e324f8c0-211c-11e1-9eb4-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e324f8c0-211c-11e1-9eb4-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule09" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule10" + ], + "dn": "ipauniqueid=e5161178-211c-11e1-b2b4-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e5161178-211c-11e1-b2b4-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule10" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule11" + ], + "dn": "ipauniqueid=e70cf4c4-211c-11e1-bb9f-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e70cf4c4-211c-11e1-bb9f-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule11" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule12" + ], + "dn": "ipauniqueid=f18be298-211c-11e1-b881-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "f18be298-211c-11e1-b881-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule12" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule13" + ], + "dn": "ipauniqueid=f449a204-211c-11e1-aad4-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "f449a204-211c-11e1-aad4-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule13" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule14" + ], + "dn": "ipauniqueid=f792fd84-211c-11e1-9cac-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "f792fd84-211c-11e1-9cac-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule14" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule15" + ], + "dn": "ipauniqueid=fef03790-211c-11e1-bd50-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "fef03790-211c-11e1-bd50-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule15" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule16" + ], + "dn": "ipauniqueid=015f362a-211d-11e1-8e68-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "FALSE" + ], + "ipauniqueid": [ + "015f362a-211d-11e1-8e68-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule16" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule17" + ], + "dn": "ipauniqueid=124d7690-211d-11e1-9ce3-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "FALSE" + ], + "ipauniqueid": [ + "124d7690-211d-11e1-9ce3-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule17" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule18" + ], + "dn": "ipauniqueid=145e2d30-211d-11e1-b05c-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "145e2d30-211d-11e1-b05c-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule18" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule19" + ], + "dn": "ipauniqueid=17685668-211d-11e1-bb9f-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "17685668-211d-11e1-bb9f-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" ] }, "summary": null, - "value": "rule2" + "value": "rule19" } ] } diff --git a/install/ui/test/data/hbactest.json b/install/ui/test/data/hbactest.json index 38565eebf..7a71dfefa 100644 --- a/install/ui/test/data/hbactest.json +++ b/install/ui/test/data/hbactest.json @@ -5,12 +5,30 @@ "error": null, "matched": [ "allow_all", - "rule1" + "rule01", + "rule02", + "rule03", + "rule04", + "rule05", + "rule06", + "rule07", + "rule08", + "rule09", + "rule10" ], "notmatched": [ - "rule2" + "rule11", + "rule12", + "rule13", + "rule14", + "rule15", + "rule16", + "rule17", + "rule18", + "rule19", + "rule20" ], "summary": "Access granted: True", "value": true } -}
\ No newline at end of file +} diff --git a/install/ui/test/data/hbactest_matched.json b/install/ui/test/data/hbactest_matched.json new file mode 100644 index 000000000..f83481eef --- /dev/null +++ b/install/ui/test/data/hbactest_matched.json @@ -0,0 +1,408 @@ +{ + "error": null, + "id": null, + "result": { + "count": 11, + "results": [ + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "allow_all" + ], + "description": [ + "Allow all users to access any host from any host" + ], + "dn": "ipauniqueid=007ff62a-20fc-11e1-b5f6-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "007ff62a-20fc-11e1-b5f6-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "allow_all" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule01" + ], + "dn": "ipauniqueid=ce568648-211c-11e1-8846-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "ce568648-211c-11e1-8846-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule01" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule02" + ], + "dn": "ipauniqueid=d0133224-211c-11e1-b881-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d0133224-211c-11e1-b881-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule02" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule03" + ], + "dn": "ipauniqueid=d21db45e-211c-11e1-bef8-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d21db45e-211c-11e1-bef8-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule03" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule04" + ], + "dn": "ipauniqueid=d4209604-211c-11e1-9192-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "FALSE" + ], + "ipauniqueid": [ + "d4209604-211c-11e1-9192-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule04" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule05" + ], + "dn": "ipauniqueid=d59dba70-211c-11e1-9ce3-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d59dba70-211c-11e1-9ce3-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule05" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule06" + ], + "dn": "ipauniqueid=d7d49c8c-211c-11e1-9192-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "d7d49c8c-211c-11e1-9192-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule06" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule07" + ], + "dn": "ipauniqueid=da048e36-211c-11e1-a6a9-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "da048e36-211c-11e1-a6a9-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule07" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule08" + ], + "dn": "ipauniqueid=e15223c4-211c-11e1-b9de-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e15223c4-211c-11e1-b9de-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule08" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule09" + ], + "dn": "ipauniqueid=e324f8c0-211c-11e1-9eb4-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e324f8c0-211c-11e1-9eb4-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule09" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule10" + ], + "dn": "ipauniqueid=e5161178-211c-11e1-b2b4-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "hostcategory": [ + "all" + ], + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e5161178-211c-11e1-b2b4-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ], + "servicecategory": [ + "all" + ], + "sourcehostcategory": [ + "all" + ], + "usercategory": [ + "all" + ] + }, + "summary": null, + "value": "rule10" + } + ] + } +} diff --git a/install/ui/test/data/hbactest_unmatched.json b/install/ui/test/data/hbactest_unmatched.json new file mode 100644 index 000000000..1086cd72c --- /dev/null +++ b/install/ui/test/data/hbactest_unmatched.json @@ -0,0 +1,249 @@ +{ + "error": null, + "id": null, + "result": { + "count": 10, + "results": [ + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule11" + ], + "dn": "ipauniqueid=e70cf4c4-211c-11e1-bb9f-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "e70cf4c4-211c-11e1-bb9f-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule11" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule12" + ], + "dn": "ipauniqueid=f18be298-211c-11e1-b881-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "f18be298-211c-11e1-b881-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule12" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule13" + ], + "dn": "ipauniqueid=f449a204-211c-11e1-aad4-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "f449a204-211c-11e1-aad4-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule13" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule14" + ], + "dn": "ipauniqueid=f792fd84-211c-11e1-9cac-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "f792fd84-211c-11e1-9cac-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule14" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule15" + ], + "dn": "ipauniqueid=fef03790-211c-11e1-bd50-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "fef03790-211c-11e1-bd50-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule15" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule16" + ], + "dn": "ipauniqueid=015f362a-211d-11e1-8e68-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "FALSE" + ], + "ipauniqueid": [ + "015f362a-211d-11e1-8e68-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule16" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule17" + ], + "dn": "ipauniqueid=124d7690-211d-11e1-9ce3-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "FALSE" + ], + "ipauniqueid": [ + "124d7690-211d-11e1-9ce3-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule17" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule18" + ], + "dn": "ipauniqueid=145e2d30-211d-11e1-b05c-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "145e2d30-211d-11e1-b05c-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule18" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule19" + ], + "dn": "ipauniqueid=17685668-211d-11e1-bb9f-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "TRUE" + ], + "ipauniqueid": [ + "17685668-211d-11e1-bb9f-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule19" + }, + { + "error": null, + "result": { + "accessruletype": [ + "allow" + ], + "cn": [ + "rule20" + ], + "dn": "ipauniqueid=19537b06-211d-11e1-9569-000c29e9f1b6,cn=hbac,dc=example,dc=com", + "ipaenabledflag": [ + "FALSE" + ], + "ipauniqueid": [ + "19537b06-211d-11e1-9569-000c29e9f1b6" + ], + "objectclass": [ + "ipaassociation", + "ipahbacrule" + ] + }, + "summary": null, + "value": "rule20" + } + ] + } +} |