Skip to content

Commit 6d36f25

Browse files
committed
fix(e2e): use valid endpoint isolation fixtures
Signed-off-by: John Myers <[email protected]>
1 parent 30b8736 commit 6d36f25

3 files changed

Lines changed: 133 additions & 29 deletions

File tree

‎e2e/rust/tests/host_gateway_alias.rs‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use std::sync::Mutex;
99

1010
use openshell_e2e::harness::binary::openshell_cmd;
1111
use openshell_e2e::harness::sandbox::SandboxGuard;
12-
use tempfile::NamedTempFile;
12+
use tempfile::{Builder as TempFileBuilder, NamedTempFile};
1313
use tokio::io::AsyncReadExt;
1414
use tokio::io::AsyncWriteExt;
1515
use tokio::net::TcpListener;
@@ -157,7 +157,10 @@ fn write_binding_profile(
157157
host: &str,
158158
port: u16,
159159
) -> Result<NamedTempFile, String> {
160-
let mut file = NamedTempFile::new().map_err(|e| format!("create provider profile: {e}"))?;
160+
let mut file = TempFileBuilder::new()
161+
.suffix(".yaml")
162+
.tempfile()
163+
.map_err(|e| format!("create provider profile: {e}"))?;
161164
let profile = format!(
162165
r#"id: {id}
163166
display_name: {display_name}
@@ -208,13 +211,13 @@ network_policies:
208211
endpoints:
209212
- host: host.openshell.internal
210213
port: {port}
211-
allowed_ips: ["10.0.0.0/8", "172.0.0.0/8", "192.168.0.0/16", "fc00::/7"]
214+
path: /allowed/**
212215
protocol: rest
213216
access: full
214217
enforcement: enforce
215218
- host: host.docker.internal
216219
port: {port}
217-
allowed_ips: ["10.0.0.0/8", "172.0.0.0/8", "192.168.0.0/16", "fc00::/7"]
220+
path: /allowed/**
218221
protocol: rest
219222
access: full
220223
enforcement: enforce
@@ -447,25 +450,25 @@ async fn static_provider_credentials_are_bound_to_profile_endpoints() {
447450
.await
448451
.expect("run endpoint-binding requests");
449452

453+
let logs = wait_for_sandbox_logs(&guard.name, |logs| {
454+
logs.contains("openshell.provider_credential.endpoint_mismatch")
455+
&& logs.contains("credential_endpoint_mismatch")
456+
})
457+
.await
458+
.expect("fetch endpoint mismatch logs");
450459
assert!(
451460
guard
452461
.create_output
453462
.contains(r#"ALLOWED={"authorized":true}"#),
454-
"credential should resolve at the bound endpoint:\n{}",
455-
guard.create_output
463+
"credential should resolve at the bound endpoint:\n{}\nlogs:\n{logs}",
464+
guard.create_output,
456465
);
457466
assert!(
458467
guard.create_output.contains("DENIED=403"),
459468
"same placeholder must be denied at an unbound host:\n{}",
460469
guard.create_output
461470
);
462471

463-
let logs = wait_for_sandbox_logs(&guard.name, |logs| {
464-
logs.contains("openshell.provider_credential.endpoint_mismatch")
465-
&& logs.contains("credential_endpoint_mismatch")
466-
})
467-
.await
468-
.expect("fetch endpoint mismatch logs");
469472
assert!(
470473
logs.contains("openshell.provider_credential.endpoint_mismatch")
471474
&& logs.contains("credential_endpoint_mismatch"),

‎e2e/rust/tests/proxy_egress_pipeline.rs‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@ use std::sync::{
2424
use openshell_e2e::harness::binary::openshell_cmd;
2525
use openshell_e2e::harness::sandbox::SandboxGuard;
2626
use serde_json::Value;
27-
use tempfile::NamedTempFile;
27+
use tempfile::{Builder as TempFileBuilder, NamedTempFile};
2828
use tokio::io::{AsyncReadExt, AsyncWriteExt};
2929
use tokio::net::{TcpListener, TcpStream};
3030
use tokio::task::JoinHandle;
3131

3232
const TEST_SERVER_HOST: &str = "host.openshell.internal";
3333
const PROVIDER_NAME: &str = "e2e-proxy-egress-credentials";
34+
const PROVIDER_PROFILE_ID: &str = "e2e-proxy-egress-credentials";
3435
const TOKEN_ENV: &str = "PROXY_E2E_TOKEN";
3536
const TEST_SECRET: &str = "sk-e2e-proxy-egress-secret";
3637
const PLACEHOLDER_PREFIX: &str = "openshell:resolve:env:";
@@ -102,21 +103,67 @@ async fn delete_provider(name: &str) {
102103
let _ = cmd.status().await;
103104
}
104105

105-
async fn create_generic_provider(name: &str) -> Result<String, String> {
106+
async fn delete_provider_profile(id: &str) {
107+
let mut cmd = openshell_cmd();
108+
cmd.args(["provider", "profile", "delete", id])
109+
.stdout(Stdio::null())
110+
.stderr(Stdio::null());
111+
let _ = cmd.status().await;
112+
}
113+
114+
async fn create_bound_provider(name: &str) -> Result<String, String> {
106115
let credential = format!("{TOKEN_ENV}={TEST_SECRET}");
107116
run_cli(&[
108117
"provider",
109118
"create",
110119
"--name",
111120
name,
112121
"--type",
113-
"generic",
122+
PROVIDER_PROFILE_ID,
114123
"--credential",
115124
&credential,
116125
])
117126
.await
118127
}
119128

129+
fn write_credential_profile(port: u16) -> Result<NamedTempFile, String> {
130+
let mut file = TempFileBuilder::new()
131+
.suffix(".yaml")
132+
.tempfile()
133+
.map_err(|error| format!("create provider profile: {error}"))?;
134+
let profile = format!(
135+
r#"id: {PROVIDER_PROFILE_ID}
136+
display_name: E2E proxy egress credentials
137+
category: other
138+
credentials:
139+
- name: proxy_e2e_token
140+
env_vars: [{TOKEN_ENV}]
141+
required: true
142+
auth_style: bearer
143+
header_name: authorization
144+
endpoints:
145+
- host: {TEST_SERVER_HOST}
146+
port: {port}
147+
path: /probe
148+
protocol: rest
149+
access: full
150+
enforcement: enforce
151+
request_body_credential_rewrite: true
152+
allowed_ips:
153+
- "10.0.0.0/8"
154+
- "172.0.0.0/8"
155+
- "192.168.0.0/16"
156+
- "fc00::/7"
157+
binaries: ["/**"]
158+
"#
159+
);
160+
file.write_all(profile.as_bytes())
161+
.map_err(|error| format!("write provider profile: {error}"))?;
162+
file.flush()
163+
.map_err(|error| format!("flush provider profile: {error}"))?;
164+
Ok(file)
165+
}
166+
120167
fn write_policy_document(
121168
host: &str,
122169
port: u16,
@@ -1615,19 +1662,19 @@ async fn http_credentials_are_rewritten_in_headers_and_bodies_for_both_adapters(
16151662
.lock()
16161663
.unwrap_or_else(std::sync::PoisonError::into_inner);
16171664
delete_provider(PROVIDER_NAME).await;
1618-
create_generic_provider(PROVIDER_NAME)
1619-
.await
1620-
.expect("create generic provider");
1665+
delete_provider_profile(PROVIDER_PROFILE_ID).await;
16211666

16221667
let result = async {
16231668
let server = CredentialProbeServer::start().await?;
1624-
let endpoint_options = r#" protocol: rest
1669+
let profile = write_credential_profile(server.port)?;
1670+
let profile_path = profile.path().to_string_lossy().into_owned();
1671+
run_cli(&["provider", "profile", "import", "--file", &profile_path]).await?;
1672+
create_bound_provider(PROVIDER_NAME).await?;
1673+
let endpoint_options = r#" path: /probe
1674+
protocol: rest
16251675
enforcement: enforce
16261676
request_body_credential_rewrite: true
1627-
rules:
1628-
- allow:
1629-
method: POST
1630-
path: "/probe""#;
1677+
access: full"#;
16311678
let policy = write_policy(TEST_SERVER_HOST, server.port, endpoint_options)?;
16321679
let policy_path = policy_path(&policy);
16331680
let script = format!(
@@ -1721,6 +1768,7 @@ print(json.dumps({{"connect": connect, "forward": forward}}, sort_keys=True))
17211768
.await;
17221769

17231770
delete_provider(PROVIDER_NAME).await;
1771+
delete_provider_profile(PROVIDER_PROFILE_ID).await;
17241772

17251773
let guard = result.expect("sandbox create");
17261774
let result = parse_json_line(&guard.create_output);

‎e2e/rust/tests/websocket_conformance.rs‎

Lines changed: 59 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,14 @@ use base64::Engine as _;
1919
use openshell_e2e::harness::binary::openshell_cmd;
2020
use openshell_e2e::harness::sandbox::SandboxGuard;
2121
use sha1::{Digest, Sha1};
22-
use tempfile::NamedTempFile;
22+
use tempfile::{Builder as TempFileBuilder, NamedTempFile};
2323
use tokio::io::{AsyncReadExt, AsyncWriteExt};
2424
use tokio::net::{TcpListener, TcpStream};
2525
use tokio::task::JoinHandle;
2626

2727
const WEBSOCKET_GUID: &str = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
2828
const PROVIDER_NAME: &str = "e2e-websocket-conformance";
29+
const PROVIDER_PROFILE_ID: &str = "e2e-websocket-conformance";
2930
const TEST_SERVER_HOST: &str = "host.openshell.internal";
3031
const TEST_SECRET: &str = "sk-e2e-websocket-conformance-secret";
3132
const TOKEN_ENV: &str = "WS_E2E_TOKEN";
@@ -66,21 +67,70 @@ async fn delete_provider(name: &str) {
6667
let _ = cmd.status().await;
6768
}
6869

69-
async fn create_generic_provider(name: &str) -> Result<String, String> {
70+
async fn delete_provider_profile(id: &str) {
71+
let mut cmd = openshell_cmd();
72+
cmd.args(["provider", "profile", "delete", id])
73+
.stdout(Stdio::null())
74+
.stderr(Stdio::null());
75+
let _ = cmd.status().await;
76+
}
77+
78+
async fn create_bound_provider(name: &str) -> Result<String, String> {
7079
let credential = format!("{TOKEN_ENV}={TEST_SECRET}");
7180
run_cli(&[
7281
"provider",
7382
"create",
7483
"--name",
7584
name,
7685
"--type",
77-
"generic",
86+
PROVIDER_PROFILE_ID,
7887
"--credential",
7988
&credential,
8089
])
8190
.await
8291
}
8392

93+
fn write_credential_profile(port: u16) -> Result<NamedTempFile, String> {
94+
let mut file = TempFileBuilder::new()
95+
.suffix(".yaml")
96+
.tempfile()
97+
.map_err(|error| format!("create provider profile: {error}"))?;
98+
let profile = format!(
99+
r#"id: {PROVIDER_PROFILE_ID}
100+
display_name: E2E WebSocket conformance credentials
101+
category: other
102+
credentials:
103+
- name: websocket_token
104+
env_vars: [{TOKEN_ENV}]
105+
required: true
106+
auth_style: bearer
107+
header_name: authorization
108+
endpoints:
109+
- host: {TEST_SERVER_HOST}
110+
port: {port}
111+
path: /ws
112+
protocol: websocket
113+
enforcement: enforce
114+
access: read-write
115+
websocket_credential_rewrite: true
116+
allowed_ips:
117+
- "10.0.0.0/8"
118+
- "172.0.0.0/8"
119+
- "192.168.0.0/16"
120+
- "fc00::/7"
121+
binaries:
122+
- path: /usr/bin/python*
123+
- path: /usr/local/bin/python*
124+
- path: /sandbox/.uv/python/*/bin/python*
125+
"#
126+
);
127+
file.write_all(profile.as_bytes())
128+
.map_err(|error| format!("write provider profile: {error}"))?;
129+
file.flush()
130+
.map_err(|error| format!("flush provider profile: {error}"))?;
131+
Ok(file)
132+
}
133+
84134
struct WebSocketProbeServer {
85135
port: u16,
86136
task: JoinHandle<()>,
@@ -435,12 +485,14 @@ async fn websocket_text_placeholder_is_rewritten_through_both_adapters() {
435485
.unwrap_or_else(std::sync::PoisonError::into_inner);
436486

437487
delete_provider(PROVIDER_NAME).await;
438-
create_generic_provider(PROVIDER_NAME)
439-
.await
440-
.expect("create generic provider");
488+
delete_provider_profile(PROVIDER_PROFILE_ID).await;
441489

442490
let result = async {
443491
let server = WebSocketProbeServer::start().await?;
492+
let profile = write_credential_profile(server.port)?;
493+
let profile_path = profile.path().to_string_lossy().into_owned();
494+
run_cli(&["provider", "profile", "import", "--file", &profile_path]).await?;
495+
create_bound_provider(PROVIDER_NAME).await?;
444496
let policy = write_websocket_policy(TEST_SERVER_HOST, server.port)?;
445497
let policy_path = policy
446498
.path()
@@ -464,6 +516,7 @@ async fn websocket_text_placeholder_is_rewritten_through_both_adapters() {
464516
.await;
465517

466518
delete_provider(PROVIDER_NAME).await;
519+
delete_provider_profile(PROVIDER_PROFILE_ID).await;
467520

468521
let guard = result.expect("sandbox create");
469522
assert!(

0 commit comments

Comments
 (0)