Merge branch 'master' into share-type-sciencemesh

Signed-off-by: Michiel de Jong <michiel@unhosted.org>

Author: michielbdejong

.drone.yml

@@ -8,8 +8,15 @@ module.exports = {
 		oc_userconfig: true,
 		dayNames: true,
 		firstDay: true,
+		'cypress/globals': true,
 	},
-	extends: ['@nextcloud'],
+	plugins: [
+		'cypress',
+	],
+	extends: [
+		'@nextcloud',
+		'plugin:cypress/recommended',
+	],
 	rules: {
 		'no-tabs': 'warn',
 		// TODO: make sure we fix this as this is bad vue coding style.

.eslintrc.js

@@ -41,7 +41,7 @@ jobs:
           blueprint: tests/blueprints/basic.toml
           ref: ${{ github.event.pull_request.head.ref }}
       - name: Run before measurements
-        uses: nextcloud/profiler@fa03a1e6864fcb63fb92b8940fa72f5191baffbe
+        uses: nextcloud/profiler@1e66a9de5f76a01e9d1db4f0153bcc1cbf989b3d
         with:
           run: |
             curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -50,6 +50,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: before.json
+          profiler-branch: master
 
       - name: Apply PR
         run: |
@@ -62,7 +63,7 @@ jobs:
 
       - name: Run after measurements
         id: compare
-        uses: nextcloud/profiler@fa03a1e6864fcb63fb92b8940fa72f5191baffbe
+        uses: nextcloud/profiler@1e66a9de5f76a01e9d1db4f0153bcc1cbf989b3d
         with:
           run: |
             curl -s -X PROPFIND -u test:test http://localhost:8080/remote.php/dav/files/test
@@ -71,6 +72,7 @@ jobs:
             curl -s -u test:test -T README.md http://localhost:8080/remote.php/dav/files/test/new_file.txt
             curl -s -u test:test -X DELETE http://localhost:8080/remote.php/dav/files/test/new_file.txt
           output: after.json
+          profiler-branch: master
           compare-with: before.json
 
       - name: Upload profiles

.github/workflows/performance.yml

@@ -14,12 +14,7 @@ jobs:
   smb-kerberos-tests:
     runs-on: ubuntu-latest
 
-    strategy:
-      fail-fast: false
-      matrix:
-        php-versions: ['8.0', '8.1']
-
-    name: php${{ matrix.php-versions }}-${{ matrix.ftpd }}
+    name: kerberos
 
     steps:
       - name: Checkout server
@@ -58,21 +53,12 @@ jobs:
           chmod 0777 cookies
 
           DC_IP=$(docker inspect dc --format '{{.NetworkSettings.IPAddress}}')
+          echo "SAML login"
           docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
-            curl -c /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/index.php/apps/user_saml/saml/login
+            curl -c /cookies/jar --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=$(docker run --rm --name client -v $PWD/cookies:/cookies -v /tmp/shared:/shared --dns $DC_IP --hostname client.domain.test icewind1991/samba-krb-test-client \
             curl -b /cookies/jar -s --negotiate -u testuser@DOMAIN.TEST: --delegation always http://httpd.domain.test/remote.php/webdav/smb/test.txt)
           echo $CONTENT
           CONTENT=$(echo $CONTENT | tr -d '[:space:]')
           [[ $CONTENT == "testfile" ]]
-
-
-  smb-kerberos-summary:
-    runs-on: ubuntu-latest
-    needs: smb-kerberos-tests
-
-    if: always()
-
-    steps:
-      - name: Summary status
-        run: if ${{ needs.smb-kerberos-tests.result != 'success' }}; then exit 1; fi

.github/workflows/psalm-github.yml

@@ -26,14 +26,45 @@ jobs:
         run: composer i
 
       - name: Psalm
-        run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
+        run: composer run psalm -- --monochrome --no-progress --output-format=github --update-baseline --report=results.sarif
 
-      - name: Check diff
+      - name: Show potential changes in Psalm baseline
+        if: always()
         run: git diff -- . ':!lib/composer'
 
-      - name: Show potential changes in Psalm baseline
-        run: |
-          bash -c "[[ ! \"`git status --porcelain build/psalm-baseline.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
+      - name: Upload Analysis results to GitHub
+        if: always()
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif
+
+  static-code-analysis-security:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Set up php
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: '8.0'
+          extensions: ctype,curl,dom,fileinfo,gd,intl,json,mbstring,openssl,pdo_sqlite,posix,sqlite,xml,zip
+          coverage: none
+
+      - name: Composer install
+        run: composer i
+
+      - name: Psalm taint analysis
+        run: composer run psalm -- --monochrome --no-progress --output-format=github --report=results.sarif --taint-analysis
+
+      - name: Upload Security Analysis results to GitHub
+        if: always()
+        uses: github/codeql-action/upload-sarif@v2
+        with:
+          sarif_file: results.sarif
 
   static-code-analysis-ocp:
     runs-on: ubuntu-latest
@@ -57,11 +88,8 @@ jobs:
         run: composer i
 
       - name: Psalm
-        run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline || ( git diff -- . ':!lib/composer' && exit 1 )
-
-      - name: Check diff
-        run: git diff -- . ':!lib/composer'
+        run: composer run psalm -- -c psalm-ocp.xml --monochrome --no-progress --output-format=github --update-baseline
 
       - name: Show potential changes in Psalm baseline
-        run: |
-          bash -c "[[ ! \"`git status --porcelain build/psalm-baseline-ocp.xml`\" ]] || ( echo 'Uncommited changes in Psalm baseline' && git status && git diff build/psalm-baseline.xml)"
+        if: always()
+        run: git diff -- . ':!lib/composer'

.github/workflows/smb-kerberos.yml

@@ -1,7 +1,7 @@
 OC.L10N.register(
     "admin_audit",
     {
-    "Auditing / Logging" : "Auditoria / registo",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece a funcionalidade de registo ao Nextcloud como o registo de acesso a ficheiros ou acções sensíveis."
+    "Auditing / Logging" : "Auditorias / Registos",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece funcionalidades de registo para o Nextcloud como registar acessos a ficheiros ou demais ações sensíveis. "
 },
 "nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");

.github/workflows/static-code-analysis.yml

@@ -1,5 +1,5 @@
 { "translations": {
-    "Auditing / Logging" : "Auditoria / registo",
-    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece a funcionalidade de registo ao Nextcloud como o registo de acesso a ficheiros ou acções sensíveis."
+    "Auditing / Logging" : "Auditorias / Registos",
+    "Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions." : "Fornece funcionalidades de registo para o Nextcloud como registar acessos a ficheiros ou demais ações sensíveis. "
 },"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
 }

3rdparty

@@ -81,7 +81,7 @@ OC.L10N.register(
     "Time:" : "Time:",
     "Location:" : "Location:",
     "Link:" : "Link:",
-    "Organizer:" : "Organizer:",
+    "Organizer:" : "Organiser:",
     "Attendees:" : "Attendees:",
     "Accept" : "Accept",
     "Decline" : "Decline",
@@ -172,12 +172,12 @@ OC.L10N.register(
     "Send notifications for events" : "Send notifications for events",
     "Notifications are sent via background jobs, so these must occur often enough." : "Notifications are sent via background jobs, so these must occur often enough.",
     "Send reminder notifications to calendar sharees as well" : "Send reminder notifications to calendar sharees as well",
-    "Reminders are always sent to organizers and attendees." : "Reminders are always sent to organizers and attendees.",
+    "Reminders are always sent to organizers and attendees." : "Reminders are always sent to organisers and attendees.",
     "Enable notifications for events via push" : "Enable notifications for events via push",
     "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}." : "Also install the {calendarappstoreopen}Calendar app{linkclose}, or {calendardocopen}connect your desktop & mobile for syncing ↗{linkclose}.",
     "Please make sure to properly set up {emailopen}the email server{linkclose}." : "Please make sure to properly set up {emailopen}the email server{linkclose}.",
     "There was an error updating your attendance status." : "There was an error updating your attendance status.",
-    "Please contact the organizer directly." : "Please contact the organizer directly.",
+    "Please contact the organizer directly." : "Please contact the organiser directly.",
     "Are you accepting the invitation?" : "Are you accepting the invitation?",
     "Tentative" : "Tentative",
     "Your attendance was updated successfully." : "Your attendance was updated successfully.",