Several small patches #439
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
bitfl0wer
commented
Nov 14, 2023
bitfl0wer
commented
- Bump versions of 2 packages to mitigate security vulnerabilities
- Remove redundant structdef
- Split up gateway.rs into multiple files for better clarity
Bumps [tungstenite](https://github.com/snapview/tungstenite-rs) from 0.20.0 to 0.20.1. - [Changelog](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md) - [Commits](snapview/tungstenite-rs@v0.20.0...v0.20.1) --- updated-dependencies: - dependency-name: tungstenite dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.11 to 0.38.22. - [Release notes](https://github.com/bytecodealliance/rustix/releases) - [Commits](bytecodealliance/rustix@v0.38.11...v0.38.22) --- updated-dependencies: - dependency-name: rustix dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [tungstenite](https://github.com/snapview/tungstenite-rs) from 0.20.0 to 0.20.1. <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md">tungstenite's changelog</a>.</em></p> <blockquote> <h1>0.20.1</h1> <ul> <li>Fixes <a href="https://redirect.github.com/snapview/tungstenite-rs/pull/379">CVE-2023-43669</a>.</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/snapview/tungstenite-rs/commit/219075edaaaf503c66ef625f95bee8b4eb5b939c"><code>219075e</code></a> Merge pull request <a href="https://redirect.github.com/snapview/tungstenite-rs/issues/379">#379</a> from snapview/CVE-2023-43669</li> <li><a href="https://github.com/snapview/tungstenite-rs/commit/f0f1a06a5038d77c3a851157960cfcb2bdb13ae4"><code>f0f1a06</code></a> Bump crate version</li> <li><a href="https://github.com/snapview/tungstenite-rs/commit/2e5029284b8bef3e59df0c9d3920c0ed6c7da7a9"><code>2e50292</code></a> Add checking for header sanity</li> <li><a href="https://github.com/snapview/tungstenite-rs/commit/f916b332a97f78f4d54d942b9e008a1af57ff938"><code>f916b33</code></a> Add <code>AttackAttempt</code> error variant</li> <li><a href="https://github.com/snapview/tungstenite-rs/commit/53914c1180dfb40e2286fc7929d68a1a92f80971"><code>53914c1</code></a> Include examples so that <code>cargo publish</code> works</li> <li><a href="https://github.com/snapview/tungstenite-rs/commit/532355989131ab989525e4e01830570898a29dec"><code>5323559</code></a> Bump version</li> <li>See full diff in <a href="https://github.com/snapview/tungstenite-rs/compare/v0.20.0...v0.20.1">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/polyphony-chat/chorus/network/alerts). </details>
Bumps [rustix](https://github.com/bytecodealliance/rustix) from 0.38.11 to 0.38.22. <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/bytecodealliance/rustix/commit/58238c794c0c6cbbbafd37ee72e9ecd445fa5fea"><code>58238c7</code></a> chore: Release rustix version 0.38.22</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/ee297a1541ed43eab295a671cd8c522cadc225a1"><code>ee297a1</code></a> Miscellaneous clippy fixes. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/928">#928</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/b28c5a8308474ea45f8df94fd3b32425dceb8f34"><code>b28c5a8</code></a> Miscellaneous documentation cleanups. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/929">#929</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/cc82ed28cce2339f8ce5d566c0ca19d0083bc5f1"><code>cc82ed2</code></a> Fix ioctl numbers on BSDs (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/926">#926</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/90b2fbd818b039968448d4252b1d2a37d1ce29d5"><code>90b2fbd</code></a> Add ioctl <code>Updater</code> type (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/925">#925</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/e1d66b582272e5b7418976cc0938854eb558902a"><code>e1d66b5</code></a> Make <code>runtime::fork</code> return the PID in both the parent and child. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/924">#924</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/31dfad159d837deff0e37f08bc4a6516af0adacb"><code>31dfad1</code></a> Fixes for empty and multiple-entry control message buffers. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/915">#915</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/1edcdfe02a325cc2270c5c077558c91aa6571e4f"><code>1edcdfe</code></a> Add a <code>readlinkat_raw</code> function. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/923">#923</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/15278a1279e6d5d57adf36520cfd8d07d2ff4385"><code>15278a1</code></a> Implement <code>rustix::process::sched_getcpu</code>. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/921">#921</a>)</li> <li><a href="https://github.com/bytecodealliance/rustix/commit/560b2e818a38d2b27b477365199823abdccec4fc"><code>560b2e8</code></a> Remove redundant checks for <code>linux_kernel</code> in the linux_raw backend. (<a href="https://redirect.github.com/bytecodealliance/rustix/issues/922">#922</a>)</li> <li>Additional commits viewable in <a href="https://github.com/bytecodealliance/rustix/compare/v0.38.11...v0.38.22">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) You can disable automated security fix PRs for this repo from the [Security Alerts page](https://github.com/polyphony-chat/chorus/network/alerts). </details>
Delete events.rs Unify import Move HEARTBEAT_ACK_TIMEOUT since its not an OPCODE
As the title suggests, `Gateway` has been split up into several files,
due to it being several hundred locs in length and, in my opinion,
becoming difficult/frustrating to navigate.
I have also fixed 2 clippy warnings: I have refactored an `if
x.is_some()... { x.unwrap() }` into the more idiomatic `if let Some(y) =
x ...`, and I have removed the duplicate definition of `NSFWLevel` in
`types/invite`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.