Update kerberos sso test setup to use new user_saml config system

Signed-off-by: Robin Appelman <robin@icewind.nl>

4 files changed, 46 insertions, 33 deletions

diff --git a/apps/files_external/tests/client-cmd.sh b/apps/files_external/tests/client-cmd.sh
new file mode 100755
index 00000000000..c97045bea4c
--- /dev/null
+++ b/apps/files_external/tests/client-cmd.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+DC_IP=$1
+shift
+
+docker run --rm --name client -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client $@
diff --git a/apps/files_external/tests/setup-krb.sh b/apps/files_external/tests/setup-krb.sh
deleted file mode 100755
index 968ba80529e..00000000000
--- a/apps/files_external/tests/setup-krb.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-function getContainerHealth {
-  docker inspect --format "{{.State.Health.Status}}" $1
-}
-
-function waitContainer {
-  while STATUS=$(getContainerHealth $1); [ $STATUS != "healthy" ]; do
-    if [ $STATUS == "unhealthy" ]; then
-      echo "Failed!"
-      exit -1
-    fi
-    printf .
-    lf=$'\n'
-    sleep 1
-  done
-  printf "$lf"
-}
-
-mkdir /tmp/shared
-
-# start the dc
-docker run -dit --name dc -v /tmp/shared:/shared --hostname krb.domain.test --cap-add SYS_ADMIN icewind1991/samba-krb-test-dc
-DC_IP=$(docker inspect dc --format '{{.NetworkSettings.IPAddress}}')
-
-waitContainer dc
-
-# start apache
-docker run -d --name apache -v $PWD:/var/www/html -v /tmp/shared:/shared --dns $DC_IP --hostname httpd.domain.test icewind1991/samba-krb-test-apache
-APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}')
-
-# add the dns record for apache
-docker exec dc samba-tool dns add krb.domain.test domain.test httpd A $APACHE_IP -U administrator --password=passwOrd1
diff --git a/apps/files_external/tests/start-apache.sh b/apps/files_external/tests/start-apache.sh
new file mode 100755
index 00000000000..2c3e178e2ef
--- /dev/null
+++ b/apps/files_external/tests/start-apache.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+docker rm -f apache 2>/dev/null > /dev/null
+
+docker run -d --name apache -v $2:/var/www/html -v /tmp/shared:/shared --dns $1 --hostname httpd.domain.test icewind1991/samba-krb-test-apache 1>&2
+APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}')
+
+# add the dns record for apache
+docker exec dc samba-tool dns add krb.domain.test domain.test httpd A $APACHE_IP -U administrator --password=passwOrd1 1>&2
+
+echo $APACHE_IP
diff --git a/apps/files_external/tests/start-dc.sh b/apps/files_external/tests/start-dc.sh
new file mode 100755
index 00000000000..45fbbfbf0b5
--- /dev/null
+++ b/apps/files_external/tests/start-dc.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+function getContainerHealth {
+  docker inspect --format "{{.State.Health.Status}}" $1
+}
+
+function waitContainer {
+  while STATUS=$(getContainerHealth $1); [ $STATUS != "healthy" ]; do
+    if [ $STATUS == "unhealthy" ]; then
+      echo "Failed!" 1>&2
+      exit -1
+    fi
+    printf . 1>&2
+    lf=$'\n'
+    sleep 1
+  done
+  printf "$lf" 1>&2
+}
+
+docker rm -f dc 2>/dev/null > /dev/null
+
+mkdir -p /tmp/shared
+
+# start the dc
+docker run -dit --name dc -v /tmp/shared:/shared --hostname krb.domain.test --cap-add SYS_ADMIN icewind1991/samba-krb-test-dc 1>&2
+
+waitContainer dc
+
+docker inspect dc --format '{{.NetworkSettings.IPAddress}}'