Oscap source

ac_probes/configure.ac.tpl

@@ -540,6 +540,7 @@ AC_CONFIG_FILES([Makefile
 		 selinux/Makefile
                  libopenscap.pc
                  src/common/Makefile
+		src/source/Makefile
                  tests/Makefile
                  tests/API/Makefile
 
@@ -636,6 +637,7 @@ AC_CONFIG_FILES([Makefile
                  tests/API/XCCDF/variable_instance/Makefile
 
                  tests/schemas/Makefile
+		tests/codestyle/Makefile
 
                  src/SCE/Makefile
                  tests/sce/Makefile])

configure.ac

@@ -1343,6 +1343,7 @@ AC_CONFIG_FILES([Makefile
 		 selinux/Makefile
                  libopenscap.pc
                  src/common/Makefile
+		src/source/Makefile
                  tests/Makefile
                  tests/API/Makefile
 
@@ -1439,6 +1440,7 @@ AC_CONFIG_FILES([Makefile
                  tests/API/XCCDF/variable_instance/Makefile
 
                  tests/schemas/Makefile
+		tests/codestyle/Makefile
 
                  src/SCE/Makefile
                  tests/sce/Makefile])

src/CCE/cce.c

@@ -6,7 +6,7 @@
  */
 
 /*
- * Copyright 2008-2009 Red Hat Inc., Durham, North Carolina.
+ * Copyright 2008-2014 Red Hat Inc., Durham, North Carolina.
  * All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -37,6 +37,8 @@
 
 #include "common/public/oscap.h"
 #include "common/elements.h"
+#include "oscap_source.h"
+#include "source/oscap_source_priv.h"
 
 #define CCE_SUPPORTED "5"
 
@@ -80,18 +82,18 @@ struct cce_entry *cce_entry_new_empty(void)
 
 static void cce_parse(const char *docname, struct cce *cce)
 {
-	xmlTextReaderPtr reader;
+	struct oscap_source *source = oscap_source_new_from_file(docname);
+	xmlTextReaderPtr reader = oscap_source_get_xmlTextReader(source);
 	int ret;
-	reader = xmlNewTextReaderFilename(docname);
 	if (reader != NULL) {
-		xmlTextReaderSetErrorHandler(reader, &libxml_error_handler, NULL);
 		ret = xmlTextReaderRead(reader);
 		while (ret == 1) {
 			process_node(reader, cce);
 			ret = xmlTextReaderRead(reader);
 		}
 		xmlFreeTextReader(reader);
 	}
+	oscap_source_free(source);
 }
 
 struct cce *cce_new(const char *fname)

src/CPE/Makefile.am

@@ -10,12 +10,16 @@ libcpe_la_SOURCES =	cpedict.c \
 			cpedict_ext_priv.c \
 			cpelang_priv.h \
 			cpedict_ext_priv.h \
-			cpedict_priv.h
+			cpedict_priv.h \
+			cpe_session.c \
+			cpe_session_priv.h
 
 libcpe_la_CPPFLAGS = @xml2_CFLAGS@ \
 			@pcre_CFLAGS@ \
 			-I$(srcdir)/public \
+			-I$(top_srcdir)/src/CPE/public \
 			-I$(top_srcdir)/src/common/public \
+			-I$(top_srcdir)/src/source/public \
 			-I$(top_srcdir)/src
 
 libcpe_la_LDFLAGS =	@xml2_LIBS@ \

src/CPE/cpe_ctx_priv.c

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Red Hat Inc., Durham, North Carolina.
+ * Copyright 2013--2014 Red Hat Inc., Durham, North Carolina.
  * All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -43,20 +43,6 @@ static inline struct cpe_parser_ctx *_cpe_parser_ctx_new()
 	return oscap_calloc(1, sizeof(struct cpe_parser_ctx));
 }
 
-struct cpe_parser_ctx *cpe_parser_ctx_new(const char *filename)
-{
-	struct cpe_parser_ctx *ctx = _cpe_parser_ctx_new();
-	ctx->reader = xmlReaderForFile(filename, NULL, 0);
-	if (ctx->reader == NULL) {
-		oscap_seterr(OSCAP_EFAMILY_GLIBC, "Unable to open file: '%s'", filename);
-		cpe_parser_ctx_free(ctx);
-		return NULL;
-	}
-	xmlTextReaderSetErrorHandler(ctx->reader, &libxml_error_handler, NULL);
-	ctx->owns_reader = true;
-	return ctx;
-}
-
 struct cpe_parser_ctx *cpe_parser_ctx_from_reader(xmlTextReaderPtr reader)
 {
 	struct cpe_parser_ctx *ctx = _cpe_parser_ctx_new();

src/CPE/cpe_ctx_priv.h

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 Red Hat Inc., Durham, North Carolina.
+ * Copyright 2013--2014 Red Hat Inc., Durham, North Carolina.
  * All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ -33,13 +33,6 @@ OSCAP_HIDDEN_START;
  */
 struct cpe_parser_ctx;
 
-/**
- * Constructor for cpe_parser_ctx
- * @param filename File path to CPE file to parse
- * @returns parser's context
- */
-struct cpe_parser_ctx *cpe_parser_ctx_new(const char *filename);
-
 /**
  * Construct cpe_parser_ctx from existing xmlTextReader
  * @param reader existing XML reader

src/CPE/cpe_session.c

@@ -0,0 +1,150 @@
+/*
+ * Copyright 2014 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * Author:
+ *     Šimon Lukašík
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "common/alloc.h"
+#include "common/_error.h"
+#include "common/list.h"
+#include "common/public/oscap.h"
+#include "common/util.h"
+#include "cpe_session_priv.h"
+#include "CPE/public/cpe_dict.h"
+#include "CPE/public/cpe_lang.h"
+#include "OVAL/public/oval_agent_api.h"
+#include "source/public/oscap_source.h"
+#include "source/oscap_source_priv.h"
+
+static inline bool cpe_session_add_default_cpe(struct cpe_session *session)
+{
+	char* cpe_dict_path = oscap_sprintf("%s/openscap-cpe-dict.xml", oscap_path_to_cpe());
+	struct oscap_source *source = oscap_source_new_from_file(cpe_dict_path);
+	oscap_free(cpe_dict_path);
+	const bool ret = cpe_session_add_cpe_dict_source(session, source);
+	oscap_source_free(source);
+	return ret;
+}
+
+struct cpe_session *cpe_session_new(void)
+{
+	struct cpe_session *cpe = oscap_calloc(1, sizeof(struct cpe_session));
+	cpe->dicts = oscap_list_new();
+	cpe->lang_models = oscap_list_new();
+	cpe->oval_sessions = oscap_htable_new();
+	cpe->applicable_platforms = oscap_htable_new();
+	if (!cpe_session_add_default_cpe(cpe)) {
+		oscap_seterr(OSCAP_EFAMILY_XCCDF, "Failed to add default CPE to newly created CPE Session.");
+	}
+	return cpe;
+}
+
+static inline void _xccdf_policy_destroy_cpe_oval_session(void* ptr)
+{
+	struct oval_agent_session* session = (struct oval_agent_session*)ptr;
+	struct oval_definition_model* model = oval_agent_get_definition_model(session);
+	oval_agent_destroy_session(session);
+	oval_definition_model_free(model);
+}
+
+void cpe_session_free(struct cpe_session *session)
+{
+	if (session != NULL) {
+		oscap_list_free(session->dicts, (oscap_destruct_func) cpe_dict_model_free);
+		oscap_list_free(session->lang_models, (oscap_destruct_func) cpe_lang_model_free);
+		oscap_htable_free(session->oval_sessions, (oscap_destruct_func) _xccdf_policy_destroy_cpe_oval_session);
+		oscap_htable_free(session->applicable_platforms, NULL);
+		oscap_free(session);
+	}
+}
+
+static inline struct oscap_source *_lookup_source_in_cache(struct cpe_session *session, const char *prefixed_href)
+{
+	if (session->sources_cache == NULL) {
+		return NULL;
+	}
+	struct oscap_source *source = oscap_htable_get(session->sources_cache, prefixed_href);
+	return source;
+}
+
+struct oval_agent_session *cpe_session_lookup_oval_session(struct cpe_session *cpe, const char *prefixed_href)
+{
+	struct oval_agent_session* session = (struct oval_agent_session*)oscap_htable_get(cpe->oval_sessions, prefixed_href);
+
+	if (session == NULL)
+	{
+		struct oscap_source *source = NULL;
+		struct oscap_source *cached = _lookup_source_in_cache(cpe, prefixed_href);
+		if (cached == NULL) {
+			source = oscap_source_new_from_file(prefixed_href);
+			cached = source;
+		}
+		struct oval_definition_model* oval_model = oval_definition_model_import_source(cached);
+		oscap_source_free(source);
+
+		if (oval_model == NULL)
+		{
+			oscap_seterr(OSCAP_EFAMILY_OSCAP, "Can't import OVAL definition model '%s' for CPE applicability checking", prefixed_href);
+			return NULL;
+		}
+
+		session = oval_agent_new_session(oval_model, prefixed_href);
+		if (session == NULL) {
+			oscap_seterr(OSCAP_EFAMILY_OSCAP, "Cannot create OVAL session for '%s' for CPE applicability checking", prefixed_href);
+			return NULL;
+		}
+		oscap_htable_add(cpe->oval_sessions, prefixed_href, session);
+	}
+	return session;
+}
+
+bool cpe_session_add_cpe_lang_model_source(struct cpe_session *session, struct oscap_source *source)
+{
+	struct cpe_lang_model *lang_model = cpe_lang_model_import_source(source);
+	return oscap_list_add(session->lang_models, lang_model);
+}
+
+bool cpe_session_add_cpe_dict_source(struct cpe_session *session, struct oscap_source *source)
+{
+	struct cpe_dict_model *dict = cpe_dict_model_import_source(source);
+	return oscap_list_add(session->dicts, dict);
+}
+
+bool cpe_session_add_cpe_autodetect_source(struct cpe_session *session, struct oscap_source *source)
+{
+	oscap_document_type_t doc_type = oscap_source_get_scap_type(source);
+	if (doc_type == OSCAP_DOCUMENT_CPE_DICTIONARY) {
+		return cpe_session_add_cpe_dict_source(session, source);
+	} else if (doc_type == OSCAP_DOCUMENT_CPE_LANGUAGE) {
+		return cpe_session_add_cpe_lang_model_source(session, source);
+	} else {
+		oscap_seterr(OSCAP_EFAMILY_OSCAP, "File '%s' wasn't detected as either CPE dictionary or "
+			"CPE lang model. Can't register it to the XCCDF policy model.", oscap_source_readable_origin(source));
+		return false;
+	}
+}
+
+void cpe_session_set_cache(struct cpe_session *session, struct oscap_htable *sources_cache)
+{
+	session->sources_cache = sources_cache;
+}

src/CPE/cpe_session_priv.h

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 Red Hat Inc., Durham, North Carolina.
+ * All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ *
+ */
+#ifndef OSCAP_CPE_CPE_SESSION_PRIV_H
+#define OSCAP_CPE_CPE_SESSION_PRIV_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "common/list.h"
+#include "common/public/oscap.h"
+#include "common/util.h"
+#include "OVAL/public/oval_agent_api.h"
+
+OSCAP_HIDDEN_START;
+
+struct cpe_session {
+	struct oscap_list *dicts;                       ///< All CPE dictionaries except the one embedded in XCCDF
+	struct oscap_list *lang_models;                 ///< All CPE lang models except the one embedded in XCCDF
+	struct oscap_htable *oval_sessions;             ///< Caches CPE OVAL check results
+	struct oscap_htable *applicable_platforms;
+	struct oscap_htable *sources_cache;             ///< Not owned cache [path -> oscap_source]
+};
+
+struct cpe_session *cpe_session_new(void);
+void cpe_session_free(struct cpe_session *session);
+struct oval_agent_session *cpe_session_lookup_oval_session(struct cpe_session *cpe, const char *prefixed_href);
+bool cpe_session_add_cpe_lang_model_source(struct cpe_session *session, struct oscap_source *source);
+bool cpe_session_add_cpe_dict_source(struct cpe_session *session, struct oscap_source *source);
+bool cpe_session_add_cpe_autodetect_source(struct cpe_session *session, struct oscap_source *source);
+void cpe_session_set_cache(struct cpe_session *session, struct oscap_htable *sources_cache);
+
+OSCAP_HIDDEN_END;
+#endif