wiki/website: harden config and port to Debian 10.

2 files changed, 47 insertions, 11 deletions

diff --git a/roles/wiki/files/var/lib/ikiwiki/IkiWiki/Plugin/pandoc.pm b/roles/wiki/files/var/lib/ikiwiki/IkiWiki/Plugin/pandoc.pm
index 25081ef..34bdd89 100644
--- a/roles/wiki/files/var/lib/ikiwiki/IkiWiki/Plugin/pandoc.pm
+++ b/roles/wiki/files/var/lib/ikiwiki/IkiWiki/Plugin/pandoc.pm
@@ -21,6 +21,23 @@ my %extra_formats = (
     latex  => { ext=>'tex', label=>'LaTeX', format=>'latex', extra=>['--standalone'], order=>7 },
 );
 
+my @scalar_meta_keys = qw/
+    title date bibliography csl subtitle abstract summary description
+    version lang locale titlesort tag fripost_debug_inner
+    /;
+
+my @list_meta_keys = qw/
+    author
+    /;
+
+my @hash_meta_keys = qw/
+    experiment
+    /;
+
+my @list_hash_meta_keys = qw/
+    references
+    /;
+
 sub import {
     my $markdown_ext = $config{pandoc_markdown_ext} || "mdwn";
 
@@ -96,6 +113,13 @@ sub getsetup () {
         safe => 1,
         rebuild => 1,
     },
+    pandoc_markdown_fmt => {
+        type => "string",
+        example => "markdown",
+        description => "Format string to use when processing files handled by Pandoc.",
+        safe => 1,
+        rebuild => 1,
+    },
     pandoc_latex => {
         type => "boolean",
         example => 0,
@@ -409,10 +433,11 @@ sub htmlize ($@) {
     # can be parsed out
     # We must omit the 'bibliography' parameter here, otherwise the list of
     # references will be doubled.
+    my $markdown_fmt = $config{pandoc_markdown_fmt} || 'markdown';
     my $to_json_pid = open2(*JSON_OUT, *PANDOC_OUT, $command,
-                    '-f', $format,
+                    '-f', $markdown_fmt,
                     '-t', 'json',
-                    @args, '--normalize');
+                    @args);
     error("Unable to open $command") unless $to_json_pid;
 
     # Workaround for perl bug (#376329)
@@ -435,8 +460,8 @@ sub htmlize ($@) {
     my $meta = undef;
     my $decoded_json = decode_json($json_content);
     # The representation of the meta block changed in pandoc version 1.18
-    if (ref $decoded_json eq 'HASH' && $decoded_json->{'Meta'}) {
-        $meta = $decoded_json->{'Meta'} || {}; # post-1.18 version
+    if (ref $decoded_json eq 'HASH' && $decoded_json->{'meta'}) {
+        $meta = $decoded_json->{'meta'} || {}; # post-1.18 version
     } elsif (ref $decoded_json eq 'ARRAY') {
         $meta = $decoded_json->[0]->{'unMeta'} || {}; # pre-1.18 version
     }
@@ -450,12 +475,11 @@ sub htmlize ($@) {
     # as well as some configuration options (generate_*, *_extra_options, *_template).
 
     my @format_keys = grep { $_ ne 'pdf' } keys %extra_formats;
-    my %scalar_meta = map { ($_=>undef) } qw(
-        title date bibliography csl subtitle abstract summary
-        description version lang locale);
+    my %scalar_meta = map { ($_=>undef) } @scalar_meta_keys;
     $scalar_meta{$_.'_template'} = undef for @format_keys;
     my %bool_meta = map { ("generate_$_"=>0) } keys %extra_formats;
-    my %list_meta = map { ($_=>[]) } qw/author references/;
+    my %list_meta = map { ($_=>[]) } (
+        @list_meta_keys, @list_hash_meta_keys, @hash_meta_keys);
     $list_meta{$_.'_extra_options'} = [] for @format_keys;
     my $have_bibl = 0;
     foreach my $k (keys %scalar_meta) {
@@ -484,6 +508,7 @@ sub htmlize ($@) {
         $list_meta{$k} = unwrap_c($meta->{$k});
         $list_meta{$k} = [$list_meta{$k}] unless ref $list_meta{$k} eq 'ARRAY';
         $have_bibl = 1 if $k eq 'references';
+        $pagestate{$page}{meta}{$k} = $list_meta{$k};
         $pagestate{$page}{meta}{"pandoc_$k"} = $list_meta{$k};
     }
     # Try to add other keys as scalars, with pandoc_ prefix only.
@@ -596,9 +621,14 @@ sub pagetemplate (@) {
     my $page = $params{page};
     my $template = $params{template};
     foreach my $k (keys %{$pagestate{$page}{meta}}) {
-        next unless $k =~ /^pandoc_/;
+        next unless
+            (grep {/^$k$/} (
+                 @scalar_meta_keys, @list_meta_keys,
+                 @hash_meta_keys, @list_hash_meta_keys)) ||
+            ($k =~ /^(pandoc_)/);
         $template->param($k => $pagestate{$page}{meta}{$k});
     }
+    return $template;
 }
 
 sub pageactions {
@@ -757,6 +787,11 @@ sub unwrap_c {
     # Finds the deepest-level scalar value for 'c' in the data structure.
     # Lists with one element are replaced with the scalar, lists with more
     # than one element are returned as an arrayref containing scalars.
+    #
+    # Elements containing hash as keys are unwrapped. That is to
+    # support *MetaList* containing *MetaMap* with keys pointing to
+    # *MetaInlines*. Reference are examples of that structure. (hash unwrap)
+    #
     my $container = shift;
     if (ref $container eq 'ARRAY' && @$container > 1) {
         if (ref $container->[0] eq 'HASH' && $container->[0]->{t} =~ /^(?:Str|Space)$/) {
@@ -771,6 +806,8 @@ sub unwrap_c {
         return;
     } elsif (ref $container eq 'HASH' && $container->{c}) {
         return unwrap_c($container->{c});
+    } elsif (ref $container eq 'HASH' && keys $container->%*) { # (hash unwrap)
+        return {map { $_ => unwrap_c($container->{$_}) } keys $container->%*};
     } elsif (ref $container) {
         return;
     } else {
diff --git a/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup b/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup
index 4353965..4af3d59 100644
--- a/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup
+++ b/roles/wiki/files/var/lib/ikiwiki/fripost-wiki.setup
@@ -31,7 +31,7 @@ reverse_proxy: 0
 # filename of cgi wrapper to generate
 cgi_wrapper: /var/lib/ikiwiki/public_html/ikiwiki.cgi
 # mode for cgi_wrapper (can safely be made suid)
-cgi_wrappermode: 06755
+cgi_wrappermode: 0755
 # number of seconds to delay CGI requests when overloaded
 cgi_overload_delay: ''
 # message to display when overloaded (may contain html)
@@ -416,5 +416,4 @@ getsource_mimetype: text/plain; charset=utf-8
 #tag_autocreate_commit: 1
 
 # pandoc plugin
-pandoc_smart: 1
 pandoc_html5: 1