git.delta.rocks / jrsonnet / refs/commits / 9c0fa0107dd8

difftreelog

feat detect infinite recursion in object evaluation

Yaroslav Bolyukin2022-04-20parent: #5a22275.patch.diff
in: master

3 files changed

modifiedcrates/jrsonnet-evaluator/src/error.rsdiffbeforeafterboth
before · crates/jrsonnet-evaluator/src/error.rs
1use crate::{2	builtin::{format::FormatError, sort::SortError},3	typed::TypeLocError,4};5use gcmodule::Trace;6use jrsonnet_interner::IStr;7use jrsonnet_parser::{BinaryOpType, ExprLocation, UnaryOpType};8use jrsonnet_types::ValType;9use std::{10	path::{Path, PathBuf},11	rc::Rc,12};13use thiserror::Error;1415#[derive(Error, Debug, Clone, Trace)]16pub enum Error {17	#[error("intrinsic not found: {0}")]18	IntrinsicNotFound(IStr),1920	#[error("operator {0} does not operate on type {1}")]21	UnaryOperatorDoesNotOperateOnType(UnaryOpType, ValType),22	#[error("binary operation {1} {0} {2} is not implemented")]23	BinaryOperatorDoesNotOperateOnValues(BinaryOpType, ValType, ValType),2425	#[error("no top level object in this context")]26	NoTopLevelObjectFound,27	#[error("self is only usable inside objects")]28	CantUseSelfOutsideOfObject,29	#[error("no super found")]30	NoSuperFound,3132	#[error("for loop can only iterate over arrays")]33	InComprehensionCanOnlyIterateOverArray,3435	#[error("array out of bounds: {0} is not within [0,{1})")]36	ArrayBoundsError(usize, usize),3738	#[error("assert failed: {0}")]39	AssertionFailed(IStr),4041	#[error("variable is not defined: {0}")]42	VariableIsNotDefined(IStr),43	#[error("type mismatch: expected {}, got {2} {0}", .1.iter().map(|e| format!("{}", e)).collect::<Vec<_>>().join(", "))]44	TypeMismatch(&'static str, Vec<ValType>, ValType),45	#[error("no such field: {0}")]46	NoSuchField(IStr),4748	#[error("only functions can be called, got {0}")]49	OnlyFunctionsCanBeCalledGot(ValType),50	#[error("parameter {0} is not defined")]51	UnknownFunctionParameter(String),52	#[error("argument {0} is already bound")]53	BindingParameterASecondTime(IStr),54	#[error("too many args, function has {0}")]55	TooManyArgsFunctionHas(usize),56	#[error("function argument is not passed: {0}")]57	FunctionParameterNotBoundInCall(IStr),5859	#[error("external variable is not defined: {0}")]60	UndefinedExternalVariable(IStr),61	#[error("native is not defined: {0}")]62	UndefinedExternalFunction(IStr),6364	#[error("field name should be string, got {0}")]65	FieldMustBeStringGot(ValType),66	#[error("duplicate field name: {0}")]67	DuplicateFieldName(IStr),6869	#[error("attempted to index array with string {0}")]70	AttemptedIndexAnArrayWithString(IStr),71	#[error("{0} index type should be {1}, got {2}")]72	ValueIndexMustBeTypeGot(ValType, ValType, ValType),73	#[error("cant index into {0}")]74	CantIndexInto(ValType),75	#[error("{0} is not indexable")]76	ValueIsNotIndexable(ValType),7778	#[error("super can't be used standalone")]79	StandaloneSuper,8081	#[error("can't resolve {1} from {0}")]82	ImportFileNotFound(PathBuf, PathBuf),83	#[error("resolved file not found: {0}")]84	ResolvedFileNotFound(PathBuf),85	#[error("imported file is not valid utf-8: {0:?}")]86	ImportBadFileUtf8(PathBuf),87	#[error("import io error: {0}")]88	ImportIo(String),89	#[error("tried to import {1} from {0}, but imports is not supported")]90	ImportNotSupported(PathBuf, PathBuf),91	#[error(92		"syntax error: expected {}, got {:?}",93		.error.expected,94		.source_code.chars().nth(error.location.offset).map(|c| c.to_string()).unwrap_or_else(|| "EOF".into())95	)]96	ImportSyntaxError {97		#[skip_trace]98		path: Rc<Path>,99		source_code: IStr,100		#[skip_trace]101		error: Box<jrsonnet_parser::ParseError>,102	},103104	#[error("runtime error: {0}")]105	RuntimeError(IStr),106	#[error("stack overflow, try to reduce recursion, or set --max-stack to bigger value")]107	StackOverflow,108	#[error("infinite recursion detected")]109	RecursiveLazyValueEvaluation,110	#[error("tried to index by fractional value")]111	FractionalIndex,112	#[error("attempted to divide by zero")]113	DivisionByZero,114115	#[error("string manifest output is not an string")]116	StringManifestOutputIsNotAString,117	#[error("stream manifest output is not an array")]118	StreamManifestOutputIsNotAArray,119	#[error("multi manifest output is not an object")]120	MultiManifestOutputIsNotAObject,121122	#[error("cant recurse stream manifest")]123	StreamManifestOutputCannotBeRecursed,124	#[error("stream manifest output cannot consist of raw strings")]125	StreamManifestCannotNestString,126127	#[error("{0}")]128	ImportCallbackError(String),129	#[error("invalid unicode codepoint: {0}")]130	InvalidUnicodeCodepointGot(u32),131132	#[error("format error: {0}")]133	Format(#[from] FormatError),134	#[error("type error: {0}")]135	TypeError(TypeLocError),136	#[error("sort error: {0}")]137	Sort(#[from] SortError),138139	#[cfg(feature = "anyhow-error")]140	#[error(transparent)]141	Other(Rc<anyhow::Error>),142}143144#[cfg(feature = "anyhow-error")]145impl From<anyhow::Error> for LocError {146	fn from(e: anyhow::Error) -> Self {147		Self::new(Error::Other(Rc::new(e)))148	}149}150151impl From<Error> for LocError {152	fn from(e: Error) -> Self {153		Self::new(e)154	}155}156157#[derive(Clone, Debug, Trace)]158pub struct StackTraceElement {159	pub location: Option<ExprLocation>,160	pub desc: String,161}162#[derive(Debug, Clone, Trace)]163pub struct StackTrace(pub Vec<StackTraceElement>);164165#[derive(Debug, Clone, Trace)]166pub struct LocError(Box<(Error, StackTrace)>);167impl LocError {168	pub fn new(e: Error) -> Self {169		Self(Box::new((e, StackTrace(vec![]))))170	}171172	pub const fn error(&self) -> &Error {173		&(self.0).0174	}175	pub fn error_mut(&mut self) -> &mut Error {176		&mut (self.0).0177	}178	pub const fn trace(&self) -> &StackTrace {179		&(self.0).1180	}181	pub fn trace_mut(&mut self) -> &mut StackTrace {182		&mut (self.0).1183	}184}185186pub type Result<V, E = LocError> = std::result::Result<V, E>;187188#[macro_export]189macro_rules! throw {190	($e: expr) => {191		return Err($e.into())192	};193}
modifiedcrates/jrsonnet-evaluator/src/obj.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/obj.rs
+++ b/crates/jrsonnet-evaluator/src/obj.rs
@@ -1,3 +1,4 @@
+use crate::error::LocError;
 use crate::function::CallLocation;
 use crate::gc::{GcHashMap, GcHashSet, TraceBox};
 use crate::operator::evaluate_add_op;
