Skip to content

Commit f107e95

Browse files
author
Henri Wahl
committed
Merge branch 'master' of github.com:HenriWahl/Nagstamon
2 parents a1d5a64 + e785146 commit f107e95

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

Nagstamon/QUI/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5009,7 +5009,7 @@ def __init__(self, dialog):
50095009
# default to Nagios as it is the mostly used monitor server
50105010
self.ui.input_combobox_type.setCurrentText('Nagios')
50115011
# fill authentication combobox
5012-
self.ui.input_combobox_authentication.addItems(['Basic', 'Digest'])
5012+
self.ui.input_combobox_authentication.addItems(['Basic', 'Digest', 'Kerberos'])
50135013

50145014
# detect change of server type which leads to certain options shown or hidden
50155015
self.ui.input_combobox_type.activated.connect(self.server_type_changed)

Nagstamon/Servers/Generic.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
1919

2020
import requests
21+
import requests_kerberos
2122
# disable annoying InsecureRequestWarning warnings
2223
try:
2324
requests.packages.urllib3.disable_warnings()
@@ -207,6 +208,8 @@ def init_HTTP(self):
207208
self.session.auth = requests.auth.HTTPBasicAuth(self.username, self.password)
208209
elif self.authentication == 'digest':
209210
self.session.auth = requests.auth.HTTPDigestAuth(self.username, self.password)
211+
elif self.authentication == 'kerberos':
212+
self.session.auth = requests_kerberos.HTTPKerberosAuth()
210213

211214
# default to not check TLS validity
212215
self.session.verify = False

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
'python3-qt5 '
106106
'python3-beautifulsoup4 '
107107
'python3-requests '
108+
'python3-requests-kerberos '
108109
'python3-qt5 '
109110
'python3-SecretStorage '
110111
'python3-crypto '

0 commit comments

Comments
 (0)