X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/b187641376a3d0519005c80c1ef0dd19266dda84..54551d38666a5260e1743a394b7e66a1f3b2cc89:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 759a49b7d..3ba6cf7f8 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -9,6 +9,18 @@ use Encode;
 
 package IkiWiki;
 
+sub printheader ($) { #{{{
+	my $session=shift;
+	
+	if ($config{sslcookie}) {
+		print $session->header(-charset => 'utf-8',
+			-cookie => $session->cookie(-secure => 1));
+	} else {
+		print $session->header(-charset => 'utf-8');
+	}
+
+} #}}}
+
 sub redirect ($$) { #{{{
 	my $q=shift;
 	my $url=shift;
@@ -31,7 +43,7 @@ sub page_locked ($$;$) { #{{{
 
 	foreach my $admin (@{$config{adminuser}}) {
 		my $locked_pages=userinfo_get($admin, "locked_pages");
-		if (globlist_match($page, userinfo_get($admin, "locked_pages"))) {
+		if (pagespec_match($page, userinfo_get($admin, "locked_pages"))) {
 			return 1 if $nonfatal;
 			error(htmllink("", "", $page, 1)." is locked by ".
 			      htmllink("", "", $admin, 1)." and cannot be edited.");
@@ -64,16 +76,37 @@ sub cgi_recentchanges ($) { #{{{
 	eval q{use Memoize};
 	memoize("htmllink");
 
+	eval q{use Time::Duration};
+	eval q{use CGI 'escapeHTML'};
+
+	my $changelog=[rcs_recentchanges(100)];
+	foreach my $change (@$changelog) {
+		$change->{when} = concise(ago($change->{when}));
+		$change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
+
+		my $is_excess = exists $change->{pages}[10]; # limit pages to first 10
+		delete @{$change->{pages}}[10 .. @{$change->{pages}}] if $is_excess;
+		$change->{pages} = [
+			map {
+				$_->{link} = htmllink("", "", $_->{page}, 1);
+				$_;
+			} @{$change->{pages}}
+		];
+		push @{$change->{pages}}, { link => '...' } if $is_excess;
+	}
+
 	my $template=template("recentchanges.tmpl"); 
 	$template->param(
 		title => "RecentChanges",
 		indexlink => indexlink(),
 		wikiname => $config{wikiname},
-		changelog => [rcs_recentchanges(100)],
-		styleurl => styleurl(),
-		baseurl => "$config{url}/",
+		changelog => $changelog,
+		baseurl => baseurl(),
 	);
-	print $q->header(-charset=>'utf-8'), $template->output;
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $template);
+	});
+	print $q->header(-charset => 'utf-8'), $template->output;
 } #}}}
 
 sub cgi_signin ($$) { #{{{
@@ -83,7 +116,7 @@ sub cgi_signin ($$) { #{{{
 	eval q{use CGI::FormBuilder};
 	my $form = CGI::FormBuilder->new(
 		title => "signin",
-		fields => [qw(do title page subpage from name password confirm_password email)],
+		fields => [qw(do title page subpage from name password)],
 		header => 1,
 		charset => "utf-8",
 		method => 'POST',
@@ -100,7 +133,7 @@ sub cgi_signin ($$) { #{{{
 		header => 0,
 		template => (-e "$config{templatedir}/signin.tmpl" ?
 			     {template_params("signin.tmpl")} : ""),
-		stylesheet => styleurl(),
+		stylesheet => baseurl()."style.css",
 	);
 		
 	decode_form_utf8($form);
@@ -112,9 +145,15 @@ sub cgi_signin ($$) { #{{{
 	$form->field(name => "from", type => "hidden");
 	$form->field(name => "subpage", type => "hidden");
 	$form->field(name => "password", type => "password", required => 0);
-	$form->field(name => "confirm_password", type => "password", required => 0);
-	$form->field(name => "email", required => 0);
-	if ($q->param("do") ne "signin") {
+	if ($form->submitted eq "Register" || $form->submitted eq "Create Account") {
+		$form->title("register");
+		$form->text("");
+		$form->field(name => "name", comment => "use FirstnameLastName");
+		$form->fields(qw(do title page subpage from name password confirm_password email));
+		$form->field(name => "confirm_password", type => "password");
+		$form->field(name => "email", type => "text");
+	}
+	if ($q->param("do") ne "signin" && !$form->submitted) {
 		$form->text("You need to log in first.");
 	}
 	
@@ -122,7 +161,8 @@ sub cgi_signin ($$) { #{{{
 		# Set required fields based on how form was submitted.
 		my %required=(
 			"Login" => [qw(name password)],
-			"Register" => [qw(name password confirm_password email)],
+			"Register" => [],
+			"Create Account" => [qw(name password confirm_password email)],
 			"Mail Password" => [qw(name)],
 		);
 		foreach my $opt (@{$required{$form->submitted}}) {
@@ -146,7 +186,7 @@ sub cgi_signin ($$) { #{{{
 		}
 		# And make sure the entered name exists when logging
 		# in or sending email, and does not when registering.
-		if ($form->submitted eq 'Register') {
+		if ($form->submitted eq 'Create Account') {
 			$form->field(
 				name => "name",
 				validate => sub {
@@ -171,8 +211,6 @@ sub cgi_signin ($$) { #{{{
 	else {
 		# First time settings.
 		$form->field(name => "name", comment => "use FirstnameLastName");
-		$form->field(name => "confirm_password", comment => "(only needed");
-		$form->field(name => "email",            comment => "for registration)");
 		if ($session->param("name")) {
 			$form->field(name => "name", value => $session->param("name"));
 		}
@@ -195,7 +233,7 @@ sub cgi_signin ($$) { #{{{
 				redirect($q, $config{url});
 			}
 		}
-		elsif ($form->submitted eq 'Register') {
+		elsif ($form->submitted eq 'Create Account') {
 			my $user_name=$form->field('name');
 			if (userinfo_setall($user_name, {
 				           'email' => $form->field('email'),
@@ -204,12 +242,12 @@ sub cgi_signin ($$) { #{{{
 				         })) {
 				$form->field(name => "confirm_password", type => "hidden");
 				$form->field(name => "email", type => "hidden");
-				$form->text("Registration successful. Now you can Login.");
-				print $session->header(-charset=>'utf-8');
+				$form->text("Account creation successful. Now you can Login.");
+				printheader($session);
 				print misctemplate($form->title, $form->render(submit => ["Login"]));
 			}
 			else {
-				error("Error saving registration.");
+				error("Error creating account.");
 			}
 		}
 		elsif ($form->submitted eq 'Mail Password') {
@@ -233,12 +271,20 @@ sub cgi_signin ($$) { #{{{
 			
 			$form->text("Your password has been emailed to you.");
 			$form->field(name => "name", required => 0);
-			print $session->header(-charset=>'utf-8');
-			print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => ["Login", "Mail Password"]));
+		}
+		elsif ($form->submitted eq "Register") {
+			printheader($session);
+			print misctemplate($form->title, $form->render(submit => ["Create Account"]));
 		}
 	}
+	elsif ($form->submitted eq "Create Account") {
+		printheader($session);
+		print misctemplate($form->title, $form->render(submit => ["Create Account"]));
+	}
 	else {
-		print $session->header(-charset=>'utf-8');
+		printheader($session);
 		print misctemplate($form->title, $form->render(submit => ["Login", "Register", "Mail Password"]));
 	}
 } #}}}
@@ -267,7 +313,7 @@ sub cgi_prefs ($$) { #{{{
 		action => $config{cgiurl},
 		template => (-e "$config{templatedir}/prefs.tmpl" ?
 			     {template_params("prefs.tmpl")} : ""),
-		stylesheet => styleurl(),
+		stylesheet => baseurl()."style.css",
 	);
 	my @buttons=("Save Preferences", "Logout", "Cancel");
 	
@@ -278,12 +324,19 @@ sub cgi_prefs ($$) { #{{{
 	$form->field(name => "password", type => "password");
 	$form->field(name => "confirm_password", type => "password");
 	$form->field(name => "subscriptions", size => 50,
-		comment => "(".htmllink("", "", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "PageSpec", 1).")");
 	$form->field(name => "locked_pages", size => 50,
-		comment => "(".htmllink("", "", "GlobList", 1).")");
+		comment => "(".htmllink("", "", "PageSpec", 1).")");
+	$form->field(name => "banned_users", size => 50);
 	
 	if (! is_admin($user_name)) {
 		$form->field(name => "locked_pages", type => "hidden");
+		$form->field(name => "banned_users", type => "hidden");
+	}
+
+	if ($config{httpauth}) {
+		$form->field(name => "password", type => "hidden");
+		$form->field(name => "confirm_password", type => "hidden");
 	}
 	
 	if (! $form->submitted) {
@@ -293,6 +346,10 @@ sub cgi_prefs ($$) { #{{{
 			value => userinfo_get($user_name, "subscriptions"));
 		$form->field(name => "locked_pages", force => 1,
 			value => userinfo_get($user_name, "locked_pages"));
+		if (is_admin($user_name)) {
+			$form->field(name => "banned_users", force => 1,
+				value => join(" ", get_banned_users()));
+		}
 	}
 	
 	decode_form_utf8($form);
@@ -312,10 +369,14 @@ sub cgi_prefs ($$) { #{{{
 				userinfo_set($user_name, $field, $form->field($field)) || error("failed to set $field");
 			}
 		}
+		if (is_admin($user_name)) {
+			set_banned_users(grep { ! is_admin($_) }
+					split(' ', $form->field("banned_users")));
+		}
 		$form->text("Preferences saved.");
 	}
 	
-	print $session->header(-charset=>'utf-8');
+	printheader($session);
 	print misctemplate($form->title, $form->render(submit => \@buttons));
 } #}}}
 
@@ -323,9 +384,19 @@ sub cgi_editpage ($$) { #{{{
 	my $q=shift;
 	my $session=shift;
 
-	eval q{use CGI::FormBuilder};
+	my @fields=qw(do rcsinfo subpage from page type editcontent comments);
+	my @buttons=("Save Page", "Preview", "Cancel");
+	
+	eval q{use CGI::FormBuilder; use CGI::FormBuilder::Template::HTML};
+	my $renderer=CGI::FormBuilder::Template::HTML->new(
+		fields => \@fields,
+		template_params("editpage.tmpl"),
+	);
+	run_hooks(pagetemplate => sub {
+		shift->(page => "", destpage => "", template => $renderer->engine);
+	});
 	my $form = CGI::FormBuilder->new(
-		fields => [qw(do rcsinfo subpage from page type editcontent comments)],
+		fields => \@fields,
 		header => 1,
 		charset => "utf-8",
 		method => 'POST',
@@ -337,21 +408,19 @@ sub cgi_editpage ($$) { #{{{
 		params => $q,
 		action => $config{cgiurl},
 		table => 0,
-		template => {template_params("editpage.tmpl")},
+		template => $renderer,
 	);
-	my @buttons=("Save Page", "Preview", "Cancel");
 	
 	decode_form_utf8($form);
 	
 	# This untaint is safe because titlepage removes any problematic
 	# characters.
 	my ($page)=$form->field('page');
-	$page=titlepage(possibly_foolish_untaint(lc($page)));
+	$page=titlepage(possibly_foolish_untaint($page));
 	if (! defined $page || ! length $page ||
 	    $page=~/$config{wiki_file_prune_regexp}/ || $page=~/^\//) {
 		error("bad page name");
 	}
-	$page=lc($page);
 	
 	my $from;
 	if (defined $form->field('from')) {
@@ -359,7 +428,7 @@ sub cgi_editpage ($$) { #{{{
 	}
 	
 	my $file;
-	my $type;	
+	my $type;
 	if (exists $pagesources{$page}) {
 		$file=$pagesources{$page};
 		$type=pagetype($file);
@@ -373,9 +442,7 @@ sub cgi_editpage ($$) { #{{{
 			# favor the type of linking page
 			$type=pagetype($pagesources{$from});
 		}
-		else {
-			$type=$config{default_pageext};
-		}
+		$type=$config{default_pageext} unless defined $type;
 		$file=$page.".".$type;
 	}
 
@@ -397,27 +464,37 @@ sub cgi_editpage ($$) { #{{{
 	$form->tmpl_param("indexlink", indexlink());
 	$form->tmpl_param("helponformattinglink",
 		htmllink("", "", "HelpOnFormatting", 1));
-	$form->tmpl_param("styleurl", styleurl());
-	$form->tmpl_param("baseurl", "$config{url}/");
+	$form->tmpl_param("baseurl", baseurl());
 	if (! $form->submitted) {
 		$form->field(name => "rcsinfo", value => rcs_prepedit($file),
 			force => 1);
 	}
 	
 	if ($form->submitted eq "Cancel") {
-		redirect($q, "$config{url}/".htmlpage($page));
+		if ($newfile && defined $from) {
+			redirect($q, "$config{url}/".htmlpage($from));
+		}
+		elsif ($newfile) {
+			redirect($q, $config{url});
+		}
+		else {
+			redirect($q, "$config{url}/".htmlpage($page));
+		}
 		return;
 	}
 	elsif ($form->submitted eq "Preview") {
-		require IkiWiki::Render;
 		my $content=$form->field('editcontent');
 		my $comments=$form->field('comments');
 		$form->field(name => "editcontent",
 				value => $content, force => 1);
 		$form->field(name => "comments",
 				value => $comments, force => 1);
+		$config{rss}=$config{atom}=0; # avoid preview writing a feed!
 		$form->tmpl_param("page_preview",
-			htmlize($type, linkify($page, $page, $content)));
+			htmlize($page, $type,
+			linkify($page, "",
+			preprocess($page, $page,
+			filter($page, $content)))));
 	}
 	else {
 		$form->tmpl_param("page_preview", "");
@@ -457,7 +534,7 @@ sub cgi_editpage ($$) { #{{{
 			}
 
 			@page_locs = grep {
-				! exists $pagesources{lc($_)} &&
+				! exists $pagecase{lc $_} &&
 				! page_locked($_, $session, 1)
 			} @page_locs;
 			
@@ -485,8 +562,8 @@ sub cgi_editpage ($$) { #{{{
 			if (! defined $form->field('editcontent') || 
 			    ! length $form->field('editcontent')) {
 				my $content="";
-				if (exists $pagesources{lc($page)}) {
-					$content=readfile(srcfile($pagesources{lc($page)}));
+				if (exists $pagesources{$page}) {
+					$content=readfile(srcfile($pagesources{$page}));
 					$content=~s/\n/\r\n/g;
 				}
 				$form->field(name => "editcontent", value => $content,
@@ -567,11 +644,7 @@ sub cgi () { #{{{
 	
 	my $q=CGI->new;
 	
-	if (exists $hooks{cgi}) {
-		foreach my $id (keys %{$hooks{cgi}}) {
-			$hooks{cgi}{$id}{call}->($q);
-		}
-	}
+	run_hooks(cgi => sub { shift->($q) });
 	
 	my $do=$q->param('do');
 	if (! defined $do || ! length $do) {
@@ -593,7 +666,7 @@ sub cgi () { #{{{
 		cgi_hyperestraier();
 	}
 	
-	CGI::Session->name("ikiwiki_session_$config{wikiname}");
+	CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
 	
 	my $oldmask=umask(077);
 	my $session = CGI::Session->new("driver:DB_File", $q,
@@ -601,7 +674,8 @@ sub cgi () { #{{{
 	umask($oldmask);
 	
 	# Everything below this point needs the user to be signed in.
-	if ((! $config{anonok} &&
+	if (((! $config{anonok} || $do eq 'prefs') &&
+	     (! $config{httpauth}) &&
 	     (! defined $session->param("name") ||
 	     ! userinfo_get($session->param("name"), "regdate"))) || $do eq 'signin') {
 		cgi_signin($q, $session);
@@ -613,6 +687,29 @@ sub cgi () { #{{{
 		
 		return;
 	}
+
+	if ($config{httpauth} && (! defined $session->param("name"))) {
+		if (! defined $q->remote_user()) {
+			error("Could not determine authenticated username.");
+		}
+		else {
+			$session->param("name", $q->remote_user());
+			if (! userinfo_get($session->param("name"), "regdate")) {
+				userinfo_setall($session->param("name"), {
+					email => "",
+					password => "",
+					regdate=>time,
+				});
+			}
+		}
+	}
+
+	if (userinfo_get($session->param("name"), "banned")) {
+		print $q->header(-status => "403 Forbidden");
+		$session->delete();
+		print "You are banned.";
+		exit;
+	}
 	
 	if ($do eq 'create' || $do eq 'edit') {
 		cgi_editpage($q, $session);
@@ -621,11 +718,11 @@ sub cgi () { #{{{
 		cgi_prefs($q, $session);
 	}
 	elsif ($do eq 'blog') {
-		my $page=titlepage(lc($q->param('title')));
+		my $page=titlepage(decode_utf8($q->param('title')));
 		# if the page already exists, munge it to be unique
 		my $from=$q->param('from');
 		my $add="";
-		while (exists $oldpagemtime{"$from/$page$add"}) {
+		while (exists $pagecase{lc "$from/$page$add"}) {
 			$add=1 unless length $add;
 			$add++;
 		}