Attachment #5391 for bug #32324

View | Details | Raw Unified | Return to bug 32324
Collapse All | Expand All

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/Makefile (+4 lines)

Line 0	Link Here

#!/usr/bin/make -f

test:

	$(MAKE) -C tests

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/Makefile (+4 lines)

Line 0	Link Here

#!/usr/bin/make -f

test:

	run-parts --verbose --regex='\.sh$$' -- .

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-check_ldap_access.sh (+10 lines)

Line 0	Link Here

#!/bin/sh

set -e

set --

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ 0 -eq "$check_ldap_access" ]

set -- --check_ldap_access

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ 1 -eq "$check_ldap_access" ]

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-check_ldap_available.sh (+10 lines)

Line 0	Link Here

#!/bin/sh

set -e

set --

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ -z "$check_ldap_availability" ]

set -- --check_ldap_availability

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ 1 -eq "$check_ldap_availability" ]




#!/bin/sh
set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

profile_file=$(mktemp)
trap "rm -f '$profile_file'" EXIT

[ -z "$(get_profile_var)" ]

[ -z "$(get_profile_var var)" ]

echo 'var=val' >"$profile_file"
[ "val" = "$(get_profile_var var)" ]

rm -f "$profile_file"
[ -z "$(get_profile_var)" ]

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-info_header-arg.sh (+8 lines)

Line 0	Link Here

#!/bin/bash

set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

header="$(info_header dummy msg)"

grep -Eq "^=== .* \([0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\) ===$" <<<"$header"

grep -Eq "^__NAME__:.* msg$" <<<"$header"

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-info_header.sh (+8 lines)

Line 0	Link Here

#!/bin/bash

set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

header="$(info_header)"

grep -Eq "^=== .* \([0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\) ===$" <<<"$header"

grep -Eq "^__NAME__:(.*) \1$" <<<"$header"




#!/bin/sh
set -e
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

profile_file=$(mktemp)
trap "rm -f '$profile_file'" EXIT

is_variable_set || die "empty"

is_variable_set "var" || die "unset"

echo 'var=val' >"$profile_file"
is_variable_set "var" && die "set"

rm -f "$profile_file"
is_variable_set "var" || die "missing"




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
HOST_DN="cn=host,$LDAP_BASE"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			server/role) echo 'server_role="domaincontroller_backup"' ;;
			ldap/base) echo "ldap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			ldap/hostdn) echo "ldap_hostdn=\"$HOST_DN\"" ;;
			*) die "$*" ;;
		esac
		shift
	done
}
ldapsearch () {
	die "$*"
}

[ "cn=admin,$LDAP_BASE" = "$(ldap_binddn)" ]




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
HOST_DN="cn=host,$LDAP_BASE"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			server/role) echo 'server_role="domaincontroller_master"' ;;
			ldap/base) echo "ldap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			ldap/hostdn) echo "ldap_hostdn=\"$HOST_DN\"" ;;
			*) die "$*" ;;
		esac
		shift
	done
}
ldapsearch () {
	die "$*"
}

[ "cn=admin,$LDAP_BASE" = "$(ldap_binddn)" ]




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
HOST_DN="cn=host,$LDAP_BASE"
USER_NAME="user mit Umlauten äöüÄÖÜß"
USER_DN="uid=$USER_NAME,cn=users in Bremen,$LDAP_BASE"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

