jan/check_xmppng
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update upstream source from tag '0.3.2'

Browse source 
Update to upstream version '0.3.2'
with Debian dir f030c740e3
This commit is contained in:
Jan Dittberner 2021-03-07 14:20:59 +01:00
commit 1a3ae4c10d
4 changed files with 74 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
README.md
View file

@ -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.
@ -54,7 +55,7 @@ http://www.gnu.org/licenses/.
## Usage
```
usage: check_xmpp [-h] -H HOST_ADDRESS [-p PORT] [--s2s | --c2s] [-4 | -6]
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]
@ -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.

8
changes.md
View file

@ -1,5 +1,13 @@
# 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
## version 0.3.0 2016-06-18
* add alternative --hostname parameter to make check_xmpp compatible with

12
check_xmppng
View file

@ -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.2"
__version__ = "0.3.2"
NS_IETF_XMPP_SASL = 'urn:ietf:params:xml:ns:xmpp-sasl'
@ -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):

51
icingaexchange.yml
View file

@ -1,16 +1,63 @@
name: check_xmppng
description: "file:///README.md"
url: "https://git.dittberner.info/?p=check_xmpp.git"
url: "https://git.dittberner.info/jan/check_xmppng"
tags: XMPP, X.509
vendor:
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:
-
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