diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2011-10-24 18:18:10 -0500 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2011-10-26 12:53:28 +0000 |
| commit | f168afbeb6e88e6ba66d7472529c35ed78dc6bc0 (patch) | |
| tree | ebadbb98c5c688c9c7bb00f81598868fb7678057 /install/ui/test | |
| parent | 0450934e366c37d01fe84a2c23ed196bf8dd6f89 (diff) | |
| download | freeipa.git-f168afbeb6e88e6ba66d7472529c35ed78dc6bc0.tar.gz freeipa.git-f168afbeb6e88e6ba66d7472529c35ed78dc6bc0.tar.xz freeipa.git-f168afbeb6e88e6ba66d7472529c35ed78dc6bc0.zip | |
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
Diffstat (limited to 'install/ui/test')
| -rwxr-xr-x | install/ui/test/bin/update_ipa_init.sh | 27 | ||||
| -rw-r--r-- | install/ui/test/data/hbacrule_find.json | 40 | ||||
| -rw-r--r-- | install/ui/test/data/hbacrule_show.json | 2 | ||||
| -rw-r--r-- | install/ui/test/data/ipa_init.json | 11 |
4 files changed, 29 insertions, 51 deletions
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 } ] } |