Add ipakrbokasdelegate option to service and host Web UI pages

https://fedorahosted.org/freeipa/ticket/3329

8 files changed, 45 insertions, 5 deletions

diff --git a/install/ui/src/freeipa/field.js b/install/ui/src/freeipa/field.js
index f972a6589..9654c8051 100644
--- a/install/ui/src/freeipa/field.js
+++ b/install/ui/src/freeipa/field.js
@@ -32,6 +32,12 @@ IPA.field = function(spec) {
     that.container = null;
     that.name = spec.name;
     that.param = spec.param || spec.name;
+
+    /**
+     * For most options param == acl_param. But some params might be virtual and
+     * actual rights might be defined by other param.
+     */
+    that.acl_param = spec.acl_param || that.param;
     that.label = spec.label;
     that.tooltip = spec.tooltip;
     that.measurement_unit = spec.measurement_unit;
@@ -188,7 +194,7 @@ IPA.field = function(spec) {
         }
 
         if (record.attributelevelrights) {
-            var rights = record.attributelevelrights[that.param];
+            var rights = record.attributelevelrights[that.acl_param];
             var oc_rights= record.attributelevelrights['objectclass'];
             var write_oc = oc_rights && oc_rights.indexOf('w') > -1;
 
diff --git a/install/ui/src/freeipa/host.js b/install/ui/src/freeipa/host.js
index d064a2fa2..40214a119 100644
--- a/install/ui/src/freeipa/host.js
+++ b/install/ui/src/freeipa/host.js
@@ -88,6 +88,11 @@ IPA.host.entity = function(spec) {
                             type: 'multivalued',
                             name: 'macaddress',
                             flags: ['w_if_no_aci']
+                        },
+                        {
+                            name: 'ipakrbokasdelegate',
+                            type: 'checkbox',
+                            acl_param: 'krbticketflags'
                         }
                     ]
                 },
diff --git a/install/ui/src/freeipa/service.js b/install/ui/src/freeipa/service.js
index 62c025340..072b21199 100644
--- a/install/ui/src/freeipa/service.js
+++ b/install/ui/src/freeipa/service.js
@@ -97,6 +97,11 @@ IPA.service.entity = function(spec) {
                                     ]
                                 }
                             ]
+                        },
+                        {
+                            name: 'ipakrbokasdelegate',
+                            type: 'checkbox',
+                            acl_param: 'krbticketflags'
                         }
                     ]
                 },
diff --git a/install/ui/test/data/host_mod.json b/install/ui/test/data/host_mod.json
index 80714a9db..0ec8dcd17 100644
--- a/install/ui/test/data/host_mod.json
+++ b/install/ui/test/data/host_mod.json
@@ -27,6 +27,7 @@
                 "krbprincipaltype": "rscwo",
                 "krbpwdhistory": "rscwo",
                 "krbpwdpolicyreference": "rscwo",
+                "krbticketflags": "rscwo",
                 "krbticketpolicyreference": "rscwo",
                 "krbupenabled": "rscwo",
                 "l": "rscwo",
diff --git a/install/ui/test/data/host_show.json b/install/ui/test/data/host_show.json
index 0557d1b3c..06c6ba749 100644
--- a/install/ui/test/data/host_show.json
+++ b/install/ui/test/data/host_show.json
@@ -29,7 +29,7 @@
                 "krbprincipaltype": "rsc",
                 "krbpwdhistory": "rsc",
                 "krbpwdpolicyreference": "rsc",
-                "krbticketflags": "rsc",
+                "krbticketflags": "rscwo",
                 "krbticketpolicyreference": "rsc",
                 "krbupenabled": "rsc",
                 "l": "rscwo",
diff --git a/install/ui/test/data/host_show_dev.example.com.json b/install/ui/test/data/host_show_dev.example.com.json
index 842a12d3d..4aaef927c 100644
--- a/install/ui/test/data/host_show_dev.example.com.json
+++ b/install/ui/test/data/host_show_dev.example.com.json
@@ -29,7 +29,7 @@
                 "krbprincipaltype": "rsc",
                 "krbpwdhistory": "rsc",
                 "krbpwdpolicyreference": "rsc",
-                "krbticketflags": "rsc",
+                "krbticketflags": "rscwo",
                 "krbticketpolicyreference": "rsc",
                 "krbupenabled": "rsc",
                 "l": "rscwo",
diff --git a/install/ui/test/data/host_show_test.example.com.json b/install/ui/test/data/host_show_test.example.com.json
index 0557d1b3c..06c6ba749 100644
--- a/install/ui/test/data/host_show_test.example.com.json
+++ b/install/ui/test/data/host_show_test.example.com.json
@@ -29,7 +29,7 @@
                 "krbprincipaltype": "rsc",
                 "krbpwdhistory": "rsc",
                 "krbpwdpolicyreference": "rsc",
-                "krbticketflags": "rsc",
+                "krbticketflags": "rscwo",
                 "krbticketpolicyreference": "rsc",
                 "krbupenabled": "rsc",
                 "l": "rscwo",
diff --git a/install/ui/test/data/ipa_init_objects.json b/install/ui/test/data/ipa_init_objects.json
index 0243c63d4..bf14222d7 100644
--- a/install/ui/test/data/ipa_init_objects.json
+++ b/install/ui/test/data/ipa_init_objects.json
@@ -5019,6 +5019,17 @@
                         "name": "ipasshpubkey",
                         "noextrawhitespace": true,
                         "type": "unicode"
+                    },
+                    {
+                        "class": "Bool",
+                        "doc": "Client credentials may be delegated to the service",
+                        "flags": [
+                            "virtual_attribute",
+                            "no_search"
+                        ],
+                        "label": "Trusted for delegation",
+                        "name": "ipakrbokasdelegate",
+                        "type": "bool"
                     }
                 ],
                 "uuid_attribute": "ipauniqueid"
@@ -6562,8 +6573,20 @@
                         "type": "unicode",
                         "values": [
                             "MS-PAC",
-                            "PAD"
+                            "PAD",
+                            "NONE"
                         ]
+                    },
+                    {
+                        "class": "Bool",
+                        "doc": "Client credentials may be delegated to the service",
+                        "flags": [
+                            "virtual_attribute",
+                            "no_search"
+                        ],
+                        "label": "Trusted for delegation",
+                        "name": "ipakrbokasdelegate",
+                        "type": "bool"
                     }
                 ],
                 "uuid_attribute": "ipauniqueid"