Skip to content

add url encode/decode to header index and contains #2049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
garypen wants to merge 2 commits into from
Closed

add url encode/decode to header index and contains #2049

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f820349
add url encode/decode to header index and contains
Nov 4, 2022
95cf0ef
Merge branch 'dev' into garypen/rhai-header-urlencode
Nov 4, 2022
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
22 changes: 15 additions & 7 deletions apollo-router/src/plugins/rhai.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,8 @@ impl Rhai {
.register_iterator::<HeaderMap>()
// Register a contains function for HeaderMap so that "in" works
.register_fn("contains", |x: &mut HeaderMap, key: &str| -> bool {
match HeaderName::from_str(key) {
let k = urlencoding::encode(key);
match HeaderName::from_str(&*k) {
Ok(hn) => x.contains_key(hn),
Err(_e) => false,
}
Expand All @@ -1078,21 +1079,28 @@ impl Rhai {
|_: &mut SharedMut<execution::DeferredResponse>| -> bool { false },
)
// Register a HeaderMap indexer so we can get/set headers
// urlencode/decode header key/values
.register_indexer_get(
|x: &mut HeaderMap, key: &str| -> Result<String, Box<EvalAltResult>> {
let k = urlencoding::encode(key);
let search_name =
HeaderName::from_str(key).map_err(|e: InvalidHeaderName| e.to_string())?;
Ok(x.get(search_name)
HeaderName::from_str(&*k).map_err(|e: InvalidHeaderName| e.to_string())?;
let v = x
.get(search_name)
.ok_or("")?
.to_str()
.map_err(|e| e.to_string())?
.to_string())
.map_err(|e| e.to_string())?;
Ok(urlencoding::decode(v)
.map(|x| x.into_owned())
.map_err(|e| e.to_string())?)
},
)
.register_indexer_set(|x: &mut HeaderMap, key: &str, value: &str| {
let k = urlencoding::encode(key);
let v = urlencoding::encode(value);
x.insert(
HeaderName::from_str(key).map_err(|e| e.to_string())?,
HeaderValue::from_str(value).map_err(|e| e.to_string())?,
HeaderName::from_str(&*k).map_err(|e| e.to_string())?,
HeaderValue::from_str(&*v).map_err(|e| e.to_string())?,
);
Ok(())
})
Expand Down