summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac3
-rw-r--r--test/.gitignore4
-rw-r--r--test/Makefile.am8
-rw-r--r--test/html/empty.html0
-rw-r--r--test/html/head-in-body.html10
-rw-r--r--test/html/hkn-delegate.html7
-rw-r--r--test/html/hkn-server.html7
-rw-r--r--test/html/hkn.html8
-rw-r--r--test/html/in-body.html8
-rw-r--r--test/test.cc68
11 files changed, 124 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index c577ef8..741d585 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,18 @@
1 1
2SUBDIRS=include lib 2SUBDIRS=include lib test
3EXTRA_DIST= NEWS NEWS.xml NEWS.xsl 3EXTRA_DIST= NEWS NEWS.xml NEWS.xsl
4 4
5DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig 5DISTCHECK_CONFIGURE_FLAGS=--with-pkgconfigdir=$${dc_install_base}/lib/pkgconfig
6if HAVE_PKGCONFIG 6if HAVE_PKGCONFIG
7pkgconfigdir=@PKGCONFIG_DIR@ 7pkgconfigdir=@PKGCONFIG_DIR@
8pkgconfig_DATA=libopkele.pc 8pkgconfig_DATA=libopkele.pc
9endif 9endif
10 10
11all-local: NEWS 11all-local: NEWS
12if HAVE_DOXYGEN 12if HAVE_DOXYGEN
13clean-local: 13clean-local:
14 rm -rf doxydox 14 rm -rf doxydox
15endif 15endif
16 16
17NEWS: NEWS.xsl NEWS.xml 17NEWS: NEWS.xsl NEWS.xml
18 ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml 18 ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml
diff --git a/configure.ac b/configure.ac
index eb3f4d6..2094273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,24 +69,27 @@ AC_ARG_ENABLE([ssl-verify-host],
69${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host]) 69${curl_ssl_verify_host} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYHOST],,[defined if cURL is not to verify cert/host])
70 70
71curl_ssl_verify_peer="true" 71curl_ssl_verify_peer="true"
72AC_ARG_ENABLE([ssl-verify-peer], 72AC_ARG_ENABLE([ssl-verify-peer],
73 AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]), 73 AC_HELP_STRING([--disable-ssl-verify-peer],[disable cURL cert validity verification]),
74 [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ] 74 [ test "${enableval}" = "no" && curl_ssl_verify_peer="false" ]
75) 75)
76${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity]) 76${curl_ssl_verify_peer} || AC_DEFINE([DISABLE_CURL_SSL_VERIFYPEER],,[defined if cURL is not to verify cert validity])
77 77
78postels_law=true 78postels_law=true
79AC_ARG_ENABLE([postels-law], 79AC_ARG_ENABLE([postels-law],
80 AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]), 80 AC_HELP_STRING([--disable-postels-law],[Be strict, do not adhere to Postel's Law ("be conservative in what you do, be liberal in what you accept from others", RFC 793)]),
81 [ test "${enableval}" = "no" && postels_law=false ] 81 [ test "${enableval}" = "no" && postels_law=false ]
82) 82)
83$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law]) 83$postels_law && AC_DEFINE([POSTELS_LAW],,[defined if we want to adhere to Postel's Law])
84 84
85AC_DEFINE_UNQUOTED([OPKELE_SRC_DIR],["$PWD"],[source directory])
86
85AC_CONFIG_FILES([ 87AC_CONFIG_FILES([
86 Makefile 88 Makefile
87 libopkele.pc 89 libopkele.pc
88 Doxyfile 90 Doxyfile
89 include/Makefile 91 include/Makefile
90 lib/Makefile 92 lib/Makefile
93 test/Makefile
91]) 94])
92AC_OUTPUT 95AC_OUTPUT
diff --git a/test/.gitignore b/test/.gitignore
new file mode 100644
index 0000000..918b3c9
--- a/dev/null
+++ b/test/.gitignore
@@ -0,0 +1,4 @@
1/.deps
2/.libs
3/test
4*.o
diff --git a/test/Makefile.am b/test/Makefile.am
new file mode 100644
index 0000000..0dbba65
--- a/dev/null
+++ b/test/Makefile.am
@@ -0,0 +1,8 @@
1noinst_PROGRAMS = test
2
3INCLUDES = -I${top_srcdir}/include/
4
5test_SOURCES = test.cc
6test_LDADD = ${top_builddir}/lib/libopkele.la
7
8EXTRA_DIST=$(addsuffix .html,$(addprefix html/, empty head-in-body hkn-delegate hkn-server hkn in-body))
diff --git a/test/html/empty.html b/test/html/empty.html
new file mode 100644
index 0000000..e69de29
--- a/dev/null
+++ b/test/html/empty.html
diff --git a/test/html/head-in-body.html b/test/html/head-in-body.html
new file mode 100644
index 0000000..0f778f3
--- a/dev/null
+++ b/test/html/head-in-body.html
@@ -0,0 +1,10 @@
1<html>
2 <head>
3 </head>
4 <body>
5 <head>
6 <link rel="openid.server" href="http://www.klever.net/openid.server" />
7 <link rel="openid.delegate" href="http://hacker.klever.net/" />
8 </head>
9 </body>
10</html>
diff --git a/test/html/hkn-delegate.html b/test/html/hkn-delegate.html
new file mode 100644
index 0000000..62e25a3
--- a/dev/null
+++ b/test/html/hkn-delegate.html
@@ -0,0 +1,7 @@
1<html>
2 <head>
3 <link rel="openid.delegate" href="http://hacker.klever.net/" />
4 </head>
5 <body>
6 </body>
7</html>
diff --git a/test/html/hkn-server.html b/test/html/hkn-server.html
new file mode 100644
index 0000000..e6b64e8
--- a/dev/null
+++ b/test/html/hkn-server.html
@@ -0,0 +1,7 @@
1<html>
2 <head>
3 <link rel="openid.server" href="http://www.klever.net/openid.server" />
4 </head>
5 <body>
6 </body>
7</html>
diff --git a/test/html/hkn.html b/test/html/hkn.html
new file mode 100644
index 0000000..8d6e409
--- a/dev/null
+++ b/test/html/hkn.html
@@ -0,0 +1,8 @@
1<html>
2 <head>
3 <link rel="openid.server" href="http://www.klever.net/openid.server" />
4 <link rel="openid.delegate" href="http://hacker.klever.net/" />
5 </head>
6 <body>
7 </body>
8</html>
diff --git a/test/html/in-body.html b/test/html/in-body.html
new file mode 100644
index 0000000..53bc06d
--- a/dev/null
+++ b/test/html/in-body.html
@@ -0,0 +1,8 @@
1<html>
2 <head>
3 </head>
4 <body>
5 <link rel="openid.server" href="http://www.klever.net/openid.server" />
6 <link rel="openid.delegate" href="http://hacker.klever.net/" />
7 </body>
8</html>
diff --git a/test/test.cc b/test/test.cc
new file mode 100644
index 0000000..f0526c6
--- a/dev/null
+++ b/test/test.cc
@@ -0,0 +1,68 @@
1#include <iostream>
2#include <stdexcept>
3using namespace std;
4#include <opkele/exception.h>
5#include <opkele/consumer.h>
6
7#include "config.h"
8
9class failed_test : public opkele::exception {
10 public:
11 failed_test(OPKELE_E_PARS)
12 : exception(OPKELE_E_CONS) { }
13};
14
15class dummy_consumer_t : public opkele::consumer_t {
16 public:
17 virtual opkele::assoc_t store_assoc(const string& server,const string& handle,const opkele::secret_t& secret,int expires_in) {
18 throw opkele::not_implemented(OPKELE_CP_ "Not implemented");
19 }
20 virtual opkele::assoc_t retrieve_assoc(const string& server,const string& handle) {
21 throw opkele::not_implemented(OPKELE_CP_ "Not implemented");
22 }
23 virtual void invalidate_assoc(const string& server,const string& handle) {
24 throw opkele::not_implemented(OPKELE_CP_ "Not implemented");
25 }
26};
27
28
29void test_retrieve_links(const string& f,bool success,const string& s="",const string& d="") {
30 dummy_consumer_t dc;
31 string server, delegate;
32 try {
33 dc.retrieve_links("file://" OPKELE_SRC_DIR "/test/html/"+f,server,delegate);
34 if(!success)
35 throw failed_test(OPKELE_CP_ "Retrieved links when it shouldn't");
36 if(server!=s)
37 throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected server '"+s+"', got '"+server+"'");
38 if(delegate!=d)
39 throw failed_test(OPKELE_CP_ "retrieve_links test failed, expected delegate '"+d+"', got '"+delegate+"'");
40 }catch(opkele::bad_input& obi) {
41 if(success)
42 throw failed_test(OPKELE_CP_ "Test failed");
43 }catch(opkele::failed_assertion& ofa) {
44 if(success)
45 throw failed_test(OPKELE_CP_ "Test failed");
46 }
47}
48
49void test_retrieve_links() {
50 test_retrieve_links("empty.html",false);
51 test_retrieve_links("in-body.html",false);
52 test_retrieve_links("head-in-body.html",false);
53 test_retrieve_links("hkn.html",true,"http://www.klever.net/openid.server","http://hacker.klever.net/");
54 test_retrieve_links("hkn-server.html",true,"http://www.klever.net/openid.server");
55 test_retrieve_links("hkn-delegate.html",false);
56}
57
58main() {
59 try {
60 test_retrieve_links();
61 }catch(failed_test& ft) {
62 cerr << "Test failed: " << ft.what() << endl;
63 }catch(exception& e) {
64 cerr << "oops: " << e.what() << endl;
65 _exit(1);
66 }
67 _exit(0);
68}