summaryrefslogtreecommitdiffabout
authorMichael Krelin <hacker@klever.net>2007-12-27 20:58:28 (UTC)
committer Michael Krelin <hacker@klever.net>2008-01-04 18:18:34 (UTC)
commit2ddc48944c5238fa1b99e50fc194d220d9e92f43 (patch) (side-by-side diff)
tree55d654042e3e52c30468d4cdf8b493e1b0cd59f9
parent2e8d7f2a65518ec6cb50166771dac8ca41c7304e (diff)
downloadlibopkele-2ddc48944c5238fa1b99e50fc194d220d9e92f43.zip
libopkele-2ddc48944c5238fa1b99e50fc194d220d9e92f43.tar.gz
libopkele-2ddc48944c5238fa1b99e50fc194d220d9e92f43.tar.bz2
added openid.sreg.ns parameter to sreg extension
Signed-off-by: Michael Krelin <hacker@klever.net>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--include/opkele/uris.h1
-rw-r--r--lib/sreg.cc2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/opkele/uris.h b/include/opkele/uris.h
index 3243831..56c2d6d 100644
--- a/include/opkele/uris.h
+++ b/include/opkele/uris.h
@@ -1,17 +1,18 @@
#ifndef __OPKELE_URIS_H
#define __OPKELE_URIS_H
#define NSURI_XRDS "xri://$xrds"
#define NSURI_XRD "xri://$xrd*($v*2.0)"
#define NSURI_OPENID10 "http://openid.net/xmlns/1.0"
#define OIURI_OPENID20 "http://specs.openid.net/auth/2.0"
+#define OIURI_SREG11 "http://openid.net/extensions/sreg/1.1"
#define STURI_OPENID10 "http://openid.net/signon/1.0"
#define STURI_OPENID11 "http://openid.net/signon/1.1"
#define STURI_OPENID20 "http://specs.openid.net/auth/2.0/signon"
#define STURI_OPENID20_OP "http://specs.openid.net/auth/2.0/server"
#define IDURI_SELECT20 "http://specs.openid.net/auth/2.0/identifier_select"
#endif /* __OPKELE_URIS_H */
diff --git a/lib/sreg.cc b/lib/sreg.cc
index 60dc691..dd7ed12 100644
--- a/lib/sreg.cc
+++ b/lib/sreg.cc
@@ -1,14 +1,15 @@
#include <opkele/exception.h>
#include <opkele/sreg.h>
+#include <opkele/uris.h>
#include <algorithm>
namespace opkele {
using std::find;
static const struct _sreg_field {
const char *fieldname;
sreg_t::fieldbit_t fieldbit;
} fields[] = {
{ "nickname", sreg_t::field_nickname },
{ "email", sreg_t::field_email },
{ "fullname", sreg_t::field_fullname },
@@ -30,24 +31,25 @@ namespace opkele {
void sreg_t::checkid_hook(params_t& p,const string& /* identity */) {
string fr, fo;
for(fields_iterator f=fields_BEGIN;f<fields_END;++f) {
if(f->fieldbit&fields_required) {
if(!fr.empty()) fr+=",";
fr += f->fieldname;
}
if(f->fieldbit&fields_optional) {
if(!fo.empty()) fo+=",";
fo += f->fieldname;
}
}
+ p["sreg.ns"] = OIURI_SREG11;
if(!fr.empty()) p["sreg.required"]=fr;
if(!fo.empty()) p["sreg.optional"]=fo;
if(!policy_url.empty()) p["sreg.policy_url"]=policy_url;
}
void sreg_t::id_res_hook(const params_t& /* p */,const params_t& sp,const string& /* identity */) {
clear();
for(fields_iterator f=fields_BEGIN;f<fields_END;++f) {
string fn = "sreg."; fn+=f->fieldname;
if(!sp.has_param(fn)) continue;
has_fields |= f->fieldbit;
response[f->fieldbit]=sp.get_param(fn);