From 73da988d9ac3f2c9b83ec224bc54edb038654f75 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Jul 2026 14:41:37 +0200 Subject: [PATCH 1/2] build(deps): bump netty-tcnative.version (#8821) Bumps `netty-tcnative.version` from 2.0.77.Final to 2.0.80.Final. Updates `io.netty:netty-tcnative` from 2.0.77.Final to 2.0.80.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.77.Final...netty-tcnative-parent-2.0.80.Final) Updates `io.netty:netty-tcnative-boringssl-static` from 2.0.77.Final to 2.0.80.Final - [Release notes](https://github.com/netty/netty-tcnative/releases) - [Commits](https://github.com/netty/netty-tcnative/compare/netty-tcnative-parent-2.0.77.Final...netty-tcnative-parent-2.0.80.Final) --- updated-dependencies: - dependency-name: io.netty:netty-tcnative dependency-version: 2.0.80.Final dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: io.netty:netty-tcnative-boringssl-static dependency-version: 2.0.80.Final dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 452d45f72e..a1c1eaea68 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ 1.5.3 33.6.0-jre 1.1.1 - 2.0.77.Final + 2.0.80.Final 4.2.15.Final 1.0.2 2.26.0 From 34663d165f3353cd43a024ade27a5848a83f0699 Mon Sep 17 00:00:00 2001 From: Richard Zowalla Date: Wed, 1 Jul 2026 15:41:54 +0200 Subject: [PATCH 2/2] fix(webapp): guard Flux viewer against js-yaml 5.x empty-input throw js-yaml 5.x changed load('') to throw a YAMLException ('expected a document, but the input is empty') instead of returning undefined (see js-yaml migrate_v4_to_v5). The Flux Topology Viewer calls parseAndRender() on page load while the textarea holds only a comment (# YAML Definition), so jsyaml.load() now throws before the existing if(doc==null) guard, surfacing as an uncaught exception that fails the cypress-e2e suite (flux-page.cy.js). Wrap the load in try/catch and treat empty/comment-only or malformed input as 'no document'. Also broaden cypress-tests.yml to run on 2.x so this class of webapp regression is exercised there too (2.x already shipped js-yaml 5.2.0 and carries the same latent bug). --- .github/workflows/cypress-tests.yml | 4 ++-- .../java/org/apache/storm/daemon/ui/WEB-INF/flux.html | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cypress-tests.yml b/.github/workflows/cypress-tests.yml index fc2c6007ea..50b71368c7 100644 --- a/.github/workflows/cypress-tests.yml +++ b/.github/workflows/cypress-tests.yml @@ -17,11 +17,11 @@ name: Cypress E2E Tests on: push: - branches: [ "master" ] + branches: [ "master", "2.x" ] paths: - 'storm-webapp/**' pull_request: - branches: [ "master" ] + branches: [ "master", "2.x" ] paths: - 'storm-webapp/**' workflow_dispatch: diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html index ad676c17a7..9d86999213 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/ui/WEB-INF/flux.html @@ -70,7 +70,14 @@ function parseAndRender() { var input = document.getElementById('taInput').value; - var doc = jsyaml.load(input); + var doc; + try { + doc = jsyaml.load(input); + } catch (e) { + // js-yaml >=5 throws on empty/comment-only input instead of + // returning undefined (see migrate_v4_to_v5); treat as no document. + return; + } if(doc==null){ return; }