Skip to content

Sync master with upstream - #211

Closed
OS-miguelfreitas wants to merge 248 commits into
masterfrom
sync-master-with-upstream
Closed

OS-miguelfreitas wants to merge 248 commits into
masterfrom
sync-master-with-upstream

Conversation

@OS-miguelfreitas

Copy link
Copy Markdown

Description

Motivation and Context

How Has This Been Tested?

Screenshots (if appropriate):

Checklist

My PR contains...

  • No code changes (src/ is unmodified: changes to documentation, CI, metadata, etc.)
  • Dependency changes (any modification to dependencies in package.json)
  • Bug fixes (non-breaking change which fixes an issue)
  • Improvements (misc. changes to existing features)
  • Features (non-breaking change which adds functionality)

My changes...

  • are breaking changes to a public API (config options, System API, major UI change, etc).
  • are breaking changes to a private API (Redux, component props, utility functions, etc.).
  • are breaking changes to a developer API (npm script behavior changes, new dev system dependencies, etc).
  • are not breaking changes.

Documentation

  • My changes do not require a change to the project documentation.
  • My changes require a change to the project documentation.
  • If yes to above: I have updated the documentation accordingly.

Automated tests

  • My changes can not or do not need to be tested.
  • My changes can and should be tested by unit and/or integration tests.
  • If yes to above: I have added tests to cover my changes.
  • If yes to above: I have taken care to cover edge cases in my tests.
  • All new and existing tests passed.

glowcloud and others added 30 commits August 28, 2025 15:00
Refs swagger-api#10243

---------

Co-authored-by: Ebert Felix (HC/XAD1.3) <Felix.Ebert@de.bosch.com>
# [5.29.0](swagger-api/swagger-ui@v5.28.1...v5.29.0) (2025-09-09)

### Features

* **oauth2-redirect:** externalize inline script for CSP compliance ([swagger-api#10559](swagger-api#10559)) ([35eb103](swagger-api@35eb103))
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 4 to 5.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](actions/setup-node@v4...v5)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: robert-hebel-sb <robert.hebel@smartbear.com>
Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 5.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v4...v5)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
## [5.29.1](swagger-api/swagger-ui@v5.29.0...v5.29.1) (2025-09-29)

### Bug Fixes

