MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8579 from Budibase/update-csp 

Update csp
This commit is contained in:
Rory Powell 2022-11-08 11:01:49 +00:00 committed by GitHub
parent f4074c77aa 1c514c8493
commit cbd8818c85
17 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hosting/nginx.prod.conf.hbs
View File

@ -51,11 +51,11 @@ http {
proxy_buffering off;
set $csp_default "default-src 'self'";
set $csp_script "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://cdn.budi.live https://js.intercomcdn.com https://widget.intercom.io";
set $csp_script "script-src 'self' 'unsafe-inline' 'unsafe-eval' https://*.budibase.net https://cdn.budi.live https://js.intercomcdn.com https://widget.intercom.io";
set $csp_style "style-src 'self' 'unsafe-inline' https://cdn.jsdelivr.net https://fonts.googleapis.com https://rsms.me https://maxcdn.bootstrapcdn.com";
set $csp_object "object-src 'none'";
set $csp_base_uri "base-uri 'self'";
set $csp_connect "connect-src 'self' https://api-iam.intercom.io https://api-iam.intercom.io https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io https://uploads.intercomcdn.com https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com";
set $csp_connect "connect-src 'self' https://*.budibase.net https://api-iam.intercom.io https://api-iam.intercom.io https://api-ping.intercom.io https://app.posthog.com wss://nexus-websocket-a.intercom.io wss://nexus-websocket-b.intercom.io https://nexus-websocket-a.intercom.io https://nexus-websocket-b.intercom.io https://uploads.intercomcdn.com https://uploads.intercomusercontent.com https://*.s3.amazonaws.com https://*.s3.us-east-2.amazonaws.com https://*.s3.us-east-1.amazonaws.com https://*.s3.us-west-1.amazonaws.com https://*.s3.us-west-2.amazonaws.com https://*.s3.af-south-1.amazonaws.com https://*.s3.ap-east-1.amazonaws.com https://*.s3.ap-southeast-3.amazonaws.com https://*.s3.ap-south-1.amazonaws.com https://*.s3.ap-northeast-3.amazonaws.com https://*.s3.ap-northeast-2.amazonaws.com https://*.s3.ap-southeast-1.amazonaws.com https://*.s3.ap-southeast-2.amazonaws.com https://*.s3.ap-northeast-1.amazonaws.com https://*.s3.ca-central-1.amazonaws.com https://*.s3.cn-north-1.amazonaws.com https://*.s3.cn-northwest-1.amazonaws.com https://*.s3.eu-central-1.amazonaws.com https://*.s3.eu-west-1.amazonaws.com https://*.s3.eu-west-2.amazonaws.com https://*.s3.eu-south-1.amazonaws.com https://*.s3.eu-west-3.amazonaws.com https://*.s3.eu-north-1.amazonaws.com https://*.s3.sa-east-1.amazonaws.com https://*.s3.me-south-1.amazonaws.com https://*.s3.us-gov-east-1.amazonaws.com https://*.s3.us-gov-west-1.amazonaws.com";
set $csp_font "font-src 'self' data: https://cdn.jsdelivr.net https://fonts.gstatic.com https://rsms.me https://maxcdn.bootstrapcdn.com https://js.intercomcdn.com https://fonts.intercomcdn.com";
set $csp_frame "frame-src 'self' https:";
set $csp_img "img-src http: https: data: blob:";

2
lerna.json
View File

@ -1,5 +1,5 @@
{
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"npmClient": "yarn",
"packages": [
"packages/*"

4
packages/backend-core/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/backend-core",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase backend core libraries used in server and worker",
"main": "dist/src/index.js",
"types": "dist/src/index.d.ts",
@ -20,7 +20,7 @@
"test:watch": "jest --watchAll"
},
"dependencies": {
"@budibase/types": "2.1.14-alpha.3",
"@budibase/types": "^2.1.18",
"@shopify/jest-koa-mocks": "5.0.1",
"@techpass/passport-openidconnect": "0.3.2",
"aws-sdk": "2.1030.0",

4
packages/bbui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/bbui",
"description": "A UI solution used in the different Budibase projects.",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"license": "MPL-2.0",
"svelte": "src/index.js",
"module": "dist/bbui.es.js",
@ -38,7 +38,7 @@
],
"dependencies": {
"@adobe/spectrum-css-workflow-icons": "^1.2.1",
"@budibase/string-templates": "2.1.14-alpha.3",
"@budibase/string-templates": "^2.1.18",
"@spectrum-css/actionbutton": "^1.0.1",
"@spectrum-css/actiongroup": "^1.0.1",
"@spectrum-css/avatar": "^3.0.2",

10
packages/builder/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/builder",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"license": "GPL-3.0",
"private": true,
"scripts": {
@ -71,10 +71,10 @@
}
},
"dependencies": {
"@budibase/bbui": "2.1.14-alpha.3",
"@budibase/client": "2.1.14-alpha.3",
"@budibase/frontend-core": "2.1.14-alpha.3",
"@budibase/string-templates": "2.1.14-alpha.3",
"@budibase/bbui": "^2.1.18",
"@budibase/client": "^2.1.18",
"@budibase/frontend-core": "^2.1.18",
"@budibase/string-templates": "^2.1.18",
"@sentry/browser": "5.19.1",
"@spectrum-css/page": "^3.0.1",
"@spectrum-css/vars": "^3.0.1",

6
packages/builder/src/pages/builder/portal/apps/index.svelte
View File

@ -167,11 +167,13 @@
const autoCreateApp = async () => {
try {
// Auto name app if has same name
let appName = template.key
const templateKey = template.key.split("/")[1]
let appName = templateKey.replace(/-/g, " ")
const appsWithSameName = $apps.filter(app =>
app.name?.startsWith(appName)
)
appName = `${appName}-${appsWithSameName.length + 1}`
appName = `${appName} ${appsWithSameName.length + 1}`
// Create form data to create app
let data = new FormData()

8
packages/cli/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/cli",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase CLI, for developers, self hosting and migrations.",
"main": "src/index.js",
"bin": {
@ -26,9 +26,9 @@
"outputPath": "build"
},
"dependencies": {
"@budibase/backend-core": "2.1.14-alpha.3",
"@budibase/string-templates": "2.1.14-alpha.3",
"@budibase/types": "2.1.14-alpha.3",
"@budibase/backend-core": "^2.1.18",
"@budibase/string-templates": "^2.1.18",
"@budibase/types": "^2.1.18",
"axios": "0.21.2",
"chalk": "4.1.0",
"cli-progress": "3.11.2",

8
packages/client/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/client",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"license": "MPL-2.0",
"module": "dist/budibase-client.js",
"main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
"dev:builder": "rollup -cw"
},
"dependencies": {
"@budibase/bbui": "2.1.14-alpha.3",
"@budibase/frontend-core": "2.1.14-alpha.3",
"@budibase/string-templates": "2.1.14-alpha.3",
"@budibase/bbui": "^2.1.18",
"@budibase/frontend-core": "^2.1.18",
"@budibase/string-templates": "^2.1.18",
"@spectrum-css/button": "^3.0.3",
"@spectrum-css/card": "^3.0.3",
"@spectrum-css/divider": "^1.0.3",

2
packages/client/src/components/app/forms/InnerForm.svelte
View File

@ -131,7 +131,7 @@
const getDefault = (defaultValue, schema, type) => {
// Remove any values not present in the field schema
// Convert any values supplied to string
if (Array.isArray(defaultValue) && type == "array") {
if (Array.isArray(defaultValue) && type == "array" && schema) {
return defaultValue.reduce((acc, entry) => {
let processedOption = String(entry)
let schemaOptions = schema.constraints.inclusion

4
packages/frontend-core/package.json
View File

@ -1,12 +1,12 @@
{
"name": "@budibase/frontend-core",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase frontend core libraries used in builder and client",
"author": "Budibase",
"license": "MPL-2.0",
"svelte": "src/index.js",
"dependencies": {
"@budibase/bbui": "2.1.14-alpha.3",
"@budibase/bbui": "^2.1.18",
"lodash": "^4.17.21",
"svelte": "^3.46.2"
}

2
packages/sdk/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/sdk",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase Public API SDK",
"author": "Budibase",
"license": "MPL-2.0",

12
packages/server/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/server",
"email": "hi@budibase.com",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase Web Server",
"main": "src/index.ts",
"repository": {
@ -77,11 +77,11 @@
"license": "GPL-3.0",
"dependencies": {
"@apidevtools/swagger-parser": "10.0.3",
"@budibase/backend-core": "2.1.14-alpha.3",
"@budibase/client": "2.1.14-alpha.3",
"@budibase/pro": "2.1.14-alpha.3",
"@budibase/string-templates": "2.1.14-alpha.3",
"@budibase/types": "2.1.14-alpha.3",
"@budibase/backend-core": "^2.1.18",
"@budibase/client": "^2.1.18",
"@budibase/pro": "2.1.18",
"@budibase/string-templates": "^2.1.18",
"@budibase/types": "^2.1.18",
"@bull-board/api": "3.7.0",
"@bull-board/koa": "3.9.4",
"@elastic/elasticsearch": "7.10.0",

30
packages/server/yarn.lock
View File

@ -1094,12 +1094,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.1.14-alpha.3":
version "2.1.14-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.14-alpha.3.tgz#79b8016c03cdbf5ce6353a7e60bdae4ef15eb720"
integrity sha512-hFZpFJVRzECLKNHBP2aGm2gChaBrg5w84cxgNLweIFxwgnrEMZxks9GW4d5G4w5mNGyh9OOxll9uQ853mTl3Ng==
"@budibase/backend-core@2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.18.tgz#fdc63f7b1a9213b09f5b25bce101cca828a04f6c"
integrity sha512-3Mihsv1Vk0wXjWLBV9p9KuAzMxoCkMUvIUYl07Ovhldsj0nxYbDiANX+vK5LjF4CYHjbvtntjR0ExfaZB9LbXQ==
dependencies:
"@budibase/types" "2.1.14-alpha.3"
"@budibase/types" "^2.1.18"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -1181,13 +1181,13 @@
svelte-flatpickr "^3.2.3"
svelte-portal "^1.0.0"
"@budibase/pro@2.1.14-alpha.3":
version "2.1.14-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.14-alpha.3.tgz#28d2d87ed09c1b17639513e4918d465d61ce6667"
integrity sha512-5Pu9ZKoKkZPqvMX6woxgdpn0E/DtyIm9stpY+osw1v6CZxRkDma2FKOuskEdpRYn9+hQZiQC0qiR556sAorQoA==
"@budibase/pro@2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.18.tgz#7f7b6b9205767cda3d640353e2cb2ce34fb3e1ac"
integrity sha512-6i+bwJYs92+v7DPX7TZ4drpa8BQrb1w5catZ1f4e/9A0UqEVnE1BiX8wJx3pD7PhLHUGXKz+BaKS+oaHusHkQQ==
dependencies:
"@budibase/backend-core" "2.1.14-alpha.3"
"@budibase/types" "2.1.14-alpha.3"
"@budibase/backend-core" "2.1.18"
"@budibase/types" "2.1.18"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
@ -1211,10 +1211,10 @@
svelte-apexcharts "^1.0.2"
svelte-flatpickr "^3.1.0"
"@budibase/types@2.1.14-alpha.3":
version "2.1.14-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.14-alpha.3.tgz#381a85b0db4abdceaf40ab68947f6d60d901d1a6"
integrity sha512-gcCHteSGbhOB9thDbwdarNatII7hPNW/79znJ9ftiVASd16xVTBC/Q5GfXifs9vjSnQ8NaDzXcahTha0Y+Gulw==
"@budibase/types@2.1.18", "@budibase/types@^2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.18.tgz#4c7859fdc815044b12c4ac7b5e09e5c920150c81"
integrity sha512-rZMqx0QtWKaaPWP7V7j2Il8xm7XZ5RvpN7xw/evOp8Jw3DuLe709Zt6teLt8uvsDuI0rEIC3XNNWQSXHxOhGzQ==
"@bull-board/api@3.7.0":
version "3.7.0"

2
packages/string-templates/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/string-templates",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Handlebars wrapper for Budibase templating.",
"main": "src/index.cjs",
"module": "dist/bundle.mjs",

2
packages/types/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@budibase/types",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase types",
"main": "dist/index.js",
"types": "dist/index.d.ts",

10
packages/worker/package.json
View File

@ -1,7 +1,7 @@
{
"name": "@budibase/worker",
"email": "hi@budibase.com",
"version": "2.1.14-alpha.3",
"version": "2.1.18",
"description": "Budibase background service",
"main": "src/index.ts",
"repository": {
@ -36,10 +36,10 @@
"author": "Budibase",
"license": "GPL-3.0",
"dependencies": {
"@budibase/backend-core": "2.1.14-alpha.3",
"@budibase/pro": "2.1.14-alpha.3",
"@budibase/string-templates": "2.1.14-alpha.3",
"@budibase/types": "2.1.14-alpha.3",
"@budibase/backend-core": "^2.1.18",
"@budibase/pro": "2.1.18",
"@budibase/string-templates": "^2.1.18",
"@budibase/types": "^2.1.18",
"@koa/router": "8.0.8",
"@sentry/node": "6.17.7",
"@techpass/passport-openidconnect": "0.3.2",

30
packages/worker/yarn.lock
View File

@ -291,12 +291,12 @@
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
"@budibase/backend-core@2.1.14-alpha.3":
version "2.1.14-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.14-alpha.3.tgz#79b8016c03cdbf5ce6353a7e60bdae4ef15eb720"
integrity sha512-hFZpFJVRzECLKNHBP2aGm2gChaBrg5w84cxgNLweIFxwgnrEMZxks9GW4d5G4w5mNGyh9OOxll9uQ853mTl3Ng==
"@budibase/backend-core@2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@budibase/backend-core/-/backend-core-2.1.18.tgz#fdc63f7b1a9213b09f5b25bce101cca828a04f6c"
integrity sha512-3Mihsv1Vk0wXjWLBV9p9KuAzMxoCkMUvIUYl07Ovhldsj0nxYbDiANX+vK5LjF4CYHjbvtntjR0ExfaZB9LbXQ==
dependencies:
"@budibase/types" "2.1.14-alpha.3"
"@budibase/types" "^2.1.18"
"@shopify/jest-koa-mocks" "5.0.1"
"@techpass/passport-openidconnect" "0.3.2"
aws-sdk "2.1030.0"
@ -328,22 +328,22 @@
uuid "8.3.2"
zlib "1.0.5"
"@budibase/pro@2.1.14-alpha.3":
version "2.1.14-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.14-alpha.3.tgz#28d2d87ed09c1b17639513e4918d465d61ce6667"
integrity sha512-5Pu9ZKoKkZPqvMX6woxgdpn0E/DtyIm9stpY+osw1v6CZxRkDma2FKOuskEdpRYn9+hQZiQC0qiR556sAorQoA==
"@budibase/pro@2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@budibase/pro/-/pro-2.1.18.tgz#7f7b6b9205767cda3d640353e2cb2ce34fb3e1ac"
integrity sha512-6i+bwJYs92+v7DPX7TZ4drpa8BQrb1w5catZ1f4e/9A0UqEVnE1BiX8wJx3pD7PhLHUGXKz+BaKS+oaHusHkQQ==
dependencies:
"@budibase/backend-core" "2.1.14-alpha.3"
"@budibase/types" "2.1.14-alpha.3"
"@budibase/backend-core" "2.1.18"
"@budibase/types" "2.1.18"
"@koa/router" "8.0.8"
bull "4.10.1"
joi "17.6.0"
node-fetch "^2.6.1"
"@budibase/types@2.1.14-alpha.3":
version "2.1.14-alpha.3"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.14-alpha.3.tgz#381a85b0db4abdceaf40ab68947f6d60d901d1a6"
integrity sha512-gcCHteSGbhOB9thDbwdarNatII7hPNW/79znJ9ftiVASd16xVTBC/Q5GfXifs9vjSnQ8NaDzXcahTha0Y+Gulw==
"@budibase/types@2.1.18", "@budibase/types@^2.1.18":
version "2.1.18"
resolved "https://registry.yarnpkg.com/@budibase/types/-/types-2.1.18.tgz#4c7859fdc815044b12c4ac7b5e09e5c920150c81"
integrity sha512-rZMqx0QtWKaaPWP7V7j2Il8xm7XZ5RvpN7xw/evOp8Jw3DuLe709Zt6teLt8uvsDuI0rEIC3XNNWQSXHxOhGzQ==
"@cspotcode/source-map-consumer@0.8.0":
version "0.8.0"