Blame 0008-library-add-_adcli_bin_sid_to_str.patch

461678c
From f28edf4e887cf8616fa21dacc2b0f0d31f5f92fb Mon Sep 17 00:00:00 2001
461678c
From: Sumit Bose <sbose@redhat.com>
461678c
Date: Tue, 30 Jan 2018 14:37:05 +0100
461678c
Subject: [PATCH 08/23] library: add _adcli_bin_sid_to_str()
461678c
461678c
Convert a binary SID to the string representation.
461678c
461678c
https://bugs.freedesktop.org/show_bug.cgi?id=100118
461678c
461678c
Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
461678c
---
461678c
 library/adprivate.h |   4 ++
461678c
 library/adutil.c    | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++
461678c
 2 files changed, 117 insertions(+)
461678c
461678c
diff --git a/library/adprivate.h b/library/adprivate.h
461678c
index fc146af..e99f9fc 100644
461678c
--- a/library/adprivate.h
461678c
+++ b/library/adprivate.h
461678c
@@ -31,6 +31,7 @@
461678c
 #include <limits.h>
461678c
 #include <stdlib.h>
461678c
 #include <stdio.h>
461678c
+#include <stdint.h>
461678c
 
461678c
 #include <ldap.h>
461678c
 
461678c
@@ -132,6 +133,9 @@ int            _adcli_str_has_prefix         (const char *str,
461678c
 int            _adcli_str_has_suffix         (const char *str,
461678c
 		                              const char *suffix);
461678c
 
461678c
+char *          _adcli_bin_sid_to_str        (const uint8_t *data,
461678c
+                                              size_t len);
461678c
+
461678c
 char *         _adcli_str_dupn               (void *data,
461678c
                                               size_t len);
461678c
 
461678c
diff --git a/library/adutil.c b/library/adutil.c
461678c
index cd40f45..829cdd9 100644
461678c
--- a/library/adutil.c
461678c
+++ b/library/adutil.c
461678c
@@ -293,6 +293,83 @@ _adcli_strv_set (char ***field,
461678c
 	*field = newval;
461678c
 }
461678c
 
461678c
+char *
461678c
+_adcli_bin_sid_to_str (const uint8_t *data,
461678c
+                       size_t len)
461678c
+{
461678c
+	uint8_t sid_rev_num;
461678c
+	int8_t num_auths;
461678c
+	uint8_t id_auth[6];
461678c
+	uint32_t id_auth_val;
461678c
+	uint32_t sub_auths[15];
461678c
+	uint32_t val;
461678c
+	size_t p = 0;
461678c
+	size_t c;
461678c
+	int nc;
461678c
+	char *sid_buf;
461678c
+	size_t sid_buf_len;
461678c
+
461678c
+	if (data == NULL || len < 8) {
461678c
+		return NULL;
461678c
+	}
461678c
+
461678c
+	sid_rev_num = (uint8_t) data [p];
461678c
+	p++;
461678c
+
461678c
+	num_auths = (int8_t) data[p];
461678c
+	p++;
461678c
+
461678c
+	if (num_auths > 15 || len < 8 + (num_auths * sizeof (uint32_t))) {
461678c
+		return NULL;
461678c
+	}
461678c
+
461678c
+	for (c = 0; c < 6; c++) {
461678c
+		id_auth[c] = (uint8_t) data[p];
461678c
+		p++;
461678c
+	}
461678c
+
461678c
+	/* Only 32bits are used for the string representation */
461678c
+	id_auth_val = (id_auth[2] << 24) +
461678c
+	              (id_auth[3] << 16) +
461678c
+	              (id_auth[4] << 8) +
461678c
+	              (id_auth[5]);
461678c
+
461678c
+	for (c = 0; c < num_auths; c++) {
461678c
+		memcpy (&val, data + p, sizeof (uint32_t));
461678c
+		sub_auths[c] = le32toh (val);
461678c
+
461678c
+		p += sizeof (uint32_t);
461678c
+	}
461678c
+
461678c
+	sid_buf_len = 17 + (num_auths * 11);
461678c
+	sid_buf = calloc (1, sid_buf_len);
461678c
+	if (sid_buf == NULL) {
461678c
+		return NULL;
461678c
+	}
461678c
+
461678c
+	nc = snprintf (sid_buf, sid_buf_len, "S-%u-%lu", sid_rev_num,
461678c
+	              (unsigned long) id_auth_val);
461678c
+	if (nc < 0 || nc >= sid_buf_len) {
461678c
+		free (sid_buf);
461678c
+		return NULL;
461678c
+	}
461678c
+
461678c
+	p = 0;
461678c
+	for (c = 0; c < num_auths; c++) {
461678c
+		p += nc;
461678c
+		sid_buf_len -= nc;
461678c
+
461678c
+		nc = snprintf (sid_buf + p, sid_buf_len, "-%lu",
461678c
+		               (unsigned long) sub_auths[c]);
461678c
+		if (nc < 0 || nc >= sid_buf_len) {
461678c
+			free (sid_buf);
461678c
+			return NULL;
461678c
+		}
461678c
+	}
461678c
+
461678c
+	return sid_buf;
461678c
+}
461678c
+
461678c
 char *
461678c
 _adcli_str_dupn (void *data,
461678c
                  size_t len)
461678c
@@ -508,6 +585,41 @@ test_check_nt_time_string_lifetime (void)
461678c
 	assert (_adcli_check_nt_time_string_lifetime ("130645404000000000", 100000));
461678c
 }
