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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 76 additions & 20 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion nix/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
name = "tssh-src";
filter = (path: type: baseNameOf path != "nix");
};
cargoHash = "sha256-pJ/TJPC2RfajnYNs5bV23tFkwKOwBXZ6g+BRBBuRJvU=";
cargoHash = "sha256-udJoulVqWx3pgbnuOiP1+3PYUo+iQvEwZ/nOp9o5etA=";

nativeBuildInputs = [
pkg-config
Expand Down
1 change: 1 addition & 0 deletions tssh-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ refinery = { version = "0.9.0", features = ["rusqlite"] }
rusqlite = "0.37.0"
serde = { version = "1.0.228", features = ["derive"] }
serde_json = "1.0.149"
sha2 = "0.11.0"
ssh-key = "0.6.7"
tracing = "0.1.44"
tss-esapi = {version = "8.0.0-alpha.2"}
Expand Down
45 changes: 45 additions & 0 deletions tssh-core/src/sqlite/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,43 @@ RETURNING id
.context("while adding key to DB")
}

pub fn get_all_keys(&self) -> Result<Vec<DBKey>> {
const STMT: &str = "
SELECT
id,
pkcs11_id,
host,
username,
port,
pub_key,
template,
backup_key_id
FROM KEYS
ORDER BY id ASC
";

let mut stmt = self.c.prepare(STMT)?;

let mut rows = stmt.query([])?;

let mut ret = Vec::new();

while let Some(r) = rows.next()? {
ret.push(DBKey {
id: r.get(0)?,
pkcs11_id: r.get(1)?,
host: r.get(2)?,
username: r.get(3)?,
port: r.get(4)?,
pub_key: r.get(5)?,
template: r.get(6)?,
backup_key: r.get(7)?,
});
}

Ok(ret)
}

pub fn get_keys(&self, page: DBPage) -> Result<Vec<DBKey>> {
const STMT: &str = "
SELECT
Expand Down Expand Up @@ -283,13 +320,21 @@ fn keys() -> Result<()> {
.get_keys(DBPage::default())
.context("while getting keys")?;
assert!(keys.is_empty());

let keys = db.get_all_keys().context("while getting all keys")?;
assert!(keys.is_empty());

let key = DBKey::generate_random_key();
let ret = db.add_key(key).context("while adding key")?;

let keys = db.get_keys(DBPage::default())?;
assert_eq!(keys.len(), 1);
assert_eq!(keys[0], ret);

let keys = db.get_all_keys()?;
assert_eq!(keys.len(), 1);
assert_eq!(keys[0], ret);

let key = db.get_key_by_pkcs11_id(&ret.pkcs11_id)?;
assert_eq!(key, ret);

Expand Down
4 changes: 4 additions & 0 deletions tssh-core/src/sqlite/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ pub struct DBPage {
}

impl DBPage {
pub fn new(page: u32, size: u32) -> Self {
Self { page, size }
}

pub fn offset(&self) -> u32 {
self.page * self.size
}
Expand Down
Loading
Loading