From e4651d7dac7d4183ef04833a3360d20ad42a7485 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 23 Jun 2019 23:10:30 +0200 Subject: [PATCH 1/9] Update project URL --- icingaexchange.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icingaexchange.yml b/icingaexchange.yml index eb873ac..7ae4a8f 100644 --- a/icingaexchange.yml +++ b/icingaexchange.yml @@ -1,6 +1,6 @@ name: check_xmppng description: "file:///README.md" -url: "https://git.dittberner.info/?p=check_xmpp.git" +url: "https://git.dittberner.info/check_xmppng" tags: XMPP, X.509 vendor: target: Messaging From 8be4413b451a1d8ffd6c5a71782c0a692bea88c0 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 23 Jun 2019 23:11:41 +0200 Subject: [PATCH 2/9] Fix command name in README Fixes #1 --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 92373b8..3902008 100644 --- a/README.md +++ b/README.md @@ -54,10 +54,10 @@ http://www.gnu.org/licenses/. ## Usage ``` -usage: check_xmpp [-h] -H HOST_ADDRESS [-p PORT] [--s2s | --c2s] [-4 | -6] - [--servername SERVERNAME] [--starttls] [-w SECONDS] - [-c SECONDS] [--no-check-certificates] [-r CAROOTS] - [--warn-days WARNDAYS] [--crit-days CRITDAYS] [-v] +usage: check_xmppng [-h] -H HOST_ADDRESS [-p PORT] [--s2s | --c2s] [-4 | -6] + [--servername SERVERNAME] [--starttls] [-w SECONDS] + [-c SECONDS] [--no-check-certificates] [-r CAROOTS] + [--warn-days WARNDAYS] [--crit-days CRITDAYS] [-v] Check XMPP services From cf0ec04526de3549f4916218f432da8a09ea73a9 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 23 Jun 2019 23:16:21 +0200 Subject: [PATCH 3/9] Fix project URL --- icingaexchange.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/icingaexchange.yml b/icingaexchange.yml index 7ae4a8f..54d6873 100644 --- a/icingaexchange.yml +++ b/icingaexchange.yml @@ -1,6 +1,6 @@ name: check_xmppng description: "file:///README.md" -url: "https://git.dittberner.info/check_xmppng" +url: "https://git.dittberner.info/jan/check_xmppng" tags: XMPP, X.509 vendor: target: Messaging From 5f54f2ca452b6dd9e64618fd61257849516ed1d9 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 23 Jun 2019 23:22:24 +0200 Subject: [PATCH 4/9] Raise version number --- check_xmppng | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/check_xmppng b/check_xmppng index 5fdd61d..6987c61 100755 --- a/check_xmppng +++ b/check_xmppng @@ -31,7 +31,7 @@ from defusedxml.sax import make_parser import nagiosplugin __author__ = "Jan Dittberner" -__version__ = "0.2" +__version__ = "0.3.1" NS_IETF_XMPP_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl' From 57f1b5fb558d11d1b50e081b2e7aebc934cbbe96 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 23 Jun 2019 23:26:19 +0200 Subject: [PATCH 5/9] Update changes.md --- changes.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes.md b/changes.md index df88e10..cd825c8 100644 --- a/changes.md +++ b/changes.md @@ -1,5 +1,9 @@ # change log +## version 0.3.1 2019-06-23 + +* move to new project location + ## version 0.3.0 2016-06-18 * add alternative --hostname parameter to make check_xmpp compatible with From 9999c4e8689aab6792a41ac177608db647079b67 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 23 Jun 2019 23:31:53 +0200 Subject: [PATCH 6/9] Update Icinga exchange metadata --- icingaexchange.yml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/icingaexchange.yml b/icingaexchange.yml index eb873ac..d610af3 100644 --- a/icingaexchange.yml +++ b/icingaexchange.yml @@ -7,10 +7,34 @@ target: Messaging type: Plugin license: gplv3 releases: + - name: 0.3.1 + description: "new project home" + files: + - + name: check_xmppng + url: "file:///check_xmppng" + description: "Check command" + checksum: 3ba088ad712e7eff3897b0be70dc5437 + - + name: COPYING + url: "file:///COPYING" + description: "GPL 3.0 license text" + checksum: d32239bcb673463ab874e80d47fae504 + - + name: README.md + url: "file:///README.md" + description: "documentation" + checksum: 1e6f6632b12e4ef5fc4f02c3ea65da8a + - + name: changes.md + url: "file:///changes.md" + description: "change log" + checksum: df32115e17a931a083c2c9065c998147 - name: 0.3.0 description: "add --hostname option" files: - - name: check_xmppng + - + name: check_xmppng url: "file:///check_xmppng" description: "Check command" checksum: 9774a26db6c54af4a51902b90ffe13bc From 5438f7f0893b117bca77885077fd4a5d01b7029d Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 7 Mar 2021 14:04:35 +0100 Subject: [PATCH 7/9] Remove CA certificate statistics The CA certificate statistics do not work with recent Python versions and broke the plugin initialization. Fixes #2 --- check_xmppng | 8 -------- 1 file changed, 8 deletions(-) diff --git a/check_xmppng b/check_xmppng index 6987c61..8ee96d1 100755 --- a/check_xmppng +++ b/check_xmppng @@ -335,14 +335,6 @@ class Xmpp(nagiosplugin.Resource): context.load_verify_locations(**kwargs) else: context.load_default_certs() - stats = context.cert_store_stats() - if stats['x509_ca'] == 0: - _LOG.info( - "tried to load CA certificates from default locations, but" - " could not find any CA certificates.") - raise XmppException('no CA certificates found') - else: - _LOG.debug('certificate store statistics: %s', stats) return context def initiate_tls(self): From 16e8cb41fe52ffc3256b03612346fc20b589ad88 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 7 Mar 2021 14:06:18 +0100 Subject: [PATCH 8/9] Improve README - Update dependency versions to those of Debian Buster - link to bug tracker - fix minor formatting issues --- README.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3902008..22245e9 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# check_xmppng - check plugin for XMPP +# `check_xmppng` - check plugin for XMPP This program implements a nagios check plugin for XMPP servers implementing the XMPP protocol as specified in [RFC 6120](http://tools.ietf.org/html/rfc6120). @@ -10,8 +10,9 @@ The program implements the following features: * support STARTTLS as specified in RFC 6120 section 5. * check the validity of the server certificate presented by the XMPP server -The plugin has been implemented because of insufficiencies in check_ssl_cert -and the existing [check_xmpp](https://exchange.icinga.org/exchange/check_xmpp). +The plugin has been implemented because of insufficiencies in `check_ssl_cert` +and the existing +[`check_xmpp`](https://exchange.icinga.org/exchange/check_xmpp). Maximum acceptable timeouts as well as minimum acceptable number of days the server certificate needs to be valid can be specified as command line @@ -30,14 +31,14 @@ the Python standard library: The software has been developed and tested with the following versions: -* Python 3.4.2 -* defusedxml 0.4.1 -* nagiosplugin 1.2.2 +* Python 3.7.3 +* defusedxml 0.5.0 +* nagiosplugin 1.2.4 ## License -check_xmppng is free software: you can redistribute it and/or modify it under +`check_xmppng` is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. @@ -95,5 +96,6 @@ optional arguments: ## Contact -If you want to provide feedback or bug reports please send me a mail to -jan (at) dittberner [dot] info. +If you want to provide feedback or bug reports please use the [bug +tracker](https://git.dittberner.info/jan/check_xmppng/issues) or send me an +email to jan (at) dittberner [dot] info. From c8f93d56dc9bd040e33b939aca9893d37ba5b329 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Sun, 7 Mar 2021 14:11:02 +0100 Subject: [PATCH 9/9] Release 0.3.2 - Update version and copyright information - Update changelog and icingaexchange.yml --- changes.md | 4 ++++ check_xmppng | 4 ++-- icingaexchange.yml | 23 +++++++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/changes.md b/changes.md index cd825c8..f327db8 100644 --- a/changes.md +++ b/changes.md @@ -1,5 +1,9 @@ # change log +## version 0.3.2 2021-03-07 + +* remove brokebn CA certificate statistics + ## version 0.3.1 2019-06-23 * move to new project location diff --git a/check_xmppng b/check_xmppng index 8ee96d1..0d08786 100755 --- a/check_xmppng +++ b/check_xmppng @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # # Nagios compatible check for XMPP servers. -# Copyright (C) 2015-2016 Jan Dittberner +# Copyright (C) 2015-2021 Jan Dittberner # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ from defusedxml.sax import make_parser import nagiosplugin __author__ = "Jan Dittberner" -__version__ = "0.3.1" +__version__ = "0.3.2" NS_IETF_XMPP_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl' diff --git a/icingaexchange.yml b/icingaexchange.yml index cda1b27..048a9c9 100644 --- a/icingaexchange.yml +++ b/icingaexchange.yml @@ -7,6 +7,29 @@ target: Messaging type: Plugin license: gplv3 releases: + - name: 0.3.2 + description: "fix CA certificate check" + files: + - + name: check_xmppng + url: "file:///check_xmppng" + description: "Check command" + checksum: e0ded038e79a2538d3b0c99cdc599810 + - + name: COPYING + url: "file:///COPYING" + description: "GPL 3.0 license text" + checksum: d32239bcb673463ab874e80d47fae504 + - + name: README.md + url: "file:///README.md" + description: "documentation" + checksum: 701ad7a882406a1f552a118d471a0b45 + - + name: changes.md + url: "file:///changes.md" + description: "change log" + checksum: 60adfa1bf31c5a5fefb57ca55d186c7b - name: 0.3.1 description: "new project home" files: