Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions crates/yaffle-engine/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,6 +44,11 @@ use crate::local_first::{

const CANONICAL_YAFFLE_MODULE_HOST: &str = "yaffle.dev";
const MODULE_API_HOST_OVERRIDE_ENV_VAR: &str = "YAFFLE_MODULE_API_HOST";
const YAFFLE_CLI_USER_AGENT: &str = concat!("yaffle-cli/", env!("CARGO_PKG_VERSION"));

fn cli_http_client_builder() -> reqwest::blocking::ClientBuilder {
Client::builder().user_agent(YAFFLE_CLI_USER_AGENT)
}

pub use crate::local_first::{
build_cloud_cli_authorize_url, check_lifecycle_admission, clear_local_cloud_auth,
Expand DownExpand Up@@ -4185,7 +4190,7 @@ fn dispatch_lifecycle_webhook(
return Ok(());
}

let client = Client::builder()
let client = cli_http_client_builder()
.timeout(Duration::from_secs(30))
.build()
.map_err(|error| request_error(request, "webhook_dispatch_failed", error.to_string()))?;
Expand DownExpand Up@@ -4537,7 +4542,7 @@ fn parse_duration_hint(value: &str) -> Result<Duration, EngineError> {
}

fn report_lifecycle_failure(callback_url: &str, reason: String) -> Result<(), LocalFirstError> {
Client::builder()
cli_http_client_builder()
.timeout(Duration::from_secs(10))
.build()
.map_err(|error| LocalFirstError::Http(error.to_string()))?
Expand Down
14 changes: 13 additions & 1 deletion crates/yaffle-engine/src/local_first.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,7 +1138,7 @@ impl LocalFirstRuntime {

fn build() -> Result<Self, LocalFirstError> {
let base_url = module_api_base_url()?;
let mut client_builder = Client::builder()
let mut client_builder = crate::cli_http_client_builder()
.connect_timeout(Duration::from_secs(5))
.timeout(Duration::from_secs(30))
.redirect(Policy::none());
Expand DownExpand Up@@ -1502,6 +1502,10 @@ mod tests {
let mut buffer = [0_u8; 8192];
let bytes_read = stream.read(&mut buffer).expect("request should read");
let request = String::from_utf8_lossy(&buffer[..bytes_read]);
assert_eq!(
request_header_value(&request, "user-agent"),
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);

if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
assert!(!request.contains("feature-token:"));
Expand DownExpand Up@@ -1556,6 +1560,14 @@ mod tests {
}
}

fn request_header_value<'a>(request: &'a str, expected_name: &str) -> Option<&'a str> {
request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case(expected_name)
.then_some(value.trim())
})
}

fn write_response(stream: &mut std::net::TcpStream, body: &str) {
let response = format!(
"HTTP/1.1 201 Created\r\nContent-Type: application/json\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{}",
Expand Down
161 changes: 147 additions & 14 deletions crates/yaffle-engine/tests/fixture-repos.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -845,6 +845,8 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand DownExpand Up@@ -881,10 +883,11 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone());
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), true);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let converge = execute(
&EngineRequest {
Expand All@@ -899,14 +902,6 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
)
.expect("converge should succeed with activation webhook");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");

assert_eq!(converge.result.kind, OperationResultKind::Succeeded);
assert!(converge
.result
Expand DownExpand Up@@ -943,6 +938,89 @@ fn converge_activation_webhook_fixture_dispatches_and_settles_activation() {
assert_eq!(conditions.get("verification_settled"), Some(&true));
assert_eq!(conditions.get("usable"), Some(&true));
assert_eq!(conditions.get("acceptable"), Some(&true));

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
fn converge_reports_failed_lifecycle_dispatch_with_cli_user_agent() {
let _guard = WAIT_ENV_LOCK
.lock()
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
.local_addr()
.expect("backend listener should have address");
let hook_listener = TcpListener::bind("127.0.0.1:0").expect("hook listener should bind");
let hook_addr = hook_listener
.local_addr()
.expect("hook listener should have address");

let config_path = repo.path().join("yaffle.toml");
let config = fs::read_to_string(&config_path).expect("fixture config should read");
fs::write(
&config_path,
config.replace(
"http://127.0.0.1:9999/hooks/preview-ready",
&format!("http://{hook_addr}/hooks/preview-ready"),
),
)
.expect("fixture config should rewrite hook url");

let lifecycle_state = Arc::new(StdMutex::new(FakeLifecycleState::default()));
let backend_stop = Arc::new(AtomicBool::new(false));
let hook_stop = Arc::new(AtomicBool::new(false));
let backend_thread = spawn_fake_lifecycle_backend(
backend_listener,
backend_addr,
lifecycle_state.clone(),
backend_stop.clone(),
true,
);
let hook_thread = spawn_activation_receiver(hook_listener, hook_stop.clone(), false);

let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
operation: EngineOperation::Converge,
target: Some(EnvironmentTarget {
environment: "main".to_string(),
}),
selection: WorkspaceSelection::default(),
wait_for: None,
},
repo.path(),
)
.expect_err("converge should report the rejected lifecycle hook");

assert_eq!(error.error.code, "webhook_dispatch_failed");
assert_eq!(
lifecycle_state
.lock()
.expect("state lock should work")
.activation_state,
"failed"
);

backend_stop.store(true, Ordering::SeqCst);
hook_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
wake_listener(hook_addr);
backend_thread.join().expect("backend thread should finish");
hook_thread.join().expect("hook thread should finish");
}

#[test]
Expand All@@ -952,6 +1030,8 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
.unwrap_or_else(|error| error.into_inner());
let repo = copy_fixture_repo("converge-activation-webhook");
write_fixture_git_remote(repo.path());
let test_home = repo.path().join("test-home");
fs::create_dir_all(&test_home).expect("test home should exist");

let backend_listener = TcpListener::bind("127.0.0.1:0").expect("backend listener should bind");
let backend_addr = backend_listener
Expand All@@ -967,8 +1047,9 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
false,
);

let previous_module_api_host = env::var_os("YAFFLE_MODULE_API_HOST");
env::set_var("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));
let _home_guard = ScopedEnvVar::set("HOME", &test_home);
let _module_api_guard =
ScopedEnvVar::set("YAFFLE_MODULE_API_HOST", format!("http://{backend_addr}"));

let error = execute(
&EngineRequest {
Expand All@@ -983,7 +1064,6 @@ fn converge_blocks_before_infra_when_environment_governance_requires_cloud() {
)
.expect_err("converge should be blocked by environment governance");

restore_env_var("YAFFLE_MODULE_API_HOST", previous_module_api_host);
backend_stop.store(true, Ordering::SeqCst);
wake_listener(backend_addr);
backend_thread.join().expect("backend thread should finish");
Expand DownExpand Up@@ -1031,6 +1111,12 @@ fn spawn_fake_lifecycle_backend(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
if !request.starts_with("POST /api/lifecycle/completions/") {
assert_cli_user_agent(&request);
}
if request.starts_with("POST /api/sessions/anonymous HTTP/1.1") {
write_http_json(
&mut stream,
Expand DownExpand Up@@ -1132,6 +1218,9 @@ fn spawn_fake_lifecycle_backend(
let body = extract_http_body(&request);
let payload: serde_json::Value =
serde_json::from_str(&body).expect("callback payload should parse");
if payload["status"] == "failed" {
assert_cli_user_agent(&request);
}
let mut state = lifecycle_state.lock().expect("state lock should work");
let is_activation = request.contains("token-1");
if is_activation {
Expand DownExpand Up@@ -1242,6 +1331,7 @@ fn spawn_fake_lifecycle_backend(
fn spawn_activation_receiver(
listener: TcpListener,
stop: Arc<AtomicBool>,
should_accept: bool,
) -> thread::JoinHandle<()> {
thread::spawn(move || {
listener
Expand All@@ -1256,6 +1346,18 @@ fn spawn_activation_receiver(
match listener.accept() {
Ok((mut stream, _)) => {
let request = read_http_request(&mut stream);
if request.is_empty() {
continue;
}
assert_cli_user_agent(&request);
if !should_accept {
write_http_json(
&mut stream,
500,
json!({ "error": "hook rejected for test" }),
);
continue;
}
if request.starts_with("POST /hooks/preview-ready HTTP/1.1") {
let body = extract_http_body(&request);
let payload: serde_json::Value =
Expand DownExpand Up@@ -1364,6 +1466,37 @@ fn restore_env_var(name: &str, previous: Option<std::ffi::OsString>) {
}
}

struct ScopedEnvVar {
name: &'static str,
previous: Option<std::ffi::OsString>,
}

impl ScopedEnvVar {
fn set(name: &'static str, value: impl AsRef<std::ffi::OsStr>) -> Self {
let previous = env::var_os(name);
env::set_var(name, value);
Self { name, previous }
}
}

impl Drop for ScopedEnvVar {
fn drop(&mut self) {
restore_env_var(self.name, self.previous.take());
}
}

fn assert_cli_user_agent(request: &str) {
let user_agent = request.lines().find_map(|line| {
let (name, value) = line.split_once(':')?;
name.eq_ignore_ascii_case("user-agent")
.then_some(value.trim())
});
assert_eq!(
user_agent,
Some(concat!("yaffle-cli/", env!("CARGO_PKG_VERSION")))
);
}

fn wake_listener(address: std::net::SocketAddr) {
let _ = std::net::TcpStream::connect(address);
}
Expand Down
Loading