diff --git a/textproc/opensearch-dashboards219/Makefile b/textproc/opensearch-dashboards219/Makefile index b31d3fb640c1..6050675e375e 100644 --- a/textproc/opensearch-dashboards219/Makefile +++ b/textproc/opensearch-dashboards219/Makefile @@ -1,95 +1,93 @@ PORTNAME= opensearch-dashboards DISTVERSION= 2.19.5 DISTVERSIONSUFFIX= -linux-${OPENSEARCH_ARCH} +PORTREVISION= 1 CATEGORIES= textproc www MASTER_SITES= https://artifacts.opensearch.org/releases/bundle/${PORTNAME}/${DISTVERSION}/ PKGNAMESUFFIX= 219 MAINTAINER= opensearch@FreeBSD.org COMMENT= Visualization dashboards for OpenSearch WWW= https://opensearch.org LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt -DEPRECATED= Depends on expired www/npm-node20 -EXPIRATION_DATE=2026-09-02 - ONLY_FOR_ARCHS= aarch64 amd64 CONFLICTS= opensearch-dashboards opensearch-dashboards210 opensearch-dashboards213 \ opensearch-dashboards216 -BUILD_DEPENDS= npm-node20>0:www/npm-node20 +BUILD_DEPENDS= npm-node24>0:www/npm-node24 -USES= nodejs:20,build,run python:build +USES= nodejs:24,build,run python:build USE_RC_SUBR= ${PORTNAME} SUB_FILES= pkg-deinstall SUB_LIST= PORTNAME="${PORTNAME}" \ PKGNAMESUFFIX="${PKGNAMESUFFIX}" \ WWWDIR=${WWWDIR} WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -NODE_VER= 20.20.2 +NODE_VER= 24.16.0 NO_BUILD= yes _DEVDIR= ${WRKDIR}/.devdir .include .if ${ARCH} == "aarch64" OPENSEARCH_ARCH= arm64 .else OPENSEARCH_ARCH= x64 .endif post-patch: @${REINPLACE_CMD} -e 's|<19|<=${NODE_VER}|g' ${WRKSRC}/package.json ${RM} \ ${WRKSRC}/bin/*.orig \ ${WRKSRC}/bin/*.bak \ ${WRKSRC}/package.json.bak ${RM} -r ${WRKSRC}/plugins/reportsDashboards/.chromium do-install: ${MKDIR} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/config/opensearch_dashboards.yml ${STAGEDIR}${ETCDIR}/opensearch_dashboards.yml.sample (cd ${WRKSRC} && \ ${COPYTREE_SHARE} "data node_modules package.json plugins src" ${STAGEDIR}${WWWDIR} && \ ${COPYTREE_BIN} bin ${STAGEDIR}${WWWDIR}) post-install: ${ECHO} "@sample ${ETCDIR}/opensearch_dashboards.yml.sample" >> ${TMPPLIST} ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(www,www) ${WWWDIR}/data" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/legacy" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/fixed" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/test/resources/dynamic" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/fixed" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/reportsDashboards/node_modules/set-interval-async/examples/dynamic" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/observabilityDashboards/server/adaptors/integrations/__test__" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/observabilityDashboards/server/adaptors/integrations/repository/__test__" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Alerts/components/AlertFlyout" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/CreateDetector/components/ConfigureAlerts/components/AlertCondition" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/AlertTriggerView" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/DetectorBasicDetailsView" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/DetectorRulesView" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/FieldMappingsView" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/UpdateAlertConditions" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/UpdateDetectorBasicDetails" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/UpdateDetectorRules" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/components/UpdateFieldMappings" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/containers/AlertTriggersView" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/containers/DetectorDetails" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/containers/DetectorDetailsView" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/containers/Detectors" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Detectors/containers/EditFieldMappings" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Rules/components/DeleteModal" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Rules/components/RuleEditor/components" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityAnalyticsDashboards/test/mocks/Rules/components/RulesTable" >> ${TMPPLIST} ${ECHO} "@dir ${WWWDIR}/plugins/securityDashboards/server/multitenancy/test" >> ${TMPPLIST} .include diff --git a/textproc/opensearch-dashboards219/files/patch-plugins_securityDashboards_server_utils_next__url.js b/textproc/opensearch-dashboards219/files/patch-plugins_securityDashboards_server_utils_next__url.js new file mode 100644 index 000000000000..d62e8f6b6a9d --- /dev/null +++ b/textproc/opensearch-dashboards219/files/patch-plugins_securityDashboards_server_utils_next__url.js @@ -0,0 +1,26 @@ +--- plugins/securityDashboards/server/utils/next_url.js.orig 2026-06-04 21:40:15 UTC ++++ plugins/securityDashboards/server/utils/next_url.js +@@ -6,7 +6,6 @@ exports.validateNextUrl = validateNextUrl; + exports.INVALID_NEXT_URL_PARAMETER_MESSAGE = void 0; + exports.composeNextUrlQueryParam = composeNextUrlQueryParam; + exports.validateNextUrl = validateNextUrl; +-var _url = require("url"); + var _encode_uri_query = require("../../../../src/plugins/opensearch_dashboards_utils/common/url/encode_uri_query"); + var _http = require("../../../../src/core/server/http"); + /* +@@ -27,7 +26,7 @@ function composeNextUrlQueryParam(request, basePath) { + function composeNextUrlQueryParam(request, basePath) { + try { + const currentUrl = request.url.toString(); +- const parsedUrl = (0, _url.parse)(currentUrl, true); ++ const parsedUrl = new URL('', currentUrl); + const nextUrl = parsedUrl === null || parsedUrl === void 0 ? void 0 : parsedUrl.path; + if (!!nextUrl && nextUrl !== '/') { + return `nextUrl=${(0, _encode_uri_query.encodeUriQuery)((0, _http.getRedirectUrl)({ +@@ -68,4 +67,4 @@ function validateNextUrl(url, basePath) { + } + } + } +-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfdXJsIiwicmVxdWlyZSIsIl9lbmNvZGVfdXJpX3F1ZXJ5IiwiX2h0dHAiLCJjb21wb3NlTmV4dFVybFF1ZXJ5UGFyYW0iLCJyZXF1ZXN0IiwiYmFzZVBhdGgiLCJjdXJyZW50VXJsIiwidXJsIiwidG9TdHJpbmciLCJwYXJzZWRVcmwiLCJwYXJzZSIsIm5leHRVcmwiLCJwYXRoIiwiZW5jb2RlVXJpUXVlcnkiLCJnZXRSZWRpcmVjdFVybCIsImVycm9yIiwiSU5WQUxJRF9ORVhUX1VSTF9QQVJBTUVURVJfTUVTU0FHRSIsImV4cG9ydHMiLCJ2YWxpZGF0ZU5leHRVcmwiLCJzcGxpdCIsImJwIiwic3RhcnRzV2l0aCIsInBhdGhNaW51c0Jhc2UiLCJyZXBsYWNlIiwibGVuZ3RoIiwidGVzdCJdLCJzb3VyY2VzIjpbIm5leHRfdXJsLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8qXG4gKiAgIENvcHlyaWdodCBPcGVuU2VhcmNoIENvbnRyaWJ1dG9yc1xuICpcbiAqICAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS5cbiAqICAgWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLlxuICogICBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICAgb3IgaW4gdGhlIFwibGljZW5zZVwiIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkXG4gKiAgIG9uIGFuIFwiQVMgSVNcIiBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlclxuICogICBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZ1xuICogICBwZXJtaXNzaW9ucyBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0IHsgcGFyc2UgfSBmcm9tICd1cmwnO1xuaW1wb3J0IHsgUGFyc2VkVXJsUXVlcnkgfSBmcm9tICdxdWVyeXN0cmluZyc7XG5pbXBvcnQgeyBPcGVuU2VhcmNoRGFzaGJvYXJkc1JlcXVlc3QgfSBmcm9tICdvcGVuc2VhcmNoLWRhc2hib2FyZHMvc2VydmVyJztcbmltcG9ydCB7IGVuY29kZVVyaVF1ZXJ5IH0gZnJvbSAnLi4vLi4vLi4vLi4vc3JjL3BsdWdpbnMvb3BlbnNlYXJjaF9kYXNoYm9hcmRzX3V0aWxzL2NvbW1vbi91cmwvZW5jb2RlX3VyaV9xdWVyeSc7XG5pbXBvcnQgeyBnZXRSZWRpcmVjdFVybCB9IGZyb20gJy4uLy4uLy4uLy4uL3NyYy9jb3JlL3NlcnZlci9odHRwJztcblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXBvc2VOZXh0VXJsUXVlcnlQYXJhbShcbiAgcmVxdWVzdDogT3BlblNlYXJjaERhc2hib2FyZHNSZXF1ZXN0LFxuICBiYXNlUGF0aDogc3RyaW5nXG4pOiBzdHJpbmcge1xuICB0cnkge1xuICAgIGNvbnN0IGN1cnJlbnRVcmwgPSByZXF1ZXN0LnVybC50b1N0cmluZygpO1xuICAgIGNvbnN0IHBhcnNlZFVybCA9IHBhcnNlKGN1cnJlbnRVcmwsIHRydWUpO1xuICAgIGNvbnN0IG5leHRVcmwgPSBwYXJzZWRVcmw/LnBhdGg7XG5cbiAgICBpZiAoISFuZXh0VXJsICYmIG5leHRVcmwgIT09ICcvJykge1xuICAgICAgcmV0dXJuIGBuZXh0VXJsPSR7ZW5jb2RlVXJpUXVlcnkoXG4gICAgICAgIGdldFJlZGlyZWN0VXJsKHtcbiAgICAgICAgICByZXF1ZXN0LFxuICAgICAgICAgIGJhc2VQYXRoLFxuICAgICAgICAgIG5leHRVcmwsXG4gICAgICAgIH0pXG4gICAgICApfWA7XG4gICAgfVxuICB9IGNhdGNoIChlcnJvcikge1xuICAgIC8qIElnbm9yZSBlcnJvcnMgZnJvbSBwYXJzaW5nICovXG4gIH1cbiAgcmV0dXJuICcnO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFBhcnNlZFVybFF1ZXJ5UGFyYW1zIGV4dGVuZHMgUGFyc2VkVXJsUXVlcnkge1xuICBuZXh0VXJsOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjb25zdCBJTlZBTElEX05FWFRfVVJMX1BBUkFNRVRFUl9NRVNTQUdFID0gJ0ludmFsaWQgbmV4dFVybCBwYXJhbWV0ZXIuJztcblxuLyoqXG4gKiBXZSByZXF1aXJlIHRoZSBuZXh0VXJsIHBhcmFtZXRlciB0byBiZSBhbiByZWxhdGl2ZSB1cmwuXG4gKlxuICogSGVyZSB3ZSB2YWxpZGF0ZSB0aGUgbmV4dFVybCBwYXJhbWV0ZXIgYnkgY2hlY2tpbmcgaWYgaXQgbWVldHMgdGhlIGZvbGxvd2luZyBjcml0ZXJpYTpcbiAqICAgLSBuZXh0VXJsIHN0YXJ0cyB3aXRoIHRoZSBiYXNlUGF0aCAoLyBpZiBubyBzZXJ2ZXJCYXNlUGF0aCBpcyBzZXQpXG4gKiAgIC0gSWYgbmV4dFVybCBpcyBsb25nZXIgdGhhbiAyIGNoYXJzIHRoZW4gdGhlIHNlY29uZCBjaGFyYWN0ZXIgbXVzdCBiZSBhbHBoYWJldGljYWwgb3IgdW5kZXJzY29yZVxuICogICAtIFRoZSBmb2xsb3dpbmcgY2hhcmFjdGVycyBtdXN0IGJlIGFscGhhbnVtZXJpYywgZGFzaCBvciB1bmRlcnNjb3JlXG4gKiBOb3RlOiB1cmwgaGFzIGJlZW4gZGVjb2RlZCBieSBPcGVuU2VhcmNoRGFzaGJvYXJkcy5cbiAqXG4gKiBAcGFyYW0gdXJsIHVybCBzdHJpbmcuXG4gKiBAcmV0dXJucyBlcnJvciBtZXNzYWdlIGlmIG5leHRVcmwgaXMgaW52YWxpZCwgb3RoZXJ3aXNlIHZvaWQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiB2YWxpZGF0ZU5leHRVcmwoXG4gIHVybDogc3RyaW5nIHwgdW5kZWZpbmVkLFxuICBiYXNlUGF0aDogc3RyaW5nIHwgdW5kZWZpbmVkXG4pOiBzdHJpbmcgfCB2b2lkIHtcbiAgaWYgKHVybCkge1xuICAgIGNvbnN0IHBhdGggPSB1cmwuc3BsaXQoL1xcP3wjLylbMF07XG4gICAgY29uc3QgYnAgPSBiYXNlUGF0aCB8fCAnJztcbiAgICBpZiAoIXBhdGguc3RhcnRzV2l0aChicCkpIHtcbiAgICAgIHJldHVybiBJTlZBTElEX05FWFRfVVJMX1BBUkFNRVRFUl9NRVNTQUdFO1xuICAgIH1cbiAgICBjb25zdCBwYXRoTWludXNCYXNlID0gcGF0aC5yZXBsYWNlKGJwLCAnJyk7XG4gICAgaWYgKFxuICAgICAgKHBhdGhNaW51c0Jhc2UgJiYgIXBhdGhNaW51c0Jhc2Uuc3RhcnRzV2l0aCgnLycpKSB8fFxuICAgICAgKHBhdGhNaW51c0Jhc2UubGVuZ3RoID49IDIgJiYgIS9eXFwvW2EtekEtWl9dW1xcL2EtekEtWjAtOS1fXSskLy50ZXN0KHBhdGhNaW51c0Jhc2UpKVxuICAgICkge1xuICAgICAgcmV0dXJuIElOVkFMSURfTkVYVF9VUkxfUEFSQU1FVEVSX01FU1NBR0U7XG4gICAgfVxuICB9XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBZUEsSUFBQUEsSUFBQSxHQUFBQyxPQUFBO0FBR0EsSUFBQUMsaUJBQUEsR0FBQUQsT0FBQTtBQUNBLElBQUFFLEtBQUEsR0FBQUYsT0FBQTtBQW5CQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQVFPLFNBQVNHLHdCQUF3QkEsQ0FDdENDLE9BQW9DLEVBQ3BDQyxRQUFnQixFQUNSO0VBQ1IsSUFBSTtJQUNGLE1BQU1DLFVBQVUsR0FBR0YsT0FBTyxDQUFDRyxHQUFHLENBQUNDLFFBQVEsQ0FBQyxDQUFDO0lBQ3pDLE1BQU1DLFNBQVMsR0FBRyxJQUFBQyxVQUFLLEVBQUNKLFVBQVUsRUFBRSxJQUFJLENBQUM7SUFDekMsTUFBTUssT0FBTyxHQUFHRixTQUFTLGFBQVRBLFNBQVMsdUJBQVRBLFNBQVMsQ0FBRUcsSUFBSTtJQUUvQixJQUFJLENBQUMsQ0FBQ0QsT0FBTyxJQUFJQSxPQUFPLEtBQUssR0FBRyxFQUFFO01BQ2hDLE9BQVEsV0FBVSxJQUFBRSxnQ0FBYyxFQUM5QixJQUFBQyxvQkFBYyxFQUFDO1FBQ2JWLE9BQU87UUFDUEMsUUFBUTtRQUNSTTtNQUNGLENBQUMsQ0FDSCxDQUFFLEVBQUM7SUFDTDtFQUNGLENBQUMsQ0FBQyxPQUFPSSxLQUFLLEVBQUU7SUFDZDtFQUFBO0VBRUYsT0FBTyxFQUFFO0FBQ1g7QUFNTyxNQUFNQyxrQ0FBa0MsR0FBQUMsT0FBQSxDQUFBRCxrQ0FBQSxHQUFHLDRCQUE0Qjs7QUFFOUU7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ08sU0FBU0UsZUFBZUEsQ0FDN0JYLEdBQXVCLEVBQ3ZCRixRQUE0QixFQUNiO0VBQ2YsSUFBSUUsR0FBRyxFQUFFO0lBQ1AsTUFBTUssSUFBSSxHQUFHTCxHQUFHLENBQUNZLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakMsTUFBTUMsRUFBRSxHQUFHZixRQUFRLElBQUksRUFBRTtJQUN6QixJQUFJLENBQUNPLElBQUksQ0FBQ1MsVUFBVSxDQUFDRCxFQUFFLENBQUMsRUFBRTtNQUN4QixPQUFPSixrQ0FBa0M7SUFDM0M7SUFDQSxNQUFNTSxhQUFhLEdBQUdWLElBQUksQ0FBQ1csT0FBTyxDQUFDSCxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQzFDLElBQ0dFLGFBQWEsSUFBSSxDQUFDQSxhQUFhLENBQUNELFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFDL0NDLGFBQWEsQ0FBQ0UsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLCtCQUErQixDQUFDQyxJQUFJLENBQUNILGFBQWEsQ0FBRSxFQUNuRjtNQUNBLE9BQU9OLGtDQUFrQztJQUMzQztFQUNGO0FBQ0YifQ== +\ No newline at end of file ++//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJfdXJsIiwicmVxdWlyZSIsIl9lbmNvZGVfdXJpX3F1ZXJ5IiwiX2h0dHAiLCJjb21wb3NlTmV4dFVybFF1ZXJ5UGFyYW0iLCJyZXF1ZXN0IiwiYmFzZVBhdGgiLCJjdXJyZW50VXJsIiwidXJsIiwidG9TdHJpbmciLCJwYXJzZWRVcmwiLCJwYXJzZSIsIm5leHRVcmwiLCJwYXRoIiwiZW5jb2RlVXJpUXVlcnkiLCJnZXRSZWRpcmVjdFVybCIsImVycm9yIiwiSU5WQUxJRF9ORVhUX1VSTF9QQVJBTUVURVJfTUVTU0FHRSIsImV4cG9ydHMiLCJ2YWxpZGF0ZU5leHRVcmwiLCJzcGxpdCIsImJwIiwic3RhcnRzV2l0aCIsInBhdGhNaW51c0Jhc2UiLCJyZXBsYWNlIiwibGVuZ3RoIiwidGVzdCJdLCJzb3VyY2VzIjpbIm5leHRfdXJsLnRzIl0sInNvdXJjZXNDb250ZW50IjpbIi8qXG4gKiAgIENvcHlyaWdodCBPcGVuU2VhcmNoIENvbnRyaWJ1dG9yc1xuICpcbiAqICAgTGljZW5zZWQgdW5kZXIgdGhlIEFwYWNoZSBMaWNlbnNlLCBWZXJzaW9uIDIuMCAodGhlIFwiTGljZW5zZVwiKS5cbiAqICAgWW91IG1heSBub3QgdXNlIHRoaXMgZmlsZSBleGNlcHQgaW4gY29tcGxpYW5jZSB3aXRoIHRoZSBMaWNlbnNlLlxuICogICBBIGNvcHkgb2YgdGhlIExpY2Vuc2UgaXMgbG9jYXRlZCBhdFxuICpcbiAqICAgICAgIGh0dHA6Ly93d3cuYXBhY2hlLm9yZy9saWNlbnNlcy9MSUNFTlNFLTIuMFxuICpcbiAqICAgb3IgaW4gdGhlIFwibGljZW5zZVwiIGZpbGUgYWNjb21wYW55aW5nIHRoaXMgZmlsZS4gVGhpcyBmaWxlIGlzIGRpc3RyaWJ1dGVkXG4gKiAgIG9uIGFuIFwiQVMgSVNcIiBCQVNJUywgV0lUSE9VVCBXQVJSQU5USUVTIE9SIENPTkRJVElPTlMgT0YgQU5ZIEtJTkQsIGVpdGhlclxuICogICBleHByZXNzIG9yIGltcGxpZWQuIFNlZSB0aGUgTGljZW5zZSBmb3IgdGhlIHNwZWNpZmljIGxhbmd1YWdlIGdvdmVybmluZ1xuICogICBwZXJtaXNzaW9ucyBhbmQgbGltaXRhdGlvbnMgdW5kZXIgdGhlIExpY2Vuc2UuXG4gKi9cblxuaW1wb3J0IHsgcGFyc2UgfSBmcm9tICd1cmwnO1xuaW1wb3J0IHsgUGFyc2VkVXJsUXVlcnkgfSBmcm9tICdxdWVyeXN0cmluZyc7XG5pbXBvcnQgeyBPcGVuU2VhcmNoRGFzaGJvYXJkc1JlcXVlc3QgfSBmcm9tICdvcGVuc2VhcmNoLWRhc2hib2FyZHMvc2VydmVyJztcbmltcG9ydCB7IGVuY29kZVVyaVF1ZXJ5IH0gZnJvbSAnLi4vLi4vLi4vLi4vc3JjL3BsdWdpbnMvb3BlbnNlYXJjaF9kYXNoYm9hcmRzX3V0aWxzL2NvbW1vbi91cmwvZW5jb2RlX3VyaV9xdWVyeSc7XG5pbXBvcnQgeyBnZXRSZWRpcmVjdFVybCB9IGZyb20gJy4uLy4uLy4uLy4uL3NyYy9jb3JlL3NlcnZlci9odHRwJztcblxuZXhwb3J0IGZ1bmN0aW9uIGNvbXBvc2VOZXh0VXJsUXVlcnlQYXJhbShcbiAgcmVxdWVzdDogT3BlblNlYXJjaERhc2hib2FyZHNSZXF1ZXN0LFxuICBiYXNlUGF0aDogc3RyaW5nXG4pOiBzdHJpbmcge1xuICB0cnkge1xuICAgIGNvbnN0IGN1cnJlbnRVcmwgPSByZXF1ZXN0LnVybC50b1N0cmluZygpO1xuICAgIGNvbnN0IHBhcnNlZFVybCA9IHBhcnNlKGN1cnJlbnRVcmwsIHRydWUpO1xuICAgIGNvbnN0IG5leHRVcmwgPSBwYXJzZWRVcmw/LnBhdGg7XG5cbiAgICBpZiAoISFuZXh0VXJsICYmIG5leHRVcmwgIT09ICcvJykge1xuICAgICAgcmV0dXJuIGBuZXh0VXJsPSR7ZW5jb2RlVXJpUXVlcnkoXG4gICAgICAgIGdldFJlZGlyZWN0VXJsKHtcbiAgICAgICAgICByZXF1ZXN0LFxuICAgICAgICAgIGJhc2VQYXRoLFxuICAgICAgICAgIG5leHRVcmwsXG4gICAgICAgIH0pXG4gICAgICApfWA7XG4gICAgfVxuICB9IGNhdGNoIChlcnJvcikge1xuICAgIC8qIElnbm9yZSBlcnJvcnMgZnJvbSBwYXJzaW5nICovXG4gIH1cbiAgcmV0dXJuICcnO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFBhcnNlZFVybFF1ZXJ5UGFyYW1zIGV4dGVuZHMgUGFyc2VkVXJsUXVlcnkge1xuICBuZXh0VXJsOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBjb25zdCBJTlZBTElEX05FWFRfVVJMX1BBUkFNRVRFUl9NRVNTQUdFID0gJ0ludmFsaWQgbmV4dFVybCBwYXJhbWV0ZXIuJztcblxuLyoqXG4gKiBXZSByZXF1aXJlIHRoZSBuZXh0VXJsIHBhcmFtZXRlciB0byBiZSBhbiByZWxhdGl2ZSB1cmwuXG4gKlxuICogSGVyZSB3ZSB2YWxpZGF0ZSB0aGUgbmV4dFVybCBwYXJhbWV0ZXIgYnkgY2hlY2tpbmcgaWYgaXQgbWVldHMgdGhlIGZvbGxvd2luZyBjcml0ZXJpYTpcbiAqICAgLSBuZXh0VXJsIHN0YXJ0cyB3aXRoIHRoZSBiYXNlUGF0aCAoLyBpZiBubyBzZXJ2ZXJCYXNlUGF0aCBpcyBzZXQpXG4gKiAgIC0gSWYgbmV4dFVybCBpcyBsb25nZXIgdGhhbiAyIGNoYXJzIHRoZW4gdGhlIHNlY29uZCBjaGFyYWN0ZXIgbXVzdCBiZSBhbHBoYWJldGljYWwgb3IgdW5kZXJzY29yZVxuICogICAtIFRoZSBmb2xsb3dpbmcgY2hhcmFjdGVycyBtdXN0IGJlIGFscGhhbnVtZXJpYywgZGFzaCBvciB1bmRlcnNjb3JlXG4gKiBOb3RlOiB1cmwgaGFzIGJlZW4gZGVjb2RlZCBieSBPcGVuU2VhcmNoRGFzaGJvYXJkcy5cbiAqXG4gKiBAcGFyYW0gdXJsIHVybCBzdHJpbmcuXG4gKiBAcmV0dXJucyBlcnJvciBtZXNzYWdlIGlmIG5leHRVcmwgaXMgaW52YWxpZCwgb3RoZXJ3aXNlIHZvaWQuXG4gKi9cbmV4cG9ydCBmdW5jdGlvbiB2YWxpZGF0ZU5leHRVcmwoXG4gIHVybDogc3RyaW5nIHwgdW5kZWZpbmVkLFxuICBiYXNlUGF0aDogc3RyaW5nIHwgdW5kZWZpbmVkXG4pOiBzdHJpbmcgfCB2b2lkIHtcbiAgaWYgKHVybCkge1xuICAgIGNvbnN0IHBhdGggPSB1cmwuc3BsaXQoL1xcP3wjLylbMF07XG4gICAgY29uc3QgYnAgPSBiYXNlUGF0aCB8fCAnJztcbiAgICBpZiAoIXBhdGguc3RhcnRzV2l0aChicCkpIHtcbiAgICAgIHJldHVybiBJTlZBTElEX05FWFRfVVJMX1BBUkFNRVRFUl9NRVNTQUdFO1xuICAgIH1cbiAgICBjb25zdCBwYXRoTWludXNCYXNlID0gcGF0aC5yZXBsYWNlKGJwLCAnJyk7XG4gICAgaWYgKFxuICAgICAgKHBhdGhNaW51c0Jhc2UgJiYgIXBhdGhNaW51c0Jhc2Uuc3RhcnRzV2l0aCgnLycpKSB8fFxuICAgICAgKHBhdGhNaW51c0Jhc2UubGVuZ3RoID49IDIgJiYgIS9eXFwvW2EtekEtWl9dW1xcL2EtekEtWjAtOS1fXSskLy50ZXN0KHBhdGhNaW51c0Jhc2UpKVxuICAgICkge1xuICAgICAgcmV0dXJuIElOVkFMSURfTkVYVF9VUkxfUEFSQU1FVEVSX01FU1NBR0U7XG4gICAgfVxuICB9XG59XG4iXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBZUEsSUFBQUEsSUFBQSxHQUFBQyxPQUFBO0FBR0EsSUFBQUMsaUJBQUEsR0FBQUQsT0FBQTtBQUNBLElBQUFFLEtBQUEsR0FBQUYsT0FBQTtBQW5CQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBOztBQVFPLFNBQVNHLHdCQUF3QkEsQ0FDdENDLE9BQW9DLEVBQ3BDQyxRQUFnQixFQUNSO0VBQ1IsSUFBSTtJQUNGLE1BQU1DLFVBQVUsR0FBR0YsT0FBTyxDQUFDRyxHQUFHLENBQUNDLFFBQVEsQ0FBQyxDQUFDO0lBQ3pDLE1BQU1DLFNBQVMsR0FBRyxJQUFBQyxVQUFLLEVBQUNKLFVBQVUsRUFBRSxJQUFJLENBQUM7SUFDekMsTUFBTUssT0FBTyxHQUFHRixTQUFTLGFBQVRBLFNBQVMsdUJBQVRBLFNBQVMsQ0FBRUcsSUFBSTtJQUUvQixJQUFJLENBQUMsQ0FBQ0QsT0FBTyxJQUFJQSxPQUFPLEtBQUssR0FBRyxFQUFFO01BQ2hDLE9BQVEsV0FBVSxJQUFBRSxnQ0FBYyxFQUM5QixJQUFBQyxvQkFBYyxFQUFDO1FBQ2JWLE9BQU87UUFDUEMsUUFBUTtRQUNSTTtNQUNGLENBQUMsQ0FDSCxDQUFFLEVBQUM7SUFDTDtFQUNGLENBQUMsQ0FBQyxPQUFPSSxLQUFLLEVBQUU7SUFDZDtFQUFBO0VBRUYsT0FBTyxFQUFFO0FBQ1g7QUFNTyxNQUFNQyxrQ0FBa0MsR0FBQUMsT0FBQSxDQUFBRCxrQ0FBQSxHQUFHLDRCQUE0Qjs7QUFFOUU7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ0E7QUFDQTtBQUNBO0FBQ08sU0FBU0UsZUFBZUEsQ0FDN0JYLEdBQXVCLEVBQ3ZCRixRQUE0QixFQUNiO0VBQ2YsSUFBSUUsR0FBRyxFQUFFO0lBQ1AsTUFBTUssSUFBSSxHQUFHTCxHQUFHLENBQUNZLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDakMsTUFBTUMsRUFBRSxHQUFHZixRQUFRLElBQUksRUFBRTtJQUN6QixJQUFJLENBQUNPLElBQUksQ0FBQ1MsVUFBVSxDQUFDRCxFQUFFLENBQUMsRUFBRTtNQUN4QixPQUFPSixrQ0FBa0M7SUFDM0M7SUFDQSxNQUFNTSxhQUFhLEdBQUdWLElBQUksQ0FBQ1csT0FBTyxDQUFDSCxFQUFFLEVBQUUsRUFBRSxDQUFDO0lBQzFDLElBQ0dFLGFBQWEsSUFBSSxDQUFDQSxhQUFhLENBQUNELFVBQVUsQ0FBQyxHQUFHLENBQUMsSUFDL0NDLGFBQWEsQ0FBQ0UsTUFBTSxJQUFJLENBQUMsSUFBSSxDQUFDLCtCQUErQixDQUFDQyxJQUFJLENBQUNILGFBQWEsQ0FBRSxFQUNuRjtNQUNBLE9BQU9OLGtDQUFrQztJQUMzQztFQUNGO0FBQ0YifQ== diff --git a/textproc/opensearch-dashboards219/files/patch-src_core_server_opensearch_legacy_opensearch__client__config.js b/textproc/opensearch-dashboards219/files/patch-src_core_server_opensearch_legacy_opensearch__client__config.js new file mode 100644 index 000000000000..cd401aa27fe9 --- /dev/null +++ b/textproc/opensearch-dashboards219/files/patch-src_core_server_opensearch_legacy_opensearch__client__config.js @@ -0,0 +1,26 @@ +--- src/core/server/opensearch/legacy/opensearch_client_config.js.orig 2026-06-04 21:37:54 UTC ++++ src/core/server/opensearch/legacy/opensearch_client_config.js +@@ -5,7 +5,6 @@ var _lodash = require("lodash"); + }); + exports.parseOpenSearchClientConfig = parseOpenSearchClientConfig; + var _lodash = require("lodash"); +-var _url = _interopRequireDefault(require("url")); + var _std = require("@osd/std"); + var _default_headers = require("../default_headers"); + function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; } +@@ -77,7 +76,7 @@ function parseOpenSearchClientConfig(config, log, { + if (Array.isArray(config.hosts)) { + const needsAuth = auth !== false && config.username && config.password; + opensearchClientConfig.hosts = config.hosts.map(nodeUrl => { +- const uri = _url.default.parse(nodeUrl); ++ const uri = new URL('', nodeUrl); + const httpsURI = uri.protocol === 'https:'; + const httpURI = uri.protocol === 'http:'; + const host = { +@@ -164,4 +163,4 @@ function getLoggerClass(log, logQueries = false) { + // noop + } + }; +-} +\ No newline at end of file ++}