From 36f30b8151f2b46ee3e0345ae64338fac958ee1d Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Fri, 14 May 2021 21:59:54 +0200
Subject: [PATCH 1/4] Add client certificate support

---
 check_json.pl | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/check_json.pl b/check_json.pl
index fb253c9..afc17d6 100755
--- a/check_json.pl
+++ b/check_json.pl
@@ -18,6 +18,8 @@ my $np = Nagios::Plugin->new(
     . "[ -d|--divisor <divisor> ] "
     . "[ -m|--metadata <content> ] "
     . "[ -T|--contenttype <content-type> ] "
+    . "[ --client-cert ] "
+    . "[ --private-key ] "
     . "[ --ignoressl ] "
     . "[ -h|--help ] ",
     version => '0.5',
@@ -93,6 +95,18 @@ $np->add_arg(
     help => "-T, --contenttype application/json \n   "
     . "Content-type accepted if different from application/json ",
 );
+$np->add_arg(
+    spec => 'client-cert|J=s',
+    default => '',
+    help => "-T, --httpclientcert /foo/bar.crt \n   "
+    . "Client certificate ",
+);
+$np->add_arg(
+    spec => 'private-key|K=s',
+    default => '',
+    help => "-T, --httpprivatekey /foo/bar.key \n   "
+    . "Client certificate keyfile",
+);
 
 $np->add_arg(
     spec => 'ignoressl',
@@ -116,6 +130,13 @@ $ua->timeout($np->opts->timeout);
 if ($np->opts->ignoressl) {
     $ua->ssl_opts(verify_hostname => 0, SSL_verify_mode => 0x00);
 }
+if ($np->opts->httpclientcert) {
+    $ua->ssl_opts(
+                    SSL_cert_file       => $np->opts->httpclientcert,
+                    SSL_key_file        => $np->opts->httpprivatekey,
+    );
+
+}
 
 if ($np->opts->verbose) { (print Dumper ($ua))};
 

From 2d14c35db85fc547b1489b7500c0625c05e8463a Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 15 May 2021 22:43:32 +0200
Subject: [PATCH 2/4] Add CA cert option

---
 check_json.pl | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/check_json.pl b/check_json.pl
index afc17d6..4b1a36a 100755
--- a/check_json.pl
+++ b/check_json.pl
@@ -18,6 +18,7 @@ my $np = Nagios::Plugin->new(
     . "[ -d|--divisor <divisor> ] "
     . "[ -m|--metadata <content> ] "
     . "[ -T|--contenttype <content-type> ] "
+    . "[ --cacert ] "
     . "[ --client-cert ] "
     . "[ --private-key ] "
     . "[ --ignoressl ] "
@@ -95,6 +96,12 @@ $np->add_arg(
     help => "-T, --contenttype application/json \n   "
     . "Content-type accepted if different from application/json ",
 );
+$np->add_arg(
+    spec => 'cacert|C=s',
+    default => '',
+    help => "-T, --cacert /foo/ca.crt \n   "
+    . "Ca certificate ",
+);
 $np->add_arg(
     spec => 'client-cert|J=s',
     default => '',
@@ -130,6 +137,9 @@ $ua->timeout($np->opts->timeout);
 if ($np->opts->ignoressl) {
     $ua->ssl_opts(verify_hostname => 0, SSL_verify_mode => 0x00);
 }
+if ($np->opts->{'cacert'}) {
+    $ua->ssl_opts(SSL_ca_file => $np->opts->{'cacert'});
+}
 if ($np->opts->httpclientcert) {
     $ua->ssl_opts(
                     SSL_cert_file       => $np->opts->httpclientcert,

From c6ed8def7d7dfa478b77752cb00c2c2329f38aeb Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 15 May 2021 22:55:29 +0200
Subject: [PATCH 3/4] docs + indent

---
 check_json.pl | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/check_json.pl b/check_json.pl
index 4b1a36a..b956028 100755
--- a/check_json.pl
+++ b/check_json.pl
@@ -99,19 +99,19 @@ $np->add_arg(
 $np->add_arg(
     spec => 'cacert|C=s',
     default => '',
-    help => "-T, --cacert /foo/ca.crt \n   "
+    help => "-C, --cacert /foo/ca.crt \n   "
     . "Ca certificate ",
 );
 $np->add_arg(
     spec => 'client-cert|J=s',
     default => '',
-    help => "-T, --httpclientcert /foo/bar.crt \n   "
+    help => "-J, --client-cert /foo/bar.crt \n   "
     . "Client certificate ",
 );
 $np->add_arg(
     spec => 'private-key|K=s',
     default => '',
-    help => "-T, --httpprivatekey /foo/bar.key \n   "
+    help => "-K, --private-key /foo/bar.key \n   "
     . "Client certificate keyfile",
 );
 
@@ -142,10 +142,9 @@ if ($np->opts->{'cacert'}) {
 }
 if ($np->opts->httpclientcert) {
     $ua->ssl_opts(
-                    SSL_cert_file       => $np->opts->httpclientcert,
-                    SSL_key_file        => $np->opts->httpprivatekey,
+        SSL_cert_file => $np->opts->httpclientcert,
+        SSL_key_file  => $np->opts->httpprivatekey,
     );
-
 }
 
 if ($np->opts->verbose) { (print Dumper ($ua))};

From b0eff678c9a1c831f012d4e2f1a688b287ad29b5 Mon Sep 17 00:00:00 2001
From: Herman van Rink <rink@initfour.nl>
Date: Sat, 15 May 2021 23:08:29 +0200
Subject: [PATCH 4/4] consistent var names

---
 check_json.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/check_json.pl b/check_json.pl
index b956028..34f23c0 100755
--- a/check_json.pl
+++ b/check_json.pl
@@ -140,10 +140,10 @@ if ($np->opts->ignoressl) {
 if ($np->opts->{'cacert'}) {
     $ua->ssl_opts(SSL_ca_file => $np->opts->{'cacert'});
 }
-if ($np->opts->httpclientcert) {
+if ($np->opts->{'client-cert'}) {
     $ua->ssl_opts(
-        SSL_cert_file => $np->opts->httpclientcert,
-        SSL_key_file  => $np->opts->httpprivatekey,
+        SSL_cert_file => $np->opts->{'client-cert'},
+        SSL_key_file  => $np->opts->{'private-key'},
     );
 }