-
-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #39531 from nextcloud/sso-kerberos-fix2
kerberos sso ci fix
- Loading branch information
Showing
8 changed files
with
93 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?php | ||
| $CONFIG = [ | ||
| "apps_paths" => [ | ||
| [ | ||
| "path" => "/var/www/html/apps", | ||
| "url" => "/apps", | ||
| "writable" => false, | ||
| ], | ||
| [ | ||
| "path" => "/var/www/html/extra-apps", | ||
| "url" => "/extra-apps", | ||
| "writable" => true, | ||
| ], | ||
| ], | ||
| ]; |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
|
|
||
| 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 | ||
| docker exec --user 33 apache ./occ config:system:set trusted_domains 1 --value 'httpd.domain.test' | ||
|
|
||
| # 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 saml:config:create | ||
| docker exec --user 33 apache ./occ saml:config:set 1 --general-uid_mapping=REMOTE_USER | ||
|
|
||
| # create user | ||
| docker exec -e OC_PASS=test --user 33 apache ./occ user:add 'testuser@DOMAIN.TEST' --password-from-env | ||
|
|
||
| # setup external storage | ||
| docker exec --user 33 apache ./occ app:enable files_external --force | ||
| docker exec --user 33 apache ./occ files_external:create smb smb smb::kerberosapache | ||
| docker exec --user 33 apache ./occ files_external:config 1 host krb.domain.test | ||
| docker exec --user 33 apache ./occ files_external:config 1 share netlogon | ||
| docker exec --user 33 apache ./occ files_external:list |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
|
|
||
| SCRIPT_DIR="${0%/*}" | ||
|
|
||
| docker rm -f apache 2>/dev/null > /dev/null | ||
|
|
||
| docker run -d --name apache -v $2:/var/www/html -v /var/www/html/data -v /var/www/html/config -v /var/www/html/extra-apps -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}}') | ||
| docker exec apache chown 33 /var/www/html/config /var/www/html/data /var/www/html/extra-apps | ||
| docker cp "$SCRIPT_DIR/apps.config.php" apache:/var/www/html/config/apps.config.php | ||
|
|
||
| # 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 |
1 change: 1 addition & 0 deletions
1
apps/files_external/tests/start-dc.sh → ...iles_external/tests/sso-setup/start-dc.sh
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
|
|
||
| function getContainerHealth { | ||
| docker inspect --format "{{.State.Health.Status}}" $1 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
|
|
||
| DC_IP="$1" | ||
| SCRIPT_DIR="${0%/*}" | ||
|
|
||
| echo -n "Checking that we can authenticate using kerberos: " | ||
| LOGIN_CONTENT=$("$SCRIPT_DIR/client-cmd.sh" $DC_IP curl -i -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login?originalUrl=success) | ||
| if [[ "$LOGIN_CONTENT" =~ "Location: success" ]]; then | ||
| echo "✔️" | ||
| else | ||
| echo "❌" | ||
| exit 1 | ||
| fi | ||
| echo -n "Getting test file: " | ||
| CONTENT=$("$SCRIPT_DIR/client-cmd.sh" $DC_IP curl -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:]') | ||
|
|
||
| if [[ $CONTENT == "testfile" ]]; then | ||
| echo "✔️" | ||
| else | ||
| echo "❌" | ||
| exit 1 | ||
| fi |
This file was deleted.
Oops, something went wrong.