From 8b22ddd85a92eddadd679ac1e51fe1792defb241 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly.no>
Date: Sat, 12 Mar 2016 16:13:31 +0000
Subject: NMS: Do URL decoding and ISO 8601 time formating

Finally found something that lacks correctness in postgres.
---
 include/nms/web.pm | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index ddc1be0..0f37a59 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -7,8 +7,9 @@ use DBI;
 use Data::Dumper;
 use JSON;
 use nms;
-use Digest::SHA qw(sha512_base64);
-use FreezeThaw qw(freeze);
+use Digest::SHA;
+use FreezeThaw;
+use URI::Escape;
 package nms::web;
 
 use base 'Exporter';
@@ -58,9 +59,6 @@ sub setwhen {
 		$now = db_safe_quote('now') . "::timestamp ";
 		$cc{'max-age'} = "3600";
 	}
-	if (defined($get_params{'offset'})) {
-		$now = "(" . $now . " - " . db_safe_quote('offset') . "::interval)";
-	}
 	$when = " time > " . $now . " - '5m'::interval and time < " . $now . " ";
 	return $when;
 }
@@ -68,7 +66,7 @@ sub setwhen {
 sub finalize_output {
 	my $query;
 	my $hash = Digest::SHA::sha512_base64(FreezeThaw::freeze(%json));
-	$query = $dbh->prepare ('select ' . $now . ' as time;');
+	$query = $dbh->prepare('select to_char(' . $now . ', \'YYYY-MM-DD"T"HH24:MI:SS\') as time;');
 	$query->execute();
 
 	$json{'time'} = $query->fetchrow_hashref()->{'time'};
@@ -81,9 +79,10 @@ sub finalize_output {
 }
 
 sub populate_params {
-	foreach my $hdr (split("&",$ENV{'QUERY_STRING'} || "")) {
+	my $querystring = $ENV{'QUERY_STRING'} || "";
+	foreach my $hdr (split("&",$querystring)) {
 		my ($key, $value) = split("=",$hdr,"2");
-		$get_params{$key} = $value;
+		$get_params{$key} = URI::Escape::uri_unescape($value);
 	}
 }
 
-- 
cgit v1.2.3


From 4666a02a51fa313e34875c169502a0cecf834b1c Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly.no>
Date: Wed, 16 Mar 2016 18:15:52 +0000
Subject: NMS: Rewrite the SNMP fetcher and whatnot

Again.

It's using the prototype, and the objects are configurable. I assume this
will need some work.

Also: I touched ping up to make it work without linknets.
---
 include/nms/web.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index 0f37a59..2a336c6 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -59,13 +59,14 @@ sub setwhen {
 		$now = db_safe_quote('now') . "::timestamp ";
 		$cc{'max-age'} = "3600";
 	}
-	$when = " time > " . $now . " - '5m'::interval and time < " . $now . " ";
+	$when = " time > " . $now . " - '15m'::interval and time < " . $now . " ";
 	return $when;
 }
 
 sub finalize_output {
 	my $query;
 	my $hash = Digest::SHA::sha512_base64(FreezeThaw::freeze(%json));
+	$dbh->commit;
 	$query = $dbh->prepare('select to_char(' . $now . ', \'YYYY-MM-DD"T"HH24:MI:SS\') as time;');
 	$query->execute();
 
-- 
cgit v1.2.3


From 314bc052854aabb44dd9272ddd82176be5c469d5 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly.no>
Date: Wed, 16 Mar 2016 19:31:48 +0000
Subject: NMS:  Implement improved ping map

e69-2 is looking good.

Now with a separate age-entity. Not really used for anything fancy right
now, but could be.
---
 include/nms/web.pm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index 2a336c6..7372916 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -52,15 +52,20 @@ sub db_safe_quote {
 
 # returns a valid $when statement
 # Also sets cache-control headers if time is overridden
+# This can be called explicitly to override the window of time we evaluate.
+# Normally up to 15 minutes old data will be returned, but for some API
+# endpoints it is better to return no data than old data (e.g.: ping).
 sub setwhen {
-	my $when;
 	$now = "now()";
+	my $window = '15m';
+	if (@_ == 1) {
+		$window = $_[0];
+	}
 	if (defined($get_params{'now'})) {
 		$now = db_safe_quote('now') . "::timestamp ";
 		$cc{'max-age'} = "3600";
 	}
-	$when = " time > " . $now . " - '15m'::interval and time < " . $now . " ";
-	return $when;
+	$when = " time > " . $now . " - '".$window."'::interval and time < " . $now . " ";
 }
 
 sub finalize_output {
@@ -93,6 +98,6 @@ BEGIN {
 
 	$dbh = nms::db_connect();
 	populate_params();
-	$when = setwhen();
+	setwhen();
 }
 1;
-- 
cgit v1.2.3


From b1e9d762c58eb57e4d600750d1a4f0cbf47e7178 Mon Sep 17 00:00:00 2001
From: Kristian Lyngstol <kly@kly.no>
Date: Wed, 16 Mar 2016 21:25:50 +0000
Subject: NMS: Emit Etag

---
 include/nms/web.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/nms/web.pm')

diff --git a/include/nms/web.pm b/include/nms/web.pm
index 7372916..2a5e132 100755
--- a/include/nms/web.pm
+++ b/include/nms/web.pm
@@ -77,8 +77,10 @@ sub finalize_output {
 
 	$json{'time'} = $query->fetchrow_hashref()->{'time'};
 	$json{'hash'} = $hash;
+	
 	printcc;
-
+	
+	print "Etag: $hash\n";
 	print "Content-Type: text/jso; charset=utf-8\n\n";
 	print JSON::XS::encode_json(\%json);
 	print "\n";
-- 
cgit v1.2.3