From 2e9ab0625e9e58995d8376bf3d41b62bce9d2640 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 23 Jan 2020 06:23:53 +0900 Subject: [PATCH 1/3] Tweak actions (#1305) * Add benchmark action * Fix Windows build --- .github/workflows/bench.yml | 42 +++++++++++++++++++++++++++++++++++ .github/workflows/macos.yml | 2 +- .github/workflows/windows.yml | 22 +++++++++++++----- 3 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 .github/workflows/bench.yml diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml new file mode 100644 index 000000000..3c9deb49c --- /dev/null +++ b/.github/workflows/bench.yml @@ -0,0 +1,42 @@ +name: Benchmark (Linux) + +on: [push, pull_request] + +jobs: + check_benchmark: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@master + + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + profile: minimal + override: true + + - name: Generate Cargo.lock + uses: actions-rs/cargo@v1 + with: + command: generate-lockfile + - name: Cache cargo registry + uses: actions/cache@v1 + with: + path: ~/.cargo/registry + key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-registry-${{ hashFiles('**/Cargo.lock') }} + - name: Cache cargo index + uses: actions/cache@v1 + with: + path: ~/.cargo/git + key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-${{ hashFiles('**/Cargo.lock') }} + - name: Cache cargo build + uses: actions/cache@v1 + with: + path: target + key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-build-${{ hashFiles('**/Cargo.lock') }} + + - name: Check benchmark + uses: actions-rs/cargo@v1 + with: + command: bench diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index f50ae2f05..d30d6b3e9 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -27,7 +27,7 @@ jobs: - name: Generate Cargo.lock uses: actions-rs/cargo@v1 with: - command: update + command: generate-lockfile - name: Cache cargo registry uses: actions/cache@v1 with: diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9aa3d3ba4..52c82a886 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,6 +3,7 @@ name: CI (Windows) on: [push, pull_request] env: + VCPKG_HASH: 3f62e5d55d1a7d8905df35d5c441d6e9ad64ffdf VCPKGRS_DYNAMIC: 1 jobs: @@ -30,7 +31,7 @@ jobs: - name: Generate Cargo.lock uses: actions-rs/cargo@v1 with: - command: update + command: generate-lockfile - name: Cache cargo registry uses: actions/cache@v1 with: @@ -50,14 +51,23 @@ jobs: uses: actions/cache@v1 id: cache-vcpkg with: - path: C:\vcpkg - key: windows_x64-${{ matrix.version }}-vcpkg + path: vcpkg + key: windows_x64-${{ env.VCPKG_HASH }}-vcpkg - name: Install OpenSSL if: steps.cache-vcpkg.outputs.cache-hit != 'true' + shell: pwsh run: | - vcpkg integrate install - vcpkg install openssl:x64-windows + git clone https://github.com/Microsoft/vcpkg.git + cd vcpkg + git reset --hard $VCPKG_HASH + .\bootstrap-vcpkg.bat + .\vcpkg integrate install + .\vcpkg install openssl:x64-windows + Copy-Item .\installed\x64-windows\bin\libcrypto-1_1-x64.dll .\installed\x64-windows\bin\libcrypto.dll + Copy-Item .\installed\x64-windows\bin\libssl-1_1-x64.dll .\installed\x64-windows\bin\libssl.dll + Get-ChildItem .\installed\x64-windows\bin + Get-ChildItem .\installed\x64-windows\lib - name: check build uses: actions-rs/cargo@v1 @@ -76,4 +86,4 @@ jobs: --skip=test_simple --skip=test_expect_continue --skip=test_http10_keepalive - --skip=test_slow_request + --skip=test_slow_request From a3287948d19bbdc9e7cf9957403961eeb2d8b94d Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Thu, 23 Jan 2020 01:08:23 +0000 Subject: [PATCH 2/3] allow explicit SameSite=None cookies (#1282) fixes #1035 --- MIGRATION.md | 6 ++++++ actix-http/CHANGES.md | 6 ++++++ actix-http/src/cookie/draft.rs | 16 ++++++++++++---- actix-http/src/cookie/mod.rs | 6 ++---- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/MIGRATION.md b/MIGRATION.md index 529f9714d..aef382a21 100644 --- a/MIGRATION.md +++ b/MIGRATION.md @@ -1,3 +1,9 @@ +## Unreleased + +* Setting a cookie's SameSite property, explicitly, to `SameSite::None` will now + result in `SameSite=None` being sent with the response Set-Cookie header. + To create a cookie without a SameSite attribute, remove any calls setting same_site. + ## 2.0.0 * `HttpServer::start()` renamed to `HttpServer::run()`. It also possible to diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md index 1c8e4f053..ee3dae5d5 100644 --- a/actix-http/CHANGES.md +++ b/actix-http/CHANGES.md @@ -1,5 +1,11 @@ # Changes +# [Unreleased] + +### Fixed + +* Allow `SameSite=None` cookies to be sent in a response. + ## [1.0.1] - 2019-12-20 ### Fixed diff --git a/actix-http/src/cookie/draft.rs b/actix-http/src/cookie/draft.rs index a2b039121..1c7123422 100644 --- a/actix-http/src/cookie/draft.rs +++ b/actix-http/src/cookie/draft.rs @@ -10,18 +10,26 @@ use std::fmt; /// attribute is "Strict", then the cookie is never sent in cross-site requests. /// If the `SameSite` attribute is "Lax", the cookie is only sent in cross-site /// requests with "safe" HTTP methods, i.e, `GET`, `HEAD`, `OPTIONS`, `TRACE`. -/// If the `SameSite` attribute is not present (made explicit via the -/// `SameSite::None` variant), then the cookie will be sent as normal. +/// If the `SameSite` attribute is not present then the cookie will be sent as +/// normal. In some browsers, this will implicitly handle the cookie as if "Lax" +/// and in others, "None". It's best to explicitly set the `SameSite` attribute +/// to avoid inconsistent behavior. +/// +/// **Note:** Depending on browser, the `Secure` attribute may be required for +/// `SameSite` "None" cookies to be accepted. /// /// **Note:** This cookie attribute is an HTTP draft! Its meaning and definition /// are subject to change. +/// +/// More info about these draft changes can be found in the draft spec: +/// - https://tools.ietf.org/html/draft-west-cookie-incrementalism-00 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum SameSite { /// The "Strict" `SameSite` attribute. Strict, /// The "Lax" `SameSite` attribute. Lax, - /// No `SameSite` attribute. + /// The "None" `SameSite` attribute. None, } @@ -92,7 +100,7 @@ impl fmt::Display for SameSite { match *self { SameSite::Strict => write!(f, "Strict"), SameSite::Lax => write!(f, "Lax"), - SameSite::None => Ok(()), + SameSite::None => write!(f, "None"), } } } diff --git a/actix-http/src/cookie/mod.rs b/actix-http/src/cookie/mod.rs index 13fd5cf4e..d9db600ea 100644 --- a/actix-http/src/cookie/mod.rs +++ b/actix-http/src/cookie/mod.rs @@ -746,9 +746,7 @@ impl<'c> Cookie<'c> { } if let Some(same_site) = self.same_site() { - if !same_site.is_none() { - write!(f, "; SameSite={}", same_site)?; - } + write!(f, "; SameSite={}", same_site)?; } if let Some(path) = self.path() { @@ -1037,7 +1035,7 @@ mod tests { let cookie = Cookie::build("foo", "bar") .same_site(SameSite::None) .finish(); - assert_eq!(&cookie.to_string(), "foo=bar"); + assert_eq!(&cookie.to_string(), "foo=bar; SameSite=None"); } #[test] From c6fa007e726386544b0ebc8b7dd459d62bfd5e69 Mon Sep 17 00:00:00 2001 From: Yuki Okushi Date: Thu, 23 Jan 2020 11:27:34 +0900 Subject: [PATCH 3/3] Fix vcpkg cache (#1312) --- .github/workflows/windows.yml | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 52c82a886..06f5af824 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -3,7 +3,6 @@ name: CI (Windows) on: [push, pull_request] env: - VCPKG_HASH: 3f62e5d55d1a7d8905df35d5c441d6e9ad64ffdf VCPKGRS_DYNAMIC: 1 jobs: @@ -47,27 +46,15 @@ jobs: with: path: target key: ${{ matrix.version }}-x86_64-pc-windows-msvc-cargo-build-${{ hashFiles('**/Cargo.lock') }} - - name: Cache vcpkg package - uses: actions/cache@v1 - id: cache-vcpkg - with: - path: vcpkg - key: windows_x64-${{ env.VCPKG_HASH }}-vcpkg - name: Install OpenSSL - if: steps.cache-vcpkg.outputs.cache-hit != 'true' - shell: pwsh run: | - git clone https://github.com/Microsoft/vcpkg.git - cd vcpkg - git reset --hard $VCPKG_HASH - .\bootstrap-vcpkg.bat - .\vcpkg integrate install - .\vcpkg install openssl:x64-windows - Copy-Item .\installed\x64-windows\bin\libcrypto-1_1-x64.dll .\installed\x64-windows\bin\libcrypto.dll - Copy-Item .\installed\x64-windows\bin\libssl-1_1-x64.dll .\installed\x64-windows\bin\libssl.dll - Get-ChildItem .\installed\x64-windows\bin - Get-ChildItem .\installed\x64-windows\lib + vcpkg integrate install + vcpkg install openssl:x64-windows + Copy-Item C:\vcpkg\installed\x64-windows\bin\libcrypto-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libcrypto.dll + Copy-Item C:\vcpkg\installed\x64-windows\bin\libssl-1_1-x64.dll C:\vcpkg\installed\x64-windows\bin\libssl.dll + Get-ChildItem C:\vcpkg\installed\x64-windows\bin + Get-ChildItem C:\vcpkg\installed\x64-windows\lib - name: check build uses: actions-rs/cargo@v1