Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tell `git revert` not to follow renames (CVE-2016-10026)
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
edittemplate.pm
diff --git
a/IkiWiki/Plugin/edittemplate.pm
b/IkiWiki/Plugin/edittemplate.pm
index 6e8c256da3fdca36addcf8a12a767a6c90d68019..c2a8da29f853ec5f13e8fab959773751cc86ada9 100644
(file)
--- a/
IkiWiki/Plugin/edittemplate.pm
+++ b/
IkiWiki/Plugin/edittemplate.pm
@@
-139,13
+139,24
@@
sub filltemplate ($$) {
$template->param(name => $page);
$template->param(name => $page);
- eval {
- require UUID::Tiny;
- UUID::Tiny->import(':std');
+ if ($template->query(name => 'uuid')) {
my $uuid;
my $uuid;
- $uuid = create_uuid_as_string(UUID_V4());
+ if (open(my $fh, "<", "/proc/sys/kernel/random/uuid")) {
+ $uuid = <$fh>;
+ chomp $uuid;
+ close $fh;
+ }
+ else {
+ eval {
+ require UUID::Tiny;
+ $uuid = UUID::Tiny::create_uuid_as_string(UUID::Tiny::UUID_V4());
+ };
+ }
$template->param(uuid => $uuid);
$template->param(uuid => $uuid);
- };
+ }
+
+ my $time = time();
+ $template->param(time => IkiWiki::date_3339($time));
return $template->output;
}
return $template->output;
}