Merge branch 'master' into fix/test-php-8.2

Signed-off-by: Côme Chilliet <[email protected]>

.github/CODEOWNERS

@@ -15,3 +15,5 @@
 /lib/private/Profiler              @CarlSchwan
 /lib/public/Profiler               @CarlSchwan
 
+# Security team
+resources/config/ca-bundle.crt    @ChristophWurst @eneiluj @miaulalala @nickvergessen

.github/dependabot.yml

@@ -28,6 +28,8 @@ updates:
     - "feature: dependencies"
   reviewers:
     - "nextcloud/server-dependabot"
+  # Disable automatic rebasing because without a build CI will likely fail anyway
+  rebase-strategy: "disabled"
 
 # Testing master npm
 - package-ecosystem: npm
@@ -62,7 +64,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable22
+  target-branch: stable23
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -80,7 +82,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable23
+  target-branch: stable24
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -89,7 +91,7 @@ updates:
   ignore:
     # ignore all GitHub linguist patch updates
     - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
 
 - package-ecosystem: npm
   directory: "/"
@@ -98,7 +100,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable24
+  target-branch: stable25
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -107,7 +109,7 @@ updates:
   ignore:
     # ignore all GitHub linguist patch updates
     - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
 
 # Testing StableXX composer
 - package-ecosystem: composer
@@ -117,7 +119,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable22
+  target-branch: stable23
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -135,7 +137,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable23
+  target-branch: stable24
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -144,7 +146,7 @@ updates:
   ignore:
     # ignore all GitHub linguist patch updates
     - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
 
 - package-ecosystem: composer
   directory: "/build/integration"
@@ -153,7 +155,7 @@ updates:
     day: saturday
     time: "03:00"
     timezone: Europe/Paris
-  target-branch: stable24
+  target-branch: stable25
   labels:
     - "3. to review"
     - "feature: dependencies"
@@ -162,4 +164,4 @@ updates:
   ignore:
     # ignore all GitHub linguist patch updates
     - dependency-name: "*"
-      update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]

.github/workflows/oci.yml

@@ -1,18 +1,19 @@
 name: PHPUnit
 
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable*
+on: pull_request
+
+permissions:
+  contents: read
+
+concurrency:
+  group: phpunit-oci-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
-  phpunit-oci8:
-    runs-on: ubuntu-20.04
+  phpunit-oci:
+    runs-on: ubuntu-latest
 
     strategy:
-      fail-fast: false
       matrix:
         php-versions: ['8.2']
         databases: [ 'oci' ]
@@ -21,26 +22,21 @@ jobs:
 
     services:
       oracle:
-        image: deepdiver/docker-oracle-xe-11g # "wnameless/oracle-xe-11g-r2"
+        image: deepdiver/docker-oracle-xe-11g # 'wnameless/oracle-xe-11g-r2'
         ports:
-          - "1521:1521"
+          - 1521:1521/tcp
 
     steps:
       - name: Checkout server
-        uses: actions/checkout@v2
-
-      - name: Checkout submodules
-        shell: bash
-        run: |
-          auth_header="$(git config --local --get http.https://github.com/.extraheader)"
-          git submodule sync --recursive
-          git -c "http.extraheader=$auth_header" -c protocol.version=2 submodule update --init --force --recursive --depth=1
+        uses: actions/checkout@v3
+        with:
+          submodules: true
 
       - name: Set up php ${{ matrix.php-versions }}
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-versions }}
-          extensions: ctype,curl,dom,fileinfo,gd,imagick,intl,json,mbstring,oci8,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, oci8, openssl, pdo_sqlite, posix, sqlite, xml, zip
           tools: phpunit:9
           coverage: none
           ini-file: development
@@ -58,3 +54,17 @@ jobs:
       - name: PHPUnit
         working-directory: tests
         run: phpunit --configuration phpunit-autotest.xml --group DB,SLOWDB
+
+  summary:
+    permissions:
+      contents: none
+    runs-on: ubuntu-latest
+    needs: phpunit-oci
+
+    if: always()
+
+    name: phpunit-oci-summary
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi

.github/workflows/update-cacert-bundle.yml

@@ -0,0 +1,42 @@
+name: Update CA certificate bundle
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "5 4 * * *"
+
+jobs:
+  update-ca-certificate-bundle:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        branches: ["master", "stable25", "stable24", "stable23", "stable22"]
+
+    name: update-ca-certificate-bundle-${{ matrix.branches }}
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          ref: ${{ matrix.branches }}
+          submodules: true
+
+      - name: Download CA certificate bundle from curl
+        run: curl --etag-compare build/ca-bundle-etag.txt --etag-save build/ca-bundle-etag.txt --output resources/config/ca-bundle.crt https://curl.se/ca/cacert.pem
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        with:
+          token: ${{ secrets.COMMAND_BOT_PAT }}
+          commit-message: Update CA certificate bundle
+          committer: GitHub <[email protected]>
+          author: nextcloud-command <[email protected]>
+          signoff: true
+          branch: automated/noid/${{ matrix.branches }}-update-ca-cert-bundle
+          title: "[${{ matrix.branches }}] Update ca-cert bundle"
+          body: |
+            Auto-generated update of CA certificate bundle from [https://curl.se/docs/caextract.html](https://curl.se/docs/caextract.html)
+          labels: |
+            dependencies
+            3. to review

.gitignore

@@ -73,6 +73,7 @@ CVS/*
 RCS/*
 *.backup*
 .php_cs.cache
+.php-cs-fixer.cache
 
 # kdevelop
 .kdev
@@ -159,3 +160,6 @@ tests/acceptance/vendor/
 composer.phar
 /lib/composer/bin
 /vendor-bin/**/vendor
+
+./.htaccess
+core/js/mimetypelist.js

.pre-commit-config.yaml

@@ -0,0 +1,17 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
+- repo: https://github.com/nextcloud/pre-commit-php.git
+  rev: 1.5.1
+  hooks:
+  - id: php-lint
+  - id: php-cs-fixer
+    files: \.(php)$
+    exclude: ^(config|data|composer|lib\/composer)
+    args: []