mirror of
https://github.com/elicpeter/nyx.git
synced 2026-06-21 20:18:06 +02:00
[pitboss/grind] deferred session-0002 (20260521T201327Z-3848)
This commit is contained in:
parent
159a779f31
commit
d99361cff6
18 changed files with 499 additions and 144 deletions
|
|
@ -1,7 +1,15 @@
|
|||
//! Phase 21 (Track M.3) — Rack / Rails middleware adapter (Ruby).
|
||||
//!
|
||||
//! Fires when the surrounding source defines a Rack-shaped middleware
|
||||
//! (`def call(env)`) or registers a Rails before-action callback.
|
||||
//! (`def call(env)`) or wires one into the Rails middleware stack.
|
||||
//!
|
||||
//! Notably does NOT fire for Rails controller actions even when the file
|
||||
//! contains `before_action :name` / `after_action :name` callback
|
||||
//! registrations — those are class-level controller DSL hooks, not Rack
|
||||
//! middleware definitions. Older `before_action ` / `after_action ` /
|
||||
//! `around_action ` source needles were dropped because every typical
|
||||
//! Rails controller mentions them, which made the adapter bind every
|
||||
//! controller action as middleware (Phase 21 binding-stealing audit).
|
||||
|
||||
use crate::dynamic::framework::{FrameworkAdapter, FrameworkBinding};
|
||||
use crate::evidence::EntryKind;
|
||||
|
|
@ -14,28 +22,39 @@ const ADAPTER_NAME: &str = "middleware-rails";
|
|||
|
||||
fn callee_is_rails_middleware(name: &str) -> bool {
|
||||
let last = name.rsplit_once('.').map(|(_, s)| s).unwrap_or(name);
|
||||
matches!(
|
||||
last,
|
||||
"call" | "before_action" | "around_action" | "after_action" | "use"
|
||||
)
|
||||
matches!(last, "call" | "use")
|
||||
}
|
||||
|
||||
fn source_imports_rails_middleware(file_bytes: &[u8]) -> bool {
|
||||
fn source_has_rack_middleware_shape(file_bytes: &[u8]) -> bool {
|
||||
const NEEDLES: &[&[u8]] = &[
|
||||
b"def call(env)",
|
||||
b"def call (env",
|
||||
b"before_action ",
|
||||
b"after_action ",
|
||||
b"around_action ",
|
||||
b"Rails.application.config.middleware",
|
||||
b"Rack::Builder",
|
||||
b"@app = app",
|
||||
];
|
||||
NEEDLES
|
||||
.iter()
|
||||
.any(|n| file_bytes.windows(n.len()).any(|w| w == *n))
|
||||
}
|
||||
|
||||
fn looks_like_rails_controller(file_bytes: &[u8]) -> bool {
|
||||
const NEEDLES: &[&[u8]] = &[
|
||||
b"< ApplicationController",
|
||||
b"<ApplicationController",
|
||||
b"< ActionController::Base",
|
||||
b"<ActionController::Base",
|
||||
b"< ActionController::API",
|
||||
b"<ActionController::API",
|
||||
];
|
||||
NEEDLES
|
||||
.iter()
|
||||
.any(|n| file_bytes.windows(n.len()).any(|w| w == *n))
|
||||
}
|
||||
|
||||
fn name_is_rack_entry(name: &str) -> bool {
|
||||
name == "call"
|
||||
}
|
||||
|
||||
impl FrameworkAdapter for MiddlewareRailsAdapter {
|
||||
fn name(&self) -> &'static str {
|
||||
ADAPTER_NAME
|
||||
|
|
@ -51,22 +70,27 @@ impl FrameworkAdapter for MiddlewareRailsAdapter {
|
|||
_ast: tree_sitter::Node<'_>,
|
||||
file_bytes: &[u8],
|
||||
) -> Option<FrameworkBinding> {
|
||||
let matches_call = super::any_callee_matches(summary, callee_is_rails_middleware);
|
||||
let matches_source = source_imports_rails_middleware(file_bytes);
|
||||
if matches_call || matches_source {
|
||||
Some(FrameworkBinding {
|
||||
adapter: ADAPTER_NAME.to_owned(),
|
||||
kind: EntryKind::Middleware {
|
||||
name: summary.name.clone(),
|
||||
},
|
||||
route: None,
|
||||
request_params: Vec::new(),
|
||||
response_writer: None,
|
||||
middleware: Vec::new(),
|
||||
})
|
||||
} else {
|
||||
None
|
||||
if looks_like_rails_controller(file_bytes) {
|
||||
return None;
|
||||
}
|
||||
let has_middleware_shape = source_has_rack_middleware_shape(file_bytes);
|
||||
let name_matches = name_is_rack_entry(&summary.name);
|
||||
let body_mounts_middleware =
|
||||
super::any_callee_matches(summary, callee_is_rails_middleware);
|
||||
let binds = (name_matches && has_middleware_shape) || body_mounts_middleware;
|
||||
if !binds {
|
||||
return None;
|
||||
}
|
||||
Some(FrameworkBinding {
|
||||
adapter: ADAPTER_NAME.to_owned(),
|
||||
kind: EntryKind::Middleware {
|
||||
name: summary.name.clone(),
|
||||
},
|
||||
route: None,
|
||||
request_params: Vec::new(),
|
||||
response_writer: None,
|
||||
middleware: Vec::new(),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -95,4 +119,20 @@ mod tests {
|
|||
assert_eq!(binding.adapter, "middleware-rails");
|
||||
assert!(matches!(binding.kind, EntryKind::Middleware { .. }));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn does_not_bind_rails_controller_action() {
|
||||
let src: &[u8] = b"class UsersController < ApplicationController\n before_action :authenticate\n def index\n @users = User.all\n render :index\n end\nend\n";
|
||||
let tree = parse_ruby(src);
|
||||
let summary = FuncSummary {
|
||||
name: "index".into(),
|
||||
..Default::default()
|
||||
};
|
||||
assert!(
|
||||
MiddlewareRailsAdapter
|
||||
.detect(&summary, tree.root_node(), src)
|
||||
.is_none(),
|
||||
"controller action must not bind as Rack middleware",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue