diff options
| -rw-r--r-- | install/static/host.js | 105 | ||||
| -rw-r--r-- | install/static/ipa.js | 17 | ||||
| -rw-r--r-- | install/static/test/data/host_disable_dev.example.com.json | 9 | ||||
| -rw-r--r-- | install/static/test/data/host_find.json | 86 | ||||
| -rw-r--r-- | install/static/test/data/host_mod.json | 75 | ||||
| -rw-r--r-- | install/static/test/data/host_show.json | 68 | ||||
| -rw-r--r-- | install/static/test/data/host_show_dev.example.com.json | 98 | ||||
| -rw-r--r-- | install/static/test/data/host_show_test.example.com.json | 77 | ||||
| -rw-r--r-- | install/static/test/data/ipa_init.json (renamed from install/static/test/data/batch.json) | 0 |
9 files changed, 421 insertions, 114 deletions
diff --git a/install/static/host.js b/install/static/host.js index 93a4c2731..37222337a 100644 --- a/install/static/host.js +++ b/install/static/host.js @@ -1,5 +1,6 @@ /* Authors: * Pavel Zuna <pzuna@redhat.com> + * Endi S. Dewata <edewata@redhat.com> * * Copyright (C) 2010 Red Hat * see file 'COPYING' for use and warranty information @@ -119,51 +120,77 @@ function ipa_host_details_facet(spec) { that.init = function() { var section = ipa_details_list_section({ - name: 'details', - label: 'Host Details' + 'name': 'details', + 'label': 'Host Details' }); that.add_section(section); section.create_field({ - name: 'fqdn', - label: 'Fully Qualified Domain Name' + 'name': 'fqdn', + 'label': 'Fully Qualified Domain Name' }); section.create_field({ - name: 'krbprincipalname', - label: 'Kerberos Principal' + 'name': 'krbprincipalname', + 'label': 'Kerberos Principal' }); section.create_field({ - name: 'serverhostname', - label: 'Server Host Name' + 'name': 'serverhostname', + 'label': 'Server Host Name' }); section = ipa_details_list_section({ - name: 'enrollment', - label: 'Enrollment' + 'name': 'enrollment', + 'label': 'Enrollment' }); that.add_section(section); section.add_field(host_provisioning_status_widget({ - name: 'provisioning_status', - label: 'Status' + 'name': 'provisioning_status', + 'label': 'Status', + 'facet': that })); section = ipa_details_list_section({ - name:'certificate', - label:'Host Certificate' + 'name': 'certificate', + 'label': 'Host Certificate' }); that.add_section(section); section.add_field(host_certificate_status_widget({ - name: 'certificate_status', - label: 'Status' + 'name': 'certificate_status', + 'label': 'Status' })); that.details_facet_init(); }; + that.refresh = function() { + + var pkey = $.bbq.getState(that.entity_name + '-pkey', true) || ''; + + var command = ipa_command({ + 'name': that.entity_name+'_show_'+pkey, + 'method': that.entity_name+'_show', + 'args': [pkey], + 'options': { 'all': true, 'rights': true } + }); + + command.on_success = function(data, text_status, xhr) { + that.load(data.result.result); + }; + + command.on_error = function(xhr, text_status, error_thrown) { + var details = $('.details', that.container).empty(); + details.append('<p>Error: '+error_thrown.name+'</p>'); + details.append('<p>'+error_thrown.title+'</p>'); + details.append('<p>'+error_thrown.message+'</p>'); + }; + + command.execute(); + }; + return that; } @@ -173,6 +200,8 @@ function host_provisioning_status_widget(spec) { var that = ipa_widget(spec); + that.facet = spec.facet; + that.create = function(container) { that.widget_create(container); @@ -241,7 +270,7 @@ function host_provisioning_status_widget(spec) { var button = $('input[name=unprovision]', that.container); that.unprovision_button = ipa_button({ 'label': 'Delete Key, Unprovision', - 'click': that.unprovision + 'click': that.show_unprovision_dialog }); button.replaceWith(that.unprovision_button); @@ -257,7 +286,7 @@ function host_provisioning_status_widget(spec) { that.enroll_button = button; }; - that.unprovision = function() { + that.show_unprovision_dialog = function() { var label = IPA.metadata[that.entity_name].label; var dialog = ipa_dialog({ @@ -271,8 +300,7 @@ function host_provisioning_status_widget(spec) { }; dialog.add_button('Unprovision', function() { - var pkey = that.result['fqdn'][0]; - ipa_cmd(that.entity_name+'_disable', [pkey], {}, + that.unprovision( function(data, text_status, xhr) { set_status('missing'); dialog.close(); @@ -294,9 +322,42 @@ function host_provisioning_status_widget(spec) { return false; }; + that.unprovision = function(on_success, on_error) { + + var pkey = that.facet.get_primary_key(); + + var command = ipa_command({ + 'name': that.entity_name+'_disable_'+pkey, + 'method': that.entity_name+'_disable', + 'args': [pkey], + 'options': { 'all': true, 'rights': true }, + 'on_success': on_success, + 'on_error': on_error + }); + + command.execute(); + }; + that.set_otp = function() { - // TODO: enroll via OTP - alert(that.otp.val()); + + var pkey = that.facet.get_primary_key(); + var otp = that.otp_input.val(); + that.otp_input.val(''); + + var command = ipa_command({ + 'method': that.entity_name+'_mod', + 'args': [pkey], + 'options': { + 'all': true, + 'rights': true, + 'userpassword': otp + }, + 'on_success': function(data, text_status, xhr) { + alert('One-Time-Password has been set.'); + } + }); + + command.execute(); }; that.load = function(result) { diff --git a/install/static/ipa.js b/install/static/ipa.js index d3ee89b41..6167b9f42 100644 --- a/install/static/ipa.js +++ b/install/static/ipa.js @@ -96,7 +96,9 @@ var IPA = ( function () { on_success(data, text_status, xhr); } }, - on_error + on_error, + null, + 'ipa_init' ); }; @@ -144,6 +146,7 @@ function ipa_command(spec) { var that = {}; + that.name = spec.name; that.method = spec.method; that.args = $.merge([], spec.args || []); @@ -170,7 +173,9 @@ function ipa_command(spec) { that.args, that.options, that.on_success, - that.on_error + that.on_error, + null, + that.name ); }; @@ -277,7 +282,7 @@ function ipa_batch_command(spec) { * win_callback - function to call if the JSON request succeeds * fail_callback - function to call if the JSON request fails * objname - name of an IPA object (optional) */ -function ipa_cmd(name, args, options, win_callback, fail_callback, objname) +function ipa_cmd(name, args, options, win_callback, fail_callback, objname, command_name) { var default_json_url = '/ipa/json'; @@ -385,7 +390,11 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname) var url = IPA.json_url; if (IPA.use_static_files){ - url += '/' + method_name + '.json'; + if (command_name) { + url += '/' + command_name + '.json'; + } else { + url += '/' + method_name + '.json'; + } } var data = { method: method_name, diff --git a/install/static/test/data/host_disable_dev.example.com.json b/install/static/test/data/host_disable_dev.example.com.json new file mode 100644 index 000000000..06f5aaa99 --- /dev/null +++ b/install/static/test/data/host_disable_dev.example.com.json @@ -0,0 +1,9 @@ +{ + "error": null, + "id": 0, + "result": { + "result": true, + "summary": "Removed kerberos key from \"dev.example.com\"", + "value": "dev.example.com" + } +} diff --git a/install/static/test/data/host_find.json b/install/static/test/data/host_find.json index 83a65d1b7..48b1fcb89 100644 --- a/install/static/test/data/host_find.json +++ b/install/static/test/data/host_find.json @@ -5,41 +5,87 @@ "count": 2, "result": [ { - "dn": "fqdn=vm-121.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", - "enrolledby": [], + "cn": [ + "dev.example.com" + ], + "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", "fqdn": [ - "vm-121.idm.lab.bos.redhat.com" + "dev.example.com" + ], + "ipauniqueid": [ + "fc6a6d5a-f388-11df-9c01-00163e72f2d9" + ], + "krbextradata": [ + { + "__base64__": "AAL+5+VMYWRtaW4vYWRtaW5AREVWLkVYQU1QTEUuQ09NAA==" + }, + { + "__base64__": "AAgBAA==" + } + ], + "krblastpwdchange": [ + "20101119025910Z" + ], + "krbpasswordexpiration": [ + "19700101000000Z" ], "krbprincipalname": [ - "host/vm-121.idm.lab.bos.redhat.com@IDM.LAB.BOS.REDHAT.COM" + "host/dev.example.com@DEV.EXAMPLE.COM" + ], + "krbticketflags": [ + "0" ], - "memberof": [] + "managedby": [ + "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + ], + "objectclass": [ + "top", + "ipaobject", + "nshost", + "ipahost", + "ipaservice", + "pkiuser", + "krbprincipalaux", + "krbprincipal", + "krbticketpolicyaux" + ], + "serverhostname": [ + "dev" + ] }, { - "description": [ - "sample host" + "cn": [ + "test.example.com" ], - "dn": "fqdn=ayounghost1.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", - "enrolledby": [], + "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", "fqdn": [ - "ayounghost1.idm.lab.bos.redhat.com" + "test.example.com" ], - "l": [ - "VM-lab" + "ipauniqueid": [ + "ac28dca0-f3b5-11df-879f-00163e72f2d9" + ], + "krbprincipalname": [ + "host/test.example.com@DEV.EXAMPLE.COM" ], - "memberof": [], - "nshardwareplatform": [ - "kvm" + "managedby": [ + "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" ], - "nshostlocation": [ - "VM-lab" + "objectclass": [ + "ipaobject", + "nshost", + "ipahost", + "pkiuser", + "ipaservice", + "krbprincipalaux", + "krbprincipal", + "top" ], - "nsosversion": [ - "F13" + "serverhostname": [ + "test" ] } ], "summary": "2 hosts matched", "truncated": false } -}
\ No newline at end of file +} diff --git a/install/static/test/data/host_mod.json b/install/static/test/data/host_mod.json new file mode 100644 index 000000000..3cb7d9ec5 --- /dev/null +++ b/install/static/test/data/host_mod.json @@ -0,0 +1,75 @@ +{ + "error": null, + "id": 0, + "result": { + "result": { + "attributelevelrights": { + "aci": "rscwo", + "cn": "rscwo", + "description": "rscwo", + "enrolledby": "rsc", + "fqdn": "rscwo", + "ipaclientversion": "rscwo", + "ipauniqueid": "rsc", + "krbcanonicalname": "rscwo", + "krbextradata": "rscwo", + "krblastfailedauth": "rscwo", + "krblastpwdchange": "rscwo", + "krblastsuccessfulauth": "rscwo", + "krbloginfailedcount": "rscwo", + "krbobjectreferences": "rscwo", + "krbpasswordexpiration": "rscwo", + "krbprincipalaliases": "rscwo", + "krbprincipalexpiration": "rscwo", + "krbprincipalkey": "wo", + "krbprincipalname": "rscwo", + "krbprincipaltype": "rscwo", + "krbpwdhistory": "rscwo", + "krbpwdpolicyreference": "rscwo", + "krbticketpolicyreference": "rscwo", + "krbupenabled": "rscwo", + "l": "rscwo", + "managedby": "rscwo", + "memberof": "rsc", + "nsaccountlock": "rscwo", + "nshardwareplatform": "rscwo", + "nshostlocation": "rscwo", + "nsosversion": "rscwo", + "objectclass": "rscwo", + "serverhostname": "rsc", + "usercertificate": "rscwo", + "userpassword": "wo" + }, + "cn": [ + "test.example.com" + ], + "fqdn": [ + "test.example.com" + ], + "ipauniqueid": [ + "ac28dca0-f3b5-11df-879f-00163e72f2d9" + ], + "krbprincipalname": [ + "host/test.example.com@DEV.EXAMPLE.COM" + ], + "managedby": [ + "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + ], + "objectclass": [ + "ipaobject", + "nshost", + "ipahost", + "pkiuser", + "ipaservice", + "krbprincipalaux", + "krbprincipal", + "top" + ], + "serverhostname": [ + "test" + ] + }, + "summary": "Modified host \"test.example.com\"", + "value": "test.example.com" + } +} diff --git a/install/static/test/data/host_show.json b/install/static/test/data/host_show.json deleted file mode 100644 index b0916215a..000000000 --- a/install/static/test/data/host_show.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "error": null, - "id": 0, - "result": { - "result": { - "cn": [ - "vm-121.idm.lab.bos.redhat.com" - ], - "dn": "fqdn=vm-121.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com", - "enrolledby": [], - "fqdn": [ - "vm-121.idm.lab.bos.redhat.com" - ], - "ipauniqueid": [ - "b54b73a8-8ba8-11df-80bc-00163e26b89e" - ], - "issuer": "CN=IPA Test Certificate Authority", - "krbextradata": [ - { - "__base64__": "AAKOoTdMYWRtaW4vYWRtaW5ASURNLkxBQi5CT1MuUkVESEFULkNPTQA=" - } - ], - "krblastpwdchange": [ - "20100709222414Z" - ], - "krbpasswordexpiration": [ - "19700101000000Z" - ], - "krbprincipalname": [ - "host/vm-121.idm.lab.bos.redhat.com@IDM.LAB.BOS.REDHAT.COM" - ], - "krbticketflags": [ - "0" - ], - "managedby": [ - "fqdn=vm-121.idm.lab.bos.redhat.com,cn=computers,cn=accounts,dc=idm,dc=lab,dc=bos,dc=redhat,dc=com" - ], - "md5_fingerprint": "08:86:a9:f9:87:af:0d:d7:42:01:e0:5f:12:9b:32:7f", - "memberof": [], - "objectclass": [ - "top", - "ipaobject", - "nshost", - "ipahost", - "ipaservice", - "pkiuser", - "krbprincipalaux", - "krbprincipal", - "krbticketpolicyaux" - ], - "serial_number": "1", - "serverhostname": [ - "vm-121" - ], - "sha1_fingerprint": "b8:4c:4b:79:4f:13:03:79:47:08:fa:6b:52:63:3d:f9:15:8e:7e:dc", - "subject": "CN=dev.example.com,O=IPA", - "usercertificate": [ - { - "__base64__": "MIICAjCCAWugAwIBAgICBAswDQYJKoZIhvcNAQEFBQAwKTEnMCUGA1UEAxMeSVBBIFRlc3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MB4XDTEwMTAwNzIzMzk0NFoXDTE1MTAwNzIzMzk0NFowKDEMMAoGA1UECgwDSVBBMRgwFgYDVQQDDA9kZXYuZXhhbXBsZS5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAOTXyj8grVB7Rj95RFawgdwn9OYZ03LWHZ+HMYggu2/xCCrUrdThP14YBlVqZumjVJSclj6T4ACjjdPJq9JTTmx7gMizDTReus7IPlS6fCxb5v5whQJZsEksXL04OxUMl25euPRFkYcTK1rdW47+AkG10j1qeNW+B6CpdQGR6eM/AgMBAAGjOjA4MBEGCWCGSAGG+EIBAQQEAwIGQDATBgNVHSUEDDAKBggrBgEFBQcDATAOBgNVHQ8BAf8EBAMCBPAwDQYJKoZIhvcNAQEFBQADgYEASIhq723VL5xP0q51MYXFlGU1boD7pPD1pIQspD/MjCIEupcbH2kAo4wf+EiKsXR0rs+WZkaSgvFqaM4OQ2kWSFTiqmFXFDBEi6EFr68yLg7IpQpNTzVBXERd8B4GwNL9wrRw60jPXlUK29DPBsdGq8fDgX18l39wKkWXv7p1to4=" - } - ], - "valid_not_after": "Tue Oct 13 01:59:32 2015 UTC", - "valid_not_before": "Wed Oct 13 01:59:32 2010 UTC" - }, - "summary": null, - "value": "vm-121.idm.lab.bos.redhat.com" - } -} diff --git a/install/static/test/data/host_show_dev.example.com.json b/install/static/test/data/host_show_dev.example.com.json new file mode 100644 index 000000000..d3e54fc84 --- /dev/null +++ b/install/static/test/data/host_show_dev.example.com.json @@ -0,0 +1,98 @@ +{ + "error": null, + "id": 0, + "result": { + "result": { + "attributelevelrights": { + "aci": "rscwo", + "cn": "rscwo", + "description": "rscwo", + "enrolledby": "rsc", + "fqdn": "rscwo", + "ipaclientversion": "rscwo", + "ipauniqueid": "rsc", + "krbcanonicalname": "rscwo", + "krbextradata": "rscwo", + "krblastfailedauth": "rscwo", + "krblastpwdchange": "rscwo", + "krblastsuccessfulauth": "rscwo", + "krbloginfailedcount": "rscwo", + "krbmaxrenewableage": "rscwo", + "krbmaxticketlife": "rscwo", + "krbobjectreferences": "rscwo", + "krbpasswordexpiration": "rscwo", + "krbprincipalaliases": "rscwo", + "krbprincipalexpiration": "rscwo", + "krbprincipalkey": "wo", + "krbprincipalname": "rscwo", + "krbprincipaltype": "rscwo", + "krbpwdhistory": "rscwo", + "krbpwdpolicyreference": "rscwo", + "krbticketflags": "rscwo", + "krbticketpolicyreference": "rscwo", + "krbupenabled": "rscwo", + "l": "rscwo", + "managedby": "rscwo", + "memberof": "rsc", + "nsaccountlock": "rscwo", + "nshardwareplatform": "rscwo", + "nshostlocation": "rscwo", + "nsosversion": "rscwo", + "objectclass": "rscwo", + "serverhostname": "rsc", + "usercertificate": "rscwo", + "userpassword": "wo" + }, + "cn": [ + "dev.example.com" + ], + "dn": "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "fqdn": [ + "dev.example.com" + ], + "has_keytab": true, + "ipauniqueid": [ + "fc6a6d5a-f388-11df-9c01-00163e72f2d9" + ], + "krbextradata": [ + { + "__base64__": "AAL+5+VMYWRtaW4vYWRtaW5AREVWLkVYQU1QTEUuQ09NAA==" + }, + { + "__base64__": "AAgBAA==" + } + ], + "krblastpwdchange": [ + "20101119025910Z" + ], + "krbpasswordexpiration": [ + "19700101000000Z" + ], + "krbprincipalname": [ + "host/dev.example.com@DEV.EXAMPLE.COM" + ], + "krbticketflags": [ + "0" + ], + "managedby": [ + "fqdn=dev.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + ], + "objectclass": [ + "top", + "ipaobject", + "nshost", + "ipahost", + "ipaservice", + "pkiuser", + "krbprincipalaux", + "krbprincipal", + "krbticketpolicyaux" + ], + "serverhostname": [ + "dev" + ] + }, + "summary": null, + "value": "dev.example.com" + } +} diff --git a/install/static/test/data/host_show_test.example.com.json b/install/static/test/data/host_show_test.example.com.json new file mode 100644 index 000000000..b858970e4 --- /dev/null +++ b/install/static/test/data/host_show_test.example.com.json @@ -0,0 +1,77 @@ +{ + "error": null, + "id": 0, + "result": { + "result": { + "attributelevelrights": { + "aci": "rscwo", + "cn": "rscwo", + "description": "rscwo", + "enrolledby": "rsc", + "fqdn": "rscwo", + "ipaclientversion": "rscwo", + "ipauniqueid": "rsc", + "krbcanonicalname": "rscwo", + "krbextradata": "rscwo", + "krblastfailedauth": "rscwo", + "krblastpwdchange": "rscwo", + "krblastsuccessfulauth": "rscwo", + "krbloginfailedcount": "rscwo", + "krbobjectreferences": "rscwo", + "krbpasswordexpiration": "rscwo", + "krbprincipalaliases": "rscwo", + "krbprincipalexpiration": "rscwo", + "krbprincipalkey": "wo", + "krbprincipalname": "rscwo", + "krbprincipaltype": "rscwo", + "krbpwdhistory": "rscwo", + "krbpwdpolicyreference": "rscwo", + "krbticketpolicyreference": "rscwo", + "krbupenabled": "rscwo", + "l": "rscwo", + "managedby": "rscwo", + "memberof": "rsc", + "nsaccountlock": "rscwo", + "nshardwareplatform": "rscwo", + "nshostlocation": "rscwo", + "nsosversion": "rscwo", + "objectclass": "rscwo", + "serverhostname": "rsc", + "usercertificate": "rscwo", + "userpassword": "wo" + }, + "cn": [ + "test.example.com" + ], + "dn": "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com", + "fqdn": [ + "test.example.com" + ], + "has_keytab": false, + "ipauniqueid": [ + "ac28dca0-f3b5-11df-879f-00163e72f2d9" + ], + "krbprincipalname": [ + "host/test.example.com@DEV.EXAMPLE.COM" + ], + "managedby": [ + "fqdn=test.example.com,cn=computers,cn=accounts,dc=dev,dc=example,dc=com" + ], + "objectclass": [ + "ipaobject", + "nshost", + "ipahost", + "pkiuser", + "ipaservice", + "krbprincipalaux", + "krbprincipal", + "top" + ], + "serverhostname": [ + "test" + ] + }, + "summary": null, + "value": "test.example.com" + } +} diff --git a/install/static/test/data/batch.json b/install/static/test/data/ipa_init.json index a38cd9767..a38cd9767 100644 --- a/install/static/test/data/batch.json +++ b/install/static/test/data/ipa_init.json |