Skip to content

Commit

Permalink
Remove old style CGI runtime substitutions
Browse files Browse the repository at this point in the history 
This implements mapserver/mapserver/#4604.  All runtime substitution
configuration is now performed using `VALIDATION` blocks in `CLASS`,
`LAYER` or `WEB`: `METADATA` blocks are no longer involved.
  • Loading branch information
@tbonfort
Homme Zwaagstra authored and tbonfort committed Mar 28, 2013
1 parent afcb21a commit 0125dd3
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 30 deletions.
38 changes: 10 additions & 28 deletions mapfile.c
View file
Expand Up @@ -90,7 +90,7 @@ char *msPositionsText[MS_POSITIONS_LENGTH] = {"UL", "LR", "UR", "LL", "CR", "CL"


/* /*
** Validates a string (value) against a series of patterns. We support up to four to allow cascading from classObj to ** Validates a string (value) against a series of patterns. We support up to four to allow cascading from classObj to
** layerObj to webObj plus a legacy pattern like TEMPLATEPATTERN or qstring_validation_pattern. ** layerObj to webObj plus a legacy pattern like TEMPLATEPATTERN.
*/ */
int msValidateParameter(char *value, char *pattern1, char *pattern2, char *pattern3, char *pattern4) int msValidateParameter(char *value, char *pattern1, char *pattern2, char *pattern3, char *pattern4)
{ {
Expand Down Expand Up @@ -6832,7 +6832,6 @@ void msApplyDefaultSubstitutions(mapObj *map)
/* output formats (#3751) */ /* output formats (#3751) */
for(i=0; i<map->numoutputformats; i++) { for(i=0; i<map->numoutputformats; i++) {
applyOutputFormatDefaultSubstitutions(map->outputformatlist[i], "filename", &(map->web.validation)); applyOutputFormatDefaultSubstitutions(map->outputformatlist[i], "filename", &(map->web.validation));
applyOutputFormatDefaultSubstitutions(map->outputformatlist[i], "filename", &(map->web.metadata));
} }


for(i=0; i<map->numlayers; i++) { for(i=0; i<map->numlayers; i++) {
Expand All @@ -6841,13 +6840,10 @@ void msApplyDefaultSubstitutions(mapObj *map)
for(j=0; j<layer->numclasses; j++) { /* class settings take precedence... */ for(j=0; j<layer->numclasses; j++) { /* class settings take precedence... */
classObj *class = GET_CLASS(map, i, j); classObj *class = GET_CLASS(map, i, j);
applyClassDefaultSubstitutions(class, &(class->validation)); applyClassDefaultSubstitutions(class, &(class->validation));
applyClassDefaultSubstitutions(class, &(class->metadata));
} }


applyLayerDefaultSubstitutions(layer, &(layer->validation)); /* ...then layer settings... */ applyLayerDefaultSubstitutions(layer, &(layer->validation)); /* ...then layer settings... */
applyLayerDefaultSubstitutions(layer, &(layer->metadata));
applyLayerDefaultSubstitutions(layer, &(map->web.validation)); /* ...and finally web settings */ applyLayerDefaultSubstitutions(layer, &(map->web.validation)); /* ...and finally web settings */
applyLayerDefaultSubstitutions(layer, &(map->web.metadata));
} }
} }


Expand All @@ -6856,23 +6852,18 @@ void msApplySubstitutions(mapObj *map, char **names, char **values, int npairs)
int i,j,k; int i,j,k;


char *tag=NULL; char *tag=NULL;
char *validation_pattern_key=NULL;


for(i=0; i<npairs; i++) { for(i=0; i<npairs; i++) {


/* runtime subtitution string */ /* runtime subtitution string */
tag = (char *) msSmallMalloc(sizeof(char)*strlen(names[i]) + 3); tag = (char *) msSmallMalloc(sizeof(char)*strlen(names[i]) + 3);
sprintf(tag, "%%%s%%", names[i]); sprintf(tag, "%%%s%%", names[i]);


/* validation pattern key - deprecated */
validation_pattern_key = (char *) msSmallMalloc(sizeof(char)*strlen(names[i]) + 20);
sprintf(validation_pattern_key,"%s_validation_pattern", names[i]);

/* output formats (#3751) */ /* output formats (#3751) */
for(j=0; j<map->numoutputformats; j++) { for(j=0; j<map->numoutputformats; j++) {
const char *filename = msGetOutputFormatOption(map->outputformatlist[j], "FILENAME", NULL); const char *filename = msGetOutputFormatOption(map->outputformatlist[j], "FILENAME", NULL);
if(filename && (strcasestr(filename, tag) != NULL)) { if(filename && (strcasestr(filename, tag) != NULL)) {
if(msValidateParameter(values[i], msLookupHashTable(&(map->web.validation), names[i]), msLookupHashTable(&(map->web.metadata), validation_pattern_key), NULL, NULL) == MS_SUCCESS) { if(msValidateParameter(values[i], msLookupHashTable(&(map->web.validation), names[i]), NULL, NULL, NULL) == MS_SUCCESS) {
char *new_filename = msStrdup(filename); char *new_filename = msStrdup(filename);
new_filename = msCaseReplaceSubstring(new_filename, tag, values[i]); new_filename = msCaseReplaceSubstring(new_filename, tag, values[i]);
msSetOutputFormatOption(map->outputformatlist[j], "FILENAME", new_filename); msSetOutputFormatOption(map->outputformatlist[j], "FILENAME", new_filename);
Expand All @@ -6893,28 +6884,23 @@ void msApplySubstitutions(mapObj *map, char **names, char **values, int npairs)
if(layer->debug >= MS_DEBUGLEVEL_V) if(layer->debug >= MS_DEBUGLEVEL_V)
msDebug( " runtime substitution - Layer %s, Class %s, tag %s...\n", layer->name, class->name, tag); msDebug( " runtime substitution - Layer %s, Class %s, tag %s...\n", layer->name, class->name, tag);


if (msLookupHashTable(&(class->validation), names[i]) || if (msLookupHashTable(&(class->validation), names[i])) {
msLookupHashTable(&(class->metadata), validation_pattern_key)) {
if (msValidateParameter(values[i], if (msValidateParameter(values[i],
msLookupHashTable(&(class->validation), names[i]), msLookupHashTable(&(class->validation), names[i]),
msLookupHashTable(&(class->metadata), validation_pattern_key), NULL, NULL, NULL) != MS_SUCCESS) {
NULL, NULL) != MS_SUCCESS) {
/* skip as the name exists in the class validation but does not validate */ /* skip as the name exists in the class validation but does not validate */
continue; continue;
} }
} else if (msLookupHashTable(&(layer->validation), names[i]) || } else if (msLookupHashTable(&(layer->validation), names[i])) {
msLookupHashTable(&(layer->metadata), validation_pattern_key)) {
if (msValidateParameter(values[i], if (msValidateParameter(values[i],
msLookupHashTable(&(layer->validation), names[i]), msLookupHashTable(&(layer->validation), names[i]),
msLookupHashTable(&(layer->metadata), validation_pattern_key), NULL, NULL, NULL) != MS_SUCCESS) {
NULL, NULL) != MS_SUCCESS) {
/* skip as the name exists in the layer validation but does not validate */ /* skip as the name exists in the layer validation but does not validate */
continue; continue;
} }
} else if (msValidateParameter(values[i], } else if (msValidateParameter(values[i],
msLookupHashTable(&(map->web.validation), names[i]), msLookupHashTable(&(map->web.validation), names[i]),
msLookupHashTable(&(map->web.metadata), validation_pattern_key), NULL, NULL, NULL) != MS_SUCCESS) {
NULL, NULL) != MS_SUCCESS) {
/* skip as the web validation fails */ /* skip as the web validation fails */
continue; continue;
} }
Expand All @@ -6928,19 +6914,16 @@ void msApplySubstitutions(mapObj *map, char **names, char **values, int npairs)
if(layer->debug >= MS_DEBUGLEVEL_V) if(layer->debug >= MS_DEBUGLEVEL_V)
msDebug( " runtime substitution - Layer %s, tag %s...\n", layer->name, tag); msDebug( " runtime substitution - Layer %s, tag %s...\n", layer->name, tag);


if (msLookupHashTable(&(layer->validation), names[i]) || if (msLookupHashTable(&(layer->validation), names[i])) {
msLookupHashTable(&(layer->metadata), validation_pattern_key)) {
if (msValidateParameter(values[i], if (msValidateParameter(values[i],
msLookupHashTable(&(layer->validation), names[i]), msLookupHashTable(&(layer->validation), names[i]),
msLookupHashTable(&(layer->metadata), validation_pattern_key), NULL, NULL, NULL) != MS_SUCCESS) {
NULL, NULL) != MS_SUCCESS) {
/* skip as the name exists in the layer validation but does not validate */ /* skip as the name exists in the layer validation but does not validate */
continue; continue;
} }
} else if (msValidateParameter(values[i], } else if (msValidateParameter(values[i],
msLookupHashTable(&(map->web.validation), names[i]), msLookupHashTable(&(map->web.validation), names[i]),
msLookupHashTable(&(map->web.metadata), validation_pattern_key), NULL, NULL, NULL) != MS_SUCCESS) {
NULL, NULL) != MS_SUCCESS) {
/* skip as the web validation fails */ /* skip as the web validation fails */
continue; continue;
} }
Expand All @@ -6950,7 +6933,6 @@ void msApplySubstitutions(mapObj *map, char **names, char **values, int npairs)
} }


msFree(tag); msFree(tag);
msFree(validation_pattern_key);
} /* next name/value pair */ } /* next name/value pair */
} }


Expand Down
4 changes: 2 additions & 2 deletions mapservutil.c
View file
Expand Up @@ -1184,7 +1184,7 @@ int msCGIDispatchQueryRequest(mapservObj *mapserv)
/* validate the qstring parameter */ /* validate the qstring parameter */
if(msValidateParameter(mapserv->QueryString, msLookupHashTable(&(GET_LAYER(mapserv->map, mapserv->SelectLayerIndex)->validation), "qstring"), if(msValidateParameter(mapserv->QueryString, msLookupHashTable(&(GET_LAYER(mapserv->map, mapserv->SelectLayerIndex)->validation), "qstring"),
msLookupHashTable(&(mapserv->map->web.validation), "qstring"), msLookupHashTable(&(mapserv->map->web.validation), "qstring"),
msLookupHashTable(&(GET_LAYER(mapserv->map, mapserv->SelectLayerIndex)->metadata), "qstring_validation_pattern"), NULL) != MS_SUCCESS) { NULL, NULL) != MS_SUCCESS) {
msSetError(MS_WEBERR, "Parameter 'qstring' value fails to validate.", "mapserv()"); msSetError(MS_WEBERR, "Parameter 'qstring' value fails to validate.", "mapserv()");
return MS_FAILURE; return MS_FAILURE;
} }
Expand Down Expand Up @@ -1276,7 +1276,7 @@ int msCGIDispatchQueryRequest(mapservObj *mapserv)
/* validate the qstring parameter */ /* validate the qstring parameter */
if(msValidateParameter(mapserv->QueryString, msLookupHashTable(&(GET_LAYER(mapserv->map, mapserv->QueryLayerIndex)->validation), "qstring"), if(msValidateParameter(mapserv->QueryString, msLookupHashTable(&(GET_LAYER(mapserv->map, mapserv->QueryLayerIndex)->validation), "qstring"),
msLookupHashTable(&(mapserv->map->web.validation), "qstring"), msLookupHashTable(&(mapserv->map->web.validation), "qstring"),
msLookupHashTable(&(GET_LAYER(mapserv->map, mapserv->QueryLayerIndex)->metadata), "qstring_validation_pattern"), NULL) != MS_SUCCESS) { NULL, NULL) != MS_SUCCESS) {
msSetError(MS_WEBERR, "Parameter 'qstring' value fails to validate.", "mapserv()"); msSetError(MS_WEBERR, "Parameter 'qstring' value fails to validate.", "mapserv()");
return MS_FAILURE; return MS_FAILURE;
} }
Expand Down

0 comments on commit 0125dd3

Please sign in to comment.