CI: Update Trivy DB #38397
Merged
CI: Update Trivy DB #38397
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
WalkthroughThe pull request modifies the Changes
Possibly related PRs
Suggested labels
Suggested reviewers
Poem
🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
Documentation and Community
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Comment on lines
+74
to
+82
| # Download Trivy DB if necessary | ||
| if [ ! -d "$HOME/.cache/trivy/db" ]; then | ||
| echo "Trivy DB not found. Downloading..." | ||
| TRIVY_TEMP_DIR=$(mktemp -d) | ||
| trivy --cache-dir $TRIVY_TEMP_DIR image --download-db-only | ||
| tar -cf ./db.tar.gz -C $TRIVY_TEMP_DIR/db metadata.json trivy.db | ||
| rm -rf $TRIVY_TEMP_DIR | ||
| fi | ||
|
|
Contributor
There was a problem hiding this comment.
🛠️ Refactor suggestion
Add error handling and space verification for database download.
The database download logic looks good, but could benefit from additional safeguards.
Apply this diff to add error handling and space checks:
# Download Trivy DB if necessary
if [ ! -d "$HOME/.cache/trivy/db" ]; then
echo "Trivy DB not found. Downloading..."
+ # Check for sufficient disk space (at least 500MB free)
+ free_space=$(df -m . | awk 'NR==2 {print $4}')
+ if [ "$free_space" -lt 500 ]; then
+ echo "Error: Insufficient disk space. Need at least 500MB free."
+ exit 1
+ fi
TRIVY_TEMP_DIR=$(mktemp -d)
- trivy --cache-dir $TRIVY_TEMP_DIR image --download-db-only
+ if ! trivy --cache-dir "$TRIVY_TEMP_DIR" image --download-db-only; then
+ echo "Error: Failed to download Trivy database"
+ rm -rf "$TRIVY_TEMP_DIR"
+ exit 1
+ fi
- tar -cf ./db.tar.gz -C $TRIVY_TEMP_DIR/db metadata.json trivy.db
+ if ! tar -cf ./db.tar.gz -C "$TRIVY_TEMP_DIR/db" metadata.json trivy.db; then
+ echo "Error: Failed to create database archive"
+ rm -rf "$TRIVY_TEMP_DIR"
+ exit 1
+ fi
rm -rf $TRIVY_TEMP_DIR
fi📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| # Download Trivy DB if necessary | |
| if [ ! -d "$HOME/.cache/trivy/db" ]; then | |
| echo "Trivy DB not found. Downloading..." | |
| TRIVY_TEMP_DIR=$(mktemp -d) | |
| trivy --cache-dir $TRIVY_TEMP_DIR image --download-db-only | |
| tar -cf ./db.tar.gz -C $TRIVY_TEMP_DIR/db metadata.json trivy.db | |
| rm -rf $TRIVY_TEMP_DIR | |
| fi | |
| # Download Trivy DB if necessary | |
| if [ ! -d "$HOME/.cache/trivy/db" ]; then | |
| echo "Trivy DB not found. Downloading..." | |
| # Check for sufficient disk space (at least 500MB free) | |
| free_space=$(df -m . | awk 'NR==2 {print $4}') | |
| if [ "$free_space" -lt 500 ]; then | |
| echo "Error: Insufficient disk space. Need at least 500MB free." | |
| exit 1 | |
| fi | |
| TRIVY_TEMP_DIR=$(mktemp -d) | |
| if ! trivy --cache-dir "$TRIVY_TEMP_DIR" image --download-db-only; then | |
| echo "Error: Failed to download Trivy database" | |
| rm -rf "$TRIVY_TEMP_DIR" | |
| exit 1 | |
| fi | |
| if ! tar -cf ./db.tar.gz -C "$TRIVY_TEMP_DIR/db" metadata.json trivy.db; then | |
| echo "Error: Failed to create database archive" | |
| rm -rf "$TRIVY_TEMP_DIR" | |
| exit 1 | |
| fi | |
| rm -rf $TRIVY_TEMP_DIR | |
| fi |
💡 Codebase verification
Database download logic needs error handling
The script has two issues that need attention:
- The database download command lacks error handling, which could lead to silent failures
- The downloaded database isn't used as the scan explicitly uses ECR repositories
Suggested fixes:
- Add error handling to the download:
trivy --cache-dir $TRIVY_TEMP_DIR image --download-db-only || { echo "Error: DB download failed"; exit 1; } - Remove the DB download block since the scan uses remote repositories anyway
🔗 Analysis chain
Verify database usage in vulnerability scanning.
The downloaded database should be properly utilized by the subsequent Trivy scan command.
Run this script to verify database usage:
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Verify that the Trivy scan command uses the downloaded database.
# Check if the scan command references any custom database paths
rg --type sh 'trivy\s+.*(?:--cache-dir|--db-repository)' .
# Check for any Trivy configuration files that might override database settings
fd -t f -e yaml -e yml trivy
Length of output: 430
Script:
#!/bin/bash
# Let's verify the complete database handling logic in the script
# Check the full context of database usage
rg -A 10 -B 5 'trivy.*--cache-dir' scripts/trivy_vulnerabilities_data.sh
# Check if there's any error handling for the database download
rg 'trivy.*download-db-only.*(\|\||&&|;)' scripts/trivy_vulnerabilities_data.sh
# Check if the downloaded database is actually used in the scan
rg -A 5 'trivy image.*--db-repository' scripts/trivy_vulnerabilities_data.sh
Length of output: 1180
sagar-qa007
requested review from
NandanAnantharamu and
yatinappsmith
and removed request for
NandanAnantharamu and
yatinappsmith
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Update trivy db download failure.
Fixes # https://app.zenhub.com/workspaces/stability-pod-6690c4814e31602e25cab7fd/issues/gh/appsmithorg/appsmith/38398
Tested: https://github.com/appsmithorg/appsmith/actions/runs/12543112349
Automation
/ok-to-test tags=""
🔍 Cypress test results
Caution
If you modify the content in this section, you are likely to disrupt the CI result for your PR.
Communication
Should the DevRel and Marketing teams inform users about this change?
Summary by CodeRabbit
New Features
Chores