-rw-r--r-- | lib/sreg.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sreg.cc b/lib/sreg.cc index 60dc691..dd7ed12 100644 --- a/lib/sreg.cc +++ b/lib/sreg.cc | |||
@@ -1,89 +1,91 @@ | |||
1 | #include <opkele/exception.h> | 1 | #include <opkele/exception.h> |
2 | #include <opkele/sreg.h> | 2 | #include <opkele/sreg.h> |
3 | #include <opkele/uris.h> | ||
3 | #include <algorithm> | 4 | #include <algorithm> |
4 | 5 | ||
5 | namespace opkele { | 6 | namespace opkele { |
6 | using std::find; | 7 | using std::find; |
7 | 8 | ||
8 | static const struct _sreg_field { | 9 | static const struct _sreg_field { |
9 | const char *fieldname; | 10 | const char *fieldname; |
10 | sreg_t::fieldbit_t fieldbit; | 11 | sreg_t::fieldbit_t fieldbit; |
11 | }fields[] = { | 12 | }fields[] = { |
12 | { "nickname", sreg_t::field_nickname }, | 13 | { "nickname", sreg_t::field_nickname }, |
13 | { "email", sreg_t::field_email }, | 14 | { "email", sreg_t::field_email }, |
14 | { "fullname", sreg_t::field_fullname }, | 15 | { "fullname", sreg_t::field_fullname }, |
15 | { "dob", sreg_t::field_dob }, | 16 | { "dob", sreg_t::field_dob }, |
16 | { "gender", sreg_t::field_gender }, | 17 | { "gender", sreg_t::field_gender }, |
17 | { "postcode", sreg_t::field_postcode }, | 18 | { "postcode", sreg_t::field_postcode }, |
18 | { "country", sreg_t::field_country }, | 19 | { "country", sreg_t::field_country }, |
19 | { "language", sreg_t::field_language }, | 20 | { "language", sreg_t::field_language }, |
20 | { "timezone", sreg_t::field_timezone } | 21 | { "timezone", sreg_t::field_timezone } |
21 | }; | 22 | }; |
22 | # define fields_BEGINfields | 23 | # define fields_BEGINfields |
23 | # define fields_END &fields[sizeof(fields)/sizeof(*fields)] | 24 | # define fields_END &fields[sizeof(fields)/sizeof(*fields)] |
24 | typedef const struct _sreg_field *fields_iterator; | 25 | typedef const struct _sreg_field *fields_iterator; |
25 | 26 | ||
26 | bool operator==(const struct _sreg_field& fd,const string& fn) { | 27 | bool operator==(const struct _sreg_field& fd,const string& fn) { |
27 | return fd.fieldname==fn; | 28 | return fd.fieldname==fn; |
28 | } | 29 | } |
29 | 30 | ||
30 | void sreg_t::checkid_hook(params_t& p,const string& /* identity */) { | 31 | void sreg_t::checkid_hook(params_t& p,const string& /* identity */) { |
31 | string fr, fo; | 32 | string fr, fo; |
32 | for(fields_iterator f=fields_BEGIN;f<fields_END;++f) { | 33 | for(fields_iterator f=fields_BEGIN;f<fields_END;++f) { |
33 | if(f->fieldbit&fields_required) { | 34 | if(f->fieldbit&fields_required) { |
34 | if(!fr.empty()) fr+=","; | 35 | if(!fr.empty()) fr+=","; |
35 | fr += f->fieldname; | 36 | fr += f->fieldname; |
36 | } | 37 | } |
37 | if(f->fieldbit&fields_optional) { | 38 | if(f->fieldbit&fields_optional) { |
38 | if(!fo.empty()) fo+=","; | 39 | if(!fo.empty()) fo+=","; |
39 | fo += f->fieldname; | 40 | fo += f->fieldname; |
40 | } | 41 | } |
41 | } | 42 | } |
43 | p["sreg.ns"] = OIURI_SREG11; | ||
42 | if(!fr.empty()) p["sreg.required"]=fr; | 44 | if(!fr.empty()) p["sreg.required"]=fr; |
43 | if(!fo.empty()) p["sreg.optional"]=fo; | 45 | if(!fo.empty()) p["sreg.optional"]=fo; |
44 | if(!policy_url.empty()) p["sreg.policy_url"]=policy_url; | 46 | if(!policy_url.empty()) p["sreg.policy_url"]=policy_url; |
45 | } | 47 | } |
46 | 48 | ||
47 | void sreg_t::id_res_hook(const params_t& /* p */,const params_t& sp,const string& /* identity */) { | 49 | void sreg_t::id_res_hook(const params_t& /* p */,const params_t& sp,const string& /* identity */) { |
48 | clear(); | 50 | clear(); |
49 | for(fields_iterator f=fields_BEGIN;f<fields_END;++f) { | 51 | for(fields_iterator f=fields_BEGIN;f<fields_END;++f) { |
50 | string fn = "sreg."; fn+=f->fieldname; | 52 | string fn = "sreg."; fn+=f->fieldname; |
51 | if(!sp.has_param(fn)) continue; | 53 | if(!sp.has_param(fn)) continue; |
52 | has_fields |= f->fieldbit; | 54 | has_fields |= f->fieldbit; |
53 | response[f->fieldbit]=sp.get_param(fn); | 55 | response[f->fieldbit]=sp.get_param(fn); |
54 | } | 56 | } |
55 | } | 57 | } |
56 | 58 | ||
57 | const string& sreg_t::get_field(fieldbit_t fb) const { | 59 | const string& sreg_t::get_field(fieldbit_t fb) const { |
58 | response_t::const_iterator i = response.find(fb); | 60 | response_t::const_iterator i = response.find(fb); |
59 | if(i==response.end()) | 61 | if(i==response.end()) |
60 | throw failed_lookup(OPKELE_CP_ "no field data available"); | 62 | throw failed_lookup(OPKELE_CP_ "no field data available"); |
61 | return i->second; | 63 | return i->second; |
62 | } | 64 | } |
63 | 65 | ||
64 | void sreg_t::set_field(fieldbit_t fb,const string& fv) { | 66 | void sreg_t::set_field(fieldbit_t fb,const string& fv) { |
65 | response[fb] = fv; | 67 | response[fb] = fv; |
66 | has_fields |= fb; | 68 | has_fields |= fb; |
67 | } | 69 | } |
68 | 70 | ||
69 | void sreg_t::reset_field(fieldbit_t fb) { | 71 | void sreg_t::reset_field(fieldbit_t fb) { |
70 | has_fields &= ~fb; | 72 | has_fields &= ~fb; |
71 | response.erase(fb); | 73 | response.erase(fb); |
72 | } | 74 | } |
73 | 75 | ||
74 | void sreg_t::clear() { | 76 | void sreg_t::clear() { |
75 | has_fields = 0; response.clear(); | 77 | has_fields = 0; response.clear(); |
76 | } | 78 | } |
77 | 79 | ||
78 | static long fields_list_to_bitmask(string& fl) { | 80 | static long fields_list_to_bitmask(string& fl) { |
79 | long rv = 0; | 81 | long rv = 0; |
80 | while(!fl.empty()) { | 82 | while(!fl.empty()) { |
81 | string::size_type co = fl.find(','); | 83 | string::size_type co = fl.find(','); |
82 | string fn; | 84 | string fn; |
83 | if(co==string::npos) { | 85 | if(co==string::npos) { |
84 | fn = fl; fl.erase(); | 86 | fn = fl; fl.erase(); |
85 | }else{ | 87 | }else{ |
86 | fn = fl.substr(0,co); fl.erase(0,co+1); | 88 | fn = fl.substr(0,co); fl.erase(0,co+1); |
87 | } | 89 | } |
88 | fields_iterator f = find(fields_BEGIN,fields_END,fn); | 90 | fields_iterator f = find(fields_BEGIN,fields_END,fn); |
89 | if(f!=fields_END) | 91 | if(f!=fields_END) |