Merge pull request #51524 from nextcloud/fix/webpack-nonce

fix: adjust webpack nonce generation

apps/files_sharing/src/additionalScripts.js

@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { getCSPNonce } from '@nextcloud/auth'
 
 import './share.js'
 import './sharebreadcrumbview.js'
@@ -9,6 +10,6 @@ import './style/sharebreadcrumb.scss'
 import './collaborationresourceshandler.js'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 window.OCA.Sharing = OCA.Sharing

apps/files_sharing/src/collaborationresourceshandler.js

@@ -2,9 +2,10 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { getCSPNonce } from '@nextcloud/auth'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 window.OCP.Collaboration.registerType('file', {
 	action: () => {

apps/settings/src/main-admin-ai.js

@@ -2,13 +2,13 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
+import { getCSPNonce } from '@nextcloud/auth'
 import Vue from 'vue'
 
 import ArtificialIntelligence from './components/AdminAI.vue'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 

apps/settings/src/main-admin-security.js

@@ -2,7 +2,7 @@
  * SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
+import { getCSPNonce } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
 import Vue from 'vue'
 
@@ -11,7 +11,7 @@ import EncryptionSettings from './components/Encryption/EncryptionSettings.vue'
 import store from './store/admin-security.js'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 

apps/settings/src/main-personal-password.js

@@ -2,14 +2,14 @@
  * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
+import { getCSPNonce } from '@nextcloud/auth'
+import { t, n } from '@nextcloud/l10n'
 
 import Vue from 'vue'
-
 import PasswordSection from './components/PasswordSection.vue'
-import { translate as t, translatePlural as n } from '@nextcloud/l10n'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 Vue.prototype.n = n

apps/settings/src/main-personal-webauth.js

@@ -2,14 +2,14 @@
  * SPDX-FileCopyrightText: 2020 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-
-import Vue from 'vue'
+import { getCSPNonce } from '@nextcloud/auth'
 import { loadState } from '@nextcloud/initial-state'
+import Vue from 'vue'
 
 import WebAuthnSection from './components/WebAuthn/Section.vue'
 
 // eslint-disable-next-line camelcase
-__webpack_nonce__ = btoa(OC.requestToken)
+__webpack_nonce__ = getCSPNonce()
 
 Vue.prototype.t = t
 

dist/files_sharing-additionalScripts.js.license

@@ -1,17 +1,32 @@
 SPDX-License-Identifier: MIT
+SPDX-License-Identifier: ISC
 SPDX-License-Identifier: GPL-3.0-or-later
 SPDX-License-Identifier: AGPL-3.0-or-later
 SPDX-FileCopyrightText: escape-html developers
 SPDX-FileCopyrightText: Tobias Koppers @sokra
+SPDX-FileCopyrightText: Roman Shtylman <shtylman@gmail.com>
 SPDX-FileCopyrightText: Roeland Jago Douma
 SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: GitHub Inc.
 SPDX-FileCopyrightText: Christoph Wurst
 
 
 This file is generated from multiple sources. Included packages:
+- @nextcloud/auth
+	- version: 2.4.0
+	- license: GPL-3.0-or-later
+- @nextcloud/browser-storage
+	- version: 0.4.0
+	- license: GPL-3.0-or-later
 - @nextcloud/capabilities
 	- version: 1.2.0
 	- license: GPL-3.0-or-later
+- semver
+	- version: 7.6.3
+	- license: ISC
+- @nextcloud/event-bus
+	- version: 3.3.2
+	- license: GPL-3.0-or-later
 - @nextcloud/initial-state
 	- version: 2.2.0
 	- license: GPL-3.0-or-later
@@ -24,6 +39,9 @@ This file is generated from multiple sources. Included packages:
 - escape-html
 	- version: 1.0.3
 	- license: MIT
+- process
+	- version: 0.11.10
+	- license: MIT
 - style-loader
 	- version: 4.0.0
 	- license: MIT

dist/files_sharing-collaboration.js

@@ -1,2 +1,2 @@
-btoa(OC.requestToken),window.OCP.Collaboration.registerType("file",{action:()=>new Promise(((i,e)=>{OC.dialogs.filepicker(t("files_sharing","Link to a file"),(function(o){OC.Files.getClient().getFileInfo(o).then(((e,o)=>{i(o.id)})).fail((()=>{e(new Error("Cannot get fileinfo"))}))}),!1,null,!1,OC.dialogs.FILEPICKER_TYPE_CHOOSE,"",{allowDirectoryChooser:!0})})),typeString:t("files_sharing","Link to a file"),typeIconClass:"icon-files-dark"});
-//# sourceMappingURL=files_sharing-collaboration.js.map?v=f799f63870ede0105298
+(()=>{"use strict";var e,r={84033:(e,r,o)=>{var n=o(21777);o.nc=(0,n.aV)(),window.OCP.Collaboration.registerType("file",{action:()=>new Promise(((e,r)=>{OC.dialogs.filepicker(t("files_sharing","Link to a file"),(function(o){OC.Files.getClient().getFileInfo(o).then(((r,o)=>{e(o.id)})).fail((()=>{r(new Error("Cannot get fileinfo"))}))}),!1,null,!1,OC.dialogs.FILEPICKER_TYPE_CHOOSE,"",{allowDirectoryChooser:!0})})),typeString:t("files_sharing","Link to a file"),typeIconClass:"icon-files-dark"})}},o={};function n(e){var t=o[e];if(void 0!==t)return t.exports;var i=o[e]={id:e,loaded:!1,exports:{}};return r[e].call(i.exports,i,i.exports,n),i.loaded=!0,i.exports}n.m=r,e=[],n.O=(r,o,t,i)=>{if(!o){var l=1/0;for(d=0;d<e.length;d++){o=e[d][0],t=e[d][1],i=e[d][2];for(var a=!0,f=0;f<o.length;f++)(!1&i||l>=i)&&Object.keys(n.O).every((e=>n.O[e](o[f])))?o.splice(f--,1):(a=!1,i<l&&(l=i));if(a){e.splice(d--,1);var s=t();void 0!==s&&(r=s)}}return r}i=i||0;for(var d=e.length;d>0&&e[d-1][2]>i;d--)e[d]=e[d-1];e[d]=[o,t,i]},n.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return n.d(r,{a:r}),r},n.d=(e,r)=>{for(var o in r)n.o(r,o)&&!n.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},n.e=()=>Promise.resolve(),n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),n.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),n.j=7541,(()=>{n.b=document.baseURI||self.location.href;var e={7541:0};n.O.j=r=>0===e[r];var r=(r,o)=>{var t,i,l=o[0],a=o[1],f=o[2],s=0;if(l.some((r=>0!==e[r]))){for(t in a)n.o(a,t)&&(n.m[t]=a[t]);if(f)var d=f(n)}for(r&&r(o);s<l.length;s++)i=l[s],n.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return n.O(d)},o=self.webpackChunknextcloud=self.webpackChunknextcloud||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})(),n.nc=void 0;var i=n.O(void 0,[4208],(()=>n(84033)));i=n.O(i)})();
+//# sourceMappingURL=files_sharing-collaboration.js.map?v=4fe8ff115adb4e496d4b

dist/files_sharing-collaboration.js.license

@@ -1,10 +1,30 @@
 SPDX-License-Identifier: MIT
+SPDX-License-Identifier: ISC
+SPDX-License-Identifier: GPL-3.0-or-later
 SPDX-License-Identifier: AGPL-3.0-or-later
 SPDX-FileCopyrightText: Tobias Koppers @sokra
+SPDX-FileCopyrightText: Roman Shtylman <shtylman@gmail.com>
 SPDX-FileCopyrightText: Nextcloud GmbH and Nextcloud contributors
+SPDX-FileCopyrightText: GitHub Inc.
+SPDX-FileCopyrightText: Christoph Wurst
 
 
 This file is generated from multiple sources. Included packages:
+- @nextcloud/auth
+	- version: 2.4.0
+	- license: GPL-3.0-or-later
+- @nextcloud/browser-storage
+	- version: 0.4.0
+	- license: GPL-3.0-or-later
+- semver
+	- version: 7.6.3
+	- license: ISC
+- @nextcloud/event-bus
+	- version: 3.3.2
+	- license: GPL-3.0-or-later
+- process
+	- version: 0.11.10
+	- license: MIT
 - webpack
 	- version: 5.94.0
 	- license: MIT