diff --git a/Makefile.toml b/Makefile.toml index 812ce9a6..a23a63ba 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -12,7 +12,7 @@ CARGO_MAKE_WORKSPACE_SKIP_MEMBERS = "integration_tests/*;examples/*;juniper_benc [tasks.release] condition = { env_set = [ "RELEASE_LEVEL" ] } command = "cargo-release" -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--execute", "${RELEASE_LEVEL}"] # Run `RELEASE_LEVEL=(patch|major|minor) cargo make release-dry-run` to do a dry run. @@ -23,7 +23,7 @@ args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/releas condition = { env_set = [ "RELEASE_LEVEL" ] } description = "Run `cargo-release --dry-run` for every crate" command = "cargo-release" -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] # Run `RELEASE_LEVEL=(patch|major|minor) cargo make release-local-test` to actually make changes locally but @@ -35,4 +35,4 @@ args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/releas condition = { env_set = [ "RELEASE_LEVEL" ] } description = "Run `cargo-release` for every crate, but only make changes locally" command = "cargo-release" -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/../_build/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] diff --git a/_build/release.toml b/_build/release.toml index bbe12430..b0acba60 100644 --- a/_build/release.toml +++ b/_build/release.toml @@ -1,6 +1,5 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" -pro-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" +post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" pre-release-replacements = [ {file="CHANGELOG.md", min=0, search="# master", replace="# master\n\n- Compatibility with the latest `juniper`.\n\n# [[{{version}}] {{date}}](https://github.com/graphql-rust/juniper/releases/tag/{{crate_name}}-{{version}})"}, diff --git a/juniper/CHANGELOG.md b/juniper/CHANGELOG.md index 27e00faf..c73bf910 100644 --- a/juniper/CHANGELOG.md +++ b/juniper/CHANGELOG.md @@ -42,6 +42,14 @@ - Support expressions in `graphql_value!` macro. ([#996](https://github.com/graphql-rust/juniper/pull/996), [#503](https://github.com/graphql-rust/juniper/issues/503)) - List coercion rules: `null` cannot be coerced to an `[Int!]!` or `[Int]!`. ([#1004](https://github.com/graphql-rust/juniper/pull/1004)) +# [[0.15.9] 2022-02-02](https://github.com/graphql-rust/juniper/releases/tag/juniper-v0.15.9) + +- Fix infinite recursion on malformed queries with nested recursive fragments. *This is a potential denial-of-service attack vector.* Thanks to [@quapka](https://github.com/quapka) for the detailed vulnerability report and reproduction steps. + +# [[0.15.8] 2022-01-26](https://github.com/graphql-rust/juniper/releases/tag/juniper-v0.15.8) + +- Fix panic on malformed queries with recursive fragments. *This is a potential denial-of-service attack vector.* Thanks to [@quapka](https://github.com/quapka) for the detailed vulnerability report and reproduction steps. + # [[0.15.7] 2021-07-08](https://github.com/graphql-rust/juniper/releases/tag/juniper-v0.15.7) - Fix panic on spreading untyped union fragments ([#945](https://github.com/graphql-rust/juniper/issues/945)) diff --git a/juniper/Cargo.toml b/juniper/Cargo.toml index fc41812b..34feeff3 100644 --- a/juniper/Cargo.toml +++ b/juniper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "juniper" -version = "0.15.7" +version = "0.15.9" authors = [ "Magnus Hallin ", "Christoph Herzog ", @@ -32,7 +32,7 @@ scalar-naivetime = [] schema-language = ["graphql-parser-integration"] [dependencies] -juniper_codegen = { version = "0.15.7", path = "../juniper_codegen" } +juniper_codegen = { version = "0.15.9", path = "../juniper_codegen" } anyhow = { version = "1.0.32", optional = true, default-features = false } async-trait = "0.1.39" diff --git a/juniper/Makefile.toml b/juniper/Makefile.toml index 6f6e065e..6736f477 100644 --- a/juniper/Makefile.toml +++ b/juniper/Makefile.toml @@ -4,13 +4,13 @@ CARGO_MAKE_CARGO_ALL_FEATURES = "" [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] [tasks.test] args = ["test", "--all-features"] diff --git a/juniper/release.toml b/juniper/release.toml index 7831d4e2..d3dea325 100644 --- a/juniper/release.toml +++ b/juniper/release.toml @@ -1,6 +1,5 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" -pro-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" +post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" pre-release-replacements = [ # Juniper's changelog diff --git a/juniper/src/lib.rs b/juniper/src/lib.rs index 40687972..b976c934 100644 --- a/juniper/src/lib.rs +++ b/juniper/src/lib.rs @@ -94,7 +94,7 @@ Juniper has not reached 1.0 yet, thus some API instability should be expected. */ // Due to `schema_introspection` test. #![cfg_attr(test, recursion_limit = "256")] -#![doc(html_root_url = "https://docs.rs/juniper/0.15.7")] +#![doc(html_root_url = "https://docs.rs/juniper/0.15.9")] #![warn(missing_docs)] // Required for using `juniper_codegen` macros inside this crate to resolve absolute `::juniper` diff --git a/juniper/src/validation/context.rs b/juniper/src/validation/context.rs index 9a02ae15..d90e7362 100644 --- a/juniper/src/validation/context.rs +++ b/juniper/src/validation/context.rs @@ -97,6 +97,10 @@ impl<'a, S: Debug> ValidatorContext<'a, S> { self.errors.push(RuleError::new(message, locations)) } + pub(crate) fn has_errors(&self) -> bool { + !self.errors.is_empty() + } + #[doc(hidden)] pub fn into_errors(mut self) -> Vec { self.errors.sort(); diff --git a/juniper/src/validation/mod.rs b/juniper/src/validation/mod.rs index 4a543528..c2759ec9 100644 --- a/juniper/src/validation/mod.rs +++ b/juniper/src/validation/mod.rs @@ -21,6 +21,7 @@ pub use self::{ #[cfg(test)] pub use self::test_harness::{ - expect_fails_rule, expect_fails_rule_with_schema, expect_passes_rule, + expect_fails_fn, expect_fails_fn_with_schema, expect_fails_rule, expect_fails_rule_with_schema, + expect_passes_fn, expect_passes_fn_with_schema, expect_passes_rule, expect_passes_rule_with_schema, }; diff --git a/juniper/src/validation/rules/mod.rs b/juniper/src/validation/rules/mod.rs index 211c1726..60a38d13 100644 --- a/juniper/src/validation/rules/mod.rs +++ b/juniper/src/validation/rules/mod.rs @@ -35,7 +35,14 @@ pub fn visit_all_rules<'a, S: Debug>(ctx: &mut ValidatorContext<'a, S>, doc: &'a where S: ScalarValue, { - let mut mv = MultiVisitorNil + // Some validators are depending on the results of other ones. + // For example, validators checking fragments usually rely on the fact that + // they have no cycles (`no_fragment_cycles`), otherwise may stall in an + // infinite recursion. So, we should run validators in stages, moving to the + // next stage only once the previous succeeds. This is better than making + // every single validator being aware of fragments cycles and/or other + // assumptions. + let mut stage1 = MultiVisitorNil .with(self::arguments_of_correct_type::factory()) .with(self::default_values_of_correct_type::factory()) .with(self::fields_on_correct_type::factory()) @@ -49,7 +56,6 @@ where .with(self::no_undefined_variables::factory()) .with(self::no_unused_fragments::factory()) .with(self::no_unused_variables::factory()) - .with(self::overlapping_fields_can_be_merged::factory()) .with(self::possible_fragment_spreads::factory()) .with(self::provided_non_null_arguments::factory()) .with(self::scalar_leafs::factory()) @@ -60,6 +66,62 @@ where .with(self::unique_variable_names::factory()) .with(self::variables_are_input_types::factory()) .with(self::variables_in_allowed_position::factory()); + visit(&mut stage1, ctx, doc); + if ctx.has_errors() { + return; + } - visit(&mut mv, ctx, doc) + let mut stage2 = MultiVisitorNil.with(self::overlapping_fields_can_be_merged::factory()); + visit(&mut stage2, ctx, doc); +} + +#[cfg(test)] +mod tests { + use crate::{parser::SourcePosition, DefaultScalarValue}; + + use crate::validation::{expect_fails_fn, RuleError}; + + #[test] + fn handles_recursive_fragments() { + expect_fails_fn::<_, DefaultScalarValue>( + super::visit_all_rules, + "fragment f on QueryRoot { ...f }", + &[ + RuleError::new( + "Fragment \"f\" is never used", + &[SourcePosition::new(0, 0, 0)], + ), + RuleError::new( + "Cannot spread fragment \"f\"", + &[SourcePosition::new(26, 0, 26)], + ), + ], + ); + } + + #[test] + fn handles_nested_recursive_fragments() { + expect_fails_fn::<_, DefaultScalarValue>( + super::visit_all_rules, + "fragment f on QueryRoot { a { ...f a { ...f } } }", + &[ + RuleError::new( + "Fragment \"f\" is never used", + &[SourcePosition::new(0, 0, 0)], + ), + RuleError::new( + r#"Unknown field "a" on type "QueryRoot""#, + &[SourcePosition::new(26, 0, 26)], + ), + RuleError::new( + "Cannot spread fragment \"f\"", + &[SourcePosition::new(30, 0, 30)], + ), + RuleError::new( + "Cannot spread fragment \"f\"", + &[SourcePosition::new(39, 0, 39)], + ), + ], + ); + } } diff --git a/juniper/src/validation/rules/overlapping_fields_can_be_merged.rs b/juniper/src/validation/rules/overlapping_fields_can_be_merged.rs index 2ae59396..1b13f393 100644 --- a/juniper/src/validation/rules/overlapping_fields_can_be_merged.rs +++ b/juniper/src/validation/rules/overlapping_fields_can_be_merged.rs @@ -33,6 +33,7 @@ struct PairSet<'a> { data: HashMap<&'a str, HashMap<&'a str, bool>>, } +#[derive(Debug)] struct OrderedMap { data: HashMap, insert_order: Vec, @@ -172,13 +173,6 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> { ); for frag_name2 in &fragment_names[i + 1..] { - // Prevent infinite fragment recursion. This case is - // caught by fragment validators, but because the validation is - // done in parallel we can't rely on fragments being - // non-recursive here. - if frag_name1 == frag_name2 { - continue; - } self.collect_conflicts_between_fragments( &mut conflicts, frag_name1, @@ -202,10 +196,8 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> { ) where S: ScalarValue, { - // Prevent infinite fragment recursion. This case is - // caught by fragment validators, but because the validation is - // done in parallel we can't rely on fragments being - // non-recursive here. + // Early return on fragment recursion, as it makes no sense. + // Fragment recursions are prevented by `no_fragment_cycles` validator. if fragment_name1 == fragment_name2 { return; } @@ -293,10 +285,8 @@ impl<'a, S: Debug> OverlappingFieldsCanBeMerged<'a, S> { self.collect_conflicts_between(conflicts, mutually_exclusive, field_map, &field_map2, ctx); for fragment_name2 in fragment_names2 { - // Prevent infinite fragment recursion. This case is - // caught by fragment validators, but because the validation is - // done in parallel we can't rely on fragments being - // non-recursive here. + // Early return on fragment recursion, as it makes no sense. + // Fragment recursions are prevented by `no_fragment_cycles` validator. if fragment_name == fragment_name2 { return; } @@ -2285,26 +2275,6 @@ mod tests { ); } - #[test] - fn handles_recursive_fragments() { - expect_passes_rule_with_schema::< - _, - EmptyMutation<()>, - EmptySubscription<()>, - _, - _, - DefaultScalarValue, - >( - QueryRoot, - EmptyMutation::new(), - EmptySubscription::new(), - factory, - r#" - fragment f on Query { ...f } - "#, - ); - } - #[test] fn error_message_contains_hint_for_alias_conflict() { assert_eq!( diff --git a/juniper/src/validation/test_harness.rs b/juniper/src/validation/test_harness.rs index 3d1cb710..5bba0a73 100644 --- a/juniper/src/validation/test_harness.rs +++ b/juniper/src/validation/test_harness.rs @@ -1,7 +1,7 @@ use std::mem; use crate::{ - ast::{FromInputValue, InputValue}, + ast::{Document, FromInputValue, InputValue}, executor::Registry, parser::parse_document_source, schema::{ @@ -834,20 +834,13 @@ where } } -pub fn validate<'a, Q, M, Sub, V, F, S>( - r: Q, - m: M, - s: Sub, - q: &'a str, - factory: F, -) -> Vec +pub fn validate<'a, Q, M, Sub, F, S>(r: Q, m: M, s: Sub, q: &'a str, visit_fn: F) -> Vec where S: ScalarValue + 'a, Q: GraphQLType, M: GraphQLType, Sub: GraphQLType, - V: Visitor<'a, S> + 'a, - F: Fn() -> V, + F: FnOnce(&mut ValidatorContext<'a, S>, &'a Document), { let mut root = RootNode::new_with_scalar_value(r, m, s); @@ -892,8 +885,7 @@ where parse_document_source(q, &root.schema).expect(&format!("Parse error on input {:#?}", q)); let mut ctx = ValidatorContext::new(unsafe { mem::transmute(&root.schema) }, &doc); - let mut mv = MultiVisitorNil.with(factory()); - visit(&mut mv, &mut ctx, unsafe { mem::transmute(doc.as_slice()) }); + visit_fn(&mut ctx, unsafe { mem::transmute(doc.as_slice()) }); ctx.into_errors() } @@ -907,6 +899,14 @@ where expect_passes_rule_with_schema(QueryRoot, MutationRoot, SubscriptionRoot, factory, q); } +pub fn expect_passes_fn<'a, F, S>(visit_fn: F, q: &'a str) +where + S: ScalarValue + 'a, + F: FnOnce(&mut ValidatorContext<'a, S>, &'a Document), +{ + expect_passes_fn_with_schema(QueryRoot, MutationRoot, SubscriptionRoot, visit_fn, q); +} + pub fn expect_passes_rule_with_schema<'a, Q, M, Sub, V, F, S>( r: Q, m: M, @@ -919,9 +919,12 @@ pub fn expect_passes_rule_with_schema<'a, Q, M, Sub, V, F, S>( M: GraphQLType, Sub: GraphQLType, V: Visitor<'a, S> + 'a, - F: Fn() -> V, + F: FnOnce() -> V, { - let errs = validate(r, m, s, q, factory); + let errs = validate(r, m, s, q, move |ctx, doc| { + let mut mv = MultiVisitorNil.with(factory()); + visit(&mut mv, ctx, unsafe { mem::transmute(doc) }); + }); if !errs.is_empty() { print_errors(&errs); @@ -929,6 +932,27 @@ pub fn expect_passes_rule_with_schema<'a, Q, M, Sub, V, F, S>( } } +pub fn expect_passes_fn_with_schema<'a, Q, M, Sub, F, S>( + r: Q, + m: M, + s: Sub, + visit_fn: F, + q: &'a str, +) where + S: ScalarValue + 'a, + Q: GraphQLType, + M: GraphQLType, + Sub: GraphQLType, + F: FnOnce(&mut ValidatorContext<'a, S>, &'a Document), +{ + let errs = validate(r, m, s, q, visit_fn); + + if !errs.is_empty() { + print_errors(&errs); + panic!("Expected `visit_fn` to pass, but errors found"); + } +} + pub fn expect_fails_rule<'a, V, F, S>(factory: F, q: &'a str, expected_errors: &[RuleError]) where S: ScalarValue + 'a, @@ -938,6 +962,14 @@ where expect_fails_rule_with_schema(QueryRoot, MutationRoot, factory, q, expected_errors); } +pub fn expect_fails_fn<'a, F, S>(visit_fn: F, q: &'a str, expected_errors: &[RuleError]) +where + S: ScalarValue + 'a, + F: FnOnce(&mut ValidatorContext<'a, S>, &'a Document), +{ + expect_fails_fn_with_schema(QueryRoot, MutationRoot, visit_fn, q, expected_errors); +} + pub fn expect_fails_rule_with_schema<'a, Q, M, V, F, S>( r: Q, m: M, @@ -949,9 +981,18 @@ pub fn expect_fails_rule_with_schema<'a, Q, M, V, F, S>( Q: GraphQLType, M: GraphQLType, V: Visitor<'a, S> + 'a, - F: Fn() -> V, + F: FnOnce() -> V, { - let errs = validate(r, m, crate::EmptySubscription::::new(), q, factory); + let errs = validate( + r, + m, + crate::EmptySubscription::::new(), + q, + move |ctx, doc| { + let mut mv = MultiVisitorNil.with(factory()); + visit(&mut mv, ctx, unsafe { mem::transmute(doc) }); + }, + ); if errs.is_empty() { panic!("Expected rule to fail, but no errors were found"); @@ -966,6 +1007,33 @@ pub fn expect_fails_rule_with_schema<'a, Q, M, V, F, S>( } } +pub fn expect_fails_fn_with_schema<'a, Q, M, F, S>( + r: Q, + m: M, + visit_fn: F, + q: &'a str, + expected_errors: &[RuleError], +) where + S: ScalarValue + 'a, + Q: GraphQLType, + M: GraphQLType, + F: FnOnce(&mut ValidatorContext<'a, S>, &'a Document), +{ + let errs = validate(r, m, crate::EmptySubscription::::new(), q, visit_fn); + + if errs.is_empty() { + panic!("Expected `visit_fn` to fail, but no errors were found"); + } else if errs != expected_errors { + println!("==> Expected errors:"); + print_errors(expected_errors); + + println!("\n==> Actual errors:"); + print_errors(&errs); + + panic!("Unexpected set of errors found"); + } +} + fn print_errors(errs: &[RuleError]) { for err in errs { for p in err.locations() { diff --git a/juniper_actix/Cargo.toml b/juniper_actix/Cargo.toml index f3f4fd27..fc0b637b 100644 --- a/juniper_actix/Cargo.toml +++ b/juniper_actix/Cargo.toml @@ -18,7 +18,7 @@ http = "0.2.4" actix-web = "4.0.0-beta.14" actix-web-actors = "4.0.0-beta.8" -juniper = { version = "0.15.7", path = "../juniper", default-features = false } +juniper = { version = "0.15.9", path = "../juniper", default-features = false } juniper_graphql_ws = { version = "0.3.0", path = "../juniper_graphql_ws", optional = true } anyhow = "1.0" @@ -36,7 +36,7 @@ tokio = "1.0" async-stream = "0.3" actix-test = "0.1.0-beta.8" -juniper = { version = "0.15.7", path = "../juniper", features = ["expose-test-schema"] } +juniper = { version = "0.15.9", path = "../juniper", features = ["expose-test-schema"] } bytes = "1.0" env_logger = "0.9" diff --git a/juniper_codegen/Cargo.toml b/juniper_codegen/Cargo.toml index 746c5494..ae5c0642 100644 --- a/juniper_codegen/Cargo.toml +++ b/juniper_codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "juniper_codegen" -version = "0.15.7" +version = "0.15.9" edition = "2018" authors = [ "Magnus Hallin ", @@ -27,4 +27,4 @@ url = "2.0" [dev-dependencies] derive_more = "0.99.7" futures = "0.3" -juniper = { version = "0.15.7", path = "../juniper" } +juniper = { version = "0.15.9", path = "../juniper" } diff --git a/juniper_codegen/Makefile.toml b/juniper_codegen/Makefile.toml index 6eca6486..58aa74fb 100644 --- a/juniper_codegen/Makefile.toml +++ b/juniper_codegen/Makefile.toml @@ -2,10 +2,10 @@ # release config. [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] diff --git a/juniper_codegen/release.toml b/juniper_codegen/release.toml index 51b3405b..33a9caec 100644 --- a/juniper_codegen/release.toml +++ b/juniper_codegen/release.toml @@ -1,6 +1,5 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" -pro-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" +post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" pre-release-replacements = [ {file="../juniper/Cargo.toml", min=0, search="juniper_codegen = \\{ version = \"[^\"]+\"", replace="juniper_codegen = { version = \"{{version}}\""}, diff --git a/juniper_codegen/src/lib.rs b/juniper_codegen/src/lib.rs index 4aff89d1..a1015a11 100644 --- a/juniper_codegen/src/lib.rs +++ b/juniper_codegen/src/lib.rs @@ -4,7 +4,7 @@ //! You should not depend on juniper_codegen directly. //! You only need the `juniper` crate. -#![doc(html_root_url = "https://docs.rs/juniper_codegen/0.15.7")] +#![doc(html_root_url = "https://docs.rs/juniper_codegen/0.15.9")] #![recursion_limit = "1024"] mod result; diff --git a/juniper_graphql_ws/Cargo.toml b/juniper_graphql_ws/Cargo.toml index a383f6fc..d24b8554 100644 --- a/juniper_graphql_ws/Cargo.toml +++ b/juniper_graphql_ws/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/graphql-rust/juniper" keywords = ["apollo", "graphql", "graphql-ws", "juniper"] [dependencies] -juniper = { version = "0.15.7", path = "../juniper", default-features = false } +juniper = { version = "0.15.9", path = "../juniper", default-features = false } juniper_subscriptions = { version = "0.16.0", path = "../juniper_subscriptions" } serde = { version = "1.0.8", features = ["derive"], default-features = false } tokio = { version = "1", features = ["macros", "rt", "time"], default-features = false } diff --git a/juniper_graphql_ws/Makefile.toml b/juniper_graphql_ws/Makefile.toml index f6bd8ee1..8a804aba 100644 --- a/juniper_graphql_ws/Makefile.toml +++ b/juniper_graphql_ws/Makefile.toml @@ -2,13 +2,14 @@ # release config. [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] + [env] CARGO_MAKE_CARGO_ALL_FEATURES = "" diff --git a/juniper_graphql_ws/release.toml b/juniper_graphql_ws/release.toml index 786a2308..a7356262 100644 --- a/juniper_graphql_ws/release.toml +++ b/juniper_graphql_ws/release.toml @@ -1,6 +1,5 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" -pro-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" +post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" pre-release-replacements = [ {file="src/lib.rs", min=0, search="docs.rs/juniper_graphql_ws/[a-z0-9\\.-]+", replace="docs.rs/juniper_graphql_ws/{{version}}"}, diff --git a/juniper_hyper/CHANGELOG.md b/juniper_hyper/CHANGELOG.md index be40b655..890990cd 100644 --- a/juniper_hyper/CHANGELOG.md +++ b/juniper_hyper/CHANGELOG.md @@ -6,6 +6,14 @@ - Compatibility with the latest `juniper`. +# [[0.7.3] 2022-02-02](https://github.com/graphql-rust/juniper/releases/tag/juniper_hyper-v0.7.3) + +- Compatibility with the latest `juniper`. + +# [[0.7.2] 2022-01-26](https://github.com/graphql-rust/juniper/releases/tag/juniper_hyper-v0.7.2) + +- Compatibility with the latest `juniper`. + # [[0.7.1] 2021-06-07](https://github.com/graphql-rust/juniper/releases/tag/juniper_hyper-0.7.1) - Compatibility with the latest `juniper`. diff --git a/juniper_hyper/Cargo.toml b/juniper_hyper/Cargo.toml index 53aa080e..e4e0f0e6 100644 --- a/juniper_hyper/Cargo.toml +++ b/juniper_hyper/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/graphql-rust/juniper" [dependencies] futures = "0.3.1" -juniper = { version = "0.15.7", path = "../juniper", default-features = false } +juniper = { version = "0.15.9", path = "../juniper", default-features = false } hyper = { version = "0.14", features = ["server", "runtime"] } serde_json = "1.0" tokio = "1.0" diff --git a/juniper_iron/CHANGELOG.md b/juniper_iron/CHANGELOG.md index 54ecaca3..3938f03e 100644 --- a/juniper_iron/CHANGELOG.md +++ b/juniper_iron/CHANGELOG.md @@ -2,6 +2,14 @@ - Compatibility with the latest `juniper`. +# [[0.7.6] 2022-02-02](https://github.com/graphql-rust/juniper/releases/tag/juniper_iron-v0.7.6) + +- Compatibility with the latest `juniper`. + +# [[0.7.5] 2022-01-26](https://github.com/graphql-rust/juniper/releases/tag/juniper_iron-v0.7.5) + +- Compatibility with the latest `juniper`. + # [[0.7.4] 2021-06-07](https://github.com/graphql-rust/juniper/releases/tag/juniper_iron-0.7.4) - Compatibility with the latest `juniper`. diff --git a/juniper_iron/Cargo.toml b/juniper_iron/Cargo.toml index 4e8faf71..46239046 100644 --- a/juniper_iron/Cargo.toml +++ b/juniper_iron/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "juniper_iron" -version = "0.7.4" +version = "0.7.6" edition = "2018" authors = [ "Magnus Hallin ", @@ -13,13 +13,13 @@ repository = "https://github.com/graphql-rust/juniper" [dependencies] futures = "0.3.1" -juniper = { version = "0.15.7", path = "../juniper" } +juniper = { version = "0.15.9", path = "../juniper" } iron = ">= 0.5, < 0.7" serde_json = "1.0.2" urlencoded = ">= 0.5, < 0.7" [dev-dependencies] -juniper = { version = "0.15.7", path = "../juniper", features = ["expose-test-schema"] } +juniper = { version = "0.15.9", path = "../juniper", features = ["expose-test-schema"] } iron-test = "0.6" logger = "0.4" mount = "0.4" diff --git a/juniper_rocket/Cargo.toml b/juniper_rocket/Cargo.toml index a518356d..5b4562b9 100644 --- a/juniper_rocket/Cargo.toml +++ b/juniper_rocket/Cargo.toml @@ -13,9 +13,9 @@ repository = "https://github.com/graphql-rust/juniper" [dependencies] futures = "0.3.1" -juniper = { version = "0.15.7", path = "../juniper", default-features = false } +juniper = { version = "0.15.9", path = "../juniper", default-features = false } rocket = { version = "0.5.0-rc.1", default-features = false } serde_json = "1.0.2" [dev-dependencies] -juniper = { version = "0.15.7", path = "../juniper", features = ["expose-test-schema"] } +juniper = { version = "0.15.9", path = "../juniper", features = ["expose-test-schema"] } diff --git a/juniper_subscriptions/Cargo.toml b/juniper_subscriptions/Cargo.toml index fd543423..2fe50ac3 100644 --- a/juniper_subscriptions/Cargo.toml +++ b/juniper_subscriptions/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/graphql-rust/juniper" [dependencies] futures = "0.3.1" -juniper = { version = "0.15.7", path = "../juniper", default-features = false } +juniper = { version = "0.15.9", path = "../juniper", default-features = false } [dev-dependencies] serde_json = "1.0" diff --git a/juniper_subscriptions/Makefile.toml b/juniper_subscriptions/Makefile.toml index f0c7fd40..afbd4f96 100644 --- a/juniper_subscriptions/Makefile.toml +++ b/juniper_subscriptions/Makefile.toml @@ -3,13 +3,13 @@ # release config. [tasks.release] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--execute", "${RELEASE_LEVEL}"] [tasks.release-dry-run] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--dry-run", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--no-publish", "--no-push", "--no-tag", "${RELEASE_LEVEL}"] [tasks.release-local-test] -args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "--skip-publish", "--skip-push", "--skip-tag", "${RELEASE_LEVEL}"] +args = ["release", "--config", "${CARGO_MAKE_WORKING_DIRECTORY}/release.toml", "--no-confirm", "${RELEASE_LEVEL}"] [env] CARGO_MAKE_CARGO_ALL_FEATURES = "" diff --git a/juniper_subscriptions/release.toml b/juniper_subscriptions/release.toml index 237641db..4108f647 100644 --- a/juniper_subscriptions/release.toml +++ b/juniper_subscriptions/release.toml @@ -1,6 +1,5 @@ -no-dev-version = true pre-release-commit-message = "Release {{crate_name}} {{version}}" -pro-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" +post-release-commit-message = "Bump {{crate_name}} version to {{next_version}}" tag-message = "Release {{crate_name}} {{version}}" pre-release-replacements = [ {file="../juniper_graphql_ws/Cargo.toml", min=0, search="juniper_subscriptions = \\{ version = \"[^\"]+\"", replace="juniper_subscriptions = { version = \"{{version}}\""}, diff --git a/juniper_warp/CHANGELOG.md b/juniper_warp/CHANGELOG.md index b3bfd1a5..072d4c59 100644 --- a/juniper_warp/CHANGELOG.md +++ b/juniper_warp/CHANGELOG.md @@ -6,6 +6,10 @@ - Compatibility with the latest `juniper`. +# [[0.6.5] 2022-01-26](https://github.com/graphql-rust/juniper/releases/tag/juniper_warp-v0.6.5) + +- Compatibility with the latest `juniper`. + # [[0.6.4] 2021-06-07](https://github.com/graphql-rust/juniper/releases/tag/juniper_warp-0.6.4) - Compatibility with the latest `juniper`. diff --git a/juniper_warp/Cargo.toml b/juniper_warp/Cargo.toml index 6246b417..0cde5abb 100644 --- a/juniper_warp/Cargo.toml +++ b/juniper_warp/Cargo.toml @@ -14,7 +14,7 @@ subscriptions = ["juniper_graphql_ws"] [dependencies] anyhow = "1.0" futures = "0.3.1" -juniper = { version = "0.15.7", path = "../juniper", default-features = false } +juniper = { version = "0.15.9", path = "../juniper", default-features = false } juniper_graphql_ws = { version = "0.3.0", path = "../juniper_graphql_ws", optional = true } serde = { version = "1.0.75", features = ["derive"] } serde_json = "1.0.24" @@ -24,7 +24,7 @@ warp = "0.3" [dev-dependencies] env_logger = "0.9" -juniper = { version = "0.15.7", path = "../juniper", features = ["expose-test-schema"] } +juniper = { version = "0.15.9", path = "../juniper", features = ["expose-test-schema"] } log = "0.4" percent-encoding = "2.1" tokio = { version = "1", features = ["macros", "rt-multi-thread"] }