Attachment 5841 Details for Bug 34414

[patch] check parameters in ldap.sh for empty values.

34xxx_lib-error.diff (text/plain), 7.07 KB, created by Philipp Hahn on 2014-03-28 13:40 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2014-03-28 13:40 CET

Size: 7.07 KB

patch

obsolete

>diff --git a/branches/ucs-3.2/ucs-3.2-1/base/univention-lib/shell/ldap.sh b/branches/ucs-3.2/ucs-3.2-1/base/univention-lib/shell/ldap.sh
>index 16e60d7..d314719 100644
>--- a/branches/ucs-3.2/ucs-3.2-1/base/univention-lib/shell/ldap.sh
>+++ b/branches/ucs-3.2/ucs-3.2-1/base/univention-lib/shell/ldap.sh
>@@ -35,17 +35,10 @@
> # ==> 20110622112559Z
> #
> ucs_getAttrOfDN () { # <attr> <dn> [<ldapsearch-credentials>]
>-	local attr="$1"
>-	local base="$2"
>-	if ! shift 2
>-	then
>-		echo "ucs_getAttrOfDN: wrong number of arguments" >&2
>-		return 2
>-	fi
>-	if [ -n "$attr" ]; then
>+	local attr="${1:?missing attribute name}"
>+	local base="${2:?missing base DN}"
> 		univention-ldapsearch -x "$@" -s base -b "$base" -LLL "$attr" \
> 			| ldapsearch-wrapper | ldapsearch-decode64 | sed -ne "s/^$attr: //p"
>-	fi
> }
> 
> #
>@@ -54,15 +47,8 @@ ucs_getAttrOfDN () { # <attr> <dn> [<ldapsearch-credentials>]
> # e.g. ucs_convertUID2DN "testuser"
> #
> ucs_convertUID2DN () { # <uid> [<ldapsearch-credentials>]
>-	local uid="$1"
>-	if ! shift 1
>-	then
>-		echo "ucs_convertUID2DN: wrong number of arguments" >&2
>-		return 2
>-	fi
>-	if [ -n "$uid" ]; then
>+	local uid="${1:?missing UID}"
> 		univention-ldapsearch -x "$@" -LLL "(&(|(&(objectClass=posixAccount)(objectClass=shadowAccount))(objectClass=univentionMail)(objectClass=sambaSamAccount)(objectClass=simpleSecurityObject)(&(objectClass=person)(objectClass=organizationalPerson)(objectClass=inetOrgPerson)))(!(uidNumber=0))(!(uid=*\$))(uid=$uid))" dn | ldapsearch-wrapper | ldapsearch-decode64 | sed -ne 's/dn: //p'
>-	fi
> }
> 
> #
>@@ -71,12 +57,7 @@ ucs_convertUID2DN () { # <uid> [<ldapsearch-credentials>]
> # e.g. ucs_convertDN2UID "uid=testuser,cn=users,dc=test,dc=system"
> #
> ucs_convertDN2UID () { # <userdn> [<ldapsearch-credentials>]
>-	local userdn="$1"
>-	if ! shift 1
>-	then
>-		echo "ucs_convertDN2UID: wrong number of arguments" >&2
>-		return 2
>-	fi
>+	local userdn="${1:?missing user DN}"
> 	ucs_getAttrOfDN "uid" "$userdn" "$@"
> }
> 
>@@ -86,12 +67,7 @@ ucs_convertDN2UID () { # <userdn> [<ldapsearch-credentials>]
> # e.g. ucs_getGroupMembersDirect "cn=Domain Admins,cn=groups,dc=test,dc=system"
> #
> ucs_getGroupMembersDirect () { # <groupDN> [<ldapsearch-credentials>]
>-	local groupdn="$1"
>-	if ! shift 1
>-	then
>-		echo "ucs_getGroupMembersDirect: wrong number of arguments" >&2
>-		return 2
>-	fi
>+	local groupdn="${1:?missing group DN}"
> 	ucs_getAttrOfDN "uniqueMember" "$groupdn" "$@"
> }
> 
>@@ -105,12 +81,7 @@ ucs_getGroupMembersDirect () { # <groupDN> [<ldapsearch-credentials>]
> ucs_getGroupMembersRecursive () { # <groupDN> [<ldapsearch-credentials>]
> 	local reply
> 	local ldif
>-	local groupdn="$1"
>-	if ! shift 1
>-	then
>-		echo "ucs_getGroupMembersRecursive: wrong number of arguments" >&2
>-		return 2
>-	fi
>+	local groupdn="${1:?missing group DN}"
> 	ucs_getGroupMembersDirect "$groupdn" "$@" | while read reply
> 	do
> 		ldif=$(univention-ldapsearch -x "$@" -LLL -b "$reply" '(!(objectClass=univentionGroup))' dn | sed -ne "s/^dn: //p")
>@@ -136,12 +107,7 @@ ucs_getGroupMembersRecursive () { # <groupDN> [<ldapsearch-credentials>]
> #
> ucs_addServiceToLocalhost () { # <servicename> [<udm-credentials>]
> 	local server_role ldap_hostdn
>-	local servicename="$1"
>-	if ! shift 1
>-	then
>-		echo "ucs_addServiceToLocalhost: wrong argument number" >&2
>-		return 2
>-	fi
>+	local servicename="${1:?missing service name}"
> 	eval "$(ucr shell server/role ldap/hostdn)"
> 	ucs_addServiceToHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
> }
>@@ -154,15 +120,10 @@ ucs_addServiceToLocalhost () { # <servicename> [<udm-credentials>]
> # e.g. ucs_addServiceToHost "nagios-server" "domaincontroller_slave" "cn=myslave,cn=dc,cn=computers,dc=test,dc=system" "$@"
> #
> ucs_addServiceToHost () { # <servicename> <udm-module-name> <dn> [options]
>-	local servicename="$1"
>-	local modulename="$2"
>-	local hostdn="$3"
>+	local servicename="${1:?missing service name}"
>+	local modulename="${2:?missing module name}"
>+	local hostdn="${3:?missing host DN}"
> 	local ldap_base="$(ucr get ldap/base)"
>-	if ! shift 3
>-	then
>-		echo "ucs_addServiceToHost: wrong argument number" >&2
>-		return 2
>-	fi
> 	univention-directory-manager container/cn create "$@" --ignore_exists \
> 		--set name="services" --position "cn=univention,$ldap_base"
> 	univention-directory-manager settings/service create "$@" --ignore_exists \
>@@ -181,12 +142,7 @@ ucs_addServiceToHost () { # <servicename> <udm-module-name> <dn> [options]
> #
> ucs_removeServiceFromLocalhost () { # <servicename> [<udm-credentials>]
> 	local server_role ldap_hostdn
>-	local servicename="$1"
>-	if ! shift 1
>-	then
>-		echo "ucs_removeServiceFromLocalhost: wrong argument number" >&2
>-		return 2
>-	fi
>+	local servicename="${1:?missing serive name}"
> 	eval "$(ucr shell server/role ldap/hostdn)"
> 	ucs_removeServiceFromHost "$servicename" "$server_role" "$ldap_hostdn" "$@"
> }
>@@ -199,15 +155,10 @@ ucs_removeServiceFromLocalhost () { # <servicename> [<udm-credentials>]
> # e.g. ucs_removeServiceFromHost "nagios-server" "domaincontroller_slave" "cn=myslave,cn=dc,cn=computers,dc=test,dc=system" "$@"
> #
> ucs_removeServiceFromHost () { # <servicename> <udm-module-name> <dn> [options]
>-	local servicename="$1"
>-	local modulename="$2"
>-	local hostdn="$3"
>+	local servicename="${1:?missing service name}"
>+	local modulename="${2:?missing module name}"
>+	local hostdn="${3:?missing host DN}"
> 	local ldap_base="$(ucr get ldap/base)"
>-	if ! shift 3
>-	then
>-		echo "ucs_removeServiceFromHost: wrong argument number" >&2
>-		return 2
>-	fi
> 	univention-directory-manager "computers/$modulename" modify "$@" \
> 		--dn "$hostdn" --remove service="$servicename"
> 	if ucs_isServiceUnused "$servicename" "$@" &&
>@@ -255,16 +206,10 @@ ucs_parseCredentials () {
> # e.g.  if ucs_isServiceUnused "DNS" "$@"; then uninstall DNS; fi
> #
> ucs_isServiceUnused () { # <servicename>
>-	local servicename="$1"
>+	local servicename="${1?:missing service name}"
> 	local master="$(ucr get ldap/master)"
> 	local port="$(ucr get ldap/master/port)"
> 
>-	if ! shift 1
>-	then
>-		echo "ucs_lastHostWithService: wrong argument number" >&2
>-		return 2
>-	fi
>-
> 	if [ -z "$port" ]
> 	then
> 		port=7389
>@@ -287,8 +232,8 @@ ucs_isServiceUnused () { # <servicename>
> 	# create a tempfile to get the real return code of the ldapsearch command,
> 	# otherwise we get only the code of the sed command
> 	local tempfile="$(mktemp)"
>-	univention-ldapsearch univentionService="${servicename}" "$@" cn >"$tempfile"
>-	if [ $? != 0 ]; then
>+	if ! univention-ldapsearch univentionService="${servicename}" "$@" cn >"$tempfile"
>+	then
> 		rm -f "$tempfile"
> 		echo "ucs_isServiceUnused: search failed" >&2
> 		return 2
>@@ -371,18 +316,13 @@ ucs_unregisterLDAPExtension () {
> # e.g. ucs_registerLDAPSchema /usr/share/univention-fetchmail-schema/univention-fetchmail.schema
> #
> ucs_registerLDAPSchema () {
>-	local schemaFile="$1"
>+	local schemaFile="${1:?missing LDAP schema file name}"
> 
> 	if [ ! -d /var/lib/univention-ldap/local-schema ]; then
> 		mkdir -p /var/lib/univention-ldap/local-schema
> 		chmod 755 /var/lib/univention-ldap/local-schema
> 	fi
> 
>-	if [ ! -e "$schemaFile" ]; then
>-		echo "ucs_registerLDAPSchema: missing schema file" >&2
>-		return 2
>-	fi
>-
> 	cp "$schemaFile" /var/lib/univention-ldap/local-schema/
> 
> 	ucr commit /etc/ldap/slapd.conf

Actions: View | Diff

Attachments on bug 34414: 5841