3 files changed, 164 insertions, 0 deletions

diff --git a/include/opkele/oauth.h b/include/opkele/oauth.h
new file mode 100644
index 0000000..14d0586
--- a/dev/null
+++ b/include/opkele/oauth.h
@@ -0,0 +1,22 @@
+#ifndef __OPKELE_OAUTH_H
+#define __OPKELE_OAUTH_H
+
+#include <string>
+
+namespace opkele {
+    namespace oauth {
+        using std::string;
+
+        struct token_t {
+            string key;
+            string secret;
+
+            token_t() { }
+            token_t(const string& k,const string& s)
+                : key(k), secret(s) { }
+        };
+
+    }
+}
+
+#endif /* __OPKELE_OAUTH_H */
diff --git a/include/opkele/oauth/consumer.h b/include/opkele/oauth/consumer.h
new file mode 100644
index 0000000..1e2784c
--- a/dev/null
+++ b/include/opkele/oauth/consumer.h
@@ -0,0 +1,124 @@
+#ifndef __OPKELE_OAUTH_CONSUMER_H
+#define __OPKELE_OAUTH_CONSUMER_H
+
+#include <string>
+#include <opkele/types.h>
+#include <opkele/oauth.h>
+
+namespace opkele {
+    namespace oauth {
+        using std::string;
+
+        enum oauth_method_t {
+            oauth_auth_header, oauth_post_body, oauth_url_query
+        };
+
+        struct service_endpoint_t {
+            string url;
+            string signature_method;
+            oauth_method_t oauth_method;
+
+            service_endpoint_t(const string& u,const string& sm,oauth_method_t om)
+                : url(u), signature_method(sm), oauth_method(om) { }
+        };
+
+        class basic_provider_endpoints {
+            public:
+
+                virtual ~basic_provider_endpoints() { }
+                
+                virtual const service_endpoint_t& get_request_token_endpoint() const = 0;
+                virtual const service_endpoint_t& get_authorize_user_endpoint() const = 0;
+                virtual const service_endpoint_t& get_access_token_endpoint() const = 0;
+
+                virtual service_endpoint_t& get_url_endpoint(service_endpoint_t& sep,
+                        const string& url) const = 0;
+        };
+
+        struct http_request_t {
+            string authorize_header;
+            string method;
+            string url;
+            string body;
+
+            http_request_t(const string& m,const string& u)
+                : method(m), url(u) { }
+        };
+
+        class basic_consumer {
+            public:
+                token_t consumer_token;
+
+                basic_consumer(const token_t& ct)
+                    : consumer_token(ct) { }
+                virtual ~basic_consumer() { }
+
+                virtual const basic_provider_endpoints& get_endpoints() const = 0;
+                virtual const string allocate_nonce(time_t ts) = 0;
+
+                token_t get_request_token();
+                const string get_authorize_url(const token_t& rt,const string& callback="");
+                token_t get_access_token(const token_t& rt);
+
+                void prepare_request(
+                        http_request_t& req,
+                        const basic_fields& qf,const basic_fields& pf,
+                        oauth_method_t om,const string& sm,
+                        const token_t *t=0,const string& realm="");
+                void prepare_request(
+                        http_request_t& req,
+                        const basic_fields& qf,const basic_fields& pf,
+                        const service_endpoint_t& sep,
+                        const token_t *t=0,const string& realm="");
+
+                const string signature(
+                        const string& method,
+                        const string& url,
+                        const basic_fields& fields,
+                        const token_t* rt=0);
+
+                token_t acquire_token(
+                        const service_endpoint_t& sep,
+                        const token_t* rt=0);
+        };
+
+        class simple_provider_endpoints : public basic_provider_endpoints {
+            public:
+                service_endpoint_t sep_request_token;
+                service_endpoint_t sep_authorize_user;
+                service_endpoint_t sep_access_token;
+                service_endpoint_t sep_generic;
+
+                simple_provider_endpoints(
+                        const string& rt,const string& au,const string& at,
+                        const string& sm,
+                        oauth_method_t ams=oauth_post_body,
+                        oauth_method_t amr=oauth_auth_header )
+                    : sep_request_token(rt,sm,ams),
+                    sep_authorize_user(au,sm,oauth_url_query),
+                    sep_access_token(at,sm,ams),
+                    sep_generic("",sm,amr) { }
+
+                const service_endpoint_t& get_request_token_endpoint() const;
+                const service_endpoint_t& get_authorize_user_endpoint() const;
+                const service_endpoint_t& get_access_token_endpoint() const;
+                service_endpoint_t& get_url_endpoint(service_endpoint_t& sep,
+                        const string& url) const;
+        };
+
+        class simple_consumer : public basic_consumer {
+            public:
+                simple_provider_endpoints peps;
+
+                simple_consumer(const simple_provider_endpoints& eps,
+                        const token_t& ct)
+                    : basic_consumer(ct), peps(eps) { }
+
+                const basic_provider_endpoints& get_endpoints() const;
+                const string allocate_nonce(time_t ts);
+        };
+
+    }
+}
+
+#endif /* __OPKELE_OAUTH_CONSUMER_H */
diff --git a/include/opkele/types.h b/include/opkele/types.h
index f63bf5d..4471e6a 100644
--- a/include/opkele/types.h
+++ b/include/opkele/types.h
@@ -1,243 +1,261 @@
 #ifndef __OPKELE_TYPES_H
 #define __OPKELE_TYPES_H
 
 /**
  * @file
  * @brief various types declarations
  */
 
 #include <cstring>
 #include <ostream>
 #include <vector>
 #include <string>
 #include <map>
 #include <set>
 #include <list>
 #include <opkele/iterator.h>
 #include <opkele/tr1-mem.h>
 
 namespace opkele {
     using std::vector;
     using std::string;
     using std::map;
     using std::ostream;
     using std::multimap;
     using std::set;
     using std::list;
     using std::iterator;
     using std::forward_iterator_tag;
 
     /**
      * the OpenID operation mode
      */
     typedef enum _mode_t {
         mode_unknown = 0,
         mode_associate,
         mode_checkid_immediate,
         mode_checkid_setup,
         mode_check_association
     } mode_t;
 
     /**
      * the association secret container
      */
     class secret_t : public vector<unsigned char> {
         public:
 
             /**
              * xor the secret and hmac together and encode, using base64
              * @param key_d pointer to the message digest
              * @param rv reference to the return value
              */
             void enxor_to_base64(const unsigned char *key_d,string& rv) const;
             /**
              * decode base64-encoded secret and xor it with the message digest
              * @param key_d pointer to the message digest
              * @param b64 base64-encoded secret value
              */
             void enxor_from_base64(const unsigned char *key_d,const string& b64);
             /**
              * plainly encode to base64 representation
              * @param rv reference to the return value
              */
             void to_base64(string& rv) const;
             /**
              * decode cleartext secret from base64
              * @param b64 base64-encoded representation of the secret value
              */
             void from_base64(const string& b64);
     };
 
     /**
      * Interface to the association.
      */
     class association_t {
         public:
 
             virtual ~association_t() { }
 
             /**
              * retrieve the server with which association was established.
              * @return server name
              */
             virtual string server() const = 0;
             /**
              * retrieve the association handle.
              * @return handle
              */
             virtual string handle() const = 0;
             /**
              * retrieve the association type.
              * @return association type
              */
             virtual string assoc_type() const = 0;
             /**
              * retrieve the association secret.
              * @return association secret
              */
             virtual secret_t secret() const = 0; 
             /**
              * retrieve the number of seconds the association expires in.
              * @return seconds till expiration
              */
             virtual int expires_in() const = 0;
             /**
              * check whether the association is stateless.
              * @return true if stateless
              */
             virtual bool stateless() const = 0;
             /**
              * check whether the association is expired.
              * @return true if expired
              */
             virtual bool is_expired() const = 0;
     };
 
     /**
      * the shared_ptr<> for association_t object type
      */
     typedef tr1mem::shared_ptr<association_t> assoc_t;
 
     class basic_fields {
         public:
             typedef util::forward_iterator_proxy<
                 string,const string&,const string*
                 > fields_iterator;
 
             basic_fields() { }
             virtual ~basic_fields() { }
             basic_fields(const basic_fields& x);
             void copy_to(basic_fields& x) const;
             void append_to(basic_fields& x) const;
 
             virtual bool has_field(const string& n) const = 0;
             virtual const string& get_field(const string& n) const = 0;
 
             virtual fields_iterator fields_begin() const = 0;
             virtual fields_iterator fields_end() const = 0;
 
             virtual string append_query(const string& url,const char *pfx=0) const;
             virtual string query_string(const char *pfx=0) const;
 
             virtual void reset_fields();
             virtual void set_field(const string& n,const string& v);
             virtual void reset_field(const string& n);
 
+            void from_query(const string& qs);
+    };
+
+    class fields_t : public basic_fields, public map<string,string> {
+        public:
+            fields_t() { }
+            fields_t(const basic_fields& x)
+                : basic_fields(x) { }
+
+            bool has_field(const string& n) const;
+            const string& get_field(const string& n) const;
+
+            virtual fields_iterator fields_begin() const;
+            virtual fields_iterator fields_end() const;
+
+            virtual void reset_fields();
+            virtual void set_field(const string& n,const string& v);
+            virtual void reset_field(const string& n);
     };
 
     class basic_openid_message : public basic_fields {
         public:
 
             basic_openid_message() { }
             basic_openid_message(const basic_openid_message& x);
 
             virtual bool has_ns(const string& uri) const;
             virtual string get_ns(const string& uri) const;
 
             virtual string append_query(const string& url,const char *pfx="openid.") const {
                 return basic_fields::append_query(url,pfx); }
             virtual string query_string(const char *pfx="openid.") const {
                 return basic_fields::query_string(pfx); }
 
             virtual void from_keyvalues(const string& kv);
             virtual void to_keyvalues(ostream& o) const;
 
             virtual void to_htmlhiddens(ostream& o,const char* pfx=0) const;
 
             void add_to_signed(const string& fields);
             string find_ns(const string& uri,const char *pfx) const;
             string allocate_ns(const string& uri,const char *pfx);
     };
 
     class openid_message_t : public basic_openid_message, public map<string,string> {
         public:
             openid_message_t() { }
             openid_message_t(const basic_openid_message& x)
                 : basic_openid_message(x) { }
 
             bool has_field(const string& n) const;
             const string& get_field(const string& n) const;
             virtual fields_iterator fields_begin() const;
             virtual fields_iterator fields_end() const;
 
             void reset_fields();
             void set_field(const string& n,const string& v);
             void reset_field(const string& n);
     };
 
     /**
      * request/response parameters map
      */
     class params_t : public openid_message_t {
         public:
 
             /**
              * check whether the parameter is present.
              * @param n the parameter name
              * @return true if yes
              */
             bool has_param(const string& n) const {
                 return has_field(n); }
             /**
              * retrieve the parameter (const version)
              * @param n the parameter name
              * @return the parameter value
              * @throw failed_lookup if there is no such parameter
              */
             const string& get_param(const string& n) const {
                 return get_field(n); }
 
             /**
              * parse the OpenID key/value data.
              * @param kv the OpenID key/value data
              */
             void parse_keyvalues(const string& kv) {
                 from_keyvalues(kv); }
 
             string append_query(const string& url,const char *prefix="openid.") const;
 
     };
 
     struct openid_endpoint_t {
         string uri;
         string claimed_id;
         string local_id;
 
         openid_endpoint_t() { }
         openid_endpoint_t(const string& u,const string& cid,const string& lid)
             : uri(u), claimed_id(cid), local_id(lid) { }
 
         bool operator==(const openid_endpoint_t& x) const {
             return uri==x.uri && local_id==x.local_id; }
         bool operator<(const openid_endpoint_t& x) const {
             int c;
             return (c=strcmp(uri.c_str(),x.uri.c_str()))
                 ? (c<0) : (strcmp(local_id.c_str(),x.local_id.c_str())<0); }
     };
 
     typedef util::output_iterator_proxy<openid_endpoint_t>
         openid_endpoint_output_iterator;
 
 }
 
 #endif /* __OPKELE_TYPES_H */