From a66fc51f69b0d19ecb63a5a78d2a052e810913c9 Mon Sep 17 00:00:00 2001

From: Martin Kosek <mkosek@redhat.com>

Date: Wed, 6 Nov 2013 12:48:26 +0100

Subject: [PATCH] Allow kernel keyring CCACHE when supported

Allow ipa-server-install and ipa-client-install to allow kernel keyring

ccache when supported.

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

---

 install/share/krb5.conf.template          |  2 +-

 ipa-client/ipa-install/ipa-client-install | 11 +++++++++++

 ipapython/kernel_keyring.py               |  6 ++++++

 ipaserver/install/krbinstance.py          | 16 ++++++++++++++++

 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/install/share/krb5.conf.template b/install/share/krb5.conf.template

index 01e66881b0a38e342886727ec205ea9b7c057ad2..7c82083e3331cfacccc1995cd9dfa6ddd88edd1f 100644

--- a/install/share/krb5.conf.template

+++ b/install/share/krb5.conf.template

@@ -12,7 +12,7 @@ includedir /var/lib/sss/pubconf/krb5.include.d/

  rdns = false

  ticket_lifetime = 24h

  forwardable = yes

-

+$OTHER_LIBDEFAULTS

 [realms]

  $REALM = {

   kdc = $FQDN:88

diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install

index 8e4695b42e9178725353dee2a4797a8da9b635b3..9b99953551fcffa64b16605d701831a49ba0e087 100755

--- a/ipa-client/ipa-install/ipa-client-install

+++ b/ipa-client/ipa-install/ipa-client-install

@@ -43,6 +43,7 @@ try:

         run, user_input, CalledProcessError, file_exists, realm_to_suffix)

     import ipapython.services as ipaservices

     from ipapython import ipautil, sysrestore, version, certmonger, ipaldap

+    from ipapython import kernel_keyring

     from ipapython.config import IPAOptionParser

     from ipalib import api, errors

     from ipalib import x509

@@ -926,6 +927,16 @@ def configure_krb5_conf(cli_realm, cli_domain, cli_server, cli_kdc, dnsok,

     libopts.append({'name':'ticket_lifetime', 'type':'option', 'value':'24h'})

     libopts.append({'name':'forwardable', 'type':'option', 'value':'yes'})

+    # Configure KEYRING CCACHE if supported

+    uid = os.geteuid()

+    try:

+        kernel_keyring.get_persistent_key(str(uid))

+    except ValueError:

+        pass

+    else:

+        libopts.append({'name':'default_ccache_name', 'type':'option',

+            'value':'KEYRING:persistent:%{uid}'})

+

     opts.append({'name':'libdefaults', 'type':'section', 'value':libopts})

     opts.append({'name':'empty', 'type':'empty'})

diff --git a/ipapython/kernel_keyring.py b/ipapython/kernel_keyring.py

index 547dd3de6b45295910b66982e99886135c06335b..c6670c4ade48e9dc9b503f937cbcaead143f19fc 100644

--- a/ipapython/kernel_keyring.py

+++ b/ipapython/kernel_keyring.py

@@ -47,6 +47,12 @@ def get_real_key(key):

         raise ValueError('key %s not found' % key)

     return stdout.rstrip()

+def get_persistent_key(key):

+    (stdout, stderr, rc) = run(['keyctl', 'get_persistent', KEYRING, key], raiseonerr=False)

+    if rc:

+        raise ValueError('persistent key %s not found' % key)

+    return stdout.rstrip()

+

 def has_key(key):

     """

     Returns True/False whether the key exists in the keyring.

diff --git a/ipaserver/install/krbinstance.py b/ipaserver/install/krbinstance.py

index 98687a4002cd7b19faea03acc552759e962d8832..48407edb9b0e237cf86e8d4e9059208e52b9c165 100644

--- a/ipaserver/install/krbinstance.py

+++ b/ipaserver/install/krbinstance.py

@@ -31,6 +31,7 @@

 from ipapython import sysrestore

 from ipapython import ipautil

 from ipapython import services as ipaservices

+from ipapython import kernel_keyring

 from ipalib import errors

 from ipapython.ipa_log_manager import *

 from ipapython.dn import DN

@@ -252,6 +253,21 @@ def __setup_sub_dict(self):

             dr_map = ""

         self.sub_dict['OTHER_DOMAIN_REALM_MAPS'] = dr_map

+        # Configure KEYRING CCACHE if supported

+        uid = os.geteuid()

+        try:

+            kernel_keyring.get_persistent_key(str(uid))

+        except ValueError:

+            keyring_ccache_supported = False

+        else:

+            keyring_ccache_supported = True

+

+        if keyring_ccache_supported:

+            self.sub_dict['OTHER_LIBDEFAULTS'] = \

+                " default_ccache_name = KEYRING:persistent:%{uid}\n"

+        else:

+            self.sub_dict['OTHER_LIBDEFAULTS'] = ''

+

     def __configure_sasl_mappings(self):

         # we need to remove any existing SASL mappings in the directory as otherwise they

         # they may conflict.

-- 

1.8.3.1