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

Bandit Scan as part of PR and precommit workflow #1275

Merged
merged 28 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
89da9c1
Create bandit.yml
nambi21 Jan 8, 2025
5086a46
Update bandit.yml for env
nambi21 Jan 8, 2025
f72c598
Added Json report Env
nambi21 Jan 8, 2025
dcce58b
Merge branch 'securefederatedai:develop' into develop
nambi21 Jan 12, 2025
7db66e0
Update bandit.yml
nambi21 Jan 12, 2025
36d747f
Update bandit.yml
nambi21 Jan 12, 2025
0dee2be
Update bandit.yml
nambi21 Jan 12, 2025
5c9b1cb
Update bandit.yml
nambi21 Jan 12, 2025
91fd049
Update bandit.yml
nambi21 Jan 12, 2025
ac9f270
Update bandit.yml
nambi21 Jan 12, 2025
a68cba0
Update bandit.yml
nambi21 Jan 12, 2025
613ff78
Update bandit.yml
nambi21 Jan 12, 2025
5412498
Update bandit.yml
nambi21 Jan 12, 2025
6151a37
Update bandit.yml
nambi21 Jan 12, 2025
ba57e06
Final test update bandit.yml
nambi21 Jan 12, 2025
cd1ec49
Update bandit.yml
nambi21 Jan 12, 2025
4c714c6
testing bandit scan config file
nambi21 Jan 15, 2025
cdd7bd1
Revert to succesful bandit scan
nambi21 Jan 15, 2025
ba7c8c7
Final tweaks for bandit scan
nambi21 Jan 15, 2025
912ad5f
Changes for enabling Bandit scan in precommit
nambi21 Jan 16, 2025
e7bb074
Include all files to be in precommit
nambi21 Jan 16, 2025
498ab92
Merge branch 'develop' into develop
nambi21 Jan 16, 2025
0627b75
Merge branch 'develop' into develop
nambi21 Jan 16, 2025
bff0367
Merge branch 'develop' into develop
nambi21 Jan 16, 2025
a7dd50c
Changes as per PR review
nambi21 Jan 16, 2025
dfe2a22
Merge branch 'develop' of https://github.com/nambi21/openfl into develop
nambi21 Jan 16, 2025
36297a3
Merge branch 'develop' into develop
pasokan-intel Jan 16, 2025
8410064
testing changes to exclude bandit in linter
nambi21 Jan 16, 2025
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
51 changes: 51 additions & 0 deletions .github/workflows/bandit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Bandit Code Scan

on:
push:
branches:
- develop
- v1.7.x
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
bandit_scan:
if: github.event.pull_request.draft == false
permissions:
contents: read # for actions/checkout to fetch code
security-events: write # for github/codeql-action/upload-sarif to upload SARIF results
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
name: Bandit Scan
runs-on: ubuntu-22.04
timeout-minutes: 15
steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Set Filename Suffix Report Date and Time
run: |
echo "REPORT_DATE=$(date +'%d-%b-%Y_%H-%M-%S')" >> $GITHUB_ENV

- name: Define SARIF Report Path
run: echo "SARIF_REPORT_PATH=${{ github.workspace }}/results.sarif" >> $GITHUB_ENV

- name: Perform Bandit Analysis
uses: PyCQA/bandit-action@v1
with:
configfile: 'DEFAULT'
profile: 'DEFAULT'
tests: 'DEFAULT'
skips: 'DEFAULT'
severity: 'DEFAULT'
confidence: 'DEFAULT'
exclude: '.svn,CVS,.bzr,.hg,.git,__pycache__,.tox,.eggs,*.egg'
baseline: 'DEFAULT'
ini: 'DEFAULT'
targets: '.'

