From 6ab1fbb3f9f551b67a6481aafe3591e837905a8b Mon Sep 17 00:00:00 2001 From: nopedial Date: Thu, 10 Oct 2013 23:48:29 +0200 Subject: add check and rescue for fetch params --- lib/oxidized/api/rest.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/oxidized/api/rest.rb b/lib/oxidized/api/rest.rb index a2ff1ab..4bf464b 100644 --- a/lib/oxidized/api/rest.rb +++ b/lib/oxidized/api/rest.rb @@ -42,7 +42,7 @@ module Oxidized when /show\/(.*)/ send res, @nodes.show($1) when /fetch\/(.*)/ # primitive node fetch implementation for file config - /nodes/fetch/$ip_address - if CFG.output[:default] == "file" # ugly hack to disable configuration fetch for non ascii configurations + if CFG.output[:default] == "file" and $1 != '' # ugly hack to disable configuration fetch for non ascii configurations and ensure that argument is received @cfg_root = CFG.output[:file] File.open("#{@cfg_root[:directory]}/#{$1}", "r") do |pipe| @res_config = [] @@ -51,8 +51,10 @@ module Oxidized end end send res, @res_config - else + elsif CFG.output[:default] != "file" and $1 != '' send res, "oxidized 0.0.14 support fetch for ascii configuration files only." # return error to end user + else # return error if no argument is received + send res, "missing argument - example: /nodes/fetch/192.0.2.1" end end end -- cgit v1.2.1