1 files changed, 88 insertions, 7 deletions

diff --git a/include/opkele/exception.h b/include/opkele/exception.h
index 2ff44b7..a8c3339 100644
--- a/include/opkele/exception.h
+++ b/include/opkele/exception.h
@@ -26,5 +26,9 @@
 /**
+ * open function-try-block
+ */
+# define OPKELE_FUNC_TRY try
+/**
  * the simple rethrow of konforka-based exception
  */
-# define OPKELE_RETHROW catch(konforka::exception& e) { e.see(CODEPOINT); throw }
+# define OPKELE_RETHROW catch(konforka::exception& e) { e.see(CODEPOINT); throw; }
 #else /* OPKELE_HAVE_KONFORKA */
@@ -46,2 +50,6 @@
 /**
+ * the dummy define for the opening function-try-block
+ */
+# define OPKELE_FUNC_TRY
+/**
  * the dummy define for the konforka-based rethrow of exception
@@ -71,9 +79,6 @@ namespace opkele {
             explicit
-                exception(const string& fi,const string& fu,int l,const string& w)
-                    : konforka::exception(fi,fu,l,w) { }
+                exception(const string& fi,const string& fu,int l,const string& w);
 #           else /* OPKELE_HAVE_KONFORKA */
             string _what;
-            explicit
-                exception(const string& w)
-                    : _what(w) { } 
+            explicit exception(const string& w);
             virtual ~exception() throw();
@@ -158,3 +163,3 @@ namespace opkele {
             string setup_url;
-            id_res_setup(OPKELE_E_PARS,const string& su)
+            id_res_setup(OPKELE_E_PARS,const string& su="")
                 : id_res_failed(OPKELE_E_CONS), setup_url(su) { }
@@ -181,2 +186,38 @@ namespace opkele {
     /**
+     * thown when the user cancelled authentication process.
+     */
+    class id_res_cancel : public id_res_failed {
+        public:
+            id_res_cancel(OPKELE_E_PARS)
+                : id_res_failed(OPKELE_E_CONS) { }
+    };
+
+    /**
+     * thrown in case of nonce reuse or otherwise imperfect nonce.
+     */
+    class id_res_bad_nonce : public id_res_failed {
+        public:
+            id_res_bad_nonce(OPKELE_E_PARS)
+                : id_res_failed(OPKELE_E_CONS) { }
+    };
+
+    /**
+     * thrown if return_to didn't pass verification
+     */
+    class id_res_bad_return_to : public id_res_failed {
+        public:
+            id_res_bad_return_to(OPKELE_E_PARS)
+                : id_res_failed(OPKELE_E_CONS) { }
+    };
+
+    /**
+     * thrown if OP isn't authorized to make an assertion
+     */
+    class id_res_unauthorized : public id_res_failed {
+        public:
+            id_res_unauthorized(OPKELE_E_PARS)
+                : id_res_failed(OPKELE_E_CONS) { }
+    };
+
+    /**
      * openssl malfunction occured
@@ -214,2 +255,32 @@ namespace opkele {
     /**
+     * htmltidy related error occured
+     */
+    class exception_tidy : public exception {
+        public:
+            int _rc;
+            exception_tidy(OPKELE_E_PARS);
+            exception_tidy(OPKELE_E_PARS,int r);
+            ~exception_tidy() throw() { }
+    };
+
+    /**
+     * exception thrown in case of failed discovery
+     */
+    class failed_discovery : public exception {
+        public:
+            failed_discovery(OPKELE_E_PARS)
+                : exception(OPKELE_E_CONS) { }
+    };
+
+    /**
+     * unsuccessfull xri resolution
+     */
+    class failed_xri_resolution : public failed_discovery {
+        public:
+            long _code;
+            failed_xri_resolution(OPKELE_E_PARS,long _c=-1)
+                : failed_discovery(OPKELE_E_CONS), _code(_c) { }
+    };
+
+    /**
      * not implemented (think pure virtual) member function executed, signfies
@@ -232,2 +303,12 @@ namespace opkele {
 
+    /**
+     * thrown in case of unsupported parameter encountered (e.g. unsupported
+     * association type).
+     */
+    class unsupported : public exception {
+        public:
+            unsupported(OPKELE_E_PARS)
+                : exception(OPKELE_E_CONS) { }
+    };
+
 }