Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify oscap_source_validate_schematron #2122

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Simplify oscap_source_validate_schematron #2122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 2 additions & 13 deletions src/source/oscap_source.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,25 +366,14 @@ int oscap_source_validate(struct oscap_source *source, xml_reporter reporter, vo
return ret;
}

int oscap_source_validate_schematron(struct oscap_source *source, const char *outfile)
int oscap_source_validate_schematron(struct oscap_source *source)
{
FILE *outfile_fd = stdout;
if (outfile != NULL) {
outfile_fd = fopen(outfile, "w");
if (outfile_fd == NULL) {
dE("Can't open %s: %s", outfile, strerror(errno));
return -1;
}
}
oscap_document_type_t scap_type = oscap_source_get_scap_type(source);
const char *schema_version = oscap_source_get_schema_version(source);
if (!schema_version) {
schema_version = "unknown schema version";
}
int ret = oscap_source_validate_schematron_priv(source, scap_type,
schema_version, outfile_fd);
if (outfile != NULL)
fclose(outfile_fd);
int ret = oscap_source_validate_schematron_priv(source, scap_type, schema_version);
if (ret != 0) {
const char *type_name = oscap_document_type_to_string(scap_type);
const char *origin = oscap_source_readable_origin(source);
Expand Down
3 changes: 1 addition & 2 deletions src/source/public/oscap_source.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,11 +142,10 @@ OSCAP_API int oscap_source_validate(struct oscap_source *source, xml_reporter re
* Validate the SCAP document against schematron assertions
* @memberof oscap_source
* @param source The oscap_source to validate
* @param outfile path to out file containing errors, NULL for stdout
* @note The held resource has to be XML for this function to work.
* @returns 0 on pass; 1 on fail, and -1 on internal error
*/
OSCAP_API int oscap_source_validate_schematron(struct oscap_source *source, const char *outfile);
OSCAP_API int oscap_source_validate_schematron(struct oscap_source *source);

/**
* Returns human readable description of oscap_source origin
Expand Down
53 changes: 26 additions & 27 deletions src/source/schematron.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ struct oscap_schema_table_entry OSCAP_SCHEMATRON_TABLE[] = {
{OSCAP_DOCUMENT_SDS, "1.3", "sds/1.3/source-data-stream-1.3.xsl"}
};

static int _validate_sds_components(struct oscap_source *source, FILE *outfile_fd)
static int _validate_sds_components(struct oscap_source *source)
{
int ret = 0;
struct ds_sds_session *session = ds_sds_session_new_from_source(source);
Expand All @@ -126,12 +126,11 @@ static int _validate_sds_components(struct oscap_source *source, FILE *outfile_f
struct oscap_source *cs = oscap_htable_iterator_next_value(it);
const char *type = oscap_document_type_to_string(oscap_source_get_scap_type(cs));
const char *origin = oscap_source_readable_origin(cs);
fprintf(outfile_fd, "Starting schematron validation of %s component '%s':\n", type, origin);
printf("Starting schematron validation of %s component '%s':\n", type, origin);
int component_result = oscap_source_validate_schematron_priv(cs,
oscap_source_get_scap_type(cs),
oscap_source_get_schema_version(cs),
outfile_fd);
fprintf(outfile_fd, "Schematron validation of %s component '%s': %s\n\n", type, origin, component_result == 0 ? "PASS" : "FAIL");
oscap_source_get_schema_version(cs));
printf("Schematron validation of %s component '%s': %s\n\n", type, origin, component_result == 0 ? "PASS" : "FAIL");
if (component_result != 0) {
ret = component_result;
}
Expand Down Expand Up @@ -408,7 +407,7 @@ static bool _req_src_236_2_sub1(xmlNodePtr data_stream_node, xmlXPathContextPtr
return res;
}

static bool _req_src_236_2(xmlXPathContextPtr context, FILE *outfile_fd)
static bool _req_src_236_2(xmlXPathContextPtr context)
{
/*
* This function implements the check for SCAPVAL requirement SRC-236-2
Expand All @@ -432,7 +431,7 @@ static bool _req_src_236_2(xmlXPathContextPtr context, FILE *outfile_fd)
free(use_case);
if (!_req_src_236_2_sub1(data_stream_node, context)) {
char *data_stream_id = (char *) xmlGetProp(data_stream_node, BAD_CAST "id");
fprintf(outfile_fd, "Error: SRC-236-2|scap:data-stream %s\n", data_stream_id);
printf("Error: SRC-236-2|scap:data-stream %s\n", data_stream_id);
free(data_stream_id);
res = false;
break;
Expand Down Expand Up @@ -574,7 +573,7 @@ static bool _req_src_346_1_sub1(xmlNodePtr data_stream_node, xmlXPathContextPtr
return res;
}

static bool _req_src_346_1(xmlXPathContextPtr context, FILE *outfile_fd)
static bool _req_src_346_1(xmlXPathContextPtr context)
{
/*
* This function implements the check for SCAPVAL requirement SRC-346-1
Expand All @@ -591,7 +590,7 @@ static bool _req_src_346_1(xmlXPathContextPtr context, FILE *outfile_fd)
xmlNodePtr data_stream_node = data_streams->nodesetval->nodeTab[i];
if (!_req_src_346_1_sub1(data_stream_node, context)) {
char *data_stream_id = (char *) xmlGetProp(data_stream_node, BAD_CAST "id");
fprintf(outfile_fd, "Error: SRC-346-1|scap:data-stream %s\n", data_stream_id);
printf("Error: SRC-346-1|scap:data-stream %s\n", data_stream_id);
free(data_stream_id);
res = false;
break;
Expand All @@ -601,7 +600,7 @@ static bool _req_src_346_1(xmlXPathContextPtr context, FILE *outfile_fd)
return res;
}

static int _additional_schematron_checks(struct oscap_source *source, FILE *outfile_fd)
static int _additional_schematron_checks(struct oscap_source *source)
{
xmlDocPtr doc = oscap_source_get_xmlDoc(source);
xmlXPathContextPtr context = xmlXPathNewContext(doc);
Expand All @@ -618,17 +617,17 @@ static int _additional_schematron_checks(struct oscap_source *source, FILE *outf

int res = 0;
/* Assert ID: scap-use-case-conf-verification-benchmark-one-rule-ref-oval-ocil */
if (!_req_src_236_2(context, outfile_fd))
if (!_req_src_236_2(context))
res = 1;
/* Assert ID: scap-general-scap-content-xccdf-check-content-ref-name-not-req */
if (!_req_src_346_1(context, outfile_fd))
if (!_req_src_346_1(context))
res = 1;

xmlXPathFreeContext(context);
return res;
}

static int _run_schematron_with_warnings_and_errors(struct oscap_source *source, const char *schema_path, FILE *outfile_fd)
static int _run_schematron_with_warnings_and_errors(struct oscap_source *source, const char *schema_path)
{
int validity = 0;
const char *params[] = { NULL };
Expand All @@ -641,27 +640,27 @@ static int _run_schematron_with_warnings_and_errors(struct oscap_source *source,
/* "Error:" found in schematron output */
validity = 1;
}
fputs(xslt_output, outfile_fd);
puts(xslt_output);
free(xslt_output);
return validity;
}

static int _sds_schematron_validation(struct oscap_source *source, const char *schema_path, FILE *outfile_fd)
static int _sds_schematron_validation(struct oscap_source *source, const char *schema_path)
{
int validity = 0;
fprintf(outfile_fd, "Starting global schematron validation using the source data stream schematron\n");
printf("Starting global schematron validation using the source data stream schematron\n");

if (_additional_schematron_checks(source, outfile_fd) != 0) {
if (_additional_schematron_checks(source) != 0) {
validity = 1;
}
if (_run_schematron_with_warnings_and_errors(source, schema_path, outfile_fd) != 0) {
if (_run_schematron_with_warnings_and_errors(source, schema_path) != 0) {
validity = 1;
}
fprintf(outfile_fd, "Global schematron validation using the source data stream schematron: %s\n\n", validity == 0 ? "PASS" : "FAIL");
printf("Global schematron validation using the source data stream schematron: %s\n\n", validity == 0 ? "PASS" : "FAIL");
return validity;
}

int oscap_source_validate_schematron_priv(struct oscap_source *source, oscap_document_type_t scap_type, const char *version, FILE *outfile_fd)
int oscap_source_validate_schematron_priv(struct oscap_source *source, oscap_document_type_t scap_type, const char *version)
{
const char *origin = oscap_source_readable_origin(source);
if (version == NULL) {
Expand All @@ -675,11 +674,11 @@ int oscap_source_validate_schematron_priv(struct oscap_source *source, oscap_doc
scap_type == OSCAP_DOCUMENT_CPE_DICTIONARY ||
scap_type == OSCAP_DOCUMENT_SCE_RESULT ||
scap_type == OSCAP_DOCUMENT_OCIL) {
fprintf(outfile_fd, "Skipped\n");
printf("Skipped\n");
return 0;
}
if (scap_type == OSCAP_DOCUMENT_XCCDF && !strcmp(version, "1.1")) {
fprintf(outfile_fd, "Skipped\n");
printf("Skipped\n");
return 0;
}

Expand All @@ -699,20 +698,20 @@ int oscap_source_validate_schematron_priv(struct oscap_source *source, oscap_doc
/* validate */
int ret = 0;
if (scap_type == OSCAP_DOCUMENT_SDS) {
int component_validity = _validate_sds_components(source, outfile_fd);
int global_validity = _sds_schematron_validation(source, schematron_path, outfile_fd);
int component_validity = _validate_sds_components(source);
int global_validity = _sds_schematron_validation(source, schematron_path);
if (component_validity != 0 || global_validity != 0) {
ret = 1;
}
fprintf(outfile_fd, "Complete result of schematron validation of '%s': %s\n", origin, ret == 0 ? "PASS" : "FAIL");
printf("Complete result of schematron validation of '%s': %s\n", origin, ret == 0 ? "PASS" : "FAIL");
} else if (scap_type == OSCAP_DOCUMENT_XCCDF) {
ret = _run_schematron_with_warnings_and_errors(source, schematron_path, outfile_fd);
ret = _run_schematron_with_warnings_and_errors(source, schematron_path);
} else {
const char *params[] = { NULL };
char *xslt_output = oscap_source_apply_xslt_path_mem(source, schematron_path, params, oscap_path_to_schemas());
if (xslt_output != NULL) {
ret = 1;
fputs(xslt_output, outfile_fd);
puts(xslt_output);
}
free(xslt_output);
}
Expand Down
2 changes: 1 addition & 1 deletion src/source/schematron_priv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,6 @@
#include "source/public/oscap_source.h"


int oscap_source_validate_schematron_priv(struct oscap_source *source, oscap_document_type_t scap_type, const char *version, FILE *outfile_fd);
int oscap_source_validate_schematron_priv(struct oscap_source *source, oscap_document_type_t scap_type, const char *version);

#endif
2 changes: 1 addition & 1 deletion utils/oscap-oval.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,7 +772,7 @@ static int app_oval_validate(const struct oscap_action *action) {
} else {
// We can only do schematron validation if the file isn't a source datastream
if (action->schematron && oscap_source_get_scap_type(source) != OSCAP_DOCUMENT_SDS) {
ret = oscap_source_validate_schematron(source, NULL);
ret = oscap_source_validate_schematron(source);
if (ret < 0) {
result = OSCAP_ERROR;
} else if (ret > 0) {
Expand Down
2 changes: 1 addition & 1 deletion utils/oscap-xccdf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,7 +1364,7 @@ int app_xccdf_validate(const struct oscap_action *action) {
result = OSCAP_FAIL;
} else {
if (action->schematron) {
ret = oscap_source_validate_schematron(source, NULL);
ret = oscap_source_validate_schematron(source);
if (ret < 0) {
result = OSCAP_ERROR;
} else if (ret > 0) {
Expand Down
Loading