summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2011-12-02 11:59:20 -0500
committerStephen Gallagher <sgallagh@redhat.com>2011-12-05 11:50:49 -0500
commitb32159300fea63222d8dd9200ed634087704ea74 (patch)
tree1df8dd260bc69f2611e53e05cc64b90e5583d576 /src
parentf46b9fd64ef09aae23220c5adb2fe4d3e4adc553 (diff)
downloadsssd_unused-b32159300fea63222d8dd9200ed634087704ea74.zip
sssd_unused-b32159300fea63222d8dd9200ed634087704ea74.tar.gz
sssd_unused-b32159300fea63222d8dd9200ed634087704ea74.tar.xz
Allow using Glib for UTF8 support
Diffstat (limited to 'src')
-rw-r--r--src/conf_macros.m421
-rw-r--r--src/external/glib.m411
-rw-r--r--src/providers/ipa/hbac_evaluator.c44
-rw-r--r--src/responder/common/responder_common.c10
-rw-r--r--src/util/sss_utf8.c119
-rw-r--r--src/util/sss_utf8.h43
6 files changed, 206 insertions, 42 deletions
diff --git a/src/conf_macros.m4 b/src/conf_macros.m4
index bd661ba..45d5484 100644
--- a/src/conf_macros.m4
+++ b/src/conf_macros.m4
@@ -352,3 +352,24 @@ AC_ARG_ENABLE([all-experimental-features],
[build all experimental features])],
[build_all_experimental_features=$enableval],
[build_all_experimental_features=no])
+
+
+AC_DEFUN([WITH_UNICODE_LIB],
+ [ AC_ARG_WITH([unicode-lib],
+ [AC_HELP_STRING([--with-unicode-lib=<library>],
+ [Which library to use for unicode processing (libunistring, glib2) [libunistring]]
+ )
+ ]
+ )
+ unicode_lib="libunistring"
+ if test x"$with_unicode_lib" != x; then
+ unicode_lib=$with_unicode_lib
+ fi
+
+ if test x"$unicode_lib" != x"libunistring" -a x"$unicode_lib" != x"glib2"; then
+ AC_MSG_ERROR([Unsupported unicode library])
+ fi
+
+ AM_CONDITIONAL([WITH_LIBUNISTRING], test x"$unicode_lib" = x"libunistring")
+ AM_CONDITIONAL([WITH_GLIB], test x"$unicode_lib" = x"glib2")
+ ]) \ No newline at end of file
diff --git a/src/external/glib.m4 b/src/external/glib.m4
new file mode 100644
index 0000000..8cec763
--- /dev/null
+++ b/src/external/glib.m4
@@ -0,0 +1,11 @@
+PKG_CHECK_MODULES([GLIB2],[glib-2.0])
+
+if test x$has_glib2 != xno; then
+ SAFE_LIBS="$LIBS"
+ LIBS="$GLIB2_LIBS"
+
+ AC_CHECK_FUNC([g_utf8_validate],
+ AC_DEFINE([HAVE_G_UTF8_VALIDATE], [1],
+ [Define if g_utf8_validate exists]))
+ LIBS="$SAFE_LIBS"
+fi \ No newline at end of file
diff --git a/src/providers/ipa/hbac_evaluator.c b/src/providers/ipa/hbac_evaluator.c
index 476ad64..a41aa5b 100644
--- a/src/providers/ipa/hbac_evaluator.c
+++ b/src/providers/ipa/hbac_evaluator.c
@@ -25,10 +25,9 @@
#include <stdlib.h>
#include <string.h>
-#include <unistr.h>
-#include <unicase.h>
#include <errno.h>
#include "providers/ipa/ipa_hbac.h"
+#include "util/sss_utf8.h"
#ifndef HAVE_ERRNO_T
#define HAVE_ERRNO_T
@@ -240,7 +239,6 @@ static errno_t hbac_evaluate_element(struct hbac_rule_element *rule_el,
size_t i, j;
const uint8_t *rule_name;
const uint8_t *req_name;
- int result;
int ret;
if (rule_el->category & HBAC_CATEGORY_ALL) {
@@ -255,21 +253,11 @@ static errno_t hbac_evaluate_element(struct hbac_rule_element *rule_el,
rule_name = (const uint8_t *) rule_el->names[i];
req_name = (const uint8_t *) req_el->name;
- /* Do a case-insensitive comparison.
- * The input must be encoded in UTF8.
- * We have no way of knowing the language,
- * so we'll pass NULL for the language and
- * hope for the best.
- */
- errno = 0;
- ret = u8_casecmp(rule_name, u8_strlen(rule_name),
- req_name, u8_strlen(req_name),
- NULL, NULL, &result);
- if (ret < 0) {
- return errno;
- }
-
- if (result == 0) {
+ /* Do a case-insensitive comparison. */
+ ret = sss_utf8_case_eq(rule_name, req_name);
+ if (ret != EOK && ret != ENOMATCH) {
+ return ret;
+ } else if (ret == EOK) {
*matched = true;
return EOK;
}
@@ -287,21 +275,11 @@ static errno_t hbac_evaluate_element(struct hbac_rule_element *rule_el,
for (j = 0; req_el->groups[j]; j++) {
req_name = (const uint8_t *) req_el->groups[j];
- /* Do a case-insensitive comparison.
- * The input must be encoded in UTF8.
- * We have no way of knowing the language,
- * so we'll pass NULL for the language and
- * hope for the best.
- */
- errno = 0;
- ret = u8_casecmp(rule_name, u8_strlen(rule_name),
- req_name, u8_strlen(req_name),
- NULL, NULL, &result);
- if (ret < 0) {
- return errno;
- }
-
- if (result == 0) {
+ /* Do a case-insensitive comparison. */
+ ret = sss_utf8_case_eq(rule_name, req_name);
+ if (ret != EOK && ret != ENOMATCH) {
+ return ret;
+ } else if (ret == EOK) {
*matched = true;
return EOK;
}
diff --git a/src/responder/common/responder_common.c b/src/responder/common/responder_common.c
index 24f9125..1b28a92 100644
--- a/src/responder/common/responder_common.c
+++ b/src/responder/common/responder_common.c
@@ -32,8 +32,8 @@
#include <sys/time.h>
#include <errno.h>
#include <popt.h>
-#include <unistr.h>
#include "util/util.h"
+#include "util/sss_utf8.h"
#include "db/sysdb.h"
#include "confdb/confdb.h"
#include "dbus/dbus.h"
@@ -636,11 +636,3 @@ int responder_logrotate(DBusMessage *message,
return monitor_common_pong(message, conn);
}
-
-bool sss_utf8_check(const uint8_t *s, size_t n)
-{
- if (u8_check(s, n) == NULL) {
- return true;
- }
- return false;
-}
diff --git a/src/util/sss_utf8.c b/src/util/sss_utf8.c
new file mode 100644
index 0000000..4a98233
--- /dev/null
+++ b/src/util/sss_utf8.c
@@ -0,0 +1,119 @@
+/*
+ SSSD
+
+ Authors:
+ Stephen Gallagher <sgallagh@redhat.com>
+
+ Copyright (C) 2011 Red Hat
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "util/util.h"
+#include "sss_utf8.h"
+
+#ifdef HAVE_LIBUNISTRING
+bool sss_utf8_check(const uint8_t *s, size_t n)
+{
+ if (u8_check(s, n) == NULL) {
+ return true;
+ }
+ return false;
+}
+
+#elif HAVE_GLIB2
+bool sss_utf8_check(const uint8_t *s, size_t n)
+{
+ return g_utf8_validate((const gchar *)s, n, NULL);
+}
+
+#else
+#error No unicode library
+#endif
+
+/* Returns EOK on match, ENOTUNIQ if comparison succeeds but
+ * does not match.
+ * May return other errno error codes on failure
+ */
+#ifdef HAVE_LIBUNISTRING
+errno_t sss_utf8_case_eq(const uint8_t *s1, const uint8_t *s2)
+{
+
+ /* Do a case-insensitive comparison.
+ * The input must be encoded in UTF8.
+ * We have no way of knowing the language,
+ * so we'll pass NULL for the language and
+ * hope for the best.
+ */
+ int ret;
+ int resultp;
+ size_t n1, n2;
+ errno = 0;
+
+ n1 = u8_strlen(s1);
+ n2 = u8_strlen(s2);
+
+ ret = u8_casecmp(s1, n1,
+ s2, n2,
+ NULL, NULL,
+ &resultp);
+ if (ret < 0) {
+ /* An error occurred */
+ return errno;
+ }
+
+ if (resultp == 0) {
+ return EOK;
+ }
+ return ENOMATCH;
+}
+
+#elif HAVE_GLIB2
+errno_t sss_utf8_case_eq(const uint8_t *s1, const uint8_t *s2)
+{
+ gchar *gs1;
+ gchar *gs2;
+ gssize n1, n2;
+ gint gret;
+ errno_t ret;
+
+ n1 = g_utf8_strlen((const gchar *)s1, -1);
+ n2 = g_utf8_strlen((const gchar *)s2, -1);
+
+ gs1 = g_utf8_casefold((const gchar *)s1, n1);
+ if (gs1 == NULL) {
+ return ENOMEM;
+ }
+
+ gs2 = g_utf8_casefold((const gchar *)s2, n2);
+ if (gs2 == NULL) {
+ return ENOMEM;
+ }
+
+ gret = g_utf8_collate(gs1, gs2);
+ if (gret == 0) {
+ ret = EOK;
+ } else {
+ ret = ENOMATCH;
+ }
+
+ g_free(gs1);
+ g_free(gs2);
+
+ return ret;
+}
+
+#else
+#error No unicode library
+#endif
diff --git a/src/util/sss_utf8.h b/src/util/sss_utf8.h
new file mode 100644
index 0000000..37dcff9
--- /dev/null
+++ b/src/util/sss_utf8.h
@@ -0,0 +1,43 @@
+/*
+ SSSD
+
+ Authors:
+ Stephen Gallagher <sgallagh@redhat.com>
+
+ Copyright (C) 2011 Red Hat
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef SSS_UTF8_H_
+#define SSS_UTF8_H_
+
+#ifdef HAVE_LIBUNISTRING
+#include <unistr.h>
+#include <unicase.h>
+#elif HAVE_GLIB2
+#include <glib.h>
+#endif
+#include "util/util.h"
+
+#ifndef ENOMATCH
+#define ENOMATCH -1
+#endif
+
+bool sss_utf8_check(const uint8_t *s, size_t n);
+
+errno_t sss_utf8_case_eq(const uint8_t *s1, const uint8_t *s2);
+
+
+#endif /* SSS_UTF8_H_ */