mirror of
https://github.com/nextcloud/server.git
synced 2026-02-20 00:12:30 -05:00
Update kerberos sso test setup to use new user_saml config system
Signed-off-by: Robin Appelman <robin@icewind.nl> Signed-off-by: Louis Chemineau <louis@chmn.me>
This commit is contained in:
Robin Appelman
Louis Chemineau
parent
693efde1f8
commit
36c87d669b
5 changed files with 65 additions and 51 deletions
37
.github/workflows/smb-kerberos.yml
vendored
37
.github/workflows/smb-kerberos.yml
vendored
|
|
@ -5,12 +5,12 @@ on:
|
|||
- master
|
||||
- stable*
|
||||
paths:
|
||||
- 'apps/files_external/**'
|
||||
- '.github/workflows/smb-kerberos.yml'
|
||||
- "apps/files_external/**"
|
||||
- ".github/workflows/smb-kerberos.yml"
|
||||
pull_request:
|
||||
paths:
|
||||
- 'apps/files_external/**'
|
||||
- '.github/workflows/smb-kerberos.yml'
|
||||
- "apps/files_external/**"
|
||||
- ".github/workflows/smb-kerberos.yml"
|
||||
|
||||
jobs:
|
||||
smb-kerberos-tests:
|
||||
|
|
@ -21,9 +21,9 @@ jobs:
|
|||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
php-versions: ['7.4', '8.0']
|
||||
php-versions: ["7.4", "8.0"]
|
||||
|
||||
name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
|
||||
name: smb-kerberos-sso
|
||||
|
||||
steps:
|
||||
- name: Checkout server
|
||||
|
|
@ -37,9 +37,12 @@ jobs:
|
|||
docker pull icewind1991/samba-krb-test-client
|
||||
- name: Setup AD-DC
|
||||
run: |
|
||||
cp apps/files_external/tests/*.sh .
|
||||
mkdir data
|
||||
sudo chown -R 33 data apps config
|
||||
apps/files_external/tests/setup-krb.sh
|
||||
DC_IP=$(./start-dc.sh)
|
||||
./start-apache.sh $DC_IP $PWD
|
||||
echo "DC_IP=$DC_IP" >> $GITHUB_ENV
|
||||
- name: Set up Nextcloud
|
||||
run: |
|
||||
docker exec --user 33 apache ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass password
|
||||
|
|
@ -48,7 +51,8 @@ jobs:
|
|||
# setup user_saml
|
||||
docker exec --user 33 apache ./occ app:enable user_saml --force
|
||||
docker exec --user 33 apache ./occ config:app:set user_saml type --value 'environment-variable'
|
||||
docker exec --user 33 apache ./occ config:app:set user_saml general-uid_mapping --value REMOTE_USER
|
||||
docker exec --user 33 apache ./occ saml:config:create
|
||||
docker exec --user 33 apache ./occ saml:config:set 1 --general-uid_mapping=REMOTE_USER
|
||||
|
||||
# setup external storage
|
||||
docker exec --user 33 apache ./occ app:enable files_external --force
|
||||
|
|
@ -58,19 +62,16 @@ jobs:
|
|||
docker exec --user 33 apache ./occ files_external:list
|
||||
- name: Test SSO
|
||||
run: |
|
||||
mkdir cookies
|
||||
chmod 0777 cookies
|
||||
mkdir /tmp/shared/cookies
|
||||
chmod 0777 /tmp/shared/cookies
|
||||
|
||||
DC_IP=$(docker inspect dc --format '{{.NetworkSettings.IPAddress}}')
|
||||
docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
|
||||
curl -c /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
|
||||
CONTENT=$(docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
|
||||
curl -b /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
|
||||
echo $CONTENT
|
||||
CONTENT=$(echo $CONTENT | tr -d '[:space:]')
|
||||
echo "SAML login"
|
||||
./client-cmd.sh ${{ env.DC_IP }} curl -c /shared/cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
|
||||
echo "Check we are logged in"
|
||||
CONTENT=$(./client-cmd.sh ${{ env.DC_IP }} curl -b /shared/cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
|
||||
CONTENT=$(echo $CONTENT | head -n 1 | tr -d '[:space:]')
|
||||
[[ $CONTENT == "testfile" ]]
|
||||
|
||||
|
||||
smb-kerberos-summary:
|
||||
runs-on: ubuntu-latest
|
||||
needs: smb-kerberos-tests
|
||||
|
|
|
|||
6
apps/files_external/tests/client-cmd.sh
Executable file
6
apps/files_external/tests/client-cmd.sh
Executable file
|
|
@ -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 $@
|
||||
|
|
@ -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
|
||||
11
apps/files_external/tests/start-apache.sh
Executable file
11
apps/files_external/tests/start-apache.sh
Executable file
|
|
@ -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
|
||||
29
apps/files_external/tests/start-dc.sh
Executable file
29
apps/files_external/tests/start-dc.sh
Executable file
|
|
@ -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}}'
|
||||
Loading…
Reference in a new issue