Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for SAST (CodeQL) workflow #1668

Merged
merged 32 commits into from
Dec 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8daceb1
Merge pull request #1299 from Devils-Knight/fix-dependabot
ashishkurmi Oct 21, 2022
7105c41
remediate files & packages
Devils-Knight Oct 25, 2022
b99b655
mod tidy
Devils-Knight Oct 26, 2022
f6256ca
add version comment to pinned actions
Devils-Knight Nov 4, 2022
ffdfe27
Merge pull request #1374 from Devils-Knight/comment
varunsh-coder Nov 7, 2022
088800b
Merge branch 'int' into pr/1352
varunsh-coder Nov 7, 2022
3da1738
Merge pull request #1352 from Devils-Knight/remediation
varunsh-coder Nov 7, 2022
7bcb807
Update harden runner version
varunsh-coder Nov 9, 2022
cc5afdc
Merge pull request #1379 from step-security/update-harden-harden-int
varunsh-coder Nov 9, 2022
b994863
[UPDATE] Pin actions to vx.y.z format (#1469)
Devils-Knight Nov 19, 2022
e9482c1
Update test command
varunsh-coder Nov 21, 2022
361b35a
Merge pull request #1476 from step-security/update-workflow-test-cmd
varunsh-coder Nov 21, 2022
8e7b11c
Update test cases
varunsh-coder Nov 21, 2022
4672343
Merge pull request #1477 from step-security/update-tests
varunsh-coder Nov 21, 2022
c096e5f
Merge branch 'main' into int
varunsh-coder Nov 21, 2022
9c234e9
update pinning remediation
Devils-Knight Nov 30, 2022
a84a433
Return secret metadata
varunsh-coder Dec 1, 2022
787f313
Merge pull request #1597 from step-security/return-secret-metadata
varunsh-coder Dec 1, 2022
9372c3f
Update secrets.go
varunsh-coder Dec 1, 2022
ea1fb43
Merge pull request #1598 from step-security/return-secret-metadata
varunsh-coder Dec 1, 2022
7906268
Merge pull request #1582 from Devils-Knight/pinIssue
varunsh-coder Dec 5, 2022
0e48ac5
configuring dependabot to use INT for upggrading dependencies
ashishkurmi Dec 7, 2022
e7de507
Merge pull request #1618 from step-security/ak-dependabot-int
ashishkurmi Dec 7, 2022
b57f3f7
Merge branch 'main' into int
varunsh-coder Dec 8, 2022
086252d
Merge branch 'main' into int
varunsh-coder Dec 8, 2022
582a89d
[FEATURE] Added Template and addWorkflow function to generate Codeql …
Devils-Knight Dec 10, 2022
ee52f8f
fixed typo
Devils-Knight Dec 10, 2022
ad10892
Merge pull request #1643 from Devils-Knight/issue
varunsh-coder Dec 12, 2022
23233ec
Update addworkflow.go
varunsh-coder Dec 14, 2022
14cc00f
Merge pull request #1657 from step-security/update-workflow-env
varunsh-coder Dec 14, 2022
1c68758
Update template
varunsh-coder Dec 17, 2022
8fe562e
Merge pull request #1667 from step-security/fix-template
varunsh-coder Dec 17, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions remediation/workflow/addworkflow.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
package workflow

import (
"fmt"
"io/ioutil"
"os"
"path"
"sort"
"strings"
)

const CodeQLWorkflowFileName = "codeql.yml"

type WorkflowParameters struct {
LanguagesToAdd []string
DefaultBranch string
}

func getTemplate(file string) (string, error) {
templatePath := os.Getenv("WORKFLOW_TEMPLATES")

if templatePath == "" {
templatePath = "../../workflow-templates"
}

template, err := ioutil.ReadFile(path.Join(templatePath, file))
if err != nil {
return "", err
}

return string(template), nil
}

func AddWorkflow(name string, workflowParameters WorkflowParameters) (string, error) {
if name == "codeql" {
codeqlWorkflow, err := getTemplate(CodeQLWorkflowFileName)
if err != nil {
return "", err
}

sort.Strings(workflowParameters.LanguagesToAdd)
codeqlWorkflow = strings.ReplaceAll(codeqlWorkflow, "$default-branch", fmt.Sprintf(`"%s"`, workflowParameters.DefaultBranch))
codeqlWorkflow = strings.ReplaceAll(codeqlWorkflow, "$detected-codeql-languages", strings.Join(workflowParameters.LanguagesToAdd, ", "))
codeqlWorkflow = strings.ReplaceAll(codeqlWorkflow, "$cron-weekly", fmt.Sprintf(`"%s"`, "0 0 * * 1")) // Note: Runs every monday at 12:00 AM

return codeqlWorkflow, nil
} else {
return "", fmt.Errorf("match for %s Workflow name not found", name)
}
}
54 changes: 54 additions & 0 deletions remediation/workflow/addworkflow_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package workflow

import (
"io/ioutil"
"reflect"
"testing"
)

func Test_AddWorkflow(t *testing.T) {
tests := []struct {
workflowName string
workflowParameters WorkflowParameters
expectedError bool
expectedOutputFile string
}{
{
workflowName: "codeql",
workflowParameters: WorkflowParameters{
LanguagesToAdd: []string{"cpp", "go", "java"},
DefaultBranch: "main",
},
expectedError: false,
expectedOutputFile: "../../testfiles/expected-codeql.yml",
},
{
workflowName: "xyz",
workflowParameters: WorkflowParameters{
LanguagesToAdd: []string{"cpp"},
DefaultBranch: "main",
},
expectedError: true,
expectedOutputFile: "",
},
}

for _, test := range tests {
output, err := AddWorkflow(test.workflowName, test.workflowParameters)
if err != nil {
if !test.expectedError {
t.Errorf("Error adding Workflow: %v", err)
}
continue
}
expectedOutput, err := ioutil.ReadFile(test.expectedOutputFile)
if err != nil {
t.Errorf("Error in reading file: %v", err)
}

if !reflect.DeepEqual(output, string(expectedOutput)) {
t.Errorf("test failed %s did not match expected output\n%s", test.workflowName, output)
}
}

}
76 changes: 76 additions & 0 deletions testfiles/expected-codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# 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: "0 0 * * 1"

permissions: # added using https://github.com/step-security/secure-workflows
contents: read

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

strategy:
fail-fast: false
matrix:
language: [cpp, go, java]
# CodeQL supports [ $supported-codeql-languages ]
# 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}}"
76 changes: 76 additions & 0 deletions workflow-templates/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# 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: [$default-branch]
pull_request:
# The branches below must be a subset of the branches above
branches: [$default-branch]
schedule:
- cron: $cron-weekly

permissions: # added using https://github.com/step-security/secure-workflows
contents: read

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

strategy:
fail-fast: false
matrix:
language: [$detected-codeql-languages]
# CodeQL supports [ $supported-codeql-languages ]
# 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}}"