Blame SOURCES/0203-SELINUX-Use-getseuserbyname-to-get-IPA-seuser.patch

976a3f
From 0006bd76856787614f961001929fea95d0669fe5 Mon Sep 17 00:00:00 2001
976a3f
From: Justin Stephenson <jstephen@redhat.com>
976a3f
Date: Thu, 9 Mar 2017 17:21:37 -0500
976a3f
Subject: [PATCH 203/205] SELINUX: Use getseuserbyname to get IPA seuser
976a3f
MIME-Version: 1.0
976a3f
Content-Type: text/plain; charset=UTF-8
976a3f
Content-Transfer-Encoding: 8bit
976a3f
976a3f
The libselinux function getseuserbyname is more reliable method to retrieve
976a3f
SELinux usernames then functions from libsemanage `semanage_user_query`
976a3f
and is recommended by libsemanage developers.
976a3f
Replace get_seuser function with getseuserbyname.
976a3f
976a3f
Resolves:
976a3f
https://pagure.io/SSSD/sssd/issue/3308
976a3f
976a3f
Reviewed-by: Michal Židek <mzidek@redhat.com>
976a3f
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
976a3f
Reviewed-by: Petr Lautrbach <plautrba@redhat.com>
976a3f
(cherry picked from commit cfe87ca0c4fded9cbf907697d08fa0e6c8f8ebce)
976a3f
---
976a3f
 Makefile.am                       |  1 +
976a3f
 src/providers/ipa/selinux_child.c | 12 +++----
976a3f
 src/util/sss_semanage.c           | 73 ---------------------------------------
976a3f
 src/util/util.h                   |  2 --
976a3f
 4 files changed, 7 insertions(+), 81 deletions(-)
976a3f
976a3f
diff --git a/Makefile.am b/Makefile.am
976a3f
index cdd517d50679b876814303fb7d6c63d49bcd8d38..1eb398830e4817d4da0878a6577b45df101e920d 100644
976a3f
--- a/Makefile.am
976a3f
+++ b/Makefile.am
976a3f
@@ -4094,6 +4094,7 @@ selinux_child_LDADD = \
976a3f
     $(POPT_LIBS) \
976a3f
     $(DHASH_LIBS) \
976a3f
     $(SEMANAGE_LIBS) \
976a3f
+    $(SELINUX_LIBS) \
976a3f
     $(NULL)
976a3f
 endif
976a3f
 
976a3f
diff --git a/src/providers/ipa/selinux_child.c b/src/providers/ipa/selinux_child.c
976a3f
index f8dd3954a7244df2dcbb910aabf8888f41306c09..073475094ee491bd5453898c6ba65214fa14fe59 100644
976a3f
--- a/src/providers/ipa/selinux_child.c
976a3f
+++ b/src/providers/ipa/selinux_child.c
976a3f
@@ -27,6 +27,7 @@
976a3f
 #include <unistd.h>
976a3f
 #include <sys/stat.h>
976a3f
 #include <popt.h>
976a3f
+#include <selinux/selinux.h>
976a3f
 
976a3f
 #include "util/util.h"
976a3f
 #include "util/child_common.h"
976a3f
@@ -172,11 +173,10 @@ static bool seuser_needs_update(struct input_buffer *ibuf)
976a3f
     char *db_mls_range = NULL;
976a3f
     errno_t ret;
976a3f
 
976a3f
-    ret = get_seuser(ibuf, ibuf->username, &db_seuser, &db_mls_range);
976a3f
+    ret = getseuserbyname(ibuf->username, &db_seuser, &db_mls_range);
976a3f
     DEBUG(SSSDBG_TRACE_INTERNAL,
976a3f
-          "get_seuser: ret: %d msg: [%s] seuser: %s mls: %s\n",
976a3f
-          ret, sss_strerror(ret),
976a3f
-          db_seuser ? db_seuser : "unknown",
976a3f
+          "getseuserbyname: ret: %d seuser: %s mls: %s\n",
976a3f
+          ret, db_seuser ? db_seuser : "unknown",
976a3f
           db_mls_range ? db_mls_range : "unknown");
976a3f
     if (ret == EOK && db_seuser && db_mls_range &&
976a3f
             strcmp(db_seuser, ibuf->seuser) == 0 &&
976a3f
@@ -188,8 +188,8 @@ static bool seuser_needs_update(struct input_buffer *ibuf)
976a3f
         needs_update = false;
976a3f
     }
976a3f
 
976a3f
-    talloc_free(db_seuser);
976a3f
-    talloc_free(db_mls_range);
976a3f
+    free(db_seuser);
976a3f
+    free(db_mls_range);
976a3f
     return needs_update;
976a3f
 }
976a3f
 
976a3f
diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c
976a3f
index 0da97aad4d8eba733b131c2749932e03ca4242c4..37278cc986a1ea49dc2218a635d52b9d54ca089d 100644
976a3f
--- a/src/util/sss_semanage.c
976a3f
+++ b/src/util/sss_semanage.c
976a3f
@@ -382,73 +382,6 @@ done:
976a3f
     sss_semanage_close(handle);
976a3f
     return ret;
976a3f
 }
976a3f
-
976a3f
-int get_seuser(TALLOC_CTX *mem_ctx, const char *login_name,
976a3f
-               char **_seuser, char **_mls_range)
976a3f
-{
976a3f
-    errno_t ret;
976a3f
-    const char *seuser;
976a3f
-    const char *mls_range;
976a3f
-    semanage_handle_t *sm_handle = NULL;
976a3f
-    semanage_seuser_t *sm_user = NULL;
976a3f
-    semanage_seuser_key_t *sm_key = NULL;
976a3f
-
976a3f
-    ret = sss_semanage_init(&sm_handle);
976a3f
-    if (ret == ERR_SELINUX_NOT_MANAGED) {
976a3f
-        goto done;
976a3f
-    } else if (ret != EOK) {
976a3f
-        DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create SELinux handle\n");
976a3f
-        goto done;
976a3f
-    }
976a3f
-
976a3f
-    ret = semanage_seuser_key_create(sm_handle, login_name, &sm_key);
976a3f
-    if (ret != EOK) {
976a3f
-        DEBUG(SSSDBG_CRIT_FAILURE, "Cannot create key for %s\n", login_name);
976a3f
-        ret = EIO;
976a3f
-        goto done;
976a3f
-    }
976a3f
-
976a3f
-    ret = semanage_seuser_query(sm_handle, sm_key, &sm_user);
976a3f
-    if (ret < 0) {
976a3f
-        DEBUG(SSSDBG_CRIT_FAILURE, "Cannot query for %s\n", login_name);
976a3f
-        ret = EIO;
976a3f
-        goto done;
976a3f
-    }
976a3f
-
976a3f
-    seuser = semanage_seuser_get_sename(sm_user);
976a3f
-    if (seuser != NULL) {
976a3f
-        *_seuser = talloc_strdup(mem_ctx, seuser);
976a3f
-        if (*_seuser == NULL) {
976a3f
-            ret = ENOMEM;
976a3f
-            goto done;
976a3f
-        }
976a3f
-        DEBUG(SSSDBG_OP_FAILURE,
976a3f
-              "SELinux user for %s: %s\n", login_name, *_seuser);
976a3f
-    } else {
976a3f
-        DEBUG(SSSDBG_CRIT_FAILURE, "Cannot get sename for %s\n", login_name);
976a3f
-    }
976a3f
-
976a3f
-    mls_range = semanage_seuser_get_mlsrange(sm_user);
976a3f
-    if (mls_range != NULL) {
976a3f
-        *_mls_range = talloc_strdup(mem_ctx, mls_range);
976a3f
-        if (*_mls_range == NULL) {
976a3f
-            ret = ENOMEM;
976a3f
-            goto done;
976a3f
-        }
976a3f
-        DEBUG(SSSDBG_OP_FAILURE,
976a3f
-              "SELinux range for %s: %s\n", login_name, *_mls_range);
976a3f
-    } else {
976a3f
-        DEBUG(SSSDBG_CRIT_FAILURE, "Cannot get mlsrange for %s\n", login_name);
976a3f
-    }
976a3f
-
976a3f
-    ret = EOK;
976a3f
-done:
976a3f
-    semanage_seuser_key_free(sm_key);
976a3f
-    semanage_seuser_free(sm_user);
976a3f
-    sss_semanage_close(sm_handle);
976a3f
-    return ret;
976a3f
-}
976a3f
-
976a3f
 #else /* HAVE_SEMANAGE */
976a3f
 int set_seuser(const char *login_name, const char *seuser_name,
976a3f
                const char *mls)
976a3f
@@ -460,10 +393,4 @@ int del_seuser(const char *login_name)
976a3f
 {
976a3f
     return EOK;
976a3f
 }
976a3f
-
976a3f
-int get_seuser(TALLOC_CTX *mem_ctx, const char *login_name,
976a3f
-               char **_seuser, char **_mls_range)
976a3f
-{
976a3f
-    return EOK;
976a3f
-}
976a3f
 #endif  /* HAVE_SEMANAGE */
976a3f
diff --git a/src/util/util.h b/src/util/util.h
976a3f
index 72d4116e1206e9cc69715edc45bf5b9b91e37e6b..1719d8eec1b6b05877b9be3382589e442bff85be 100644
976a3f
--- a/src/util/util.h
976a3f
+++ b/src/util/util.h
976a3f
@@ -658,8 +658,6 @@ errno_t restore_creds(struct sss_creds *saved_creds);
976a3f
 int set_seuser(const char *login_name, const char *seuser_name,
976a3f
                const char *mlsrange);
976a3f
 int del_seuser(const char *login_name);
976a3f
-int get_seuser(TALLOC_CTX *mem_ctx, const char *login_name,
976a3f
-               char **_seuser, char **_mls_range);
976a3f
 
976a3f
 /* convert time from generalized form to unix time */
976a3f
 errno_t sss_utc_to_time_t(const char *str, const char *format, time_t *unix_time);
976a3f
-- 
976a3f
2.14.3
976a3f