summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--acinclude.m46
-rw-r--r--configure.ac49
-rw-r--r--lib/consumer.cc53
3 files changed, 92 insertions, 16 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 349d3cf..532f978 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -84,8 +84,8 @@ dnl Outputs:
84dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX 84dnl AC_SUBST: PCRE_CONFIG PCRE_PREFIX PCRE_EXEC_PREFIX
85dnl PCRE_VERSION PCRE_CFLAGS PCRE_LIBS 85dnl PCRE_VERSION PCRE_CFLAGS PCRE_LIBS
86dnl PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX 86dnl PCRE_LIBS_POSIX PCRE_CFLAGS_POSIX
87dnl AM_CONDITIONAL: HAVE_PCRE
88dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION 87dnl AC_DEFINE: HAVE_PCRE PCRE_VERSION
88dnl env: HAVE_PCRE=yes|no
89AC_DEFUN([AC_WITH_PCRE],[ 89AC_DEFUN([AC_WITH_PCRE],[
90 HAVE_PCRE="no" 90 HAVE_PCRE="no"
91 PCRE_CONFIG="" 91 PCRE_CONFIG=""
@@ -142,15 +142,14 @@ AC_DEFUN([AC_WITH_PCRE],[
142 fi 142 fi
143 fi 143 fi
144 fi 144 fi
145 AM_CONDITIONAL([HAVE_PCRE],[test "${HAVE_PCRE}" = "yes"])
146]) 145])
147 146
148dnl AC_WITH_PCREPP([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]]) 147dnl AC_WITH_PCREPP([ACTION-IF-FOUND[,ACTION-IF-NOT-FOUND]])
149dnl Outputs: 148dnl Outputs:
150dnl AC_SUBST: PCREPP_CONFIG PCREPP_PREFIX PCREPP_EXEC_PREFIX 149dnl AC_SUBST: PCREPP_CONFIG PCREPP_PREFIX PCREPP_EXEC_PREFIX
151dnl PCREPP_VERSION PCREPP_CFLAGS PCREPP_LIBS 150dnl PCREPP_VERSION PCREPP_CFLAGS PCREPP_LIBS
152dnl AM_CONDITIONAL: HAVE_PCREPP
153dnl AC_DEFINE: HAVE_PCREPP PCREPP_VERSION 151dnl AC_DEFINE: HAVE_PCREPP PCREPP_VERSION
152dnl env: HAVE_PCREPP=yes|no
154AC_DEFUN([AC_WITH_PCREPP],[ 153AC_DEFUN([AC_WITH_PCREPP],[
155 HAVE_PCREPP="no" 154 HAVE_PCREPP="no"
156 PCREPP_CONFIG="" 155 PCREPP_CONFIG=""
@@ -207,7 +206,6 @@ AC_DEFUN([AC_WITH_PCREPP],[
207 fi 206 fi
208 fi 207 fi
209 fi 208 fi
210 AM_CONDITIONAL([HAVE_PCREPP],[test "${HAVE_PCREPP}" = "yes"])
211]) 209])
212 210
213m4_include([acinclude.d/libcurl.m4]) 211m4_include([acinclude.d/libcurl.m4])
diff --git a/configure.ac b/configure.ac
index 2094273..00c6bc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -52,15 +52,52 @@ fi
52LIBCURL_CHECK_CONFIG(,,,[ 52LIBCURL_CHECK_CONFIG(,,,[
53 AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/]) 53 AC_MSG_ERROR([no required libcurl library. get one from http://curl.haxx.se/])
54]) 54])
55AC_WITH_PCRE([ 55
56 AC_WITH_PCREPP(,[ 56want_pcre_impl=""
57 AC_MSG_ERROR([no pcre++ library found. get one at http://www.daemon.de/PCRE]) 57AC_ARG_WITH([pcre-bindings],
58 ]) 58 AC_HELP_STRING([--with-pcre-bindings=(pcrepp|none|libpcrecpp)],[Specify which pcre c++ bindings to use. 'pcrepp' stands for quite sensible library, found at http://www.daemon.de/PCRE/, 'libcrecpp' makes use of crappy bindings by google and 'none' disables internal implementation of OP discovery]),
59 ],[ 59 [
60 AC_MSG_ERROR([no pcre library found. get one at http://www.pcre.org/]) 60 case "$withval" in
61 pcrepp) want_pcre_impl="pcrepp" ;;
62 libpcrecpp) want_pcre_impl="libpcrecpp" ;;
63 none) want_pcre_impl="none";;
64 *) AC_MSG_ERROR([I'm not sure I understand what do you want for a pcre c++ bindings]) ;;
65 esac
61 ] 66 ]
62) 67)
63 68
69found_pcre_impl=""
70
71if test -z "$want_pcre_impl" -o "$want_pcre_impl" = "pcrepp" ; then
72 AC_WITH_PCRE([
73 AC_WITH_PCREPP([
74 found_pcre_impl=pcrepp
75 ])
76 ],[
77 AC_MSG_ERROR([no pcre library found. get one at http://www.pcre.org/])
78 ]
79 )
80 test "$want_pcre_impl,$found_pcre_impl" = "pcrepp," && AC_MSG_ERROR([no pcre++ library found. get one at http://www.daemon.de/PCRE])
81fi
82
83if test "$found_pcre_impl,$want_pcre_impl" = "," -o "$want_pcre_impl" = "libpcrecpp" ; then
84 test -z "$want_pcre_impl" || AC_MSG_NOTICE([You want to use crappy libpcre c++ bindings])
85 PKG_CHECK_MODULES([LIBPCRECPP],[libpcrecpp],[
86 found_pcre_impl=libpcrecpp
87 CXXFLAGS="$CXXFLAGS $LIBPCRECPP_CFLAGS"
88 LIBS="$LIBS $LIBPCRECPP_LIBS"
89 ],[
90 test -z "$want_pcre_impl" || AC_MSG_ERROR([no libpcre c++ bindings found. why would you want it if you don't have it installed?])
91 ]
92 )
93fi
94test "$want_pcre_impl,$found_pcre_impl" = "," && AC_MSG_ERROR([no pcre c++ bindings found, use --with-pcre-bindings=none to disable code that makes use of it])
95
96case "$found_pcre_impl" in
97 pcrepp) AC_DEFINE([USE_PCREPP],,[defined if pcre++ is to be used]) ;;
98 libpcrecpp) AC_DEFINE([USE_LIBPCRECPP],,[defined if crappy google bindings are to be used]) ;;
99esac
100
64curl_ssl_verify_host="true" 101curl_ssl_verify_host="true"
65AC_ARG_ENABLE([ssl-verify-host], 102AC_ARG_ENABLE([ssl-verify-host],
66 AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]), 103 AC_HELP_STRING([--disable-ssl-verify-host],[disable cURL cert/host relationships verification]),
diff --git a/lib/consumer.cc b/lib/consumer.cc
index 8f66688..299b3bc 100644
--- a/lib/consumer.cc
+++ b/lib/consumer.cc
@@ -7,12 +7,19 @@
7#include <openssl/sha.h> 7#include <openssl/sha.h>
8#include <openssl/hmac.h> 8#include <openssl/hmac.h>
9#include <curl/curl.h> 9#include <curl/curl.h>
10#include <pcre++.h>
11 10
12#include <iostream> 11#include <iostream>
13 12
14#include "config.h" 13#include "config.h"
15 14
15#if defined(USE_LIBPCRECPP)
16# include <pcrecpp.h>
17#elif defined(USE_PCREPP)
18# include <pcre++.h>
19#else
20 /* internal implementation won't be built */
21#endif
22
16namespace opkele { 23namespace opkele {
17 using namespace std; 24 using namespace std;
18 25
@@ -261,6 +268,7 @@ namespace opkele {
261 } 268 }
262 269
263 void consumer_t::retrieve_links(const string& url,string& server,string& delegate) { 270 void consumer_t::retrieve_links(const string& url,string& server,string& delegate) {
271#if defined(USE_LIBPCRECPP) || defined(USE_PCREPP)
264 server.erase(); 272 server.erase();
265 delegate.erase(); 273 delegate.erase();
266 curl_t curl = curl_easy_init(); 274 curl_t curl = curl_easy_init();
@@ -278,17 +286,44 @@ namespace opkele {
278 r = curl_easy_perform(curl); 286 r = curl_easy_perform(curl);
279 if(r && r!=CURLE_WRITE_ERROR) 287 if(r && r!=CURLE_WRITE_ERROR)
280 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r); 288 throw exception_curl(OPKELE_CP_ "failed to curl_easy_perform()",r);
281 pcrepp::Pcre bre("<body\\b",PCRE_CASELESS);
282 // strip out everything past body 289 // strip out everything past body
290 static const char *re_hdre = "<head[^>]*>",
291 *re_lre = "<link\\b([^>]+)>",
292 *re_rre = "\\brel=['\"]([^'\"]+)['\"]",
293 *re_hre = "\\bhref=['\"]([^'\"]+)['\"]";
294#if defined(USE_LIBPCRECPP)
295 static pcrecpp::RE_Options ro(PCRE_CASELESS|PCRE_DOTALL);
296 static pcrecpp::RE
297 bre("<body\\b.*",ro), hdre(re_hdre,ro),
298 lre(re_lre,ro), rre(re_rre), hre(re_hre,ro);
299 bre.Replace("",&html);
300 pcrecpp::StringPiece hpiece(html);
301 if(!hdre.FindAndConsume(&hpiece))
302 throw bad_input(OPKELE_CP_ "failed to find head");
303 string attrs;
304 while(lre.FindAndConsume(&hpiece,&attrs)) {
305 pcrecpp::StringPiece rel, href;
306 if(!(rre.PartialMatch(attrs,&rel) && hre.PartialMatch(attrs,&href)))
307 continue;
308 if(rel=="openid.server") {
309 href.CopyToString(&server);
310 if(!delegate.empty())
311 break;
312 }else if(rel=="openid.delegate") {
313 href.CopyToString(&delegate);
314 if(!server.empty())
315 break;
316 }
317 }
318#elif defined(USE_PCREPP)
319 pcrepp::Pcre bre("<body\\b",PCRE_CASELESS);
283 if(bre.search(html)) 320 if(bre.search(html))
284 html.erase(bre.get_match_start()); 321 html.erase(bre.get_match_start());
285 pcrepp::Pcre hdre("<head[^>]*>",PCRE_CASELESS); 322 pcrepp::Pcre hdre(re_hdre,PCRE_CASELESS);
286 if(!hdre.search(html)) 323 if(!hdre.search(html))
287 throw bad_input(OPKELE_CP_ "failed to find head"); 324 throw bad_input(OPKELE_CP_ "failed to find head");
288 html.erase(0,hdre.get_match_end()+1); 325 html.erase(0,hdre.get_match_end()+1);
289 pcrepp::Pcre lre("<link\\b([^>]+)>",PCRE_CASELESS), 326 pcrepp::Pcre lre(re_lre,PCRE_CASELESS), rre(re_rre,PCRE_CASELESS), hre(re_hre,PCRE_CASELESS);
290 rre("\\brel=['\"]([^'\"]+)['\"]",PCRE_CASELESS),
291 hre("\\bhref=['\"]([^'\"]+)['\"]",PCRE_CASELESS);
292 while(lre.search(html)) { 327 while(lre.search(html)) {
293 string attrs = lre[0]; 328 string attrs = lre[0];
294 html.erase(0,lre.get_match_end()+1); 329 html.erase(0,lre.get_match_end()+1);
@@ -304,8 +339,14 @@ namespace opkele {
304 break; 339 break;
305 } 340 }
306 } 341 }
342#else
343 #error "I must have gone crazy"
344#endif
307 if(server.empty()) 345 if(server.empty())
308 throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration"); 346 throw failed_assertion(OPKELE_CP_ "The location has no openid.server declaration");
347#else /* none of the RE bindings enabled */
348 throw not_implemented(OPKELE_CP_ "No internal implementation of retrieve_links were provided at compile-time");
349#endif
309 } 350 }
310 351
311 assoc_t consumer_t::find_assoc(const string& server) { 352 assoc_t consumer_t::find_assoc(const string& server) {