added an identifier normalization utility function

* moved iname leader characters and whitespace characters strings to
  opkele::data namespace
* added opkele::util::normalize_identifier() function

Signed-off-by: Michael Krelin <hacker@klever.net>

2 files changed, 4 insertions, 0 deletions

diff --git a/include/opkele/data.h b/include/opkele/data.h
index d0b0516..904b5ae 100644
--- a/include/opkele/data.h
+++ b/include/opkele/data.h
@@ -1,18 +1,20 @@
 #ifndef __OPKELE_DATA_H
 #define __OPKELE_DATA_H
 
 /**
  * @brief the main opkele namespace
  */
 namespace opkele {
 
     /**
      * @brief internal data opkele namespace
      */
     namespace data {
 	extern const char *_default_p;
 	extern const char *_default_g;
+	extern const char *_iname_leaders;
+	extern const char *_whitespace_chars;
     }
 }
 
 #endif /* __OPKELE_DATA_H */
diff --git a/include/opkele/util.h b/include/opkele/util.h
index 60955e1..fd974a1 100644
--- a/include/opkele/util.h
+++ b/include/opkele/util.h
@@ -39,76 +39,78 @@ namespace opkele {
 	string url_encode(const string& str);
 
 	/**
 	 * Make string suitable for using as x(ht)ml attribute.
 	 * @param str string to escape
 	 * @return escaped string
 	 */
 	string attr_escape(const string& str);
 
 	/**
 	 * Convert number to string
 	 * @param l number
 	 * @return string representation
 	 * @throw failed_conversion in case of failure
 	 */
 	string long_to_string(long l);
 	/**
 	 * Convert string to number
 	 * @param s string, containing the number
 	 * @return the number
 	 * @throw failed_conversion in case of failure
 	 */
 	long string_to_long(const string& s);
 
 	/**
 	 * Encode binary data using base64.
 	 * @param data pointer to binary data
 	 * @param length length of data
 	 * @return encoded data
 	 */
 	string encode_base64(const void *data,size_t length);
 	/**
 	 * Decode binary data from base64 representation.
 	 * @param data base64-encoded data
 	 * @param rv container for decoded binary
 	 */
 	void decode_base64(const string& data,vector<unsigned char>& rv);
 
 	/**
 	 * Normalize http(s) URI according to RFC3986, section 6. URI is
 	 * expected to have scheme: in front of it.
 	 * @param uri URI
 	 * @return normalized URI
 	 * @throw not_implemented in case of non-httpi(s) URI
 	 * @throw bad_input in case of malformed URI
 	 */
 	string rfc_3986_normalize_uri(const string& uri);
 
+	string normalize_identifier(const string& usi,bool strip_fragment);
+
 	/**
 	 * Match URI against realm
 	 * @param uri URI to match
 	 * @param realm realm to match against
 	 * @return true if URI matches realm
 	 */
 	bool uri_matches_realm(const string& uri,const string& realm);
 
 	/**
 	 * Strip fragment part from URI
 	 * @param uri input/output parameter containing the URI
 	 * @return reference to uri
 	 */
 	string& strip_uri_fragment_part(string& uri);
 
 	/**
 	 * Calculate signature and encode it using base64
 	 * @param assoc association being used for signing
 	 * @param om openid message
 	 * @return base64 representation of the signature
 	 */
 	string base64_signature(const assoc_t& assoc,const basic_openid_message& om);
 
     }
 
 }
 
 #endif /* __OPKELE_UTIL_H */