Skip to content

Commit 93b8bda

Browse files
Merge branch 'main' into adding_example_diesel_r2d2
2 parents bd8b96f + 2dc4f96 commit 93b8bda

File tree

5 files changed

+40
-23
lines changed

5 files changed

+40
-23
lines changed

.github/workflows/checks.yml

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,28 +22,39 @@ jobs:
2222
toolchain: stable
2323
- name: Install cargo audit
2424
run: cargo install cargo-audit
25-
26-
# Ignoring RUSTSEC-2023-0071 as it only occurs in a dependency used in an example
27-
# and is not exploitable in the context of this project.
28-
#
29-
# Crate: rsa
30-
# Version: 0.9.6
31-
# Title: Marvin Attack: potential key recovery through timing sidechannels
32-
# Date: 2023-11-22
33-
# ID: RUSTSEC-2023-0071
34-
# URL: https://rustsec.org/advisories/RUSTSEC-2023-0071
35-
# Severity: 5.9 (medium)
36-
# Solution: No fixed upgrade is available!
25+
# Crate: sqlx
26+
# Version: 0.8.0
27+
# Title: Binary Protocol Misinterpretation caused by Truncating or Overflowing Casts
28+
# error: 1 vulnerability found!
29+
# Date: 2024-08-15
30+
# ID: RUSTSEC-2024-0363
31+
# URL: https://rustsec.org/advisories/RUSTSEC-2024-0363
32+
# Solution: Upgrade to >=0.8.1
3733
# Dependency tree:
38-
# rsa 0.9.6
39-
# └── sqlx-mysql 0.7.3
40-
# ├── sqlx-macros-core 0.7.3
41-
# │ └── sqlx-macros 0.7.3
42-
# │ └── sqlx 0.7.3
43-
# │ └── sqlx_embedded 0.4.1
44-
# └── sqlx 0.7.3
34+
# sqlx 0.8.0
35+
# ├── tensor_chord_extension 0.16.1
36+
# ├── sqlx_embedded 0.16.1
37+
# ├── postgresql_embedded 0.16.1
38+
# │ ├── zonky 0.16.1
39+
# │ ├── tensor_chord_extension 0.16.1
40+
# │ ├── sqlx_embedded 0.16.1
41+
# │ ├── postgresql_extensions 0.16.1
42+
# │ │ ├── tensor_chord_extension 0.16.1
43+
# │ │ ├── portal_corp_extension 0.16.1
44+
# │ │ ├── download_progress_bar 0.16.1
45+
# │ │ └── axum_embedded 0.16.1
46+
# │ ├── postgres_embedded 0.16.1
47+
# │ ├── portal_corp_extension 0.16.1
48+
# │ ├── embedded_sync 0.16.1
49+
# │ ├── embedded_async 0.16.1
50+
# │ ├── download_progress_bar 0.16.1
51+
# │ └── axum_embedded 0.16.1
52+
# ├── portal_corp_extension 0.16.1
53+
# ├── pgvector 0.4.0
54+
# │ └── portal_corp_extension 0.16.1
55+
# └── axum_embedded 0.16.1
4556
- name: Audit dependencies
46-
run: cargo audit --ignore RUSTSEC-2023-0071
57+
run: cargo audit --ignore RUSTSEC-2024-0363
4758

4859
check:
4960
runs-on: ubuntu-22.04

deny.toml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,16 @@ allow = [
2121
"BSL-1.0",
2222
"ISC",
2323
"MIT",
24-
"OpenSSL",
2524
"PostgreSQL",
2625
"Unicode-DFS-2016",
2726
]
2827

28+
# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html
29+
[advisories]
30+
ignore = [
31+
"RUSTSEC-2024-0363",
32+
]
33+
2934
# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html
3035
[bans]
3136
multiple-versions = "deny"

postgresql_embedded/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ At runtime, the PostgreSQL binaries are cached by default in the following direc
8888
- Unix: `$HOME/.theseus/postgresql`
8989
- Windows: `%USERPROFILE%\.theseus\postgresql`
9090

91-
Performance can be improved by Using a specific version of the PostgreSQL binaries (e.g. `=16.4.0`).
91+
Performance can be improved by using a specific version of the PostgreSQL binaries (e.g. `=16.4.0`).
9292
After the first download, the PostgreSQL binaries will be cached and reused for subsequent runs.
9393
Further, the repository will no longer be queried to calculate the version match.
9494

postgresql_embedded/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
//! - Unix: `$HOME/.theseus/postgresql`
7676
//! - Windows: `%USERPROFILE%\.theseus\postgresql`
7777
//!
78-
//! Performance can be improved by Using a specific version of the PostgreSQL binaries (e.g. `=16.4.0`).
78+
//! Performance can be improved by using a specific version of the PostgreSQL binaries (e.g. `=16.4.0`).
7979
//! After the first download, the PostgreSQL binaries will be cached and reused for subsequent runs.
8080
//! Further, the repository will no longer be queried to calculate the version match.
8181
//!

postgresql_embedded/src/settings.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ impl Settings {
135135
/// # Errors
136136
///
137137
/// Returns an error if the URL is invalid.
138+
#[allow(irrefutable_let_patterns)]
138139
pub fn from_url<S: AsRef<str>>(url: S) -> Result<Self> {
139140
let parsed_url = match Url::parse(url.as_ref()) {
140141
Ok(parsed_url) => parsed_url,

0 commit comments

Comments
 (0)