From 6c6ac0787aa72031302a7027b955dd134781f561 Mon Sep 17 00:00:00 2001 From: Timur Akhmadiev <42980811+Sugar-pack@users.noreply.github.com> Date: Mon, 27 Feb 2023 10:55:08 +0400 Subject: [PATCH 1/3] Create codeql.yml --- .github/workflows/codeql.yml | 74 ++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 00000000..03280484 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -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: [ "master"] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "master" ] + +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', 'ruby' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # 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#, Go, 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}}" From 931c78e81e83e4e472b54c649ff25b7db3bbcfcf Mon Sep 17 00:00:00 2001 From: Timur_Akhmadiev Date: Mon, 1 May 2023 10:44:52 +0400 Subject: [PATCH 2/3] change password length requirements remove unused code --- config.json | 2 +- internal/utils/password_generator.go | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/config.json b/config.json index ab1fd9c6..00cedc55 100644 --- a/config.json +++ b/config.json @@ -16,7 +16,7 @@ "isSendRequired": false }, "password": { - "length": 8, + "length": 12, "resetExpirationMinutes": 15 }, "orderStatusOverdueTimeCheckDuration": "4h", diff --git a/internal/utils/password_generator.go b/internal/utils/password_generator.go index 0cf23b71..2a0bd7a4 100644 --- a/internal/utils/password_generator.go +++ b/internal/utils/password_generator.go @@ -2,15 +2,12 @@ package utils import ( "crypto/rand" - "fmt" "math/big" "git.epam.com/epm-lstr/epm-lstr-lc/be/pkg/domain" ) const ( - MinPasswordLen = 8 - MaxPasswordLen = 32 AllowedRandomResetPasswordSymbols = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789" ) @@ -19,12 +16,6 @@ type passwordGenerator struct { } func NewPasswordGenerator(length int) (domain.PasswordGenerator, error) { - if length < MinPasswordLen { - return nil, fmt.Errorf("password length must be at least %d", MinPasswordLen) - } - if length > MaxPasswordLen { - return nil, fmt.Errorf("password length must be at most %d", MaxPasswordLen) - } return &passwordGenerator{length: length}, nil } From 190ea2343daa07b08ed9e5eed3ab846b2de32138 Mon Sep 17 00:00:00 2001 From: Timur_Akhmadiev Date: Mon, 1 May 2023 10:51:44 +0400 Subject: [PATCH 3/3] remove tests --- internal/utils/password_generator_test.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/internal/utils/password_generator_test.go b/internal/utils/password_generator_test.go index 33537cfc..4e7116f4 100644 --- a/internal/utils/password_generator_test.go +++ b/internal/utils/password_generator_test.go @@ -6,18 +6,6 @@ import ( "github.com/stretchr/testify/assert" ) -func TestNewPasswordGenerator_PasswordLengthTooLow(t *testing.T) { - generator, err := NewPasswordGenerator(1) - assert.Error(t, err) - assert.Nil(t, generator) -} - -func TestNewPasswordGenerator_PasswordLengthTooBig(t *testing.T) { - generator, err := NewPasswordGenerator(33) - assert.Error(t, err) - assert.Nil(t, generator) -} - func TestNewPasswordGenerator_OK(t *testing.T) { generator, err := NewPasswordGenerator(10) assert.NoError(t, err)