Merge pull request #460 from nextcloud/backport/459/stable22

Author: skjnldsv

.github/workflows/phpunit.yml

@@ -30,13 +30,7 @@ jobs:
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
-
-      - 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
+          submodules: true
 
       - name: Checkout app
         uses: actions/checkout@v2
@@ -86,7 +80,7 @@ jobs:
 
     services:
       mysql:
-        image: mariadb
+        image: mariadb:10.5
         ports:
           - 4444:3306/tcp
         env:
@@ -171,13 +165,7 @@ jobs:
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
-
-      - 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
+          submodules: true
 
       - name: Checkout app
         uses: actions/checkout@v2
@@ -238,13 +226,7 @@ jobs:
         with:
           repository: nextcloud/server
           ref: ${{ matrix.server-versions }}
-
-      - 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
+          submodules: true
 
       - name: Checkout app
         uses: actions/checkout@v2

js/files_pdfviewer-public.js

@@ -49,3 +49,25 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
+/**
+ * @copyright Copyright (c) 2021 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */

js/files_pdfviewer-public.js.map

@@ -38,15 +38,14 @@ window.addEventListener('DOMContentLoaded', function() {
 		const page = location.hash.split('page=')[1] || 0
 		const contentElmt = document.getElementById('files-public-content')
 		const sharingTokenElmt = document.getElementById('sharingToken')
-		const footerElmt = document.querySelector('#app-content > footer')
+		const footerElmt = document.querySelector('body > footer')
 
 		const sharingToken = sharingTokenElmt.value
 		const downloadUrl = generateUrl('/s/{token}/download', { token: sharingToken })
 		const viewerUrl = generateUrl('/apps/files_pdfviewer/?file={downloadUrl}#page={page}', { downloadUrl, page })
 
 		// Create viewer frame
 		const viewerNode = document.createElement('iframe')
-		viewerNode.src = viewerUrl
 		viewerNode.style.height = '100%'
 		viewerNode.style.width = '100%'
 		viewerNode.style.position = 'absolute'
@@ -55,10 +54,45 @@ window.addEventListener('DOMContentLoaded', function() {
 		if (contentElmt) {
 			contentElmt.innerHTML = ''
 			contentElmt.appendChild(viewerNode)
+			viewerNode.src = viewerUrl
 			footerElmt.style.display = 'none'
 		} else {
 			logger.error('Unable to inject the PDF Viewer')
 		}
+
+		// When pdf viewer is loaded
+		addEventListener('load', function() {
+			// If we forbid download, prevent interaction
+			if (!canDownload()) {
+				const pdfViewer = viewerNode.contentDocument.querySelector('.pdfViewer')
+				const PDFViewerApplication = viewerNode.contentWindow.PDFViewerApplication
+
+				if (pdfViewer) {
+					pdfViewer.classList.add('disabledTextSelection')
+				}
+
+				if (PDFViewerApplication) {
+					// Disable printing service when downloads are hidden, as even if the
+					// buttons in the UI are hidden the printing could still be triggered
+					// with Ctrl|Meta+P.
+					// Abuse the "supportsPrinting" parameter, which signals that the
+					// browser does not fully support printing, to make PDFViewer disable
+					// the printing service.
+					// "supportsPrinting" is a getter function, so it needs to be deleted
+					// before replacing it with a simple value.
+					delete PDFViewerApplication.supportsPrinting
+					PDFViewerApplication.supportsPrinting = false
+
+					// When printing is not supported a warning is shown by the default
+					// "beforePrint" function when trying to print. That function needs to
+					// be replaced with an empty one to prevent that warning to be shown.
+					PDFViewerApplication.beforePrint = function() {
+					}
+				}
+
+				logger.info('Download, printing and user interaction disabled')
+			}
+		})
 	} else {
 		logger.error('But this does not appear to be a public page')
 	}

js/files_pdfviewer-workersrc.js

@@ -22,5 +22,4 @@
  */
 
 const hideDownloadElmt = document.getElementById('hideDownload')
-// true = hidden download
 export default () => !hideDownloadElmt || (hideDownloadElmt && hideDownloadElmt.value !== 'true')

js/files_pdfviewer-workersrc.js.LICENSE.txt

@@ -20,6 +20,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  *
  */
+
 import canDownload from './canDownload'
 
 export default () => !canDownload() && typeof OCA.RichDocuments !== 'undefined'

js/files_pdfviewer-workersrc.js.map

@@ -22,12 +22,10 @@
  *
  */
 
-import canDownload from './utils/canDownload'
+import logger from './services/logger'
 import redirectIfNotIframe from './utils/redirectIfNotIframe'
 
-/**
- * Checks if the page is displayed in an iframe. If not redirect to /.
- **/
+// Checks if the page is displayed in an iframe. If not redirect to /.
 redirectIfNotIframe()
 
 // When "PDFViewerApplication.webViewerInitialized" is executed (once
@@ -38,7 +36,6 @@ redirectIfNotIframe()
 // "PDFViewerApplication" and "PDFViewerApplicationOptions" are globally set and
 // before "PDFViewerApplication.initialize" is executed.
 function initializeCustomPDFViewerApplication() {
-
 	// Preferences override options, so they must be disabled for
 	// "externalLinkTarget" to take effect.
 	PDFViewerApplicationOptions.set('disablePreferences', true)
@@ -48,86 +45,7 @@ function initializeCustomPDFViewerApplication() {
 	PDFViewerApplicationOptions.set('cMapUrl', document.getElementsByTagName('head')[0].getAttribute('data-cmapurl'))
 	PDFViewerApplicationOptions.set('enablePermissions', true)
 
-	console.debug('Initialized files_pdfviewer', PDFViewerApplicationOptions.getAll())
-
-	// The download has to be forced to use the URL of the file; by default
-	// "PDFViewerApplication.download" uses a blob, but this causes a CSP error
-	// (at least, in Firefox) when trying to download it.
-	PDFViewerApplication.download = function() {
-		// "isDataSchema()" and "getPDFFileNameFromURL()" are copied from
-		// "vendor/pdfjs/web/viewer.js", as the functions defined in that file
-		// can not be accessed from the outside.
-		function isDataSchema(url) {
-			let i = 0
-			const ii = url.length
-			while (i < ii && url[i].trim() === '') {
-				i++
-			}
-			return url.substr(i, 5).toLowerCase() === 'data:'
-		}
-
-		function getPDFFileNameFromURL(url) {
-			const defaultFilename = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'document.pdf'
-
-			if (isDataSchema(url)) {
-				console.warn('getPDFFileNameFromURL: ' + 'ignoring "data:" URL for performance reasons.')
-				return defaultFilename
-			}
-			const reURI = /^(?:(?:[^:]+:)?\/\/[^/]+)?([^?#]*)(\?[^#]*)?(#.*)?$/
-			const reFilename = /[^/?#=]+\.pdf\b(?!.*\.pdf\b)/i
-			const splitURI = reURI.exec(url)
-			let suggestedFilename = reFilename.exec(splitURI[1]) || reFilename.exec(splitURI[2]) || reFilename.exec(splitURI[3])
-			if (suggestedFilename) {
-				suggestedFilename = suggestedFilename[0]
-				if (suggestedFilename.indexOf('%') !== -1) {
-					try {
-						suggestedFilename = reFilename.exec(decodeURIComponent(suggestedFilename))[0]
-					} catch (e) {
-						console.debug(e)
-					}
-				}
-			}
-			return suggestedFilename || defaultFilename
-		}
-
-		const url = decodeURIComponent(window.location.search.substr(6))
-
-		this.downloadManager.downloadUrl(url, getPDFFileNameFromURL(url))
-	}
-
-	if (!canDownload()) {
-		// Disable download function when downloads are hidden, as even if the
-		// buttons in the UI are hidden the download could still be triggered
-		// with Ctrl|Meta+S.
-		PDFViewerApplication.download = function() {
-		}
-		const downloadButton = document.getElementById('toolbarViewerRight').querySelector('button.download')
-		if (downloadButton) {
-			downloadButton.style.display = 'none'
-		}
-
-		// Disable printing service when downloads are hidden, as even if the
-		// buttons in the UI are hidden the printing could still be triggered
-		// with Ctrl|Meta+P.
-		// Abuse the "supportsPrinting" parameter, which signals that the
-		// browser does not fully support printing, to make PDFViewer disable
-		// the printing service.
-		// "supportsPrinting" is a getter function, so it needs to be deleted
-		// before replacing it with a simple value.
-		delete PDFViewerApplication.supportsPrinting
-		PDFViewerApplication.supportsPrinting = false
-
-		// When printing is not supported a warning is shown by the default
-		// "beforePrint" function when trying to print. That function needs to
-		// be replaced with an empty one to prevent that warning to be shown.
-		PDFViewerApplication.beforePrint = function() {
-		}
-
-		// For css properties
-		document.getElementById('viewer').classList.add('disabledTextSelection')
-
-		console.debug('Files_PDFViewer, download and print disabled')
-	}
+	logger.debug('Initialized files_pdfviewer', PDFViewerApplicationOptions.getAll())
 }
 
 document.addEventListener('DOMContentLoaded', initializeCustomPDFViewerApplication, true)