diff options
Diffstat (limited to '.github')
25 files changed, 143 insertions, 74 deletions
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 12d8dd6a728..da82ccc35e2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -18,6 +18,7 @@ /apps/oauth2/appinfo/info.xml @julien-nc @ChristophWurst /apps/provisioning_api/appinfo/info.xml @provokateurin @nickvergessen /apps/settings/appinfo/info.xml @Pytal @JuliaKirschenheuter +/apps/sharebymail/appinfo/info.xml @Altahrim /apps/systemtags/appinfo/info.xml @Antreesy @marcelklehr /apps/theming/appinfo/info.xml @skjnldsv @juliushaertl /apps/twofactor_backupcodes/appinfo/info.xml @st3iny @miaulalala @ChristophWurst @@ -29,6 +30,7 @@ # Security team /resources/config/ca-bundle.crt @ChristophWurst @miaulalala @nickvergessen +/.drone.yml @nickvergessen # Two-Factor Authentication # https://github.com/nextcloud/wg-two-factor-authentication#members @@ -36,6 +38,10 @@ /apps/twofactor_backupcodes @ChristophWurst @miaulalala @nickvergessen @st3iny /core/templates/twofactor* @ChristophWurst @miaulalala @nickvergessen @st3iny +# Limit login to IP +# Watch login routes for https://github.com/nextcloud/limit_login_to_ip +/core/routes.php @Altahrim + # OpenAPI openapi.json @provokateurin ResponseDefinitions.php @provokateurin diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml index 09131179fef..37c28859b6f 100644 --- a/.github/workflows/command-compile.yml +++ b/.github/workflows/command-compile.yml @@ -54,7 +54,7 @@ jobs: steps: - name: Checkout ${{ needs.init.outputs.head_ref }} - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 with: token: ${{ secrets.COMMAND_BOT_PAT }} fetch-depth: 0 diff --git a/.github/workflows/command-pull-3rdparty.yml b/.github/workflows/command-pull-3rdparty.yml index e5ebaff285b..d8cff0f9aaa 100644 --- a/.github/workflows/command-pull-3rdparty.yml +++ b/.github/workflows/command-pull-3rdparty.yml @@ -30,7 +30,7 @@ jobs: id: comment-branch - name: Checkout ${{ steps.comment-branch.outputs.head_ref }} - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: fetch-depth: 0 token: ${{ secrets.COMMAND_BOT_PAT }} diff --git a/.github/workflows/command-rebase.yml b/.github/workflows/command-rebase.yml index d713df36c6d..4e8e08556a4 100644 --- a/.github/workflows/command-rebase.yml +++ b/.github/workflows/command-rebase.yml @@ -31,7 +31,7 @@ jobs: reaction-type: "+1" - name: Checkout the latest code - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 with: fetch-depth: 0 token: ${{ secrets.COMMAND_BOT_PAT }} diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index bc2d9937974..8e0d647ba6b 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout app - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 - name: Check composer.json id: check_composer @@ -112,7 +112,7 @@ jobs: CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }} - name: Upload snapshots - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 if: always() with: name: snapshots_${{ matrix.containers }} @@ -123,7 +123,7 @@ jobs: run: docker logs nextcloud-cypress-tests-${{ env.APP_NAME }} > nextcloud.log - name: Upload NC logs - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 if: failure() && matrix.containers != 'component' with: name: nc_logs_${{ matrix.containers }} @@ -134,7 +134,7 @@ jobs: run: docker exec nextcloud-cypress-tests-server tar -cvjf - data > data.tar - name: Upload data dir archive - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 if: failure() && matrix.containers != 'component' with: name: nc_data_${{ matrix.containers }} diff --git a/.github/workflows/ftp.yml b/.github/workflows/ftp.yml index c4324cdcebc..dd6c3adecd5 100644 --- a/.github/workflows/ftp.yml +++ b/.github/workflows/ftp.yml @@ -5,9 +5,11 @@ on: - master - stable* paths: + - '.github/**' - 'apps/files_external/**' pull_request: paths: + - '.github/**' - 'apps/files_external/**' env: @@ -30,17 +32,19 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true - name: Set up ftpd run: | sudo mkdir /tmp/ftp - sudo chown -R 0777 /tmp/ftp - if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then docker run --name ftp -d --net host -e FTP_USERNAME=test -e FTP_PASSWORD=test -v /tmp/ftp:/home/test hauptmedia/proftpd; fi + sudo chmod -R 0777 /tmp/ftp + if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then echo '$6$Q7V2n3q2GRVv5YeQ$/AhLu07H76Asojy7bxGXMY1caKLAbp5Vt82LOZYMkD/8uDzyMAEXwk0c1Bdz1DkBsk2Vh/9SF130mOPavRGMo.' > /tmp/secret.txt; fi + if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then echo 'FTP_ROOT=/home/test' > $GITHUB_ENV; fi + if [[ "${{ matrix.ftpd }}" == 'proftpd' ]]; then docker run --name ftp -d --net host -e PASV_ADDRESS=127.0.0.1 -e FTPUSER_NAME=test -v /tmp/secret.txt:/run/secrets/ftp-user-password-secret -v /tmp/ftp:/home/test instantlinux/proftpd; fi if [[ "${{ matrix.ftpd }}" == 'vsftpd' ]]; then docker run --name ftp -d --net host -e FTP_USER=test -e FTP_PASS=test -e PASV_ADDRESS=127.0.0.1 -v /tmp/ftp:/home/vsftpd/test fauria/vsftpd; fi - if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp2:/home/test -v /tmp/ftp2:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi + if [[ "${{ matrix.ftpd }}" == 'pure-ftpd' ]]; then docker run --name ftp -d --net host -e "PUBLICHOST=localhost" -e FTP_USER_NAME=test -e FTP_USER_PASS=test -e FTP_USER_HOME=/home/test -v /tmp/ftp:/home/test -v /tmp/ftp:/etc/pure-ftpd/passwd stilliard/pure-ftpd; fi - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d #v2.25.2 with: @@ -58,13 +62,14 @@ jobs: php -S localhost:8080 & - name: smoketest ftp run: | - php -r 'var_dump(file_put_contents("ftp://test:test@localhost/ftp.txt", "asd"));' - php -r 'var_dump(file_get_contents("ftp://test:test@localhost/ftp.txt"));' - php -r 'var_dump(mkdir("ftp://test:test@localhost/asdads"));' + php -r 'var_dump(file_put_contents("ftp://test:test@localhost${{ env.FTP_ROOT }}/ftp.txt", "asd"));' + php -r 'var_dump(file_get_contents("ftp://test:test@localhost${{ env.FTP_ROOT }}/ftp.txt"));' + php -r 'var_dump(mkdir("ftp://test:test@localhost${{ env.FTP_ROOT }}/asdads"));' ls -l /tmp/ftp + [ -f /tmp/ftp/ftp.txt ] - name: PHPUnit run: | - echo "<?php return ['run' => true,'host' => 'localhost','user' => 'test','password' => 'test', 'root' => ''];" > apps/${{ env.APP_NAME }}/tests/config.ftp.php + echo "<?php return ['run' => true,'host' => 'localhost','user' => 'test','password' => 'test', 'root' => '${{ env.FTP_ROOT }}'];" > apps/${{ env.APP_NAME }}/tests/config.ftp.php phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/FtpTest.php - name: ftpd logs if: always() diff --git a/.github/workflows/lint-eslint.yml b/.github/workflows/lint-eslint.yml index f53f38666e1..71488b8c1cc 100644 --- a/.github/workflows/lint-eslint.yml +++ b/.github/workflows/lint-eslint.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 - name: Read package.json node and npm engines version uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.1 diff --git a/.github/workflows/lint-php-cs.yml b/.github/workflows/lint-php-cs.yml index f8d3375111f..2a73a06cde9 100644 --- a/.github/workflows/lint-php-cs.yml +++ b/.github/workflows/lint-php-cs.yml @@ -22,7 +22,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 - name: Set up php uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 diff --git a/.github/workflows/lint-php.yml b/.github/workflows/lint-php.yml index 8d7f63f84b4..d6922bf1cd6 100644 --- a/.github/workflows/lint-php.yml +++ b/.github/workflows/lint-php.yml @@ -31,7 +31,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 - name: Set up php ${{ matrix.php-versions }} uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d # v2 diff --git a/.github/workflows/node-tests.yml b/.github/workflows/node-tests.yml index fad74c4e396..b4f108cb5af 100644 --- a/.github/workflows/node-tests.yml +++ b/.github/workflows/node-tests.yml @@ -19,7 +19,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Read package.json node and npm engines version uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 @@ -34,7 +34,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Set up node ${{ needs.versions.outputs.nodeVersion }} uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c @@ -61,7 +61,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Set up node ${{ needs.versions.outputs.nodeVersion }} uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c @@ -83,7 +83,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Set up node ${{ needs.versions.outputs.nodeVersion }} uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 8a2a1d7a52f..54550067a22 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -37,7 +37,7 @@ jobs: name: node steps: - name: Checkout - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 - name: Read package.json node and npm engines version uses: skjnldsv/read-package-engines-version-actions@8205673bab74a63eb9b8093402fd9e0e018663a1 # v2.1 diff --git a/.github/workflows/npm-audit-fix.yml b/.github/workflows/npm-audit-fix.yml index e3a7e2ce900..a9ae29bc06f 100644 --- a/.github/workflows/npm-audit-fix.yml +++ b/.github/workflows/npm-audit-fix.yml @@ -24,7 +24,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v3.5.2 with: ref: ${{ matrix.branches }} diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index 56c03ba534c..f3ca7ce77b1 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -42,7 +42,7 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true diff --git a/.github/workflows/openapi.yml b/.github/workflows/openapi.yml index aa149e6a7fc..ecff2faedca 100644 --- a/.github/workflows/openapi.yml +++ b/.github/workflows/openapi.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac - name: Set up php uses: shivammathur/setup-php@v2 diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 30bb9fd6199..457727880d3 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -17,7 +17,7 @@ jobs: steps: - name: Checkout server before PR - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true ref: ${{ github.event.pull_request.base.ref }} @@ -79,14 +79,14 @@ jobs: - name: Upload profiles if: always() - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce + uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 with: name: profiles path: | before.json after.json - - uses: actions/github-script@v5 + - uses: actions/github-script@v6 if: failure() && steps.compare.outcome == 'failure' with: github-token: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/phpunit-32bits.yml b/.github/workflows/phpunit-32bits.yml index 0ed52fe3d97..8a831f87556 100644 --- a/.github/workflows/phpunit-32bits.yml +++ b/.github/workflows/phpunit-32bits.yml @@ -30,7 +30,7 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml index b77f19230ab..969490eb30e 100644 --- a/.github/workflows/s3-external.yml +++ b/.github/workflows/s3-external.yml @@ -38,7 +38,7 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true @@ -91,7 +91,7 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true diff --git a/.github/workflows/s3-primary-integration.yml b/.github/workflows/s3-primary-integration.yml index 7d12f1a584b..ddeda1e99e2 100644 --- a/.github/workflows/s3-primary-integration.yml +++ b/.github/workflows/s3-primary-integration.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true diff --git a/.github/workflows/s3-primary.yml b/.github/workflows/s3-primary.yml index 21f6219e1f7..4254f084adf 100644 --- a/.github/workflows/s3-primary.yml +++ b/.github/workflows/s3-primary.yml @@ -32,7 +32,7 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true diff --git a/.github/workflows/sftp.yml b/.github/workflows/sftp.yml new file mode 100644 index 00000000000..7d72afc3211 --- /dev/null +++ b/.github/workflows/sftp.yml @@ -0,0 +1,75 @@ +name: SFTP unit tests +on: + push: + branches: + - master + - stable* + paths: + - 'apps/files_external/**' + pull_request: + paths: + - 'apps/files_external/**' + +env: + APP_NAME: files_external + +jobs: + sftp-tests: + runs-on: ubuntu-latest + + if: ${{ github.repository_owner != 'nextcloud-gmbh' }} + + strategy: + # do not stop on another job's failure + fail-fast: false + matrix: + php-versions: ['8.0'] + sftpd: ['openssh'] + + name: php${{ matrix.php-versions }}-${{ matrix.sftpd }} + + steps: + - name: Checkout server + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + with: + submodules: true + + - name: Set up sftpd + run: | + sudo mkdir /tmp/sftp + sudo chown -R 0777 /tmp/sftp + if [[ "${{ matrix.sftpd }}" == 'openssh' ]]; then docker run -p 2222:22 --name sftp -d -v /tmp/sftp:/home/test atmoz/sftp "test:test:::data"; fi + - name: Set up php ${{ matrix.php-versions }} + uses: shivammathur/setup-php@c5fc0d8281aba02c7fda07d3a70cc5371548067d #v2.25.2 + with: + php-version: ${{ matrix.php-versions }} + tools: phpunit:9 + extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up Nextcloud + run: | + mkdir data + ./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 + ./occ app:enable --force ${{ env.APP_NAME }} + php -S localhost:8080 & + - name: PHPUnit + run: | + echo "<?php return ['run' => true, 'host' => 'localhost:2222','user' => 'test','password' => 'test', 'root' => 'data'];" > apps/${{ env.APP_NAME }}/tests/config.sftp.php + phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/SftpTest.php + - name: sftpd logs + if: always() + run: | + ls -l /tmp/sftp + docker logs sftp + + sftp-summary: + runs-on: ubuntu-latest + needs: sftp-tests + + if: always() + + steps: + - name: Summary status + run: if ${{ needs.sftp-tests.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/smb-kerberos.yml b/.github/workflows/smb-kerberos.yml index c069d665a6a..519b1ce3700 100644 --- a/.github/workflows/smb-kerberos.yml +++ b/.github/workflows/smb-kerberos.yml @@ -22,53 +22,36 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true + - name: Checkout user_saml + uses: actions/checkout@v3 + with: + repository: nextcloud/user_saml + path: apps/user_saml - name: Pull images run: | - docker pull icewind1991/samba-krb-test-dc - docker pull icewind1991/samba-krb-test-apache - docker pull icewind1991/samba-krb-test-client + docker pull ghcr.io/icewind1991/samba-krb-test-dc + docker pull ghcr.io/icewind1991/samba-krb-test-apache + docker pull ghcr.io/icewind1991/samba-krb-test-client + docker tag ghcr.io/icewind1991/samba-krb-test-dc icewind1991/samba-krb-test-dc + docker tag ghcr.io/icewind1991/samba-krb-test-apache icewind1991/samba-krb-test-apache + docker tag ghcr.io/icewind1991/samba-krb-test-client 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 - DC_IP=$(./start-dc.sh) - ./start-apache.sh $DC_IP $PWD + DC_IP=$(apps/files_external/tests/sso-setup/start-dc.sh) + apps/files_external/tests/sso-setup/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 - 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 - - # 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 + apps/files_external/tests/sso-setup/setup-sso-nc.sh - name: Test SSO run: | - mkdir /tmp/shared/cookies - chmod 0777 /tmp/shared/cookies - - 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" ]] + apps/files_external/tests/sso-setup/test-sso-smb.sh ${{ env.DC_IP }} - name: Show logs if: failure() run: | - docker exec --user 33 apache ./occ log:file FILEPATH=$(docker exec --user 33 apache ./occ log:file | grep "Log file:" | cut -d' ' -f3) + echo "$FILEPATH:" docker exec --user 33 apache cat $FILEPATH diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 29e680b4698..7016f5108a6 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -15,7 +15,7 @@ jobs: issues: write steps: - - uses: actions/stale@v5 + - uses: actions/stale@v8 with: repo-token: ${{ secrets.COMMAND_BOT_PAT }} stale-issue-message: > diff --git a/.github/workflows/static-code-analysis.yml b/.github/workflows/static-code-analysis.yml index 22a1a69a977..3459cedb03a 100644 --- a/.github/workflows/static-code-analysis.yml +++ b/.github/workflows/static-code-analysis.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true @@ -49,7 +49,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true @@ -77,7 +77,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: submodules: true diff --git a/.github/workflows/update-cacert-bundle.yml b/.github/workflows/update-cacert-bundle.yml index 3a50c35e964..c4bdade5cd6 100644 --- a/.github/workflows/update-cacert-bundle.yml +++ b/.github/workflows/update-cacert-bundle.yml @@ -17,7 +17,7 @@ jobs: name: update-ca-certificate-bundle-${{ matrix.branches }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: ref: ${{ matrix.branches }} submodules: true diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index af5a210bc31..42092f3950b 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -19,7 +19,7 @@ jobs: name: update-psalm-baseline-${{ matrix.branches }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac with: ref: ${{ matrix.branches }} submodules: true |