profile_file=$(mktemp)
trap "rm -f '$profile_file'" EXIT
echo "ldap_username=\"$USER_NAME\"" >"$profile_file"

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			server/role) echo 'server_role="domaincontroller_slave"' ;;
			ldap/base) echo "dap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			ldap/hostdn) echo "ldap_hostdn=\"$HOST_DN\"" ;;
			*) die "$*" ;;
		esac
		shift
	done
}
ldapsearch () {
	while [ $# -ge 1 ]
	do
		case "$1" in
			-x|-Z|-ZZ|-L|-LL) ;;
			-D) [ "$HOST_DN" = "$2" ] || die "$*" ; shift ;;
			-y) [ "/etc/machine.secret" = "$2" ] || die "$*" ; shift ;;
			-h) [ "$LDAP_FQDN" = "$2" ] || die "$*" ; shift ;;
			-*) die "$*" ;;
			*"(uid=$USER_NAME)"*) ;;
			dn) ;;
			*) die "$*" ;;
		esac
		shift
	done
	echo -n "dn:: "
	echo "$USER_DN" | base64 | sed -e '2,$s/^/ /'
}
type ldapsearch-wrapper >/dev/null 2>&1 || ldapsearch-wrapper () {
	sed -e '1{h;$n;d;};/^[ \t]/{H;g;s/\n[ \t]//;$n;h;d;};x;${p;x;}'
}
type ldapsearch-base64 >/dev/null 2>&1 || ldapsearch-base64 () {
	local line
	while read key val
	do
		case "$key" in
		"") echo ;;
		dn::) echo "dn: $(base64 -d <<<"$val")" ;;
		*) die "$key"  ;;
		esac
	done
}

[ "$USER_DN" = "$(ldap_binddn)" ]




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
HOST_DN="cn=host,$LDAP_BASE"
USER_NAME="user"
USER_DN="uid=$USER_NAME,cn=users,$LDAP_BASE"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

profile_file=$(mktemp)
trap "rm -f '$profile_file'" EXIT
echo "ldap_username=\"$USER_NAME\"" >"$profile_file"

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			server/role) echo 'server_role="domaincontroller_slave"' ;;
			ldap/base) echo "ldap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			ldap/hostdn) echo "ldap_hostdn=\"$HOST_DN\"" ;;
			*) die "$*" ;;
		esac
		shift
	done
}
ldapsearch () {
	while [ $# -ge 1 ]
	do
		case "$1" in
			-x|-Z|-ZZ|-L|-LL) ;;
			-D) [ "$HOST_DN" = "$2" ] || die "$*" ; shift ;;
			-y) [ "/etc/machine.secret" = "$2" ] || die "$*" ; shift ;;
			-h) [ "$LDAP_FQDN" = "$2" ] || die "$*" ; shift ;;
			-*) die "$*" ;;
			*"(uid=$USER_NAME)"*) ;;
			dn) ;;
			*) die "$*" ;;
		esac
		shift
	done
	echo "dn: $USER_DN"
}
type ldapsearch-wrapper >/dev/null 2>&1 || ldapsearch-wrapper () {
	sed -e '1{h;$n;d;};/^[ \t]/{H;g;s/\n[ \t]//;$n;h;d;};x;${p;x;}'
}
ldapsearch-base64 () {
	/bin/cat
}

[ "$USER_DN" = "$(ldap_binddn)" ]




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			ldap/base) echo "dap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			server/role) echo 'server_role="domaincontroller_backup"' ;;
			*) die "$*" ;;
		esac
		shift
	done
}
cat () {
	[ "/etc/ldap.secret" = "$1" ] || exit 1
	echo -n "univention"
}

[ "univention" = "$(ldap_bindpwd)" ]




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			ldap/base) echo "dap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			server/role) echo 'server_role="domaincontroller_master"' ;;
			*) die "$*" ;;
		esac
		shift
	done
}
cat () {
	[ "/etc/ldap.secret" = "$1" ] || exit 1
	echo -n "univention"
}

[ "univention" = "$(ldap_bindpwd)" ]




#!/bin/bash
set -e
DOMAIN="example.com"
LDAP_BASE="dc=example,dc=com"
LDAP_FQDN="ldap.$DOMAIN"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

profile_file=$(mktemp)
trap "rm -f '$profile_file'" EXIT
echo 'ldap_password="univention"' >"$profile_file"

univention-config-registry () {
	[ "shell" = "$1" ] || exit 1
	shift
	while [ $# -ge 1 ]
	do
		case "$1" in
			ldap/base) echo "dap_base=\"$LDAP_BASE\"" ;;
			ldap/master) echo "ldap_master=\"$LDAP_FQDN\"" ;;
			server/role) echo 'server_role="domaincontroller_slave"' ;;
			*) die "$*" ;;
		esac
		shift
	done
}
cat () {
	exit 2
}

