Compare commits

...
62 Commits
Author SHA1 Message Date
jfmonty2 0798124811 add db migrations and restore config on unlock 2026-11-18 05:49:45 -05:00
jfmonty2 a10510ed6e persist database salt and rework config loading 2026-11-13 13:43:06 -05:00
jfmonty2 2371486f39 add unlock screen 2026-11-12 14:47:10 -05:00
jfmonty2 a1e5daba59 rework basically everything 2026-11-12 11:28:18 -05:00
jfmonty2 2bd81a66a4 initial commit - just the welcome screen and db connection, at present 2026-11-05 11:02:33 -05:00
jfmonty2 d67871f491 clear everything out in preparation for rewrite 2026-11-03 14:00:56 -05:00
jfmonty2 1a7f502fce add Arch packaging 2025-08-31 05:24:36 -04:00
jfmonty2 b2c27d26e8 update auto-launch to 0.5.0 to deal with windows task manager issue 2025-01-05 08:04:10 -05:00
jfmonty2 8fa3a15807 include generated linux schema 2025-01-04 11:05:40 -05:00
jfmonty2 862c68c846 update todo 2025-01-04 11:02:58 -05:00
jfmonty2 ac62171467 upgrade to tauri 2.2.0 2025-01-04 10:50:04 -05:00
jfmonty2 2080fb897b fix autolaunch name in dev/prod 2025-01-03 16:43:45 -05:00
jfmonty2 bf62054c2b make windows work again 2025-01-03 07:52:10 -05:00
jfmonty2 cd4c613758 improve start-minimized and start-on-login behavior
Previously, when Creddy was configured to start minimized, it would always start minimized, regardless of how it was launched. Really, though, when you use this setting what you probably want is for it to start minimized only when it's being launched automatically, i.e. on login. This update changes its behavior so that it will only start minimized when auto-launching.

Additionally, if Creddy detects on startup that its start-on-login configuration doesn't match the system, it will modify its own settings to match the system (unless it's the very first launch, of course.) That way if you disable Creddy's start-on-login behavior from your system dialog, it will respect your change.
2024-12-30 21:09:45 -05:00
jfmonty2 efbf6c687c add test to ensure that client and server agree on socket address 2024-12-28 07:36:38 -05:00
jfmonty2 ee495478ff start working on test for server address 2024-12-28 07:24:43 -05:00
jfmonty2 4c18de8b7a fix docker credential helper when credentials are not found 2024-12-28 06:59:09 -05:00
jfmonty2 0cfa9fc07a correct server socket differentiation 2024-12-27 15:49:42 -05:00
jfmonty2 9e9bc2b0ae separate dev and production instances and add visual indicators of dev mode 2024-12-27 08:17:49 -05:00
jfmonty2 07bf98e522 bump version to 0.6.0 2024-11-25 14:58:53 -05:00
jfmonty2 e0e758554c finish basic Docker credential helper implementation 2024-11-25 14:47:30 -05:00
jfmonty2 479a0a96eb add Docker credentials to management page 2024-11-25 12:02:44 -05:00
jfmonty2 c6e22fc91b show client username, check whether credential exists before requesting confirmation from frontend 2024-11-25 11:22:27 -05:00
jfmonty2 9bc9cb56c1 finish extremely basic implementation of docker credentials 2024-11-25 07:58:02 -05:00
jfmonty2 8bcdc5420a add CliRequest variants to store/erase docker credentials 2024-11-25 07:58:02 -05:00
jfmonty2 0a355c299b working implementation of docker get 2024-11-25 07:58:02 -05:00
jfmonty2 192d9058c3 send SaveCredential request to frontend on docker store 2024-11-25 07:58:02 -05:00
jfmonty2 b88b32d0f1 add Docker credentials to app and CLI 2024-11-25 07:58:02 -05:00
jfmonty2 12c97c4a7d start working on docker helper 2024-11-25 07:58:02 -05:00
jfmonty2 97528d65d6 link visibility of passphrase inputs on EnterPassphrase page 2024-11-24 09:37:33 -05:00
jfmonty2 295698e62f focus unlock input when window is focused 2024-09-18 09:29:14 -04:00
jfmonty2 3b61aa924a test CLI credentials against main app 2024-07-21 06:38:25 -04:00
jfmonty2 02ba19d709 switch to clap derive instead of builder 2024-07-15 14:54:25 -04:00
jfmonty2 55801384eb split into workspace so CLI can be a standalone crate 2024-07-15 10:34:51 -04:00
jfmonty2 27c2f467c4 fix cli invocations in gui entrypoint 2024-07-14 20:51:49 -04:00
jfmonty2 cab5ec40cc make server_addr configurable for client 2024-07-12 14:50:36 -04:00
jfmonty2 5cf848f7fe clean up warnings 2024-07-11 06:04:56 -04:00
jfmonty2 a32e36be7e fix RSA key signatures 2024-07-04 21:57:27 -04:00
jfmonty2 10231df860 add alternate entry mode for ssh keys 2024-07-03 16:28:31 -04:00
jfmonty2 ae93a57aab v0.5.0 2024-07-03 14:56:35 -04:00
jfmonty2 9fd355b68e finish SSH key support 2024-07-03 14:54:10 -04:00
jfmonty2 00089d7efb fix compiler warnings 2024-07-03 06:47:25 -04:00
jfmonty2 0124f77f7b initial working implementation of ssh agent 2024-07-03 06:33:58 -04:00
jfmonty2 6711ce2c43 finish manage ui for ssh keys 2024-07-02 09:57:02 -04:00
jfmonty2 a3a11897c2 persistence for ssh keys 2024-07-01 13:27:20 -04:00
jfmonty2 5e6542d08e initial ssh key model and creation ui 2024-07-01 06:38:46 -04:00
jfmonty2 f311fde74e fix permissions errors and terminal launching 2024-06-29 20:42:51 -04:00
jfmonty2 acc5c71bfa rework error alerts 2024-06-28 20:35:18 -04:00
jfmonty2 504c0b4156 add passphrase reset 2024-06-28 11:19:52 -04:00
jfmonty2 bf0a2ca72d finish manage-credentials page and rework home screen 2024-06-28 06:25:55 -04:00
jfmonty2 bb980c5eef continue working on default credentials 2024-06-26 22:24:44 -04:00
jfmonty2 ce7d75f15a almost finish refactoring PersistentCredential trait 2024-06-26 15:01:07 -04:00
jfmonty2 37b44ddb2e start refactoring for default credentials 2024-06-26 11:10:50 -04:00
jfmonty2 8c668e51a6 still in progress 2024-06-25 15:19:29 -04:00
jfmonty2 9928996fab get backend running 2024-06-19 05:10:55 -04:00
jfmonty2 d0a2532c27 start working on generalizing credential logic 2024-06-16 07:08:10 -04:00
jfmonty2 0491cb5790 fix error popup on startup 2024-06-03 01:33:35 -04:00
jfmonty2 816bd7db00 upgrade to tauri 2.0 beta 2024-06-02 17:20:37 -04:00
jfmonty2 b165965289 update todo 2024-05-08 11:37:07 -04:00
jfmonty2 86896d68c2 update Cargo.lock 2024-02-24 19:42:39 -08:00
jfmonty2 64a2927b94 return to Approve screen after cancelling unlock during request approval 2024-02-07 13:03:12 -08:00
jfmonty2 87617a0726 add ui for idle timeout 2024-02-06 20:27:51 -08:00
102 changed files with 10303 additions and 12090 deletions

No files matched your search

