Skip to content

Commit

Permalink
Merge pull request #1308 from kgaillot/fixes
Browse files Browse the repository at this point in the history 
Fix: libcrmcommon: handle schema versions properly
  • Loading branch information
@kgaillot
kgaillot authored Jul 19, 2017
2 parents 226bc4b + d69a8ec commit 989f1a8
Show file tree
Hide file tree
Showing 7 changed files with 106 additions and 100 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ before_install:
- sudo apt-get update -qq

install:
- sudo apt-get install -qq automake autoconf chrpath libglib2.0-dev perl net-tools python libtool libxml2-dev bison flex uuid-dev libbz2-dev zlib1g-dev libltdl3-dev libgnutls-dev python-central python-dev libpam0g-dev libncurses5-dev libcorosync-dev libxslt1-dev libdbus-1-dev
- sudo apt-get install -qq automake autoconf chrpath libglib2.0-dev perl net-tools python libtool libxml2-dev bison flex uuid-dev libbz2-dev zlib1g-dev libltdl3-dev libgnutls-dev python-dev libpam0g-dev libncurses5-dev libcorosync-dev libxslt1-dev libdbus-1-dev
- sudo apt-get install -qq cluster-glue-dev heartbeat-dev libheartbeat2-dev
- sudo apt-get install -qq libqb-dev

Expand Down
2 changes: 0 additions & 2 deletions include/crm/common/alerts_internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,6 @@ crm_alert_envvar_t *crm_dup_alert_envvar(crm_alert_envvar_t *src);
crm_alert_entry_t *crm_alert_entry_new(const char *id, const char *path);
void crm_free_alert_entry(crm_alert_entry_t *entry);
void crm_free_alert_envvar(crm_alert_envvar_t *entry);
void crm_set_alert_key(enum crm_alert_keys_e name, const char *value);
void crm_set_alert_key_int(enum crm_alert_keys_e name, int value);
void crm_insert_alert_key(GHashTable *table, enum crm_alert_keys_e name,
const char *value);
void crm_insert_alert_key_int(GHashTable *table, enum crm_alert_keys_e name,
Expand Down
2 changes: 1 addition & 1 deletion lib/common/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ libcrmcommon_la_LDFLAGS = -version-info 10:0:7
libcrmcommon_la_CFLAGS = $(CFLAGS_HARDENED_LIB)
libcrmcommon_la_LDFLAGS += $(LDFLAGS_HARDENED_LIB)

libcrmcommon_la_LIBADD = @LIBADD_DL@ $(GNUTLSLIBS) -lm
libcrmcommon_la_LIBADD = @LIBADD_DL@ $(GNUTLSLIBS)

libcrmcommon_la_SOURCES = compat.c digest.c ipc.c io.c procfs.c utils.c xml.c \
iso8601.c remote.c mainloop.c logging.c watchdog.c \
Expand Down
24 changes: 0 additions & 24 deletions lib/common/alerts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,30 +136,6 @@ crm_dup_alert_entry(crm_alert_entry_t *entry)
return new_entry;
}

void
crm_set_alert_key(enum crm_alert_keys_e name, const char *value)
{
const char **key;

for (key = crm_alert_keys[name]; *key; key++) {
crm_trace("Setting alert key %s = '%s'", *key, value);
if (value) {
setenv(*key, value, 1);
} else {
unsetenv(*key);
}
}
}

void
crm_set_alert_key_int(enum crm_alert_keys_e name, int value)
{
char *s = crm_itoa(value);

crm_set_alert_key(name, s);
free(s);
}

