X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3479809f96fa9c7a5d9f86c18c581f9a343a3aef..1933e3732c03cec44b28611d5436cddddd6f1669:/ikiwiki-transition

diff --git a/ikiwiki-transition b/ikiwiki-transition
index 0e2bd4e22..e02c3aaed 100755
--- a/ikiwiki-transition
+++ b/ikiwiki-transition
@@ -57,6 +57,8 @@ sub indexdb {
 		usage();		
 	}
 
+	# Note: No lockwiki here because ikiwiki already locks it
+	# before calling this.	
 	if (! IkiWiki::oldloadindex()) {
 		die "failed to load index\n";
 	}
@@ -71,11 +73,38 @@ sub indexdb {
 	}
 }
 
+sub hashpassword {
+	$config{wikistatedir}=shift()."/.ikiwiki";
+
+	if (! defined $config{wikistatedir}) {
+		usage();		
+	}
+	
+	eval q{use IkiWiki::UserInfo};
+	eval q{use Authen::Passphrase::BlowfishCrypt};
+	if ($@) {
+		error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
+	}
+
+	IkiWiki::lockwiki();
+	IkiWiki::loadplugin("passwordauth");
+	my $userinfo = IkiWiki::userinfo_retrieve();
+	foreach my $user (keys %{$userinfo}) {
+		if (ref $userinfo->{$user} &&
+		    exists $userinfo->{$user}->{password} &&
+		    length $userinfo->{$user}->{password} &&
+		    ! exists $userinfo->{$user}->{cryptpassword}) {
+			IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
+		}
+	}
+}
+
 sub usage {
 	print STDERR "Usage: ikiwiki-transition type ...\n";
 	print STDERR "Currently supported transition subcommands:\n";
 	print STDERR "	prefix_directives file\n";
 	print STDERR "	indexdb srcdir\n";
+	print STDERR "	hashpassword srcdir\n";
 	exit 1;
 }
 
@@ -85,6 +114,9 @@ my $mode=shift;
 if ($mode eq 'prefix_directives') {
 	prefix_directives(@ARGV);
 }
+if ($mode eq 'hashpassword') {
+	hashpassword(@ARGV);
+}
 elsif ($mode eq 'indexdb') {
 	indexdb(@ARGV);
 }
@@ -94,6 +126,7 @@ else {
 
 package IkiWiki;
 
+# A slightly modified version of the old loadindex function.
 sub oldloadindex {
 	%oldrenderedfiles=%pagectime=();
 	if (! $config{rebuild}) {
@@ -131,5 +164,16 @@ sub oldloadindex {
 		$oldrenderedfiles{$page}=[@{$items{dest}}];
 		$pagectime{$page}=$items{ctime}[0];
 	}
+
+	# saveindex relies on %hooks being populated, else it won't save
+	# the page state owned by a given hook. But no plugins are loaded
+	# by this program, so populate %hooks with all hook ids that
+	# currently have page state.
+	foreach my $page (keys %pagemtime) {
+		foreach my $id (keys %{$pagestate{$page}}) {
+			$hooks{_dummy}{$id}=1;
+		}
+	}
+	
 	return close($in);
 }