Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/cargo-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ jobs:
builds:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
rust: [ '1.55.0' ]
os: [ ubuntu-latest, macos-latest ]
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ jobs:
rustup default ${{ matrix.rust }}
rustup component add rustfmt
- name: Build
# note: since there is no 'cargo clean' here, the results of scripts/prepare-dfx-assets.sh
# are often cached.
run: cargo build --locked --release
env:
OPENSSL_STATIC: yes
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ jobs:
name: lint
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
rust: [ '1.55.0' ]
os: [ ubuntu-latest, macos-latest ]
Expand Down
45 changes: 45 additions & 0 deletions .github/workflows/prepare-dfx-assets.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Check dfx asset preparation
# The cargo build steps in other workflows often benefit from caching of the results of this process,
# so this workflow runs it separately.

on:
pull_request:
push:
branches:
- master

jobs:
prepare:
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
rust: [ '1.55.0' ]
os: [ ubuntu-latest, macos-latest ]
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
with:
path: |
~/.cargo/registry
~/.cargo/git
target
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
- name: Install Rust
run: |
rustup update ${{ matrix.rust }} --no-self-update
rustup component add clippy
rustup default ${{ matrix.rust }}

- name: Prepare dfx assets
run: scripts/prepare-dfx-assets.sh "$(mktemp -d)"

aggregate:
name: prepare-dfx-assets:required
if: ${{ always() }}
needs: prepare
runs-on: ubuntu-latest
steps:
- name: check step result directly
if: ${{ needs.prepare.result != 'success' }}
run: exit 1
5 changes: 5 additions & 0 deletions e2e/tests-dfx/certificate.bash
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ setup() {
install_asset certificate
dfx_start

(uname -a | grep Linux) && return 0

dfx deploy

BACKEND="$(jq -r .networks.local.bind dfx.json)"
Expand Down Expand Up @@ -64,11 +66,14 @@ teardown() {
}

@test "mitm attack - update: attack fails because certificate verification fails" {
(uname -a | grep Linux) && skip "See SDK-221: mitmproxy / pyparsing incompatibility on ubuntu-latest"

assert_command_fail dfx canister call certificate hello_update '("Buckaroo")'
assert_match 'Certificate verification failed.'
}

@test "mitm attack - query: attack succeeds because there is no certificate to verify" {
(uname -a | grep Linux) && skip "See SDK-221: mitmproxy / pyparsing incompatibility on ubuntu-latest"
# The wallet does not have a query call forward method (currently calls forward from wallet's update method)
# So call with users Identity as sender here
# There may need to be a query version of wallet_call
Expand Down
8 changes: 4 additions & 4 deletions nix/sources.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,15 @@
"rev": "5ba08e57d607fc8fb159013fe30e46302cb4667d",
"sha256": "1jshdygx7pr0v7s4v2bm277y8jqyrpd9gdhwqmx1762nk7rqq8q0",
"type": "file",
"url": "https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/ic-starter.gz",
"url": "https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/ic-starter.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/x86_64-darwin/ic-starter.gz"
},
"ic-starter-x86_64-linux": {
"builtin": false,
"rev": "5ba08e57d607fc8fb159013fe30e46302cb4667d",
"sha256": "1cnib147bwmxi1hp8kwl002d0hp3pxdrmjy1s47fr3i3la18mw55",
"type": "file",
"url": "https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/ic-starter.gz",
"url": "https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/ic-starter.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/ic-starter.gz"
},
"icx-proxy": {
Expand Down Expand Up @@ -125,15 +125,15 @@
"rev": "5ba08e57d607fc8fb159013fe30e46302cb4667d",
"sha256": "1m3z228k2kzx9l7g0f8k52pk6hnr5l01jabvanchl2mbip3d27d6",
"type": "file",
"url": "https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/replica.gz",
"url": "https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/replica.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/x86_64-darwin/replica.gz"
},
"replica-x86_64-linux": {
"builtin": false,
"rev": "5ba08e57d607fc8fb159013fe30e46302cb4667d",
"sha256": "1faaxsklhqbc3pjw1fvnhzqlap3zzgjw4g07phzpz9drm8d0zah2",
"type": "file",
"url": "https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/replica.gz",
"url": "https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/replica.gz",
"url_template": "https://download.dfinity.systems/ic/<rev>/nix-release/replica.gz"
}
}
8 changes: 4 additions & 4 deletions scripts/dfx-asset-sources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ IC_REF_X86_64_DARWIN_URL="https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a
IC_REF_X86_64_LINUX_SHA256="9342175f9c2c4ff9174f7859f5f5c43d9f944fe91cd0237fbed448b6cf029f4b"
IC_REF_X86_64_LINUX_URL="https://download.dfinity.systems/ic-ref/ic-ref-0.0.1-a432156f-x86_64-linux.tar.gz"
IC_STARTER_X86_64_DARWIN_SHA256="00238cf3995698137ac51cb697dacd1e4be4cf1175894df4d920dfd39f6f50cb"
IC_STARTER_X86_64_DARWIN_URL="https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/ic-starter.gz"
IC_STARTER_X86_64_DARWIN_URL="https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/ic-starter.gz"
IC_STARTER_X86_64_LINUX_SHA256="a5f08a82a2238eec0ed1c1cb9a5bbfe342d00400944f746188bdf2754858d1b2"
IC_STARTER_X86_64_LINUX_URL="https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/ic-starter.gz"
IC_STARTER_X86_64_LINUX_URL="https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/ic-starter.gz"
MOTOKO_X86_64_DARWIN_SHA256="7c769856afaacfa435dded80daa3b7970611dc4420b48f5edee9f9d1c58f9d22"
MOTOKO_X86_64_DARWIN_URL="https://github.com/dfinity/motoko/releases/download/0.6.14/motoko-macos-0.6.14.tar.gz"
MOTOKO_X86_64_LINUX_SHA256="5ee769d7dd6b3a5d3daf84ced9bf50fa42a39925188d46b5f4be3a8a766327a1"
MOTOKO_X86_64_LINUX_URL="https://github.com/dfinity/motoko/releases/download/0.6.14/motoko-linux64-0.6.14.tar.gz"
REPLICA_X86_64_DARWIN_SHA256="a61dd1c68dab0a0a99557b2919002dd94233af281339f00e4dfd4f3191107fd4"
REPLICA_X86_64_DARWIN_URL="https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/replica.gz"
REPLICA_X86_64_DARWIN_URL="https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/x86_64-darwin/replica.gz"
REPLICA_X86_64_LINUX_SHA256="02aa0f1aaab9a57f3fbc073cc2e5fb7f5c45f18776bbc0e51d6c6148a7ee4ab9"
REPLICA_X86_64_LINUX_URL="https://download.dfinity.systems/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/replica.gz"
REPLICA_X86_64_LINUX_URL="https://download.dfinity.systems/blessed/ic/5ba08e57d607fc8fb159013fe30e46302cb4667d/nix-release/replica.gz"
ICX_PROXY_BRANCH="main"
ICX_PROXY_REV="d2cd4d822be4fa8d0af2f27e4dcc635d2032fcfb"
ICX_PROXY_REPO="https://github.com/dfinity/icx-proxy"
Expand Down