@@ -28,6 +29,15 @@
 
 // Field => This
 type CacheKey = (IStr, WeakObjValue);
+
+#[derive(Trace)]
+enum CacheValue {
+	Cached(Val),
+	NotFound,
+	Pending,
+	Errored(LocError),
+}
+
 #[derive(Trace)]
 #[force_tracking]
 pub struct ObjValueInternals {
@@ -36,7 +46,7 @@
 	assertions_ran: RefCell<GcHashSet<ObjValue>>,
 	this_obj: Option<ObjValue>,
 	this_entries: Cc<GcHashMap<IStr, ObjMember>>,
-	value_cache: RefCell<GcHashMap<CacheKey, Option<Val>>>,
+	value_cache: RefCell<GcHashMap<CacheKey, CacheValue>>,
 }
 
 #[derive(Clone, Trace)]
@@ -234,8 +244,17 @@
 		let cache_key = (key.clone(), WeakObjValue(real_this.0.downgrade()));
 
 		if let Some(v) = self.0.value_cache.borrow().get(&cache_key) {
-			return Ok(v.clone());
+			return Ok(match v {
+				CacheValue::Cached(v) => Some(v.clone()),
+				CacheValue::NotFound => None,
+				CacheValue::Pending => throw!(InfiniteRecursionDetected),
+				CacheValue::Errored(e) => return Err(e.clone()),
+			});
 		}
+		self.0
+			.value_cache
+			.borrow_mut()
+			.insert(cache_key.clone(), CacheValue::Pending);
 		let value = match (self.0.this_entries.get(&key), &self.0.super_obj) {
 			(Some(k), None) => Ok(Some(self.evaluate_this(k, real_this)?)),
 			(Some(k), Some(s)) => {
@@ -251,11 +270,24 @@
 			}
 			(None, Some(s)) => s.get_raw(key, Some(real_this)),
 			(None, None) => Ok(None),
-		}?;
-		self.0
-			.value_cache
-			.borrow_mut()
-			.insert(cache_key, value.clone());
+		};
+		let value = match value {
+			Ok(v) => v,
+			Err(e) => {
+				self.0
+					.value_cache
+					.borrow_mut()
+					.insert(cache_key, CacheValue::Errored(e.clone()));
+				return Err(e);
+			}
+		};
+		self.0.value_cache.borrow_mut().insert(
+			cache_key,
+			match &value {
+				Some(v) => CacheValue::Cached(v.clone()),
+				None => CacheValue::NotFound,
+			},
+		);
 		Ok(value)
 	}
 	fn evaluate_this(&self, v: &ObjMember, real_this: &Self) -> Result<Val> {
modifiedcrates/jrsonnet-evaluator/src/val.rsdiffbeforeafterboth
--- a/crates/jrsonnet-evaluator/src/val.rs
+++ b/crates/jrsonnet-evaluator/src/val.rs
@@ -47,7 +47,7 @@
 		match &*self.0.borrow() {
 			LazyValInternals::Computed(v) => return Ok(v.clone()),
 			LazyValInternals::Errored(e) => return Err(e.clone()),
-			LazyValInternals::Pending => return Err(RecursiveLazyValueEvaluation.into()),
+			LazyValInternals::Pending => return Err(InfiniteRecursionDetected.into()),
 			_ => (),
 		};
 		let value = if let LazyValInternals::Waiting(value) =