Skip to content
Merged
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
87 changes: 82 additions & 5 deletions crates/kahea-ingest/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,11 +349,7 @@ fn yaml_to_json(
Yaml::Hash(values) => {
let mut object = Map::new();
for (key, value) in values {
let Yaml::String(key) = key else {
return Err(IngestError::Parse(format!(
"non-string mapping key at {location}"
)));
};
let key = yaml_mapping_key_to_string(key, location)?;
let child_location = format!("{location}/{}", escape_pointer(&key));
object.insert(key, yaml_to_json(value, &child_location, depth + 1, nodes)?);
}
Expand All @@ -365,6 +361,18 @@ fn yaml_to_json(
}
}

fn yaml_mapping_key_to_string(key: Yaml, location: &str) -> Result<String, IngestError> {
match key {
Yaml::String(value) => Ok(value),
Yaml::Integer(value) => Ok(value.to_string()),
Yaml::Real(value) if !value.contains(['.', 'e', 'E']) => Ok(value),
Yaml::Real(value) if value.parse::<f64>().is_ok_and(f64::is_finite) => Ok(value),
_ => Err(IngestError::Parse(format!(
"non-string mapping key at {location}"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
))),
}
}

fn validate_openapi_version(document: &Value) -> Result<(), IngestError> {
let Some(version) = document.get("openapi").and_then(Value::as_str) else {
return Err(IngestError::UnsupportedVersion);
Expand Down Expand Up @@ -570,6 +578,75 @@ paths:
assert_eq!(page.next.as_deref(), Some("1"));
}

#[test]
fn numeric_yaml_response_status_keys_are_accepted() {
let spec = r#"
openapi: 3.1.0
info: { title: Status keys, version: 1.0.0 }
paths:
/token:
post:
operationId: getToken
responses:
'200': { description: ok }
401: { description: unauthorized }
422: { description: invalid }
"#;
let source = load_openapi(Path::new("status-keys.yaml"), spec.as_bytes()).unwrap();
let responses = source.document["paths"]["/token"]["post"]["responses"]
.as_object()
.unwrap();
assert!(responses.contains_key("200"));
assert!(responses.contains_key("401"));
assert!(responses.contains_key("422"));

let index =
inspect_openapi(Path::new("status-keys.yaml"), spec.as_bytes(), None, 50, 0).unwrap();
assert_eq!(index.operations.len(), 1);
assert_eq!(index.operations[0].3, "getToken");
}

#[test]
fn oversized_integer_yaml_mapping_keys_are_preserved_as_strings() {
let spec = r#"
openapi: 3.1.0
info: { title: Large key, version: 1.0.0 }
paths:
/token:
post:
operationId: getToken
responses:
1234567890123456789012345678901234567890: { description: impossible but finite }
"#;
let source = load_openapi(Path::new("large-key.yaml"), spec.as_bytes()).unwrap();
let responses = source.document["paths"]["/token"]["post"]["responses"]
.as_object()
.unwrap();
assert!(responses.contains_key("1234567890123456789012345678901234567890"));
}

#[test]
fn unsupported_yaml_mapping_keys_are_still_rejected() {
let spec = r#"
openapi: 3.1.0
info: { title: Boolean key, version: 1.0.0 }
paths:
/health:
get:
operationId: getHealth
responses:
true: { description: ok }
"#;
let error = load_openapi(Path::new("boolean-key.yaml"), spec.as_bytes())
.expect_err("a boolean mapping key was accepted");
assert!(
error
.to_string()
.contains("non-string mapping key at #/paths/~1health/get/responses"),
"unexpected rejection: {error}"
);
}

#[test]
fn common_request_artifacts_normalize_to_operations() {
let curl = load_source(
Expand Down