- name: Upload Bandit SARIF Report as Artifact
if: always()
uses: actions/upload-artifact@v4
with:
name: "bandit-report-summary_${{ env.REPORT_DATE }}"
path: ${{ env.SARIF_REPORT_PATH }}
8 changes: 7 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@ repos:
- --in-place
- --remove-unused-variables
- --recursive
- --ignore-pass-statements
- --ignore-pass-statements
- repo: https://github.com/PyCQA/bandit
rev: 1.7.4
hooks:
- id: bandit
args: ["-c", "pre_commit.toml"]
additional_dependencies: ["bandit[toml]"]
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ OpenFL supports popular aggregation algorithms out-of-the-box, with more algorit
| FedProx | [Li et al., 2020](https://arxiv.org/pdf/1812.06127.pdf) | yes | yes | - |
| FedCurv | [Shoham et al., 2019](https://arxiv.org/pdf/1910.07796.pdf) | yes | - | - |

### Enabling Bandit Precommit
To ensure that precommit is setup in your local for Bandit Scan. For more details, kindly follow this doc: [Setup Guide - Precommit](precommit-doc.md)

## Contributing
We welcome contributions! Please refer to the [contributing guidelines](https://openfl.readthedocs.io/en/latest/contributing.html).

Expand Down
7 changes: 7 additions & 0 deletions pre_commit.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[tool.bandit]
# Exclude specific directories or files from the scan
# exclude = ["tests/", "docs/"]

# Set the severity and confidence levels
severity = "HIGH"
confidence = "HIGH"
66 changes: 66 additions & 0 deletions precommit-doc.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
## Pre-commit with Bandit

To ensure code quality and security, we use [pre-commit](https://pre-commit.com/) with [Bandit](https://bandit.readthedocs.io/en/latest/) to automatically scan for security issues before commits.

Follow the steps below to set up and use pre-commit in your local development environment.

### Setup

1. **Clone the repository**:

```sh
git clone https://github.com/intel-innersource/frameworks.ai.openfl.openfl-security.git
cd frameworks.ai.openfl.openfl-security
```

2. **Run the setup script**:

We have provided a `precommit-setup.sh` script to simplify the installation process. This script will install pre-commit and set up the pre-commit hooks.

```sh
./precommit-setup.sh
```

The `setup.sh` script performs the following actions:
- Check for prerequisties in local: (python, pip)
- Installs pre-commit if it is not already installed.
- Installs the pre-commit hooks defined in the .pre-commit-config.yaml file.

3. **Verify the installation**:

After running the setup script, you can verify that pre-commit is installed and the hooks are set up correctly by running:

```sh
pre-commit --version
pre-commit install
```

### Usage

Once the pre-commit hooks are installed, Bandit scans will automatically run before each commit. If any issues are found, the commit will be aborted, and you will need to fix the issues before committing again.

1. **Make changes to your code**:

Edit your files as needed.

2. **Stage your changes**:

```sh
git add <file>
```

3. **Commit your changes**:

```sh
git commit -m "Your commit message"
```

During the commit process, pre-commit will automatically run the Bandit scan. If the scan is successful, the commit will proceed. If any issues are found, the commit will be aborted, and you will need to address the issues before committing again.

### How to bypass precommit hooks?

To exclude the bandit pre-commit hook when making a Git commit, you can use the --no-verify option. This bypasses any pre-commit hooks that are set up in your repository.

```sh
git commit --no-verify -m "Your commit message"
```
87 changes: 87 additions & 0 deletions precommit-setup.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#!/bin/bash

# Function to add the installation path to PATH
add_to_path() {
if [[ ":$PATH:" != *":$1:"* ]]; then
export PATH="$PATH:$1"
echo "Added $1 to PATH"
else
echo "$1 is already in PATH"
fi
}

# Function to check if Python and pip are installed
check_python_and_pip() {
if ! command -v python3 &> /dev/null; then
echo "Python3 is not installed. Please install Python3 and try again."
exit 1
fi

if ! command -v pip &> /dev/null; then
echo "pip is not installed. Please install pip and try again."
exit 1
fi
}

# Function to install pre-commit
install_precommit() {
if ! command -v pre-commit &> /dev/null; then
echo "pre-commit not found, installing..."
pip install --user pre-commit
else
echo "pre-commit is already installed"
fi
}

# Check if Python and pip are installed
check_python_and_pip

# Detect the operating system
OS="$(uname -s)"
case "$OS" in
Linux*)
echo "Detected Linux"
INSTALL_PATH="$HOME/.local/bin"
install_precommit
add_to_path "$INSTALL_PATH"
;;
Darwin*)
echo "Detected MacOS"
INSTALL_PATH="$HOME/.local/bin"
install_precommit
add_to_path "$INSTALL_PATH"
;;
CYGWIN*|MINGW32*|MSYS*|MINGW*)
echo "Detected Windows"
INSTALL_PATH="$HOME/AppData/Local/Packages/PythonSoftwareFoundation.Python.3.12_qbz5n2kfra8p0/LocalCache/local-packages/Python312/Scripts"
install_precommit
add_to_path "$INSTALL_PATH"
;;
*)
echo "Unknown OS"
exit 1
;;
esac

# Add the installation path to the shell profile for persistence
if [[ "$OS" == "Linux" || "$OS" == "Darwin" ]]; then
SHELL_PROFILE="$HOME/.bashrc"
if [[ -f "$HOME/.zshrc" ]]; then
SHELL_PROFILE="$HOME/.zshrc"
fi
echo "export PATH=\$PATH:$INSTALL_PATH" >> "$SHELL_PROFILE"
source "$SHELL_PROFILE"
elif [[ "$OS" == "CYGWIN"* || "$OS" == "MINGW"* || "$OS" == "MSYS"* ]]; then
SHELL_PROFILE="$HOME/.bash_profile"
echo "export PATH=\$PATH:$INSTALL_PATH" >> "$SHELL_PROFILE"
source "$SHELL_PROFILE"
fi

# Verify the installation
if command -v pre-commit &> /dev/null; then
echo "pre-commit installation successful"
pre-commit --version
else
echo "pre-commit installation failed"
exit 1
fi
2 changes: 1 addition & 1 deletion scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -Eeuo pipefail
base_dir=$(dirname $(dirname $0))

# Run the pre-commit checks
pre-commit run --all-files
SKIP=bandit pre-commit run --all-files

ruff check --config "${base_dir}/pyproject.toml" openfl/

Expand Down
Loading