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

Update jinja2 from 3.0.2 to 3.1.3 #7107

Merged
merged 6 commits into from
Jan 23, 2024
Merged

Conversation

zenmonkeykstop
Copy link
Contributor

@zenmonkeykstop zenmonkeykstop commented Jan 18, 2024

Status

RfR

Description of Changes

  • Prod dependency: updates jinja2 from 3.0.2 to 3.1.3 in response to GHSA-h5c8-rqwp-cp95
  • dev dependency: updates semgrep in dev deps to latest (1.57.0)
  • dev dependency: updates pillow from 10.0.1 to 10.2.0
  • pins CI semgrep version at 1.56.0 temporarily to work around CI-only bug
  • adds ignore for safety alert 62817 - prompt-toolkit

Testing

  • CI is passing
  • in prod deps, only jinja2 dependency is updated

Deployment

n/a - will be released with next scheduled version

Checklist

If you added or updated a reference to a production code dependency:

Choose one of the following:

  • I have performed a diff review and pasted the contents to the packaging wiki
  • I would like someone else to do the diff review
  • I am silencing an alert related to a production dependency, because (please explain below):

@zenmonkeykstop zenmonkeykstop requested a review from a team as a code owner January 18, 2024 23:52
@zenmonkeykstop zenmonkeykstop marked this pull request as draft January 18, 2024 23:53
@zenmonkeykstop zenmonkeykstop force-pushed the safety-jinja2-update branch 6 times, most recently from f691b81 to 67aedfe Compare January 19, 2024 22:48
@zenmonkeykstop zenmonkeykstop marked this pull request as ready for review January 22, 2024 21:27
@cfm cfm self-assigned this Jan 23, 2024
Copy link
Member

@cfm cfm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left one documentation nit for your consideration, @zenmonkeykstop. Revise or merge at your discretion!

@@ -271,7 +271,7 @@ jobs:
command: |
fromtag=$(docker images |grep securedrop-test-focal-py3 |head -n1 |awk '{print $2}')
DOCKER_BUILD_ARGUMENTS="--cache-from securedrop-test-focal-py3:${fromtag:-latest}" securedrop/bin/dev-shell \
bash -c "pip3 install -U -q --upgrade pip && pip3 install -U -q --upgrade semgrep && make -C .. semgrep"
bash -c "pip3 install -U -q --upgrade pip && pip3 install -U -q semgrep==1.56.0 && make -C .. semgrep"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
bash -c "pip3 install -U -q --upgrade pip && pip3 install -U -q semgrep==1.56.0 && make -C .. semgrep"
bash -c "pip3 install -U -q --upgrade pip && pip3 install -U -q semgrep==1.56.0 && make -C .. semgrep" # semgrep==1.56.0 pending semgrep/semgrep#9630

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO it's fine as is, let's skip an extra CI run. I will bear the burden of remembering to test the next semgrep release and slip an update into the next appropriate PR.

@zenmonkeykstop zenmonkeykstop merged commit 1e4644e into develop Jan 23, 2024
17 checks passed
cfm added a commit to freedomofpress/securedrop-builder that referenced this pull request Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants