Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
4ee5965bfa
|
|||
|
b939e9efcd
|
|||
|
f6c2bc4cdb
|
|||
|
4e7ef4b8b7
|
|||
|
e1ad8b37c1
|
|||
|
e9510216ef
|
10
.drone.yml
10
.drone.yml
@ -8,22 +8,20 @@ steps:
|
|||||||
- rustup component add rustfmt
|
- rustup component add rustfmt
|
||||||
- cargo fmt --all -- --check
|
- cargo fmt --all -- --check
|
||||||
- name: test
|
- name: test
|
||||||
image: ubuntu:focal
|
image: shimun/fido2luks@sha256:6d0b4017bffbec5fac8f25d383d68671fcc9930efb02e97ce5ea81acf0060ece
|
||||||
environment:
|
environment:
|
||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
commands:
|
commands:
|
||||||
- apt update && apt install -y cargo libkeyutils-dev libclang-dev clang pkg-config libcryptsetup-dev
|
|
||||||
- cargo test --locked
|
- cargo test --locked
|
||||||
- name: publish
|
- name: publish
|
||||||
image: ubuntu:focal
|
image: shimun/fido2luks@sha256:6d0b4017bffbec5fac8f25d383d68671fcc9930efb02e97ce5ea81acf0060ece
|
||||||
environment:
|
environment:
|
||||||
DEBIAN_FRONTEND: noninteractive
|
DEBIAN_FRONTEND: noninteractive
|
||||||
CARGO_REGISTRY_TOKEN:
|
CARGO_REGISTRY_TOKEN:
|
||||||
from_secret: cargo_tkn
|
from_secret: cargo_tkn
|
||||||
commands:
|
commands:
|
||||||
- grep -E 'version ?= ?"${DRONE_TAG}"' -i Cargo.toml || (printf "incorrect crate/tag version" && exit 1)
|
- grep -E 'version ?= ?"${DRONE_TAG}"' -i Cargo.toml || (printf "incorrect crate/tag version" && exit 1)
|
||||||
- apt update && apt install -y cargo libkeyutils-dev libclang-dev clang pkg-config libcryptsetup-dev
|
- cargo package --all-features --allow-dirty
|
||||||
- cargo package --all-features
|
- cargo publish --all-features --allow-dirty
|
||||||
- cargo publish --all-features
|
|
||||||
when:
|
when:
|
||||||
event: tag
|
event: tag
|
||||||
|
|||||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -5,4 +5,6 @@
|
|||||||
fido2luks.bash
|
fido2luks.bash
|
||||||
fido2luks.elv
|
fido2luks.elv
|
||||||
fido2luks.fish
|
fido2luks.fish
|
||||||
fido2luks.zsh
|
fido2luks.zsh
|
||||||
|
result
|
||||||
|
result-*
|
||||||
|
|||||||
11
CHANGELOG.md
Normal file
11
CHANGELOG.md
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
## 0.3.0
|
||||||
|
|
||||||
|
* LUKS2 Tokens are now supported by every subcommand
|
||||||
|
* `<credential>` has been converted into the flag `--creds`
|
||||||
|
credentials provided by `--creds` will be supplemented from the LUKS header unless this is disabled by `--disable-token`
|
||||||
|
* `fido2luks add-key` will take an `--auto-cred` flag which allows for credentials to be generated and stored without having to use `fido2luks credential`
|
||||||
|
`fido2luks replace-key` will allow for credentials to be removed using the `--remove-cred` flag respectively
|
||||||
|
* Removed `fido2luks open-token` subcommand
|
||||||
|
`fido2luks open` now fulfills both functions
|
||||||
|
* Added `fido2luks open --dry-run` flag, to perform the whole procedure apart from mounting the LUKS volume
|
||||||
|
* Added an `--verbose` flag to display additional information like credentials and keyslots used if desired
|
||||||
101
Cargo.lock
generated
101
Cargo.lock
generated
@ -1,5 +1,7 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
|
version = 3
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "addr2line"
|
name = "addr2line"
|
||||||
version = "0.13.0"
|
version = "0.13.0"
|
||||||
@ -86,7 +88,7 @@ dependencies = [
|
|||||||
"lazycell",
|
"lazycell",
|
||||||
"log",
|
"log",
|
||||||
"peeking_take_while",
|
"peeking_take_while",
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"regex",
|
"regex",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
@ -100,6 +102,18 @@ version = "1.2.1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bstr"
|
||||||
|
version = "0.2.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d"
|
||||||
|
dependencies = [
|
||||||
|
"lazy_static",
|
||||||
|
"memchr",
|
||||||
|
"regex-automata",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "byteorder"
|
name = "byteorder"
|
||||||
version = "1.3.4"
|
version = "1.3.4"
|
||||||
@ -244,6 +258,19 @@ dependencies = [
|
|||||||
"lazy_static",
|
"lazy_static",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "csv"
|
||||||
|
version = "1.1.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1"
|
||||||
|
dependencies = [
|
||||||
|
"bstr",
|
||||||
|
"csv-core",
|
||||||
|
"itoa",
|
||||||
|
"ryu",
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "csv-core"
|
name = "csv-core"
|
||||||
version = "0.1.10"
|
version = "0.1.10"
|
||||||
@ -255,14 +282,14 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ctap_hmac"
|
name = "ctap_hmac"
|
||||||
version = "0.4.2"
|
version = "0.4.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c5fec79b66e3a7bc6a7ace0f4c98f0748892b36d3c5c317fadfce0344fd185dc"
|
checksum = "e9c22d4c95aeeb4e2d41e823912d5460cfa1ebf672363eb97b32fa7c91cab89a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"cbor-codec",
|
"cbor-codec",
|
||||||
"crossbeam",
|
"crossbeam",
|
||||||
"csv-core",
|
"csv",
|
||||||
"derive_builder",
|
"derive_builder",
|
||||||
"failure",
|
"failure",
|
||||||
"failure_derive",
|
"failure_derive",
|
||||||
@ -271,6 +298,8 @@ dependencies = [
|
|||||||
"rand 0.6.5",
|
"rand 0.6.5",
|
||||||
"ring",
|
"ring",
|
||||||
"rust-crypto",
|
"rust-crypto",
|
||||||
|
"serde",
|
||||||
|
"serde_derive",
|
||||||
"untrusted",
|
"untrusted",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -292,10 +321,10 @@ checksum = "f0c960ae2da4de88a91b2d920c2a7233b400bc33cb28453a2987822d8392519b"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"fnv",
|
"fnv",
|
||||||
"ident_case",
|
"ident_case",
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"strsim 0.9.3",
|
"strsim 0.9.3",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -306,7 +335,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"darling_core",
|
"darling_core",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -317,9 +346,9 @@ checksum = "a2658621297f2cf68762a6f7dc0bb7e1ff2cfd6583daef8ee0fed6f7ec468ec0"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"derive_builder_core",
|
"derive_builder_core",
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -329,9 +358,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
|
checksum = "2791ea3e372c8495c0bc2033991d76b512cd799d07491fbd6890124db9458bef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"darling",
|
"darling",
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -369,15 +398,15 @@ version = "0.1.8"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
"synstructure",
|
"synstructure",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fido2luks"
|
name = "fido2luks"
|
||||||
version = "0.2.14"
|
version = "0.3.0-alpha"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ctap_hmac",
|
"ctap_hmac",
|
||||||
"failure",
|
"failure",
|
||||||
@ -615,9 +644,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro-error-attr",
|
"proc-macro-error-attr",
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -627,7 +656,7 @@ version = "1.0.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"version_check",
|
"version_check",
|
||||||
]
|
]
|
||||||
@ -643,9 +672,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.20"
|
version = "1.0.27"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "175c513d55719db99da20232b06cda8bab6b83ec2d04e3283edf0213c37c1a29"
|
checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-xid 0.2.1",
|
"unicode-xid 0.2.1",
|
||||||
]
|
]
|
||||||
@ -671,7 +700,7 @@ version = "1.0.7"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -824,6 +853,12 @@ dependencies = [
|
|||||||
"thread_local",
|
"thread_local",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "regex-automata"
|
||||||
|
version = "0.1.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex-syntax"
|
name = "regex-syntax"
|
||||||
version = "0.6.18"
|
version = "0.6.18"
|
||||||
@ -912,19 +947,19 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde"
|
name = "serde"
|
||||||
version = "1.0.115"
|
version = "1.0.126"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5"
|
checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_derive"
|
name = "serde_derive"
|
||||||
version = "1.0.115"
|
version = "1.0.126"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48"
|
checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -975,9 +1010,9 @@ checksum = "5e2513111825077552a6751dfad9e11ce0fba07d7276a3943a037d7e93e64c5f"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"heck",
|
"heck",
|
||||||
"proc-macro-error",
|
"proc-macro-error",
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -993,11 +1028,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.40"
|
version = "1.0.73"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "963f7d3cc59b59b9325165add223142bbf1df27655d07789f109896d353d8350"
|
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"unicode-xid 0.2.1",
|
"unicode-xid 0.2.1",
|
||||||
]
|
]
|
||||||
@ -1008,9 +1043,9 @@ version = "0.12.4"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
|
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2 1.0.20",
|
"proc-macro2 1.0.27",
|
||||||
"quote 1.0.7",
|
"quote 1.0.7",
|
||||||
"syn 1.0.40",
|
"syn 1.0.73",
|
||||||
"unicode-xid 0.2.1",
|
"unicode-xid 0.2.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
12
Cargo.toml
12
Cargo.toml
@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "fido2luks"
|
name = "fido2luks"
|
||||||
version = "0.2.14"
|
version = "0.3.0-alpha"
|
||||||
authors = ["shimunn <shimun@shimun.net>"]
|
authors = ["shimunn <shimun@shimun.net>"]
|
||||||
edition = "2018"
|
edition = "2018"
|
||||||
|
|
||||||
@ -14,19 +14,19 @@ categories = ["command-line-utilities"]
|
|||||||
license = "MPL-2.0"
|
license = "MPL-2.0"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ctap_hmac = { version="0.4.2", features = ["request_multiple"] }
|
ctap_hmac = { version="0.4.5", features = ["request_multiple"] }
|
||||||
hex = "0.3.2"
|
hex = "0.3.2"
|
||||||
ring = "0.13.5"
|
ring = "0.13.5"
|
||||||
failure = "0.1.5"
|
failure = "0.1.5"
|
||||||
rpassword = "4.0.1"
|
rpassword = "4.0.1"
|
||||||
structopt = "0.3.2"
|
structopt = "0.3.2"
|
||||||
libcryptsetup-rs = "0.4.1"
|
libcryptsetup-rs = "0.4.2"
|
||||||
serde_json = "1.0.51"
|
serde_json = "1.0.51"
|
||||||
serde_derive = "1.0.106"
|
serde_derive = "1.0.116"
|
||||||
serde = "1.0.106"
|
serde = "1.0.116"
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
ctap_hmac = { version="0.4.2", features = ["request_multiple"] }
|
ctap_hmac = { version="0.4.5", features = ["request_multiple"] }
|
||||||
hex = "0.3.2"
|
hex = "0.3.2"
|
||||||
ring = "0.13.5"
|
ring = "0.13.5"
|
||||||
failure = "0.1.5"
|
failure = "0.1.5"
|
||||||
|
|||||||
28
PKGBUILD
28
PKGBUILD
@ -1,25 +1,37 @@
|
|||||||
# Maintainer: shimunn <shimun@shimun.net>
|
# Maintainer: shimunn <shimun@shimun.net>
|
||||||
pkgname=fido2luks
|
|
||||||
pkgver=0.2.12
|
pkgname=fido2luks-git
|
||||||
|
pkgver=0.2.16.7e6b33a
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
makedepends=('rust' 'cargo' 'cryptsetup' 'clang')
|
makedepends=('rust' 'cargo' 'cryptsetup' 'clang' 'git')
|
||||||
depends=('cryptsetup')
|
depends=('cryptsetup')
|
||||||
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
|
||||||
pkgdesc="Decrypt your LUKS partition using a FIDO2 compatible authenticator"
|
pkgdesc="Decrypt your LUKS partition using a FIDO2 compatible authenticator"
|
||||||
url="https://github.com/shimunn/fido2luks"
|
url="https://github.com/shimunn/fido2luks"
|
||||||
license=('MPL-2.0')
|
license=('MPL-2.0')
|
||||||
|
source=('git+https://github.com/shimunn/fido2luks')
|
||||||
|
sha512sums=('SKIP')
|
||||||
|
|
||||||
pkgver() {
|
pkgver() {
|
||||||
# Use tag version if possible otherwise concat project version and git ref
|
cd fido2luks
|
||||||
git describe --exact-match --tags HEAD 2> /dev/null || \
|
|
||||||
echo "$(cargo pkgid | cut -d'#' -f2).$(git describe --always)"
|
# Use tag version if possible otherwise concat project version and git ref
|
||||||
|
git describe --exact-match --tags HEAD 2>/dev/null ||
|
||||||
|
echo "$(cargo pkgid | cut -d'#' -f2).$(git describe --always)"
|
||||||
}
|
}
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
|
cd fido2luks
|
||||||
cargo build --release --locked --all-features --target-dir=target
|
cargo build --release --locked --all-features --target-dir=target
|
||||||
}
|
}
|
||||||
|
|
||||||
package() {
|
package() {
|
||||||
install -Dm 755 target/release/${pkgname} -t "${pkgdir}/usr/bin"
|
cd fido2luks
|
||||||
install -Dm 644 ../fido2luks.bash "${pkgdir}/usr/share/bash-completion/completions/fido2luks"
|
|
||||||
|
install -Dm 755 target/release/fido2luks -t "${pkgdir}/usr/bin"
|
||||||
|
install -Dm 755 pam_mount/fido2luksmounthelper.sh -t "${pkgdir}/usr/bin"
|
||||||
|
install -Dm 644 initcpio/hooks/fido2luks -t "${pkgdir}/usr/lib/initcpio/hooks"
|
||||||
|
install -Dm 644 initcpio/install/fido2luks -t "${pkgdir}/usr/lib/initcpio/install"
|
||||||
|
install -Dm 644 fido2luks.bash "${pkgdir}/usr/share/bash-completion/completions/fido2luks"
|
||||||
|
install -Dm 644 fido2luks.fish -t "${pkgdir}/usr/share/fish/vendor_completions.d"
|
||||||
}
|
}
|
||||||
|
|||||||
131
README.md
131
README.md
@ -1,130 +1,7 @@
|
|||||||
# fido2luks [](https://crates.io/crates/fido2luks)
|
# fido2luks [](https://crates.io/crates/fido2luks)
|
||||||
|
|
||||||
This will allow you to unlock your LUKS encrypted disk with an FIDO2 compatible key.
|
## 0.3.0-alpha
|
||||||
|
|
||||||
Note: This has only been tested under Fedora 31, [Ubuntu 20.04](initramfs-tools/), [NixOS](https://nixos.org/nixos/manual/#sec-luks-file-systems-fido2) using a Solo Key, Trezor Model T
|
|
||||||
|
|
||||||
## Setup
|
|
||||||
|
|
||||||
### Prerequisites
|
|
||||||
|
|
||||||
```
|
|
||||||
dnf install clang cargo cryptsetup-devel -y
|
|
||||||
```
|
|
||||||
|
|
||||||
### Device
|
|
||||||
|
|
||||||
```
|
|
||||||
git clone https://github.com/shimunn/fido2luks.git && cd fido2luks
|
|
||||||
|
|
||||||
# Alternativly cargo build --release && sudo cp target/release/fido2luks /usr/bin/
|
|
||||||
sudo -E cargo install -f --path . --root /usr
|
|
||||||
|
|
||||||
# Copy template
|
|
||||||
cp dracut/96luks-2fa/fido2luks.conf /etc/
|
|
||||||
# Name is optional but useful if your authenticator has a display
|
|
||||||
echo FIDO2LUKS_CREDENTIAL_ID=$(fido2luks credential [NAME]) >> /etc/fido2luks.conf
|
|
||||||
|
|
||||||
# Load config into env
|
|
||||||
set -a
|
|
||||||
. /etc/fido2luks.conf
|
|
||||||
|
|
||||||
# Repeat for each luks volume
|
|
||||||
# You can also use the `--token` flag when using LUKS2 which will then store the credential in the LUKS header,
|
|
||||||
# enabling you to use `fido2luks open-token` without passing a credential as parameter
|
|
||||||
sudo -E fido2luks -i add-key /dev/disk/by-uuid/<DISK_UUID>
|
|
||||||
|
|
||||||
# Test(only works if the luks container isn't active)
|
|
||||||
sudo -E fido2luks -i open /dev/disk/by-uuid/<DISK_UUID> luks-<DISK_UUID>
|
|
||||||
|
|
||||||
```
|
|
||||||
|
|
||||||
### Dracut
|
|
||||||
|
|
||||||
```
|
|
||||||
cd dracut
|
|
||||||
|
|
||||||
sudo make install
|
|
||||||
```
|
|
||||||
|
|
||||||
### Grub
|
|
||||||
|
|
||||||
Add `rd.luks.2fa=<CREDENTIAL_ID>:<DISK_UUID>` to `GRUB_CMDLINE_LINUX` in /etc/default/grub
|
|
||||||
|
|
||||||
Note: This is only required for your root disk, systemd will try to unlock all other LUKS partions using the same key if you added it using `fido2luks add-key`
|
|
||||||
|
|
||||||
```
|
|
||||||
grub2-mkconfig > /boot/grub2/grub.cfg
|
|
||||||
```
|
|
||||||
|
|
||||||
I'd also recommend to copy the executable onto /boot so that it is accessible in case you have to access your disk from a rescue system
|
|
||||||
|
|
||||||
```
|
|
||||||
mkdir /boot/fido2luks/
|
|
||||||
cp /usr/bin/fido2luks /boot/fido2luks/
|
|
||||||
cp /etc/fido2luks.conf /boot/fido2luks/
|
|
||||||
```
|
|
||||||
|
|
||||||
## Testing
|
|
||||||
|
|
||||||
Just reboot and see if it works, if that's the case you should remove your old less secure password from your LUKS header:
|
|
||||||
|
|
||||||
```
|
|
||||||
# Recommend in case you lose your authenticator, store this backupfile somewhere safe
|
|
||||||
cryptsetup luksHeaderBackup /dev/disk/by-uuid/<DISK_UUID> --header-backup-file luks_backup_<DISK_UUID>
|
|
||||||
# There is no turning back if you mess this up, make sure you made a backup
|
|
||||||
# You can also pass `--token` if you're using LUKS2 which will then store the credential in the LUKS header,
|
|
||||||
# which will enable you to use `fido2luks open-token` without passing a credential as parameter
|
|
||||||
fido2luks -i add-key --exclusive /dev/disk/by-uuid/<DISK_UUID>
|
|
||||||
```
|
|
||||||
|
|
||||||
## Addtional settings
|
|
||||||
|
|
||||||
### Password less
|
|
||||||
|
|
||||||
Remove your previous secret as described in the next section, in case you've already added one.
|
|
||||||
|
|
||||||
Open `/etc/fido2luks.conf` and replace `FIDO2LUKS_SALT=Ask` with `FIDO2LUKS_SALT=string:<YOUR_RANDOM_STRING>`
|
|
||||||
but be warned that this password will be included to into your initramfs.
|
|
||||||
|
|
||||||
Import the new config into env:
|
|
||||||
|
|
||||||
```
|
|
||||||
set -a
|
|
||||||
. /etc/fido2luks.conf
|
|
||||||
```
|
|
||||||
|
|
||||||
Then add the new secret to each device and update dracut afterwards `dracut -f`
|
|
||||||
|
|
||||||
### Multiple keys
|
|
||||||
|
|
||||||
Additional/backup keys are supported, Multiple fido2luks credentials can be added to your /etc/fido2luks.conf file. Credential tokens are comma separated.
|
|
||||||
```
|
|
||||||
FIDO2LUKS_CREDENTIAL_ID=<CREDENTIAL1>,<CREDENTIAL2>,<CREDENTIAL3>
|
|
||||||
```
|
|
||||||
|
|
||||||
## Removal
|
|
||||||
|
|
||||||
Remove `rd.luks.2fa` from `GRUB_CMDLINE_LINUX` in /etc/default/grub
|
|
||||||
|
|
||||||
```
|
|
||||||
set -a
|
|
||||||
. fido2luks.conf
|
|
||||||
sudo -E fido2luks -i replace-key /dev/disk/by-uuid/<DISK_UUID>
|
|
||||||
|
|
||||||
sudo rm -rf /usr/lib/dracut/modules.d/96luks-2fa /etc/dracut.conf.d/luks-2fa.conf /etc/fido2luks.conf
|
|
||||||
```
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
Licensed under
|
|
||||||
|
|
||||||
* Mozilla Public License 2.0, ([LICENSE-MPL](LICENSE-MPL) or https://www.mozilla.org/en-US/MPL/2.0/)
|
|
||||||
|
|
||||||
### Contribution
|
|
||||||
|
|
||||||
Unless you explicitly state otherwise, any contribution intentionally
|
|
||||||
submitted for inclusion in the work by you, as defined in the MPL 2.0
|
|
||||||
license, shall be licensed as above, without any additional terms or
|
|
||||||
conditions.
|
|
||||||
|
|
||||||
|
This is just the program itself, all intitrid scripts are mostly taylored to the latest 0.2.x version and will most likely not work with 0.3.0 due to breaking changes in the CLI interface.
|
||||||
|
I've decided it release the version in this state since I just do not have the time now or in the forseeable future to tewak all scripts since it's quite an tedious tasks which involves rebooting VMs countless times.
|
||||||
|
If you're interested to adapt or write scripts for an particular distro I'd be more than happy to accept pull requests.
|
||||||
|
|||||||
6
build.rs
6
build.rs
@ -19,6 +19,10 @@ use structopt::StructOpt;
|
|||||||
fn main() {
|
fn main() {
|
||||||
// generate completion scripts, zsh does panic for some reason
|
// generate completion scripts, zsh does panic for some reason
|
||||||
for shell in Shell::variants().iter().filter(|shell| **shell != "zsh") {
|
for shell in Shell::variants().iter().filter(|shell| **shell != "zsh") {
|
||||||
Args::clap().gen_completions(env!("CARGO_PKG_NAME"), Shell::from_str(shell).unwrap(), ".");
|
Args::clap().gen_completions(
|
||||||
|
env!("CARGO_PKG_NAME"),
|
||||||
|
Shell::from_str(shell).unwrap(),
|
||||||
|
env!("CARGO_MANIFEST_DIR"),
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
62
flake.lock
generated
Normal file
62
flake.lock
generated
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"naersk": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1639051343,
|
||||||
|
"narHash": "sha256-62qARP+5Q0GmudcpuQHJP3/yXIgmUVoHR4orD/+FAC4=",
|
||||||
|
"owner": "nmattia",
|
||||||
|
"repo": "naersk",
|
||||||
|
"rev": "ebde51ec0eec82dc71eaca03bc24cf8eb44a3d74",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nmattia",
|
||||||
|
"repo": "naersk",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1638109994,
|
||||||
|
"narHash": "sha256-OpA37PTiPMIqoRJbufbl5rOLII7HeeGcA0yl7FoyCIE=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "a284564b7f75ac4db73607db02076e8da9d42c9d",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"id": "nixpkgs",
|
||||||
|
"type": "indirect"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"naersk": "naersk",
|
||||||
|
"nixpkgs": "nixpkgs",
|
||||||
|
"utils": "utils"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"utils": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1638122382,
|
||||||
|
"narHash": "sha256-sQzZzAbvKEqN9s0bzWuYmRaA03v40gaJ4+iL1LXjaeI=",
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"rev": "74f7e4319258e287b0f9cb95426c9853b282730b",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "numtide",
|
||||||
|
"repo": "flake-utils",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
63
flake.nix
Normal file
63
flake.nix
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
{
|
||||||
|
description = "Decrypt your LUKS partition using a FIDO2 compatible authenticator";
|
||||||
|
|
||||||
|
inputs = {
|
||||||
|
utils.url = "github:numtide/flake-utils";
|
||||||
|
naersk = {
|
||||||
|
url = "github:nmattia/naersk";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
outputs = { self, nixpkgs, utils, naersk }:
|
||||||
|
let
|
||||||
|
root = ./.;
|
||||||
|
pname = (builtins.fromTOML (builtins.readFile ./Cargo.toml)).package.name;
|
||||||
|
forPkgs = pkgs:
|
||||||
|
let
|
||||||
|
naersk-lib = naersk.lib."${pkgs.system}";
|
||||||
|
buildInputs = with pkgs; [ cryptsetup ];
|
||||||
|
LIBCLANG_PATH = "${pkgs.clang.cc.lib}/lib";
|
||||||
|
nativeBuildInputs = with pkgs; [
|
||||||
|
pkgconfig
|
||||||
|
clang
|
||||||
|
];
|
||||||
|
in
|
||||||
|
rec {
|
||||||
|
# `nix build`
|
||||||
|
packages.${pname} = naersk-lib.buildPackage {
|
||||||
|
inherit pname root buildInputs nativeBuildInputs LIBCLANG_PATH;
|
||||||
|
};
|
||||||
|
defaultPackage = packages.${pname};
|
||||||
|
|
||||||
|
# `nix run`
|
||||||
|
apps.${pname} = utils.lib.mkApp {
|
||||||
|
drv = packages.${pname};
|
||||||
|
};
|
||||||
|
defaultApp = apps.${pname};
|
||||||
|
|
||||||
|
# `nix flake check`
|
||||||
|
checks = {
|
||||||
|
fmt = with pkgs; runCommandLocal "${pname}-fmt" { buildInputs = [ cargo rustfmt nixpkgs-fmt ]; } ''
|
||||||
|
cd ${root}
|
||||||
|
cargo fmt -- --check
|
||||||
|
nixpkgs-fmt --check *.nix
|
||||||
|
touch $out
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
hydraJobs = checks // packages;
|
||||||
|
|
||||||
|
# `nix develop`
|
||||||
|
devShell = pkgs.mkShell {
|
||||||
|
nativeBuildInputs = with pkgs; [ rustc cargo rustfmt nixpkgs-fmt ] ++ nativeBuildInputs;
|
||||||
|
inherit buildInputs LIBCLANG_PATH;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
forSystem = system: forPkgs nixpkgs.legacyPackages."${system}";
|
||||||
|
in
|
||||||
|
(utils.lib.eachSystem [ "aarch64-linux" "i686-linux" "x86_64-linux" ] forSystem) // {
|
||||||
|
overlay = final: prev: (forPkgs final).packages;
|
||||||
|
};
|
||||||
|
|
||||||
|
}
|
||||||
18
initcpio/Makefile
Normal file
18
initcpio/Makefile
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
.PHONY: install remove
|
||||||
|
|
||||||
|
install:
|
||||||
|
install -Dm644 hooks/fido2luks -t /usr/lib/initcpio/hooks
|
||||||
|
install -Dm644 install/fido2luks -t /usr/lib/initcpio/install
|
||||||
|
ifdef preset
|
||||||
|
mkinitcpio -p $(preset)
|
||||||
|
else
|
||||||
|
mkinitcpio -P
|
||||||
|
endif
|
||||||
|
|
||||||
|
remove:
|
||||||
|
rm /usr/lib/initcpio/{hooks,install}/fido2luks
|
||||||
|
ifdef preset
|
||||||
|
mkinitcpio -p $(preset)
|
||||||
|
else
|
||||||
|
mkinitcpio -P
|
||||||
|
endif
|
||||||
52
initcpio/README.md
Normal file
52
initcpio/README.md
Normal file
@ -0,0 +1,52 @@
|
|||||||
|
## fido2luks hook for mkinitcpio (ArchLinux and derivatives)
|
||||||
|
|
||||||
|
> ⚠️ Before proceeding, it is very advised to [backup your existing LUKS2 header](https://wiki.archlinux.org/title/dm-crypt/Device_encryption#Backup_using_cryptsetup) to external storage
|
||||||
|
|
||||||
|
### Setup
|
||||||
|
|
||||||
|
1. Connect your FIDO2 authenticator
|
||||||
|
2. Generate credential id
|
||||||
|
|
||||||
|
```shell
|
||||||
|
fido2luks credential
|
||||||
|
```
|
||||||
|
|
||||||
|
3. Generate salt (random string)
|
||||||
|
|
||||||
|
```shell
|
||||||
|
pwgen 48 1
|
||||||
|
```
|
||||||
|
|
||||||
|
4. Add key to your LUKS2 device
|
||||||
|
|
||||||
|
```shell
|
||||||
|
fido2luks add-key -Pt --salt <salt> <block_device> <credential_id>
|
||||||
|
```
|
||||||
|
|
||||||
|
`-P` - request PIN to unlock the authenticator
|
||||||
|
`-t` - add token (including credential id) to the LUKS2 header
|
||||||
|
`-e` - wipe all other keys
|
||||||
|
|
||||||
|
For the full list of options see `fido2luks add-key --help`
|
||||||
|
|
||||||
|
5. Edit [/etc/fido2luks.conf](/initcpio/fido2luks.conf)
|
||||||
|
|
||||||
|
Keyslot (`FIDO2LUKS_DEVICE_SLOT`) can be obtained from the output of
|
||||||
|
|
||||||
|
```shell
|
||||||
|
cryptsetup luksDump <block_device>
|
||||||
|
```
|
||||||
|
|
||||||
|
6. Add fido2luks hook to /etc/mkinitcpio.conf
|
||||||
|
|
||||||
|
Before or instead of `encrypt` hook, for example:
|
||||||
|
|
||||||
|
```shell
|
||||||
|
HOOKS=(base udev autodetect modconf keyboard block fido2luks filesystems fsck)
|
||||||
|
```
|
||||||
|
|
||||||
|
7. Recreate initial ramdisk
|
||||||
|
|
||||||
|
```shell
|
||||||
|
mkinitcpio -p <preset>
|
||||||
|
```
|
||||||
18
initcpio/fido2luks.conf
Normal file
18
initcpio/fido2luks.conf
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Set credential *ONLY IF* it's not embedded in the LUKS2 header
|
||||||
|
FIDO2LUKS_CREDENTIAL_ID=
|
||||||
|
|
||||||
|
# Encrypted device and its name under /dev/mapper
|
||||||
|
# Can be overridden by `cryptdevice` kernel parameter
|
||||||
|
FIDO2LUKS_DEVICE=
|
||||||
|
FIDO2LUKS_MAPPER_NAME=
|
||||||
|
|
||||||
|
FIDO2LUKS_SALT=string:<salt>
|
||||||
|
|
||||||
|
# Use specific keyslot (ignore all other slots)
|
||||||
|
FIDO2LUKS_DEVICE_SLOT=
|
||||||
|
|
||||||
|
# Await for an authenticator to be connected (in seconds)
|
||||||
|
FIDO2LUKS_DEVICE_AWAIT=
|
||||||
|
|
||||||
|
# Set to 1 if PIN is required to unlock the authenticator
|
||||||
|
FIDO2LUKS_ASK_PIN=
|
||||||
55
initcpio/hooks/fido2luks
Normal file
55
initcpio/hooks/fido2luks
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
#!/usr/bin/ash
|
||||||
|
|
||||||
|
run_hook() {
|
||||||
|
modprobe -a -q dm-crypt >/dev/null 2>&1
|
||||||
|
. /etc/fido2luks.conf
|
||||||
|
|
||||||
|
if [ -z "$cryptdevice" ]; then
|
||||||
|
device="$FIDO2LUKS_DEVICE"
|
||||||
|
dmname="$FIDO2LUKS_MAPPER_NAME"
|
||||||
|
else
|
||||||
|
IFS=: read cryptdev dmname _cryptoptions <<EOF
|
||||||
|
$cryptdevice
|
||||||
|
EOF
|
||||||
|
if ! device=$(resolve_device "${cryptdev}" ${rootdelay}); then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
options="--salt $FIDO2LUKS_SALT"
|
||||||
|
|
||||||
|
if [ "$FIDO2LUKS_ASK_PIN" == 1 ]; then
|
||||||
|
options="$options --pin"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$FIDO2LUKS_DEVICE_SLOT" ]; then
|
||||||
|
options="$options --slot $FIDO2LUKS_DEVICE_SLOT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -n "$FIDO2LUKS_DEVICE_AWAIT" ]; then
|
||||||
|
options="$options --await-dev $FIDO2LUKS_DEVICE_AWAIT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# HACK: /dev/tty is hardcoded in rpassword, but not accessible from the ramdisk
|
||||||
|
# Temporary link it to /dev/tty1
|
||||||
|
mv /dev/tty /dev/tty.back
|
||||||
|
ln -s /dev/tty1 /dev/tty
|
||||||
|
|
||||||
|
printf "\nAuthentication is required to access the $dmname volume at $device\n"
|
||||||
|
|
||||||
|
if [ -z "$FIDO2LUKS_CREDENTIAL_ID" ]; then
|
||||||
|
fido2luks open-token $device $dmname $options
|
||||||
|
else
|
||||||
|
fido2luks open $device $dmname $FIDO2LUKS_CREDENTIAL_ID $options
|
||||||
|
fi
|
||||||
|
exit_code=$?
|
||||||
|
|
||||||
|
# Restore /dev/tty
|
||||||
|
mv /dev/tty.back /dev/tty
|
||||||
|
|
||||||
|
if [ $exit_code -ne 0 ]; then
|
||||||
|
printf '\n'
|
||||||
|
read -s -p 'Press Enter to continue'
|
||||||
|
printf '\n'
|
||||||
|
fi
|
||||||
|
}
|
||||||
31
initcpio/install/fido2luks
Normal file
31
initcpio/install/fido2luks
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
build() {
|
||||||
|
local mod
|
||||||
|
|
||||||
|
add_module dm-crypt
|
||||||
|
add_module dm-integrity
|
||||||
|
if [[ $CRYPTO_MODULES ]]; then
|
||||||
|
for mod in $CRYPTO_MODULES; do
|
||||||
|
add_module "$mod"
|
||||||
|
done
|
||||||
|
else
|
||||||
|
add_all_modules /crypto/
|
||||||
|
fi
|
||||||
|
|
||||||
|
add_binary fido2luks
|
||||||
|
add_binary dmsetup
|
||||||
|
add_file /usr/lib/udev/rules.d/10-dm.rules
|
||||||
|
add_file /usr/lib/udev/rules.d/13-dm-disk.rules
|
||||||
|
add_file /usr/lib/udev/rules.d/95-dm-notify.rules
|
||||||
|
add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules
|
||||||
|
add_file /etc/fido2luks.conf /etc/fido2luks.conf
|
||||||
|
|
||||||
|
add_runscript
|
||||||
|
}
|
||||||
|
|
||||||
|
help() {
|
||||||
|
cat <<HELPEOF
|
||||||
|
This hook allows to decrypt LUKS2 partition using FIDO2 compatible authenticator
|
||||||
|
HELPEOF
|
||||||
|
}
|
||||||
15
initramfs-tools/Dockerfile
Normal file
15
initramfs-tools/Dockerfile
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
FROM rust:bullseye
|
||||||
|
|
||||||
|
RUN cargo install -f cargo-deb --debug --version 1.30.0
|
||||||
|
|
||||||
|
ARG DEBIAN_FRONTEND=noninteractive
|
||||||
|
|
||||||
|
RUN apt update && apt install -y cryptsetup pkg-config libclang-dev libcryptsetup-dev && mkdir -p /build/fido2luks
|
||||||
|
|
||||||
|
WORKDIR /build/fido2luks
|
||||||
|
|
||||||
|
ENV CARGO_TARGET_DIR=/build/fido2luks/target
|
||||||
|
|
||||||
|
RUN cargo install fido2luks -f
|
||||||
|
|
||||||
|
CMD bash -xc 'cp -rf /code/* /build/fido2luks && cargo-deb && cp target/debian/*.deb /out'
|
||||||
9
initramfs-tools/build-deb.sh
Executable file
9
initramfs-tools/build-deb.sh
Executable file
@ -0,0 +1,9 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
set -ex
|
||||||
|
|
||||||
|
docker build . -t fido2luks-deb
|
||||||
|
|
||||||
|
mkdir -p debs
|
||||||
|
|
||||||
|
docker run -ti -v "$(pwd)/..:/code:ro" -v "$(pwd)/debs:/out" fido2luks-deb
|
||||||
@ -7,8 +7,4 @@ if [ -z "$FIDO2LUKS_PASSWORD_HELPER" ]; then
|
|||||||
export FIDO2LUKS_PASSWORD_HELPER="plymouth ask-for-password --prompt '$MSG'"
|
export FIDO2LUKS_PASSWORD_HELPER="plymouth ask-for-password --prompt '$MSG'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$FIDO2LUKS_USE_TOKEN" -eq 1 ]; then
|
fido2luks print-secret --bin "$CRYPTTAB_SOURCE" $([ "$FIDO2LUKS_USE_TOKEN" -eq 0 ] && printf "--disable-token")
|
||||||
export FIDO2LUKS_CREDENTIAL_ID="$FIDO2LUKS_CREDENTIAL_ID,$(fido2luks token list --csv $CRYPTTAB_SOURCE)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
fido2luks print-secret --bin
|
|
||||||
|
|||||||
220
pam_mount/fido2luksmounthelper.sh
Executable file
220
pam_mount/fido2luksmounthelper.sh
Executable file
@ -0,0 +1,220 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
#
|
||||||
|
# This is a rather minimal example Argbash potential
|
||||||
|
# Example taken from http://argbash.readthedocs.io/en/stable/example.html
|
||||||
|
#
|
||||||
|
# ARG_POSITIONAL_SINGLE([operation],[Operation to perform (mount|umount)],[])
|
||||||
|
# ARG_OPTIONAL_SINGLE([credentials-type],[c],[Type of the credentials to use (external|embedded)])
|
||||||
|
# ARG_OPTIONAL_SINGLE([device],[d],[Name of the device to create])
|
||||||
|
# ARG_OPTIONAL_SINGLE([mount-point],[m],[Path of the mount point to use])
|
||||||
|
# ARG_OPTIONAL_BOOLEAN([ask-pin],[a],[Ask for a pin],[off])
|
||||||
|
# ARG_OPTIONAL_SINGLE([salt],[s],[Salt to use],[""])
|
||||||
|
# ARG_HELP([Unlocks/Locks a LUKS volume and mount/unmount it in the given mount point.])
|
||||||
|
# ARGBASH_GO()
|
||||||
|
# needed because of Argbash --> m4_ignore([
|
||||||
|
### START OF CODE GENERATED BY Argbash v2.9.0 one line above ###
|
||||||
|
# Argbash is a bash code generator used to get arguments parsing right.
|
||||||
|
# Argbash is FREE SOFTWARE, see https://argbash.io for more info
|
||||||
|
# Generated online by https://argbash.io/generate
|
||||||
|
|
||||||
|
|
||||||
|
die()
|
||||||
|
{
|
||||||
|
local _ret="${2:-1}"
|
||||||
|
test "${_PRINT_HELP:-no}" = yes && print_help >&2
|
||||||
|
echo "$1" >&2
|
||||||
|
exit "${_ret}"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
begins_with_short_option()
|
||||||
|
{
|
||||||
|
local first_option all_short_options='cdmash'
|
||||||
|
first_option="${1:0:1}"
|
||||||
|
test "$all_short_options" = "${all_short_options/$first_option/}" && return 1 || return 0
|
||||||
|
}
|
||||||
|
|
||||||
|
# THE DEFAULTS INITIALIZATION - POSITIONALS
|
||||||
|
_positionals=()
|
||||||
|
# THE DEFAULTS INITIALIZATION - OPTIONALS
|
||||||
|
_arg_credentials_type=
|
||||||
|
_arg_device=
|
||||||
|
_arg_mount_point=
|
||||||
|
_arg_ask_pin="off"
|
||||||
|
_arg_salt=""
|
||||||
|
|
||||||
|
|
||||||
|
print_help()
|
||||||
|
{
|
||||||
|
printf '%s\n' "Unlocks/Locks a LUKS volume and mount/unmount it in the given mount point."
|
||||||
|
printf 'Usage: %s [-c|--credentials-type <arg>] [-d|--device <arg>] [-m|--mount-point <arg>] [-a|--(no-)ask-pin] [-s|--salt <arg>] [-h|--help] <operation>\n' "$0"
|
||||||
|
printf '\t%s\n' "<operation>: Operation to perform (mount|umount)"
|
||||||
|
printf '\t%s\n' "-c, --credentials-type: Type of the credentials to use (external|embedded) (no default)"
|
||||||
|
printf '\t%s\n' "-d, --device: Name of the device to create (no default)"
|
||||||
|
printf '\t%s\n' "-m, --mount-point: Path of the mount point to use (no default)"
|
||||||
|
printf '\t%s\n' "-a, --ask-pin, --no-ask-pin: Ask for a pin (off by default)"
|
||||||
|
printf '\t%s\n' "-s, --salt: Salt to use (default: '""')"
|
||||||
|
printf '\t%s\n' "-h, --help: Prints help"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
parse_commandline()
|
||||||
|
{
|
||||||
|
_positionals_count=0
|
||||||
|
while test $# -gt 0
|
||||||
|
do
|
||||||
|
_key="$1"
|
||||||
|
case "$_key" in
|
||||||
|
-c|--credentials-type)
|
||||||
|
test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
|
||||||
|
_arg_credentials_type="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--credentials-type=*)
|
||||||
|
_arg_credentials_type="${_key##--credentials-type=}"
|
||||||
|
;;
|
||||||
|
-c*)
|
||||||
|
_arg_credentials_type="${_key##-c}"
|
||||||
|
;;
|
||||||
|
-d|--device)
|
||||||
|
test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
|
||||||
|
_arg_device="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--device=*)
|
||||||
|
_arg_device="${_key##--device=}"
|
||||||
|
;;
|
||||||
|
-d*)
|
||||||
|
_arg_device="${_key##-d}"
|
||||||
|
;;
|
||||||
|
-m|--mount-point)
|
||||||
|
test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
|
||||||
|
_arg_mount_point="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--mount-point=*)
|
||||||
|
_arg_mount_point="${_key##--mount-point=}"
|
||||||
|
;;
|
||||||
|
-m*)
|
||||||
|
_arg_mount_point="${_key##-m}"
|
||||||
|
;;
|
||||||
|
-a|--no-ask-pin|--ask-pin)
|
||||||
|
_arg_ask_pin="on"
|
||||||
|
test "${1:0:5}" = "--no-" && _arg_ask_pin="off"
|
||||||
|
;;
|
||||||
|
-a*)
|
||||||
|
_arg_ask_pin="on"
|
||||||
|
_next="${_key##-a}"
|
||||||
|
if test -n "$_next" -a "$_next" != "$_key"
|
||||||
|
then
|
||||||
|
{ begins_with_short_option "$_next" && shift && set -- "-a" "-${_next}" "$@"; } || die "The short option '$_key' can't be decomposed to ${_key:0:2} and -${_key:2}, because ${_key:0:2} doesn't accept value and '-${_key:2:1}' doesn't correspond to a short option."
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
-s|--salt)
|
||||||
|
test $# -lt 2 && die "Missing value for the optional argument '$_key'." 1
|
||||||
|
_arg_salt="$2"
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
--salt=*)
|
||||||
|
_arg_salt="${_key##--salt=}"
|
||||||
|
;;
|
||||||
|
-s*)
|
||||||
|
_arg_salt="${_key##-s}"
|
||||||
|
;;
|
||||||
|
-h|--help)
|
||||||
|
print_help
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
-h*)
|
||||||
|
print_help
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
_last_positional="$1"
|
||||||
|
_positionals+=("$_last_positional")
|
||||||
|
_positionals_count=$((_positionals_count + 1))
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
handle_passed_args_count()
|
||||||
|
{
|
||||||
|
local _required_args_string="'operation'"
|
||||||
|
test "${_positionals_count}" -ge 1 || _PRINT_HELP=yes die "FATAL ERROR: Not enough positional arguments - we require exactly 1 (namely: $_required_args_string), but got only ${_positionals_count}." 1
|
||||||
|
test "${_positionals_count}" -le 1 || _PRINT_HELP=yes die "FATAL ERROR: There were spurious positional arguments --- we expect exactly 1 (namely: $_required_args_string), but got ${_positionals_count} (the last one was: '${_last_positional}')." 1
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
assign_positional_args()
|
||||||
|
{
|
||||||
|
local _positional_name _shift_for=$1
|
||||||
|
_positional_names="_arg_operation "
|
||||||
|
|
||||||
|
shift "$_shift_for"
|
||||||
|
for _positional_name in ${_positional_names}
|
||||||
|
do
|
||||||
|
test $# -gt 0 || break
|
||||||
|
eval "$_positional_name=\${1}" || die "Error during argument parsing, possibly an Argbash bug." 1
|
||||||
|
shift
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
parse_commandline "$@"
|
||||||
|
handle_passed_args_count
|
||||||
|
assign_positional_args 1 "${_positionals[@]}"
|
||||||
|
|
||||||
|
# OTHER STUFF GENERATED BY Argbash
|
||||||
|
|
||||||
|
### END OF CODE GENERATED BY Argbash (sortof) ### ])
|
||||||
|
# [ <-- needed because of Argbash
|
||||||
|
|
||||||
|
if [ -z ${_arg_mount_point} ]; then
|
||||||
|
die "Missing '--mount-point' argument"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z ${_arg_device} ]; then
|
||||||
|
die "Missing '--device' argument"
|
||||||
|
fi
|
||||||
|
|
||||||
|
ASK_PIN=${_arg_ask_pin}
|
||||||
|
OPERATION=${_arg_operation}
|
||||||
|
DEVICE=${_arg_device}
|
||||||
|
DEVICE_NAME=$(sed "s|/|_|g" <<< ${DEVICE})
|
||||||
|
MOUNT_POINT=${_arg_mount_point}
|
||||||
|
CREDENTIALS_TYPE=${_arg_credentials_type}
|
||||||
|
SALT=${_arg_salt}
|
||||||
|
CONF_FILE_PATH="/etc/fido2luksmounthelper.conf"
|
||||||
|
|
||||||
|
if [ "${OPERATION}" == "mount" ]; then
|
||||||
|
if [ "${CREDENTIALS_TYPE}" == "external" ]; then
|
||||||
|
if [ -f ${CONF_FILE_PATH} ]; then
|
||||||
|
if [ "${ASK_PIN}" == "on" ]; then
|
||||||
|
read PASSWORD
|
||||||
|
fi
|
||||||
|
CREDENTIALS=$(<${CONF_FILE_PATH})
|
||||||
|
else
|
||||||
|
die "The configuration file '${CONF_FILE_PATH}' is missing. Please create it or use embedded credentials."
|
||||||
|
fi
|
||||||
|
printf ${PASSWORD} | fido2luks open --salt string:${SALT} --pin --pin-source /dev/stdin ${DEVICE} ${DEVICE_NAME} ${CREDENTIALS}
|
||||||
|
elif [ "${CREDENTIALS_TYPE}" == "embedded" ]; then
|
||||||
|
if [ "${ASK_PIN}" == "on" ]; then
|
||||||
|
read PASSWORD
|
||||||
|
fi
|
||||||
|
printf ${PASSWORD} | fido2luks open-token --salt string:${SALT} --pin --pin-source /dev/stdin ${DEVICE} ${DEVICE_NAME}
|
||||||
|
else
|
||||||
|
die "Given credential-type '${CREDENTIALS_TYPE}' is invalid. It must be 'external' or 'embedded'"
|
||||||
|
fi
|
||||||
|
mount /dev/mapper/${DEVICE_NAME} ${MOUNT_POINT}
|
||||||
|
elif [ "${OPERATION}" == "umount" ]; then
|
||||||
|
umount ${MOUNT_POINT}
|
||||||
|
cryptsetup luksClose ${DEVICE_NAME}
|
||||||
|
else
|
||||||
|
die "Given operation '${OPERATION}' is invalid. It must be 'mount' or 'unmount'"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
|
|
||||||
|
# ] <-- needed because of Argbash
|
||||||
488
src/cli.rs
488
src/cli.rs
@ -2,33 +2,23 @@ use crate::error::*;
|
|||||||
use crate::luks::{Fido2LuksToken, LuksDevice};
|
use crate::luks::{Fido2LuksToken, LuksDevice};
|
||||||
use crate::util::sha256;
|
use crate::util::sha256;
|
||||||
use crate::*;
|
use crate::*;
|
||||||
|
pub use cli_args::Args;
|
||||||
use cli_args::*;
|
use cli_args::*;
|
||||||
|
|
||||||
use structopt::clap::Shell;
|
|
||||||
use structopt::StructOpt;
|
|
||||||
|
|
||||||
use ctap::{FidoCredential, FidoErrorKind};
|
use ctap::{FidoCredential, FidoErrorKind};
|
||||||
|
use std::borrow::Cow;
|
||||||
use std::io::{Read, Write};
|
use std::collections::HashSet;
|
||||||
|
use std::io::Write;
|
||||||
|
use std::iter::FromIterator;
|
||||||
|
use std::path::Path;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use std::thread;
|
use std::thread;
|
||||||
use std::time::Duration;
|
use std::time::Duration;
|
||||||
|
|
||||||
use std::borrow::Cow;
|
|
||||||
use std::collections::HashSet;
|
|
||||||
use std::fs::File;
|
|
||||||
use std::time::SystemTime;
|
use std::time::SystemTime;
|
||||||
|
use structopt::clap::Shell;
|
||||||
|
use structopt::StructOpt;
|
||||||
|
|
||||||
pub use cli_args::Args;
|
fn read_pin() -> Fido2LuksResult<String> {
|
||||||
|
util::read_password_tty("Authenticator PIN", false)
|
||||||
fn read_pin(ap: &AuthenticatorParameters) -> Fido2LuksResult<String> {
|
|
||||||
if let Some(src) = ap.pin_source.as_ref() {
|
|
||||||
let mut pin = String::new();
|
|
||||||
File::open(src)?.read_to_string(&mut pin)?;
|
|
||||||
Ok(pin.trim_end_matches("\n").to_string()) //remove trailing newline
|
|
||||||
} else {
|
|
||||||
util::read_password("Authenticator PIN", false)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn derive_secret(
|
fn derive_secret(
|
||||||
@ -37,6 +27,9 @@ fn derive_secret(
|
|||||||
timeout: u64,
|
timeout: u64,
|
||||||
pin: Option<&str>,
|
pin: Option<&str>,
|
||||||
) -> Fido2LuksResult<([u8; 32], FidoCredential)> {
|
) -> Fido2LuksResult<([u8; 32], FidoCredential)> {
|
||||||
|
if credentials.is_empty() {
|
||||||
|
return Err(Fido2LuksError::InsufficientCredentials);
|
||||||
|
}
|
||||||
let timeout = Duration::from_secs(timeout);
|
let timeout = Duration::from_secs(timeout);
|
||||||
let start = SystemTime::now();
|
let start = SystemTime::now();
|
||||||
|
|
||||||
@ -64,16 +57,118 @@ fn derive_secret(
|
|||||||
let (unsalted, cred) =
|
let (unsalted, cred) =
|
||||||
perform_challenge(&credentials, salt, timeout - start.elapsed().unwrap(), pin)?;
|
perform_challenge(&credentials, salt, timeout - start.elapsed().unwrap(), pin)?;
|
||||||
|
|
||||||
Ok((sha256(&[salt, &unsalted[..]]), cred.clone()))
|
let binary = sha256(&[salt, &unsalted[..]]);
|
||||||
|
Ok((binary, cred.clone()))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn extend_creds_device(
|
||||||
|
creds: &[HexEncoded],
|
||||||
|
luks_dev: &mut LuksDevice,
|
||||||
|
) -> Fido2LuksResult<Vec<HexEncoded>> {
|
||||||
|
let mut additional = HashSet::new();
|
||||||
|
additional.extend(creds.iter().cloned());
|
||||||
|
for token in luks_dev.tokens()? {
|
||||||
|
for cred in token?.1.credential {
|
||||||
|
let parsed = HexEncoded::from_str(cred.as_str()).map_err(|_e| {
|
||||||
|
Fido2LuksError::HexEncodingError {
|
||||||
|
string: cred.clone(),
|
||||||
|
}
|
||||||
|
})?;
|
||||||
|
additional.insert(parsed);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(Vec::from_iter(additional.into_iter()))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_input(
|
||||||
|
secret: &SecretParameters,
|
||||||
|
authenticator: &AuthenticatorParameters,
|
||||||
|
interactive: bool,
|
||||||
|
q: &str,
|
||||||
|
verify: bool,
|
||||||
|
) -> Fido2LuksResult<(Option<String>, [u8; 32])> {
|
||||||
|
let password_helper = secret
|
||||||
|
.password_helper
|
||||||
|
.as_ref()
|
||||||
|
.map(|helper| move || helper.obtain());
|
||||||
|
let salt = &secret.salt;
|
||||||
|
Ok(if interactive {
|
||||||
|
(
|
||||||
|
if authenticator.pin && may_require_pin()? {
|
||||||
|
Some(read_pin()?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
},
|
||||||
|
salt.obtain_sha256(Some(|| util::read_password_tty(q, verify)))?,
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
match (
|
||||||
|
authenticator.pin && may_require_pin()?,
|
||||||
|
authenticator.pin_prefixed,
|
||||||
|
) {
|
||||||
|
(true, false) => (Some(read_pin()?), salt.obtain_sha256(password_helper)?),
|
||||||
|
(true, true) => read_password_pin_prefixed(|| {
|
||||||
|
salt.obtain(password_helper).and_then(|secret| {
|
||||||
|
String::from_utf8(secret).map_err(|e| Fido2LuksError::from(e))
|
||||||
|
})
|
||||||
|
})?,
|
||||||
|
(false, _) => (None, salt.obtain_sha256(password_helper)?),
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn read_password_pin_prefixed(
|
||||||
|
prefixed: impl Fn() -> Fido2LuksResult<String>,
|
||||||
|
) -> Fido2LuksResult<(Option<String>, [u8; 32])> {
|
||||||
|
let read = prefixed()?;
|
||||||
|
let separator = ':';
|
||||||
|
let mut parts = read.split(separator);
|
||||||
|
let pin = parts.next().filter(|p| p.len() > 0).map(|p| p.to_string());
|
||||||
|
let password = match pin {
|
||||||
|
Some(ref pin) if read.len() > pin.len() => {
|
||||||
|
read.chars().skip(pin.len() + 1).collect::<String>()
|
||||||
|
}
|
||||||
|
Some(_) => String::new(),
|
||||||
|
_ => read
|
||||||
|
.chars()
|
||||||
|
.skip(read.chars().next().map(|c| c == separator).unwrap_or(false) as usize)
|
||||||
|
.collect::<String>(),
|
||||||
|
};
|
||||||
|
Ok((pin, util::sha256(&[password.as_bytes()])))
|
||||||
|
}
|
||||||
|
|
||||||
|
/// generate an more readable name from common paths
|
||||||
|
pub fn derive_credential_name(path: &Path) -> String {
|
||||||
|
match path.file_name() {
|
||||||
|
Some(name)
|
||||||
|
if path
|
||||||
|
.iter()
|
||||||
|
.any(|p| p == "by-label" || p == "by-partlabel" || p == "by-uuid") =>
|
||||||
|
{
|
||||||
|
name.to_string_lossy().as_ref().to_string()
|
||||||
|
}
|
||||||
|
_ => path.display().to_string(),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn parse_cmdline() -> Args {
|
pub fn parse_cmdline() -> Args {
|
||||||
Args::from_args()
|
Args::from_args()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn prompt_interaction(interactive: bool) {
|
||||||
|
if interactive {
|
||||||
|
println!("Authorize using your FIDO device");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
pub fn run_cli() -> Fido2LuksResult<()> {
|
pub fn run_cli() -> Fido2LuksResult<()> {
|
||||||
let mut stdout = io::stdout();
|
let mut stdout = io::stdout();
|
||||||
let args = parse_cmdline();
|
let args = parse_cmdline();
|
||||||
|
let log = |message: &dyn Fn() -> String| {
|
||||||
|
if args.verbose {
|
||||||
|
eprintln!("{}", &*message());
|
||||||
|
}
|
||||||
|
};
|
||||||
let interactive = args.interactive;
|
let interactive = args.interactive;
|
||||||
match &args.command {
|
match &args.command {
|
||||||
Command::Credential {
|
Command::Credential {
|
||||||
@ -81,13 +176,13 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
name,
|
name,
|
||||||
} => {
|
} => {
|
||||||
let pin_string;
|
let pin_string;
|
||||||
let pin = if authenticator.pin {
|
let pin = if authenticator.pin && may_require_pin()? {
|
||||||
pin_string = read_pin(authenticator)?;
|
pin_string = read_pin()?;
|
||||||
Some(pin_string.as_ref())
|
Some(pin_string.as_ref())
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
let cred = make_credential_id(name.as_ref().map(|n| n.as_ref()), pin)?;
|
let cred = make_credential_id(Some(name.as_ref()), pin)?;
|
||||||
println!("{}", hex::encode(&cred.id));
|
println!("{}", hex::encode(&cred.id));
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@ -96,25 +191,44 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
authenticator,
|
authenticator,
|
||||||
credentials,
|
credentials,
|
||||||
secret,
|
secret,
|
||||||
|
device,
|
||||||
} => {
|
} => {
|
||||||
let pin_string;
|
let (pin, salt) =
|
||||||
let pin = if authenticator.pin {
|
get_input(&secret, &authenticator, args.interactive, "Password", false)?;
|
||||||
pin_string = read_pin(authenticator)?;
|
let credentials = if let Some(path) = device {
|
||||||
Some(pin_string.as_ref())
|
let mut dev = LuksDevice::load(path)?;
|
||||||
|
let luks2 = dev.is_luks2()?;
|
||||||
|
log(&|| format!("luks2 supported: {}", luks2));
|
||||||
|
extend_creds_device(
|
||||||
|
credentials
|
||||||
|
.ids
|
||||||
|
.clone()
|
||||||
|
.map(|cs| cs.0)
|
||||||
|
.unwrap_or_default()
|
||||||
|
.as_slice(),
|
||||||
|
&mut dev,
|
||||||
|
)?
|
||||||
} else {
|
} else {
|
||||||
None
|
credentials.ids.clone().map(|cs| cs.0).unwrap_or_default()
|
||||||
};
|
};
|
||||||
let salt = if interactive || secret.password_helper == PasswordHelper::Stdin {
|
log(&|| {
|
||||||
util::read_password_hashed("Password", false)
|
format!(
|
||||||
} else {
|
"credentials: {}",
|
||||||
secret.salt.obtain_sha256(&secret.password_helper)
|
credentials
|
||||||
}?;
|
.iter()
|
||||||
let (secret, _cred) = derive_secret(
|
.map(ToString::to_string)
|
||||||
credentials.ids.0.as_slice(),
|
.collect::<Vec<_>>()
|
||||||
|
.join(", ")
|
||||||
|
)
|
||||||
|
});
|
||||||
|
prompt_interaction(interactive);
|
||||||
|
let (secret, cred) = derive_secret(
|
||||||
|
&credentials,
|
||||||
&salt,
|
&salt,
|
||||||
authenticator.await_time,
|
authenticator.await_time,
|
||||||
pin,
|
pin.as_deref(),
|
||||||
)?;
|
)?;
|
||||||
|
log(&|| format!("credential used: {}", hex::encode(&cred.id)));
|
||||||
if *binary {
|
if *binary {
|
||||||
stdout.write_all(&secret[..])?;
|
stdout.write_all(&secret[..])?;
|
||||||
} else {
|
} else {
|
||||||
@ -129,7 +243,6 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
secret,
|
secret,
|
||||||
luks_mod,
|
luks_mod,
|
||||||
existing_secret: other_secret,
|
existing_secret: other_secret,
|
||||||
token,
|
|
||||||
..
|
..
|
||||||
}
|
}
|
||||||
| Command::ReplaceKey {
|
| Command::ReplaceKey {
|
||||||
@ -139,21 +252,41 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
secret,
|
secret,
|
||||||
luks_mod,
|
luks_mod,
|
||||||
replacement: other_secret,
|
replacement: other_secret,
|
||||||
token,
|
|
||||||
..
|
..
|
||||||
} => {
|
} => {
|
||||||
let pin = if authenticator.pin {
|
let mut luks_dev = LuksDevice::load(&luks.device)?;
|
||||||
Some(read_pin(authenticator)?)
|
|
||||||
|
let luks2 = luks_dev.is_luks2()?;
|
||||||
|
|
||||||
|
log(&|| format!("luks2 supported: {}", luks2));
|
||||||
|
|
||||||
|
let credentials = if !luks.disable_token && luks2 {
|
||||||
|
extend_creds_device(
|
||||||
|
credentials
|
||||||
|
.ids
|
||||||
|
.clone()
|
||||||
|
.map(|cs| cs.0)
|
||||||
|
.unwrap_or_default()
|
||||||
|
.as_slice(),
|
||||||
|
&mut luks_dev,
|
||||||
|
)?
|
||||||
} else {
|
} else {
|
||||||
None
|
credentials.ids.clone().map(|cs| cs.0).unwrap_or_default()
|
||||||
};
|
};
|
||||||
let salt = |q: &str, verify: bool| -> Fido2LuksResult<[u8; 32]> {
|
log(&|| {
|
||||||
if interactive || secret.password_helper == PasswordHelper::Stdin {
|
format!(
|
||||||
util::read_password_hashed(q, verify)
|
"credentials: {}",
|
||||||
} else {
|
credentials
|
||||||
secret.salt.obtain_sha256(&secret.password_helper)
|
.iter()
|
||||||
}
|
.map(ToString::to_string)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(", ")
|
||||||
|
)
|
||||||
|
});
|
||||||
|
let inputs = |q: &str, verify: bool| -> Fido2LuksResult<(Option<String>, [u8; 32])> {
|
||||||
|
get_input(&secret, &authenticator, args.interactive, q, verify)
|
||||||
};
|
};
|
||||||
|
|
||||||
let other_secret = |salt_q: &str,
|
let other_secret = |salt_q: &str,
|
||||||
verify: bool|
|
verify: bool|
|
||||||
-> Fido2LuksResult<(Vec<u8>, Option<FidoCredential>)> {
|
-> Fido2LuksResult<(Vec<u8>, Option<FidoCredential>)> {
|
||||||
@ -164,38 +297,70 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
} => Ok((util::read_keyfile(file)?, None)),
|
} => Ok((util::read_keyfile(file)?, None)),
|
||||||
OtherSecret {
|
OtherSecret {
|
||||||
fido_device: true, ..
|
fido_device: true, ..
|
||||||
} => Ok(derive_secret(
|
} => {
|
||||||
&credentials.ids.0,
|
let (pin, salt) = inputs(salt_q, verify)?;
|
||||||
&salt(salt_q, verify)?,
|
prompt_interaction(interactive);
|
||||||
authenticator.await_time,
|
Ok(derive_secret(
|
||||||
pin.as_deref(),
|
&credentials,
|
||||||
)
|
&salt,
|
||||||
.map(|(secret, cred)| (secret[..].to_vec(), Some(cred)))?),
|
authenticator.await_time,
|
||||||
|
pin.as_deref(),
|
||||||
|
)
|
||||||
|
.map(|(secret, cred)| (secret[..].to_vec(), Some(cred)))?)
|
||||||
|
}
|
||||||
_ => Ok((
|
_ => Ok((
|
||||||
util::read_password(salt_q, verify)?.as_bytes().to_vec(),
|
util::read_password_tty(salt_q, verify)?.as_bytes().to_vec(),
|
||||||
None,
|
None,
|
||||||
)),
|
)),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
let secret = |verify: bool| -> Fido2LuksResult<([u8; 32], FidoCredential)> {
|
let secret = |q: &str,
|
||||||
derive_secret(
|
verify: bool,
|
||||||
&credentials.ids.0,
|
credentials: &[HexEncoded]|
|
||||||
&salt("Password", verify)?,
|
-> Fido2LuksResult<([u8; 32], FidoCredential)> {
|
||||||
authenticator.await_time,
|
let (pin, salt) = inputs(q, verify)?;
|
||||||
pin.as_deref(),
|
prompt_interaction(interactive);
|
||||||
)
|
derive_secret(credentials, &salt, authenticator.await_time, pin.as_deref())
|
||||||
};
|
};
|
||||||
let mut luks_dev = LuksDevice::load(&luks.device)?;
|
|
||||||
// Non overlap
|
// Non overlap
|
||||||
match &args.command {
|
match &args.command {
|
||||||
Command::AddKey { exclusive, .. } => {
|
Command::AddKey {
|
||||||
|
exclusive,
|
||||||
|
generate_credential,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
let (existing_secret, _) = other_secret("Current password", false)?;
|
let (existing_secret, _) = other_secret("Current password", false)?;
|
||||||
let (new_secret, cred) = secret(true)?;
|
let (new_secret, cred) = if *generate_credential && luks2 {
|
||||||
|
let cred = make_credential_id(
|
||||||
|
Some(derive_credential_name(luks.device.as_path()).as_str()),
|
||||||
|
(if authenticator.pin && may_require_pin()? {
|
||||||
|
//TODO: not ideal since it ignores pin-prefixed
|
||||||
|
Some(read_pin()?)
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
})
|
||||||
|
.as_deref(),
|
||||||
|
)?;
|
||||||
|
log(&|| {
|
||||||
|
format!(
|
||||||
|
"generated credential: {}\ncredential username: {:?}",
|
||||||
|
hex::encode(&cred.id),
|
||||||
|
derive_credential_name(luks.device.as_path())
|
||||||
|
)
|
||||||
|
});
|
||||||
|
let creds = vec![HexEncoded(cred.id)];
|
||||||
|
secret("Password to be added", true, &creds)
|
||||||
|
} else {
|
||||||
|
secret("Password to be added", true, &credentials)
|
||||||
|
}?;
|
||||||
|
log(&|| format!("credential used: {}", hex::encode(&cred.id)));
|
||||||
let added_slot = luks_dev.add_key(
|
let added_slot = luks_dev.add_key(
|
||||||
&new_secret,
|
&new_secret,
|
||||||
&existing_secret[..],
|
&existing_secret[..],
|
||||||
luks_mod.kdf_time.or(Some(10)),
|
luks_mod.kdf_time.or(Some(10)),
|
||||||
Some(&cred.id[..]).filter(|_| *token),
|
Some(&cred.id[..])
|
||||||
|
.filter(|_| !luks.disable_token || *generate_credential)
|
||||||
|
.filter(|_| luks2),
|
||||||
)?;
|
)?;
|
||||||
if *exclusive {
|
if *exclusive {
|
||||||
let destroyed = luks_dev.remove_keyslots(&[added_slot])?;
|
let destroyed = luks_dev.remove_keyslots(&[added_slot])?;
|
||||||
@ -214,24 +379,42 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
Command::ReplaceKey { add_password, .. } => {
|
Command::ReplaceKey {
|
||||||
let (existing_secret, _) = secret(false)?;
|
add_password,
|
||||||
|
remove_cred,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
let (existing_secret, _prev_cred) =
|
||||||
|
secret("Current password", false, &credentials)?;
|
||||||
let (replacement_secret, cred) = other_secret("Replacement password", true)?;
|
let (replacement_secret, cred) = other_secret("Replacement password", true)?;
|
||||||
let slot = if *add_password {
|
let slot = if *add_password {
|
||||||
luks_dev.add_key(
|
luks_dev.add_key(
|
||||||
&replacement_secret[..],
|
&replacement_secret[..],
|
||||||
&existing_secret,
|
&existing_secret,
|
||||||
luks_mod.kdf_time,
|
luks_mod.kdf_time,
|
||||||
cred.as_ref().filter(|_| *token).map(|cred| &cred.id[..]),
|
cred.as_ref()
|
||||||
|
.filter(|_| !luks.disable_token)
|
||||||
|
.filter(|_| luks2)
|
||||||
|
.map(|cred| &cred.id[..]),
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
luks_dev.replace_key(
|
let slot = luks_dev.replace_key(
|
||||||
&replacement_secret[..],
|
&replacement_secret[..],
|
||||||
&existing_secret,
|
&existing_secret,
|
||||||
luks_mod.kdf_time,
|
luks_mod.kdf_time,
|
||||||
cred.as_ref().filter(|_| *token).map(|cred| &cred.id[..]),
|
cred.as_ref()
|
||||||
)
|
.filter(|_| !luks.disable_token)
|
||||||
|
.filter(|_| luks2)
|
||||||
|
.map(|cred| &cred.id[..]),
|
||||||
|
)?;
|
||||||
|
if *remove_cred && cred.is_none() {
|
||||||
|
luks_dev.remove_token_slot(slot)?;
|
||||||
|
}
|
||||||
|
Ok(slot)
|
||||||
}?;
|
}?;
|
||||||
|
if let Some(cred) = cred {
|
||||||
|
log(&|| format!("credential used: {}", hex::encode(&cred.id)));
|
||||||
|
}
|
||||||
println!(
|
println!(
|
||||||
"Added to password to device {}, slot: {}",
|
"Added to password to device {}, slot: {}",
|
||||||
luks.device.display(),
|
luks.device.display(),
|
||||||
@ -247,74 +430,93 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
authenticator,
|
authenticator,
|
||||||
secret,
|
secret,
|
||||||
name,
|
name,
|
||||||
|
credentials,
|
||||||
retries,
|
retries,
|
||||||
|
dry_run,
|
||||||
|
allow_discards,
|
||||||
..
|
..
|
||||||
}
|
|
||||||
| Command::OpenToken {
|
|
||||||
luks,
|
|
||||||
authenticator,
|
|
||||||
secret,
|
|
||||||
name,
|
|
||||||
retries,
|
|
||||||
} => {
|
} => {
|
||||||
let pin_string;
|
let inputs = |q: &str, verify: bool| -> Fido2LuksResult<(Option<String>, [u8; 32])> {
|
||||||
let pin = if authenticator.pin {
|
get_input(&secret, &authenticator, args.interactive, q, verify)
|
||||||
pin_string = read_pin(authenticator)?;
|
|
||||||
Some(pin_string.as_ref())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
};
|
|
||||||
let salt = |q: &str, verify: bool| -> Fido2LuksResult<[u8; 32]> {
|
|
||||||
if interactive || secret.password_helper == PasswordHelper::Stdin {
|
|
||||||
util::read_password_hashed(q, verify)
|
|
||||||
} else {
|
|
||||||
secret.salt.obtain_sha256(&secret.password_helper)
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// Cow shouldn't be necessary
|
// Cow shouldn't be necessary
|
||||||
let secret = |credentials: Cow<'_, Vec<HexEncoded>>| {
|
let secret = |credentials: Cow<'_, Vec<HexEncoded>>| {
|
||||||
|
let (pin, salt) = inputs("Password", false)?;
|
||||||
|
prompt_interaction(interactive);
|
||||||
derive_secret(
|
derive_secret(
|
||||||
credentials.as_ref(),
|
credentials.as_ref(),
|
||||||
&salt("Password", false)?,
|
&salt,
|
||||||
authenticator.await_time,
|
authenticator.await_time,
|
||||||
pin,
|
pin.as_deref(),
|
||||||
)
|
)
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut retries = *retries;
|
let mut retries = *retries;
|
||||||
let mut luks_dev = LuksDevice::load(&luks.device)?;
|
let mut luks_dev = LuksDevice::load(&luks.device)?;
|
||||||
|
let luks2 = luks_dev.is_luks2()?;
|
||||||
|
log(&|| format!("luks2 supported: {}", luks2));
|
||||||
loop {
|
loop {
|
||||||
let secret = match &args.command {
|
let slot = if let Some(ref credentials) = credentials.ids {
|
||||||
Command::Open { credentials, .. } => secret(Cow::Borrowed(&credentials.ids.0))
|
log(&|| {
|
||||||
.and_then(|(secret, _cred)| luks_dev.activate(&name, &secret, luks.slot)),
|
format!(
|
||||||
Command::OpenToken { .. } => luks_dev.activate_token(
|
"credentials: {}",
|
||||||
|
credentials
|
||||||
|
.0
|
||||||
|
.iter()
|
||||||
|
.map(ToString::to_string)
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
.join(", ")
|
||||||
|
)
|
||||||
|
});
|
||||||
|
secret(Cow::Borrowed(&credentials.0)).and_then(|(secret, cred)| {
|
||||||
|
log(&|| format!("credential used: {}", hex::encode(&cred.id)));
|
||||||
|
luks_dev.activate(&name, &secret, luks.slot, *dry_run, *allow_discards)
|
||||||
|
})
|
||||||
|
} else if luks2 && !luks.disable_token {
|
||||||
|
luks_dev.activate_token(
|
||||||
&name,
|
&name,
|
||||||
Box::new(|credentials: Vec<String>| {
|
Box::new(|credentials: Vec<String>| {
|
||||||
|
log(&|| format!("credentials: {}", credentials.join(", ")));
|
||||||
let creds = credentials
|
let creds = credentials
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.flat_map(|cred| HexEncoded::from_str(cred.as_ref()).ok())
|
.flat_map(|cred| HexEncoded::from_str(cred.as_ref()).ok())
|
||||||
.collect::<Vec<_>>();
|
.collect::<Vec<_>>();
|
||||||
secret(Cow::Owned(creds))
|
secret(Cow::Owned(creds)).map(|(secret, cred)| {
|
||||||
.map(|(secret, cred)| (secret, hex::encode(&cred.id)))
|
log(&|| format!("credential used: {}", hex::encode(&cred.id)));
|
||||||
|
(secret, hex::encode(&cred.id))
|
||||||
|
})
|
||||||
}),
|
}),
|
||||||
luks.slot,
|
luks.slot,
|
||||||
),
|
*dry_run,
|
||||||
_ => unreachable!(),
|
*allow_discards,
|
||||||
|
)
|
||||||
|
} else if luks_dev.is_luks2()? && luks.disable_token {
|
||||||
|
// disable-token is mostly cosmetic in this instance
|
||||||
|
return Err(Fido2LuksError::InsufficientCredentials);
|
||||||
|
} else {
|
||||||
|
return Err(Fido2LuksError::WrongSecret);
|
||||||
};
|
};
|
||||||
match secret {
|
match slot {
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
match e {
|
match e {
|
||||||
Fido2LuksError::WrongSecret if retries > 0 => {}
|
Fido2LuksError::WrongSecret if retries > 0 => {}
|
||||||
Fido2LuksError::AuthenticatorError { ref cause }
|
Fido2LuksError::AuthenticatorError { ref cause }
|
||||||
if cause.kind() == FidoErrorKind::Timeout && retries > 0 => {}
|
if match cause.kind() {
|
||||||
|
FidoErrorKind::Timeout => true,
|
||||||
|
FidoErrorKind::CborError(e) if e.code() == 0x33 => true,
|
||||||
|
_ => false,
|
||||||
|
} && retries > 0 => {}
|
||||||
|
|
||||||
e => return Err(e),
|
e => return Err(e),
|
||||||
}
|
};
|
||||||
retries -= 1;
|
retries -= 1;
|
||||||
eprintln!("{}", e);
|
eprintln!("{}", e);
|
||||||
}
|
}
|
||||||
res => break res.map(|_| ()),
|
Ok(slot) => {
|
||||||
|
log(&|| format!("keyslot: {}", slot));
|
||||||
|
break Ok(());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -384,7 +586,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
let count = if tokens.is_empty() {
|
let count = if tokens.is_empty() {
|
||||||
dev.add_token(&Fido2LuksToken::with_credentials(&credentials.ids.0, *slot))?;
|
dev.add_token(&Fido2LuksToken::with_credentials(&credentials.0, *slot))?;
|
||||||
1
|
1
|
||||||
} else {
|
} else {
|
||||||
tokens.len()
|
tokens.len()
|
||||||
@ -392,7 +594,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
for (id, mut token) in tokens {
|
for (id, mut token) in tokens {
|
||||||
token
|
token
|
||||||
.credential
|
.credential
|
||||||
.extend(credentials.ids.0.iter().map(|h| h.to_string()));
|
.extend(credentials.0.iter().map(|h| h.to_string()));
|
||||||
dev.update_token(id, &token)?;
|
dev.update_token(id, &token)?;
|
||||||
}
|
}
|
||||||
println!("Updated {} tokens", count);
|
println!("Updated {} tokens", count);
|
||||||
@ -420,7 +622,7 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
token.credential = token
|
token.credential = token
|
||||||
.credential
|
.credential
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|cred| !credentials.ids.0.iter().any(|h| &h.to_string() == cred))
|
.filter(|cred| !credentials.0.iter().any(|h| &h.to_string() == cred))
|
||||||
.collect();
|
.collect();
|
||||||
dev.update_token(id, &token)?;
|
dev.update_token(id, &token)?;
|
||||||
}
|
}
|
||||||
@ -450,16 +652,64 @@ pub fn run_cli() -> Fido2LuksResult<()> {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
Command::GenerateCompletions { shell, out_dir } => {
|
Command::GenerateCompletions { shell, out_dir } => {
|
||||||
Args::clap().gen_completions(
|
// zsh won't work atm https://github.com/clap-rs/clap/issues/1822
|
||||||
env!("CARGO_PKG_NAME"),
|
if let Some(s) = shell {
|
||||||
match shell.as_ref() {
|
if s.as_str() == "zsh" {
|
||||||
"bash" => Shell::Bash,
|
unimplemented!("zsh completions are broken atm: see https://github.com/clap-rs/clap/issues/1822")
|
||||||
"fish" => Shell::Fish,
|
}
|
||||||
_ => unreachable!("structopt shouldn't allow us to reach this point"),
|
}
|
||||||
},
|
for variant in Shell::variants().iter().filter(|v| *v != &"zsh") {
|
||||||
&out_dir,
|
if let Some(s) = shell {
|
||||||
);
|
if *variant != s.as_str() {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Args::clap().gen_completions(
|
||||||
|
env!("CARGO_PKG_NAME"),
|
||||||
|
Shell::from_str(variant)
|
||||||
|
.expect("structopt shouldn't allow us to reach this point"),
|
||||||
|
&out_dir,
|
||||||
|
);
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_read_password_pin_prefixed() {
|
||||||
|
// 1234:test -> PIN: 1234, password: test
|
||||||
|
assert_eq!(
|
||||||
|
read_password_pin_prefixed(|| Ok("1234:test".into())).unwrap(),
|
||||||
|
(Some("1234".to_string()), util::sha256(&["test".as_bytes()]))
|
||||||
|
);
|
||||||
|
// :test -> PIN: None, password: test
|
||||||
|
assert_eq!(
|
||||||
|
read_password_pin_prefixed(|| Ok(":test".into())).unwrap(),
|
||||||
|
(None, util::sha256(&["test".as_bytes()]))
|
||||||
|
);
|
||||||
|
// 1234::test -> PIN: 1234, password: :test
|
||||||
|
assert_eq!(
|
||||||
|
read_password_pin_prefixed(|| Ok("1234::test".into())).unwrap(),
|
||||||
|
(
|
||||||
|
Some("1234".to_string()),
|
||||||
|
util::sha256(&[":test".as_bytes()])
|
||||||
|
)
|
||||||
|
);
|
||||||
|
// 1234 -> PIN: 1234, password: empty
|
||||||
|
assert_eq!(
|
||||||
|
read_password_pin_prefixed(|| Ok("1234".into())).unwrap(),
|
||||||
|
(Some("1234".to_string()), util::sha256(&["".as_bytes()]))
|
||||||
|
);
|
||||||
|
// 1234:test -> PIN: None, password: test
|
||||||
|
assert_eq!(
|
||||||
|
read_password_pin_prefixed(|| Ok(":test".into())).unwrap(),
|
||||||
|
(None, util::sha256(&["test".as_bytes()]))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@ -7,6 +7,7 @@ use std::fs::File;
|
|||||||
use std::io::Read;
|
use std::io::Read;
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::process::Command;
|
use std::process::Command;
|
||||||
|
use std::process::Stdio;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq)]
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
@ -55,11 +56,17 @@ impl fmt::Display for SecretInput {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SecretInput {
|
impl SecretInput {
|
||||||
pub fn obtain_string(&self, password_helper: &PasswordHelper) -> Fido2LuksResult<String> {
|
pub fn obtain_string(
|
||||||
|
&self,
|
||||||
|
password_helper: Option<impl FnOnce() -> Fido2LuksResult<String>>,
|
||||||
|
) -> Fido2LuksResult<String> {
|
||||||
Ok(String::from_utf8(self.obtain(password_helper)?)?)
|
Ok(String::from_utf8(self.obtain(password_helper)?)?)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn obtain(&self, password_helper: &PasswordHelper) -> Fido2LuksResult<Vec<u8>> {
|
pub fn obtain(
|
||||||
|
&self,
|
||||||
|
password_helper: Option<impl FnOnce() -> Fido2LuksResult<String>>,
|
||||||
|
) -> Fido2LuksResult<Vec<u8>> {
|
||||||
let mut secret = Vec::new();
|
let mut secret = Vec::new();
|
||||||
match self {
|
match self {
|
||||||
SecretInput::File { path } => {
|
SecretInput::File { path } => {
|
||||||
@ -67,16 +74,22 @@ impl SecretInput {
|
|||||||
let mut do_io = || File::open(path)?.read_to_end(&mut secret);
|
let mut do_io = || File::open(path)?.read_to_end(&mut secret);
|
||||||
do_io().map_err(|cause| Fido2LuksError::KeyfileError { cause })?;
|
do_io().map_err(|cause| Fido2LuksError::KeyfileError { cause })?;
|
||||||
}
|
}
|
||||||
SecretInput::AskPassword => {
|
SecretInput::AskPassword => secret.extend_from_slice(
|
||||||
secret.extend_from_slice(password_helper.obtain()?.as_bytes())
|
password_helper.ok_or_else(|| Fido2LuksError::AskPassError {
|
||||||
}
|
cause: AskPassError::FailedHelper,
|
||||||
|
})?()?
|
||||||
|
.as_bytes(),
|
||||||
|
),
|
||||||
|
|
||||||
SecretInput::String(s) => secret.extend_from_slice(s.as_bytes()),
|
SecretInput::String(s) => secret.extend_from_slice(s.as_bytes()),
|
||||||
}
|
}
|
||||||
Ok(secret)
|
Ok(secret)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn obtain_sha256(&self, password_helper: &PasswordHelper) -> Fido2LuksResult<[u8; 32]> {
|
pub fn obtain_sha256(
|
||||||
|
&self,
|
||||||
|
password_helper: Option<impl FnOnce() -> Fido2LuksResult<String>>,
|
||||||
|
) -> Fido2LuksResult<[u8; 32]> {
|
||||||
let mut digest = digest::Context::new(&digest::SHA256);
|
let mut digest = digest::Context::new(&digest::SHA256);
|
||||||
match self {
|
match self {
|
||||||
SecretInput::File { path } => {
|
SecretInput::File { path } => {
|
||||||
@ -151,11 +164,13 @@ impl PasswordHelper {
|
|||||||
use PasswordHelper::*;
|
use PasswordHelper::*;
|
||||||
match self {
|
match self {
|
||||||
Systemd => unimplemented!(),
|
Systemd => unimplemented!(),
|
||||||
Stdin => Ok(util::read_password("Password", true)?),
|
Stdin => Ok(util::read_password("Password", true, false)?),
|
||||||
Script(password_helper) => {
|
Script(password_helper) => {
|
||||||
let password = Command::new("sh")
|
let password = Command::new("sh")
|
||||||
.arg("-c")
|
.arg("-c")
|
||||||
.arg(&password_helper)
|
.arg(&password_helper)
|
||||||
|
.stdin(Stdio::inherit())
|
||||||
|
.stderr(Stdio::inherit())
|
||||||
.output()
|
.output()
|
||||||
.map_err(|e| Fido2LuksError::AskPassError {
|
.map_err(|e| Fido2LuksError::AskPassError {
|
||||||
cause: error::AskPassError::IO(e),
|
cause: error::AskPassError::IO(e),
|
||||||
@ -198,7 +213,7 @@ mod test {
|
|||||||
fn input_salt_obtain() {
|
fn input_salt_obtain() {
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
SecretInput::String("abc".into())
|
SecretInput::String("abc".into())
|
||||||
.obtain(&PasswordHelper::Stdin)
|
.obtain_sha256(Some(|| Ok("123456".to_string())))
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
[
|
[
|
||||||
186, 120, 22, 191, 143, 1, 207, 234, 65, 65, 64, 222, 93, 174, 34, 35, 176, 3, 97,
|
186, 120, 22, 191, 143, 1, 207, 234, 65, 65, 64, 222, 93, 174, 34, 35, 176, 3, 97,
|
||||||
|
|||||||
@ -1,7 +1,8 @@
|
|||||||
use std::fmt::{Display, Error, Formatter};
|
use std::fmt::{Display, Error, Formatter};
|
||||||
|
use std::hash::{Hash, Hasher};
|
||||||
use std::path::PathBuf;
|
use std::path::PathBuf;
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
use structopt::clap::AppSettings;
|
use structopt::clap::{AppSettings, Shell};
|
||||||
use structopt::StructOpt;
|
use structopt::StructOpt;
|
||||||
|
|
||||||
mod config;
|
mod config;
|
||||||
@ -31,6 +32,12 @@ impl FromStr for HexEncoded {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Hash for HexEncoded {
|
||||||
|
fn hash<H: Hasher>(&self, state: &mut H) {
|
||||||
|
self.0.hash(state)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Eq, PartialEq, Clone)]
|
#[derive(Debug, Eq, PartialEq, Clone)]
|
||||||
pub struct CommaSeparated<T: FromStr + Display>(pub Vec<T>);
|
pub struct CommaSeparated<T: FromStr + Display>(pub Vec<T>);
|
||||||
|
|
||||||
@ -58,19 +65,24 @@ impl<T: Display + FromStr> FromStr for CommaSeparated<T> {
|
|||||||
#[derive(Debug, StructOpt)]
|
#[derive(Debug, StructOpt)]
|
||||||
pub struct Credentials {
|
pub struct Credentials {
|
||||||
/// FIDO credential ids, separated by ',' generate using fido2luks credential
|
/// FIDO credential ids, separated by ',' generate using fido2luks credential
|
||||||
#[structopt(name = "credential-id", env = "FIDO2LUKS_CREDENTIAL_ID")]
|
#[structopt(
|
||||||
pub ids: CommaSeparated<HexEncoded>,
|
name = "credential-ids",
|
||||||
|
env = "FIDO2LUKS_CREDENTIAL_ID",
|
||||||
|
short = "c",
|
||||||
|
long = "creds"
|
||||||
|
)]
|
||||||
|
pub ids: Option<CommaSeparated<HexEncoded>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, StructOpt)]
|
#[derive(Debug, StructOpt)]
|
||||||
pub struct AuthenticatorParameters {
|
pub struct AuthenticatorParameters {
|
||||||
/// Request a PIN to unlock the authenticator
|
/// Request a PIN to unlock the authenticator if required
|
||||||
#[structopt(short = "P", long = "pin")]
|
#[structopt(short = "P", long = "pin")]
|
||||||
pub pin: bool,
|
pub pin: bool,
|
||||||
|
|
||||||
/// Location to read PIN from
|
/// Request PIN and password combined `pin:password` when using an password helper
|
||||||
#[structopt(long = "pin-source", env = "FIDO2LUKS_PIN_SOURCE")]
|
#[structopt(long = "pin-prefixed")]
|
||||||
pub pin_source: Option<PathBuf>,
|
pub pin_prefixed: bool,
|
||||||
|
|
||||||
/// Await for an authenticator to be connected, timeout after n seconds
|
/// Await for an authenticator to be connected, timeout after n seconds
|
||||||
#[structopt(
|
#[structopt(
|
||||||
@ -90,13 +102,20 @@ pub struct LuksParameters {
|
|||||||
/// Try to unlock the device using a specifc keyslot, ignore all other slots
|
/// Try to unlock the device using a specifc keyslot, ignore all other slots
|
||||||
#[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
|
#[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
|
||||||
pub slot: Option<u32>,
|
pub slot: Option<u32>,
|
||||||
|
|
||||||
|
/// Disable implicit use of LUKS2 tokens
|
||||||
|
#[structopt(
|
||||||
|
long = "disable-token",
|
||||||
|
// env = "FIDO2LUKS_DISABLE_TOKEN" // unfortunately clap will convert flags into args if they have an env attribute
|
||||||
|
)]
|
||||||
|
pub disable_token: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, StructOpt, Clone)]
|
#[derive(Debug, StructOpt, Clone)]
|
||||||
pub struct LuksModParameters {
|
pub struct LuksModParameters {
|
||||||
/// Number of milliseconds required to derive the volume decryption key
|
/// Number of milliseconds required to derive the volume decryption key
|
||||||
/// Defaults to 10ms when using an authenticator or the default by cryptsetup when using a password
|
/// Defaults to 10ms when using an authenticator or the default by cryptsetup when using a password
|
||||||
#[structopt(long = "kdf-time", name = "kdf-time")]
|
#[structopt(long = "kdf-time", name = "kdf-time", env = "FIDO2LUKS_KDF_TIME")]
|
||||||
pub kdf_time: Option<u64>,
|
pub kdf_time: Option<u64>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -119,15 +138,17 @@ pub struct SecretParameters {
|
|||||||
#[structopt(
|
#[structopt(
|
||||||
name = "password-helper",
|
name = "password-helper",
|
||||||
env = "FIDO2LUKS_PASSWORD_HELPER",
|
env = "FIDO2LUKS_PASSWORD_HELPER",
|
||||||
default_value = "/usr/bin/env systemd-ask-password 'Please enter second factor for LUKS disk encryption!'"
|
long = "password-helper"
|
||||||
)]
|
)]
|
||||||
pub password_helper: PasswordHelper,
|
pub password_helper: Option<PasswordHelper>,
|
||||||
}
|
}
|
||||||
#[derive(Debug, StructOpt)]
|
#[derive(Debug, StructOpt)]
|
||||||
pub struct Args {
|
pub struct Args {
|
||||||
/// Request passwords via Stdin instead of using the password helper
|
/// Request passwords via Stdin instead of using the password helper
|
||||||
#[structopt(short = "i", long = "interactive")]
|
#[structopt(short = "i", long = "interactive")]
|
||||||
pub interactive: bool,
|
pub interactive: bool,
|
||||||
|
#[structopt(short = "v", long = "verbose")]
|
||||||
|
pub verbose: bool,
|
||||||
#[structopt(subcommand)]
|
#[structopt(subcommand)]
|
||||||
pub command: Command,
|
pub command: Command,
|
||||||
}
|
}
|
||||||
@ -138,7 +159,7 @@ pub struct OtherSecret {
|
|||||||
#[structopt(short = "d", long = "keyfile", conflicts_with = "fido_device")]
|
#[structopt(short = "d", long = "keyfile", conflicts_with = "fido_device")]
|
||||||
pub keyfile: Option<PathBuf>,
|
pub keyfile: Option<PathBuf>,
|
||||||
/// Use another fido device instead of a password
|
/// Use another fido device instead of a password
|
||||||
/// Note: this requires for the credential fot the other device to be passed as argument as well
|
/// Note: this requires for the credential for the other device to be passed as argument as well
|
||||||
#[structopt(short = "f", long = "fido-device", conflicts_with = "keyfile")]
|
#[structopt(short = "f", long = "fido-device", conflicts_with = "keyfile")]
|
||||||
pub fido_device: bool,
|
pub fido_device: bool,
|
||||||
}
|
}
|
||||||
@ -147,8 +168,9 @@ pub struct OtherSecret {
|
|||||||
pub enum Command {
|
pub enum Command {
|
||||||
#[structopt(name = "print-secret")]
|
#[structopt(name = "print-secret")]
|
||||||
PrintSecret {
|
PrintSecret {
|
||||||
|
// version 0.3.0 will store use the lower case ascii encoded hex string making binary output unnecessary
|
||||||
/// Prints the secret as binary instead of hex encoded
|
/// Prints the secret as binary instead of hex encoded
|
||||||
#[structopt(short = "b", long = "bin")]
|
#[structopt(hidden = true, short = "b", long = "bin")]
|
||||||
binary: bool,
|
binary: bool,
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
credentials: Credentials,
|
credentials: Credentials,
|
||||||
@ -156,6 +178,9 @@ pub enum Command {
|
|||||||
authenticator: AuthenticatorParameters,
|
authenticator: AuthenticatorParameters,
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
secret: SecretParameters,
|
secret: SecretParameters,
|
||||||
|
/// Load credentials from LUKS header
|
||||||
|
#[structopt(env = "FIDO2LUKS_DEVICE")]
|
||||||
|
device: Option<PathBuf>,
|
||||||
},
|
},
|
||||||
/// Adds a generated key to the specified LUKS device
|
/// Adds a generated key to the specified LUKS device
|
||||||
#[structopt(name = "add-key")]
|
#[structopt(name = "add-key")]
|
||||||
@ -171,9 +196,9 @@ pub enum Command {
|
|||||||
/// Will wipe all other keys
|
/// Will wipe all other keys
|
||||||
#[structopt(short = "e", long = "exclusive")]
|
#[structopt(short = "e", long = "exclusive")]
|
||||||
exclusive: bool,
|
exclusive: bool,
|
||||||
/// Will add an token to your LUKS 2 header, including the credential id
|
/// Will generate an credential while adding a new key to this LUKS device if supported
|
||||||
#[structopt(short = "t", long = "token")]
|
#[structopt(short = "g", long = "gen-cred")]
|
||||||
token: bool,
|
generate_credential: bool,
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
existing_secret: OtherSecret,
|
existing_secret: OtherSecret,
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
@ -193,16 +218,16 @@ pub enum Command {
|
|||||||
/// Add the password and keep the key
|
/// Add the password and keep the key
|
||||||
#[structopt(short = "a", long = "add-password")]
|
#[structopt(short = "a", long = "add-password")]
|
||||||
add_password: bool,
|
add_password: bool,
|
||||||
/// Will add an token to your LUKS 2 header, including the credential id
|
/// Remove the affected credential from LUKS header
|
||||||
#[structopt(short = "t", long = "token")]
|
#[structopt(short = "r", long = "remove-cred")]
|
||||||
token: bool,
|
remove_cred: bool,
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
replacement: OtherSecret,
|
replacement: OtherSecret,
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
luks_mod: LuksModParameters,
|
luks_mod: LuksModParameters,
|
||||||
},
|
},
|
||||||
/// Open the LUKS device
|
/// Open the LUKS device
|
||||||
#[structopt(name = "open")]
|
#[structopt(name = "open", alias = "open-token")]
|
||||||
Open {
|
Open {
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
luks: LuksParameters,
|
luks: LuksParameters,
|
||||||
@ -216,40 +241,33 @@ pub enum Command {
|
|||||||
secret: SecretParameters,
|
secret: SecretParameters,
|
||||||
#[structopt(short = "r", long = "max-retries", default_value = "0")]
|
#[structopt(short = "r", long = "max-retries", default_value = "0")]
|
||||||
retries: i32,
|
retries: i32,
|
||||||
},
|
/// Perform the whole procedure without mounting the LUKS volume on success
|
||||||
/// Open the LUKS device using credentials embedded in the LUKS 2 header
|
#[structopt(long = "dry-run")]
|
||||||
#[structopt(name = "open-token")]
|
dry_run: bool,
|
||||||
OpenToken {
|
/// Pass SSD trim instructions to the underlying block device
|
||||||
#[structopt(flatten)]
|
#[structopt(long = "allow-discards", env = "FIDO2LUKS_ALLOW_DISCARDS")]
|
||||||
luks: LuksParameters,
|
allow_discards: bool,
|
||||||
#[structopt(env = "FIDO2LUKS_MAPPER_NAME")]
|
|
||||||
name: String,
|
|
||||||
#[structopt(flatten)]
|
|
||||||
authenticator: AuthenticatorParameters,
|
|
||||||
#[structopt(flatten)]
|
|
||||||
secret: SecretParameters,
|
|
||||||
#[structopt(short = "r", long = "max-retries", default_value = "0")]
|
|
||||||
retries: i32,
|
|
||||||
},
|
},
|
||||||
/// Generate a new FIDO credential
|
/// Generate a new FIDO credential
|
||||||
#[structopt(name = "credential")]
|
#[structopt(name = "credential")]
|
||||||
Credential {
|
Credential {
|
||||||
#[structopt(flatten)]
|
#[structopt(flatten)]
|
||||||
authenticator: AuthenticatorParameters,
|
authenticator: AuthenticatorParameters,
|
||||||
/// Name to be displayed on the authenticator if it has a display
|
/// Name to be displayed on the authenticator display
|
||||||
#[structopt(env = "FIDO2LUKS_CREDENTIAL_NAME")]
|
#[structopt(env = "FIDO2LUKS_CREDENTIAL_NAME", default_value = "fido2luks")]
|
||||||
name: Option<String>,
|
name: String,
|
||||||
},
|
},
|
||||||
/// Check if an authenticator is connected
|
/// Check if an authenticator is connected
|
||||||
#[structopt(name = "connected")]
|
#[structopt(name = "connected")]
|
||||||
Connected,
|
Connected,
|
||||||
Token(TokenCommand),
|
Token(TokenCommand),
|
||||||
/// Generate bash completion scripts
|
/// Generate bash completion scripts
|
||||||
|
/// Example: fido2luks completions --shell bash /usr/share/bash-completion/completions
|
||||||
#[structopt(name = "completions", setting = AppSettings::Hidden)]
|
#[structopt(name = "completions", setting = AppSettings::Hidden)]
|
||||||
GenerateCompletions {
|
GenerateCompletions {
|
||||||
/// Shell to generate completions for: bash, fish
|
/// Shell to generate completions for
|
||||||
#[structopt(possible_values = &["bash", "fish"])]
|
#[structopt(short = "s", long = "shell",possible_values = &Shell::variants()[..])]
|
||||||
shell: String,
|
shell: Option<String>,
|
||||||
out_dir: PathBuf,
|
out_dir: PathBuf,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
@ -269,8 +287,14 @@ pub enum TokenCommand {
|
|||||||
Add {
|
Add {
|
||||||
#[structopt(env = "FIDO2LUKS_DEVICE")]
|
#[structopt(env = "FIDO2LUKS_DEVICE")]
|
||||||
device: PathBuf,
|
device: PathBuf,
|
||||||
#[structopt(flatten)]
|
/// FIDO credential ids, separated by ',' generate using fido2luks credential
|
||||||
credentials: Credentials,
|
#[structopt(
|
||||||
|
name = "credential-ids",
|
||||||
|
env = "FIDO2LUKS_CREDENTIAL_ID",
|
||||||
|
short = "c",
|
||||||
|
long = "creds"
|
||||||
|
)]
|
||||||
|
credentials: CommaSeparated<HexEncoded>,
|
||||||
/// Slot to which the credentials will be added
|
/// Slot to which the credentials will be added
|
||||||
#[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
|
#[structopt(long = "slot", env = "FIDO2LUKS_DEVICE_SLOT")]
|
||||||
slot: u32,
|
slot: u32,
|
||||||
@ -279,8 +303,14 @@ pub enum TokenCommand {
|
|||||||
Remove {
|
Remove {
|
||||||
#[structopt(env = "FIDO2LUKS_DEVICE")]
|
#[structopt(env = "FIDO2LUKS_DEVICE")]
|
||||||
device: PathBuf,
|
device: PathBuf,
|
||||||
#[structopt(flatten)]
|
/// FIDO credential ids, separated by ',' generate using fido2luks credential
|
||||||
credentials: Credentials,
|
#[structopt(
|
||||||
|
name = "credential-ids",
|
||||||
|
env = "FIDO2LUKS_CREDENTIAL_ID",
|
||||||
|
short = "c",
|
||||||
|
long = "creds"
|
||||||
|
)]
|
||||||
|
credentials: CommaSeparated<HexEncoded>,
|
||||||
/// Token from which the credentials will be removed
|
/// Token from which the credentials will be removed
|
||||||
#[structopt(long = "token")]
|
#[structopt(long = "token")]
|
||||||
token_id: Option<u32>,
|
token_id: Option<u32>,
|
||||||
|
|||||||
@ -19,7 +19,7 @@ pub fn make_credential_id(
|
|||||||
}
|
}
|
||||||
let request = request.build().unwrap();
|
let request = request.build().unwrap();
|
||||||
let make_credential = |device: &mut FidoDevice| {
|
let make_credential = |device: &mut FidoDevice| {
|
||||||
if let Some(pin) = pin {
|
if let Some(pin) = pin.filter(|_| device.needs_pin()) {
|
||||||
device.unlock(pin)?;
|
device.unlock(pin)?;
|
||||||
}
|
}
|
||||||
device.make_hmac_credential(&request)
|
device.make_hmac_credential(&request)
|
||||||
@ -44,7 +44,7 @@ pub fn perform_challenge<'a>(
|
|||||||
.build()
|
.build()
|
||||||
.unwrap();
|
.unwrap();
|
||||||
let get_assertion = |device: &mut FidoDevice| {
|
let get_assertion = |device: &mut FidoDevice| {
|
||||||
if let Some(pin) = pin {
|
if let Some(pin) = pin.filter(|_| device.needs_pin()) {
|
||||||
device.unlock(pin)?;
|
device.unlock(pin)?;
|
||||||
}
|
}
|
||||||
device.get_hmac_assertion(&request, &util::sha256(&[&salt[..]]), None)
|
device.get_hmac_assertion(&request, &util::sha256(&[&salt[..]]), None)
|
||||||
@ -58,6 +58,17 @@ pub fn perform_challenge<'a>(
|
|||||||
Ok((secret, credential))
|
Ok((secret, credential))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn may_require_pin() -> Fido2LuksResult<bool> {
|
||||||
|
for di in ctap::get_devices()? {
|
||||||
|
if let Ok(dev) = FidoDevice::new(&di) {
|
||||||
|
if dev.needs_pin() {
|
||||||
|
return Ok(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(false)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn get_devices() -> Fido2LuksResult<Vec<FidoDevice>> {
|
pub fn get_devices() -> Fido2LuksResult<Vec<FidoDevice>> {
|
||||||
let mut devices = Vec::with_capacity(2);
|
let mut devices = Vec::with_capacity(2);
|
||||||
for di in ctap::get_devices()? {
|
for di in ctap::get_devices()? {
|
||||||
|
|||||||
@ -29,6 +29,10 @@ pub enum Fido2LuksError {
|
|||||||
WrongSecret,
|
WrongSecret,
|
||||||
#[fail(display = "not an utf8 string")]
|
#[fail(display = "not an utf8 string")]
|
||||||
StringEncodingError { cause: FromUtf8Error },
|
StringEncodingError { cause: FromUtf8Error },
|
||||||
|
#[fail(display = "not an hex string: {}", string)]
|
||||||
|
HexEncodingError { string: String },
|
||||||
|
#[fail(display = "couldn't obtain at least one credential")]
|
||||||
|
InsufficientCredentials,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Fido2LuksError {
|
impl Fido2LuksError {
|
||||||
@ -50,6 +54,8 @@ pub enum AskPassError {
|
|||||||
IO(io::Error),
|
IO(io::Error),
|
||||||
#[fail(display = "provided passwords don't match")]
|
#[fail(display = "provided passwords don't match")]
|
||||||
Mismatch,
|
Mismatch,
|
||||||
|
#[fail(display = "failed to call password helper")]
|
||||||
|
FailedHelper,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Fail)]
|
#[derive(Debug, Fail)]
|
||||||
|
|||||||
34
src/luks.rs
34
src/luks.rs
@ -1,8 +1,8 @@
|
|||||||
use crate::error::*;
|
use crate::error::*;
|
||||||
|
|
||||||
use libcryptsetup_rs::{
|
use libcryptsetup_rs::{
|
||||||
CryptActivateFlags, CryptDevice, CryptInit, CryptTokenInfo, EncryptionFormat, KeyslotInfo,
|
CryptActivateFlag, CryptActivateFlags, CryptDevice, CryptInit, CryptTokenInfo,
|
||||||
TokenInput,
|
EncryptionFormat, KeyslotInfo, TokenInput,
|
||||||
};
|
};
|
||||||
use std::collections::{HashMap, HashSet};
|
use std::collections::{HashMap, HashSet};
|
||||||
use std::path::Path;
|
use std::path::Path;
|
||||||
@ -111,6 +111,20 @@ impl LuksDevice {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn remove_token_slot(&mut self, slot: u32) -> Fido2LuksResult<()> {
|
||||||
|
let mut remove = HashSet::new();
|
||||||
|
for token in self.tokens()? {
|
||||||
|
let (id, token) = token?;
|
||||||
|
if token.keyslots.contains(&slot.to_string()) {
|
||||||
|
remove.insert(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for rm in remove {
|
||||||
|
self.remove_token(rm)?;
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn update_token(&mut self, token: u32, data: &Fido2LuksToken) -> Fido2LuksResult<()> {
|
pub fn update_token(&mut self, token: u32, data: &Fido2LuksToken) -> Fido2LuksResult<()> {
|
||||||
self.require_luks2()?;
|
self.require_luks2()?;
|
||||||
self.device
|
self.device
|
||||||
@ -192,7 +206,9 @@ impl LuksDevice {
|
|||||||
old_secret,
|
old_secret,
|
||||||
CryptActivateFlags::empty(),
|
CryptActivateFlags::empty(),
|
||||||
)?;
|
)?;
|
||||||
self.device.keyslot_handle().change_by_passphrase(
|
|
||||||
|
// slot should stay the same but better be safe than sorry
|
||||||
|
let slot = self.device.keyslot_handle().change_by_passphrase(
|
||||||
Some(slot),
|
Some(slot),
|
||||||
Some(slot),
|
Some(slot),
|
||||||
old_secret,
|
old_secret,
|
||||||
@ -221,10 +237,16 @@ impl LuksDevice {
|
|||||||
name: &str,
|
name: &str,
|
||||||
secret: &[u8],
|
secret: &[u8],
|
||||||
slot_hint: Option<u32>,
|
slot_hint: Option<u32>,
|
||||||
|
dry_run: bool,
|
||||||
|
allow_discard: bool,
|
||||||
) -> Fido2LuksResult<u32> {
|
) -> Fido2LuksResult<u32> {
|
||||||
|
let mut flags = CryptActivateFlags::empty();
|
||||||
|
if allow_discard {
|
||||||
|
flags = CryptActivateFlags::new(vec![CryptActivateFlag::AllowDiscards]);
|
||||||
|
}
|
||||||
self.device
|
self.device
|
||||||
.activate_handle()
|
.activate_handle()
|
||||||
.activate_by_passphrase(Some(name), slot_hint, secret, CryptActivateFlags::empty())
|
.activate_by_passphrase(Some(name).filter(|_| !dry_run), slot_hint, secret, flags)
|
||||||
.map_err(LuksError::activate)
|
.map_err(LuksError::activate)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -233,6 +255,8 @@ impl LuksDevice {
|
|||||||
name: &str,
|
name: &str,
|
||||||
secret: impl Fn(Vec<String>) -> Fido2LuksResult<([u8; 32], String)>,
|
secret: impl Fn(Vec<String>) -> Fido2LuksResult<([u8; 32], String)>,
|
||||||
slot_hint: Option<u32>,
|
slot_hint: Option<u32>,
|
||||||
|
dry_run: bool,
|
||||||
|
allow_discard: bool,
|
||||||
) -> Fido2LuksResult<u32> {
|
) -> Fido2LuksResult<u32> {
|
||||||
if !self.is_luks2()? {
|
if !self.is_luks2()? {
|
||||||
return Err(LuksError::Luks2Required.into());
|
return Err(LuksError::Luks2Required.into());
|
||||||
@ -276,7 +300,7 @@ impl LuksDevice {
|
|||||||
.chain(std::iter::once(None).take(slots.is_empty() as usize)), // Try all slots as last resort
|
.chain(std::iter::once(None).take(slots.is_empty() as usize)), // Try all slots as last resort
|
||||||
);
|
);
|
||||||
for slot in slots {
|
for slot in slots {
|
||||||
match self.activate(name, &secret, slot) {
|
match self.activate(name, &secret, slot, dry_run, allow_discard) {
|
||||||
Err(Fido2LuksError::WrongSecret) => (),
|
Err(Fido2LuksError::WrongSecret) => (),
|
||||||
res => return res,
|
res => return res,
|
||||||
}
|
}
|
||||||
|
|||||||
18
src/util.rs
18
src/util.rs
@ -13,9 +13,17 @@ pub fn sha256(messages: &[&[u8]]) -> [u8; 32] {
|
|||||||
secret.as_mut().copy_from_slice(digest.finish().as_ref());
|
secret.as_mut().copy_from_slice(digest.finish().as_ref());
|
||||||
secret
|
secret
|
||||||
}
|
}
|
||||||
|
pub fn read_password_tty(q: &str, verify: bool) -> Fido2LuksResult<String> {
|
||||||
pub fn read_password(q: &str, verify: bool) -> Fido2LuksResult<String> {
|
read_password(q, verify, true)
|
||||||
match rpassword::read_password_from_tty(Some(&[q, ": "].join("")))? {
|
}
|
||||||
|
pub fn read_password(q: &str, verify: bool, tty: bool) -> Fido2LuksResult<String> {
|
||||||
|
let res = if tty {
|
||||||
|
rpassword::read_password_from_tty(Some(&[q, ": "].join("")))
|
||||||
|
} else {
|
||||||
|
print!("{}: ", q);
|
||||||
|
rpassword::read_password()
|
||||||
|
}?;
|
||||||
|
match res {
|
||||||
ref pass
|
ref pass
|
||||||
if verify
|
if verify
|
||||||
&& &rpassword::read_password_from_tty(Some(&[q, "(again): "].join(" ")))?
|
&& &rpassword::read_password_from_tty(Some(&[q, "(again): "].join(" ")))?
|
||||||
@ -29,10 +37,6 @@ pub fn read_password(q: &str, verify: bool) -> Fido2LuksResult<String> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn read_password_hashed(q: &str, verify: bool) -> Fido2LuksResult<[u8; 32]> {
|
|
||||||
read_password(q, verify).map(|pass| sha256(&[pass.as_bytes()]))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn read_keyfile<P: Into<PathBuf>>(path: P) -> Fido2LuksResult<Vec<u8>> {
|
pub fn read_keyfile<P: Into<PathBuf>>(path: P) -> Fido2LuksResult<Vec<u8>> {
|
||||||
let mut file = File::open(path.into())?;
|
let mut file = File::open(path.into())?;
|
||||||
let mut key = Vec::new();
|
let mut key = Vec::new();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user