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.

Sign up for GitHub

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

Session resumption (a.k.a. Seeds) #142

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Session resumption (a.k.a. Seeds) #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
eaf60fc
Fix CI again
piegamesde Mar 16, 2022
e077011
Clap dependency: Migrate 2 -> 3
piegamesde Mar 7, 2022
0581cf2
CLI: Move arguments parsing to struct derives
piegamesde Mar 8, 2022
464737a
core: Replace verifier field by method
piegamesde Mar 6, 2022
49fe496
core: Provide session_id
piegamesde Mar 6, 2022
ace4358
Bump MSRV to 1.58
piegamesde Mar 13, 2022
adbaef3
Initial Seeds implementation
piegamesde Mar 6, 2022
f40d961
Seeds: Add tests
piegamesde Mar 16, 2022
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
9 changes: 5 additions & 4 deletions .github/workflows/push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
- ubuntu-latest
- windows-latest
rust:
- 1.56.0 # MSRV
- 1.58.0 # MSRV
- stable
- nightly
steps:
Expand Down Expand Up @@ -118,12 +118,13 @@ jobs:
command: build
args: --bins --locked --release
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: wormhole-${{ matrix.os }}-${{ github.sha }}
path: ./target/release/wormhole-rs{,.exe}
path: |
./target/release/wormhole-rs
./target/release/wormhole-rs.exe
if-no-files-found: error
continue-on-error: true

coverage:
runs-on: ubuntu-latest
Expand Down
143 changes: 115 additions & 28 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 5 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,14 @@ stun_codec = "0.1.13"
bytecodec = "0.4.15"

# for "bin" feature
clap = { version = "2.34.0", optional = true }
clap = { version = "3.1.5", optional = true, features = ["cargo", "derive", "wrap_help"] }
env_logger = { version = "0.9.0", optional = true }
console = { version = "0.15.0", optional = true }
indicatif = { version = "0.16.0", optional = true }
dialoguer = { version = "0.10.0", optional = true }
color-eyre = { version = "0.6.0", optional = true }
number_prefix = { version = "0.4.0", optional = true }
directories = { version = "4.0.1", optional = true }
url = { version = "2.2.2", features = ["serde"] }
uri = "0.4.0"
rmp-serde = "0.15.5"
Expand All @@ -69,7 +70,7 @@ env_logger = "0.9.0"
eyre = "0.6.5"

[features]
bin = ["clap", "env_logger", "console", "indicatif", "dialoguer", "color-eyre", "number_prefix"]
bin = ["clap", "env_logger", "console", "indicatif", "dialoguer", "color-eyre", "number_prefix", "directories"]
# TODO remove this one day
# - Removing it now requires all cargo calls to have --features=bin which is annoying
# - There is a cargo issue that would allow proper bin dependencies and thus would resolve it
Expand All @@ -83,3 +84,5 @@ required-features = ["bin"]

[profile.release]
overflow-checks = true
strip = "debuginfo"
lto = "thin"
5 changes: 5 additions & 0 deletions changelog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

## Unreleased

- Added a contact book and session resumption
- If you send a file to somebody, a "seed" will be stored on both sides.
- Afterwards, you can you `wormhole send --to <person>` and `wormhole receive --from <person>`
- The secure connection will then be established without having to enter a code.

## Version 0.3.0

- Added experimental port forwarding feature
Expand Down
Loading