diff --git a/.github/workflows/dispatch-workflow-repo.yml b/.github/workflows/dispatch-workflow-repo.yml index c6dda7f5..39832e88 100644 --- a/.github/workflows/dispatch-workflow-repo.yml +++ b/.github/workflows/dispatch-workflow-repo.yml @@ -69,7 +69,7 @@ jobs: if [ -f "$workflow" ]; then filename=$(basename "$workflow") target_file="./target/.github/workflows/$filename" - + # Only copy if the file exists in the target repository if [ -f "$target_file" ]; then echo "Updating existing workflow: $filename" diff --git a/README.md b/README.md index c0f8be68..7bbe9ce1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ SPDX-License-Identifier: MIT # This repository contains Nextcloud's workflow templates -## Setup a new template on your repository +## Set up a new template on your repository When creating a new workflow on your repository, you will see templates originating from here. https://github.com/nextcloud/viewer/actions/new @@ -18,10 +18,13 @@ There is a GitHub action for that as well. Simply install https://github.com/nextcloud/.github/blob/master/workflow-templates/sync-workflow-templates.yml into your repository and a cron job will update the workflows from the template every sunday morning. -> [!NOTE] +> [!IMPORTANT] > GitHub does not allow pull request that touch workflows to be auto-approved and auto-merged to improve security. > But it's at least much easier to be aware of the updates and you just need to approve and merge the PRs. +> [!WARNING] +> Do not forget to check the diff for conflicts and missing patches before approving, especially when updating the workflows on stable branches! + ## Patching workflows It's also possible to customise workflows by putting a `workflow.yml.patch` file right next to it. @@ -38,7 +41,8 @@ If there was an error it will be outlined in the PR description. You can also run the following shell script on your machine to update all workflows of an app. It should be run inside the cloned repository of an app and requires rsync to be installed. -⚠️ Do not forget to check the diff for unwanted changes before committing, especially when updating the workflows on stable branches! +> [!WARNING] +> Do not forget to check the diff for unwanted changes before committing, especially when updating the workflows on stable branches! ```sh #!/bin/sh diff --git a/SECURITY.md b/SECURITY.md index 7cc19cba..4306758a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -3,14 +3,14 @@ SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors SPDX-License-Identifier: MIT --> -# Security Policy +# Security Policy ## 💡 TLDR: Report security issues at [hackerone.com/nextcloud](https://hackerone.com/nextcloud) ### Found a security bug in Nextcloud? Let's get it fixed! -If you believe you have found an issue that meets our -[definition of a security vulnerability](https://nextcloud.com/security/threat-model), +If you believe you have found an issue that meets our +[definition of a security vulnerability](https://nextcloud.com/security/threat-model), we encourage you to let us know right away. Please use the reporting process described below. | If you are a... | See section... | @@ -36,8 +36,8 @@ Your report should include: If you require encrypted communication, please request it in your initial message. -> **Note:** This process is for confidential reporting of software vulnerabilities only. -> For general support or configuration help, see +> **Note:** This process is for confidential reporting of software vulnerabilities only. +> For general support or configuration help, see > [Nextcloud Support](https://nextcloud.com/support/). ## What to Expect After Reporting @@ -50,42 +50,42 @@ A member of our security team will: - Follow up with any questions - Coordinate the fix and public disclosure -We apply, test, and release fixes for all relevant, supported stable branches in the next -security update. Vulnerabilities are publicly announced after the fix is released. As a thank +We apply, test, and release fixes for all relevant, supported stable branches in the next +security update. Vulnerabilities are publicly announced after the fix is released. As a thank you, we will add your name to our [Hall of Fame](https://hackerone.com/nextcloud/thanks). -If your report concerns an app not maintained by Nextcloud (e.g., community-maintained apps -hosted by Nextcloud or hosted elsewhere), our security team will coordinate with the current +If your report concerns an app not maintained by Nextcloud (e.g., community-maintained apps +hosted by Nextcloud or hosted elsewhere), our security team will coordinate with the current maintainer to help resolve the issue in a similar fashion. ## Bug Bounties -If you are interested in a bug bounty, please note that complete, detailed reports can -contribute to higher bounty awards. Details on past bounties are available at +If you are interested in a bug bounty, please note that complete, detailed reports can +contribute to higher bounty awards. Details on past bounties are available at [HackerOne](https://hackerone.com/nextcloud). ## Security Advisories -Published advisories for Nextcloud Server, Clients, and Apps are available at the -[Nextcloud Security Advisories](https://github.com/nextcloud/security-advisories/security/advisories) +Published advisories for Nextcloud Server, Clients, and Apps are available at the +[Nextcloud Security Advisories](https://github.com/nextcloud/security-advisories/security/advisories) page. ## Supported Versions -Each major release of Nextcloud Server receives security updates for one year from its -initial release date. The Nextcloud project typically supports at least the two most recent +Each major release of Nextcloud Server receives security updates for one year from its +initial release date. The Nextcloud project typically supports at least the two most recent major releases. To stay protected: - Ensure your Nextcloud Server is always running a supported major release -- Promptly apply all maintenance releases (these include critical security and functionality +- Promptly apply all maintenance releases (these include critical security and functionality bug fixes) -- Monitor the end-of-life (EOL) date for your major release (after this date, no further - maintenance releases will be published. Upgrading to a newer major release is strongly +- Monitor the end-of-life (EOL) date for your major release (after this date, no further + maintenance releases will be published. Upgrading to a newer major release is strongly recommended.) -See the -[Maintenance and Release Schedule](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule) +See the +[Maintenance and Release Schedule](https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule) for details. --- diff --git a/workflow-templates/phpunit-mysql.yml b/workflow-templates/phpunit-mysql.yml index bca76cc1..596d91ea 100644 --- a/workflow-templates/phpunit-mysql.yml +++ b/workflow-templates/phpunit-mysql.yml @@ -138,7 +138,7 @@ jobs: uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 with: working-directory: apps/${{ env.APP_NAME }} - + - name: Set up Nextcloud env: DB_PORT: 4444 diff --git a/workflow-templates/phpunit-oci.yml b/workflow-templates/phpunit-oci.yml index 60dd354e..4314399b 100644 --- a/workflow-templates/phpunit-oci.yml +++ b/workflow-templates/phpunit-oci.yml @@ -145,7 +145,7 @@ jobs: uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 with: working-directory: apps/${{ env.APP_NAME }} - + - name: Set up Nextcloud env: DB_PORT: 1521 diff --git a/workflow-templates/phpunit-pgsql.yml b/workflow-templates/phpunit-pgsql.yml index 1b6cbdb0..dab23f2e 100644 --- a/workflow-templates/phpunit-pgsql.yml +++ b/workflow-templates/phpunit-pgsql.yml @@ -136,7 +136,7 @@ jobs: uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 with: working-directory: apps/${{ env.APP_NAME }} - + - name: Set up Nextcloud env: DB_PORT: 4444 diff --git a/workflow-templates/phpunit-sqlite.yml b/workflow-templates/phpunit-sqlite.yml index e4598002..273400a4 100644 --- a/workflow-templates/phpunit-sqlite.yml +++ b/workflow-templates/phpunit-sqlite.yml @@ -125,7 +125,7 @@ jobs: uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 with: working-directory: apps/${{ env.APP_NAME }} - + - name: Set up Nextcloud env: DB_PORT: 4444 diff --git a/workflow-templates/psalm-matrix.yml b/workflow-templates/psalm-matrix.yml index bad25a08..b2d0ff1e 100644 --- a/workflow-templates/psalm-matrix.yml +++ b/workflow-templates/psalm-matrix.yml @@ -69,7 +69,7 @@ jobs: - name: Install composer dependencies uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - + - name: Install nextcloud/ocp:${{ matrix.ocp-version }} env: OCP_VERSION: ${{ matrix.ocp-version }} diff --git a/workflow-templates/psalm.yml b/workflow-templates/psalm.yml index aa784ed7..4feadcb8 100644 --- a/workflow-templates/psalm.yml +++ b/workflow-templates/psalm.yml @@ -53,7 +53,7 @@ jobs: - name: Install composer dependencies uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - + - name: Install nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} run: composer require --dev nextcloud/ocp:dev-${{ steps.versions.outputs.branches-max }} --ignore-platform-reqs --with-dependencies diff --git a/workflow-templates/rector-apply.yml b/workflow-templates/rector-apply.yml index 1b531313..c61c5b10 100644 --- a/workflow-templates/rector-apply.yml +++ b/workflow-templates/rector-apply.yml @@ -51,7 +51,7 @@ jobs: - name: Install composer dependencies uses: ramsey/composer-install@65e4f84970763564f46a70b8a54b90d033b3bdda # 4.0.0 - + - name: Rector run: composer run rector