Skip to content

Commit 8db4591

Browse files
committed
CI fixes
1 parent 57b2a69 commit 8db4591

5 files changed

Lines changed: 10 additions & 23 deletions

File tree

.github/workflows/tests.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,6 @@ jobs:
7979
chmod +x scripts/debug_tls_env.sh
8080
./scripts/debug_tls_env.sh
8181
sudo ./scripts/debug_tls_env.sh
82-
echo ""
83-
echo "=== Testing Certificate Generation ==="
84-
chmod +x scripts/debug_cert_generation.sh
85-
./scripts/debug_cert_generation.sh || true
86-
echo "=== End Debug ==="
8782
8883
- name: Run Linux jail integration tests (with sudo)
8984
run: |

src/jail/linux/mod.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,12 @@ pub struct LinuxJail {
6868

6969
impl LinuxJail {
7070
pub fn new(config: JailConfig) -> Result<Self> {
71-
// Use jail_id from config instead of generating our own
71+
// Use jail_id from config for naming
72+
// Note: Linux network interface names are limited to 15 characters
7273
let namespace_name = format!("httpjail_{}", config.jail_id);
73-
let veth_host = format!("veth_h_{}", config.jail_id);
74-
let veth_ns = format!("veth_n_{}", config.jail_id);
74+
// Shorten to fit within 15 char limit: "vh_" + jail_id (max 10 chars)
75+
let veth_host = format!("vh_{}", config.jail_id);
76+
let veth_ns = format!("vn_{}", config.jail_id);
7577

7678
Ok(Self {
7779
config,

src/jail/managed.rs

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -219,21 +219,6 @@ impl<J: Jail> ManagedJail<J> {
219219

220220
Ok(Self { jail, lifecycle })
221221
}
222-
223-
/// Get a reference to the inner jail
224-
pub fn inner(&self) -> &J {
225-
&self.jail
226-
}
227-
228-
/// Get a mutable reference to the inner jail
229-
pub fn inner_mut(&mut self) -> &mut J {
230-
&mut self.jail
231-
}
232-
233-
/// Consume the managed jail and return the inner jail
234-
pub fn into_inner(self) -> J {
235-
self.jail
236-
}
237222
}
238223

239224
impl<J: Jail> Jail for ManagedJail<J> {

src/jail/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ pub mod managed;
88
static JAIL_ID_COUNTER: AtomicU32 = AtomicU32::new(0);
99

1010
/// Trait for platform-specific jail implementations
11+
#[allow(dead_code)]
1112
pub trait Jail: Send + Sync {
1213
/// Setup jail for a specific session
1314
fn setup(&mut self, proxy_port: u16) -> Result<()>;

tests/system_integration.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,8 @@ pub fn test_concurrent_jail_isolation<P: JailTestPlatform>() {
464464

465465
// Start first httpjail instance - allows only ifconfig.me
466466
let child1 = std::process::Command::new(&httpjail_path)
467+
.arg("-v")
468+
.arg("-v") // Add verbose logging to fix timing issues
467469
.arg("-r")
468470
.arg("allow: ifconfig\\.me")
469471
.arg("-r")
@@ -482,6 +484,8 @@ pub fn test_concurrent_jail_isolation<P: JailTestPlatform>() {
482484

483485
// Start second httpjail instance - allows only ifconfig.io
484486
let output2 = std::process::Command::new(&httpjail_path)
487+
.arg("-v")
488+
.arg("-v") // Add verbose logging to fix timing issues
485489
.arg("-r")
486490
.arg("allow: ifconfig\\.io")
487491
.arg("-r")

0 commit comments

Comments
 (0)