auth: switch circleci mssql image

[thirdparty/pdns.git] / pdns / json.cc

diff --git a/pdns/json.cc b/pdns/json.cc
index c0fda4e7ae0249ded244d0111f052f06326d295b..b1847d06a31fe527d4b1eb1ea7f9d825878c0b69 100644 (file)
--- a/pdns/json.cc
+++ b/pdns/json.cc
@@ -1,24 +1,24 @@
 /*
-    Copyright (C) 2002 - 2015  PowerDNS.COM BV
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2
-    as published by the Free Software Foundation
-
-    Additionally, the license of this program contains a special
-    exception which allows to distribute the program in binary form when
-    it is linked against OpenSSL.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
+ * This file is part of PowerDNS or dnsdist.
+ * Copyright -- PowerDNS.COM B.V. and its contributors
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ *
+ * In addition, for the avoidance of any doubt, permission is granted to
+ * link this program with OpenSSL and to (re)distribute the binaries
+ * produced as the result of such linking.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -46,7 +46,40 @@ int intFromJson(const Json container, const std::string& key, const int default_
   if (val.is_number()) {
     return val.int_value();
   } else if (val.is_string()) {
-    return std::stoi(val.string_value());
+    try {
+      return std::stoi(val.string_value());
+    } catch (std::out_of_range&) {
+      throw JsonException("Value for key '" + string(key) + "' is out of range");
+    }
+  } else {
+    // TODO: check if value really isn't present
+    return default_value;
+  }
+}
+
+double doubleFromJson(const Json container, const std::string& key)
+{
+  auto val = container[key];
+  if (val.is_number()) {
+    return val.number_value();
+  } else if (val.is_string()) {
+    try {
+      return std::stod(val.string_value());
+    } catch (std::out_of_range&) {
+      throw JsonException("Value for key '" + string(key) + "' is out of range");
+    }
+  } else {
+    throw JsonException("Key '" + string(key) + "' not an Integer or not present");
+  }
+}
+
+double doubleFromJson(const Json container, const std::string& key, const double default_value)
+{
+  auto val = container[key];
+  if (val.is_number()) {
+    return val.number_value();
+  } else if (val.is_string()) {
+    return std::stod(val.string_value());
   } else {
     // TODO: check if value really isn't present
     return default_value;
@@ -68,9 +101,8 @@ bool boolFromJson(const Json container, const std::string& key)
   auto val = container[key];
   if (val.is_bool()) {
     return val.bool_value();
-  } else {
-    throw JsonException("Key '" + string(key) + "' not present or not a Bool");
   }
+  throw JsonException("Key '" + string(key) + "' not present or not a Bool");
 }
 
 bool boolFromJson(const Json container, const std::string& key, const bool default_value)
@@ -78,7 +110,6 @@ bool boolFromJson(const Json container, const std::string& key, const bool defau
   auto val = container[key];
   if (val.is_bool()) {
     return val.bool_value();
-  } else {
-    return default_value;
   }
+  return default_value;
 }