From: Sven Schöling <s.schoeling@linet-services.de>
Date: Fri, 15 Apr 2016 17:18:58 +0000 (+0200)
Subject: Menu: Fehlerchecks beim yaml einlesen
X-Git-Tag: release-3.4.1~220
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=b686560537b3e522fdfd0f8a81fa1d9b7c7114d8;p=kivitendo-erp.git

Menu: Fehlerchecks beim yaml einlesen

2 häufige Fehler abfangen:
  - wenn ids in einer datei doppelt vorkommen (passiert beim editieren)
  - wenn YAML selber Fehler wirft gab es bisher ein HTTP 500
---

diff --git a/SL/Menu.pm b/SL/Menu.pm
index 6bbcffb9c..bdac42c0d 100644
--- a/SL/Menu.pm
+++ b/SL/Menu.pm
@@ -28,11 +28,24 @@ sub new {
     my $nodes_by_id = {};
     for my $file (@files) {
       my $data;
-      if ($yaml_xs) {
-        $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file));
-      } else {
-        $data = YAML::LoadFile(File::Spec->catfile($path, $file));
-      }
+      eval {
+        if ($yaml_xs) {
+          $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file));
+        } else {
+          $data = YAML::LoadFile(File::Spec->catfile($path, $file));
+        }
+        1;
+      } or do {
+        die "Error while parsing $file: $@";
+      };
+
+      # check if this file is internally consistent.
+      die 'not an array ref' unless $data && 'ARRAY' eq ref $data; # TODO get better diag to user
+
+      # in particular duplicate ids tend to come up as a user error when editing the menu files
+      my %uniq_ids;
+      $uniq_ids{$_->{id}}++ && die "Error in $file: duplicate id $_->{id}" for @$data;
+
       _merge($nodes, $nodes_by_id, $data);
     }
 
@@ -57,8 +70,6 @@ sub new {
 sub _merge {
   my ($nodes, $by_id, $data) = @_;
 
-  die 'not an array ref' unless $data && 'ARRAY' eq ref $data; # TODO check this sooner, to get better diag to user
-
   for my $node (@$data) {
     my $id = $node->{id};