Prevent endless recursion, limit traversal depth. #6691
Conversation
sdedic
added
Java
sdedic
force-pushed
the
gradle/project-loading-recursion
branch
2 times, most recently
from
1061236 to
f927c8c
Compare
| @@ -226,15 +240,13 @@ public NbProjectInfo buildAll() { | |||
| // introspection is only allowed for gradle 7.4 and above. | |||
| // TODO: investigate if some of the instrospection could be done for earlier Gradles. | |||
| sinceGradle("7.0", () -> { | |||
| initIntrospection(); | |||
There was a problem hiding this comment.
Rearranging exception handling code uncovered an exception from detectTaskProperties silently ignored in NB19-20. Adding task properties to the conditional block for >= 7.0
| @@ -539,19 +553,53 @@ private static boolean isPrimitiveOrString(Class c) { | |||
| * @param propertyTypes | |||
| * @param defaultValues | |||
| */ | |||
| private void startInspectObjectAndValues(Class clazz, Object object, String prefix, Map<String, Map<String, String>> globalTypes, Map<String, String> propertyTypes, Map<String, Object> defaultValues) { | |||
There was a problem hiding this comment.
Just force-reset depth at the start of the inspection (top-level object).
| } else { | ||
| defaultValues.put(prefix + "." + k, Objects.toString(v)); // NOI18N | ||
| } else if (!v.equals(value)) { | ||
| defaultValues.put(prefix + "." + k, objectToString(v)); // NOI18N |
There was a problem hiding this comment.
toString itself can cause StackOverflow with recursive structures.
| @@ -420,10 +454,30 @@ private static GradleReport createReport(Throwable e) { | |||
| } else { | |||
| reported = e; | |||
| } | |||
| String cn = e.getClass().getName(); | |||
| if (cn.contains("GradleScriptException") || cn.contains("ResolutionException")) { | |||
There was a problem hiding this comment.
These are common exception classes for failures reported by the build system itself, mark as 'user' or expected exceptions.
|
@lkishalmi do the changes look sane ? I'd merge it in the following days |
There was a problem hiding this comment.
COMPATIBLE_CACHE_VERSION needs to be increased, in order to force reload the info from Gradle.
There was a problem hiding this comment.
patched into dd185ef. Thanks.
sdedic
force-pushed
the
gradle/project-loading-recursion
branch
from
f927c8c to
d726811
Compare
Prevents infinite recursion through structures in project model, should fix #6674 and #4779. This is done by:
toString()calls in try-catch, so potential error (incl. stack overflow) does not abort and just dumps an object placeholder.The other part delivers more error details to NB. Fo unexpected exceptions, stack traces are provided in the
detailReport field. Reports are marked withseverityso now the loader can declare unexpected (exception) fatal (error), nonfatal (warning) and info messaes.Unexpected exceptions are presented in project problems with their (truncated to 100 lines) stacktraces. Build system exceptions (i.e. unresolved artifact) should not present stacktraces, but full details from the nested exceptions.
Just error and exception levels pop up project problems window and notifications. Stacktraces are received by NB and can be optionally logged (with appropriate loglevel) - useful for user diagnostic.
I have added a test that a project with Spotbugs plugin loads OK + checks to verify recursive structure avoidance.