summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2008-04-06 09:09:34 (UTC)
committer Michael Krelin <hacker@klever.net>2008-04-06 09:09:34 (UTC)
commit3ad3ff71c4799ffd5f592fadb64feabac9e85b46 (patch) (side-by-side diff)
tree8f11323de7dc782cbc0b644c92d857b1e401f70f
parenta9bb96d74c1337771bb4a9c1a4e78e2f2a73bbff (diff)
parent5d91c1f9eb443a13e36bb607d8c1b770e561888c (diff)
downloadlibopkele-3ad3ff71c4799ffd5f592fadb64feabac9e85b46.zip
libopkele-3ad3ff71c4799ffd5f592fadb64feabac9e85b46.tar.gz
libopkele-3ad3ff71c4799ffd5f592fadb64feabac9e85b46.tar.bz2
Merge commit 'devel/devel/oauth' into devel/oauth
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--lib/basic_op.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/basic_op.cc b/lib/basic_op.cc
index fa659ac..511b51a 100644
--- a/lib/basic_op.cc
+++ b/lib/basic_op.cc
@@ -149,25 +149,31 @@ namespace opkele {
try {
return_to = inm.get_field("return_to");
}catch(failed_lookup&) { }
if(openid2) {
try {
realm = inm.get_field("realm");
+ if(realm.empty())
+ throw failed_lookup(OPKELE_CP_ "Empty realm doesn't count");
}catch(failed_lookup&) {
try {
realm = inm.get_field("trust_root");
+ if(realm.empty())
+ throw failed_lookup(OPKELE_CP_ "Empty trust_root doesn't count");
}catch(failed_lookup&) {
if(return_to.empty())
throw bad_input(OPKELE_CP_
"Both realm and return_to are unset");
realm = return_to;
}
}
}else{
try {
realm = inm.get_field("trust_root");
+ if(realm.empty())
+ throw failed_lookup(OPKELE_CP_ "Empty trust_root doesn't count");
}catch(failed_lookup&) {
if(return_to.empty())
throw bad_input(OPKELE_CP_
"Both realm and return_to are unset");
realm = return_to;
}