diff options
| author | Joey Hess <joey@kitenet.net> | 2010-12-25 15:08:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-25 15:08:22 -0400 |
| commit | 326c4d6af2fbcbdf9b1487d584f03e6f63e5597d (patch) | |
| tree | 2863211c9b1811fc8bbf4eabdb949521218094fd | |
| parent | 93d7368a326b418a32f9ef686450da304186f330 (diff) | |
| download | ikiwiki-326c4d6af2fbcbdf9b1487d584f03e6f63e5597d.tar ikiwiki-326c4d6af2fbcbdf9b1487d584f03e6f63e5597d.tar.gz | |
use CGI->url to get current absolute cgi url for openid login process
| -rw-r--r-- | IkiWiki/Plugin/openid.pm | 4 | ||||
| -rw-r--r-- | doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm index 0cb8d6289..ce0990e40 100644 --- a/IkiWiki/Plugin/openid.pm +++ b/IkiWiki/Plugin/openid.pm @@ -148,7 +148,7 @@ sub validate ($$$;$) { } my $cgiurl=$config{openid_cgiurl}; - $cgiurl=$config{cgiurl} if ! defined $cgiurl; + $cgiurl=$q->url if ! defined $cgiurl; my $trust_root=$config{openid_realm}; $trust_root=$cgiurl if ! defined $trust_root; @@ -249,7 +249,7 @@ sub getobj ($$) { } my $cgiurl=$config{openid_cgiurl}; - $cgiurl=$config{cgiurl} if ! defined $cgiurl; + $cgiurl=$q->url if ! defined $cgiurl; return Net::OpenID::Consumer->new( ua => $ua, diff --git a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn index ba5259895..b069ee2bd 100644 --- a/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn +++ b/doc/todo/want_to_avoid_ikiwiki_using_http_or_https_in_urls_to_allow_serving_both.mdwn @@ -328,4 +328,6 @@ Update: I had to revert part of 296e5cb2fd3690e998b3824d54d317933c595873, since it broke openid logins. The openid object requires a complete, not a relative cgiurl. I'm not sure if my changing that back to using `$config{cgiurl}` will force users back to eg, the non-https version of a -site when logging in via openid. smcv? --[[Joey]] +site when logging in via openid. + +> Ok, changed it to use `CGI->url` to get the current absolute cgi url. --[[Joey]] |