* **security:** update Axios to non-vulnerable 1.12.2 version ([swagger-api#10579](swagger-api#10579)) ([54276b9](swagger-api@54276b9))
## [5.29.2](swagger-api/swagger-ui@v5.29.1...v5.29.2) (2025-10-02)

### Bug Fixes

* include oauth2-redirect.js in npm package distribution ([swagger-api#10585](swagger-api#10585)) ([443c011](swagger-api@443c011)), closes [swagger-api#10574](swagger-api#10574)
## [5.29.3](swagger-api/swagger-ui@v5.29.2...v5.29.3) (2025-10-03)

### Bug Fixes

* **auth:** ensure schema is immutable when persisting authorization ([swagger-api#10588](swagger-api#10588)) ([9124f59](swagger-api@9124f59)), closes [swagger-api#10569](swagger-api#10569)
## [5.29.4](swagger-api/swagger-ui@v5.29.3...v5.29.4) (2025-10-10)

### Bug Fixes

* **core:** refactor UNSAFE_ lifecycle methods in ContentType and OperationContainer ([swagger-api#10373](swagger-api#10373)) ([2814709](swagger-api@2814709)), closes [swagger-api#10212](swagger-api#10212)
* ignore rendering responses with extensions in the schema ([swagger-api#10592](swagger-api#10592)) ([23e3e00](swagger-api@23e3e00))
* include script in body ([swagger-api#10593](swagger-api#10593)) ([456274c](swagger-api@456274c))
* update vulnerable libxml2 to 2.13.9-r0 ([swagger-api#10600](swagger-api#10600)) ([8138154](swagger-api@8138154))
* use h1 for title heading to improve accessibility ([swagger-api#10598](swagger-api#10598)) ([c0bd7b6](swagger-api@c0bd7b6)), closes [swagger-api#10480](swagger-api#10480)
robert-hebel-sb and others added 23 commits September 1, 2026 20:14
## [5.32.15](swagger-api/swagger-ui@v5.32.14...v5.32.15) (2026-09-04)

### Bug Fixes

* **oas32:** include query in default supportedSubmitMethods ([swagger-api#11021](swagger-api#11021)) ([c26e573](swagger-api@c26e573))
* use scoped DOMPurify instance to avoid mutating global ([swagger-api#11029](swagger-api#11029)) ([182fb83](swagger-api@182fb83))
# [5.33.0](swagger-api/swagger-ui@v5.32.15...v5.33.0) (2026-09-16)

### Bug Fixes

* **icons:** operation copy-to-clipboard icon visibility ([swagger-api#11050](swagger-api#11050)) ([45119d8](swagger-api@45119d8))

### Features

* add virtualization for schemas and operations ([swagger-api#11019](swagger-api#11019)) ([0ad38e9](swagger-api@0ad38e9))
@OS-miguelfreitas OS-miguelfreitas self-assigned this Sep 22, 2026
@wiz-code-outsystems

Copy link
Copy Markdown

Wiz Scan Summary

Scanner Findings
Vulnerability Finding Vulnerabilities -
Data Finding Sensitive Data -
Secret Finding Secrets -
IaC Misconfiguration IaC Misconfigurations 1 High 1 Low
SAST Finding SAST Findings 2 Medium
Software Management Finding Software Management Findings -
Total 1 High 2 Medium 1 Low

View scan details in Wiz

To detect these findings earlier in the dev lifecycle, try the Wiz Code extension for VS Code, JetBrains, or Visual Studio.

Pull Request Developer Guidance

Questions? See the Wiz FAQ.

Please contact the Security Office if you encounter issues with Wiz pull request scanning.

Comment thread Dockerfile
# https://github.com/swagger-api/swagger-ui/blob/main/docs/usage/configuration.md

FROM nginx:1.29.1-alpine
FROM nginx:1.31.5-alpine

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

High IaC Finding

Missing User Instruction

More Details
This rule checks whether a `USER` instruction is specified in the Dockerfile. The rule fails when the `USER` instruction is missing, causing the container to run with root privileges (UID 0). If an attacker compromises an application running as root, they gain the privileges needed to potentially escape the container and attack the host node. It also increases the blast radius of a breach, allowing full control to modify files or install malware within the container. Enforcing a non-root user is a fundamental security measure that minimizes the attack surface and contains the impact of a potential compromise.

Expected

The Dockerfile stage should contain the 'USER' instruction

Found

The Dockerfile stage does not contain any 'USER' instruction

Rule ID: 6cd7a272-d9d1-4667-8224-73140fbaabdd


To ignore this finding as an exception, reply to this conversation with #wiz_ignore reason

If you'd like to ignore this finding in all future scans, add an exception in the .wiz file (learn more) or create an Ignore Rule (learn more).


To get more details on how to remediate this issue using AI, reply to this conversation with #wiz remediate

})
}

app.get("*", authenticate, function (req, res) {

@OS-joaomurgeiro OS-joaomurgeiro left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocker: upstream renamed master → main

The sync imports that rename into every branch filter, but our default branch is still master and main does not exist in this repo. On merge:

  • .github/workflows/nodejs.yml:8,10 → branches: [ main, next ]. No build, no e2e-tests on any push to or PR against our default branch. This already happened on this PR — the check list here has CodeQL, Wiz and Slack Notification but no build/e2e-tests, whereas #199 (the last PR into master) ran all five.
  • .github/dependabot.yaml:25 → target-branch: "main". Dependabot stops opening GitHub Actions update PRs.
  • .github/workflows/dependabot-merge.yml:5 → auto-approve/auto-merge stops firing for PRs into our default branch.
  • Same rename in codeql.yml:16,19, docker-build-push*.yml:8 and the three release-swagger-ui*.yml (harmless for us — those have no credentials configured on this fork and have never been run here).

Fix: rename our branch rather than patch the filters

This fixes all of the above at once and keeps future syncs conflict-free. Checked that it's safe:

  • Zero master references remain anywhere in the repo's config after this merge — everything already points at main.
  • Platform only pins b11 (OutSystemsJavascriptLocations.csv:12); nothing external points at master.
  • The Wiz PR checks - 2026 Q2 ruleset already includes ~DEFAULT_BRANCH, refs/heads/main and refs/heads/main*, so required checks survive the rename.
  • b11's workflows do reference master, but only in filters that never matched b11-targeted events — unaffected either way.

Order of actions

  1. Rename the default branch master → main (Settings → Branches). GitHub retargets all open PRs, transfers protection, and sets up redirects.

  2. Re-trigger this PR. The rename retargets it to main but does not re-fire pull_request workflows. Push to sync-master-with-upstream (or close/reopen) so nodejs.yml matches and build + the four e2e-tests shards actually run.

  3. Merge once CI is green.

  4. Have everyone update their local clones:

    git branch -m master main && git fetch origin && git branch -u origin/main main && git remote set-head origin -a

@OS-miguelfreitas
OS-miguelfreitas deleted the sync-master-with-upstream branch September 23, 2026 14:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.