void
crm_unset_alert_keys()
{
Expand Down
170 changes: 101 additions & 69 deletions lib/common/schemas.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <string.h>
#include <dirent.h>
#include <errno.h>
#include <math.h>
#include <sys/stat.h>
#include <stdarg.h>

Expand All @@ -40,20 +39,38 @@
#include <crm/common/xml.h>
#include <crm/common/xml_internal.h> /* CRM_XML_LOG_BASE */

typedef struct {
unsigned char v[2];
} schema_version_t;

#define SCHEMA_ZERO { .v = { 0, 0 } }

#define schema_scanf(s, prefix, version, suffix) \
sscanf((s), prefix "%hhu.%hhu" suffix, &((version).v[0]), &((version).v[1]))

#define schema_strdup_printf(prefix, version, suffix) \
crm_strdup_printf(prefix "%u.%u" suffix, (version).v[0], (version).v[1])

typedef struct {
xmlRelaxNGPtr rng;
xmlRelaxNGValidCtxtPtr valid;
xmlRelaxNGParserCtxtPtr parser;
} relaxng_ctx_cache_t;

enum schema_validator_e {
schema_validator_none,
schema_validator_dtd,
schema_validator_rng
};

struct schema_s {
int type;
float version;
char *name;
char *location;
char *transform;
int after_transform;
void *cache;
enum schema_validator_e validator;
int after_transform;
schema_version_t version;
};

static struct schema_s *known_schemas = NULL;
Expand Down Expand Up @@ -86,13 +103,11 @@ xml_minimum_schema_index(void)
static int best = 0;
if (best == 0) {
int lpc = 0;
float target = 0.0;

best = xml_latest_schema_index();
target = floor(known_schemas[best].version);

for (lpc = best; lpc > 0; lpc--) {
if (known_schemas[lpc].version < target) {
if (known_schemas[lpc].version.v[0]
< known_schemas[best].version.v[0]) {
return best;
} else {
best = lpc;
Expand Down Expand Up @@ -134,19 +149,27 @@ get_schema_path(const char *name, const char *file)
return crm_strdup_printf("%s/%s.rng", base, name);
}

static inline bool
version_from_filename(const char *filename, schema_version_t *version)
{
int rc = schema_scanf(filename, "pacemaker-", *version, ".rng");

return (rc == 2);
}

static int
schema_filter(const struct dirent *a)
{
int rc = 0;
float version = 0;
schema_version_t version = SCHEMA_ZERO;

if (strstr(a->d_name, "pacemaker-") != a->d_name) {
/* crm_trace("%s - wrong prefix", a->d_name); */

} else if (!crm_ends_with(a->d_name, ".rng")) {
/* crm_trace("%s - wrong suffix", a->d_name); */

} else if (sscanf(a->d_name, "pacemaker-%f.rng", &version) == 0) {
} else if (!version_from_filename(a->d_name, &version)) {
/* crm_trace("%s - wrong format", a->d_name); */

} else if (strcmp(a->d_name, "pacemaker-1.1.rng") == 0) {
Expand All @@ -164,49 +187,52 @@ schema_filter(const struct dirent *a)
static int
schema_sort(const struct dirent **a, const struct dirent **b)
{
int rc = 0;
float a_version = 0.0;
float b_version = 0.0;
schema_version_t a_version = SCHEMA_ZERO;
schema_version_t b_version = SCHEMA_ZERO;

sscanf(a[0]->d_name, "pacemaker-%f.rng", &a_version);
sscanf(b[0]->d_name, "pacemaker-%f.rng", &b_version);
version_from_filename(a[0]->d_name, &a_version);
version_from_filename(b[0]->d_name, &b_version);

if (a_version > b_version) {
rc = 1;
} else if(a_version < b_version) {
rc = -1;
for (int i = 0; i < 2; ++i) {
if (a_version.v[i] < b_version.v[i]) {
return -1;
} else if (a_version.v[i] > b_version.v[i]) {
return 1;
}
}

/* crm_trace("%s (%f) vs. %s (%f) : %d", a[0]->d_name, a_version, b[0]->d_name, b_version, rc); */
return rc;
return 0;
}

static void
__xml_schema_add(int type, float version, const char *name,
const char *location, const char *transform,
int after_transform)
add_schema(enum schema_validator_e validator, const schema_version_t *version,
const char *name, const char *location, const char *transform,
int after_transform)
{
int last = xml_schema_max;
bool have_version = FALSE;

xml_schema_max++;
known_schemas = realloc_safe(known_schemas,
xml_schema_max * sizeof(struct schema_s));
CRM_ASSERT(known_schemas != NULL);
memset(known_schemas+last, 0, sizeof(struct schema_s));
known_schemas[last].type = type;
known_schemas[last].validator = validator;
known_schemas[last].after_transform = after_transform;

if (version > 0.0) {
known_schemas[last].version = version;
known_schemas[last].name = crm_strdup_printf("pacemaker-%.1f", version);
known_schemas[last].location = crm_strdup_printf("%s.rng", known_schemas[last].name);

for (int i = 0; i < 2; ++i) {
known_schemas[last].version.v[i] = version->v[i];
if (version->v[i]) {
have_version = TRUE;
}
}
if (have_version) {
known_schemas[last].name = schema_strdup_printf("pacemaker-", *version, "");
known_schemas[last].location = crm_strdup_printf("%s.rng",
known_schemas[last].name);
} else {
char dummy[1024];
CRM_ASSERT(name);
CRM_ASSERT(location);
sscanf(name, "%[^-]-%f", dummy, &version);
known_schemas[last].version = version;
schema_scanf(name, "%*[^-]-", known_schemas[last].version, "");
known_schemas[last].name = strdup(name);
known_schemas[last].location = strdup(location);
}
Expand Down Expand Up @@ -246,39 +272,45 @@ crm_schema_init(void)
int lpc, max;
const char *base = get_schema_root();
struct dirent **namelist = NULL;
const schema_version_t zero = SCHEMA_ZERO;

max = scandir(base, &namelist, schema_filter, schema_sort);
__xml_schema_add(1, 0.0, "pacemaker-0.6", "crm.dtd", "upgrade06.xsl", 3);
__xml_schema_add(1, 0.0, "transitional-0.6", "crm-transitional.dtd",
"upgrade06.xsl", 3);
__xml_schema_add(2, 0.0, "pacemaker-0.7", "pacemaker-1.0.rng", NULL, 0);

add_schema(schema_validator_dtd, &zero, "pacemaker-0.6",
"crm.dtd", "upgrade06.xsl", 3);

add_schema(schema_validator_dtd, &zero, "transitional-0.6",
"crm-transitional.dtd", "upgrade06.xsl", 3);

add_schema(schema_validator_rng, &zero, "pacemaker-0.7",
"pacemaker-1.0.rng", NULL, 0);

if (max < 0) {
crm_notice("scandir(%s) failed: %s (%d)", base, strerror(errno), errno);

} else {
for (lpc = 0; lpc < max; lpc++) {
int next = 0;
float version = 0.0;
schema_version_t version = SCHEMA_ZERO;
char *transform = NULL;

sscanf(namelist[lpc]->d_name, "pacemaker-%f.rng", &version);
version_from_filename(namelist[lpc]->d_name, &version);
if ((lpc + 1) < max) {
float next_version = 0.0;
schema_version_t next_version = SCHEMA_ZERO;

sscanf(namelist[lpc+1]->d_name, "pacemaker-%f.rng",
&next_version);
version_from_filename(namelist[lpc+1]->d_name, &next_version);

if (floor(version) < floor(next_version)) {
if (version.v[0] < next_version.v[0]) {
struct stat s;
char *xslt = NULL;

transform = crm_strdup_printf("upgrade-%.1f.xsl", version);
transform = schema_strdup_printf("upgrade-", version, ".xsl");
xslt = get_schema_path(NULL, transform);
if (stat(xslt, &s) != 0) {
crm_err("Transform %s not found", xslt);
free(xslt);
__xml_schema_add(2, version, NULL, NULL, NULL, -1);
add_schema(schema_validator_rng, &version, NULL, NULL,
NULL, -1);
break;
} else {
free(xslt);
Expand All @@ -288,16 +320,22 @@ crm_schema_init(void)
} else {
next = -1;
}
__xml_schema_add(2, version, NULL, NULL, transform, next);
add_schema(schema_validator_rng, &version, NULL, NULL, transform,
next);
free(namelist[lpc]);
free(transform);
}
}

/* 1.1 was the old name for -next */
__xml_schema_add(2, 0.0, "pacemaker-1.1", "pacemaker-next.rng", NULL, 0);
__xml_schema_add(2, 0.0, "pacemaker-next", "pacemaker-next.rng", NULL, -1);
__xml_schema_add(0, 0.0, "none", "N/A", NULL, -1);
add_schema(schema_validator_rng, &zero, "pacemaker-1.1",
"pacemaker-next.rng", NULL, 0);

add_schema(schema_validator_rng, &zero, "pacemaker-next",
"pacemaker-next.rng", NULL, -1);

add_schema(schema_validator_none, &zero, "none",
"N/A", NULL, -1);
free(namelist);
}

Expand Down Expand Up @@ -469,15 +507,11 @@ crm_schema_cleanup(void)

for (lpc = 0; lpc < xml_schema_max; lpc++) {

switch (known_schemas[lpc].type) {
case 0:
/* None */
break;
case 1:
/* DTD - Not cached */
switch (known_schemas[lpc].validator) {
case schema_validator_none:
case schema_validator_dtd: // not cached
break;
case 2:
/* RNG - Cached */
case schema_validator_rng: // cached
ctx = (relaxng_ctx_cache_t *) known_schemas[lpc].cache;
if (ctx == NULL) {
break;
Expand All @@ -494,8 +528,6 @@ crm_schema_cleanup(void)
free(ctx);
known_schemas[lpc].cache = NULL;
break;
default:
break;
}
free(known_schemas[lpc].name);
free(known_schemas[lpc].location);
Expand All @@ -510,15 +542,13 @@ validate_with(xmlNode *xml, int method, gboolean to_logs)
{
xmlDocPtr doc = NULL;
gboolean valid = FALSE;
int type = 0;
char *file = NULL;

if (method < 0) {
return FALSE;
}

type = known_schemas[method].type;
if(type == 0) {
if (known_schemas[method].validator == schema_validator_none) {
return TRUE;
}

Expand All @@ -527,18 +557,20 @@ validate_with(xmlNode *xml, int method, gboolean to_logs)
file = get_schema_path(known_schemas[method].name,
known_schemas[method].location);

crm_trace("Validating with: %s (type=%d)", crm_str(file), type);
switch (type) {
case 1:
crm_trace("Validating with: %s (type=%d)",
crm_str(file), known_schemas[method].validator);
switch (known_schemas[method].validator) {
case schema_validator_dtd:
valid = validate_with_dtd(doc, to_logs, file);
break;
case 2:
case schema_validator_rng:
valid =
validate_with_relaxng(doc, to_logs, file,
(relaxng_ctx_cache_t **) & (known_schemas[method].cache));
break;
default:
crm_err("Unknown validator type: %d", type);
crm_err("Unknown validator type: %d",
known_schemas[method].validator);
break;
}

Expand Down Expand Up @@ -765,7 +797,7 @@ update_validation(xmlNode **xml_blob, int *best, int max, gboolean transform,
*best = lpc++;

} else if (lpc < 0) {
crm_debug("Unknown validation type");
crm_debug("Unknown validation schema");
lpc = 0;
}
}
Expand Down
Loading

0 comments on commit 989f1a8

Please sign in to comment.