From a02a454a5b7c037dfe5f7e41e62add2cd0858b09 Mon Sep 17 00:00:00 2001 From: Sudeep Duggal <5505558+duggalsu@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:21:12 +0530 Subject: [PATCH] Prepare for release - Updated Uli repo url in github workflows - Updated github actions checkout version in github workflows - Modified firefox publish job id in github workflows - Updated chrome and firefox extension version in manifest - Removed localhost from CSP in manifest for production - Added plugin dev CSP instructions to readme --- .github/workflows/release-on-chrome.yml | 4 ++-- .github/workflows/release-on-firefox.yml | 6 +++--- browser-extension/README.md | 5 ++++- browser-extension/plugin/manifest.firefox.json | 4 ++-- browser-extension/plugin/manifest.json | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/release-on-chrome.yml b/.github/workflows/release-on-chrome.yml index 51ef7238..ef2270af 100644 --- a/.github/workflows/release-on-chrome.yml +++ b/.github/workflows/release-on-chrome.yml @@ -8,11 +8,11 @@ jobs: runs-on: "ubuntu-latest" environment: name: main - url: "https://github.com/tattle-made/OGBV/releases" + url: "https://github.com/tattle-made/Uli/releases" steps: - name: "Checkout Development Branch" - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: main diff --git a/.github/workflows/release-on-firefox.yml b/.github/workflows/release-on-firefox.yml index 5e6447f8..85c39ab2 100644 --- a/.github/workflows/release-on-firefox.yml +++ b/.github/workflows/release-on-firefox.yml @@ -3,16 +3,16 @@ name: "Publish on Firefox" on: workflow_dispatch jobs: - chrome-publish: + firefox-publish: name: "Pre Release Extension" runs-on: "ubuntu-latest" environment: name: development - url: "https://github.com/tattle-made/OGBV/releases" + url: "https://github.com/tattle-made/Uli/releases" steps: - name: "Checkout Development Branch" - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: ref: main diff --git a/browser-extension/README.md b/browser-extension/README.md index 35b5978c..10b1d023 100644 --- a/browser-extension/README.md +++ b/browser-extension/README.md @@ -63,7 +63,10 @@ docker compose up ``` You should now see database migration in the logs. The `api-server` will be running now. - +For local plugin development, add the following two entries to the `connect-src` in the manifest's `content_security_policy`: +``` +http://localhost:3000 ws://localhost +``` To run the plugin development server, run `cd plugin` and then the following : diff --git a/browser-extension/plugin/manifest.firefox.json b/browser-extension/plugin/manifest.firefox.json index 68db55fd..860a99b2 100644 --- a/browser-extension/plugin/manifest.firefox.json +++ b/browser-extension/plugin/manifest.firefox.json @@ -2,9 +2,9 @@ "manifest_version": 2, "name": "uli", "description": "Moderate your Twitter Feed", - "version": "0.1.10", + "version": "0.1.12", "author": "tattlemade|cis", - "content_security_policy": "default-src 'none'; connect-src http://localhost:3000 https://ogbv-plugin.tattle.co.in/ https://uli-media.tattle.co.in/; font-src https://fonts.gstatic.com; object-src 'none'; script-src 'self' ; style-src https://fonts.googleapis.com 'self' 'unsafe-inline'; img-src https://uli-media.tattle.co.in/; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; report-uri 'none';", + "content_security_policy": "default-src 'none'; connect-src https://ogbv-plugin.tattle.co.in/ https://uli-media.tattle.co.in/; font-src https://fonts.gstatic.com; object-src 'none'; script-src 'self' ; style-src https://fonts.googleapis.com 'self' 'unsafe-inline'; img-src https://uli-media.tattle.co.in/; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; report-uri 'none';", "permissions": [ "storage", "webRequest", diff --git a/browser-extension/plugin/manifest.json b/browser-extension/plugin/manifest.json index e5f9bdb9..63fd04dd 100644 --- a/browser-extension/plugin/manifest.json +++ b/browser-extension/plugin/manifest.json @@ -2,10 +2,10 @@ "manifest_version": 3, "name": "uli", "description": "Moderate your Twitter Feed", - "version": "0.1.11", + "version": "0.1.12", "author": "tattlemade|cis", "content_security_policy": { - "extension_pages": "default-src 'none'; connect-src http://localhost:3000 https://ogbv-plugin.tattle.co.in/ https://uli-media.tattle.co.in/; font-src https://fonts.gstatic.com; object-src 'none'; script-src 'self'; style-src https://fonts.googleapis.com 'self' 'unsafe-inline'; img-src https://uli-media.tattle.co.in/; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; report-uri 'none';" + "extension_pages": "default-src 'none'; connect-src https://ogbv-plugin.tattle.co.in/ https://uli-media.tattle.co.in/; font-src https://fonts.gstatic.com; object-src 'none'; script-src 'self'; style-src https://fonts.googleapis.com 'self' 'unsafe-inline'; img-src https://uli-media.tattle.co.in/; base-uri 'none'; form-action 'none'; frame-ancestors 'none'; report-uri 'none';" }, "permissions": ["storage", "contextMenus"], "background": {