461678c
 
461678c
+static void
461678c
+test_bin_sid_to_str (void)
461678c
+{
461678c
+	uint8_t sid1[] = { 0x01, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
461678c
+	                   0x15, 0x00, 0x00, 0x00, 0xF8, 0x12, 0x13, 0xDC,
461678c
+	                   0x47, 0xF3, 0x1C, 0x76, 0x47, 0x2F, 0x2E, 0xD7,
461678c
+	                   0x51, 0x04, 0x00, 0x00 };
461678c
+
461678c
+	uint8_t sid2[] = { 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
461678c
+	                   0x15, 0x00, 0x00, 0x00, 0xF8, 0x12, 0x13, 0xDC,
461678c
+	                   0x47, 0xF3, 0x1C, 0x76, 0x47, 0x2F, 0x2E, 0xD7};
461678c
+
461678c
+	uint8_t sid3[] = { 0x01, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05,
461678c
+	                   0x15, 0x00, 0x00, 0x00, 0x29, 0xC9, 0x4F, 0xD9,
461678c
+	                   0xC2, 0x3C, 0xC3, 0x78, 0x36, 0x55, 0x87, 0xF8};
461678c
+
461678c
+
461678c
+	char *str;
461678c
+
461678c
+	str = _adcli_bin_sid_to_str (sid1, sizeof (sid1));
461678c
+	assert (str != NULL);
461678c
+	assert (strcmp (str, "S-1-5-21-3692237560-1981608775-3610128199-1105") == 0);
461678c
+	free (str);
461678c
+
461678c
+	str = _adcli_bin_sid_to_str (sid2, sizeof (sid2));
461678c
+	assert (str != NULL);
461678c
+	assert (strcmp (str, "S-1-5-21-3692237560-1981608775-3610128199") == 0);
461678c
+	free (str);
461678c
+
461678c
+	str = _adcli_bin_sid_to_str (sid3, sizeof (sid2));
461678c
+	assert (str != NULL);
461678c
+	assert (strcmp (str, "S-1-5-21-3645884713-2026060994-4169618742") == 0);
461678c
+	free (str);
461678c
+}
461678c
+
461678c
 int
461678c
 main (int argc,
461678c
       char *argv[])
461678c
@@ -516,6 +628,7 @@ main (int argc,
461678c
 	test_func (test_strv_dup, "/util/strv_dup");
461678c
 	test_func (test_strv_count, "/util/strv_count");
461678c
 	test_func (test_check_nt_time_string_lifetime, "/util/check_nt_time_string_lifetime");
461678c
+	test_func (test_bin_sid_to_str, "/util/bin_sid_to_str");
461678c
 	return test_run (argc, argv);
461678c
 }
461678c
 
461678c
-- 
461678c
2.14.4
461678c