diff options
| -rw-r--r-- | .github/workflows/files-external-smb-kerberos.yml | 12 | ||||
| -rw-r--r-- | apps/files/lib/Activity/FavoriteProvider.php | 2 | ||||
| -rwxr-xr-x | apps/files_external/tests/sso-setup/start-apache.sh | 3 |
3 files changed, 16 insertions, 1 deletions
diff --git a/.github/workflows/files-external-smb-kerberos.yml b/.github/workflows/files-external-smb-kerberos.yml index cb5d48dfe16..cc3d7011f7f 100644 --- a/.github/workflows/files-external-smb-kerberos.yml +++ b/.github/workflows/files-external-smb-kerberos.yml @@ -83,6 +83,18 @@ jobs: run: | apps/files_external/tests/sso-setup/test-sso-smb.sh ${{ env.DC_IP }} + - name: Show logs DC + if: always() + run: | + docker logs dc + echo "------------" + docker exec dc cat /var/log/samba/log.samba + + - name: Show logs Apache + if: always() + run: | + docker logs apache + - name: Show logs if: always() run: | diff --git a/apps/files/lib/Activity/FavoriteProvider.php b/apps/files/lib/Activity/FavoriteProvider.php index 84c509f493f..7a660287192 100644 --- a/apps/files/lib/Activity/FavoriteProvider.php +++ b/apps/files/lib/Activity/FavoriteProvider.php @@ -138,7 +138,7 @@ class FavoriteProvider implements IProvider { } $parameter = [ 'type' => 'file', - 'id' => $subjectParams['id'], + 'id' => (string)$subjectParams['id'], 'name' => basename($subjectParams['path']), 'path' => trim($subjectParams['path'], '/'), 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $subjectParams['id']]), diff --git a/apps/files_external/tests/sso-setup/start-apache.sh b/apps/files_external/tests/sso-setup/start-apache.sh index eb2ff55b0e6..58ad71e3a3a 100755 --- a/apps/files_external/tests/sso-setup/start-apache.sh +++ b/apps/files_external/tests/sso-setup/start-apache.sh @@ -15,6 +15,9 @@ 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 +# ensure that samba is started (see https://github.com/icewind1991/samba-krb-test/pull/8) +docker exec dc service samba-ad-dc status || docker exec dc service samba-ad-dc start + # 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 |