| -rw-r--r-- | include/opkele/uris.h | 1 | ||||
| -rw-r--r-- | lib/sreg.cc | 2 |
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,65 +1,67 @@ #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 }, { "dob", sreg_t::field_dob }, { "gender", sreg_t::field_gender }, { "postcode", sreg_t::field_postcode }, { "country", sreg_t::field_country }, { "language", sreg_t::field_language }, { "timezone", sreg_t::field_timezone } }; # define fields_BEGIN fields # define fields_END &fields[sizeof(fields)/sizeof(*fields)] typedef const struct _sreg_field *fields_iterator; bool operator==(const struct _sreg_field& fd,const string& fn) { return fd.fieldname==fn; } 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); } } const string& sreg_t::get_field(fieldbit_t fb) const { response_t::const_iterator i = response.find(fb); if(i==response.end()) throw failed_lookup(OPKELE_CP_ "no field data available"); return i->second; } void sreg_t::set_field(fieldbit_t fb,const string& fv) { response[fb] = fv; |