Hi,

webUI changes to support external trust and showing UPN suffixes are
attached.

UPN Suffixes defined on AD side and fetched with 'ipa trust-fetch-domains'.
They cannot be disabled individually as they come from AD side and are
forest-wide, so we only show them, not allowing to modify anything.

External forest is a flag and is shown in the trust-add dialog.
The result would be visible as trust type of 'Non-transitive external
trust to a domain in another Active Directory forest'

These patches functionally depend on 0201 and 0202.

--
/ Alexander Bokovoy
From 4da33f5e82c83617ccfb2da7c3b70e5e66ac49d9 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <aboko...@redhat.com>
Date: Thu, 9 Jun 2016 12:04:05 +0300
Subject: [PATCH 7/8] webui: show UPN suffixes in trust properties

Part of https://fedorahosted.org/freeipa/ticket/5354

---
 install/ui/src/freeipa/trust.js | 11 +++++++++++
 ipaserver/plugins/internal.py   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index f26e2f2..f147a26 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -142,6 +142,17 @@ return {
                     ]
                 },
                 {
+                    name: 'suffixes',
+                    label: '@i18n:objects.trust.ipantadditionalsuffixes',
+                    fields: [
+                        {
+                            $type: 'multivalued',
+                            name: 'ipantadditionalsuffixes',
+                            read_only: 'true'
+                        },
+                    ]
+                },
+                {
                     name: 'blacklists',
                     label: '@i18n:objects.trust.blacklists',
                     fields: [
diff --git a/ipaserver/plugins/internal.py b/ipaserver/plugins/internal.py
index 4804f64..ea29b16 100644
--- a/ipaserver/plugins/internal.py
+++ b/ipaserver/plugins/internal.py
@@ -747,6 +747,8 @@ class i18n_messages(Command):
                 "trustdirection": _("Trust direction"),
                 "truststatus": _("Trust status"),
                 "trusttype": _("Trust type"),
+                "suffixes": _("UPN suffixes"),
+                "ipantadditionalsuffixes": _("UPN suffixes"),
             },
             "trustconfig": {
                 "options": _("Options"),
-- 
2.7.4

From 99600009b97f5652b088718c71ba0dd348f4bdb8 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <aboko...@redhat.com>
Date: Thu, 9 Jun 2016 12:04:39 +0300
Subject: [PATCH 8/8] webui: support external flag to trust-add

Part of https://fedorahosted.org/freeipa/ticket/5743

---
 install/ui/src/freeipa/trust.js | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/install/ui/src/freeipa/trust.js b/install/ui/src/freeipa/trust.js
index f147a26..ab2e24f 100644
--- a/install/ui/src/freeipa/trust.js
+++ b/install/ui/src/freeipa/trust.js
@@ -189,6 +189,12 @@ return {
                 widget: 'realm.bidirectional'
             },
             {
+                $type: 'checkbox',
+                name: 'external',
+                metadata: '@mc-opt:trust_add:external',
+                widget: 'realm.external'
+            },
+            {
                 name: 'realm_admin',
                 label: '@i18n:objects.trust.account',
                 widget: 'method.realm_admin'
@@ -246,6 +252,11 @@ return {
                         $type: 'checkbox',
                         name: 'bidirectional',
                         tooltip: '@mc-opt:trust_add:bidirectional:doc'
+                    },
+                    {
+                        $type: 'checkbox',
+                        name: 'external',
+                        tooltip: '@mc-opt:trust_add:external:doc'
                     }
                 ]
             },
-- 
2.7.4

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to