From 03a081107f17b717bdc5ff8f559e3970c9a33139 Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Mon, 30 Dec 2024 11:58:56 -0500 Subject: [PATCH 1/5] chore: new repo templates --- .github/ISSUE_TEMPLATE.md | 39 ----------------------- .github/ISSUE_TEMPLATE/bug_report.md | 36 +++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 25 +++++++++++++++ 3 files changed, 61 insertions(+), 39 deletions(-) delete mode 100644 .github/ISSUE_TEMPLATE.md create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index e71410b..0000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,39 +0,0 @@ -## Issue - -### Description - -Please provide a detailed description of the issue or feature request. Include any relevant information, such as the context in which the issue occurs or the feature is needed. - -### Steps to Reproduce (for bug reports) - -1. Go to '...' -2. Click on '...' -3. Scroll down to '...' -4. See error - -### Expected Behavior - -A clear and concise description of what you expected to happen. - -### Screenshots - -If applicable, add screenshots to help explain your problem. - -### Environment - -- OS: [e.g., Windows, macOS, Linux] -- Burp Suite Version: [e.g., 2023.1] -- Jython Version: [e.g., 2.7.4] -- Other relevant environment details - -### Additional Context - -Add any other context about the problem here. - -### Feature Request - -If you are requesting a new feature, please describe the feature in detail and provide any relevant examples or use cases. - -### Contribution - -We welcome any forks and contributions, especially those that increase the number of supported "configs" through additional inference providers. Please ensure that your contributions follow the project's guidelines and include relevant tests and documentation. \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..6a532c1 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,36 @@ +--- +name: Bug Report +about: Create a report to help improve burpference +title: '[BUG] ' +labels: bug +assignees: '' +--- + +### Bug Description +A clear and concise description of the bug. + +### Steps to Reproduce +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +### Expected Behavior +A clear description of what you expected to happen. + +### Screenshots +If applicable, add screenshots to help explain your problem. + +### Environment +- OS: [e.g. Windows 10, macOS 12.0] +- Browser: [e.g. Chrome 96] +- Extension Version: [e.g. 1.0.0] +- URL being tested: [if applicable] + +### Additional Context +Add any other context about the problem here. + +### Console Output +``` +Paste any relevant console output here +``` \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 0000000..0300b49 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,25 @@ +--- +name: Feature Request +about: Suggest an idea for burpference +title: '[FEATURE] ' +labels: enhancement +assignees: '' +--- + +### Problem Description +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +### Proposed Solution +A clear and concise description of what you want to happen. + +### Alternative Solutions +A clear and concise description of any alternative solutions or features you've considered. + +### Use Case +Describe how this feature would be used and who would use it. + +### Additional Context +Add any other context, screenshots, or mock-ups about the feature request here. + +### Implementation Ideas +If you have any thoughts on how this could be implemented, share them here. \ No newline at end of file From b3cf84781763da8a59535eba37a443d718005198 Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:52:39 -0500 Subject: [PATCH 2/5] Revert "Revert "fix: yml shellchecks"" This reverts commit e377bbbf03262077a7161b0e719b3b045db1ce3e. --- .github/workflows/rigging_pr_description.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/rigging_pr_description.yml b/.github/workflows/rigging_pr_description.yml index 1fb881f..4ef920d 100644 --- a/.github/workflows/rigging_pr_description.yml +++ b/.github/workflows/rigging_pr_description.yml @@ -20,11 +20,11 @@ jobs: - name: Get Diff id: diff run: | - git fetch origin ${{ github.base_ref }} - MERGE_BASE=$(git merge-base HEAD origin/${{ github.base_ref }}) + git fetch origin "${{ github.base_ref }}" + MERGE_BASE=$(git merge-base HEAD "origin/${{ github.base_ref }}") # Encode the diff as base64 to preserve all characters - DIFF=$(git diff $MERGE_BASE..HEAD | base64 -w 0) - echo "diff=$DIFF" >> $GITHUB_OUTPUT + DIFF=$(git diff "$MERGE_BASE"..HEAD | base64 -w 0) + echo "diff=$DIFF" >> "$GITHUB_OUTPUT" - uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b #v5.0.3 with: python-version: "3.11" From 1b0dc57c163539d98d9032557554a097b0ff2b13 Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:53:04 -0500 Subject: [PATCH 3/5] Revert "Revert "fix: dup key in json ollama 32"" This reverts commit d19aef2245ab91b7835873e05c7512b4a5547ba6. --- configs/ollama_llama3.2_generate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/ollama_llama3.2_generate.json b/configs/ollama_llama3.2_generate.json index efcab5a..1202e45 100644 --- a/configs/ollama_llama3.2_generate.json +++ b/configs/ollama_llama3.2_generate.json @@ -1,7 +1,6 @@ { "api_type": "ollama", "format": "json", - "api_type": "ollama", "stream": false, "host": "http://localhost:11434/api/generate", "model": "llama3.2" From 8167a16622a9398f7f5d9d8af1b3cc10dd4992e2 Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Mon, 30 Dec 2024 12:56:53 -0500 Subject: [PATCH 4/5] chore: rm secrets from workflow commits --- .pre-commit-config.yaml | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 3bf7003..5291219 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -18,26 +18,6 @@ repos: - id: actionlint name: Check Github Actions - # Secrets detection - - repo: https://github.com/Yelp/detect-secrets - rev: 01886c8a910c64595c47f186ca1ffc0b77fa5458 #v1.5.0 - hooks: - - id: detect-secrets - name: Detect secrets - args: - - '--baseline' - - '.secrets.baseline' - - '--exclude-files' - - 'components/api/migrations/*' - - '--exclude-files' - - 'components/api/app/assets/*' - - '--exclude-files' - - '\.sops\.yaml$' - - '--exclude-files' - - 'secrets\.enc\.yaml$' - - '--exclude-files' - - 'components/strikes/*' - # Python linting - repo: https://github.com/astral-sh/ruff-pre-commit # Ruff version. @@ -64,4 +44,4 @@ repos: name: Check GitHub Actions for Pinned Dependencies entry: python .scripts/check_pinned_hash_dependencies.py language: python - files: \.github/.*\.yml$ \ No newline at end of file + files: \.github/.*\.yml$ From 8c3558e4afd047f5b3dee8f82c53203f476a54aa Mon Sep 17 00:00:00 2001 From: Ads Dawson <104169244+GangGreenTemperTatum@users.noreply.github.com> Date: Mon, 30 Dec 2024 13:00:56 -0500 Subject: [PATCH 5/5] fix: bandit syntax --- .pre-commit-config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 5291219..18c7b6f 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -34,8 +34,7 @@ repos: hooks: - id: bandit name: Code security checks - args: ["-c", "pyproject.toml"] - additional_dependencies: ["bandit[toml]"] + args: ["-r", "--level", "2", "./"] - repo: local hooks: