Attachment 8979 Details for Bug 44881

[patch] nt-diagnostic-drs-showrepl-421.patch

nt-diagnostic-drs-showrepl-421.patch (text/plain), 8.86 KB, created by Lukas Oyen on 2017-06-28 15:50 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Oyen

Created: 2017-06-28 15:50 CEST

Size: 8.86 KB

patch

obsolete

>From e2d20cfd9daef59adf6af27730a0932ed9730b5b Mon Sep 17 00:00:00 2001
>From: Lukas Oyen <oyen@univention.de>
>Date: Tue, 27 Jun 2017 18:06:01 +0200
>Subject: [PATCH 1/2] Bug #xxx: umc-diagnostic: new check
> `samba_tool_showrepl.py`
>
>Inspired by Julian Hupertz `check_drs_replication.py`.
>---
> .../diagnostic/plugins/samba_tool_showrepl.py      | 154 +++++++++++++++++++++
> 1 file changed, 154 insertions(+)
> create mode 100755 management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/samba_tool_showrepl.py
>
>diff --git a/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/samba_tool_showrepl.py b/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/samba_tool_showrepl.py
>new file mode 100755
>index 0000000..9987b96
>--- /dev/null
>+++ b/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/samba_tool_showrepl.py
>@@ -0,0 +1,154 @@
>+#!/usr/bin/python2.7
>+# coding: utf-8
>+#
>+# Univention Management Console module:
>+#  System Diagnosis UMC module
>+#
>+# Copyright 2017 Univention GmbH
>+#
>+# http://www.univention.de/
>+#
>+# All rights reserved.
>+#
>+# The source code of this program is made available
>+# under the terms of the GNU Affero General Public License version 3
>+# (GNU AGPL V3) as published by the Free Software Foundation.
>+#
>+# Binary versions of this program provided by Univention to you as
>+# well as other copyrighted, protected or trademarked materials like
>+# Logos, graphics, fonts, specific documentations and configurations,
>+# cryptographic keys etc. are subject to a license agreement between
>+# you and Univention and not subject to the GNU AGPL V3.
>+#
>+# In the case you use this program under the terms of the GNU AGPL V3,
>+# the program is provided in the hope that it will be useful,
>+# but WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU Affero General Public License for more details.
>+#
>+# You should have received a copy of the GNU Affero General Public
>+# License with the Debian GNU/Linux or Univention distribution in file
>+# /usr/share/common-licenses/AGPL-3; if not, see
>+# <http://www.gnu.org/licenses/>.
>+
>+import os
>+import ldap
>+import socket
>+
>+try:
>+	import samba.param
>+	import samba.credentials
>+	from samba.dcerpc import drsuapi
>+	from samba import drs_utils
>+except ImportError:
>+	SAMBA_AVAILABLE = False
>+else:
>+	SAMBA_AVAILABLE = True
>+
>+import univention.uldap
>+from univention.management.console.modules.diagnostic import Warning
>+
>+from univention.lib.i18n import Translation
>+_ = Translation('univention-management-console-module-diagnostic').translate
>+
>+title = _('Check Samba replication status for errors')
>+description = _('No errors found.'),
>+
>+
>+def is_service_active(service):
>+	lo = univention.uldap.getMachineConnection()
>+	raw_filter = '(&(univentionService=%s)(cn=%s))'
>+	filter_expr = ldap.filter.filter_format(raw_filter, (service, socket.gethostname()))
>+	for (dn, _attr) in lo.search(filter_expr, attr=['cn']):
>+		if dn is not None:
>+			return True
>+	return False
>+
>+
>+class DRSUAPI(object):
>+	def __init__(self, dc=None):
>+		(self.load_param, self.credentials) = self.samba_credentials()
>+		self.server = dc or self.netcmd_dnsname(self.load_param)
>+		drs_tuple = drs_utils.drsuapi_connect(self.server, self.load_param, self.credentials)
>+		(self.drsuapi, self.handle, _bind_supported_extensions) = drs_tuple
>+
>+	@staticmethod
>+	def netcmd_dnsname(lp):
>+		'''return the full DNS name of our own host. Used as a default
>+		for hostname when running status queries'''
>+		return lp.get('netbios name').lower() + "." + lp.get('realm').lower()
>+
>+	@staticmethod
>+	def samba_credentials():
>+		load_param = samba.param.LoadParm()
>+		load_param.set("debug level", "0")
>+		if os.getenv("SMB_CONF_PATH") is not None:
>+			load_param.load(os.getenv("SMB_CONF_PATH"))
>+		else:
>+			load_param.load_default()
>+		credentials = samba.credentials.Credentials()
>+		credentials.guess(load_param)
>+		if not credentials.authentication_requested():
>+			credentials.set_machine_account(load_param)
>+		return (load_param, credentials)
>+
>+	def _replica_info(self, info_type):
>+		req1 = drsuapi.DsReplicaGetInfoRequest1()
>+		req1.info_type = info_type
>+		(info_type, info) = self.drsuapi.DsReplicaGetInfo(self.handle, 1, req1)
>+		return (info_type, info)
>+
>+	def neighbours(self):
>+		(info_type, info) = self._replica_info(drsuapi.DRSUAPI_DS_REPLICA_INFO_NEIGHBORS)
>+		for neighbour in info.array:
>+			yield neighbour
>+
>+		(info_type, info) = self._replica_info(drsuapi.DRSUAPI_DS_REPLICA_INFO_REPSTO)
>+		for neighbour in info.array:
>+			yield neighbour
>+
>+	def replication_problems(self):
>+		for neighbour in self.neighbours():
>+			(ecode, estring) = neighbour.result_last_attempt
>+			if ecode != 0:
>+				yield ReplicationProblem(neighbour)
>+
>+
>+class ReplicationProblem(Exception):
>+	def __init__(self, neighbour):
>+		super(ReplicationProblem, self).__init__(neighbour)
>+		self.neighbour = neighbour
>+
>+	def __str__(self):
>+		msg = _('In {nc!r}: error during DRS replication from {source}.')
>+		source = self._parse_ntds_dn(self.neighbour.source_dsa_obj_dn)
>+		return msg.format(nc=self.neighbour.naming_context_dn.encode(),
>+			source=source)
>+
>+	@staticmethod
>+	def _parse_ntds_dn(dn):
>+		exploded = ldap.dn.str2dn(dn)
>+		if len(exploded) >= 5:
>+			(first, second, third, fourth, fifth) = exploded[:5]
>+			valid_ntds_dn = all((first[0][1] == 'NTDS Settings',
>+				third[0][1] == 'Servers', fifth[0][1] == 'Sites'))
>+			if valid_ntds_dn:
>+				return '{}/{}'.format(fourth[0][1], second[0][1])
>+		return dn
>+
>+
>+def run():
>+	if not is_service_active('Samba 4') or not SAMBA_AVAILABLE:
>+		return
>+
>+	drs = DRSUAPI()
>+	problems = list(drs.replication_problems())
>+	if problems:
>+		ed = [_('`samba-tool drs showrepl` returned a problem with the replication.')]
>+		ed.extend(str(error) for error in problems)
>+		raise Warning(description='\n'.join(ed))
>+
>+
>+if __name__ == '__main__':
>+	from univention.management.console.modules.diagnostic import main
>+	main()
>-- 
>2.7.4
>
>
>From 24d399d03bfce1415ccac7c7cbd3164ee5d5e29d Mon Sep 17 00:00:00 2001
>From: Lukas Oyen <oyen@univention.de>
>Date: Wed, 28 Jun 2017 15:43:29 +0200
>Subject: [PATCH 2/2] Bug #xxx: umc-diagnostic: new check
> `samba_tool_showrepl.py` (po)
>
>---
> .../umc/python/diagnostic/de.po                      | 20 ++++++++++++++++++--
> 1 file changed, 18 insertions(+), 2 deletions(-)
>
>diff --git a/management/univention-management-console-module-diagnostic/umc/python/diagnostic/de.po b/management/univention-management-console-module-diagnostic/umc/python/diagnostic/de.po
>index affad86..a98dca3 100644
>--- a/management/univention-management-console-module-diagnostic/umc/python/diagnostic/de.po
>+++ b/management/univention-management-console-module-diagnostic/umc/python/diagnostic/de.po
>@@ -2,8 +2,8 @@
> msgid ""
> msgstr ""
> "Project-Id-Version: univention-management-console-module-diagnostic\n"
>-"Report-Msgid-Bugs-To: packages@univention.de\n"
>-"POT-Creation-Date: 2016-01-14 12:19+0100\n"
>+"Report-Msgid-Bugs-To: \n"
>+"POT-Creation-Date: 2017-06-28 15:42+0200\n"
> "PO-Revision-Date: \n"
> "Last-Translator: Univention GmbH <packages@univention.de>\n"
> "Language-Team: Univention GmbH <packages@univention.de>\n"
>@@ -27,6 +27,10 @@ msgstr ""
> msgid "Adjust to suggested limits"
> msgstr "An vorgeschlagene Limits anpassen"
> 
>+#: umc/python/diagnostic/plugins/samba_tool_showrepl.py:54
>+msgid "Check Samba replication status for errors"
>+msgstr "ÃberprÃ¼fe den Samba Replikations Status"
>+
> #: umc/python/diagnostic/plugins/gateway.py:11
> msgid "Gateway is not reachable"
> msgstr "Gateway ist nicht erreichbar"
>@@ -49,6 +53,10 @@ msgid "If these settings are correct the problem relies in the gateway itself:"
> msgstr ""
> "Wenn diese Einstellungen richtig sind liegt das Problem im Gateway selbst:"
> 
>+#: umc/python/diagnostic/plugins/samba_tool_showrepl.py:123
>+msgid "In {nc!r}: error during DRS replication from {source}."
>+msgstr "In {nc!r}: Fehler wÃ¤hrend der DRS Replikation von {source}."
>+
> #: umc/python/diagnostic/plugins/security_limits.py:19
> #, python-brace-format
> msgid ""
>@@ -97,6 +105,10 @@ msgstr ""
> msgid "Nameserver(s) are not responsive"
> msgstr "Nameserver sind nicht ansprechbar"
> 
>+#: umc/python/diagnostic/plugins/samba_tool_showrepl.py:55
>+msgid "No errors found."
>+msgstr "Keine Fehler gefunden."
>+
> #: umc/python/diagnostic/plugins/package_status.py:11
> msgid "Package status corrupt"
> msgstr "Paketstatus korrupt"
>@@ -260,6 +272,10 @@ msgstr ""
> "dass Authentifikations-Zugangsdaten (falls existierend) korrekt sind und die "
> "ACL's des Proxy-Servers nicht verbieten, Anfragen an %s zu stellen."
> 
>+#: umc/python/diagnostic/plugins/samba_tool_showrepl.py:147
>+msgid "`samba-tool drs showrepl` returned a problem with the replication."
>+msgstr "`samba-tool drs showrepl` gibt ein Problem mit der Replikation zurÃ¼ck."
>+
> #: umc/python/diagnostic/plugins/package_status.py:28
> msgid "some"
> msgstr "einigen"
>-- 
>2.7.4
>

Actions: View | Diff

Attachments on bug 44881: 8979 | 9112