]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blob - ikiwiki-transition
hashed password support, and empty password security fix
[git.ikiwiki.info.git] / ikiwiki-transition
1 #!/usr/bin/perl -i
2 use warnings;
3 use strict;
4 use IkiWiki;
5 use HTML::Entities;
7 my $regex = qr{
8         (\\?)           # 1: escape?
9         \[\[(!?)        # directive open; 2: optional prefix
10         ([-\w]+)        # 3: command
11         (               # 4: the parameters (including initial whitespace)
12         \s+
13                 (?:
14                         (?:[-\w]+=)?            # named parameter key?
15                         (?:
16                                 """.*?"""       # triple-quoted value
17                                 |
18                                 "[^"]+"         # single-quoted value
19                                 |
20                                 [^\s\]]+        # unquoted value
21                         )
22                         \s*                     # whitespace or end
23                                                 # of directive
24                 )
25         *)              # 0 or more parameters
26         \]\]            # directive closed
27 }sx;
29 sub handle_directive {
30         my $escape = shift;
31         my $prefix = shift;
32         my $directive = shift;
33         my $args = shift;
35         if (length $escape) {
36                 return "${escape}[[${prefix}${directive}${args}]]"
37         }
38         if ($directive =~ m/^(if|more|table|template|toggleable)$/) {
39                 $args =~ s{$regex}{handle_directive($1, $2, $3, $4)}eg;
40         }
41         return "[[!${directive}${args}]]"
42 }
44 sub prefix_directives {
45         $/=undef; # process whole files at once
46         
47         while (<>) {
48                 s{$regex}{handle_directive($1, $2, $3, $4)}eg;
49                 print;
50         }
51 }
53 sub indexdb {
54         $config{wikistatedir}=shift()."/.ikiwiki";
56         if (! defined $config{wikistatedir}) {
57                 usage();                
58         }
60         # Note: No lockwiki here because ikiwiki already locks it
61         # before calling this.  
62         if (! IkiWiki::oldloadindex()) {
63                 die "failed to load index\n";
64         }
65         if (! IkiWiki::saveindex()) {
66                 die "failed to save indexdb\n"
67         }
68         if (! IkiWiki::loadindex()) {
69                 die "transition failed, cannot load new indexdb\n";
70         }
71         if (! unlink("$config{wikistatedir}/index")) {
72                 die "unlink failed: $!\n";
73         }
74 }
76 sub hashpassword {
77         $config{wikistatedir}=shift()."/.ikiwiki";
79         if (! defined $config{wikistatedir}) {
80                 usage();                
81         }
82         
83         eval q{use IkiWiki::UserInfo};
84         eval q{use Authen::Passphrase::BlowfishCrypt};
85         if ($@) {
86                 error("ikiwiki-transition hashpassword: failed to load Authen::Passphrase, passwords not hashed");
87         }
89         IkiWiki::lockwiki();
90         IkiWiki::loadplugin("passwordauth");
91         my $userinfo = IkiWiki::userinfo_retrieve();
92         foreach my $user (keys %{$userinfo}) {
93                 if (ref $userinfo->{$user} &&
94                     exists $userinfo->{$user}->{password} &&
95                     length $userinfo->{$user}->{password} &&
96                     ! exists $userinfo->{$user}->{cryptpassword}) {
97                         IkiWiki::Plugin::passwordauth::setpassword($user, $userinfo->{$user}->{password});
98                 }
99         }
102 sub usage {
103         print STDERR "Usage: ikiwiki-transition type ...\n";
104         print STDERR "Currently supported transition subcommands:\n";
105         print STDERR "  prefix_directives file\n";
106         print STDERR "  indexdb srcdir\n";
107         print STDERR "  hashpassword srcdir\n";
108         exit 1;
111 usage() unless @ARGV;
113 my $mode=shift;
114 if ($mode eq 'prefix_directives') {
115         prefix_directives(@ARGV);
117 if ($mode eq 'hashpassword') {
118         hashpassword(@ARGV);
120 elsif ($mode eq 'indexdb') {
121         indexdb(@ARGV);
123 else {
124         usage();
127 package IkiWiki;
129 # A slightly modified version of the old loadindex function.
130 sub oldloadindex {
131         %oldrenderedfiles=%pagectime=();
132         if (! $config{rebuild}) {
133                 %pagesources=%pagemtime=%oldlinks=%links=%depends=
134                         %destsources=%renderedfiles=%pagecase=%pagestate=();
135         }
136         open (my $in, "<", "$config{wikistatedir}/index") || return;
137         while (<$in>) {
138                 chomp;
139                 my %items;
140                 $items{link}=[];
141                 $items{dest}=[];
142                 foreach my $i (split(/ /, $_)) {
143                         my ($item, $val)=split(/=/, $i, 2);
144                         push @{$items{$item}}, decode_entities($val);
145                 }
147                 next unless exists $items{src}; # skip bad lines for now
149                 my $page=pagename($items{src}[0]);
150                 if (! $config{rebuild}) {
151                         $pagesources{$page}=$items{src}[0];
152                         $pagemtime{$page}=$items{mtime}[0];
153                         $oldlinks{$page}=[@{$items{link}}];
154                         $links{$page}=[@{$items{link}}];
155                         $depends{$page}=$items{depends}[0] if exists $items{depends};
156                         $destsources{$_}=$page foreach @{$items{dest}};
157                         $renderedfiles{$page}=[@{$items{dest}}];
158                         $pagecase{lc $page}=$page;
159                         foreach my $k (grep /_/, keys %items) {
160                                 my ($id, $key)=split(/_/, $k, 2);
161                                 $pagestate{$page}{decode_entities($id)}{decode_entities($key)}=$items{$k}[0];
162                         }
163                 }
164                 $oldrenderedfiles{$page}=[@{$items{dest}}];
165                 $pagectime{$page}=$items{ctime}[0];
166         }
168         # saveindex relies on %hooks being populated, else it won't save
169         # the page state owned by a given hook. But no plugins are loaded
170         # by this program, so populate %hooks with all hook ids that
171         # currently have page state.
172         foreach my $page (keys %pagemtime) {
173                 foreach my $id (keys %{$pagestate{$page}}) {
174                         $hooks{_dummy}{$id}=1;
175                 }
176         }
177         
178         return close($in);