From ce3e35e2a37497d94cdd5bd93a51b5d7b5c4daeb Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 28 Apr 2022 20:37:46 -0400 Subject: [PATCH 1/5] Add codeql analysis to workflows --- .github/workflows/codeql-analysis.yml | 83 +++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 .github/workflows/codeql-analysis.yml diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml new file mode 100644 index 00000000..b90fcffc --- /dev/null +++ b/.github/workflows/codeql-analysis.yml @@ -0,0 +1,83 @@ +# 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: '37 21 * * 4' + +jobs: + analyze: + name: Analyze + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'go' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ] + # Learn more: + # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + - uses: technote-space/get-diff-action@v6.0.1 + with: + PATTERNS: | + **/**.sol + **/**.go + **/**.ts + **/**.js + go.mod + go.sum + + # 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 + queries: crypto-com/cosmos-sdk-codeql@main,security-and-quality + if: env.GIT_DIFF + # 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 + if: env.GIT_DIFF From f367f1ff39ed8dce47165ac86e11123db2985dc0 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 28 Apr 2022 20:40:19 -0400 Subject: [PATCH 2/5] Run on master branch --- .github/workflows/codeql-analysis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index b90fcffc..ad49a777 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ main ] + branches: [ master ] pull_request: # The branches below must be a subset of the branches above - branches: [ main ] + branches: [ master ] schedule: - cron: '37 21 * * 4' From a13f279a29d9d73988c9b862f4edff993e7faeff Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 28 Apr 2022 20:48:01 -0400 Subject: [PATCH 3/5] no autobuild for you --- .github/workflows/codeql-analysis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ad49a777..81aef928 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -64,8 +64,8 @@ jobs: # 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 + #- name: Autobuild + #uses: github/codeql-action/autobuild@v1 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -74,9 +74,8 @@ jobs: # and modify them (or add more) to build your code if your project # uses a compiled language - #- run: | - # make bootstrap - # make release + - run: | + make all - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 From c3132fde67c94e7fef7e00156a959343d2ff8658 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 28 Apr 2022 21:04:54 -0400 Subject: [PATCH 4/5] now with 1.18 --- .github/workflows/codeql-analysis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 81aef928..fcba9697 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -40,6 +40,9 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v3 + - uses: actions/setup-go@v2.1.4 + with: + go-version: '^1.18' - uses: technote-space/get-diff-action@v6.0.1 with: PATTERNS: | @@ -75,7 +78,10 @@ jobs: # uses a compiled language - run: | - make all + go mod tidy + go mod download + cd cmd/lumd + go build - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v1 From 21fa1d990567fcb2eaf7ca9a1519faed7c6e04e6 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Thu, 28 Apr 2022 21:23:51 -0400 Subject: [PATCH 5/5] attempting a change in keeper to trigger codeql --- x/beam/keeper/keeper.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x/beam/keeper/keeper.go b/x/beam/keeper/keeper.go index 4d99be2d..07e99afd 100644 --- a/x/beam/keeper/keeper.go +++ b/x/beam/keeper/keeper.go @@ -258,7 +258,7 @@ func (k Keeper) OpenBeam(ctx sdk.Context, msg types.MsgOpenBeam) error { beam.Amount = *msg.GetAmount() } - // If the payload includes a owner field, we auto claim it + // If the payload includes an owner field, we auto claim it if len(msg.GetClaimAddress()) > 0 { beam.ClaimAddress = msg.GetClaimAddress() beam.Claimed = true