Skip to content

Commit

Permalink
Create codeql-analysis.yml (#330)
Browse files Browse the repository at this point in the history
* Create codeql-analysis.yml

* Fix "Incomplete URL scheme check"

* Add more sepcific githubraw url check

* Fix other githubraw checks

* Patch getInvalidCSS func.

Co-authored-by: Isaac Maier <padspambox@gmail.com>
  • Loading branch information
CharlieS1103 and theRealPadster authored Sep 26, 2022
1 parent c926776 commit fcc7ee6
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 7 deletions.
74 changes: 74 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
# 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.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ "main" ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "main" ]
schedule:
- cron: '17 23 * * 2'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
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.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality


# 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@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
category: "/language:${{matrix.language}}"
5 changes: 3 additions & 2 deletions packages/marketplace/src/extensions/extension.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { RepoType } from "../types/marketplace-types";
import {
getLocalStorageDataFromKey,
resetMarketplace,
isGithubRawUrl,
getParamsFromGithubRaw,
initializeSnippets,
injectColourScheme,
Expand Down Expand Up @@ -55,7 +56,7 @@ import {
script.src = extensionManifest.extensionURL;

// If it's a github raw script, use jsdelivr
if (script.src.indexOf("raw.githubusercontent.com") > -1) {
if (isGithubRawUrl(script.src)) {
const { user, repo, branch, filePath } = getParamsFromGithubRaw(extensionManifest.extensionURL);
if (!user || !repo || !branch || !filePath) return;
script.src = `https://cdn.jsdelivr.net/gh/${user}/${repo}@${branch}/${filePath}`;
Expand Down Expand Up @@ -110,7 +111,7 @@ import {
let src = script;

// If it's a github raw script, use jsdelivr
if (script.indexOf("raw.githubusercontent.com") > -1) {
if (isGithubRawUrl(script)) {
const { user, repo, branch, filePath } = getParamsFromGithubRaw(script);
src = `https://cdn.jsdelivr.net/gh/${user}/${repo}@${branch}/${filePath}`;
}
Expand Down
22 changes: 17 additions & 5 deletions packages/marketplace/src/logic/Utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,7 @@ export const processAuthors = (authors: Author[], user: string) => {
if (authors && authors.length > 0) {
parsedAuthors = authors.map((author) => ({
name: author.name,
url: author.url.startsWith("javascript:")
? ""
: author.url,
url: sanitizeUrl(author.url),
}));
} else {
parsedAuthors.push({
Expand Down Expand Up @@ -298,7 +296,7 @@ export const initColorShiftLoop = (schemes: SchemeIni) => {
export const parseCSS = async (themeData: CardItem) => {
if (!themeData.cssURL) throw new Error("No CSS URL provided");

const userCssUrl = themeData.cssURL.indexOf("raw.githubusercontent.com") > -1
const userCssUrl = isGithubRawUrl(themeData.cssURL)
// TODO: this should probably be the URL stored in localstorage actually (i.e. put this url in localstorage)
? `https://cdn.jsdelivr.net/gh/${themeData.user}/${themeData.repo}@${themeData.branch}/${themeData.manifest.usercss}`
: themeData.cssURL;
Expand Down Expand Up @@ -328,6 +326,13 @@ export const parseCSS = async (themeData: CardItem) => {
return css;
};

export const isGithubRawUrl = (url: string) => {
const parsedUrl = new URL(url);
parsedUrl.host;

return (parsedUrl.host === "raw.githubusercontent.com");
};

/**
* Get user, repo, and branch from a GitHub raw URL
* @param url Github Raw URL
Expand Down Expand Up @@ -367,7 +372,7 @@ export function getInvalidCSS(): string[] {
const invalidCssClassName: string[] = [];
for (const match of matches) {
// Check if match is the same class name as an html element
const className = match[0].replace("{", "").trim();
const className = match[0].replace(/{/g, "").trim();
const classesArr = className.split(" ");
let element;
for (let i = 0; i < classesArr.length; i++) {
Expand Down Expand Up @@ -433,3 +438,10 @@ export function generateKey(props: CardProps) {

return `marketplace:installed:${prefix}${cardId}`;
}

export const sanitizeUrl = (url: string) => {
const u = decodeURI(url).trim().toLowerCase();
if (u.startsWith("javascript:") || u.startsWith("data:") || u.startsWith("vbscript:"))
return "about:blank";
return url;
};

0 comments on commit fcc7ee6

Please sign in to comment.