Merge branch 'master' into fair-use-push

nextcloud · Oct 22, 2021 · 66e73a1 · 66e73a1
2 parents 78c814c + 8b742ab
commit 66e73a1
Show file tree

Hide file tree

Showing 35 changed files with 598 additions and 239 deletions.
diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml
@@ -0,0 +1,124 @@
+name: S3 External storage
+on:
+  push:
+    branches:
+      - master
+      - stable*
+    paths:
+      - 'apps/files_external/**'
+  pull_request:
+    paths:
+      - 'apps/files_external/**'
+
+env:
+  APP_NAME: files_external
+
+jobs:
+  s3-external-tests-minio:
+    runs-on: ubuntu-latest
+
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4', '8.0']
+
+    name: php${{ matrix.php-versions }}-minio
+
+    services:
+      minio:
+        env:
+          MINIO_ACCESS_KEY: minio
+          MINIO_SECRET_KEY: minio123
+        image: bitnami/minio:2021.10.6
+        ports:
+          - "9000:9000"
+
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: phpunit
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+
+      - 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,'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
+          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
+          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
+      - name: S3 logs
+        if: always()
+        run: |
+          docker ps -a
+          docker logs $(docker ps -aq)
+  s3-external-tests-localstack:
+    runs-on: ubuntu-latest
+
+    strategy:
+      # do not stop on another job's failure
+      fail-fast: false
+      matrix:
+        php-versions: ['7.4', '8.0']
+
+    name: php${{ matrix.php-versions }}-localstack
+
+    services:
+      minio:
+        env:
+          SERVICES: s3
+          DEBUG: 1
+        image: localstack/localstack:0.12.7
+        ports:
+          - "4566:4566"
+
+    steps:
+      - name: Checkout server
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+
+      - name: Set up php ${{ matrix.php-versions }}
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          tools: phpunit
+          extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, zip, gd
+
+      - 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,'hostname' => 'localhost','key' => 'ignored','secret' => 'ignored', 'bucket' => 'bucket', 'port' => 4566, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php
+          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php
+          phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php
+      - name: S3 logs
+        if: always()
+        run: |
+          docker ps -a
+          docker logs $(docker ps -aq)
+
+  s3-external-summary:
+    runs-on: ubuntu-latest
+    needs: [s3-external-tests-minio, s3-external-tests-localstack]
+
+    if: always()
+
+    steps:
+      - name: Summary status
+        run: if ${{ needs.s3-external-tests-minio.result != 'success' }} || ${{ needs.s3-external-tests-localstack.result != 'success' }}; then exit 1; fi
diff --git a/3rdparty b/3rdparty
diff --git a/apps/accessibility/css/dark.scss b/apps/accessibility/css/dark.scss
@@ -21,6 +21,9 @@ $color-box-shadow: transparentize(darken($color-main-background, 70%), 0.5);
 $color-border: lighten($color-main-background, 7%);
 $color-border-dark: lighten($color-main-background, 14%);
 
+$image-logo: url('../../../core/img/logo/logo.svg?v=1');
+$image-logoheader: url('../../../core/img/logo/logo.svg?v=1');
+
 #app-navigation > ul > li > a:first-child,
 #app-navigation > ul > li > ul > li > a:first-child,
 #contactsmenu-menu a,

diff --git a/apps/accessibility/css/fontdyslexic.scss b/apps/accessibility/css/fontdyslexic.scss
@@ -13,3 +13,6 @@
 }
 
 $font-face: OpenDyslexic, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, Ubuntu, 'Helvetica Neue', Arial, 'Noto Color Emoji', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
+
+$image-logo: url('../../../core/img/logo/logo.svg?v=1');
+$image-logoheader: url('../../../core/img/logo/logo.svg?v=1');
diff --git a/apps/accessibility/css/highcontrast.scss b/apps/accessibility/css/highcontrast.scss
@@ -20,6 +20,9 @@ $color-box-shadow: $color-main-text;
 $color-border: darken($color-main-background, 50%);
 $color-border-dark: darken($color-main-background, 50%);
 
+$image-logo: url('../../../core/img/logo/logo.svg?v=1');
+$image-logoheader: url('../../../core/img/logo/logo.svg?v=1');
+
 [class^='icon-'], [class*=' icon-'],
 .action,
 #appmenu li a,

diff --git a/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php b/apps/dav/lib/CalDAV/InvitationResponse/InvitationResponseServer.php
@@ -124,4 +124,10 @@ public function handleITipMessage(Message $iTipMessage) {
 		$schedulingPlugin = $this->server->getPlugin('caldav-schedule');
 		$schedulingPlugin->scheduleLocalDelivery($iTipMessage);
 	}
+
+	public function isExternalAttendee(string $principalUri): bool {
+		/** @var \Sabre\DAVACL\Plugin $aclPlugin */
+		$aclPlugin = $this->server->getPlugin('acl');
+		return $aclPlugin->getPrincipalByUri($principalUri) === null;
+	}
 }
diff --git a/apps/dav/lib/Controller/InvitationResponseController.php b/apps/dav/lib/Controller/InvitationResponseController.php
@@ -198,7 +198,12 @@ private function buildITipResponse(array $row, string $partStat, int $guests = n
 		$iTipMessage->method = 'REPLY';
 		$iTipMessage->sequence = $row['sequence'];
 		$iTipMessage->sender = $row['attendee'];
-		$iTipMessage->recipient = $row['organizer'];
+
+		if ($this->responseServer->isExternalAttendee($row['attendee'])) {
+			$iTipMessage->recipient = $row['organizer'];
+		} else {
+			$iTipMessage->recipient = $row['attendee'];
+		}
 
 		$message = <<<EOF
 BEGIN:VCALENDAR

diff --git a/apps/dav/templates/schedule-response-options.php b/apps/dav/templates/schedule-response-options.php
@@ -24,8 +24,8 @@
 			</div>
 		</fieldset>
 		<fieldset id="more_options">
-			<input type="number" min="0" name="guests" placeholder="Guests" />
-			<input type="text" name="comment" placeholder="Comment" />
+			<input type="number" min="0" name="guests" placeholder="<?php p($l->t('Number of guests')); ?>" />
+			<input type="text" name="comment" placeholder="<?php p($l->t('Comment')); ?>" />
 		</fieldset>
 		<fieldset>
 			<input type="submit" value="<?php p($l->t('Save'));?>">