[ "univention" = "$(ldap_bindpwd)" ]

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-progress_error.sh (+7 lines)

Line 0	Link Here

#!/bin/sh

set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ "__ERR__:" = "$(progress_error)" ]

[ "__ERR__:msg" = "$(progress_error msg)" ]

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-progress_join_error.sh (+7 lines)

Line 0	Link Here

#!/bin/sh

set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ "__JOINERR__:" = "$(progress_join_error)" ]

[ "__JOINERR__:msg" = "$(progress_join_error msg)" ]

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-progress_msg.sh (+7 lines)

Line 0	Link Here

#!/bin/sh

set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ "__MSG__:" = "$(progress_msg)" ]

[ "__MSG__:msg" = "$(progress_msg msg)" ]




#!/bin/sh
set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

tmp=$(mktemp)
trap "rm -f '$tmp'" EXIT

progress_next_step >"$tmp"
grep -Fq '__STEP__:' "$tmp"
progress_next_step >"$tmp"
grep -Fq '__STEP__:1' "$tmp"
progress_next_step 42 >"$tmp"
grep -Fq '__STEP__:42' "$tmp"
progress_next_step >"$tmp"
grep -Fq '__STEP__:42' "$tmp"

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-progress_steps.sh (+7 lines)

Line 0	Link Here

#!/bin/sh

set -e

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

[ "__STEPS__:" = "$(progress_steps)" ]

[ "__STEPS__:42" = "$(progress_steps 42)" ]




#!/bin/bash
set -e
SERVICE="../../bin/true"
die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

invoke-rc.d () {
	[ "$SERVICE" = "$1" ] || die "$*"
	[ "start" = "$2" ] || die "$*"
}
service_start "$SERVICE"

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/tests/setup_utils-setvice_stop.sh (-2 / +12 lines)

Line 0	Link Here

#!/bin/bash

--

set -e

SERVICE="../../bin/true"

die () { echo "${FUNCNAME[*]}: $*" >&2; exit 2; }

. ../usr/lib/univention-system-setup/scripts/setup_utils.sh

invoke-rc.d () {

	[ "$SERVICE" = "$1" ] || die "$*"

	[ "stop" = "$2" ] || die "$*"

service_stop "$SERVICE"

.../usr/lib/univention-system-setup/scripts/setup_utils.sh         |    4 ++--

.../usr/lib/univention-system-setup/scripts/setup_utils.sh         |    4 ++--

1 file changed, 2 insertions(+), 2 deletions(-)

1 file changed, 2 insertions(+), 2 deletions(-)




done

# writes an info header
# @param  script path (unused)
# @param  description (optional)
info_header()
{

}

is_variable_set()
{ # INVERTED return code: returns '1' if found, '0' if not
	if [ ! -e $profile_file ]; then
		return 0
	fi
- 
--
.../usr/lib/univention-system-setup/scripts/setup_utils.sh         |    4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)




{
	for service in $@; do
		if [ -x /etc/init.d/$service ]; then
			invoke-rc.d "$service" stop
		fi
	done
}

{
	for service in $@; do
		if [ -x /etc/init.d/$service ]; then
			invoke-rc.d "$service" start
		fi
	done
}
- 
--
.../univention-system-setup/scripts/setup_utils.sh |   21 +++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)




# @param  description (optional)
info_header()
{
	_path="$(readlink -m "$0")"
	script="${_path##*scripts/}"
	echo "=== $script ($(date +'%Y-%m-%d %H:%M:%S')) ==="

	# information for the internal progress handler
	# print the name of the script... if not specified the script name
	name="${2:-$script}"
	[ -z "$name" ] && name="$script"
	echo "__NAME__:$script $name"
}



