From 770fb9d2ad964b81019f7806bdc3f3905d1c455b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Thu, 15 Feb 2024 10:54:18 +0100 Subject: [PATCH 1/5] fix(docker): fix libexpat vulnerability (#9600) --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c3706056397e..53ff7af9c5ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,11 @@ # We don't declare them here — take a look at our docs. # https://github.com/swagger-api/swagger-ui/blob/master/docs/usage/configuration.md -FROM nginx:1.25.3-alpine +FROM nginx:1.25.4-alpine -RUN apk update && apk add --no-cache "nodejs>=18.14.1-r0" && apk add --no-cache "tiff>=4.4.0-r4" +RUN apk add "nodejs" -LABEL maintainer="fehguy" +LABEL maintainer="char0n" ENV API_KEY="**None**" \ SWAGGER_JSON="/app/swagger.json" \ From e60012736bf0f6f5870ae4aa5e0e3a4095007ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Thu, 15 Feb 2024 10:59:34 +0100 Subject: [PATCH 2/5] fix(docker): fix libexpat vulnerability (#9601) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 53ff7af9c5ec..739072374475 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM nginx:1.25.4-alpine -RUN apk add "nodejs" +RUN apk update && apk add "nodejs" && apk add --no-cache "libexpat>=2.6.0-r0" LABEL maintainer="char0n" From 363b3abbd634dc934c28f43ee3be2053e12bd2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Thu, 15 Feb 2024 11:16:05 +0100 Subject: [PATCH 3/5] fix(docker): fix libexpat vulnerability (#9602) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 739072374475..53ff7af9c5ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ FROM nginx:1.25.4-alpine -RUN apk update && apk add "nodejs" && apk add --no-cache "libexpat>=2.6.0-r0" +RUN apk add "nodejs" LABEL maintainer="char0n" From 16fef9633898854448e3545515af41c11286a52e Mon Sep 17 00:00:00 2001 From: Oliwia Rogala Date: Thu, 15 Feb 2024 11:17:11 +0100 Subject: [PATCH 4/5] fix: associate HTML labels with inputs (#9599) Refs #8879 Co-authored-by: morsko1 --- src/core/components/auth/api-key-auth.jsx | 11 ++++- src/core/components/auth/basic-auth.jsx | 28 +++++++++--- src/core/components/param-body.jsx | 10 ++++- .../components/parameter-include-empty.jsx | 16 ++++--- src/core/components/parameters/parameters.jsx | 9 +++- .../oas3/components/auth/http-auth.jsx | 45 ++++++++++++++----- 6 files changed, 90 insertions(+), 29 deletions(-) diff --git a/src/core/components/auth/api-key-auth.jsx b/src/core/components/auth/api-key-auth.jsx index 5b3527e8c062..f85c6014c05d 100644 --- a/src/core/components/auth/api-key-auth.jsx +++ b/src/core/components/auth/api-key-auth.jsx @@ -66,10 +66,17 @@ export default class ApiKeyAuth extends React.Component {

In: { schema.get("in") }

- + { value ? ****** - : + : + + } { diff --git a/src/core/components/auth/basic-auth.jsx b/src/core/components/auth/basic-auth.jsx index baa5268ffc99..f982f71f624c 100644 --- a/src/core/components/auth/basic-auth.jsx +++ b/src/core/components/auth/basic-auth.jsx @@ -65,20 +65,34 @@ export default class BasicAuth extends React.Component { - + { username ? { username } - : + : + + } - + { username ? ****** - : + : + + } { diff --git a/src/core/components/param-body.jsx b/src/core/components/param-body.jsx index 3ac5a21e88e9..11eeef9f7b9f 100644 --- a/src/core/components/param-body.jsx +++ b/src/core/components/param-body.jsx @@ -2,6 +2,7 @@ import React, { PureComponent } from "react" import PropTypes from "prop-types" import { fromJS, List } from "immutable" import { getKnownSyntaxHighlighterLanguage } from "core/utils/jsonParse" +import createHtmlReadyId from "core/utils/create-html-ready-id" const NOOP = Function.prototype @@ -118,6 +119,9 @@ export default class ParamBody extends PureComponent { language = "json" } + const regionId = createHtmlReadyId(`${pathMethod[1]}${pathMethod[0]}_parameters`) + const controlId = `${regionId}_select` + return (
{ @@ -137,14 +141,16 @@ export default class ParamBody extends PureComponent {
} -