[ SEMANAGE ] Seuser record

[ SEMANAGE ] Seuser record

[Ivan Gyurdiev]

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

Add seuser record to semanage. A seuser record is a mapping from the 
seusers file.
I am still expecting objections from Tresys, based on previous 
discussion of this,
but if there are none, please merge.

This code was copied straight out of sepol/user_record.c.
I deleted roles, mls_level, and added sename.
Also modified to pass in the handle and use it, where failures occur.

[-- Attachment #2: libsemanage.seuser_record.diff --]
[-- Type: text/x-patch, Size: 6331 bytes --]

diff -Naur libsemanage/include/semanage/seuser_record.h libsemanage.new/include/semanage/seuser_record.h
--- libsemanage/include/semanage/seuser_record.h	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/include/semanage/seuser_record.h	2005-10-14 13:19:03.000000000 -0400
@@ -0,0 +1,69 @@
+#ifndef _SEMANAGE_SEUSER_RECORD_H_
+#define _SEMANAGE_SEUSER_RECORD_H_
+
+#include <stddef.h>
+#include <semanage/handle.h>
+
+struct semanage_seuser;
+struct semanage_seuser_key;
+typedef struct semanage_seuser semanage_seuser_t;
+typedef struct semanage_seuser_key semanage_seuser_key_t;
+
+/* Key */
+extern int semanage_seuser_key_create(
+	semanage_handle_t* handle,
+	const char* name, 
+	semanage_seuser_key_t** key);
+
+extern int semanage_seuser_key_extract(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser, 
+	semanage_seuser_key_t** key);
+
+extern void semanage_seuser_key_free(
+	semanage_seuser_key_t* key);
+
+extern int semanage_seuser_compare(
+	semanage_seuser_t* seuser, 
+	semanage_seuser_key_t* key);
+	
+/* Name */
+extern const char* semanage_seuser_get_name(
+	semanage_seuser_t* seuser);
+
+extern int semanage_seuser_set_name(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser, 
+	const char* name);
+
+/* Selinux Name */
+extern const char* semanage_seuser_get_sename(
+	semanage_seuser_t* seuser);
+
+extern int semanage_seuser_set_sename(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser,
+	const char* sename);
+
+/* MLS */
+extern const char* semanage_seuser_get_mlsrange(
+	semanage_seuser_t* seuser);
+
+extern int semanage_seuser_set_mlsrange(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser, 
+	const char* mls_range);
+
+/* Create/Clone/Destroy */
+extern int semanage_seuser_create(
+	semanage_handle_t* handle,
+	semanage_seuser_t** seuser_ptr);
+
+extern int semanage_seuser_clone(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser, 
+	semanage_seuser_t** seuser_ptr);
+
+extern void semanage_seuser_free(
+	semanage_seuser_t* seuser);
+#endif
diff -Naur libsemanage/src/seuser_record.c libsemanage.new/src/seuser_record.c
--- libsemanage/src/seuser_record.c	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/src/seuser_record.c	2005-10-14 13:19:26.000000000 -0400
@@ -0,0 +1,195 @@
+#include <stdlib.h>
+#include <string.h>
+
+#include <semanage/seuser_record.h>
+#include "debug.h"
+#include "handle.h"
+
+struct semanage_seuser {
+	/* This user's name */
+	char* name;
+
+	/* This user's corresponding 
+	 * seuser ("role set") */
+	char* sename;
+
+	/* This user's mls range (only required for mls) */
+	char* mls_range;
+};
+
+struct semanage_seuser_key {
+	/* This user's name */
+	const char* name;
+};
+
+int semanage_seuser_key_create(
+	semanage_handle_t* handle,
+	const char* name,
+	semanage_seuser_key_t** key_ptr) {
+
+	semanage_seuser_key_t* tmp_key = 
+		(semanage_seuser_key_t*) 
+		malloc(sizeof (semanage_seuser_key_t));
+
+	if (!tmp_key) {
+		ERR(handle, "out of memory, could not create seuser key");
+		return STATUS_ERR;
+	}
+	tmp_key->name = name;
+
+	*key_ptr = tmp_key;
+	return STATUS_SUCCESS;
+}
+
+int semanage_seuser_key_extract(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser, 
+	semanage_seuser_key_t** key_ptr) {
+
+	if (semanage_seuser_key_create(handle, seuser->name, key_ptr) < 0) {
+		ERR(handle, "could not extract key from seuser %s",
+			seuser->name);
+		return STATUS_ERR;
+	}
+
+	return STATUS_SUCCESS;
+}	
+
+void semanage_seuser_key_free(semanage_seuser_key_t* key) {
+	free(key);
+}
+
+int semanage_seuser_compare(
+	semanage_seuser_t* seuser,
+	semanage_seuser_key_t* key) {
+	
+	if (!strcmp(seuser->name, key->name))
+		return 0;
+	return 1;
+}
+
+/* Name */
+const char* semanage_seuser_get_name(
+	semanage_seuser_t* seuser) {
+
+	return seuser->name;
+}
+
+int semanage_seuser_set_name(
+	semanage_handle_t* handle, 
+	semanage_seuser_t* seuser, 
+	const char* name) {
+
+	seuser->name = strdup(name);
+	if (!seuser->name) {
+		ERR(handle,  "out of memory, could not set name");
+		return STATUS_ERR;
+	}
+	return STATUS_SUCCESS;
+}
+
+/* Selinux Name */
+const char* semanage_seuser_get_sename(
+	semanage_seuser_t* seuser) {
+
+	return seuser->sename;
+}
+
+int semanage_seuser_set_sename(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser,
+	const char* sename) {
+
+	seuser->sename = strdup(sename);
+	if (!seuser->sename) {
+		ERR(handle,  "out of memory, could not set name");
+		return STATUS_ERR;
+	}
+	return STATUS_SUCCESS;
+}
+
+/* MLS Range */
+const char* semanage_seuser_get_mlsrange(
+	semanage_seuser_t* seuser) {
+
+	return seuser->mls_range;
+}
+
+int semanage_seuser_set_mlsrange(
+	semanage_handle_t* handle, 
+	semanage_seuser_t* seuser, 
+	const char* mls_range) {
+
+	seuser->mls_range = strdup(mls_range);
+	if (!seuser->mls_range) {
+		ERR(handle, "out of memory, could not set "
+			"MLS allowed range");
+		return STATUS_ERR;
+	}
+	return STATUS_SUCCESS;
+}
+
+/* Create */
+int semanage_seuser_create(
+	semanage_handle_t* handle,
+	semanage_seuser_t** seuser_ptr) {
+
+	semanage_seuser_t* seuser = 
+		(semanage_seuser_t*) malloc(sizeof (semanage_seuser_t));
+
+        if (!seuser) {
+		ERR(handle, "out of memory, "
+			"could not create seuser record"); 
+		return STATUS_ERR;
+	}
+
+        seuser->name = NULL;
+	seuser->sename = NULL;
+	seuser->mls_range = NULL;
+	
+	*seuser_ptr = seuser;
+	return STATUS_SUCCESS;
+}
+
+/* Deep copy clone */
+int semanage_seuser_clone(
+	semanage_handle_t* handle,
+	semanage_seuser_t* seuser, 
+	semanage_seuser_t** seuser_ptr) {
+
+	semanage_seuser_t* new_seuser = NULL;
+
+	if (semanage_seuser_create(handle, &new_seuser) < 0)
+		goto err;
+
+	if (semanage_seuser_set_name(handle, new_seuser, seuser->name) < 0)
+		goto err;
+
+	if (semanage_seuser_set_sename(handle, new_seuser, seuser->sename) < 0)
+		goto err;
+
+	if (seuser->mls_range &&
+	   (semanage_seuser_set_mlsrange(handle, new_seuser, seuser->mls_range) < 0))
+		goto err;
+
+	*seuser_ptr = new_seuser;
+	return STATUS_SUCCESS;
+
+	err:
+	ERR(handle, "could not clone seuser record");
+	semanage_seuser_free(new_seuser);
+	return STATUS_ERR;
+}
+
+/* Destroy */
+void semanage_seuser_free(
+	semanage_seuser_t* seuser) {
+
+	if (!seuser)
+		return;
+	
+	free(seuser->name);
+	free(seuser->sename);
+	free(seuser->mls_range);
+	free(seuser);
+}

[ SEMANAGE ] Seuser database

[Ivan Gyurdiev]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

Attached patch adds seuser database and files (parse/print stubbed).
Unfortunately I can't initialize the record table yet, because it does 
not support
passing the handle to records at this time (and my new seuser
record takes the handle as argument).

Also adds things I forgot in last patch that added interfaces/booleans
(headers for interfaces and boolean file databases, initialization in 
the handle, etc..)



[-- Attachment #2: libsemanage.seusers.diff --]
[-- Type: text/x-patch, Size: 9010 bytes --]

diff -Naur libsemanage/include/semanage/seusers.h libsemanage.new/include/semanage/seusers.h
--- libsemanage/include/semanage/seusers.h	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/include/semanage/seusers.h	2005-10-14 13:30:10.000000000 -0400
@@ -0,0 +1,47 @@
+#ifndef _SEMANAGE_SEUSERS_H_
+#define _SEMANAGE_SEUSERS_H_
+
+#include <stddef.h>
+#include <semanage/seuser_record.h>
+#include <semanage/handle.h>
+
+extern int semanage_seuser_add(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	semanage_seuser_t* data);
+
+extern int semanage_seuser_modify(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	semanage_seuser_t* data);
+
+extern int semanage_seuser_del(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key);
+
+extern int semanage_seuser_query(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	semanage_seuser_t** response);
+
+extern int semanage_seuser_exists(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	int* response);
+
+extern int semanage_seuser_count(
+	semanage_handle_t* handle,
+	int* response);
+
+extern int semanage_seuser_iterate(
+	semanage_handle_t* handle,
+	int (*handler) (semanage_seuser_t* record,
+	                void* varg),
+	void* handler_arg);
+
+extern int semanage_seuser_list(
+	semanage_handle_t* handle,
+	semanage_seuser_t*** records,
+	size_t* count);
+
+#endif 
diff -Naur libsemanage/src/booleans_file.h libsemanage.new/src/booleans_file.h
--- libsemanage/src/booleans_file.h	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/src/booleans_file.h	2005-10-14 13:32:57.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _SEMANAGE_BOOLEANS_FILE_H_
+#define _SEMANAGE_BOOLEANS_FILE_H_
+
+#include "database.h"
+#include "handle.h"
+
+int bool_file_dbase_init(
+	dbase_config_t* dconfig);
+
+void bool_file_dbase_release(
+	semanage_handle_t* handle,
+	dbase_config_t* dconfig);
+
+#endif 
diff -Naur libsemanage/src/handle.c libsemanage.new/src/handle.c
--- libsemanage/src/handle.c	2005-10-13 13:08:35.000000000 -0400
+++ libsemanage.new/src/handle.c	2005-10-14 13:37:59.000000000 -0400
@@ -36,6 +36,9 @@
 #include "semanage_store.h"
 #include "users_file.h"
 #include "ports_file.h"
+#include "interfaces_file.h"
+#include "booleans_file.h"
+#include "seusers_file.h"
 #include "database.h"
 
 #define SEMANAGE_COMMIT_READ_WAIT 5
@@ -78,6 +81,15 @@
 	if (port_file_dbase_init(&sh->dbase[DBASE_PORTS]) < 0)
 		goto err;
 
+	if (iface_file_dbase_init(&sh->dbase[DBASE_INTERFACES]) < 0)
+		goto err;
+
+	if (bool_file_dbase_init(&sh->dbase[DBASE_BOOLEANS]) < 0)
+		goto err;
+
+	if (seuser_file_dbase_init(&sh->dbase[DBASE_SEUSERS]) < 0)
+		goto err;
+
         return sh;
 
  omem:
diff -Naur libsemanage/src/handle.h libsemanage.new/src/handle.h
--- libsemanage/src/handle.h	2005-10-14 13:19:51.000000000 -0400
+++ libsemanage.new/src/handle.h	2005-10-14 13:37:26.000000000 -0400
@@ -71,11 +71,12 @@
 	struct semanage_policy_table* funcs;
 
 	/* Object databases */
-#define DBASE_COUNT      4
+#define DBASE_COUNT      5
 #define DBASE_USERS      0
 #define DBASE_PORTS      1
 #define DBASE_INTERFACES 2
 #define DBASE_BOOLEANS   3
+#define DBASE_SEUSERS    4
 	dbase_config_t dbase[DBASE_COUNT];
 };
 
@@ -99,5 +100,10 @@
 	return &handle->dbase[DBASE_BOOLEANS];
 }
 
