projects
/
shibboleth
/
cpp-opensaml.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
704c0a7
)
Add option for schema validation.
author
Scott Cantor
<cantor.2@osu.edu>
Thu, 21 Jul 2011 18:16:28 +0000
(18:16 +0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Thu, 21 Jul 2011 18:16:28 +0000
(18:16 +0000)
samlsign/samlsign.cpp
patch
|
blob
|
history
diff --git
a/samlsign/samlsign.cpp
b/samlsign/samlsign.cpp
index
2e67ddf
..
27f4a2c
100644
(file)
--- a/
samlsign/samlsign.cpp
+++ b/
samlsign/samlsign.cpp
@@
-117,7
+117,7
@@
public:
int main(int argc,char* argv[])
{
int main(int argc,char* argv[])
{
- bool verify=true;
+ bool verify=true
,validate=false
;
char* url_param=nullptr;
char* path_param=nullptr;
char* key_param=nullptr;
char* url_param=nullptr;
char* path_param=nullptr;
char* key_param=nullptr;
@@
-161,6
+161,8
@@
int main(int argc,char* argv[])
prot=argv[++i];
else if (!strcmp(argv[i],"-r") && i+1<argc)
rname=argv[++i];
prot=argv[++i];
else if (!strcmp(argv[i],"-r") && i+1<argc)
rname=argv[++i];
+ else if (!strcmp(argv[i],"-V"))
+ validate = true;
else if (!strcmp(argv[i],"-ns") && i+1<argc)
rns=argv[++i];
else if (!strcmp(argv[i],"-alg") && i+1<argc)
else if (!strcmp(argv[i],"-ns") && i+1<argc)
rns=argv[++i];
else if (!strcmp(argv[i],"-alg") && i+1<argc)
@@
-194,6
+196,8
@@
int main(int argc,char* argv[])
XMLToolingConfig& xmlconf = XMLToolingConfig::getConfig();
xmlconf.log_config(getenv("OPENSAML_LOG_CONFIG"));
XMLToolingConfig& xmlconf = XMLToolingConfig::getConfig();
xmlconf.log_config(getenv("OPENSAML_LOG_CONFIG"));
+ if (getenv("OPENSAML_SCHEMAS"))
+ xmlconf.catalog_path = getenv("OPENSAML_SCHEMAS");
SAMLConfig& conf=SAMLConfig::getConfig();
if (!conf.init())
return -2;
SAMLConfig& conf=SAMLConfig::getConfig();
if (!conf.init())
return -2;
@@
-208,18
+212,27
@@
int main(int argc,char* argv[])
auto_ptr_XMLCh wideurl(url_param);
URLInputSource src(wideurl.get());
Wrapper4InputSource dsrc(&src,false);
auto_ptr_XMLCh wideurl(url_param);
URLInputSource src(wideurl.get());
Wrapper4InputSource dsrc(&src,false);
- doc=xmlconf.getParser().parse(dsrc);
+ if (validate)
+ doc = xmlconf.getValidatingParser().parse(dsrc);
+ else
+ doc = xmlconf.getParser().parse(dsrc);
}
else if (path_param) {
auto_ptr_XMLCh widenit(path_param);
LocalFileInputSource src(widenit.get());
Wrapper4InputSource dsrc(&src,false);
}
else if (path_param) {
auto_ptr_XMLCh widenit(path_param);
LocalFileInputSource src(widenit.get());
Wrapper4InputSource dsrc(&src,false);
- doc=xmlconf.getParser().parse(dsrc);
+ if (validate)
+ doc = xmlconf.getValidatingParser().parse(dsrc);
+ else
+ doc = xmlconf.getParser().parse(dsrc);
}
else {
StdInInputSource src;
Wrapper4InputSource dsrc(&src,false);
}
else {
StdInInputSource src;
Wrapper4InputSource dsrc(&src,false);
- doc=xmlconf.getParser().parse(dsrc);
+ if (validate)
+ doc = xmlconf.getValidatingParser().parse(dsrc);
+ else
+ doc = xmlconf.getParser().parse(dsrc);
}
// Unmarshall it.
}
// Unmarshall it.