+3
View File
@@ -0,0 +1,3 @@
[env]
# in development (i.e. when running through Cargo), store state in project directory
CREDDY_DATA_DIR = { value = "data", relative = true }
+14 -8
View File
@@ -1,11 +1,17 @@
dist
**/node_modules
src-tauri/target/
**/creddy.db **/creddy.db
# .env is system-specific # state directory for development work
.env data/
.vscode .vscode
# just in case pacman/pkg
credentials* pacman/src
!credentials.rs pacman/*.deb
pacman/*.tar.zst
# temporary worktree for master while we work on rewrite
master
# Added by cargo
/target
Generated
+9000
View File
File diff suppressed because it is too large. Load diff
+26
View File
@@ -0,0 +1,26 @@
[package]
name = "creddy"
version = "0.7.0"
description = "A friendly AWS credentials manager"
authors = ["Joseph Montanaro"]
license = ""
repository = ""
default-run = "creddy"
edition = "2024"
[dependencies]
argon2 = { version = "0.6.0", features = ["parallel", "zeroize"] }
base64ct = "1.8.3"
dirs = "7.0.0"
duckdb = { version = "1.20000.1", features = ["bundled"] }
getrandom = { version = "0.4.3", features = ["sys_rng"] }
gpui-kit = "0.7.0"
gpui-omarchy = "0.2.1"
include_dir = "0.7.4"
serde = "1.0.229"
serde_json = "1.0.154"
testresult = "0.4.2"
thiserror = "2.0.21"
[dev-dependencies]
tempfile = "3.27.0"
-24
View File
@@ -1,24 +0,0 @@
## Creddy: Low-friction AWS credential helper
_Security at the expense of usability comes at the expense of security._ - Avi Douglen
**Creddy** is an AWS credential helper that focuses on improving security without interrupting your workflow (much). It works by mimicking the AWS Instance Metadata Service and requesting your approval before granting any application access to your AWS credentials. Additionally, the credentials it hands out are short-lived session credentials rather than long-lived credentials, meaning that even if they are compromised, the damage that the attacker can do is limited.
### What was wrong with all the existing AWS credential managers?
Most other AWS credential managers that I have seen differ in two ways.
**First**, they require the user to be _proactive_ instead of _reactive_, i.e. you must remember "this command will require AWS credentials" and invoke it in some special way. By contrast, Creddy waits patiently in the background until an application requests credentials, then asks for your approval before proceeding. In most cases, this requires only a couple of keystrokes, after which your original operation continues as invoked. This completely prevents the frustrating workflow of:
```
$ aws do-something-interesting
...
...
Unable to locate credentials. You can configure credentials by running "aws configure".
# a deep sigh of the most profound resignation
$ with-aws-credentials aws do-something-interesting
```
**Second**, other credential managers are mostly backed by the system credential store. While this may sound like a good idea, it has a critical weakness: By default, on most systems, a user's credentials are accessible to _any process running as that user_. In other words, if your quick nodejs script happens to depend on a compromised module, congratulations: you have just given that module access to your AWS account.
By contrast, Creddy encrypts your main long-lived AWS credentials with a passphrase (using libsodium's `SecretBox`) and, importantly, _does not store that passphrase_. Although this means that you, the user, must re-enter the passphrase every time Creddy needs to generate a new session, this is normally only necessary about once per day. In my own opinion, this is a worthwhile tradeoff.
+4
View File
@@ -0,0 +1,4 @@
fn main() {
// include_dir! only tracks files that already exist, so rebuild when one is added
println!("cargo:rerun-if-changed=migrations");
}
+8 -6
View File
@@ -9,7 +9,7 @@ The following is a list of security features that I hope to add eventually, in a
* To defend against the possibility that an attacker could replace, say, the `aws` executable with a malicious one that snarfs your credentials and then passes the command on to the real one, maybe track the path (and maybe even the hash) of the executable, and raise a warning if this is the first time we've seen that one? Using the hash would be safer, but would also introduce a lot of false positives, since every time the application gets updated it would trigger. On the other hand, users should presumably know when they've updated things, so maybe it would be ok. On the _other_ other hand, if somebody doesn't use `aws` very often then it might be weeks or months in between updating it and actually using the updated executable, in which case they probably won't remember that this is the first time they've used it since updating. * To defend against the possibility that an attacker could replace, say, the `aws` executable with a malicious one that snarfs your credentials and then passes the command on to the real one, maybe track the path (and maybe even the hash) of the executable, and raise a warning if this is the first time we've seen that one? Using the hash would be safer, but would also introduce a lot of false positives, since every time the application gets updated it would trigger. On the other hand, users should presumably know when they've updated things, so maybe it would be ok. On the _other_ other hand, if somebody doesn't use `aws` very often then it might be weeks or months in between updating it and actually using the updated executable, in which case they probably won't remember that this is the first time they've used it since updating.
Another possible approach is to _watch_ the files in question, and alert the user whenever any of them changes. Presumably the user will know whether this change is expected or not. Another possible approach is to _watch_ the files in question, and alert the user whenever any of them changes. Presumably the user will know whether this change is expected or not.
* Downgrade privileges after launching. In particular, if possible, disallow any kind of outgoing network access (obviously we have to bind the listening socket, but maybe we can filter that down to _just_ the ability to bind that particular address/port) and filesystem access outside of state db. I think this is doable on Linux, although it may involve high levels of `seccomp` grossness. No idea whether it's possible on Windows. Probably possible on MacOS although it may require lengths to which I am currently unwilling to go (e.g. pay for a certificate from Apple or something.) * Downgrade privileges after launching. In particular, if possible, disallow any kind of outgoing network access (obviously we have to bind the listening socket, but maybe we can filter that down to _just_ the ability to bind that particular address/port) and filesystem access outside of state db. I think this is doable on Linux, although it may involve high levels of `seccomp` grossness. No idea whether it's possible on Windows. Probably possible on MacOS although it may require lengths to which I am currently unwilling to go (e.g. pay for a certificate from Apple or something.)
* "Panic button" - if a potential attack is detected (e.g. the user denies a request but Creddy discovers the request has already succeeded somehow), offer a one-click option to lock out the current IAM user. (Sadly, you can't revoke session tokens, so this is the only way to limit a potential compromise). Not sure how feasible this is, session credentials may be limited with regard to what kind of IAM operations they can carry out.) * "Panic button" - if a potential attack is detected (e.g. the user denies a request but Creddy discovers the request has already succeeded somehow), offer a one-click option to lock out the current IAM user. Sadly, you can't revoke session tokens, so this is the only way to limit a potential compromise. Obviously this would require the current user having the ability to revoke their own IAM permissions.)
* Some kind of Yubikey or other HST integration. (Optional, since not everyone will have a HST.) This comes in two flavors: * Some kind of Yubikey or other HST integration. (Optional, since not everyone will have a HST.) This comes in two flavors:
1. (Probably doable) Store the encryption key for the passphrase on the HST, and ask the HST to decrypt the passphrase instead of asking the user to enter it. This has the advantage of being a) lower-friction, since the user doesn't have to type in the passphrase, and b) more secure, since the application code never sees the encryption key. 1. (Probably doable) Store the encryption key for the passphrase on the HST, and ask the HST to decrypt the passphrase instead of asking the user to enter it. This has the advantage of being a) lower-friction, since the user doesn't have to type in the passphrase, and b) more secure, since the application code never sees the encryption key.
2. (Less doable) Store the actual AWS secret key on the HST, and then ask the HST to just sign the whole `GetSessionToken` request. This requires that the HST support the exact signing algorithm required by AWS, which a) it probably doesn't, and b) is subject to change anyway. So this is probably not doable, but it's worth at least double-checking, since it would provide the maximum theoretical level of security. (That is, after initial setup, the application would never again see the long-lived AWS secret key.) 2. (Less doable) Store the actual AWS secret key on the HST, and then ask the HST to just sign the whole `GetSessionToken` request. This requires that the HST support the exact signing algorithm required by AWS, which a) it probably doesn't, and b) is subject to change anyway. So this is probably not doable, but it's worth at least double-checking, since it would provide the maximum theoretical level of security. (That is, after initial setup, the application would never again see the long-lived AWS secret key.)
@@ -19,9 +19,9 @@ Another possible approach is to _watch_ the files in question, and alert the use
Who exactly are we defending against and why? Who exactly are we defending against and why?
The basic idea behind Creddy is that it provides "gap coverage" between two wildly different security boundaries: 1) the older, user-based model, where all code executing as a given user is assumed to have the same level of trust, and 2) the newer, application-based model (most clearly seen on mobile devices) where that bondary instead exists around each _application_. The basic idea behind Creddy is that it provides "gap coverage" between two wildly different security models: 1) the older, user-based model, where all code executing as a given user is assumed to have the same level of trust, and 2) the newer, application-based model (most clearly seen on mobile devices) where that bondary instead exists around each _application_.
The unfortunate reality is that desktop environments are unlikely to adopt the latter model any time soon, if ever. This is primarily due to friction: Per-application security is a nightmare to manage. The only reason it works at all on mobile devices is because most mobile apps eschew the local device in favor of cloud-backed services where they can, e.g. for file storage. Arguably, the higher-friction trust model of mobile environments is in part _why_ mobile apps tend to be cloud-first. The unfortunate reality is that desktop environments are unlikely to adopt the latter model any time soon, if ever. This is primarily due to friction: Per-application security is a nightmare to manage. The only reason it works at all on mobile devices is because most mobile apps eschew the local device in favor of cloud-backed services where they can, e.g. for file storage. Arguably, the higher-friction trust model of mobile environments (along with the frequently-replaced nature of mobile devices) is in part _why_ mobile apps tend to be cloud-first.
Regardless, we live in a world where it's difficult to run untrusted code without giving it an inordinate level of access to the machine on which it runs. Creddy attempts to prevent that access from including your AWS credentials. The threat model is thus "untrusted code running under your user". This is especially likely to occur in the form of a supply-chain attack, where the compromised code is not your own but rather a dependency, or a dependency of a dependency, etc. Regardless, we live in a world where it's difficult to run untrusted code without giving it an inordinate level of access to the machine on which it runs. Creddy attempts to prevent that access from including your AWS credentials. The threat model is thus "untrusted code running under your user". This is especially likely to occur in the form of a supply-chain attack, where the compromised code is not your own but rather a dependency, or a dependency of a dependency, etc.
@@ -31,13 +31,13 @@ There are lots of ways that I can imagine someone might try to circumvent Creddy
### Tricking Creddy into allowing a request that it shouldn't ### Tricking Creddy into allowing a request that it shouldn't
If an attacker is able to compromise Creddy's frontend, e.g. via a JS library that Creddy relies on, they could forge "request accepted" responses and cause the backend to hand out credentials to an unauthorized client. Most likely, the user would immediately be alerted to the fact that Something Is Up because as soon as the request came in, Creddy would pop up requesting permission. When the user (presumably) denied the request, Creddy would discover that the request had already been approved - we could make this a high-alert situation because it would be unlikely to happen unless something fishy were going on. Additionally, the request and (hopefully) what executable made it would be logged. If an attacker is able to compromise Creddy's frontend, e.g. via a JS library that Creddy relies on, they could forge "request accepted" responses and cause the backend to hand out credentials to an unauthorized client. Most likely, the user would immediately be alerted to the fact that Something Is Up because Creddy would pop up requesting then permission, and then immediately disappear again because the request had been approved. Additionally, the request and (hopefully) what executable made it would be logged.
### Tricking the user into allowing a request they didn't intend to ### Tricking the user into allowing a request they didn't intend to
If an attacker can edit the user's .bashrc or similar, they could theoretically insert a function or pre-command hook that wraps, say, the `aws` command, and dump the credentials before continuing on with the user's command. This would most likely alert the user because either a) the attacker is hijacking the original `aws` command and thus it doesn't do what the user told it to, or b) the user's original `aws` command proceeds as normal after the malicious one, and the user is alerted by the second request where there should only have been one. If an attacker can edit the user's .bashrc or similar, they could theoretically insert a function or pre-command hook that wraps, say, the `aws` command, and dump the credentials before continuing on with the user's command. The attacker could inject the credentials into the environment before running the original command, so as to avoid alerting the user by issuing a second credentials request.
A similar but more-difficult-to-detect attack would be replacing the `aws` executable, or any other executable that is always expected to ask for AWS credentials, with a malicious wrapper that snarfs the credentials before passing them through to the original command. Creddy could defend against this to a certain extent by storing the hash of the executable, as discussed above. Another attack along the same lines would be replacing the `aws` executable, or any other executable that is always expected to ask for AWS credentials, with a malicious wrapper that snarfs the credentials before passing them through to the original command. Creddy could defend against this to a certain extent by storing the hash of the executable, as discussed above.
### Pretending to be the user ### Pretending to be the user
@@ -46,3 +46,5 @@ Most desktop environments don't prevent applications from simulating user-input
### Twiddling with Creddy's persistent state ### Twiddling with Creddy's persistent state
The solutions to or mitigations for a lot of these attacks rely on Creddy being able to assume that its local database hasn't been tampered with. Unfortunately, given that our threat model is "other code running as the same user", this isn't a safe assumption. The solutions to or mitigations for a lot of these attacks rely on Creddy being able to assume that its local database hasn't been tampered with. Unfortunately, given that our threat model is "other code running as the same user", this isn't a safe assumption.
The solution to this problem is probably just to encrypt the entire database. This introduces a bit of complexity since certain settings, like `start_on_login` and `start_minimized`, will need to be accessible before the app is unlocked,but these settings can probably just be stashed alongside the database and kept in sync on every config save.
+7 -4
View File
@@ -2,15 +2,17 @@
* ~~Switch to "process" provider for AWS credentials (much less hacky)~~ * ~~Switch to "process" provider for AWS credentials (much less hacky)~~
* ~~Frontend needs to react when request is cancelled from backend~~ * ~~Frontend needs to react when request is cancelled from backend~~
* Session timeout (plain duration, or activity-based?) * ~~Session timeout~~
* Indicate on approval screen when additional requests are pending
* ~~Fix rehide behavior when new request comes in while old one is still being resolved~~ * ~~Fix rehide behavior when new request comes in while old one is still being resolved~~
* Additional hotkey configuration (approve/deny at the very least)
* ~~Switch tray menu item to Hide when window is visible~~ * ~~Switch tray menu item to Hide when window is visible~~
* Clear password input after unlock fails
* Indicate on approval screen when additional requests are pending
* Additional hotkey configuration (approve/deny at the very least)
* Logging * Logging
* Icon * Icon
* Auto-updates * Auto-updates
* SSH key handling * ~~SSH key handling~~
* ~~Docker credential helper~~
* Encrypted sync server * Encrypted sync server
## Maybe ## Maybe
@@ -21,3 +23,4 @@
* Make hotkey configuration a little more tolerant of slight mistiming * Make hotkey configuration a little more tolerant of slight mistiming
* Distinguish between request that was denied and request that was canceled (e.g. due to error) * Distinguish between request that was denied and request that was canceled (e.g. due to error)
* Use atomic types for primitive state values instead of RwLock'd types * Use atomic types for primitive state values instead of RwLock'd types
* Rework approval flow to be a fullscreen overlay instead of mixing with normal navigation (as more views are added the pain of the current situation will only increase)
-13
View File
@@ -1,13 +0,0 @@
<!DOCTYPE html>
<html lang="en" data-theme="dark">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + Svelte</title>
</head>
<body id="app" class="m-0">
<script type="module" src="/src/main.js"></script>
</body>
</html>
View File
Whitespace-only changes.
+4
View File
@@ -0,0 +1,4 @@
-- config will only ever hold a single row with a single value
CREATE TABLE config (value JSON);
-- seed it with an empty object, which will be populated with default values on deserialization
INSERT INTO config VALUES ('{}');
-2264
View File
File diff suppressed because it is too large. Load diff
-23
View File
@@ -1,23 +0,0 @@
{
"name": "creddy",
"version": "0.4.5",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview",
"tauri": "tauri"
},
"devDependencies": {
"@sveltejs/vite-plugin-svelte": "^1.0.1",
"@tauri-apps/cli": "^1.0.5",
"autoprefixer": "^10.4.8",
"postcss": "^8.4.16",
"svelte": "^3.49.0",
"tailwindcss": "^3.1.8",
"vite": "^3.0.7"
},
"dependencies": {
"@tauri-apps/api": "^1.0.2",
"daisyui": "^2.51.5"
}
}
-6
View File
@@ -1,6 +0,0 @@
module.exports = {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
}
-7
View File
@@ -1,7 +0,0 @@
[target.x86_64-unknown-linux-gnu]
linker = "clang"
rustflags = ["-C", "link-arg=--ld-path=/usr/bin/mold"]
[target.x86_64-pc-windows-msvc]
rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-5711
View File
File diff suppressed because it is too large. Load diff
-61
View File
@@ -1,61 +0,0 @@
[package]
name = "creddy"
version = "0.4.6"
description = "A friendly AWS credentials manager"
authors = ["Joseph Montanaro"]
license = ""
repository = ""
default-run = "creddy"
edition = "2021"
rust-version = "1.57"
[[bin]]
name = "creddy_cli"
path = "src/bin/creddy_cli.rs"
[[bin]]
name = "creddy"
path = "src/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[build-dependencies]
tauri-build = { version = "1.0.4", features = [] }
[dependencies]
serde_json = "1.0"
serde = { version = "1.0", features = ["derive"] }
tauri = { version = "1.2", features = [ "app-all", "dialog", "dialog-open", "global-shortcut", "os-all", "system-tray"] }
tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "dev" }
sodiumoxide = "0.2.7"
tokio = { version = ">=1.19", features = ["full"] }
sqlx = { version = "0.6.2", features = ["sqlite", "runtime-tokio-rustls"] }
sysinfo = "0.26.8"
aws-types = "0.52.0"
aws-sdk-sts = "0.22.0"
aws-smithy-types = "0.52.0"
aws-config = "0.52.0"
thiserror = "1.0.38"
once_cell = "1.16.0"
strum = "0.24"
strum_macros = "0.24"
auto-launch = "0.4.0"
dirs = "5.0"
clap = { version = "3.2.23", features = ["derive"] }
is-terminal = "0.4.7"
argon2 = { version = "0.5.0", features = ["std"] }
chacha20poly1305 = { version = "0.10.1", features = ["std"] }
which = "4.4.0"
windows = { version = "0.51.1", features = ["Win32_Foundation", "Win32_System_Pipes"] }
time = "0.3.31"
[features]
# by default Tauri runs in production mode
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
default = ["custom-protocol"]
# this feature is used used for production builds where `devPath` points to the filesystem
# DO NOT remove this
custom-protocol = ["tauri/custom-protocol"]
# [profile.dev.build-override]
# opt-level = 3
-3
View File
@@ -1,3 +0,0 @@
fn main() {
tauri_build::build()
}
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
<!-- Create a subdirectory for the console binary so that we can add it to PATH -->
<Directory Id="BinDir" Name="bin">
<Component Id="CliBinary" Guid="b6358c8e-504f-41fd-b14b-38af821dcd04">
<!-- Same name as the main executable, so that it can be invoked as just "creddy" -->
<File Id="Bin_Cli" Source="..\..\creddy_cli.exe" Name="creddy.exe" KeyPath="yes"/>
</Component>
</Directory>
</DirectoryRef>
<DirectoryRef Id="TARGETDIR">
<Component Id="AddToPath" Guid="b5fdaf7e-94f2-4aad-9144-aa3a8edfa675">
<Environment Id="CreddyInstallDir" Action="set" Name="PATH" Part="last" Permanent="no" Value="[BinDir]" />
</Component>
</DirectoryRef>
</Fragment>
</Wix>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 974 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 903 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

@@ -1,18 +0,0 @@
-- Add migration script here
CREATE TABLE credentials (
access_key_id TEXT NOT NULL,
secret_key_enc BLOB NOT NULL,
salt BLOB NOT NULL,
nonce BLOB NOT NULL,
created_at INTEGER NOT NULL
);
CREATE TABLE config (
name TEXT UNIQUE NOT NULL,
data TEXT NOT NULL
);
CREATE TABLE clients (
name TEXT,
path TEXT
);
-176
View File
@@ -1,176 +0,0 @@
use std::error::Error;
use std::time::Duration;
use once_cell::sync::OnceCell;
use sqlx::{
SqlitePool,
sqlite::SqlitePoolOptions,
sqlite::SqliteConnectOptions,
};
use tauri::{
App,
AppHandle,
Manager,
async_runtime as rt,
};
use crate::{
config::{self, AppConfig},
credentials::Session,
ipc,
server::Server,
errors::*,
shortcuts,
state::AppState,
tray,
};
pub static APP: OnceCell<AppHandle> = OnceCell::new();
pub fn run() -> tauri::Result<()> {
tauri::Builder::default()
.plugin(tauri_plugin_single_instance::init(|app, _argv, _cwd| {
show_main_window(app)
.error_popup("Failed to show main window");
}))
.system_tray(tray::create())
.on_system_tray_event(tray::handle_event)
.invoke_handler(tauri::generate_handler![
ipc::unlock,
ipc::respond,
ipc::get_session_status,
ipc::signal_activity,
ipc::save_credentials,
ipc::get_config,
ipc::save_config,
ipc::launch_terminal,
ipc::get_setup_errors,
])
.setup(|app| rt::block_on(setup(app)))
.build(tauri::generate_context!())?
.run(|app, run_event| match run_event {
tauri::RunEvent::WindowEvent { event, .. } => match event {
tauri::WindowEvent::CloseRequested { api, .. } => {
let _ = hide_main_window(app);
api.prevent_close();
}
_ => ()
}
_ => ()
});
Ok(())
}
pub async fn connect_db() -> Result<SqlitePool, SetupError> {
let conn_opts = SqliteConnectOptions::new()
.filename(config::get_or_create_db_path()?)
.create_if_missing(true);
let pool_opts = SqlitePoolOptions::new();
let pool: SqlitePool = pool_opts.connect_with(conn_opts).await?;
sqlx::migrate!().run(&pool).await?;
Ok(pool)
}
async fn setup(app: &mut App) -> Result<(), Box<dyn Error>> {
APP.set(app.handle()).unwrap();
// get_or_create_db_path doesn't create the actual db file, just the directory
let is_first_launch = !config::get_or_create_db_path()?.exists();
let pool = connect_db().await?;
let mut setup_errors: Vec<String> = vec![];
let mut conf = match AppConfig::load(&pool).await {
Ok(c) => c,
Err(SetupError::ConfigParseError(_)) => {
setup_errors.push(
"Could not load configuration from database. Reverting to defaults.".into()
);
AppConfig::default()
},
err => err?,
};
let session = Session::load(&pool).await?;
Server::start(app.handle())?;
config::set_auto_launch(conf.start_on_login)?;
if let Err(_e) = config::set_auto_launch(conf.start_on_login) {
setup_errors.push("Error: Failed to manage autolaunch.".into());
}
// if hotkeys fail to register, disable them so that this error doesn't have to keep showing up
if let Err(_e) = shortcuts::register_hotkeys(&conf.hotkeys) {
conf.hotkeys.disable_all();
conf.save(&pool).await?;
setup_errors.push("Failed to register hotkeys. Hotkey settings have been disabled.".into());
}
let desktop_is_gnome = std::env::var("XDG_CURRENT_DESKTOP")
.map(|names| names.split(':').any(|n| n == "GNOME"))
.unwrap_or(false);
// if session is empty, this is probably the first launch, so don't autohide
if !conf.start_minimized || is_first_launch {
show_main_window(&app.handle())?;
}
let state = AppState::new(conf, session, pool, setup_errors, desktop_is_gnome);
app.manage(state);
// make sure we do this after managing app state, so that it doesn't panic
start_auto_locker(app.app_handle());
Ok(())
}
fn start_auto_locker(app: AppHandle) {
rt::spawn(async move {
let state = app.state::<AppState>();
loop {
// this gives our session-timeout a minimum resolution of 10s, which seems fine?
let delay = Duration::from_secs(10);
tokio::time::sleep(delay).await;
if state.should_auto_lock().await {
state.lock().await.error_popup("Failed to lock Creddy");
}
}
});
}
pub fn show_main_window(app: &AppHandle) -> Result<(), WindowError> {
let w = app.get_window("main").ok_or(WindowError::NoMainWindow)?;
w.show()?;
app.tray_handle()
.get_item("show_hide")
.set_title("Hide")?;
Ok(())
}
pub fn hide_main_window(app: &AppHandle) -> Result<(), WindowError> {
let w = app.get_window("main").ok_or(WindowError::NoMainWindow)?;
w.hide()?;
app.tray_handle()
.get_item("show_hide")
.set_title("Show")?;
Ok(())
}
pub fn toggle_main_window(app: &AppHandle) -> Result<(), WindowError> {
let w = app.get_window("main").ok_or(WindowError::NoMainWindow)?;
if w.is_visible()? {
hide_main_window(app)
}
else {
show_main_window(app)
}
}
-47
View File
@@ -1,47 +0,0 @@
// Windows isn't really amenable to having a single executable work as both a CLI and GUI app,
// so we just have a second binary for CLI usage
use creddy::{
cli,
errors::CliError,
};
use std::{
env,
process::{self, Command},
};
fn main() {
let args = cli::parser().get_matches();
if let Some(true) = args.get_one::<bool>("help") {
cli::parser().print_help().unwrap(); // if we can't print help we can't print an error
process::exit(0);
}
let res = match args.subcommand() {
None | Some(("run", _)) => launch_gui(),
Some(("get", m)) => cli::get(m),
Some(("exec", m)) => cli::exec(m),
Some(("shortcut", m)) => cli::invoke_shortcut(m),
_ => unreachable!("Unknown subcommand"),
};
if let Err(e) = res {
eprintln!("Error: {e}");
process::exit(1);
}
}
fn launch_gui() -> Result<(), CliError> {
let mut path = env::current_exe()?;
path.pop(); // bin dir
// binaries are colocated in dev, but not in production
#[cfg(not(debug_assertions))]
path.pop(); // install dir
path.push("creddy.exe"); // exe in main install dir (aka gui exe)
Command::new(path).spawn()?;
Ok(())
}
-203
View File
@@ -1,203 +0,0 @@
use std::ffi::OsString;
use std::process::Command as ChildCommand;
#[cfg(windows)]
use std::time::Duration;
use clap::{
Command,
Arg,
ArgMatches,
ArgAction,
builder::PossibleValuesParser,
};
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use crate::credentials::Credentials;
use crate::errors::*;
use crate::server::{Request, Response};
use crate::shortcuts::ShortcutAction;
#[cfg(unix)]
use {
std::os::unix::process::CommandExt,
tokio::net::UnixStream,
};
#[cfg(windows)]
use {
tokio::net::windows::named_pipe::{NamedPipeClient, ClientOptions},
windows::Win32::Foundation::ERROR_PIPE_BUSY,
};
pub fn parser() -> Command<'static> {
Command::new("creddy")
.version(env!("CARGO_PKG_VERSION"))
.about("A friendly AWS credentials manager")
.subcommand(
Command::new("run")
.about("Launch Creddy")
)
.subcommand(
Command::new("get")
.about("Request AWS credentials from Creddy and output to stdout")
.arg(
Arg::new("base")
.short('b')
.long("base")
.action(ArgAction::SetTrue)
.help("Use base credentials instead of session credentials")
)
)
.subcommand(
Command::new("exec")
.about("Inject AWS credentials into the environment of another command")
.trailing_var_arg(true)
.arg(
Arg::new("base")
.short('b')
.long("base")
.action(ArgAction::SetTrue)
.help("Use base credentials instead of session credentials")
)
.arg(
Arg::new("command")
.multiple_values(true)
)
)
.subcommand(
Command::new("shortcut")
.about("Invoke an action normally trigged by hotkey (e.g. launch terminal)")
.arg(
Arg::new("action")
.value_parser(
PossibleValuesParser::new(["show_window", "launch_terminal"])
)
)
)
}
pub fn get(args: &ArgMatches) -> Result<(), CliError> {
let base = args.get_one("base").unwrap_or(&false);
let output = match get_credentials(*base)? {
Credentials::Base(creds) => serde_json::to_string(&creds).unwrap(),
Credentials::Session(creds) => serde_json::to_string(&creds).unwrap(),
};
println!("{output}");
Ok(())
}
pub fn exec(args: &ArgMatches) -> Result<(), CliError> {
let base = *args.get_one("base").unwrap_or(&false);
let mut cmd_line = args.get_many("command")
.ok_or(ExecError::NoCommand)?;
let cmd_name: &String = cmd_line.next().unwrap(); // Clap guarantees that there will be at least one
let mut cmd = ChildCommand::new(cmd_name);
cmd.args(cmd_line);
match get_credentials(base)? {
Credentials::Base(creds) => {
cmd.env("AWS_ACCESS_KEY_ID", creds.access_key_id);
cmd.env("AWS_SECRET_ACCESS_KEY", creds.secret_access_key);
},
Credentials::Session(creds) => {
cmd.env("AWS_ACCESS_KEY_ID", creds.access_key_id);
cmd.env("AWS_SECRET_ACCESS_KEY", creds.secret_access_key);
cmd.env("AWS_SESSION_TOKEN", creds.session_token);
}
}
#[cfg(unix)]
{
// cmd.exec() never returns if successful
let e = cmd.exec();
match e.kind() {
std::io::ErrorKind::NotFound => {
let name: OsString = cmd_name.into();
Err(ExecError::NotFound(name).into())
}
_ => Err(ExecError::ExecutionFailed(e).into()),
}
}
#[cfg(windows)]
{
let mut child = match cmd.spawn() {
Ok(c) => c,
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
let name: OsString = cmd_name.into();
return Err(ExecError::NotFound(name).into());
}
Err(e) => return Err(ExecError::ExecutionFailed(e).into()),
};
let status = child.wait()
.map_err(|e| ExecError::ExecutionFailed(e))?;
std::process::exit(status.code().unwrap_or(1));
};
}
pub fn invoke_shortcut(args: &ArgMatches) -> Result<(), CliError> {
let action = match args.get_one::<String>("action").map(|s| s.as_str()) {
Some("show_window") => ShortcutAction::ShowWindow,
Some("launch_terminal") => ShortcutAction::LaunchTerminal,
Some(&_) | None => unreachable!("Unknown shortcut action"), // guaranteed by clap
};
let req = Request::InvokeShortcut(action);
match make_request(&req) {
Ok(Response::Empty) => Ok(()),
Ok(r) => Err(RequestError::Unexpected(r).into()),
Err(e) => Err(e.into()),
}
}
fn get_credentials(base: bool) -> Result<Credentials, RequestError> {
let req = Request::GetAwsCredentials { base };
match make_request(&req) {
Ok(Response::Aws(creds)) => Ok(creds),
Ok(r) => Err(RequestError::Unexpected(r)),
Err(e) => Err(e),
}
}
#[tokio::main]
async fn make_request(req: &Request) -> Result<Response, RequestError> {
let mut data = serde_json::to_string(req).unwrap();
// server expects newline marking end of request
data.push('\n');
let mut stream = connect().await?;
stream.write_all(&data.as_bytes()).await?;
let mut buf = Vec::with_capacity(1024);
stream.read_to_end(&mut buf).await?;
let res: Result<Response, ServerError> = serde_json::from_slice(&buf)?;
Ok(res?)
}
#[cfg(windows)]
async fn connect() -> Result<NamedPipeClient, std::io::Error> {
// apparently attempting to connect can fail if there's already a client connected
loop {
match ClientOptions::new().open(r"\\.\pipe\creddy-requests") {
Ok(stream) => return Ok(stream),
Err(e) if e.raw_os_error() == Some(ERROR_PIPE_BUSY.0 as i32) => (),
Err(e) => return Err(e),
}
tokio::time::sleep(Duration::from_millis(10)).await;
}
}
#[cfg(unix)]
async fn connect() -> Result<UnixStream, std::io::Error> {
UnixStream::connect("/tmp/creddy.sock").await
}
-35
View File
@@ -1,35 +0,0 @@
use std::path::{Path, PathBuf};
use sysinfo::{System, SystemExt, Pid, PidExt, ProcessExt};
use serde::{Serialize, Deserialize};
use crate::errors::*;
#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Hash)]
pub struct Client {
pub pid: u32,
pub exe: Option<PathBuf>,
}
pub fn get_process_parent_info(pid: u32) -> Result<Client, ClientInfoError> {
let sys_pid = Pid::from_u32(pid);
let mut sys = System::new();
sys.refresh_process(sys_pid);
let proc = sys.process(sys_pid)
.ok_or(ClientInfoError::ProcessNotFound)?;
let parent_pid_sys = proc.parent()
.ok_or(ClientInfoError::ParentPidNotFound)?;
sys.refresh_process(parent_pid_sys);
let parent = sys.process(parent_pid_sys)
.ok_or(ClientInfoError::ParentProcessNotFound)?;
let exe = match parent.exe() {
p if p == Path::new("") => None,
p => Some(PathBuf::from(p)),
};
Ok(Client { pid: parent_pid_sys.as_u32(), exe })
}
-223
View File
@@ -1,223 +0,0 @@
use std::path::PathBuf;
use std::time::Duration;
use auto_launch::AutoLaunchBuilder;
use is_terminal::IsTerminal;
use serde::{Serialize, Deserialize};
use sqlx::SqlitePool;
use crate::errors::*;
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct TermConfig {
pub name: String,
// we call it exec because it isn't always the actual path,
// in some cases it's just the name and relies on path-searching
// it's a string because it can come from the frontend as json
pub exec: String,
pub args: Vec<String>,
}
#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
pub struct Hotkey {
pub keys: String,
pub enabled: bool,
}
#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq)]
pub struct HotkeysConfig {
// tauri uses strings to represent keybinds, so we will as well
pub show_window: Hotkey,
pub launch_terminal: Hotkey,
}
impl HotkeysConfig {
pub fn disable_all(&mut self) {
self.show_window.enabled = false;
self.launch_terminal.enabled = false;
}
}
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct AppConfig {
#[serde(default = "default_rehide_ms")]
pub rehide_ms: u64,
#[serde(default = "default_auto_lock")]
pub auto_lock: bool,
#[serde(default = "default_lock_after")]
pub lock_after: Duration,
#[serde(default = "default_start_minimized")]
pub start_minimized: bool,
#[serde(default = "default_start_on_login")]
pub start_on_login: bool,
#[serde(default = "default_term_config")]
pub terminal: TermConfig,
#[serde(default = "default_hotkey_config")]
pub hotkeys: HotkeysConfig,
}
impl Default for AppConfig {
fn default() -> Self {
AppConfig {
rehide_ms: default_rehide_ms(),
auto_lock: default_auto_lock(),
lock_after: default_lock_after(),
start_minimized: default_start_minimized(),
start_on_login: default_start_on_login(),
terminal: default_term_config(),
hotkeys: default_hotkey_config(),
}
}
}
impl AppConfig {
pub async fn load(pool: &SqlitePool) -> Result<AppConfig, SetupError> {
let res = sqlx::query!("SELECT * from config where name = 'main'")
.fetch_optional(pool)
.await?;
let row = match res {
Some(row) => row,
None => return Ok(AppConfig::default()),
};
Ok(serde_json::from_str(&row.data)?)
}
pub async fn save(&self, pool: &SqlitePool) -> Result<(), sqlx::error::Error> {
let data = serde_json::to_string(self).unwrap();
sqlx::query(
"INSERT INTO config (name, data) VALUES ('main', ?)
ON CONFLICT (name) DO UPDATE SET data = ?"
)
.bind(&data)
.bind(&data)
.execute(pool)
.await?;
Ok(())
}
}
pub fn set_auto_launch(is_configured: bool) -> Result<(), SetupError> {
let path_buf = std::env::current_exe()
.map_err(|e| auto_launch::Error::Io(e))?;
let path = path_buf
.to_string_lossy();
let auto = AutoLaunchBuilder::new()
.set_app_name("Creddy")
.set_app_path(&path)
.build()?;
let is_enabled = auto.is_enabled()?;
if is_configured && !is_enabled {
auto.enable()?;
}
else if !is_configured && is_enabled {
auto.disable()?;
}
Ok(())
}
pub fn get_or_create_db_path() -> Result<PathBuf, DataDirError> {
let mut path = dirs::data_dir()
.ok_or(DataDirError::NotFound)?;
path.push("Creddy");
std::fs::create_dir_all(&path)?;
if cfg!(debug_assertions) && std::io::stdout().is_terminal() {
path.push("creddy.dev.db");
}
else {
path.push("creddy.db");
}
Ok(path)
}
fn default_term_config() -> TermConfig {
#[cfg(windows)]
{
let shell = if which::which("pwsh.exe").is_ok() {
"pwsh.exe".to_string()
}
else {
"powershell.exe".to_string()
};
let (exec, args) = if cfg!(debug_assertions) {
("conhost.exe".to_string(), vec![shell.clone()])
} else {
(shell.clone(), vec![])
};
TermConfig { name: shell, exec, args }
}
#[cfg(unix)]
{
for bin in ["gnome-terminal", "konsole"] {
if let Ok(_) = which::which(bin) {
return TermConfig {
name: bin.into(),
exec: bin.into(),
args: vec![],
}
}
}
return TermConfig {
name: "gnome-terminal".into(),
exec: "gnome-terminal".into(),
args: vec![],
};
}
}
fn default_hotkey_config() -> HotkeysConfig {
HotkeysConfig {
show_window: Hotkey {keys: "alt+shift+C".into(), enabled: true},
launch_terminal: Hotkey {keys: "alt+shift+T".into(), enabled: true},
}
}
fn default_rehide_ms() -> u64 { 1000 }
fn default_auto_lock() -> bool { true }
fn default_lock_after() -> Duration { Duration::from_secs(43200) }
// start minimized and on login only in production mode
fn default_start_minimized() -> bool { !cfg!(debug_assertions) }
fn default_start_on_login() -> bool { !cfg!(debug_assertions) }
// struct DurationVisitor;
// impl<'de> Visitor<'de> for DurationVisitor {
// type Value = Duration;
// fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
// write!(formatter, "an integer between 0 and 2^64 - 1")
// }
// fn visit_u64<E: de::Error>(self, v: u64) -> Result<Duration, E> {
// Ok(Duration::from_secs(v))
// }
// }
// fn duration_from_secs<'de, D>(deserializer: D) -> Result<Duration, D::Error>
// where D: Deserializer<'de>
// {
// deserializer.deserialize_u64(DurationVisitor)
// }
-346
View File
@@ -1,346 +0,0 @@
use std::fmt::{self, Formatter};
use std::time::{SystemTime, UNIX_EPOCH};
use aws_smithy_types::date_time::{DateTime, Format};
use argon2::{
Argon2,
Algorithm,
Version,
ParamsBuilder,
password_hash::rand_core::{RngCore, OsRng},
};
use chacha20poly1305::{
XChaCha20Poly1305,
XNonce,
aead::{
Aead,
AeadCore,
KeyInit,
Error as AeadError,
generic_array::GenericArray,
},
};
use serde::{
Serialize,
Deserialize,
Serializer,
Deserializer,
};
use serde::de::{self, Visitor};
use sqlx::SqlitePool;
use crate::errors::*;
#[derive(Clone, Debug)]
pub enum Session {
Unlocked{
base: BaseCredentials,
session: SessionCredentials,
},
Locked(LockedCredentials),
Empty,
}
impl Session {
pub async fn load(pool: &SqlitePool) -> Result<Self, SetupError> {
let res = sqlx::query!("SELECT * FROM credentials ORDER BY created_at desc")
.fetch_optional(pool)
.await?;
let row = match res {
Some(r) => r,
None => {return Ok(Session::Empty);}
};
let salt: [u8; 32] = row.salt
.try_into()
.map_err(|_e| SetupError::InvalidRecord)?;
let nonce = XNonce::from_exact_iter(row.nonce.into_iter())
.ok_or(SetupError::InvalidRecord)?;
let creds = LockedCredentials {
access_key_id: row.access_key_id,
secret_key_enc: row.secret_key_enc,
salt,
nonce,
};
Ok(Session::Locked(creds))
}
pub async fn renew_if_expired(&mut self) -> Result<bool, GetSessionError> {
match self {
Session::Unlocked{ref base, ref mut session} => {
if !session.is_expired() {
return Ok(false);
}
*session = SessionCredentials::from_base(base).await?;
Ok(true)
},
Session::Locked(_) => Err(GetSessionError::CredentialsLocked),
Session::Empty => Err(GetSessionError::CredentialsEmpty),
}
}
pub fn try_get(
&self
) -> Result<(&BaseCredentials, &SessionCredentials), GetCredentialsError> {
match self {
Self::Empty => Err(GetCredentialsError::Empty),
Self::Locked(_) => Err(GetCredentialsError::Locked),
Self::Unlocked{ ref base, ref session } => Ok((base, session))
}
}
}
#[derive(Clone, Debug)]
pub struct LockedCredentials {
pub access_key_id: String,
pub secret_key_enc: Vec<u8>,
pub salt: [u8; 32],
pub nonce: XNonce,
}
impl LockedCredentials {
pub async fn save(&self, pool: &SqlitePool) -> Result<(), sqlx::Error> {
sqlx::query(
"INSERT INTO credentials (access_key_id, secret_key_enc, salt, nonce, created_at)
VALUES (?, ?, ?, ?, strftime('%s'))"
)
.bind(&self.access_key_id)
.bind(&self.secret_key_enc)
.bind(&self.salt[..])
.bind(&self.nonce[..])
.execute(pool)
.await?;
Ok(())
}
pub fn decrypt(&self, passphrase: &str) -> Result<BaseCredentials, UnlockError> {
let crypto = Crypto::new(passphrase, &self.salt)
.map_err(|e| CryptoError::Argon2(e))?;
let decrypted = crypto.decrypt(&self.nonce, &self.secret_key_enc)
.map_err(|e| CryptoError::Aead(e))?;
let secret_access_key = String::from_utf8(decrypted)
.map_err(|_| UnlockError::InvalidUtf8)?;
let creds = BaseCredentials::new(
self.access_key_id.clone(),
secret_access_key,
);
Ok(creds)
}
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "PascalCase")]
pub struct BaseCredentials {
pub version: usize,
pub access_key_id: String,
pub secret_access_key: String,
}
impl BaseCredentials {
pub fn new(access_key_id: String, secret_access_key: String) -> Self {
Self {version: 1, access_key_id, secret_access_key}
}
pub fn encrypt(&self, passphrase: &str) -> Result<LockedCredentials, CryptoError> {
let salt = Crypto::salt();
let crypto = Crypto::new(passphrase, &salt)?;
let (nonce, secret_key_enc) = crypto.encrypt(self.secret_access_key.as_bytes())?;
let locked = LockedCredentials {
access_key_id: self.access_key_id.clone(),
secret_key_enc,
salt,
nonce,
};
Ok(locked)
}
}
#[derive(Clone, Debug, Serialize, Deserialize)]
#[serde(rename_all = "PascalCase")]
pub struct SessionCredentials {
pub version: usize,
pub access_key_id: String,
pub secret_access_key: String,
pub session_token: String,
#[serde(serialize_with = "serialize_expiration")]
#[serde(deserialize_with = "deserialize_expiration")]
pub expiration: DateTime,
}
impl SessionCredentials {
pub async fn from_base(base: &BaseCredentials) -> Result<Self, GetSessionError> {
let req_creds = aws_sdk_sts::Credentials::new(
&base.access_key_id,
&base.secret_access_key,
None, // token
None, //expiration
"Creddy", // "provider name" apparently
);
let config = aws_config::from_env()
.credentials_provider(req_creds)
.load()
.await;
let client = aws_sdk_sts::Client::new(&config);
let resp = client.get_session_token()
.duration_seconds(43_200)
.send()
.await?;
let aws_session = resp.credentials().ok_or(GetSessionError::EmptyResponse)?;
let access_key_id = aws_session.access_key_id()
.ok_or(GetSessionError::EmptyResponse)?
.to_string();
let secret_access_key = aws_session.secret_access_key()
.ok_or(GetSessionError::EmptyResponse)?
.to_string();
let session_token = aws_session.session_token()
.ok_or(GetSessionError::EmptyResponse)?
.to_string();
let expiration = aws_session.expiration()
.ok_or(GetSessionError::EmptyResponse)?
.clone();
let session_creds = SessionCredentials {
version: 1,
access_key_id,
secret_access_key,
session_token,
expiration,
};
#[cfg(debug_assertions)]
println!("Got new session:\n{}", serde_json::to_string(&session_creds).unwrap());
Ok(session_creds)
}
pub fn is_expired(&self) -> bool {
let current_ts = SystemTime::now()
.duration_since(UNIX_EPOCH)
.unwrap() // doesn't panic because UNIX_EPOCH won't be later than now()
.as_secs();
let expire_ts = self.expiration.secs();
let remaining = expire_ts - (current_ts as i64);
remaining < 60
}
}
#[derive(Debug, Serialize, Deserialize)]
pub enum Credentials {
Base(BaseCredentials),
Session(SessionCredentials),
}
fn serialize_expiration<S>(exp: &DateTime, serializer: S) -> Result<S::Ok, S::Error>
where S: Serializer
{
// this only fails if the d/t is out of range, which it can't be for this format
let time_str = exp.fmt(Format::DateTime).unwrap();
serializer.serialize_str(&time_str)
}
struct DateTimeVisitor;
impl<'de> Visitor<'de> for DateTimeVisitor {
type Value = DateTime;
fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
write!(formatter, "an RFC 3339 UTC string, e.g. \"2014-01-05T10:17:34Z\"")
}
fn visit_str<E: de::Error>(self, v: &str) -> Result<DateTime, E> {
DateTime::from_str(v, Format::DateTime)
.map_err(|_| E::custom(format!("Invalid date/time: {v}")))
}
}
fn deserialize_expiration<'de, D>(deserializer: D) -> Result<DateTime, D::Error>
where D: Deserializer<'de>
{
deserializer.deserialize_str(DateTimeVisitor)
}
struct Crypto {
cipher: XChaCha20Poly1305,
}
impl Crypto {
/// Argon2 params rationale:
///
/// m_cost is measured in KiB, so 128 * 1024 gives us 128MiB.
/// This should roughly double the memory usage of the application
/// while deriving the key.
///
/// p_cost is irrelevant since (at present) there isn't any parallelism
/// implemented, so we leave it at 1.
///
/// With the above m_cost, t_cost = 8 results in about 800ms to derive
/// a key on my (somewhat older) CPU. This is probably overkill, but
/// given that it should only have to happen ~once a day for most
/// usage, it should be acceptable.
#[cfg(not(debug_assertions))]
const MEM_COST: u32 = 128 * 1024;
#[cfg(not(debug_assertions))]
const TIME_COST: u32 = 8;
/// But since this takes a million years without optimizations,
/// we turn it way down in debug builds.
#[cfg(debug_assertions)]
const MEM_COST: u32 = 48 * 1024;
#[cfg(debug_assertions)]
const TIME_COST: u32 = 1;
fn new(passphrase: &str, salt: &[u8]) -> argon2::Result<Crypto> {
let params = ParamsBuilder::new()
.m_cost(Self::MEM_COST)
.p_cost(1)
.t_cost(Self::TIME_COST)
.build()
.unwrap(); // only errors if the given params are invalid
let hasher = Argon2::new(
Algorithm::Argon2id,
Version::V0x13,
params,
);
let mut key = [0; 32];
hasher.hash_password_into(passphrase.as_bytes(), &salt, &mut key)?;
let cipher = XChaCha20Poly1305::new(GenericArray::from_slice(&key));
Ok(Crypto { cipher })
}
fn salt() -> [u8; 32] {
let mut salt = [0; 32];
OsRng.fill_bytes(&mut salt);
salt
}
fn encrypt(&self, data: &[u8]) -> Result<(XNonce, Vec<u8>), AeadError> {
let nonce = XChaCha20Poly1305::generate_nonce(&mut OsRng);
let ciphertext = self.cipher.encrypt(&nonce, data)?;
Ok((nonce, ciphertext))
}
fn decrypt(&self, nonce: &XNonce, data: &[u8]) -> Result<Vec<u8>, AeadError> {
self.cipher.decrypt(nonce, data)
}
}
-477
View File
@@ -1,477 +0,0 @@
use std::error::Error;
use std::convert::AsRef;
use std::ffi::OsString;
use std::sync::mpsc;
use std::string::FromUtf8Error;
use strum_macros::AsRefStr;
use thiserror::Error as ThisError;
use aws_sdk_sts::{
types::SdkError as AwsSdkError,
error::GetSessionTokenError,
};
use sqlx::{
error::Error as SqlxError,
migrate::MigrateError,
};
use tauri::api::dialog::{
MessageDialogBuilder,
MessageDialogKind,
};
use tokio::sync::oneshot::error::RecvError;
use serde::{
Serialize,
Serializer,
ser::SerializeMap,
Deserialize,
};
pub trait ShowError {
fn error_popup(self, title: &str);
fn error_popup_nowait(self, title: &str);
fn error_print(self);
fn error_print_prefix(self, prefix: &str);
}
impl<E: std::fmt::Display> ShowError for Result<(), E> {
fn error_popup(self, title: &str) {
if let Err(e) = self {
let (tx, rx) = mpsc::channel();
MessageDialogBuilder::new(title, format!("{e}"))
.kind(MessageDialogKind::Error)
.show(move |_| tx.send(true).unwrap());
rx.recv().unwrap();
}
}
fn error_popup_nowait(self, title: &str) {
if let Err(e) = self {
MessageDialogBuilder::new(title, format!("{e}"))
.kind(MessageDialogKind::Error)
.show(|_| {})
}
}
fn error_print(self) {
if let Err(e) = self {
eprintln!("{e}");
}
}
fn error_print_prefix(self, prefix: &str) {
if let Err(e) = self {
eprintln!("{prefix}: {e}");
}
}
}
fn serialize_basic_err<E, S>(err: &E, serializer: S) -> Result<S::Ok, S::Error>
where
E: std::error::Error + AsRef<str>,
S: Serializer,
{
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", err.as_ref())?;
map.serialize_entry("msg", &format!("{err}"))?;
if let Some(src) = err.source() {
map.serialize_entry("source", &format!("{src}"))?;
}
map.end()
}
struct SerializeUpstream<E>(pub E);
impl<E: Error> Serialize for SerializeUpstream<E> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let msg = format!("{}", self.0);
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("msg", &msg)?;
map.serialize_entry("code", &None::<&str>)?;
map.serialize_entry("source", &None::<&str>)?;
map.end()
}
}
fn serialize_upstream_err<E, M>(err: &E, map: &mut M) -> Result<(), M::Error>
where
E: Error,
M: serde::ser::SerializeMap,
{
// let msg = err.source().map(|s| format!("{s}"));
// map.serialize_entry("msg", &msg)?;
// map.serialize_entry("code", &None::<&str>)?;
// map.serialize_entry("source", &None::<&str>)?;
match err.source() {
Some(src) => map.serialize_entry("source", &SerializeUpstream(src))?,
None => map.serialize_entry("source", &None::<&str>)?,
}
Ok(())
}
macro_rules! impl_serialize_basic {
($err_type:ident) => {
impl Serialize for $err_type {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
serialize_basic_err(self, serializer)
}
}
}
}
// error during initial setup (primarily loading state from db)
#[derive(Debug, ThisError, AsRefStr)]
pub enum SetupError {
#[error("Invalid database record")]
InvalidRecord, // e.g. wrong size blob for nonce or salt
#[error("Error from database: {0}")]
DbError(#[from] SqlxError),
#[error("Error running migrations: {0}")]
MigrationError(#[from] MigrateError),
#[error("Error parsing configuration from database")]
ConfigParseError(#[from] serde_json::Error),
#[error("Failed to set up start-on-login: {0}")]
AutoLaunchError(#[from] auto_launch::Error),
#[error("Failed to start listener: {0}")]
ServerSetupError(#[from] std::io::Error),
#[error("Failed to resolve data directory: {0}")]
DataDir(#[from] DataDirError),
#[error("Failed to register hotkeys: {0}")]
RegisterHotkeys(#[from] tauri::Error),
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum DataDirError {
#[error("Could not determine data directory")]
NotFound,
#[error("Failed to create data directory: {0}")]
Io(#[from] std::io::Error),
}
// error when attempting to tell a request handler whether to release or deny credentials
#[derive(Debug, ThisError, AsRefStr)]
pub enum SendResponseError {
#[error("The specified credentials request was not found")]
NotFound,
#[error("The specified request was already closed by the client")]
Abandoned,
#[error("A response has already been received for the specified request")]
Fulfilled,
#[error("Could not renew AWS sesssion: {0}")]
SessionRenew(#[from] GetSessionError),
}
// errors encountered while handling a client request
#[derive(Debug, ThisError, AsRefStr)]
pub enum HandlerError {
#[error("Error writing to stream: {0}")]
StreamIOError(#[from] std::io::Error),
#[error("Received invalid UTF-8 in request")]
InvalidUtf8(#[from] FromUtf8Error),
#[error("HTTP request malformed")]
BadRequest(#[from] serde_json::Error),
#[error("HTTP request too large")]
RequestTooLarge,
#[error("Connection closed early by client")]
Abandoned,
#[error("Internal server error")]
Internal(#[from] RecvError),
#[error("Error accessing credentials: {0}")]
NoCredentials(#[from] GetCredentialsError),
#[error("Error getting client details: {0}")]
ClientInfo(#[from] ClientInfoError),
#[error("Error from Tauri: {0}")]
Tauri(#[from] tauri::Error),
#[error("No main application window found")]
NoMainWindow,
#[error("Request was denied")]
Denied,
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum WindowError {
#[error("Failed to find main application window")]
NoMainWindow,
#[error(transparent)]
ManageFailure(#[from] tauri::Error),
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum GetCredentialsError {
#[error("Credentials are currently locked")]
Locked,
#[error("No credentials are known")]
Empty,
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum GetSessionError {
#[error("Request completed successfully but no credentials were returned")]
EmptyResponse, // SDK returned successfully but credentials are None
#[error("Error response from AWS SDK: {0}")]
SdkError(#[from] AwsSdkError<GetSessionTokenError>),
#[error("Could not construt session: credentials are locked")]
CredentialsLocked,
#[error("Could not construct session: no credentials are known")]
CredentialsEmpty,
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum UnlockError {
#[error("App is not locked")]
NotLocked,
#[error("No saved credentials were found")]
NoCredentials,
#[error(transparent)]
Crypto(#[from] CryptoError),
#[error("Data was found to be corrupt after decryption")]
InvalidUtf8, // Somehow we got invalid utf-8 even though decryption succeeded
#[error("Database error: {0}")]
DbError(#[from] SqlxError),
#[error("Failed to create AWS session: {0}")]
GetSession(#[from] GetSessionError),
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum LockError {
#[error("App is not unlocked")]
NotUnlocked,
#[error("Database error: {0}")]
DbError(#[from] SqlxError),
#[error(transparent)]
Setup(#[from] SetupError),
#[error(transparent)]
TauriError(#[from] tauri::Error),
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum CryptoError {
#[error(transparent)]
Argon2(#[from] argon2::Error),
#[error("Invalid passphrase")] // I think this is the only way decryption fails
Aead(#[from] chacha20poly1305::aead::Error),
}
// Errors encountered while trying to figure out who's on the other end of a request
#[derive(Debug, ThisError, AsRefStr)]
pub enum ClientInfoError {
#[error("Found PID for client socket, but no corresponding process")]
ProcessNotFound,
#[error("Could not determine parent PID of connected client")]
ParentPidNotFound,
#[error("Found PID for parent process of client, but no corresponding process")]
ParentProcessNotFound,
#[cfg(windows)]
#[error("Could not determine PID of connected client")]
WindowsError(#[from] windows::core::Error),
#[error(transparent)]
Io(#[from] std::io::Error),
}
// Technically also an error, but formatted as a struct for easy deserialization
#[derive(Debug, Serialize, Deserialize)]
pub struct ServerError {
code: String,
msg: String,
}
impl std::fmt::Display for ServerError {
fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
write!(f, "{} ({})", self.msg, self.code)?;
Ok(())
}
}
// Errors encountered while requesting credentials via CLI (creddy show, creddy exec)
#[derive(Debug, ThisError, AsRefStr)]
pub enum RequestError {
#[error("Error response from server: {0}")]
Server(ServerError),
#[error("Unexpected response from server")]
Unexpected(crate::server::Response),
#[error("The server did not respond with valid JSON")]
InvalidJson(#[from] serde_json::Error),
#[error("Error reading/writing stream: {0}")]
StreamIOError(#[from] std::io::Error),
}
impl From<ServerError> for RequestError {
fn from(s: ServerError) -> Self {
Self::Server(s)
}
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum CliError {
#[error(transparent)]
Request(#[from] RequestError),
#[error(transparent)]
Exec(#[from] ExecError),
#[error(transparent)]
Io(#[from] std::io::Error),
}
// Errors encountered while trying to launch a child process
#[derive(Debug, ThisError, AsRefStr)]
pub enum ExecError {
#[error("Please specify a command")]
NoCommand,
#[error("Executable not found: {0:?}")]
NotFound(OsString),
#[error("Failed to execute command: {0}")]
ExecutionFailed(#[from] std::io::Error),
#[error(transparent)]
GetCredentials(#[from] GetCredentialsError),
}
#[derive(Debug, ThisError, AsRefStr)]
pub enum LaunchTerminalError {
#[error("Could not discover main window")]
NoMainWindow,
#[error("Failed to communicate with main Creddy window")]
IpcFailed(#[from] tauri::Error),
#[error("Failed to launch terminal: {0}")]
Exec(#[from] ExecError),
#[error(transparent)]
GetCredentials(#[from] GetCredentialsError),
}
// =========================
// Serialize implementations
// =========================
struct SerializeWrapper<E>(pub E);
impl Serialize for SerializeWrapper<&GetSessionTokenError> {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let err = self.0;
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", &err.code())?;
map.serialize_entry("msg", &err.message())?;
map.serialize_entry("source", &None::<&str>)?;
map.end()
}
}
impl_serialize_basic!(SetupError);
impl_serialize_basic!(GetCredentialsError);
impl_serialize_basic!(ClientInfoError);
impl_serialize_basic!(WindowError);
impl_serialize_basic!(LockError);
impl Serialize for HandlerError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", self.as_ref())?;
map.serialize_entry("msg", &format!("{self}"))?;
map.end()
}
}
impl Serialize for SendResponseError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", self.as_ref())?;
map.serialize_entry("msg", &format!("{self}"))?;
match self {
SendResponseError::SessionRenew(src) => map.serialize_entry("source", &src)?,
_ => serialize_upstream_err(self, &mut map)?,
}
map.end()
}
}
impl Serialize for GetSessionError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", self.as_ref())?;
map.serialize_entry("msg", &format!("{self}"))?;
match self {
GetSessionError::SdkError(AwsSdkError::ServiceError(se_wrapper)) => {
let err = se_wrapper.err();
map.serialize_entry("source", &SerializeWrapper(err))?
}
_ => serialize_upstream_err(self, &mut map)?,
}
map.end()
}
}
impl Serialize for UnlockError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", self.as_ref())?;
map.serialize_entry("msg", &format!("{self}"))?;
match self {
UnlockError::GetSession(src) => map.serialize_entry("source", &src)?,
// The string representation of the AEAD error is not very helpful, so skip it
UnlockError::Crypto(_src) => map.serialize_entry("source", &None::<&str>)?,
_ => serialize_upstream_err(self, &mut map)?,
}
map.end()
}
}
impl Serialize for ExecError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", self.as_ref())?;
map.serialize_entry("msg", &format!("{self}"))?;
match self {
ExecError::GetCredentials(src) => map.serialize_entry("source", &src)?,
_ => serialize_upstream_err(self, &mut map)?,
}
map.end()
}
}
impl Serialize for LaunchTerminalError {
fn serialize<S: Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
let mut map = serializer.serialize_map(None)?;
map.serialize_entry("code", self.as_ref())?;
map.serialize_entry("msg", &format!("{self}"))?;
match self {
LaunchTerminalError::Exec(src) => map.serialize_entry("source", &src)?,
_ => serialize_upstream_err(self, &mut map)?,
}
map.end()
}
}
-101
View File
@@ -1,101 +0,0 @@
use serde::{Serialize, Deserialize};
use tauri::State;
use crate::config::AppConfig;
use crate::credentials::{Session,BaseCredentials};
use crate::errors::*;
use crate::clientinfo::Client;
use crate::state::AppState;
use crate::terminal;
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct AwsRequestNotification {
pub id: u64,
pub client: Client,
pub base: bool,
}
#[derive(Debug, Serialize, Deserialize)]
pub struct RequestResponse {
pub id: u64,
pub approval: Approval,
pub base: bool,
}
#[derive(Debug, Serialize, Deserialize)]
pub enum Approval {
Approved,
Denied,
}
#[tauri::command]
pub async fn respond(response: RequestResponse, app_state: State<'_, AppState>) -> Result<(), SendResponseError> {
app_state.send_response(response).await
}
#[tauri::command]
pub async fn unlock(passphrase: String, app_state: State<'_, AppState>) -> Result<(), UnlockError> {
app_state.unlock(&passphrase).await
}
#[tauri::command]
pub async fn get_session_status(app_state: State<'_, AppState>) -> Result<String, ()> {
let session = app_state.session.read().await;
let status = match *session {
Session::Locked(_) => "locked".into(),
Session::Unlocked{..} => "unlocked".into(),
Session::Empty => "empty".into()
};
Ok(status)
}
#[tauri::command]
pub async fn signal_activity(app_state: State<'_, AppState>) -> Result<(), ()> {
app_state.signal_activity().await;
Ok(())
}
#[tauri::command]
pub async fn save_credentials(
credentials: BaseCredentials,
passphrase: String,
app_state: State<'_, AppState>
) -> Result<(), UnlockError> {
app_state.new_creds(credentials, &passphrase).await
}
#[tauri::command]
pub async fn get_config(app_state: State<'_, AppState>) -> Result<AppConfig, ()> {
let config = app_state.config.read().await;
Ok(config.clone())
}
#[tauri::command]
pub async fn save_config(config: AppConfig, app_state: State<'_, AppState>) -> Result<(), String> {
app_state.update_config(config)
.await
.map_err(|e| format!("Error saving config: {e}"))?;
Ok(())
}
#[tauri::command]
pub async fn launch_terminal(base: bool) -> Result<(), LaunchTerminalError> {
terminal::launch(base).await
}
#[tauri::command]
pub async fn get_setup_errors(app_state: State<'_, AppState>) -> Result<Vec<String>, ()> {
Ok(app_state.setup_errors.clone())
}
-12
View File
@@ -1,12 +0,0 @@
pub mod app;
pub mod cli;
mod config;
mod credentials;
pub mod errors;
mod clientinfo;
mod ipc;
mod state;
mod server;
mod shortcuts;
mod terminal;
mod tray;
-29
View File
@@ -1,29 +0,0 @@
#![cfg_attr(
all(not(debug_assertions), target_os = "windows"),
windows_subsystem = "windows"
)]
use creddy::{
app,
cli,
errors::ShowError,
};
fn main() {
let res = match cli::parser().get_matches().subcommand() {
None | Some(("run", _)) => {
app::run().error_popup("Creddy failed to start");
Ok(())
},
Some(("get", m)) => cli::get(m),
Some(("exec", m)) => cli::exec(m),
Some(("shortcut", m)) => cli::invoke_shortcut(m),
_ => unreachable!(),
};
if let Err(e) = res {
eprintln!("Error: {e}");
std::process::exit(1);
}
}
-164
View File
@@ -1,164 +0,0 @@
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::sync::oneshot;
use serde::{Serialize, Deserialize};
use tauri::{AppHandle, Manager};
use crate::errors::*;
use crate::clientinfo::{self, Client};
use crate::credentials::Credentials;
use crate::ipc::{Approval, AwsRequestNotification};
use crate::state::AppState;
use crate::shortcuts::{self, ShortcutAction};
#[cfg(windows)]
mod server_win;
#[cfg(windows)]
pub use server_win::Server;
#[cfg(windows)]
use server_win::Stream;
#[cfg(unix)]
mod server_unix;
#[cfg(unix)]
pub use server_unix::Server;
#[cfg(unix)]
use server_unix::Stream;
#[derive(Serialize, Deserialize)]
pub enum Request {
GetAwsCredentials{
base: bool,
},
InvokeShortcut(ShortcutAction),
}
#[derive(Debug, Serialize, Deserialize)]
pub enum Response {
Aws(Credentials),
Empty,
}
struct CloseWaiter<'s> {
stream: &'s mut Stream,
}
impl<'s> CloseWaiter<'s> {
async fn wait_for_close(&mut self) -> std::io::Result<()> {
let mut buf = [0u8; 8];
loop {
match self.stream.read(&mut buf).await {
Ok(0) => break Ok(()),
Ok(_) => (),
Err(e) => break Err(e),
}
}
}
}
async fn handle(mut stream: Stream, app_handle: AppHandle, client_pid: u32) -> Result<(), HandlerError>
{
// read from stream until delimiter is reached
let mut buf: Vec<u8> = Vec::with_capacity(1024); // requests are small, 1KiB is more than enough
let mut n = 0;
loop {
n += stream.read_buf(&mut buf).await?;
if let Some(&b'\n') = buf.last() {
break;
}
else if n >= 1024 {
return Err(HandlerError::RequestTooLarge);
}
}
let client = clientinfo::get_process_parent_info(client_pid)?;
let waiter = CloseWaiter { stream: &mut stream };
let req: Request = serde_json::from_slice(&buf)?;
let res = match req {
Request::GetAwsCredentials{ base } => get_aws_credentials(
base, client, app_handle, waiter
).await,
Request::InvokeShortcut(action) => invoke_shortcut(action).await,
};
// doesn't make sense to send the error to the client if the client has already left
if let Err(HandlerError::Abandoned) = res {
return Err(HandlerError::Abandoned);
}
let res = serde_json::to_vec(&res).unwrap();
stream.write_all(&res).await?;
Ok(())
}
async fn invoke_shortcut(action: ShortcutAction) -> Result<Response, HandlerError> {
shortcuts::exec_shortcut(action);
Ok(Response::Empty)
}
async fn get_aws_credentials(
base: bool,
client: Client,
app_handle: AppHandle,
mut waiter: CloseWaiter<'_>,
) -> Result<Response, HandlerError> {
let state = app_handle.state::<AppState>();
let rehide_ms = {
let config = state.config.read().await;
config.rehide_ms
};
let lease = state.acquire_visibility_lease(rehide_ms).await
.map_err(|_e| HandlerError::NoMainWindow)?; // automate this conversion eventually?
let (chan_send, chan_recv) = oneshot::channel();
let request_id = state.register_request(chan_send).await;
// if an error occurs in any of the following, we want to abort the operation
// but ? returns immediately, and we want to unregister the request before returning
// so we bundle it all up in an async block and return a Result so we can handle errors
let proceed = async {
let notification = AwsRequestNotification {id: request_id, client, base};
app_handle.emit_all("credentials-request", &notification)?;
let response = tokio::select! {
r = chan_recv => r?,
_ = waiter.wait_for_close() => {
app_handle.emit_all("request-cancelled", request_id)?;
return Err(HandlerError::Abandoned);
},
};
match response.approval {
Approval::Approved => {
if response.base {
let creds = state.base_creds_cloned().await?;
Ok(Response::Aws(Credentials::Base(creds)))
}
else {
let creds = state.session_creds_cloned().await?;
Ok(Response::Aws(Credentials::Session(creds)))
}
},
Approval::Denied => Err(HandlerError::Denied),
}
};
let result = match proceed.await {
Ok(r) => Ok(r),
Err(e) => {
state.unregister_request(request_id).await;
Err(e)
}
};
lease.release();
result
}
-59
View File
@@ -1,59 +0,0 @@
use std::io::ErrorKind;
use tokio::net::{UnixListener, UnixStream};
use tauri::{
AppHandle,
Manager,
async_runtime as rt,
};
use crate::errors::*;
pub type Stream = UnixStream;
pub struct Server {
listener: UnixListener,
app_handle: AppHandle,
}
impl Server {
pub fn start(app_handle: AppHandle) -> std::io::Result<()> {
match std::fs::remove_file("/tmp/creddy.sock") {
Ok(_) => (),
Err(e) if e.kind() == ErrorKind::NotFound => (),
Err(e) => return Err(e),
}
let listener = UnixListener::bind("/tmp/creddy.sock")?;
let srv = Server { listener, app_handle };
rt::spawn(srv.serve());
Ok(())
}
async fn serve(self) {
loop {
self.try_serve()
.await
.error_print_prefix("Error accepting request: ");
}
}
async fn try_serve(&self) -> Result<(), HandlerError> {
let (stream, _addr) = self.listener.accept().await?;
let new_handle = self.app_handle.app_handle();
let client_pid = get_client_pid(&stream)?;
rt::spawn(async move {
super::handle(stream, new_handle, client_pid)
.await
.error_print_prefix("Error responding to request: ");
});
Ok(())
}
}
fn get_client_pid(stream: &UnixStream) -> std::io::Result<u32> {
let cred = stream.peer_cred()?;
Ok(cred.pid().unwrap() as u32)
}
-74
View File
@@ -1,74 +0,0 @@
use tokio::net::windows::named_pipe::{
NamedPipeServer,
ServerOptions,
};
use tauri::{AppHandle, Manager};
use windows::Win32:: {
Foundation::HANDLE,
System::Pipes::GetNamedPipeClientProcessId,
};
use std::os::windows::io::AsRawHandle;
use tauri::async_runtime as rt;
use crate::errors::*;
// used by parent module
pub type Stream = NamedPipeServer;
pub struct Server {
listener: NamedPipeServer,
app_handle: AppHandle,
}
impl Server {
pub fn start(app_handle: AppHandle) -> std::io::Result<()> {
let listener = ServerOptions::new()
.first_pipe_instance(true)
.create(r"\\.\pipe\creddy-requests")?;
let srv = Server {listener, app_handle};
rt::spawn(srv.serve());
Ok(())
}
async fn serve(mut self) {
loop {
if let Err(e) = self.try_serve().await {
eprintln!("Error accepting connection: {e}");
}
}
}
async fn try_serve(&mut self) -> Result<(), HandlerError> {
// connect() just waits for a client to connect, it doesn't return anything
self.listener.connect().await?;
// create a new pipe instance to listen for the next client, and swap it in
let new_listener = ServerOptions::new().create(r"\\.\pipe\creddy-requests")?;
let stream = std::mem::replace(&mut self.listener, new_listener);
let new_handle = self.app_handle.app_handle();
let client_pid = get_client_pid(&stream)?;
rt::spawn(async move {
super::handle(stream, new_handle, client_pid)
.await
.error_print_prefix("Error responding to request: ");
});
Ok(())
}
}
fn get_client_pid(pipe: &NamedPipeServer) -> Result<u32, ClientInfoError> {
let raw_handle = pipe.as_raw_handle();
let mut pid = 0u32;
let handle = HANDLE(raw_handle as _);
unsafe { GetNamedPipeClientProcessId(handle, &mut pid as *mut u32)? };
Ok(pid)
}
-60
View File
@@ -1,60 +0,0 @@
use serde::{Serialize, Deserialize};
use tauri::{
GlobalShortcutManager,
Manager,
async_runtime as rt,
};
use crate::app::APP;
use crate::config::HotkeysConfig;
use crate::errors::*;
use crate::terminal;
#[derive(Debug, Serialize, Deserialize)]
pub enum ShortcutAction {
ShowWindow,
LaunchTerminal,
}
pub fn exec_shortcut(action: ShortcutAction) {
match action {
ShortcutAction::ShowWindow => {
let app = APP.get().unwrap();
app.get_window("main")
.ok_or("Couldn't find application main window")
.map(|w| w.show().error_popup("Failed to show window"))
.error_popup("Failed to show window");
},
ShortcutAction::LaunchTerminal => {
rt::spawn(async {
terminal::launch(false).await.error_popup("Failed to launch terminal");
});
},
}
}
pub fn register_hotkeys(hotkeys: &HotkeysConfig) -> tauri::Result<()> {
let app = APP.get().unwrap();
let mut manager = app.global_shortcut_manager();
manager.unregister_all()?;
if hotkeys.show_window.enabled {
manager.register(
&hotkeys.show_window.keys,
|| exec_shortcut(ShortcutAction::ShowWindow)
)?;
}
if hotkeys.launch_terminal.enabled {
manager.register(
&hotkeys.launch_terminal.keys,
|| exec_shortcut(ShortcutAction::LaunchTerminal)
)?;
}
Ok(())
}
-288
View File
@@ -1,288 +0,0 @@
use std::collections::HashMap;
use std::time::Duration;
use time::OffsetDateTime;
use tokio::{
sync::RwLock,
sync::oneshot::{self, Sender},
};
use sqlx::SqlitePool;
use tauri::{
Manager,
async_runtime as rt,
};
use crate::app;
use crate::credentials::{
Session,
BaseCredentials,
SessionCredentials,
};
use crate::{config, config::AppConfig};
use crate::ipc::{self, Approval, RequestResponse};
use crate::errors::*;
use crate::shortcuts;
#[derive(Debug)]
struct Visibility {
leases: usize,
original: Option<bool>,
}
impl Visibility {
fn new() -> Self {
Visibility { leases: 0, original: None }
}
fn acquire(&mut self, delay_ms: u64) -> Result<VisibilityLease, WindowError> {
let app = crate::app::APP.get().unwrap();
let window = app.get_window("main")
.ok_or(WindowError::NoMainWindow)?;
self.leases += 1;
// `original` represents the visibility of the window before any leases were acquired
// None means we don't know, Some(false) means it was previously hidden,
// Some(true) means it was previously visible
let is_visible = window.is_visible()?;
if self.original.is_none() {
self.original = Some(is_visible);
}
let state = app.state::<AppState>();
if is_visible && state.desktop_is_gnome {
// Gnome has a really annoying "focus-stealing prevention" behavior means we
// can't just pop up when the window is already visible, so to work around it
// we hide and then immediately unhide the window
window.hide()?;
}
app::show_main_window(&app)?;
window.set_focus()?;
let (tx, rx) = oneshot::channel();
let lease = VisibilityLease { notify: tx };
let delay = Duration::from_millis(delay_ms);
let handle = app.app_handle();
rt::spawn(async move {
// We don't care if it's an error; lease being dropped should be handled identically
let _ = rx.await;
tokio::time::sleep(delay).await;
// we can't use `self` here because we would have to move it into the async block
let state = handle.state::<AppState>();
let mut visibility = state.visibility.write().await;
visibility.leases -= 1;
if visibility.leases == 0 {
if let Some(false) = visibility.original {
app::hide_main_window(&handle).error_print();
}
visibility.original = None;
}
});
Ok(lease)
}
}
pub struct VisibilityLease {
notify: Sender<()>,
}
impl VisibilityLease {
pub fn release(self) {
rt::spawn(async move {
if let Err(_) = self.notify.send(()) {
eprintln!("Error releasing visibility lease")
}
});
}
}
#[derive(Debug)]
pub struct AppState {
pub config: RwLock<AppConfig>,
pub session: RwLock<Session>,
pub last_activity: RwLock<OffsetDateTime>,
pub request_count: RwLock<u64>,
pub waiting_requests: RwLock<HashMap<u64, Sender<RequestResponse>>>,
pub pending_terminal_request: RwLock<bool>,
// these are never modified and so don't need to be wrapped in RwLocks
pub setup_errors: Vec<String>,
pub desktop_is_gnome: bool,
pool: sqlx::SqlitePool,
visibility: RwLock<Visibility>,
}
impl AppState {
pub fn new(
config: AppConfig,
session: Session,
pool: SqlitePool,
setup_errors: Vec<String>,
desktop_is_gnome: bool,
) -> AppState {
AppState {
config: RwLock::new(config),
session: RwLock::new(session),
last_activity: RwLock::new(OffsetDateTime::now_utc()),
request_count: RwLock::new(0),
waiting_requests: RwLock::new(HashMap::new()),
pending_terminal_request: RwLock::new(false),
setup_errors,
desktop_is_gnome,
pool,
visibility: RwLock::new(Visibility::new()),
}
}
pub async fn new_creds(&self, base_creds: BaseCredentials, passphrase: &str) -> Result<(), UnlockError> {
let locked = base_creds.encrypt(passphrase)?;
// do this first so that if it fails we don't save bad credentials
self.new_session(base_creds).await?;
locked.save(&self.pool).await?;
Ok(())
}
pub async fn update_config(&self, new_config: AppConfig) -> Result<(), SetupError> {
let mut live_config = self.config.write().await;
// update autostart if necessary
if new_config.start_on_login != live_config.start_on_login {
config::set_auto_launch(new_config.start_on_login)?;
}
// re-register hotkeys if necessary
if new_config.hotkeys.show_window != live_config.hotkeys.show_window
|| new_config.hotkeys.launch_terminal != live_config.hotkeys.launch_terminal
{
shortcuts::register_hotkeys(&new_config.hotkeys)?;
}
new_config.save(&self.pool).await?;
*live_config = new_config;
Ok(())
}
pub async fn register_request(&self, sender: Sender<RequestResponse>) -> u64 {
let count = {
let mut c = self.request_count.write().await;
*c += 1;
c
};
let mut waiting_requests = self.waiting_requests.write().await;
waiting_requests.insert(*count, sender); // `count` is the request id
*count
}
pub async fn unregister_request(&self, id: u64) {
let mut waiting_requests = self.waiting_requests.write().await;
waiting_requests.remove(&id);
}
pub async fn acquire_visibility_lease(&self, delay: u64) -> Result<VisibilityLease, WindowError> {
let mut visibility = self.visibility.write().await;
visibility.acquire(delay)
}
pub async fn send_response(&self, response: ipc::RequestResponse) -> Result<(), SendResponseError> {
if let Approval::Approved = response.approval {
let mut session = self.session.write().await;
session.renew_if_expired().await?;
}
let mut waiting_requests = self.waiting_requests.write().await;
waiting_requests
.remove(&response.id)
.ok_or(SendResponseError::NotFound)?
.send(response)
.map_err(|_| SendResponseError::Abandoned)
}
pub async fn unlock(&self, passphrase: &str) -> Result<(), UnlockError> {
let base_creds = match *self.session.read().await {
Session::Empty => {return Err(UnlockError::NoCredentials);},
Session::Unlocked{..} => {return Err(UnlockError::NotLocked);},
Session::Locked(ref locked) => locked.decrypt(passphrase)?,
};
// Read lock is dropped here, so this doesn't deadlock
self.new_session(base_creds).await?;
Ok(())
}
pub async fn lock(&self) -> Result<(), LockError> {
let mut session = self.session.write().await;
match *session {
Session::Empty => Err(LockError::NotUnlocked),
Session::Locked(_) => Err(LockError::NotUnlocked),
Session::Unlocked{..} => {
*session = Session::load(&self.pool).await?;
let app_handle = app::APP.get().unwrap();
app_handle.emit_all("locked", None::<usize>)?;
Ok(())
}
}
}
pub async fn signal_activity(&self) {
let mut last_activity = self.last_activity.write().await;
*last_activity = OffsetDateTime::now_utc();
}
pub async fn should_auto_lock(&self) -> bool {
let config = self.config.read().await;
if !config.auto_lock || !self.is_unlocked().await {
return false;
}
let last_activity = self.last_activity.read().await;
let elapsed = OffsetDateTime::now_utc() - *last_activity;
elapsed >= config.lock_after
}
pub async fn is_unlocked(&self) -> bool {
let session = self.session.read().await;
matches!(*session, Session::Unlocked{..})
}
pub async fn base_creds_cloned(&self) -> Result<BaseCredentials, GetCredentialsError> {
let app_session = self.session.read().await;
let (base, _session) = app_session.try_get()?;
Ok(base.clone())
}
pub async fn session_creds_cloned(&self) -> Result<SessionCredentials, GetCredentialsError> {
let app_session = self.session.read().await;
let (_base, session) = app_session.try_get()?;
Ok(session.clone())
}
async fn new_session(&self, base: BaseCredentials) -> Result<(), GetSessionError> {
let session = SessionCredentials::from_base(&base).await?;
let mut app_session = self.session.write().await;
*app_session = Session::Unlocked {base, session};
Ok(())
}
pub async fn register_terminal_request(&self) -> Result<(), ()> {
let mut req = self.pending_terminal_request.write().await;
if *req {
// if a request is already pending, we can't register a new one
Err(())
}
else {
*req = true;
Ok(())
}
}
pub async fn unregister_terminal_request(&self) {
let mut req = self.pending_terminal_request.write().await;
*req = false;
}
}
-78
View File
@@ -1,78 +0,0 @@
use std::process::Command;
use tauri::Manager;
use crate::app::APP;
use crate::errors::*;
use crate::state::AppState;
pub async fn launch(use_base: bool) -> Result<(), LaunchTerminalError> {
let app = APP.get().unwrap();
let state = app.state::<AppState>();
// register_terminal_request() returns Err if there is another request pending
if state.register_terminal_request().await.is_err() {
return Ok(());
}
let mut cmd = {
let config = state.config.read().await;
let mut cmd = Command::new(&config.terminal.exec);
cmd.args(&config.terminal.args);
cmd
};
// if session is unlocked or empty, wait for credentials from frontend
if !state.is_unlocked().await {
app.emit_all("launch-terminal-request", ())?;
let lease = state.acquire_visibility_lease(0).await
.map_err(|_e| LaunchTerminalError::NoMainWindow)?; // automate conversion eventually?
let (tx, rx) = tokio::sync::oneshot::channel();
app.once_global("credentials-event", move |e| {
let success = match e.payload() {
Some("\"unlocked\"") | Some("\"entered\"") => true,
_ => false,
};
let _ = tx.send(success);
});
if !rx.await.unwrap_or(false) {
state.unregister_terminal_request().await;
return Ok(()); // request was canceled by user
}
lease.release();
}
// more lock-management
{
let app_session = state.session.read().await;
// session should really be unlocked at this point, but if the frontend misbehaves
// (i.e. lies about unlocking) we could end up here with a locked session
// this will result in an error popup to the user (see main hotkey handler)
let (base_creds, session_creds) = app_session.try_get()?;
if use_base {
cmd.env("AWS_ACCESS_KEY_ID", &base_creds.access_key_id);
cmd.env("AWS_SECRET_ACCESS_KEY", &base_creds.secret_access_key);
}
else {
cmd.env("AWS_ACCESS_KEY_ID", &session_creds.access_key_id);
cmd.env("AWS_SECRET_ACCESS_KEY", &session_creds.secret_access_key);
cmd.env("AWS_SESSION_TOKEN", &session_creds.session_token);
}
}
let res = match cmd.spawn() {
Ok(_) => Ok(()),
Err(e) if std::io::ErrorKind::NotFound == e.kind() => {
Err(ExecError::NotFound(cmd.get_program().to_owned()))
},
Err(e) => Err(ExecError::ExecutionFailed(e)),
};
state.unregister_terminal_request().await;
res?; // ? auto-conversion is more liberal than .into()
Ok(())
}
-45
View File
@@ -1,45 +0,0 @@
use tauri::{
AppHandle,
CustomMenuItem,
Manager,
SystemTray,
SystemTrayEvent,
SystemTrayMenu,
async_runtime as rt,
};
use crate::app;
use crate::state::AppState;
pub fn create() -> SystemTray {
let show = CustomMenuItem::new("show_hide".to_string(), "Show");
let quit = CustomMenuItem::new("exit".to_string(), "Exit");
let menu = SystemTrayMenu::new()
.add_item(show)
.add_item(quit);
SystemTray::new().with_menu(menu)
}
pub fn handle_event(app_handle: &AppHandle, event: SystemTrayEvent) {
match event {
SystemTrayEvent::MenuItemClick{ id, .. } => {
match id.as_str() {
"exit" => app_handle.exit(0),
"show_hide" => {
let _ = app::toggle_main_window(app_handle);
let new_handle = app_handle.app_handle();
rt::spawn(async move {
let state = new_handle.state::<AppState>();
state.signal_activity().await;
});
}
_ => (),
}
}
_ => (),
}
}
-85
View File
@@ -1,85 +0,0 @@
{
"$schema": "../node_modules/@tauri-apps/cli/schema.json",
"build": {
"beforeBuildCommand": "npm run build",
"beforeDevCommand": "npm run dev",
"devPath": "http://localhost:5173",
"distDir": "../dist"
},
"package": {
"productName": "creddy",
"version": "0.4.6"
},
"tauri": {
"allowlist": {
"app": {
"all": true,
"show": false,
"hide": false
},
"os": {"all": true},
"dialog": {"open": true}
},
"bundle": {
"active": true,
"category": "DeveloperTool",
"copyright": "",
"deb": {
"depends": []
},
"externalBin": [],
"icon": [
"icons/32x32.png",
"icons/128x128.png",
"icons/128x128@2x.png",
"icons/icon.icns",
"icons/icon.ico"
],
"identifier": "creddy",
"longDescription": "",
"macOS": {
"entitlements": null,
"exceptionDomain": "",
"frameworks": [],
"providerShortName": null,
"signingIdentity": null
},
"resources": [],
"shortDescription": "",
"targets": "all",
"windows": {
"certificateThumbprint": null,
"digestAlgorithm": "sha256",
"timestampUrl": "",
"wix": {
"fragmentPaths": ["conf/cli.wxs"],
"componentRefs": ["CliBinary", "AddToPath"]
}
}
},
"security": {
"csp": {
"default-src": ["'self'"],
"style-src": ["'self'", "'unsafe-inline'"]
}
},
"updater": {
"active": false
},
"windows": [
{
"fullscreen": false,
"height": 600,
"resizable": true,
"label": "main",
"title": "Creddy",
"width": 800,
"visible": false
}
],
"systemTray": {
"iconPath": "icons/icon.png",
"iconAsTemplate": true
}
}
}
-52
View File
@@ -1,52 +0,0 @@
<script>
import { onMount } from 'svelte';
import { listen } from '@tauri-apps/api/event';
import { invoke } from '@tauri-apps/api/tauri';
import { appState, acceptRequest, cleanupRequest } from './lib/state.js';
import { views, currentView, navigate } from './lib/routing.js';
$views = import.meta.glob('./views/*.svelte', {eager: true});
navigate('Home');
invoke('get_config').then(config => $appState.config = config);
listen('credentials-request', (tauriEvent) => {
$appState.pendingRequests.put(tauriEvent.payload);
});
listen('request-cancelled', (tauriEvent) => {
const id = tauriEvent.payload;
if (id === $appState.currentRequest?.id) {
cleanupRequest()
}
else {
const found = $appState.pendingRequests.find_remove(r => r.id === id);
}
});
listen('launch-terminal-request', async (tauriEvent) => {
if ($appState.currentRequest === null) {
let status = await invoke('get_session_status');
if (status === 'locked') {
navigate('Unlock');
}
else if (status === 'empty') {
navigate('EnterCredentials');
}
// else, session is unlocked, so do nothing
// (although we shouldn't even get the event in that case)
}
});
invoke('get_setup_errors')
.then(errs => {
$appState.setupErrors = errs.map(e => ({msg: e, show: true}));
});
acceptRequest();
</script>
<svelte:component this="{$currentView}" />
-153
View File
@@ -1,153 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
version="1.1"
id="Layer_1"
x="0px"
y="0px"
viewBox="0 0 273.45667 273.45667"
xml:space="preserve"
sodipodi:docname="vault_door.svg"
inkscape:version="1.2 (dc2aedaf03, 2022-05-15)"
width="273.45667"
height="273.45667"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><defs
id="defs43" /><sodipodi:namedview
id="namedview41"
pagecolor="#ffffff"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
showgrid="false"
inkscape:zoom="2.054"
inkscape:cx="209.83447"
inkscape:cy="63.291139"
inkscape:window-width="2560"
inkscape:window-height="1377"
inkscape:window-x="-8"
inkscape:window-y="-8"
inkscape:window-maximized="1"
inkscape:current-layer="Layer_1" />
<style
type="text/css"
id="style2">
.st0{fill:#FFFFFF;}
.st1{fill:#161616;}
</style>
<g
id="g38"
style="fill:#60697a;fill-opacity:1"
transform="matrix(-0.65108732,0,0,0.65108732,299.50017,-26.043493)">
<g
id="g36"
style="fill:#60697a;fill-opacity:1">
<path
class="st1"
d="m 102.88,181.03 c -3.49,0 -6.22,4.26 -6.22,9.7 v 118.53 c 0,5.44 2.73,9.7 6.22,9.7 3.49,0 6.22,-4.26 6.22,-9.7 V 190.73 c 0,-5.44 -2.73,-9.7 -6.22,-9.7 z m 2.99,128.24 c 0,3.64 -1.6,6.47 -2.98,6.47 -1.38,0 -2.99,-2.83 -2.99,-6.47 V 190.73 c 0,-3.64 1.61,-6.47 2.99,-6.47 1.38,0 2.98,2.83 2.98,6.47 z"
id="path6"
style="fill:#60697a;fill-opacity:1" />
<path
class="st1"
d="m 250,306.08 c 30.92,0 56.08,-25.16 56.08,-56.08 0,-30.92 -25.16,-56.08 -56.08,-56.08 -30.92,0 -56.08,25.16 -56.08,56.08 0,30.92 25.16,56.08 56.08,56.08 z m -6.47,-3.64 c -10.66,-1.31 -20.35,-5.8 -28.08,-12.49 l 23.33,-21.47 c 1.48,0.9 3.06,1.65 4.75,2.18 z M 231.6,250 c 0,-10.15 8.26,-18.4 18.4,-18.4 10.15,0 18.4,8.26 18.4,18.4 0,10.14 -8.26,18.4 -18.4,18.4 -10.15,0 -18.4,-8.25 -18.4,-18.4 z m 21.64,52.74 c -1.07,0.07 -2.15,0.11 -3.24,0.11 -1.08,0 -2.16,-0.04 -3.23,-0.11 v -31.37 c 1.06,0.16 2.13,0.27 3.23,0.27 1.1,0 2.18,-0.11 3.24,-0.27 z m 3.23,-0.31 v -31.79 c 1.58,-0.5 3.07,-1.18 4.46,-2.01 l 23.37,21.51 c -7.69,6.59 -17.28,11 -27.83,12.29 z m 30.24,-14.47 -23.04,-21.2 c 1.68,-1.37 3.14,-2.99 4.35,-4.79 l 23.06,21.23 c -1.36,1.67 -2.82,3.26 -4.37,4.76 z m 6.33,-7.36 -23.42,-21.55 c 0.57,-1.24 1.03,-2.54 1.36,-3.89 h 31.6 c -0.91,9.43 -4.32,18.12 -9.54,25.44 z m 9.8,-30.6 c 0,0.65 -0.03,1.29 -0.05,1.93 h -31.25 c 0.06,-0.64 0.1,-1.28 0.1,-1.93 0,-1.56 -0.17,-3.07 -0.49,-4.53 h 31.49 c 0.12,1.49 0.2,3 0.2,4.53 z m -0.57,-7.77 h -32.1 c -0.25,-0.64 -0.52,-1.27 -0.83,-1.88 l 23.33,-21.47 c 4.94,6.75 8.32,14.71 9.6,23.35 z m -11.59,-25.91 -23.04,21.2 c -1.26,-1.77 -2.77,-3.34 -4.49,-4.66 l 23.1,-21.26 c 1.57,1.48 3.06,3.05 4.43,4.72 z m -34.21,-18.75 c 10.33,1.27 19.75,5.52 27.35,11.87 l -23.45,21.58 c -1.23,-0.68 -2.54,-1.24 -3.9,-1.67 z m -9.7,-0.31 c 1.07,-0.06 2.15,-0.11 3.23,-0.11 1.09,0 2.16,0.04 3.24,0.11 v 31.37 c -1.06,-0.16 -2.13,-0.27 -3.24,-0.27 -1.1,0 -2.17,0.11 -3.23,0.27 z m -3.24,0.3 v 31.79 c -1.47,0.46 -2.87,1.09 -4.19,1.84 l -23.41,-21.54 c 7.66,-6.48 17.16,-10.81 27.6,-12.09 z m -30.01,14.26 23.07,21.23 c -1.7,1.35 -3.19,2.93 -4.42,4.72 l -23.05,-21.21 c 1.37,-1.67 2.84,-3.25 4.4,-4.74 z m -6.37,7.31 23.37,21.51 c -0.25,0.52 -0.48,1.05 -0.69,1.59 h -32.1 c 1.26,-8.53 4.58,-16.4 9.42,-23.1 z M 197.16,250 c 0,-1.53 0.08,-3.04 0.21,-4.53 h 31.49 c -0.31,1.46 -0.49,2.98 -0.49,4.53 0,0.65 0.04,1.3 0.1,1.93 H 197.2 c -0.02,-0.64 -0.04,-1.28 -0.04,-1.93 z m 0.25,5.17 h 31.6 c 0.31,1.24 0.71,2.45 1.22,3.59 l -23.45,21.59 c -5.12,-7.27 -8.46,-15.87 -9.37,-25.18 z m 34.41,6.52 c 1.18,1.83 2.62,3.47 4.27,4.86 l -23.03,21.19 c -1.54,-1.51 -2.99,-3.11 -4.34,-4.8 z"
id="path8"
style="fill:#60697a;fill-opacity:1" />
<path
class="st1"
d="m 438.65,157.85 5.34,-0.47 c 3.48,-0.31 6.31,-3.4 6.31,-6.89 V 100.67 97.44 57.41 c 0,-5.35 -4.35,-9.7 -9.7,-9.7 h -16.48 c -5.35,0 -9.7,4.35 -9.7,9.7 v 40.24 l -17.36,2.63 C 359.14,63.03 307.22,40 250,40 191.36,40 138.27,64.18 100.14,103.07 l -6.31,-5.81 6.68,-7.38 c 1.16,-1.28 1.75,-2.94 1.66,-4.66 -0.09,-1.73 -0.84,-3.31 -2.12,-4.47 L 84.46,66.63 c -1.19,-1.08 -2.73,-1.67 -4.34,-1.67 -1.83,0 -3.58,0.78 -4.8,2.13 L 68.83,74.26 58.01,64.3 c -0.31,-0.29 -0.73,-0.44 -1.16,-0.43 -0.43,0.02 -0.83,0.2 -1.12,0.52 l -6.57,7.14 c -0.6,0.66 -0.56,1.68 0.09,2.29 l 10.9,10.03 -6.53,7.22 c -2.39,2.65 -2.19,6.74 0.46,9.14 l 15.59,14.1 c 1.19,1.08 2.73,1.67 4.34,1.67 1.83,0 3.58,-0.78 4.8,-2.13 l 6.34,-7 6.21,5.72 C 59.39,149.43 40,197.49 40,250 c 0,52.28 19.22,100.15 50.95,136.95 l -5.99,5.52 -6.15,-6.79 c -1.22,-1.35 -2.97,-2.13 -4.8,-2.13 -1.61,0 -3.15,0.59 -4.34,1.67 l -15.59,14.1 c -2.65,2.39 -2.85,6.49 -0.46,9.14 l 6.34,7.01 -10.71,9.86 c -0.66,0.6 -0.7,1.63 -0.09,2.29 l 6.57,7.14 c 0.29,0.32 0.69,0.5 1.12,0.52 0.02,0 0.04,0 0.07,0 0.4,0 0.8,-0.15 1.09,-0.43 l 10.63,-9.78 6.68,7.38 c 1.22,1.35 2.97,2.13 4.8,2.13 1.61,0 3.15,-0.59 4.34,-1.67 l 15.59,-14.1 c 1.28,-1.16 2.03,-2.75 2.12,-4.47 0.09,-1.73 -0.51,-3.38 -1.66,-4.66 l -6.87,-7.59 6.07,-5.59 c 38.17,39.12 91.42,63.5 150.29,63.5 56.54,0 107.92,-22.48 145.71,-58.95 l 18.71,3.24 v 40.27 c 0,5.35 4.35,9.7 9.7,9.7 h 16.48 c 5.35,0 9.7,-4.35 9.7,-9.7 v -40.01 -3.23 -54.75 c 0,-3.49 -2.83,-6.58 -6.31,-6.89 L 440,339.33 c 12.81,-27.13 20,-57.4 20,-89.33 0,-33.04 -7.7,-64.31 -21.35,-92.15 z m -21,-100.44 c 0,-3.57 2.9,-6.47 6.47,-6.47 h 16.48 c 3.57,0 6.47,2.9 6.47,6.47 V 97.42 H 417.65 Z M 250,43.23 c 55.47,0 105.9,21.97 143.07,57.66 l -26.41,4 C 334.71,79.15 294.13,63.72 250,63.72 c -51.75,0 -98.62,21.23 -132.41,55.41 L 102.51,105.26 C 140.06,67.01 192.3,43.23 250,43.23 Z m 29.31,38.01 c 24.27,4.2 46.8,13.52 66.44,26.82 l -65.25,9.89 c 0.56,-1.31 0.91,-2.78 0.91,-4.35 V 87.72 c 0.01,-2.49 -0.79,-4.76 -2.1,-6.48 z m -11.85,-4.88 c -1.51,-3.4 -4.91,-5.79 -8.87,-5.79 h -16.48 c -3.92,0 -7.29,2.34 -8.82,5.69 -41.67,3.98 -79.11,22.68 -107.06,50.82 l -6.26,-5.76 C 153.17,87.78 199.19,66.95 250,66.95 c 42.27,0 81.2,14.45 112.22,38.61 l -11.79,1.79 C 326.49,90.45 298.14,79.42 267.46,76.36 Z m 10.73,11.36 v 25.88 c 0,2.02 -0.72,3.8 -1.83,4.98 l -8.06,1.22 V 81.25 h 4.95 c 2.72,0 4.94,2.91 4.94,6.47 z m -13.13,-7.44 v 39.79 H 235.64 V 80.28 c 0,-3.57 2.9,-6.47 6.47,-6.47 h 16.48 c 3.57,0 6.47,2.9 6.47,6.47 z m 84.7,312.81 11.62,2.01 c -30.88,23.76 -69.49,37.94 -111.38,37.94 -51.04,0 -97.25,-21 -130.48,-54.81 l 6.26,-5.76 c 28.09,28.49 65.87,47.38 107.94,51.29 1.68,2.9 4.81,4.85 8.39,4.85 h 16.48 c 3.61,0 6.76,-1.99 8.43,-4.92 30.56,-2.97 58.83,-13.87 82.74,-30.6 z m -81.47,26.15 v -0.32 -38.49 h 4.95 c 2.73,0 4.95,2.9 4.95,6.47 v 25.88 c 0,3.57 -2.22,6.47 -4.95,6.47 h -4.95 z m 11.4,-38.29 65.53,11.35 c -19.41,13.03 -41.62,22.19 -65.52,26.39 1.07,-1.64 1.72,-3.69 1.72,-5.92 v -25.88 c 0,-2.23 -0.65,-4.29 -1.73,-5.94 z m -57.18,31.82 v -25.88 c 0,-3.57 2.22,-6.47 4.95,-6.47 h 4.95 v 38.49 0.32 h -4.95 c -2.73,0.01 -4.95,-2.89 -4.95,-6.46 z m 42.55,6.14 c 0,3.57 -2.9,6.47 -6.47,6.47 h -16.48 c -3.57,0 -6.47,-2.9 -6.47,-6.47 V 378.9 h 29.42 z m -32.65,-76.39 v 33.14 1.53 h -4.95 c -4.51,0 -8.18,4.35 -8.18,9.7 v 25.88 c 0,2.28 0.67,4.38 1.79,6.04 -36.03,-6.16 -68.25,-23.58 -92.89,-48.54 l 7.62,-7.01 6.18,6.84 c 1.6,1.76 3.55,2.81 5.22,2.81 0.86,0 1.62,-0.28 2.2,-0.8 l 8.13,-7.36 c 0.96,-0.86 1.27,-2.27 0.86,-3.86 -0.32,-1.25 -1.08,-2.57 -2.12,-3.72 l -6.29,-6.96 54.75,-50.39 c 11.97,10.89 27.86,17.53 45.28,17.53 37.14,0 67.35,-30.21 67.35,-67.35 0,-37.14 -30.21,-67.35 -67.35,-67.35 -17.19,0 -32.88,6.48 -44.8,17.11 l -55.05,-50.66 6.11,-6.75 c 1.04,-1.15 1.79,-2.47 2.12,-3.72 0.41,-1.59 0.1,-3 -0.85,-3.86 l -8.13,-7.36 c -1.71,-1.54 -5.01,-0.65 -7.42,2.01 l -6,6.63 -7.36,-6.77 c 24.69,-24.82 56.89,-42.12 92.87,-48.18 -1.37,1.73 -2.21,4.06 -2.21,6.61 v 25.88 c 0,5.35 3.67,9.7 8.18,9.7 h 4.95 v 0.22 35.72 c 0,2.55 0.98,4.94 2.77,6.72 1.78,1.78 4.16,2.76 6.71,2.76 l 65.28,-1.8 c 12.68,-0.35 22.59,9.43 22.59,21.97 v 122.9 c 0,12.26 -9.97,22.24 -22.23,22.24 l -65.39,-1.08 h -0.16 c -5.29,0.01 -9.58,4.31 -9.58,9.58 z M 78.68,250 c 0,-42.42 15.5,-81.28 41.14,-111.23 l 7.48,6.88 -7.02,7.76 c -1.04,1.15 -1.79,2.47 -2.12,3.72 -0.41,1.59 -0.1,3 0.85,3.86 l 8.13,7.36 c 0.58,0.52 1.34,0.8 2.2,0.8 1.68,0 3.63,-1.05 5.22,-2.81 l 6.91,-7.64 54.94,50.56 c -8.63,11.32 -13.77,25.44 -13.77,40.74 0,15.07 4.98,29.01 13.38,40.24 l -54.73,50.37 -6.73,-7.43 c -2.41,-2.66 -5.71,-3.56 -7.42,-2.01 l -8.13,7.36 c -0.96,0.86 -1.27,2.27 -0.86,3.86 0.32,1.25 1.08,2.57 2.12,3.72 l 6.83,7.55 -7.7,7.09 C 94.02,330.87 78.68,292.19 78.68,250 Z m 38.35,112.94 -6.24,5.74 C 83.48,336.7 66.96,295.25 66.96,250 c 0,-45.48 16.69,-87.12 44.24,-119.17 l 6.25,5.75 c -26.17,30.53 -42,70.16 -42,113.42 0,43.04 15.66,82.48 41.58,112.94 z M 185.88,250 c 0,-35.36 28.76,-64.12 64.12,-64.12 35.36,0 64.12,28.76 64.12,64.12 0,35Line truncated
id="path10"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="227.46001"
cy="88.870003"
r="2.8299999"
id="circle12"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="227.46001"
cy="112.45"
r="2.8299999"
id="circle14"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="227.46001"
cy="100.66"
r="2.8299999"
id="circle16"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="272.73999"
cy="88.870003"
r="2.8299999"
id="circle18"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="272.73999"
cy="112.45"
r="2.8299999"
id="circle20"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="272.73999"
cy="100.66"
r="2.8299999"
id="circle22"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="227.46001"
cy="388.04001"
r="2.8299999"
id="circle24"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="227.46001"
cy="411.62"
r="2.8299999"
id="circle26"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="227.46001"
cy="399.82999"
r="2.8299999"
id="circle28"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="272.73999"
cy="388.04001"
r="2.8299999"
id="circle30"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="272.73999"
cy="411.62"
r="2.8299999"
id="circle32"
style="fill:#60697a;fill-opacity:1" />
<circle
class="st1"
cx="272.73999"
cy="399.82999"
r="2.8299999"
id="circle34"
style="fill:#60697a;fill-opacity:1" />
</g>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 14 KiB

+3
View File
@@ -0,0 +1,3 @@
mod passphrase_input;
pub use passphrase_input::{PassphraseInput, PassphraseInputEvent};
+97
View File
@@ -0,0 +1,97 @@
use gpui_kit::assets::IconName;
use gpui_kit::base::input::{InputEvent, InputState};
use gpui_kit::{
App, AppContext, Context, Entity, EventEmitter, IntoElement, Render, SharedString, Styled,
Subscription, Window,
};
use gpui_omarchy::{ButtonVariant, icon_button, input};
/// A masked passphrase field with a show/hide toggle.
///
/// The `show` flag is passed in from outside so that it can be shared
/// (e.g. passphrase and confirm-passphrase inputs should share it).
pub struct PassphraseInput {
state: Entity<InputState>,
show: Entity<bool>,
_subscriptions: Vec<Subscription>,
}
pub enum PassphraseInputEvent {
/// The user pressed Enter in the field.
Submit,
/// The field's text changed.
Change,
/// The field lost focus.
Blur,
}
impl EventEmitter<PassphraseInputEvent> for PassphraseInput {}
impl PassphraseInput {
pub fn new(show: Entity<bool>, window: &mut Window, cx: &mut Context<Self>) -> Self {
let masked = !*show.read(cx);
let state = cx.new(|cx| {
InputState::new(window, cx)
.masked(masked)
.placeholder("correct horse battery staple")
});
// keep this field's masking in sync with the shared flag
let sync_mask = cx.observe_in(&show, window, |this, show, window, cx| {
let masked = !*show.read(cx);
this.state.update(cx, |state, cx| state.set_masked(masked, window, cx));
cx.notify();
});
// re-emit the subset of input events that consumers care about
let forward = cx.subscribe(&state, |_, _, event: &InputEvent, cx| {
let event = match event {
InputEvent::PressEnter { .. } => PassphraseInputEvent::Submit,
InputEvent::Change => PassphraseInputEvent::Change,
InputEvent::Blur => PassphraseInputEvent::Blur,
InputEvent::Focus => return,
};
cx.emit(event);
});
Self {
state,
show,
_subscriptions: vec![sync_mask, forward],
}
}
pub fn value(&self, cx: &App) -> SharedString {
self.state.read(cx).value()
}
pub fn focus(&self, window: &mut Window, cx: &mut App) {
self.state.update(cx, |state, cx| state.focus(window, cx));
}
fn toggle_show(&mut self, cx: &mut Context<Self>) {
self.show.update(cx, |show, cx| {
*show = !*show;
cx.notify();
});
}
}
impl Render for PassphraseInput {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let (icon, label) = if *self.show.read(cx) {
(IconName::EyeOff, "Hide passphrase")
}
else {
(IconName::Eye, "Show passphrase")
};
input("passphrase", &self.state, window, cx)
.w_full()
.suffix(
icon_button("toggle-show", icon, label, ButtonVariant::Secondary, cx)
.on_click(cx.listener(|this, _, _, cx| this.toggle_show(cx))),
)
}
}
+246
View File
@@ -0,0 +1,246 @@
use std::env;
use std::ffi::OsString;
use std::fs::File;
use std::path::{Path, PathBuf};
use gpui_kit::Global;
use serde::{Serialize, Deserialize};
use crate::error::CreddyError;
/// Config that doesn't need to or can't be stored in the encrypted db
/// (such as settings that must be known at startup, before unlock).
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct PublicConfig {
db_salt: [u8; 32],
}
impl PublicConfig {
/// Construct a PublicConfig with default values, in case there is nothing saved on disk
pub fn default() -> PublicConfig {
let mut db_salt = [0u8; 32];
let _ = getrandom::fill(&mut db_salt);
PublicConfig { db_salt }
}
/// Load non-sensitive config from disk.
pub fn load(path: &Path) -> Result<PublicConfig, CreddyError> {
if path.exists() {
let f = File::open(path)?;
serde_json::from_reader(f).map_err(|e| CreddyError::InvalidJSON(e))
}
else {
Ok(PublicConfig::default())
}
}
pub fn save(&self, path: &Path) -> Result<(), CreddyError> {
let file = File::create(path)?;
serde_json::to_writer(file, self)?;
Ok(())
}
}
/// Config that can be stored in the encrypted db
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
#[serde(default)]
pub struct PrivateConfig {
rehide_ms: u64,
}
impl Default for PrivateConfig {
fn default() -> PrivateConfig {
PrivateConfig {
rehide_ms: 1000,
}
}
}
#[derive(Debug, Clone)]
pub struct AppConfig {
pub data_dir: PathBuf,
pub db_salt: [u8; 32],
pub rehide_ms: u64,
}
impl AppConfig {
/// Load config from disk, using defaults for non-public values.
pub fn load() -> Result<AppConfig, CreddyError> {
let data_dir = AppConfig::resolve_data_dir(
env::var_os("CREDDY_DATA_DIR"),
dirs::data_dir(),
)?;
AppConfig::load_from(data_dir)
}
pub fn load_from(data_dir: PathBuf) -> Result<AppConfig, CreddyError> {
let public_config = PublicConfig::load(&data_dir.join("public_config.json"))?;
let private_config = PrivateConfig::default();
Ok(AppConfig::from_parts(data_dir, public_config, private_config))
}
fn resolve_data_dir(creddy_data_dir: Option<OsString>, platform_data_dir: Option<PathBuf>) -> Result<PathBuf, CreddyError> {
creddy_data_dir
.map(PathBuf::from)
.or_else(|| platform_data_dir.map(|d| d.join("creddy")))
.ok_or(CreddyError::DataDirNotFound)
}
/// Pull the appropriate fields from instances of PublicConfig and PrivateConfig (plus data_dir since that comes from neither)
fn from_parts(data_dir: PathBuf, public: PublicConfig, private: PrivateConfig) -> AppConfig {
AppConfig {
data_dir,
db_salt: public.db_salt,
rehide_ms: private.rehide_ms,
}
}
pub fn merge_private(&mut self, private: PrivateConfig) {
self.rehide_ms = private.rehide_ms;
}
pub fn public_config_path(&self) -> PathBuf {
self.data_dir.join("public_config.json")
}
pub fn db_path(&self) -> PathBuf {
self.data_dir.join("creddy.duckdb")
}
pub fn public_config(&self) -> PublicConfig {
PublicConfig {
db_salt: self.db_salt,
}
}
pub fn private_config(&self) -> PrivateConfig {
PrivateConfig {
rehide_ms: self.rehide_ms,
}
}
}
impl Default for AppConfig {
fn default() -> AppConfig {
// AppConfig::default will only be called for testing or to fill in
// remaining defaults when constructing otherwise, and data_dir is
// always specified otherwise
AppConfig::from_parts(
PathBuf::from(""),
PublicConfig::default(),
PrivateConfig::default(),
)
}
}
impl Global for AppConfig {}
#[cfg(test)]
mod tests {
use super::*;
use tempfile::NamedTempFile;
use testresult::TestResult;
#[test]
fn test_public_default() {
let conf = PublicConfig::default();
assert!(conf.db_salt.len() == 32);
}
#[test]
fn test_public_config_load_not_present() -> TestResult {
let p = tempfile::tempdir()?.path().join("public_config.json");
let conf = PublicConfig::load(&p)?;
assert!(conf.db_salt.len() == 32);
Ok(())
}
#[test]
fn test_public_config_load_present() -> TestResult {
let data_dir = tempfile::tempdir()?;
let p = data_dir.path().join("public_config.json");
let expected = PublicConfig::default(); // uses a random db salt
let f = File::create(&p)?;
serde_json::to_writer(f, &expected)?;
let loaded = PublicConfig::load(&p)?;
assert!(loaded.db_salt == expected.db_salt);
Ok(())
}
#[test]
fn test_config_load_not_present() -> TestResult {
let data_dir = tempfile::tempdir()?;
let config = AppConfig::load_from(data_dir.path().to_path_buf())?;
assert!(config.data_dir == data_dir.path());
assert!(config.db_salt.len() == 32);
Ok(())
}
#[test]
fn test_config_load_present() -> TestResult {
let data_dir = tempfile::tempdir()?;
let p = data_dir.path().join("public_config.json");
let public = PublicConfig::default(); // uses a random db salt
let f = File::create(&p)?;
serde_json::to_writer(f, &public)?;
let config = AppConfig::load_from(data_dir.path().to_path_buf())?;
assert!(config.data_dir == data_dir.path());
assert!(config.db_salt == public.db_salt);
Ok(())
}
#[test]
fn test_resolve_data_dir_override() -> TestResult {
let data_dir = AppConfig::resolve_data_dir(
Some(OsString::from("/tmp/creddy")),
None,
)?;
assert!(data_dir == PathBuf::from("/tmp/creddy"));
Ok(())
}
#[test]
fn test_resolve_data_dir_default() -> TestResult {
let data_dir = AppConfig::resolve_data_dir(
None,
Some(PathBuf::from("/tmp")),
)?;
assert!(data_dir == PathBuf::from("/tmp/creddy"));
Ok(())
}
#[test]
fn test_config_paths() {
let mut config = AppConfig::default();
config.data_dir = PathBuf::from("/tmp/creddy");
assert!(config.db_path() == PathBuf::from("/tmp/creddy/creddy.duckdb"));
assert!(config.public_config_path() == PathBuf::from("/tmp/creddy/public_config.json"));
}
#[test]
fn test_public_config_from_app_config() {
let mut config = AppConfig::default();
config.data_dir = PathBuf::from("/tmp/creddy");
let public = config.public_config();
assert!(public.db_salt == config.db_salt);
}
#[test]
fn test_public_config_save_load() -> TestResult {
let file = NamedTempFile::new()?;
let expected = PublicConfig::default();
expected.save(file.path())?;
let loaded = PublicConfig::load(file.path())?;
assert!(loaded.db_salt == expected.db_salt);
Ok(())
}
}
+54
View File
@@ -0,0 +1,54 @@
use crate::config::PrivateConfig;
use crate::error::CreddyError;
use super::Db;
impl Db {
pub fn load_private_config(&self) -> Result<PrivateConfig, CreddyError> {
let conn = self.connection.lock().unwrap();
let json: String = conn.query_row("SELECT value FROM config", [], |row| row.get(0))?;
let config: PrivateConfig = serde_json::from_str(&json)?;
Ok(config)
}
pub fn save_private_config(&self, config: &PrivateConfig) -> Result<(), CreddyError> {
let json = serde_json::to_string(&config)?;
let conn = self.connection.lock().unwrap();
conn.execute("INSERT INTO config VALUES (?);", [&json])?;
Ok(())
}
}
#[cfg(test)]
mod tests {
use testresult::TestResult;
use tempfile::TempDir;
use crate::config::AppConfig;
use super::*;
fn test_db() -> Result<(Db, TempDir), CreddyError> {
let data_dir = tempfile::tempdir()?;
let mut config = AppConfig::default();
config.data_dir = data_dir.path().to_path_buf();
let db = Db::connect(&config, "correct horse battery staple")?;
Ok((db, data_dir))
}
#[test]
fn test_save_private_config() -> TestResult {
let (db, _data_dir) = test_db()?;
let private_config = PrivateConfig::default();
db.save_private_config(&private_config)?;
Ok(())
}
#[test]
fn test_load_priate_config() -> TestResult {
let (db, _data_dir) = test_db()?;
let private_config = PrivateConfig::default();
db.save_private_config(&private_config)?;
let loaded = db.load_private_config()?;
assert_eq!(loaded, private_config);
Ok(())
}
}
+174
View File
@@ -0,0 +1,174 @@
use duckdb::Connection;
use include_dir::{Dir, include_dir};
use crate::error::CreddyError;
static MIGRATIONS_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/migrations");
struct Migration {
id: &'static str,
sql: &'static str,
}
/// Run all unapplied database migrations.
pub fn migrate(conn: &mut Connection) -> Result<(), CreddyError> {
apply_migrations(conn, &embedded_migrations())
}
/// Sorted list of migration files, checked for utf-8-ness at compile time.
fn embedded_migrations() -> Vec<Migration> {
let mut migrations: Vec<Migration> = MIGRATIONS_DIR
.files()
.filter(|f| f.path().extension().is_some_and(|ext| ext == "sql"))
.map(|f| Migration {
// these are baked in at compile time, so a bad file is a build problem, not a runtime one
id: f.path().file_name().and_then(|n| n.to_str()).expect("migration filename is not UTF-8"),
sql: f.contents_utf8().expect("migration file is not UTF-8"),
})
.collect();
migrations.sort_by_key(|m| m.id);
migrations
}
/// Run a specific list of migrations. (Makes testing easier than always hard-coding)
fn apply_migrations(conn: &mut Connection, known: &[Migration]) -> Result<(), CreddyError> {
create_migrations_table(conn)?;
let applied = list_applied_migrations(conn)?;
// the applied migrations must be exactly the first N known ones
for (i, id) in applied.iter().enumerate() {
if known.get(i).is_some_and(|m| m.id == id) {
continue;
}
// at this point, either known[i] doesn't exist or doesn't match `id`
if known.iter().any(|m| m.id == id) {
return Err(CreddyError::MigrationOutOfOrder(id.clone()));
}
//
return Err(CreddyError::DbTooNew(id.clone()));
}
for migration in &known[applied.len()..] {
let tx = conn.transaction()?;
tx.execute_batch(migration.sql)?;
tx.execute("INSERT INTO _migrations (id) VALUES (?);", [migration.id])?;
tx.commit()?;
}
Ok(())
}
/// Create the migrations table if it doesn't exist already.
fn create_migrations_table(conn: &Connection) -> Result<(), CreddyError> {
conn.execute_batch(
"CREATE TABLE IF NOT EXISTS _migrations (
id VARCHAR PRIMARY KEY,
applied_at TIMESTAMPTZ NOT NULL DEFAULT current_timestamp
);",
)?;
Ok(())
}
/// List migrations that have been applied to this database, in the order they were applied.
fn list_applied_migrations(conn: &Connection) -> Result<Vec<String>, CreddyError> {
let mut stmt = conn.prepare("SELECT id FROM _migrations ORDER BY id;")?;
let ids = stmt
.query_map([], |row| row.get(0))?
.collect::<Result<Vec<String>, _>>()?;
Ok(ids)
}
#[cfg(test)]
mod tests {
use testresult::TestResult;
use super::*;
const FIRST: Migration = Migration {
id: "0001_first.sql",
sql: "CREATE TABLE a (x INTEGER);",
};
const SECOND: Migration = Migration {
id: "0002_second.sql",
sql: "CREATE TABLE b (x INTEGER); INSERT INTO b VALUES (1);",
};
fn table_exists(conn: &Connection, name: &str) -> duckdb::Result<bool> {
conn.query_row(
"SELECT count(*) > 0 FROM duckdb_tables() WHERE table_name = ?;",
[name],
|row| row.get(0),
)
}
#[test]
fn test_embedded_migrations_apply() -> TestResult {
let mut conn = Connection::open_in_memory()?;
migrate(&mut conn)?;
let applied = list_applied_migrations(&conn)?;
let expected: Vec<_> = embedded_migrations().iter().map(|m| m.id.to_string()).collect();
assert_eq!(applied, expected);
Ok(())
}
#[test]
fn test_apply_incrementally() -> TestResult {
let mut conn = Connection::open_in_memory()?;
apply_migrations(&mut conn, &[FIRST])?;
assert_eq!(list_applied_migrations(&conn)?, ["0001_first.sql"]);
// already-applied migrations are skipped, so re-running FIRST would fail if it weren't
apply_migrations(&mut conn, &[FIRST, SECOND])?;
assert_eq!(list_applied_migrations(&conn)?, ["0001_first.sql", "0002_second.sql"]);
assert!(table_exists(&conn, "b")?);
Ok(())
}
#[test]
fn test_failed_migration_rolls_back() -> TestResult {
let mut conn = Connection::open_in_memory()?;
let broken = Migration {
id: "0002_broken.sql",
sql: "CREATE TABLE b (x INTEGER); this is not sql;",
};
let res = apply_migrations(&mut conn, &[FIRST, broken]);
assert!(matches!(res, Err(CreddyError::Db(_))));
// FIRST stays applied, but nothing from the broken migration survives
assert_eq!(list_applied_migrations(&conn)?, ["0001_first.sql"]);
assert!(table_exists(&conn, "a")?);
assert!(!table_exists(&conn, "b")?);
Ok(())
}
#[test]
fn test_db_too_new() -> TestResult {
let mut conn = Connection::open_in_memory()?;
apply_migrations(&mut conn, &[FIRST, SECOND])?;
// simulates running an older version of the app, which doesn't know about SECOND
match apply_migrations(&mut conn, &[FIRST]) {
Err(CreddyError::DbTooNew(id)) => assert_eq!(id, "0002_second.sql"),
res => panic!("Expected DbTooNew, got {res:?}"),
}
Ok(())
}
#[test]
fn test_migration_out_of_order() -> TestResult {
let mut conn = Connection::open_in_memory()?;
apply_migrations(&mut conn, &[SECOND])?;
// FIRST sorts before an already-applied migration, so it was added after the fact
match apply_migrations(&mut conn, &[FIRST, SECOND]) {
Err(CreddyError::MigrationOutOfOrder(id)) => assert_eq!(id, "0002_second.sql"),
res => panic!("Expected MigrationOutOfOrder, got {res:?}"),
}
Ok(())
}
}
+182
View File
@@ -0,0 +1,182 @@
use std::fs;
use std::sync::Mutex;
use argon2::{Algorithm, Argon2, Version, Error as Argon2Error, ParamsBuilder};
use base64ct::{Base64, Encoding};
use duckdb::{
Connection,
params,
};
use crate::error::CreddyError;
use crate::config::AppConfig;
mod config;
mod migrations;
// tests take forever with production parameters, so we turn them down in dev
#[cfg(not(debug_assertions))]
const MEM_COST: u32 = 128 * 1024;
#[cfg(not(debug_assertions))]
const TIME_COST: u32 = 8;
#[cfg(not(debug_assertions))]
const PARALLELISM_COST: u32 = 4;
#[cfg(debug_assertions)]
const MEM_COST: u32 = 1024;
#[cfg(debug_assertions)]
const TIME_COST: u32 = 1;
#[cfg(debug_assertions)]
const PARALLELISM_COST: u32 = 1;
#[derive(Debug)]
pub struct Db {
connection: Mutex<Connection>,
}
impl Db {
/// Connect to the database, creating it if necessary.
pub fn connect(config: &AppConfig, passphrase: &str) -> Result<Self, CreddyError> {
fs::create_dir_all(&config.data_dir)?;
// since we are about to make use of the salt stored in `config`, we need to save it now
config.public_config().save(&config.public_config_path())?;
let path = config.db_path()
.into_os_string()
.into_string()
.map_err(|s| CreddyError::InvalidPath(s))?;
let key = Db::derive_key(passphrase, &config.db_salt)?;
dbg!(&key);
let mut conn = Connection::open_in_memory()?;
conn.execute(
"ATTACH ? AS creddy (ENCRYPTION_KEY ?);",
params![path, key],
)?;
// must come before migrating, or the tables end up in the in-memory db
conn.execute("USE creddy;", [])?;
migrations::migrate(&mut conn)?;
Ok(Self{ connection: Mutex::new(conn) })
}
/// Hash the given passphrase/salt with argon2, then encode to base64 for DuckDB
fn derive_key(passphrase: &str, salt: &[u8; 32]) -> Result<String, Argon2Error> {
let params = ParamsBuilder::new()
.m_cost(MEM_COST)
.t_cost(TIME_COST)
.p_cost(PARALLELISM_COST)
.build()
.unwrap(); // only errors if the given params are invalid
let hasher = Argon2::new(Algorithm::Argon2id, Version::V0x13, params);
let mut key = [0; 32]; // todo: replace this with a `zeroize` or `secrecy` type
hasher.hash_password_into(passphrase.as_bytes(), salt, &mut key)?;
Ok(Base64::encode_string(&key))
}
}
#[cfg(test)]
mod tests {
use testresult::TestResult;
use duckdb::Error;
use super::*;
const TEST_PASSPHRASE: &'static str = "correct horse battery staple";
const TEST_SALT: [u8; 32] = [0; 32];
// the result of hashing TEST_PASSPHRASE with TEST_SALT and encoding to Base64
const TEST_KEY: &'static str = "YvOfk7EXGX+SnvdGySbTtf8OXAXg3AGikvKxJOLkLOo=";
#[test]
fn test_connect_new() -> TestResult {
let data_dir = tempfile::tempdir()?;
let mut config = AppConfig::default();
config.data_dir = data_dir.path().to_path_buf();
let res = Db::connect(&config, TEST_PASSPHRASE);
assert!(res.is_ok());
// confirm that db is in fact encrypted
match Connection::open(&config.db_path()) {
Err(Error::DuckDBFailure(error, _desc)) => {
assert!(error.code == duckdb::ErrorCode::Unknown);
assert!(error.extended_code == 1);
},
Err(e) => panic!("Unexpected error type: {e:?}"),
Ok(_) => panic!("Should not be able to open newly-created database without encryption key"),
};
// confirm that using a different passphrase won't work
let res = Db::connect(&config, "not the correct passphrase");
match res {
Err(CreddyError::Db(Error::DuckDBFailure(error, Some(desc)))) => {
assert!(error.code == duckdb::ErrorCode::Unknown);
assert!(error.extended_code == 1);
assert!(desc.contains("Wrong encryption key"));
},
Err(e) => panic!("Unexpected error type: {e:?}"),
Ok(_) => panic!("Should not be able to open database with a different passphrase"),
}
Ok(())
}
#[test]
fn test_connect_existing() -> TestResult {
let data_dir = tempfile::tempdir()?;
let mut config = AppConfig::default();
config.data_dir = data_dir.path().to_path_buf();
config.db_salt = TEST_SALT;
dbg!(TEST_KEY);
let conn = Connection::open_in_memory()?;
conn.execute(
"ATTACH ? AS creddy (ENCRYPTION_KEY ?);",
params![&config.db_path().to_string_lossy(), TEST_KEY],
)?;
Db::connect(&config, TEST_PASSPHRASE)?;
Ok(())
}
#[test]
fn test_connect_create_dir() -> TestResult {
let tmp_dir = tempfile::tempdir()?;
let mut config = AppConfig::default();
config.data_dir = tmp_dir.path().join("creddy");
// data_dir does not exist at this point
Db::connect(&config, TEST_PASSPHRASE)?;
Ok(())
}
#[test]
fn test_connect_migrates_attached_db() -> TestResult {
let data_dir = tempfile::tempdir()?;
let mut config = AppConfig::default();
config.data_dir = data_dir.path().to_path_buf();
let db = Db::connect(&config, TEST_PASSPHRASE)?;
// the migrations table should live in the encrypted db, not the in-memory one
let database: String = db.connection.lock().unwrap().query_row(
"SELECT database_name FROM duckdb_tables() WHERE table_name = '_migrations';",
[],
|row| row.get(0),
)?;
assert_eq!(database, "creddy");
Ok(())
}
#[test]
fn test_derive_key() -> TestResult {
let key = Db::derive_key(TEST_PASSPHRASE, &TEST_SALT)?;
dbg!(&key);
dbg!(TEST_KEY);
assert!(key == TEST_KEY);
Ok(())
}
}
+33
View File
@@ -0,0 +1,33 @@
use std::ffi::OsString;
use thiserror::Error;
#[derive(Error, Debug)]
pub enum CreddyError {
#[error("Couldn't determine location for app state")]
DataDirNotFound,
#[error("Invalid path: {0:?}")]
InvalidPath(OsString),
#[error("Error from database: {0}")]
Db(#[from] duckdb::Error),
#[error("I/O error: {0}")]
Io(#[from] std::io::Error),
#[error("Unable to hash password: {0}")]
PasswordHash(#[from] argon2::Error),
#[error("Unable to get random data: {0}")]
Entropy(#[from] getrandom::Error),
#[error("This database was created by a newer version of Creddy (unknown migration {0})")]
DbTooNew(String),
#[error("Migration {0} was applied before an earlier migration that hasn't been")]
MigrationOutOfOrder(String),
#[error("Invalid JSON: {0}")]
InvalidJSON(#[from] serde_json::Error),
}
-8
View File
@@ -1,8 +0,0 @@
export function getRootCause(error) {
if (error.source) {
return getRootCause(error.source);
}
else {
return error;
}
}
-44
View File
@@ -1,44 +0,0 @@
/* Simple asynchronous queue.
To make `get` blocking, we create a new promise and store its `resolve` function in `resolvers`.
The next time an item is added to the queue, it will be resolved.
*/
export default function() {
return {
items: [],
resolvers: [],
size() {
return this.items.length;
},
put(item) {
this.items.push(item);
let resolver = this.resolvers.shift();
if (resolver) {
resolver();
}
},
async get() {
if (this.items.length === 0) {
await new Promise((resolve, reject) => {
this.resolvers.push(resolve);
})
}
return this.items.shift();
},
find_remove(pred) {
for (let i=0; i<this.items.length; i++) {
if (pred(this.items[i])) {
this.items.splice(i, 1);
return true;
}
}
return false;
},
}
}
-11
View File
@@ -1,11 +0,0 @@
import { writable, get } from 'svelte/store';
export let views = writable();
export let currentView = writable();
export let previousView = writable();
export function navigate(viewName) {
let v = get(views)[`./views/${viewName}.svelte`].default;
currentView.set(v)
}
-34
View File
@@ -1,34 +0,0 @@
import { writable, get } from 'svelte/store';
import queue from './queue.js';
import { navigate, currentView, previousView } from './routing.js';
export let appState = writable({
currentRequest: null,
pendingRequests: queue(),
credentialStatus: 'locked',
setupErrors: [],
});
export async function acceptRequest() {
let req = await get(appState).pendingRequests.get();
appState.update($appState => {
$appState.currentRequest = req;
return $appState;
});
previousView.set(get(currentView));
navigate('Approve');
}
export function cleanupRequest() {
appState.update($appState => {
$appState.currentRequest = null;
return $appState;
});
currentView.set(get(previousView));
previousView.set(null);
acceptRequest();
}
-8
View File
@@ -1,8 +0,0 @@
import './style.css';
import App from './App.svelte';
const app = new App({
target: document.getElementById('app')
})
export default app;
+70
View File
@@ -0,0 +1,70 @@
use gpui_kit::{
AppContext, Context, IntoElement, ParentElement, Render, Styled, Window, WindowOptions, div,
};
use gpui_omarchy::ActiveTheme;
mod components;
mod config;
mod db;
mod error;
mod screens;
mod session;
#[cfg(test)]
mod test_data;
use config::AppConfig;
use session::AppSession;
use screens::{HomeScreen, UnlockScreen, WelcomeScreen};
struct CreddyApp {}
impl Render for CreddyApp {
fn render(&mut self, window: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let session = cx.global::<AppSession>();
let screen = match session {
AppSession::Empty => window
.use_keyed_state("welcome", cx, |window, cx| {
WelcomeScreen::new(window, cx)
})
.into_any_element(),
AppSession::Locked => window
.use_keyed_state("unlock", cx, |window, cx| UnlockScreen::new(window, cx))
.into_any_element(),
AppSession::Unlocked { .. } => window
.use_keyed_state("home", cx, |_, _| HomeScreen {})
.into_any_element(),
};
let theme = cx.omarchy();
div()
.size_full()
.bg(theme.background)
.text_color(theme.foreground)
.font_family(theme.font.clone())
.child(screen)
}
}
fn main() {
// todo: replace this with proper error handling
let app_config = AppConfig::load().expect("failed to load config");
let app_session = AppSession::load(&app_config);
// Icons are read through the asset source, so register the bundle.
gpui_kit::application()
.with_assets(gpui_kit::assets::Assets)
.run(|app| {
gpui_omarchy::init(app);
app.set_global(app_config);
app.set_global(app_session);
// refresh_windows() forces everything to re-render, which is kind of a nuclear solution,
// but these values aren't expected to change very frequently, so it shouldn't be a problem
app.observe_global::<AppConfig>(|app| app.refresh_windows()).detach();
app.observe_global::<AppSession>(|app| app.refresh_windows()).detach();
app.open_window(WindowOptions::default(), |_, cx| cx.new(|_| CreddyApp {}))
.expect("open window");
app.activate(true);
});
}
+13
View File
@@ -0,0 +1,13 @@
use gpui_kit::{div, Render, Window, Context, IntoElement, Styled, ParentElement};
pub struct HomeScreen {}
impl Render for HomeScreen {
fn render(&mut self, _: &mut Window, _: &mut Context<Self>) -> impl IntoElement {
div()
.flex()
.justify_center()
.items_center()
.child("Creddy is unlocked")
}
}
+7
View File
@@ -0,0 +1,7 @@
mod home;
mod unlock;
mod welcome;
pub use home::HomeScreen;
pub use unlock::UnlockScreen;
pub use welcome::WelcomeScreen;
+137
View File
@@ -0,0 +1,137 @@
use gpui_kit::{
AppContext, BorrowAppContext, Context, Entity, FontWeight, IntoElement, ParentElement, Render, SharedString,
Styled, Subscription, Task, Window, div, rems,
};
use gpui_omarchy::{ButtonVariant, Status, alert, button, focus_scope};
use crate::components::{PassphraseInput, PassphraseInputEvent};
use crate::config::AppConfig;
use crate::db::Db;
use crate::error::CreddyError;
use crate::session::AppSession;
/// Shown at startup when a database exists: enter the passphrase to open it.
pub struct UnlockScreen {
passphrase: Entity<PassphraseInput>,
error: Option<SharedString>,
/// Set while the KDF is running; dropping it cancels the task.
pending: Option<Task<()>>,
_subscriptions: Vec<Subscription>,
}
impl UnlockScreen {
pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
// nothing else shares the show/hide flag, so it's private to this input
let show = cx.new(|_| false);
let passphrase = cx.new(|cx| PassphraseInput::new(show, window, cx));
passphrase.update(cx, |input, cx| input.focus(window, cx));
let submit = cx.subscribe_in(&passphrase, window, |this, _, event, window, cx| {
if let PassphraseInputEvent::Submit = event {
this.submit(window, cx);
}
});
Self {
passphrase,
error: None,
pending: None,
_subscriptions: vec![submit],
}
}
fn submit(&mut self, _: &mut Window, cx: &mut Context<Self>) {
if self.pending.is_some() {
return;
}
let passphrase = self.passphrase.read(cx).value(cx);
if passphrase.is_empty() {
self.error = Some("Passphrase is empty.".into());
cx.notify();
return;
}
let config = cx.global::<AppConfig>().clone();
self.error = None;
self.pending = Some(cx.spawn(async move |this, cx| {
// argon2 is deliberately slow, so keep it off the UI thread
let result = cx
.background_spawn(async move {
let db = Db::connect(&config, passphrase.as_str())?;
// Some of AppConfig comes from the db, but we couldn't see it until now
let private_config = db.load_private_config()?;
Ok((db, private_config))
})
.await;
// db connection has been established or not, so now we handle the result
let _ = this.update(cx, |this, cx| {
this.pending = None;
match result {
Ok((db, private_config)) => {
cx.update_global::<AppConfig, _>(|config, _cx| config.merge_private(private_config));
cx.set_global(AppSession::Unlocked(db));
},
Err(e) => this.error = Some(error_message(&e)),
}
cx.notify();
});
}));
cx.notify();
}
}
/// Turn a failed unlock into something fit to show the user.
fn error_message(e: &CreddyError) -> SharedString {
// todo: have Db::connect return a dedicated error variant for this instead
if let CreddyError::Db(duckdb::Error::DuckDBFailure(_, Some(desc))) = e
&& desc.contains("Wrong encryption key")
{
return "Incorrect passphrase.".into();
}
format!("Failed to unlock: {e}").into()
}
impl Render for UnlockScreen {
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
focus_scope("unlock")
.size_full()
.flex()
.flex_col()
.items_center()
.p(rems(0.5))
.child(
div()
.text_size(rems(1.875))
.font_weight(FontWeight::BOLD)
.child("Creddy is locked"),
)
.child(
// fill the rest of the window so the form sits in the middle of it
div()
.flex_1()
.w_full()
.max_w(rems(24.))
.flex()
.flex_col()
.justify_center()
.gap(rems(1.))
.child(
div()
.text_center()
.text_size(rems(1.25))
.font_weight(FontWeight::BOLD)
.child("Please enter your passphrase"),
)
.children(self.error.clone().map(|e| alert(e, Status::Error, cx)))
.child(self.passphrase.clone())
.child(
button("submit", "Submit", ButtonVariant::Primary, cx)
.disabled(self.pending.is_some())
.on_click(cx.listener(|this, _, window, cx| this.submit(window, cx))),
),
)
}
}
+178
View File
@@ -0,0 +1,178 @@
use gpui_kit::{
AppContext, Context, Entity, FontWeight, IntoElement, ParentElement, Render, SharedString,
Styled, Subscription, Task,Window, div, rems,
};
use gpui_omarchy::{ActiveTheme, ButtonVariant, Status, alert, button, focus_scope};
use crate::components::{PassphraseInput, PassphraseInputEvent};
use crate::config::AppConfig;
use crate::db::Db;
use crate::session::AppSession;
const MISMATCH: &str = "Passphrases do not match.";
/// First-run screen: choose a passphrase, derive the key, and unlock the session.
pub struct WelcomeScreen {
passphrase: Entity<PassphraseInput>,
confirm: Entity<PassphraseInput>,
error: Option<SharedString>,
/// Set while the KDF is running; dropping it cancels the task.
pending: Option<Task<()>>,
_subscriptions: Vec<Subscription>,
}
impl WelcomeScreen {
pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
let show = cx.new(|_| false);
let passphrase = cx.new(|cx| PassphraseInput::new(show.clone(), window, cx));
let confirm = cx.new(|cx| PassphraseInput::new(show, window, cx));
passphrase.update(cx, |input, cx| input.focus(window, cx));
let mut _subscriptions = Vec::new();
for input in [&passphrase, &confirm] {
_subscriptions.push(cx.subscribe_in(input, window, |this, _, event, window, cx| {
match event {
PassphraseInputEvent::Submit => this.submit(window, cx),
// typing only dismisses the mismatch error, never raises it
PassphraseInputEvent::Change if this.passphrases_match(cx) => {
this.error = None;
cx.notify();
}
_ => (),
}
}));
}
// leaving the confirm field is what raises the mismatch error
_subscriptions.push(cx.subscribe_in(&confirm, window, |this, _, event, _, cx| {
if let PassphraseInputEvent::Blur = event
&& !this.passphrases_match(cx)
{
this.error = Some(MISMATCH.into());
cx.notify();
}
}));
Self {
passphrase,
confirm,
error: None,
pending: None,
_subscriptions,
}
}
fn passphrases_match(&self, cx: &Context<Self>) -> bool {
self.passphrase.read(cx).value(cx) == self.confirm.read(cx).value(cx)
}
fn submit(&mut self, _: &mut Window, cx: &mut Context<Self>) {
if self.pending.is_some() {
return;
}
let passphrase = self.passphrase.read(cx).value(cx);
if !self.passphrases_match(cx) {
self.error = Some(MISMATCH.into());
cx.notify();
return;
}
if passphrase.is_empty() {
self.error = Some("Passphrase is empty.".into());
cx.notify();
return;
}
let config = cx.global::<AppConfig>().clone();
self.error = None;
// todo: persist the salt (and KDF params) so the database can be unlocked again later
self.pending = Some(cx.spawn(async move |this, cx| {
// argon2 is deliberately slow, so keep it off the UI thread
let result = cx
.background_spawn(async move {
Db::connect(&config, passphrase.as_str())
})
.await;
let _ = this.update(cx, |this, cx| {
this.pending = None;
match result {
Ok(db) => cx.set_global(AppSession::Unlocked(db)),
Err(e) => this.error = Some(format!("Failed to derive key: {e}").into()),
}
cx.notify();
});
}));
cx.notify();
}
}
impl Render for WelcomeScreen {
fn render(&mut self, _: &mut Window, cx: &mut Context<Self>) -> impl IntoElement {
let t = cx.omarchy();
let field = |label: &'static str, input: &Entity<PassphraseInput>| {
div()
.flex()
.flex_col()
.gap(rems(0.25))
.child(div().text_size(rems(0.875)).child(label))
.child(input.clone())
};
focus_scope("welcome")
.size_full()
.flex()
.justify_center()
.items_center()
.bg(t.background)
.text_color(t.foreground)
.font_family(t.font.clone())
.child(
div()
.w_full()
.max_w(rems(32.))
.flex()
.flex_col()
.gap(rems(2.))
.child(
div()
.text_center()
.text_size(rems(1.5))
.font_weight(FontWeight::BOLD)
.child("Welcome to Creddy!"),
)
.child(
div()
.flex()
.flex_col()
.gap(rems(1.))
.child("Create a passphrase to get started.")
.child(
"Please note that if you forget your passphrase, there is no way \
to recover your stored credentials. You will have to start over \
with a new passphrase.",
),
)
.child(
div()
.w_full()
.max_w(rems(24.))
.mx_auto()
.flex()
.flex_col()
.gap(rems(1.))
.children(self.error.clone().map(|e| alert(e, Status::Error, cx)))
.child(field("Passphrase", &self.passphrase))
.child(field("Re-enter passphrase", &self.confirm))
.child(
button("submit", "Submit", ButtonVariant::Primary, cx)
.disabled(self.pending.is_some())
.on_click(cx.listener(|this, _, window, cx| {
this.submit(window, cx)
})),
),
),
)
}
}
+43
View File
@@ -0,0 +1,43 @@
use gpui_kit::Global;
use crate::config::AppConfig;
use crate::error::CreddyError;
use crate::db::Db;
#[derive(Debug)]
pub enum AppSession {
Empty,
Locked,
Unlocked(Db),
}
impl AppSession {
pub fn load(config: &AppConfig) -> AppSession {
if config.db_path().exists() {
AppSession::Locked
} else {
AppSession::Empty
}
}
pub fn unlock(&mut self, passphrase: &str) -> Result<AppSession, CreddyError> {
todo!()
}
}
impl Global for AppSession {}
#[cfg(test)]
mod tests {
use super::*;
// #[test]
// fn test_new() {
// let passphrase = "correct horse battery staple";
// let salt = AppSession::salt().expect("salt generation failed.");
// let session = AppSession::new(passphrase, &salt).expect("password KDF failed.");
// match session {
// AppSession::Unlocked { .. } => (),
// _ => panic!("AppSession::new() should return an unlocked session"),
// }
// }
}
-12
View File
@@ -1,12 +0,0 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
.btn-alert-error {
@apply bg-transparent hover:bg-[#cd5a5a] border border-error-content text-error-content
}
/* I like alert icons to be top-aligned */
.alert > :where(*) {
align-items: flex-start;
}
-9
View File
@@ -1,9 +0,0 @@
<script>
import Icon from './Icon.svelte';
export let icon = null;
</script>
<button>
{#if icon}<Icon name={icon} class="w-4 text-gray-200" />{/if}
<slot></slot>
</button>
-67
View File
@@ -1,67 +0,0 @@
<script>
import { onMount } from 'svelte';
import { slide } from 'svelte/transition';
let extraClasses = "";
export {extraClasses as class};
export let slideDuration = 150;
let animationClass = "";
export function shake() {
animationClass = 'shake';
window.setTimeout(() => animationClass = "", 400);
}
</script>
<style>
/* animation from https://svelte.dev/repl/e606c27c864045e5a9700691a7417f99?version=3.58.0 */
@keyframes shake {
0% {
transform: translateX(0px);
}
20% {
transform: translateX(10px);
}
40% {
transform: translateX(-10px);
}
60% {
transform: translateX(5px);
}
80% {
transform: translateX(-5px);
}
90% {
transform: translateX(2px);
}
95% {
transform: translateX(-2px);
}
100% {
transform: translateX(0px);
}
}
.shake {
animation-name: shake;
animation-play-state: running;
animation-duration: 0.4s;
}
</style>
<div in:slide="{{duration: slideDuration}}" class="alert alert-error shadow-lg {animationClass} {extraClasses}">
<div>
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
<span>
<slot></slot>
</span>
</div>
{#if $$slots.buttons}
<div>
<slot name="buttons"></slot>
</div>
{/if}
</div>
-11
View File
@@ -1,11 +0,0 @@
<script>
const ICONS = import.meta.glob('./icons/*.svelte', {eager: true});
export let name;
let classes = "";
export {classes as class};
let svg = ICONS[`./icons/${name}.svelte`].default;
</script>
<svelte:component this={svg} class={classes} />
-15
View File
@@ -1,15 +0,0 @@
<script>
export let keys;
let classes;
export {classes as class};
</script>
<span class="inline-flex gap-x-[0.2em] items-center {classes}">
{#each keys as key, i}
{#if i > 0}
<span class="mt-[-0.1em]">+</span>
{/if}
<kbd class="normal-case px-1 py-0.5 rounded border border-neutral">{key}</kbd>
{/each}
</span>
-43
View File
@@ -1,43 +0,0 @@
<script>
import { navigate } from '../lib/routing.js';
export let target;
export let hotkey = null;
export let ctrl = false
export let alt = false;
export let shift = false;
let classes = "";
export {classes as class};
function click() {
if (typeof target === 'string') {
navigate(target);
}
else if (typeof target === 'function') {
target();
}
else {
throw(`Link target is not a string or a function: ${target}`)
}
}
function handleHotkey(event) {
if (
hotkey === event.key
&& ctrl === event.ctrlKey
&& alt === event.altKey
&& shift === event.shiftKey
) {
click();
}
}
</script>
<svelte:window on:keydown={handleHotkey} />
<a href="/{target}" on:click|preventDefault="{click}" class={classes}>
<slot></slot>
</a>
-29
View File
@@ -1,29 +0,0 @@
<script>
import Link from './Link.svelte';
import Icon from './Icon.svelte';
export let position = "sticky";
</script>
<nav class="{position} top-0 bg-base-100 w-full flex justify-between items-center p-2">
<div>
<Link target="Home">
<button class="btn btn-square btn-ghost align-middle">
<Icon name="home" class="w-8 h-8 stroke-2" />
</button>
</Link>
</div>
{#if $$slots.title}
<slot name="title"></slot>
{/if}
<div>
<Link target="Settings">
<button class="btn btn-square btn-ghost align-middle ">
<Icon name="cog-8-tooth" class="w-8 h-8 stroke-2" />
</button>
</Link>
</div>
</nav>
-42
View File
@@ -1,42 +0,0 @@
<script>
export let thickness = 8;
let classes = '';
export { classes as class };
const radius = (100 - thickness) / 2;
// the px are fake, but we need them to satisfy css calc()
const circumference = `${2 * Math.PI * radius}px`;
</script>
<svg
style:--circumference={circumference}
class={classes}
viewBox="0 0 100 100"
stroke="currentColor"
>
<circle cx="50" cy="50" r={radius} stroke-width={thickness} />
</svg>
<style>
circle {
fill: transparent;
stroke-dasharray: var(--circumference);
transform: rotate(-90deg);
transform-origin: center;
animation: chase 3s infinite,
spin 1.5s linear infinite;
}
@keyframes chase {
0% { stroke-dashoffset: calc(-1 * var(--circumference)); }
50% { stroke-dashoffset: calc(-2 * var(--circumference)); }
100% { stroke-dashoffset: calc(-3 * var(--circumference)); }
}
@keyframes spin {
50% { transform: rotate(135deg); }
100% { transform: rotate(270deg); }
}
</style>
-8
View File
@@ -1,8 +0,0 @@
<script>
let classes = "";
export {classes as class};
</script>
<svg class={classes} fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1">
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
-9
View File
@@ -1,9 +0,0 @@
<script>
let classes = "";
export {classes as class};
</script>
<svg class="w-6 h-6 {classes}" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M10.343 3.94c.09-.542.56-.94 1.11-.94h1.093c.55 0 1.02.398 1.11.94l.149.894c.07.424.384.764.78.93.398.164.855.142 1.205-.108l.737-.527a1.125 1.125 0 011.45.12l.773.774c.39.389.44 1.002.12 1.45l-.527.737c-.25.35-.272.806-.107 1.204.165.397.505.71.93.78l.893.15c.543.09.94.56.94 1.109v1.094c0 .55-.397 1.02-.94 1.11l-.893.149c-.425.07-.765.383-.93.78-.165.398-.143.854.107 1.204l.527.738c.32.447.269 1.06-.12 1.45l-.774.773a1.125 1.125 0 01-1.449.12l-.738-.527c-.35-.25-.806-.272-1.203-.107-.397.165-.71.505-.781.929l-.149.894c-.09.542-.56.94-1.11.94h-1.094c-.55 0-1.019-.398-1.11-.94l-.148-.894c-.071-.424-.384-.764-.781-.93-.398-.164-.854-.142-1.204.108l-.738.527c-.447.32-1.06.269-1.45-.12l-.773-.774a1.125 1.125 0 01-.12-1.45l.527-.737c.25-.35.273-.806.108-1.204-.165-.397-.505-.71-.93-.78l-.894-.15c-.542-.09-.94-.56-.94-1.109v-1.094c0-.55.398-1.02.94-1.11l.894-.149c.424-.07.765-.383.93-.78.165-.398.143-.854-.107-1.204l-.527-.738a1.125 1.125 0 01.12-1.45l.773-.773a1.125 1.125 0 011.45-.12l.737.527c.35.25.807.272 1.204.107.397-.165.71-.505.78-.929l.15-.894z" />
<path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
</svg>
-8
View File
@@ -1,8 +0,0 @@
<script>
let classes = "";
export {classes as class};
</script>
<svg class="w-6 h-6 {classes}" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
<path stroke-linecap="round" stroke-linejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
</svg>
-8
View File
@@ -1,8 +0,0 @@
<script>
let classes = "";
export {classes as class};
</script>
<svg class={classes} fill="none" viewBox="0 0 24 24" stroke="currentColor" stroke-width="1">
<path stroke-linecap="round" stroke-linejoin="round" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
-27
View File
@@ -1,27 +0,0 @@
<script>
import { createEventDispatcher } from 'svelte';
import { open } from '@tauri-apps/api/dialog';
import Setting from './Setting.svelte';
export let title;
export let value;
const dispatch = createEventDispatcher();
</script>
<Setting {title}>
<div slot="input">
<input
type="text"
class="input input-sm input-bordered grow text-right"
bind:value
on:change={() => dispatch('update', {value})}
>
<button
class="btn btn-sm btn-primary"
on:click={async () => value = await open()}
>Browse</button>
</div>
<slot name="description" slot="description"></slot>
</Setting>
-72
View File
@@ -1,72 +0,0 @@
<script>
import { createEventDispatcher } from 'svelte';
import KeyCombo from '../KeyCombo.svelte';
export let description;
export let value;
const id = Math.random().toString().slice(2);
const dispatch = createEventDispatcher();
const MODIFIERS = new Set(['Alt', 'AltGraph', 'Control', 'Fn', 'FnLock', 'Meta', 'Shift', 'Super', ]);
let listening = false;
let keysPressed = [];
function addModifiers(event) {
// add modifier key if it isn't already present
if (MODIFIERS.has(event.key) && keysPressed.indexOf(event.key) === -1) {
keysPressed.push(event.key);
}
}
function addMainKey(event) {
if (!MODIFIERS.has(event.key)) {
keysPressed.push(event.key);
value.keys = keysPressed.join('+');
dispatch('update', {value});
event.preventDefault();
event.stopPropagation();
unlisten();
}
}
function listen() {
// don't re-listen if we already are
if (listening) return;
listening = true;
window.addEventListener('keydown', addModifiers);
window.addEventListener('keyup', addMainKey);
// setTimeout avoids reacting to the click event that we are currently processing
setTimeout(() => window.addEventListener('click', unlisten), 0);
}
function unlisten() {
listening = false;
keysPressed = [];
window.removeEventListener('keydown', addModifiers);
window.removeEventListener('keyup', addMainKey);
window.removeEventListener('click', unlisten);
}
</script>
<input
{id}
type="checkbox"
class="checkbox checkbox-primary"
bind:checked={value.enabled}
on:change={() => dispatch('update', {value})}
>
<label for={id} class="cursor-pointer ml-4 text-lg">{description}</label>
<button class="h-12 p-2 rounded border border-neutral cursor-pointer text-center" on:click={listen}>
{#if listening}
Click to cancel
{:else}
<KeyCombo keys={value.keys.split('+')} />
{/if}
</button>
-87
View File
@@ -1,87 +0,0 @@
<script>
import { createEventDispatcher } from 'svelte';
import Setting from './Setting.svelte';
export let title;
export let value;
export let unit = '';
export let min = null;
export let max = null;
export let decimal = false;
export let debounceInterval = 0;
const dispatch = createEventDispatcher();
$: localValue = value.toString();
let lastInputTime = null;
function debounce(event) {
localValue = localValue.replace(/[^-0-9.]/g, '');
if (debounceInterval === 0) {
updateValue(localValue);
return;
}
lastInputTime = Date.now();
const eventTime = lastInputTime;
const pendingValue = localValue;
window.setTimeout(
() => {
// if no other inputs have occured since then
if (eventTime === lastInputTime) {
updateValue(pendingValue);
}
},
debounceInterval,
)
}
let error = null;
function updateValue(newValue) {
// Don't update the value, but also don't error, if it's empty
// or if it could be the start of a negative or decimal number
if (newValue.match(/^$|^-$|^\.$/) !== null) {
error = null;
return;
}
const num = parseFloat(newValue);
if (num % 1 !== 0 && !decimal) {
error = `${num} is not a whole number`;
}
else if (min !== null && num < min) {
error = `Too low (minimum ${min})`;
}
else if (max !== null && num > max) {
error = `Too large (maximum ${max})`
}
else {
error = null;
value = num;
dispatch('update', {value})
}
}
</script>
<Setting {title}>
<div slot="input">
{#if unit}
<span class="mr-2">{unit}:</span>
{/if}
<div class="tooltip tooltip-error" class:tooltip-open={error !== null} data-tip="{error}">
<input
type="text"
class="input input-sm input-bordered text-right"
size="{Math.max(5, localValue.length)}"
class:input-error={error}
bind:value={localValue}
on:input="{debounce}"
/>
</div>
</div>
<slot name="description" slot="description"></slot>
</Setting>
-22
View File
@@ -1,22 +0,0 @@
<script>
import { slide } from 'svelte/transition';
import ErrorAlert from '../ErrorAlert.svelte';
export let title;
</script>
<div>
<div class="flex flex-wrap justify-between gap-y-4">
<h3 class="text-lg font-bold shrink-0">{title}</h3>
{#if $$slots.input}
<slot name="input"></slot>
{/if}
</div>
{#if $$slots.description}
<p class="mt-3">
<slot name="description"></slot>
</p>
{/if}
</div>
-14
View File
@@ -1,14 +0,0 @@
<script>
export let name;
</script>
<div>
<div class="divider mt-0 mb-8">
<h2 class="text-xl font-bold">{name}</h2>
</div>
<div class="space-y-12">
<slot></slot>
</div>
</div>
-22
View File
@@ -1,22 +0,0 @@
<script>
import { createEventDispatcher } from 'svelte';
import Setting from './Setting.svelte';
export let title;
export let value;
const dispatch = createEventDispatcher();
</script>
<Setting {title}>
<div slot="input">
<input
type="text"
class="input input-sm input-bordered grow text-right"
bind:value
on:change={() => dispatch('update', {value})}
>
</div>
<slot name="description" slot="description"></slot>
</Setting>
-22
View File
@@ -1,22 +0,0 @@
<script>
import { createEventDispatcher } from 'svelte';
import Setting from './Setting.svelte';
export let title;
export let value;
const dispatch = createEventDispatcher();
</script>
<Setting {title}>
<input
slot="input"
type="checkbox"
class="toggle toggle-success"
bind:checked={value}
on:change={e => dispatch('update', {value: e.target.checked})}
/>
<slot name="description" slot="description"></slot>
</Setting>
-5
View File
@@ -1,5 +0,0 @@
export { default as Setting } from './Setting.svelte';
export { default as ToggleSetting } from './ToggleSetting.svelte';
export { default as NumericSetting } from './NumericSetting.svelte';
export { default as FileSetting } from './FileSetting.svelte';
export { default as TextSetting } from './TextSetting.svelte';
-152
View File
@@ -1,152 +0,0 @@
<script>
import { onMount } from 'svelte';
import { invoke } from '@tauri-apps/api/tauri';
import { navigate } from '../lib/routing.js';
import { appState, cleanupRequest } from '../lib/state.js';
import ErrorAlert from '../ui/ErrorAlert.svelte';
import Link from '../ui/Link.svelte';
import KeyCombo from '../ui/KeyCombo.svelte';
// Send response to backend, display error if applicable
let error, alert;
async function respond() {
const response = {
id: $appState.currentRequest.id,
...$appState.currentRequest.response,
};
try {
await invoke('respond', {response});
navigate('ShowResponse');
}
catch (e) {
if (error) {
alert.shake();
}
error = e;
}
}
// Approval has one of several outcomes depending on current credential state
async function approve(base) {
$appState.currentRequest.response = {approval: 'Approved', base};
let status = await invoke('get_session_status');
if (status === 'unlocked') {
await respond();
}
else if (status === 'locked') {
navigate('Unlock');
}
else {
navigate('EnterCredentials');
}
}
function approve_base() {
approve(true);
}
function approve_session() {
approve(false);
}
// Denial has only one
async function deny() {
$appState.currentRequest.response = {approval: 'Denied', base: false};
await respond();
}
// Extract executable name from full path
const client = $appState.currentRequest.client;
const m = client.exe?.match(/\/([^/]+?$)|\\([^\\]+?$)/);
const appName = m[1] || m[2];
// Executable paths can be long, so ensure they only break on \ or /
function breakPath(path) {
return path.replace(/(\\|\/)/g, '$1<wbr>');
}
// if the request has already been approved/denied, send response immediately
onMount(async () => {
if ($appState.currentRequest.response) {
await respond();
}
});
</script>
<!-- Don't render at all if we're just going to immediately proceed to the next screen -->
{#if error || !$appState.currentRequest?.response}
<div class="flex flex-col space-y-4 p-4 m-auto max-w-xl h-screen items-center justify-center">
{#if error}
<ErrorAlert bind:this={alert}>
{error.msg}
<svelte:fragment slot="buttons">
<button class="btn btn-sm btn-alert-error" on:click={cleanupRequest}>Cancel</button>
<button class="btn btn-sm btn-alert-error" on:click={respond}>Retry</button>
</svelte:fragment>
</ErrorAlert>
{/if}
{#if $appState.currentRequest?.base}
<div class="alert alert-warning shadow-lg">
<div>
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current flex-shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z" /></svg>
<span>
WARNING: This application is requesting your base AWS credentials.
These credentials are less secure than session credentials, since they don't expire automatically.
</span>
</div>
</div>
{/if}
<div class="space-y-1 mb-4">
<h2 class="text-xl font-bold">{appName ? `"${appName}"` : 'An appplication'} would like to access your AWS credentials.</h2>
<div class="grid grid-cols-[auto_1fr] gap-x-3">
<div class="text-right">Path:</div>
<code class="">{@html client.exe ? breakPath(client.exe) : 'Unknown'}</code>
<div class="text-right">PID:</div>
<code>{client.pid}</code>
</div>
</div>
<div class="w-full grid grid-cols-[1fr_auto] items-center gap-y-6">
<!-- Don't display the option to approve with session credentials if base was specifically requested -->
{#if !$appState.currentRequest?.base}
<h3 class="font-semibold">
Approve with session credentials
</h3>
<Link target={() => approve(false)} hotkey="Enter" shift={true}>
<button class="w-full btn btn-success">
<KeyCombo keys={['Shift', 'Enter']} />
</button>
</Link>
{/if}
<h3 class="font-semibold">
<span class="mr-2">
{#if $appState.currentRequest?.base}
Approve
{:else}
Approve with base credentials
{/if}
</span>
</h3>
<Link target={() => approve(true)} hotkey="Enter" shift={true} ctrl={true}>
<button class="w-full btn btn-warning">
<KeyCombo keys={['Ctrl', 'Shift', 'Enter']} />
</button>
</Link>
<h3 class="font-semibold">
<span class="mr-2">Deny</span>
</h3>
<Link target={deny} hotkey="Escape">
<button class="w-full btn btn-error">
<KeyCombo keys={['Esc']} />
</button>
</Link>
</div>
</div>
{/if}
-92
View File
@@ -1,92 +0,0 @@
<script>
import { onMount } from 'svelte';
import { invoke } from '@tauri-apps/api/tauri';
import { emit } from '@tauri-apps/api/event';
import { getRootCause } from '../lib/errors.js';
import { appState } from '../lib/state.js';
import { navigate } from '../lib/routing.js';
import Link from '../ui/Link.svelte';
import ErrorAlert from '../ui/ErrorAlert.svelte';
import Spinner from '../ui/Spinner.svelte';
let errorMsg = null;
let alert;
let AccessKeyId, SecretAccessKey, passphrase, confirmPassphrase
function confirm() {
if (passphrase !== confirmPassphrase) {
errorMsg = 'Passphrases do not match.'
}
}
let saving = false;
async function save() {
if (passphrase !== confirmPassphrase) {
alert.shake();
return;
}
let credentials = {AccessKeyId, SecretAccessKey};
try {
saving = true;
await invoke('save_credentials', {credentials, passphrase});
emit('credentials-event', 'entered');
if ($appState.currentRequest) {
navigate('Approve');
}
else {
navigate('Home');
}
}
catch (e) {
window.error = e;
const root = getRootCause(e);
if (e.code === 'GetSession' && root.code) {
errorMsg = `Error response from AWS (${root.code}): ${root.msg}`;
}
else {
errorMsg = e.msg;
}
// if the alert already existed, shake it
if (alert) {
alert.shake();
}
saving = false;
}
}
function cancel() {
emit('credentials-event', 'enter-canceled');
navigate('Home');
}
</script>
<form action="#" on:submit|preventDefault="{save}" class="form-control space-y-4 max-w-sm m-auto p-4 h-screen justify-center">
<h2 class="text-2xl font-bold text-center">Enter your credentials</h2>
{#if errorMsg}
<ErrorAlert bind:this="{alert}">{errorMsg}</ErrorAlert>
{/if}
<input type="text" placeholder="AWS Access Key ID" bind:value="{AccessKeyId}" class="input input-bordered" />
<input type="password" placeholder="AWS Secret Access Key" bind:value="{SecretAccessKey}" class="input input-bordered" />
<input type="password" placeholder="Passphrase" bind:value="{passphrase}" class="input input-bordered" />
<input type="password" placeholder="Re-enter passphrase" bind:value={confirmPassphrase} class="input input-bordered" on:change={confirm} />
<button type="submit" class="btn btn-primary">
{#if saving }
<Spinner class="w-5 h-5" thickness="12"/>
{:else}
Submit
{/if}
</button>
<Link target={cancel} hotkey="Escape">
<button class="btn btn-sm btn-outline w-full">Cancel</button>
</Link>
</form>
-67
View File
@@ -1,67 +0,0 @@
<script>
import { onMount } from 'svelte';
import { invoke } from '@tauri-apps/api/tauri';
import { appState } from '../lib/state.js';
import { navigate } from '../lib/routing.js';
import Nav from '../ui/Nav.svelte';
import Icon from '../ui/Icon.svelte';
import Link from '../ui/Link.svelte';
import vaultDoorSvg from '../assets/vault_door.svg?raw';
let launchBase = false;
function launchTerminal() {
invoke('launch_terminal', {base: launchBase});
launchBase = false;
}
</script>
<Nav position="fixed">
<h2 slot="title" class="text-3xl font-bold">Creddy</h2>
</Nav>
<div class="flex flex-col h-screen items-center justify-center p-4 space-y-4">
<div class="flex flex-col items-center space-y-4">
{@html vaultDoorSvg}
{#await invoke('get_session_status') then status}
{#if status === 'locked'}
<h2 class="text-2xl font-bold">Creddy is locked</h2>
<Link target="Unlock" hotkey="Enter" class="w-64">
<button class="btn btn-primary w-full">Unlock</button>
</Link>
{:else if status === 'unlocked'}
<h2 class="text-2xl font-bold">Waiting for requests</h2>
<button class="btn btn-primary w-full" on:click={launchTerminal}>
Launch Terminal
</button>
<label class="label cursor-pointer flex items-center space-x-2">
<span class="label-text">Launch with long-lived credentials</span>
<input type="checkbox" class="checkbox checkbox-sm" bind:checked={launchBase}>
</label>
{:else if status === 'empty'}
<h2 class="text-2xl font-bold">No credentials found</h2>
<Link target="EnterCredentials" hotkey="Enter" class="w-64">
<button class="btn btn-primary w-full">Enter Credentials</button>
</Link>
{/if}
{/await}
</div>
</div>
{#if $appState.setupErrors.some(e => e.show)}
<div class="toast">
{#each $appState.setupErrors as error}
{#if error.show}
<div class="alert alert-error shadow-lg">
{error.msg}
<button class="btn btn-sm btn-alert-error" on:click={() => error.show = false}>Ok</button>
</div>
{/if}
{/each}
</div>
{/if}
-119
View File
@@ -1,119 +0,0 @@
<script>
import { invoke } from '@tauri-apps/api/tauri';
import { type } from '@tauri-apps/api/os';
import { appState } from '../lib/state.js';
import Nav from '../ui/Nav.svelte';
import Link from '../ui/Link.svelte';
import ErrorAlert from '../ui/ErrorAlert.svelte';
import SettingsGroup from '../ui/settings/SettingsGroup.svelte';
import Keybind from '../ui/settings/Keybind.svelte';
import { Setting, ToggleSetting, NumericSetting, FileSetting, TextSetting } from '../ui/settings';
import { fly } from 'svelte/transition';
import { backInOut } from 'svelte/easing';
// make an independent copy so it can differ from the main config object
let config = JSON.parse(JSON.stringify($appState.config));
$: configModified = JSON.stringify(config) !== JSON.stringify($appState.config);
let error = null;
async function save() {
try {
await invoke('save_config', {config});
$appState.config = await invoke('get_config');
}
catch (e) {
error = e;
}
}
let osType = null;
type().then(t => osType = t);
</script>
<Nav>
<h1 slot="title" class="text-2xl font-bold">Settings</h1>
</Nav>
<div class="max-w-lg mx-auto mt-1.5 mb-24 p-4 space-y-16">
<SettingsGroup name="General">
<ToggleSetting title="Start on login" bind:value={config.start_on_login}>
<svelte:fragment slot="description">
Start Creddy when you log in to your computer.
</svelte:fragment>
</ToggleSetting>
<ToggleSetting title="Start minimized" bind:value={config.start_minimized}>
<svelte:fragment slot="description">
Minimize to the system tray at startup.
</svelte:fragment>
</ToggleSetting>
<NumericSetting title="Re-hide delay" bind:value={config.rehide_ms} min={0} unit="Milliseconds">
<svelte:fragment slot="description">
How long to wait after a request is approved/denied before minimizing
the window to tray. Only applicable if the window was minimized
to tray before the request was received.
</svelte:fragment>
</NumericSetting>
<Setting title="Update credentials">
<Link slot="input" target="EnterCredentials">
<button class="btn btn-sm btn-primary">Update</button>
</Link>
<svelte:fragment slot="description">
Update or re-enter your encrypted credentials.
</svelte:fragment>
</Setting>
<FileSetting
title="Terminal emulator"
bind:value={config.terminal.exec}
>
<svelte:fragment slot="description">
Choose your preferred terminal emulator (e.g. <code>gnome-terminal</code> or <code>wt.exe</code>.) May be an absolute path or an executable discoverable on <code>$PATH</code>.
</svelte:fragment>
</FileSetting>
</SettingsGroup>
<SettingsGroup name="Hotkeys">
<div class="space-y-4">
<p>Click on a keybinding to modify it. Use the checkbox to enable or disable a keybinding entirely.</p>
<div class="grid grid-cols-[auto_1fr_auto] gap-y-3 items-center">
<Keybind description="Show Creddy" bind:value={config.hotkeys.show_window} />
<Keybind description="Launch terminal" bind:value={config.hotkeys.launch_terminal} />
</div>
</div>
</SettingsGroup>
</div>
{#if error}
<div transition:fly={{y: 100, easing: backInOut, duration: 400}} class="toast">
<div class="alert alert-error no-animation">
<div>
<span>{error}</span>
</div>
<div>
<button class="btn btn-sm btn-alert-error" on:click={() => error = null}>Ok</button>
</div>
</div>
</div>
{:else if configModified}
<div transition:fly={{y: 100, easing: backInOut, duration: 400}} class="toast">
<div class="alert shadow-lg no-animation">
<span>You have unsaved changes.</span>
<div>
<!-- <button class="btn btn-sm btn-ghost">Cancel</button> -->
<button class="btn btn-sm btn-primary" on:click={save}>Save</button>
</div>
</div>
</div>
{/if}
-38
View File
@@ -1,38 +0,0 @@
<script>
import { onMount } from 'svelte';
import { draw, fade } from 'svelte/transition';
import { appState, cleanupRequest } from '../lib/state.js';
let success = false;
let error = null;
let drawDuration = $appState.config.rehide_ms >= 750 ? 500 : 0;
let fadeDuration = drawDuration * 0.6;
let fadeDelay = drawDuration * 0.4;
onMount(() => {
window.setTimeout(
cleanupRequest,
// Extra 50ms so the window can finish disappearing before the redraw
Math.min(5000, $appState.config.rehide_ms + 50),
)
})
</script>
<div class="flex flex-col h-screen items-center justify-center max-w-max m-auto">
{#if $appState.currentRequest.response.approval === 'Approved'}
<svg xmlns="http://www.w3.org/2000/svg" class="w-36 h-36" fill="none" viewBox="0 0 24 24" stroke-width="1" stroke="currentColor">
<path in:draw="{{duration: drawDuration}}" stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
{:else}
<svg xmlns="http://www.w3.org/2000/svg" class="w-36 h-36" fill="none" viewBox="0 0 24 24" stroke-width="1" stroke="currentColor">
<path in:draw="{{duration: 500}}" stroke-linecap="round" stroke-linejoin="round" d="M9.75 9.75l4.5 4.5m0-4.5l-4.5 4.5M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
{/if}
<div in:fade="{{duration: fadeDuration, delay: fadeDelay}}" class="text-2xl font-bold">
{$appState.currentRequest.response.approval}!
</div>
</div>
-88
View File
@@ -1,88 +0,0 @@
<script>
import { invoke } from '@tauri-apps/api/tauri';
import { emit } from '@tauri-apps/api/event';
import { onMount } from 'svelte';
import { appState } from '../lib/state.js';
import { navigate } from '../lib/routing.js';
import { getRootCause } from '../lib/errors.js';
import ErrorAlert from '../ui/ErrorAlert.svelte';
import Link from '../ui/Link.svelte';
import Spinner from '../ui/Spinner.svelte';
let errorMsg = null;
let alert;
let passphrase = '';
let loadTime = 0;
let saving = false;
async function unlock() {
// The hotkey for navigating here from homepage is Enter, which also
// happens to trigger the form submit event
if (Date.now() - loadTime < 10) {
return;
}
try {
saving = true;
let r = await invoke('unlock', {passphrase});
$appState.credentialStatus = 'unlocked';
emit('credentials-event', 'unlocked');
if ($appState.currentRequest) {
navigate('Approve');
}
else {
navigate('Home');
}
}
catch (e) {
const root = getRootCause(e);
if (e.code === 'GetSession' && root.code) {
errorMsg = `Error response from AWS (${root.code}): ${root.msg}`;
}
else {
errorMsg = e.msg;
}
// if the alert already existed, shake it
if (alert) {
alert.shake();
}
saving = false;
}
}
function cancel() {
emit('credentials-event', 'unlock-canceled');
navigate('Home');
}
onMount(() => {
loadTime = Date.now();
})
</script>
<form action="#" on:submit|preventDefault="{unlock}" class="form-control space-y-4 max-w-sm m-auto p-4 h-screen justify-center">
<h2 class="font-bold text-2xl text-center">Enter your passphrase</h2>
{#if errorMsg}
<ErrorAlert bind:this="{alert}">{errorMsg}</ErrorAlert>
{/if}
<!-- svelte-ignore a11y-autofocus -->
<input autofocus name="password" type="password" placeholder="correct horse battery staple" bind:value="{passphrase}" class="input input-bordered" />
<button type="submit" class="btn btn-primary">
{#if saving}
<Spinner class="w-5 h-5" thickness="12"/>
{:else}
Submit
{/if}
</button>
<Link target={cancel} hotkey="Escape">
<button class="btn btn-sm btn-outline w-full">Cancel</button>
</Link>
</form>
Loaded 100 of 102 files, more files were not shown because too many files have changed in this diff. Show more