+static inline
+dbase_config_t* semanage_seuser_dbase(semanage_handle_t* handle) {
+	return &handle->dbase[DBASE_SEUSERS];
+}
+
 #endif
 
diff -Naur libsemanage/src/interfaces_file.h libsemanage.new/src/interfaces_file.h
--- libsemanage/src/interfaces_file.h	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/src/interfaces_file.h	2005-10-14 13:32:32.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _SEMANAGE_INTERFACES_FILE_H_
+#define _SEMANAGE_INTERFACES_FILE_H_
+
+#include "database.h"
+#include "handle.h"
+
+int iface_file_dbase_init(
+	dbase_config_t* dconfig);
+
+void iface_file_dbase_release(
+	semanage_handle_t* handle,
+	dbase_config_t* dconfig);
+
+#endif 
diff -Naur libsemanage/src/seusers.c libsemanage.new/src/seusers.c
--- libsemanage/src/seusers.c	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/src/seusers.c	2005-10-14 13:39:54.000000000 -0400
@@ -0,0 +1,96 @@
+#include <semanage/seuser_record.h>
+
+typedef semanage_seuser_key_t record_key_t;
+typedef semanage_seuser_t record_t;
+#define DBASE_RECORD_DEFINED
+
+struct dbase_file;
+typedef struct dbase_file dbase_t;
+#define DBASE_DEFINED
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <semanage/seusers.h>
+#include "handle.h"
+#include "database.h"
+
+/* Record base functions */
+record_table_t SEMANAGE_SEUSER_RTABLE = {
+	.create      = NULL, /* FIXME: takes handle argument  */
+	.key_extract = NULL, /* FIXME */
+	.key_free    = semanage_seuser_key_free,
+	.clone       = NULL, /* FIXME */
+	.compare     = semanage_seuser_compare,
+	.free        = semanage_seuser_free,
+};
+
+int semanage_seuser_add(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	semanage_seuser_t* data) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->add(handle, dconfig->dbase, key, data);
+}
+
+int semanage_seuser_modify(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	semanage_seuser_t* data) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);	
+	return dconfig->dtable->modify(handle, dconfig->dbase, key, data);
+}
+
+int semanage_seuser_del(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->del(handle, dconfig->dbase, key);
+}
+
+int semanage_seuser_query(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	semanage_seuser_t** response) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->query(handle, dconfig->dbase, key, response);
+}
+
+int semanage_seuser_exists(
+	semanage_handle_t* handle,
+	semanage_seuser_key_t* key,
+	int* response) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->exists(handle, dconfig->dbase, key, response);
+}
+
+int semanage_seuser_count(
+	semanage_handle_t* handle,
+	int* response) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->count(handle, dconfig->dbase, response);
+}
+
+int semanage_seuser_iterate(
+	semanage_handle_t* handle,
+	int (*handler) (semanage_seuser_t* record,
+	                void* varg),
+	void* handler_arg) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->iterate(handle, dconfig->dbase, handler, handler_arg);
+}
+
+int semanage_seuser_list(
+	semanage_handle_t* handle,
+	semanage_seuser_t*** records,
+	size_t* count) {
+
+	dbase_config_t* dconfig = semanage_seuser_dbase(handle);
+	return dconfig->dtable->list(handle, dconfig->dbase, records, count);
+}
diff -Naur libsemanage/src/seusers_file.c libsemanage.new/src/seusers_file.c
--- libsemanage/src/seusers_file.c	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/src/seusers_file.c	2005-10-14 13:36:29.000000000 -0400
@@ -0,0 +1,67 @@
+#include <semanage/seuser_record.h>
+
+typedef semanage_seuser_t record_t;
+typedef semanage_seuser_key_t record_key_t;
+#define DBASE_RECORD_DEFINED
+
+struct dbase_file;
+typedef struct dbase_file dbase_t;
+#define DBASE_DEFINED
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <strings.h>
+#include "database_file.h"
+#include "parse_utils.h"
+#include "debug.h"
+#include "semanage_store.h"
+#include "handle.h"
+
+static int seuser_print(
+	semanage_seuser_t* seuser, 
+	FILE* str) {
+
+	/* Stub */
+	seuser = NULL;
+	str = NULL;
+	return STATUS_SUCCESS;
+}
+
+static int seuser_parse(
+	parse_info_t* info, 
+	semanage_seuser_t* seuser) {
+	
+	/* Stub */
+	info = NULL;
+	seuser = NULL;
+	return STATUS_SUCCESS;
+}
+
+/* SEUSER RECORD: method table (seusers.c) */
+extern record_table_t SEMANAGE_SEUSER_RTABLE;
+
+/* SEUSER RECORD: FILE extension: method table */
+record_file_table_t SEMANAGE_SEUSER_FILE_RTABLE = {
+	.parse       = seuser_parse,
+	.print       = seuser_print,
+};
+
+int seuser_file_dbase_init(dbase_config_t* dconfig) {
+
+	if (dbase_file_init(
+		"seusers",
+		&SEMANAGE_SEUSER_RTABLE,
+		&SEMANAGE_SEUSER_FILE_RTABLE,
+		&dconfig->dbase) < 0)
+		return STATUS_ERR;
+
+	dconfig->dtable = &SEMANAGE_FILE_DTABLE;
+	return STATUS_SUCCESS;
+}
+
+void seuser_file_dbase_release(
+	semanage_handle_t* handle,
+	dbase_config_t* dconfig) {
+
+	dbase_file_release(handle, dconfig->dbase);
+}
diff -Naur libsemanage/src/seusers_file.h libsemanage.new/src/seusers_file.h
--- libsemanage/src/seusers_file.h	1969-12-31 19:00:00.000000000 -0500
+++ libsemanage.new/src/seusers_file.h	2005-10-14 13:36:53.000000000 -0400
@@ -0,0 +1,14 @@
+#ifndef _SEMANAGE_SEUSERS_FILE_H_
+#define _SEMANAGE_SEUSERS_FILE_H_
+
+#include "database.h"
+#include "handle.h"
+
+int seuser_file_dbase_init(
+	dbase_config_t* dconfig);
+
+void seuser_file_dbase_release(
+	semanage_handle_t* handle,
+	dbase_config_t* dconfig);
+
+#endif