From 69120b674d4718dc439b6a7923c8a0df11182e7d Mon Sep 17 00:00:00 2001 From: "Stefan@AWG" Date: Fri, 9 Oct 2020 16:42:24 +0200 Subject: [PATCH 1/5] fix(core): make postmessaging in GndService more restrict --- .../core/services/gnd-service/gnd.service.ts | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/app/core/services/gnd-service/gnd.service.ts b/src/app/core/services/gnd-service/gnd.service.ts index 2dcdc46959..e2cf5a00f5 100644 --- a/src/app/core/services/gnd-service/gnd.service.ts +++ b/src/app/core/services/gnd-service/gnd.service.ts @@ -161,10 +161,27 @@ export class GndService extends StorageService { * @return {void} Sends the postMessage to the parent window. */ private exposeGndMessageToParent(value: string): void { - const parentTargets = [AppConfig.LOCALHOST_URL, AppConfig.INSERI_TEST_URL]; - - for (const target of parentTargets) { - window.parent.window.postMessage({ gnd: value }, target); + const localTarget = AppConfig.LOCALHOST_URL; + const nieTarget = AppConfig.INSERI_TEST_URL; + const parentTargets = [localTarget, nieTarget]; + const LOCAL_DOMAINS = ['localhost', '127.0.0.1', '']; + + if (window.location !== window.parent.location || window.self !== window.top) { + /* + * the page is running in an iFrame, + * posting will be only allowed to localhost (develop) or NIE-INE (production) + */ + for (const target of parentTargets) { + window.parent.window.postMessage({ gnd: value }, target); + } + } else { + /* + * the page is not running in an iFrame, + * posting will be only allowed from and to localhost + */ + if (LOCAL_DOMAINS.includes(window.location.hostname)) { + window.postMessage({ gnd: value }, localTarget); + } } } From ac428a28a475533893f40a20c7d3d95d0e09f9bf Mon Sep 17 00:00:00 2001 From: "Stefan@AWG" Date: Tue, 13 Oct 2020 13:51:33 +0200 Subject: [PATCH 2/5] ci(gh-actions): add CodeQl action --- .github/workflows/ci_tests.yml | 8 +-- .github/workflows/codeql-analysis.yml | 71 +++++++++++++++++++++++++++ .github/workflows/deployment.yml | 8 +-- 3 files changed, 81 insertions(+), 6 deletions(-) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index ebc50abcbd..841d532581 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -1,14 +1,16 @@ name: CI Tests on: - push: + workflow_run: + workflows: ['CodeQL'] branches: - '**' - - '!master' # do not run on master tags-ignore: - '*' paths-ignore: - - '**.md' # ignore changes to markdown files + - '**.md' + types: + - completed jobs: test: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 0000000000..77c50dc43a --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,71 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +name: 'CodeQL' + +on: + push: + branches: + - '**' + tags-ignore: + - '*' + paths-ignore: + - '**.md' # ignore changes to markdown files + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + + strategy: + fail-fast: false + matrix: + # Override automatic language detection by changing the below list + # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] + language: ['javascript'] + # Learn more... + # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection + + steps: + - name: Checkout repository + uses: actions/checkout@v2 + with: + # We must fetch at least the immediate parents so that if this is + # a pull request then we can checkout the head. + fetch-depth: 2 + + # If this run was triggered by a pull request event, then checkout + # the head of the pull request instead of the merge commit. + - run: git checkout HEAD^2 + if: ${{ github.event_name == 'pull_request' }} + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v1 + with: + languages: ${{ matrix.language }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + # queries: ./path/to/local/query, your-org/your-repo/queries@main + + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v1 + + # ℹ️ Command-line programs to run using the OS shell. + # 📚 https://git.io/JvXDl + + # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines + # and modify them (or add more) to build your code if your project + # uses a compiled language + + #- run: | + # make bootstrap + # make release + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v1 diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 52bc7c895d..59fcc33e34 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -1,9 +1,11 @@ name: Deployment on: - push: - branches: - - master # generally, only deploy if we are on 'master' + workflow_run: + workflows: ['CI Tests'] + branches: [master] # generally, only deploy on 'master' + types: + - completed jobs: build: From 88287465ab6573e9746d6564fdc57d55ae492f90 Mon Sep 17 00:00:00 2001 From: "Stefan@AWG" Date: Tue, 13 Oct 2020 14:03:26 +0200 Subject: [PATCH 3/5] ci(gh-actions): adjust CodeQL action --- .github/workflows/ci_tests.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index 841d532581..f2280a0fb7 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -5,10 +5,6 @@ on: workflows: ['CodeQL'] branches: - '**' - tags-ignore: - - '*' - paths-ignore: - - '**.md' types: - completed From 51dad76f6669145450caecdeaeaa1f459ad525a5 Mon Sep 17 00:00:00 2001 From: "Stefan@AWG" Date: Tue, 13 Oct 2020 15:26:53 +0200 Subject: [PATCH 4/5] ci(gh-actions): keep ignore commands in ci tests --- .github/workflows/ci_tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml index f2280a0fb7..4c2da5fc73 100644 --- a/.github/workflows/ci_tests.yml +++ b/.github/workflows/ci_tests.yml @@ -5,6 +5,10 @@ on: workflows: ['CodeQL'] branches: - '**' + tags-ignore: + - '*' + paths-ignore: + - '**.md' # ignore changes to markdown files types: - completed From dde4889cbd53236d80cde328d050f484beb63109 Mon Sep 17 00:00:00 2001 From: "Stefan@AWG" Date: Tue, 13 Oct 2020 15:32:01 +0200 Subject: [PATCH 5/5] chore(release): 0.7.8 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- src/app/app.globals.ts | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2bed077bcf..ac18dcf073 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [0.7.8](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.7...v0.7.8) (2020-10-13) + +### Bug Fixes + +- **core:** make postmessaging in GndService more restrict ([69120b6](https://github.com/webern-unibas-ch/awg-app/commit/69120b674d4718dc439b6a7923c8a0df11182e7d)) + ### [0.7.7](https://github.com/webern-unibas-ch/awg-app/compare/v0.7.6...v0.7.7) (2020-10-09) ### Bug Fixes diff --git a/package.json b/package.json index bafdac771a..4ca5fba15f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "awg-app", - "version": "0.7.7", + "version": "0.7.8", "license": "MIT", "author": { "name": "Stefan Münnich", diff --git a/src/app/app.globals.ts b/src/app/app.globals.ts index 2b997e7c06..735e4ab2e0 100644 --- a/src/app/app.globals.ts +++ b/src/app/app.globals.ts @@ -1,15 +1,15 @@ // THIS IS AN AUTO-GENERATED FILE. DO NOT CHANGE IT MANUALLY! -// Generated last time on Fri Oct 9 14:23:30 CEST 2020 +// Generated last time on Tue Oct 13 15:32:01 CEST 2020 /** * The latest version of the AWG App */ -export const appVersion = '0.7.7'; +export const appVersion = '0.7.8'; /** * The release date of the latest version of the AWG App */ -export const appVersionReleaseDate = '09. Oktober 2020'; +export const appVersionReleaseDate = '13. Oktober 2020'; /** * The URL of the AWG App