openid: Automatically upgrade openid_realm to https when accessed via https.

diff --git a/IkiWiki/Plugin/openid.pm b/IkiWiki/Plugin/openid.pm
index 40a9568499be29710966b8115f0286c99aa899f7..e3b9982f2d3bbf4d5185ae7a1b97c850f6cdaa89 100644 (file)
--- a/IkiWiki/Plugin/openid.pm
+++ b/IkiWiki/Plugin/openid.pm
@@ -156,8 +156,8 @@ sub validate ($$$;$) {
        $trust_root=$cgiurl if ! defined $trust_root;
 
        my $check_url = $claimed_identity->check_url(
-               return_to => "$cgiurl?do=postsignin",
-               trust_root => $trust_root,
+               return_to => auto_upgrade_https($q, "$cgiurl?do=postsignin"),
+               trust_root => auto_upgrade_https($q, $trust_root),
                delayed_return => 1,
        );
        # Redirect the user to the OpenID server, which will
@@ -258,10 +258,19 @@ sub getobj ($$) {
                ua => $ua,
                args => $q,
                consumer_secret => sub { return shift()+$secret },
-               required_root => $cgiurl,
+               required_root => auto_upgrade_https($q, $cgiurl),
        );
 }
 
+sub auto_upgrade_https {
+       my $q=shift;
+       my $url=shift;
+       if ($q->https()) {
+               $url=~s/^http:/https:/i;
+       }
+       return $url;
+}
+
 sub load_openid_module {
        # Give up if module is unavailable to avoid needing to depend on it.
        eval q{use Net::OpenID::Consumer};

diff --git a/debian/changelog b/debian/changelog
index d98af52cffefbc486c65210a62edf2833025a55b..587a375b9b909fea1f82ef46410cd9335d41fb4d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ ikiwiki (3.20130519) UNRELEASED; urgency=low
   * osm: Remove trailing slash from KML maps icon.
   * page.tmpl: omit searchform, trails, sidebar and most metadata in CGI
     (smcv)
+  * openid: Automatically upgrade openid_realm to https when
+    accessed via https.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 23 Jun 2013 14:02:01 -0400