is_variable_set()
{ # INVERTED return code: returns '1' if found, '0' if not
	if [ ! -e "$profile_file" ]; then
		return 0
	fi


}
get_profile_var ()
{
	if [ ! -e "$profile_file" ]; then
		return
	fi



service_stop ()
{
	for service in "$@"
	do
		if [ -x "/etc/init.d/$service" ]
		then
			invoke-rc.d "$service" stop
		fi
	done
}
service_start ()
{
	for service in "$@"
	do
		if [ -x "/etc/init.d/$service" ]
		then
			invoke-rc.d "$service" start
		fi
	done
- 
--
.../base/univention-system-setup/debian/changelog  |    6 ++++++
.../univention-system-setup/scripts/setup_utils.sh |   22 ++++++++------------
2 files changed, 15 insertions(+), 13 deletions(-)

(-)a/branches/ucs-3.2/ucs-3.2-0/base/univention-system-setup/debian/changelog (+6 lines)

Lines 1-3	Link Here

univention-system-setup (7.0.29-1) unstable; urgency=low

  * Fix ldapsearch wrapping and encoding (Bug #32324)

 -- Philipp Hahn <hahn@univention.de>  Fri, 23 Aug 2013 08:18:04 +0200

univention-system-setup (7.0.28-1) unstable; urgency=low

univention-system-setup (7.0.28-1) unstable; urgency=low

  * Revert second half of change of 7.0.26-1 (Bug #31960)

  * Revert second half of change of 7.0.26-1 (Bug #31960)




	if [ -z "$1" ]; then
		return 0
	fi
	! egrep -q "^$1=" "$profile_file"
	if [ -z "$value" ]; then
		return 0
	else
		return 1
	fi
}
get_profile_var ()
{

		return
	fi

	sed -rne "s/^$1=//;T;s/#.*//;s/([\"'])(.*)\1 *$/\2/;p;q" "$profile_file"
	echo "$value"
}

service_stop ()

	if [ "$server_role" = "domaincontroller_master" ] || [ "$server_role" = "domaincontroller_backup" ]; then
		echo "cn=admin,$ldap_base"
	else
		ldap_username="$(get_profile_var ldap_username)"
		if [ -n "$ldap_username" ]; then
			ldapsearch -x -ZZ -D "$ldap_hostdn" -y /etc/machine.secret -h "$ldap_master" "(&(objectClass=person)(uid=$ldap_username))" dn |
			ldapsearch-wrapper |
			ldapsearch-base64 |
			sed -ne 's|^dn: ||;T;p;q'
		fi
	fi
}

{
	eval "$(univention-config-registry shell server/role ldap/base ldap/master)"
	if [ "$server_role" = "domaincontroller_master" ] || [ "$server_role" = "domaincontroller_backup" ]; then
		cat /etc/ldap.secret
	else
		ldap_password="$(get_profile_var ldap_password)"
		if [ -n "$ldap_password" ]; then
			echo "$ldap_password"
		fi
- 
--
.../usr/lib/univention-system-setup/scripts/setup_utils.sh      |    7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)




# @param  description (optional)
info_header()
{
	local _path _script name
	_path="$(readlink -m "$0")"
	script="${_path##*scripts/}"
	echo "=== $script ($(date +'%Y-%m-%d %H:%M:%S')) ==="


service_stop ()
{
	local service
	for service in "$@"
	do
		if [ -x "/etc/init.d/$service" ]

}
service_start ()
{
	local service
	for service in "$@"
	do
		if [ -x "/etc/init.d/$service" ]


ldap_binddn ()
{
	local server_role ldap_base ldap_master ldap_hostdn ldap_username
	eval "$(univention-config-registry shell server/role ldap/base ldap/master ldap/hostdn)"
	if [ "$server_role" = "domaincontroller_master" ] || [ "$server_role" = "domaincontroller_backup" ]; then
		echo "cn=admin,$ldap_base"


ldap_bindpwd ()
{
	local server_role ldap_password
	eval "$(univention-config-registry shell server/role)"
	if [ "$server_role" = "domaincontroller_master" ] || [ "$server_role" = "domaincontroller_backup" ]; then
		cat /etc/ldap.secret
	else
- 

Return to bug 32324