Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0798124811 | ||
|
|
a10510ed6e | ||
|
|
2371486f39 | ||
|
|
a1e5daba59 | ||
|
|
2bd81a66a4 | ||
|
|
d67871f491 | ||
|
|
1a7f502fce | ||
|
|
b2c27d26e8 | ||
|
|
8fa3a15807 | ||
|
|
862c68c846 | ||
|
|
ac62171467 | ||
|
|
2080fb897b | ||
|
|
bf62054c2b | ||
|
|
cd4c613758 | ||
|
|
efbf6c687c | ||
|
|
ee495478ff | ||
|
|
4c18de8b7a | ||
|
|
0cfa9fc07a | ||
|
|
9e9bc2b0ae | ||
|
|
07bf98e522 | ||
|
|
e0e758554c | ||
|
|
479a0a96eb | ||
|
|
c6e22fc91b | ||
|
|
9bc9cb56c1 | ||
|
|
8bcdc5420a | ||
|
|
0a355c299b | ||
|
|
192d9058c3 | ||
|
|
b88b32d0f1 | ||
|
|
12c97c4a7d | ||
|
|
97528d65d6 | ||
|
|
295698e62f | ||
|
|
3b61aa924a | ||
|
|
02ba19d709 | ||
|
|
55801384eb | ||
|
|
27c2f467c4 | ||
|
|
cab5ec40cc | ||
|
|
5cf848f7fe | ||
|
|
a32e36be7e | ||
|
|
10231df860 | ||
|
|
ae93a57aab | ||
|
|
9fd355b68e | ||
|
|
00089d7efb | ||
|
|
0124f77f7b | ||
|
|
6711ce2c43 | ||
|
|
a3a11897c2 | ||
|
|
5e6542d08e | ||
|
|
f311fde74e | ||
|
|
acc5c71bfa | ||
|
|
504c0b4156 | ||
|
|
bf0a2ca72d | ||
|
|
bb980c5eef | ||
|
|
ce7d75f15a | ||
|
|
37b44ddb2e | ||
|
|
8c668e51a6 | ||
|
|
9928996fab | ||
|
|
d0a2532c27 | ||
|
|
0491cb5790 | ||
|
|
816bd7db00 | ||
|
|
b165965289 | ||
|
|
86896d68c2 | ||
|
|
64a2927b94 | ||
|
|
87617a0726 | ||
|
|
141334f7e2 | ||
|
|
69f6a39396 | ||
|
|
70e23c7e20 | ||
|
|
1df849442e | ||
|
|
7fdb336c79 | ||
|
|
46b8d810c5 | ||
|
|
dd40eb379e | ||
|
|
13545ac725 | ||
|
|
040a01536a | ||
|
|
4e2a90b15b | ||
|
|
e0d919ed4a | ||
|
|
3f4efc5f8f | ||
|
|
4881b90b0b | ||
|
|
1b749a857c | ||
|
|
2079f99d04 | ||
|
|
5e0ffc1155 | ||
|
|
d4fa8966b2 | ||
|
|
a293d8f92c | ||
|
|
367a140e2a | ||
|
|
4b06dce7f4 | ||
|
|
47a3e1cfef | ||
|
|
1047818fdc | ||
|
|
3d093a3a45 | ||
|
|
992d2a4d06 | ||
|
|
12f0f187a6 | ||
|
|
997e8b419f | ||
|
|
1d9132de3b |
No files matched your search
@@ -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 }
|
||||||
@@ -1,8 +1,17 @@
|
|||||||
dist
|
|
||||||
**/node_modules
|
|
||||||
src-tauri/target/
|
|
||||||
**/creddy.db
|
**/creddy.db
|
||||||
|
# state directory for development work
|
||||||
|
data/
|
||||||
|
.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
|
||||||
@@ -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"
|
||||||
@@ -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.
|
|
||||||
@@ -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");
|
||||||
|
}
|
||||||
@@ -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.
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
## Definitely
|
||||||
|
|
||||||
|
* ~~Switch to "process" provider for AWS credentials (much less hacky)~~
|
||||||
|
* ~~Frontend needs to react when request is cancelled from backend~~
|
||||||
|
* ~~Session timeout~~
|
||||||
|
* ~~Fix rehide behavior when new request comes in while old one is still being resolved~~
|
||||||
|
* ~~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
|
||||||
|
* Icon
|
||||||
|
* Auto-updates
|
||||||
|
* ~~SSH key handling~~
|
||||||
|
* ~~Docker credential helper~~
|
||||||
|
* Encrypted sync server
|
||||||
|
|
||||||
|
## Maybe
|
||||||
|
|
||||||
|
* Flatten error type hierarchy
|
||||||
|
* Rehide after terminal launch from locked
|
||||||
|
* Generalize Request across both credentials and terminal launch?
|
||||||
|
* 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)
|
||||||
|
* 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)
|
||||||
@@ -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>
|
|
||||||
@@ -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 ('{}');
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "creddy",
|
|
||||||
"version": "0.3.1",
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
module.exports = {
|
|
||||||
plugins: {
|
|
||||||
tailwindcss: {},
|
|
||||||
autoprefixer: {},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -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"]
|
|
||||||
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
DATABASE_URL=sqlite://C:/Users/Joe/AppData/Roaming/creddy/creddy.dev.db
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "creddy"
|
|
||||||
version = "0.3.1"
|
|
||||||
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 = ["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"] }
|
|
||||||
netstat2 = "0.9.1"
|
|
||||||
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"
|
|
||||||
|
|
||||||
[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
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
fn main() {
|
|
||||||
tauri_build::build()
|
|
||||||
}
|
|
||||||
@@ -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>
|
|
||||||
|
Before Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 6.8 KiB |
|
Before Width: | Height: | Size: 974 B |
|
Before Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 3.8 KiB |
|
Before Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 7.6 KiB |
|
Before Width: | Height: | Size: 903 B |
|
Before Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 2.0 KiB |
|
Before Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 85 KiB |
|
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
|
|
||||||
);
|
|
||||||
@@ -1,97 +0,0 @@
|
|||||||
use std::error::Error;
|
|
||||||
|
|
||||||
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::*,
|
|
||||||
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| {
|
|
||||||
app.get_window("main")
|
|
||||||
.map(|w| w.show().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::save_credentials,
|
|
||||||
ipc::get_config,
|
|
||||||
ipc::save_config,
|
|
||||||
ipc::launch_terminal,
|
|
||||||
])
|
|
||||||
.setup(|app| rt::block_on(setup(app)))
|
|
||||||
.build(tauri::generate_context!())?
|
|
||||||
.run(|app, run_event| match run_event {
|
|
||||||
tauri::RunEvent::WindowEvent { label, event, .. } => match event {
|
|
||||||
tauri::WindowEvent::CloseRequested { api, .. } => {
|
|
||||||
let _ = app.get_window(&label).map(|w| w.hide());
|
|
||||||
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();
|
|
||||||
|
|
||||||
let is_first_launch = config::get_or_create_db_path()?.exists();
|
|
||||||
|
|
||||||
let pool = connect_db().await?;
|
|
||||||
let conf = AppConfig::load(&pool).await?;
|
|
||||||
let session = Session::load(&pool).await?;
|
|
||||||
let srv = Server::new(conf.listen_addr, conf.listen_port, app.handle()).await?;
|
|
||||||
|
|
||||||
config::set_auto_launch(conf.start_on_login)?;
|
|
||||||
config::register_hotkeys(&conf.hotkeys)?;
|
|
||||||
// if session is empty, this is probably the first launch, so don't autohide
|
|
||||||
if !conf.start_minimized || is_first_launch {
|
|
||||||
app.get_window("main")
|
|
||||||
.ok_or(HandlerError::NoMainWindow)?
|
|
||||||
.show()?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let state = AppState::new(conf, session, srv, pool);
|
|
||||||
app.manage(state);
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
@@ -1,45 +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(("show", m)) => cli::show(m),
|
|
||||||
Some(("exec", m)) => cli::exec(m),
|
|
||||||
_ => unreachable!(),
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Err(e) = res {
|
|
||||||
eprintln!("Error: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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(())
|
|
||||||
}
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
use std::ffi::OsString;
|
|
||||||
use std::process::Command as ChildCommand;
|
|
||||||
#[cfg(unix)]
|
|
||||||
use std::os::unix::process::CommandExt;
|
|
||||||
|
|
||||||
use clap::{
|
|
||||||
Command,
|
|
||||||
Arg,
|
|
||||||
ArgMatches,
|
|
||||||
ArgAction
|
|
||||||
};
|
|
||||||
use tokio::{
|
|
||||||
net::TcpStream,
|
|
||||||
io::{AsyncReadExt, AsyncWriteExt},
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
use crate::app;
|
|
||||||
use crate::config::AppConfig;
|
|
||||||
use crate::credentials::{BaseCredentials, SessionCredentials};
|
|
||||||
use crate::errors::*;
|
|
||||||
|
|
||||||
|
|
||||||
pub fn parser() -> Command<'static> {
|
|
||||||
Command::new("creddy")
|
|
||||||
.about("A friendly AWS credentials manager")
|
|
||||||
.subcommand(
|
|
||||||
Command::new("run")
|
|
||||||
.about("Launch Creddy")
|
|
||||||
)
|
|
||||||
.subcommand(
|
|
||||||
Command::new("show")
|
|
||||||
.about("Fetch and display AWS credentials")
|
|
||||||
.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)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
pub fn show(args: &ArgMatches) -> Result<(), CliError> {
|
|
||||||
let base = args.get_one("base").unwrap_or(&false);
|
|
||||||
let creds = get_credentials(*base)?;
|
|
||||||
println!("{creds}");
|
|
||||||
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);
|
|
||||||
|
|
||||||
if base {
|
|
||||||
let creds: BaseCredentials = serde_json::from_str(&get_credentials(base)?)
|
|
||||||
.map_err(|_| RequestError::InvalidJson)?;
|
|
||||||
cmd.env("AWS_ACCESS_KEY_ID", creds.access_key_id);
|
|
||||||
cmd.env("AWS_SECRET_ACCESS_KEY", creds.secret_access_key);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
let creds: SessionCredentials = serde_json::from_str(&get_credentials(base)?)
|
|
||||||
.map_err(|_| RequestError::InvalidJson)?;
|
|
||||||
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.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));
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn get_credentials(base: bool) -> Result<String, RequestError> {
|
|
||||||
let pool = app::connect_db().await?;
|
|
||||||
let config = AppConfig::load(&pool).await?;
|
|
||||||
let path = if base {"/creddy/base-credentials"} else {"/"};
|
|
||||||
|
|
||||||
let mut stream = TcpStream::connect((config.listen_addr, config.listen_port)).await?;
|
|
||||||
let req = format!("GET {path} HTTP/1.0\r\n\r\n");
|
|
||||||
stream.write_all(req.as_bytes()).await?;
|
|
||||||
|
|
||||||
// some day we'll have a proper HTTP parser
|
|
||||||
let mut buf = vec![0; 8192];
|
|
||||||
stream.read_to_end(&mut buf).await?;
|
|
||||||
|
|
||||||
let status = buf.split(|&c| &[c] == b" ")
|
|
||||||
.skip(1)
|
|
||||||
.next()
|
|
||||||
.ok_or(RequestError::MalformedHttpResponse)?;
|
|
||||||
|
|
||||||
if status != b"200" {
|
|
||||||
let s = String::from_utf8_lossy(status).to_string();
|
|
||||||
return Err(RequestError::Failed(s));
|
|
||||||
}
|
|
||||||
|
|
||||||
let break_idx = buf.windows(4)
|
|
||||||
.position(|w| w == b"\r\n\r\n")
|
|
||||||
.ok_or(RequestError::MalformedHttpResponse)?;
|
|
||||||
let body = &buf[(break_idx + 4)..];
|
|
||||||
|
|
||||||
let creds_str = std::str::from_utf8(body)
|
|
||||||
.map_err(|_| RequestError::MalformedHttpResponse)?
|
|
||||||
.to_string();
|
|
||||||
|
|
||||||
if creds_str == "Denied!" {
|
|
||||||
return Err(RequestError::Rejected);
|
|
||||||
}
|
|
||||||
Ok(creds_str)
|
|
||||||
}
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use netstat2::{AddressFamilyFlags, ProtocolFlags, ProtocolSocketInfo};
|
|
||||||
use tauri::Manager;
|
|
||||||
use sysinfo::{System, SystemExt, Pid, PidExt, ProcessExt};
|
|
||||||
use serde::{Serialize, Deserialize};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::APP,
|
|
||||||
errors::*,
|
|
||||||
config::AppConfig,
|
|
||||||
state::AppState,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize, Eq, PartialEq, Hash)]
|
|
||||||
pub struct Client {
|
|
||||||
pub pid: u32,
|
|
||||||
pub exe: PathBuf,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
async fn get_associated_pids(local_port: u16) -> Result<Vec<u32>, netstat2::error::Error> {
|
|
||||||
let state = APP.get().unwrap().state::<AppState>();
|
|
||||||
let AppConfig {
|
|
||||||
listen_addr: app_listen_addr,
|
|
||||||
listen_port: app_listen_port,
|
|
||||||
..
|
|
||||||
} = *state.config.read().await;
|
|
||||||
|
|
||||||
let sockets_iter = netstat2::iterate_sockets_info(
|
|
||||||
AddressFamilyFlags::IPV4,
|
|
||||||
ProtocolFlags::TCP
|
|
||||||
)?;
|
|
||||||
for item in sockets_iter {
|
|
||||||
let sock_info = item?;
|
|
||||||
let proto_info = match sock_info.protocol_socket_info {
|
|
||||||
ProtocolSocketInfo::Tcp(tcp_info) => tcp_info,
|
|
||||||
ProtocolSocketInfo::Udp(_) => {continue;}
|
|
||||||
};
|
|
||||||
|
|
||||||
if proto_info.local_port == local_port
|
|
||||||
&& proto_info.remote_port == app_listen_port
|
|
||||||
&& proto_info.local_addr == app_listen_addr
|
|
||||||
&& proto_info.remote_addr == app_listen_addr
|
|
||||||
{
|
|
||||||
return Ok(sock_info.associated_pids)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(vec![])
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Theoretically, on some systems, multiple processes can share a socket
|
|
||||||
pub async fn get_clients(local_port: u16) -> Result<Vec<Option<Client>>, ClientInfoError> {
|
|
||||||
let mut clients = Vec::new();
|
|
||||||
let mut sys = System::new();
|
|
||||||
for p in get_associated_pids(local_port).await? {
|
|
||||||
let pid = Pid::from_u32(p);
|
|
||||||
sys.refresh_process(pid);
|
|
||||||
let proc = sys.process(pid)
|
|
||||||
.ok_or(ClientInfoError::ProcessNotFound)?;
|
|
||||||
|
|
||||||
let client = Client {
|
|
||||||
pid: p,
|
|
||||||
exe: proc.exe().to_path_buf(),
|
|
||||||
};
|
|
||||||
clients.push(Some(client));
|
|
||||||
}
|
|
||||||
|
|
||||||
if clients.is_empty() {
|
|
||||||
clients.push(None);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(clients)
|
|
||||||
}
|
|
||||||
@@ -1,245 +0,0 @@
|
|||||||
use std::net::Ipv4Addr;
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use auto_launch::AutoLaunchBuilder;
|
|
||||||
use is_terminal::IsTerminal;
|
|
||||||
use serde::{Serialize, Deserialize};
|
|
||||||
use sqlx::SqlitePool;
|
|
||||||
use tauri::{
|
|
||||||
Manager,
|
|
||||||
GlobalShortcutManager,
|
|
||||||
async_runtime as rt,
|
|
||||||
};
|
|
||||||
|
|
||||||
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,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
|
||||||
pub struct AppConfig {
|
|
||||||
#[serde(default = "default_listen_addr")]
|
|
||||||
pub listen_addr: Ipv4Addr,
|
|
||||||
#[serde(default = "default_listen_port")]
|
|
||||||
pub listen_port: u16,
|
|
||||||
#[serde(default = "default_rehide_ms")]
|
|
||||||
pub rehide_ms: u64,
|
|
||||||
#[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 {
|
|
||||||
listen_addr: default_listen_addr(),
|
|
||||||
listen_port: default_listen_port(),
|
|
||||||
rehide_ms: default_rehide_ms(),
|
|
||||||
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_listen_port() -> u16 {
|
|
||||||
if cfg!(debug_assertions) {
|
|
||||||
12_345
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
19_923
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// note: will panic if called before APP is set
|
|
||||||
pub fn register_hotkeys(hotkeys: &HotkeysConfig) -> tauri::Result<()> {
|
|
||||||
let app = crate::app::APP.get().unwrap();
|
|
||||||
|
|
||||||
let mut manager = app.global_shortcut_manager();
|
|
||||||
manager.unregister_all()?;
|
|
||||||
|
|
||||||
if hotkeys.show_window.enabled {
|
|
||||||
let handle = app.app_handle();
|
|
||||||
manager.register(
|
|
||||||
&hotkeys.show_window.keys,
|
|
||||||
move || {
|
|
||||||
handle.get_window("main")
|
|
||||||
.map(|w| w.show().error_popup("Failed to show"))
|
|
||||||
.ok_or(HandlerError::NoMainWindow)
|
|
||||||
.error_popup("No main window");
|
|
||||||
},
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
if hotkeys.launch_terminal.enabled {
|
|
||||||
// register() doesn't take an async fn, so we have to use spawn
|
|
||||||
manager.register(
|
|
||||||
&hotkeys.launch_terminal.keys,
|
|
||||||
|| {
|
|
||||||
rt::spawn(async {
|
|
||||||
crate::terminal::launch(false)
|
|
||||||
.await
|
|
||||||
.error_popup("Failed to launch");
|
|
||||||
});
|
|
||||||
}
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fn default_listen_addr() -> Ipv4Addr { Ipv4Addr::LOCALHOST }
|
|
||||||
fn default_rehide_ms() -> u64 { 1000 }
|
|
||||||
// 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) }
|
|
||||||
@@ -1,331 +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 {
|
|
||||||
access_key_id: self.access_key_id.clone(),
|
|
||||||
secret_access_key,
|
|
||||||
};
|
|
||||||
Ok(creds)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize, Deserialize)]
|
|
||||||
#[serde(rename_all = "PascalCase")]
|
|
||||||
pub struct BaseCredentials {
|
|
||||||
pub access_key_id: String,
|
|
||||||
pub secret_access_key: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl BaseCredentials {
|
|
||||||
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 access_key_id: String,
|
|
||||||
pub secret_access_key: String,
|
|
||||||
pub 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 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 {
|
|
||||||
access_key_id,
|
|
||||||
secret_access_key,
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,381 +0,0 @@
|
|||||||
use std::error::Error;
|
|
||||||
use std::convert::AsRef;
|
|
||||||
use std::ffi::OsString;
|
|
||||||
use std::sync::mpsc;
|
|
||||||
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 serde::{Serialize, Serializer, ser::SerializeMap};
|
|
||||||
|
|
||||||
|
|
||||||
pub trait ErrorPopup {
|
|
||||||
fn error_popup(self, title: &str);
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<E: Error> ErrorPopup 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 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()
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
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>)?;
|
|
||||||
|
|
||||||
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 an HTTP 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,
|
|
||||||
#[error("HTTP request malformed")]
|
|
||||||
BadRequest(Vec<u8>),
|
|
||||||
#[error("HTTP request too large")]
|
|
||||||
RequestTooLarge,
|
|
||||||
#[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,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[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 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("Couldn't get client socket details: {0}")]
|
|
||||||
NetstatError(#[from] netstat2::error::Error),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Errors encountered while requesting credentials via CLI (creddy show, creddy exec)
|
|
||||||
#[derive(Debug, ThisError, AsRefStr)]
|
|
||||||
pub enum RequestError {
|
|
||||||
#[error("Credentials request failed: HTTP {0}")]
|
|
||||||
Failed(String),
|
|
||||||
#[error("Credentials request was rejected")]
|
|
||||||
Rejected,
|
|
||||||
#[error("Couldn't interpret the server's response")]
|
|
||||||
MalformedHttpResponse,
|
|
||||||
#[error("The server did not respond with valid JSON")]
|
|
||||||
InvalidJson,
|
|
||||||
#[error("Error reading/writing stream: {0}")]
|
|
||||||
StreamIOError(#[from] std::io::Error),
|
|
||||||
#[error("Error loading configuration data: {0}")]
|
|
||||||
Setup(#[from] SetupError),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[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 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}"))?;
|
|
||||||
|
|
||||||
match self {
|
|
||||||
HandlerError::NoCredentials(src) => map.serialize_entry("source", &src)?,
|
|
||||||
HandlerError::ClientInfo(src) => map.serialize_entry("source", &src)?,
|
|
||||||
_ => serialize_upstream_err(self, &mut map)?,
|
|
||||||
}
|
|
||||||
|
|
||||||
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)?,
|
|
||||||
_ => 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()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,87 +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 Request {
|
|
||||||
pub id: u64,
|
|
||||||
pub clients: Vec<Option<Client>>,
|
|
||||||
pub base: bool,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize)]
|
|
||||||
pub struct RequestResponse {
|
|
||||||
pub id: u64,
|
|
||||||
pub approval: Approval,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[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 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
|
|
||||||
}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
pub mod app;
|
|
||||||
pub mod cli;
|
|
||||||
mod config;
|
|
||||||
mod credentials;
|
|
||||||
pub mod errors;
|
|
||||||
mod clientinfo;
|
|
||||||
mod ipc;
|
|
||||||
mod state;
|
|
||||||
mod server;
|
|
||||||
mod terminal;
|
|
||||||
mod tray;
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
#![cfg_attr(
|
|
||||||
all(not(debug_assertions), target_os = "windows"),
|
|
||||||
windows_subsystem = "windows"
|
|
||||||
)]
|
|
||||||
|
|
||||||
use creddy::{
|
|
||||||
app,
|
|
||||||
cli,
|
|
||||||
errors::ErrorPopup,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
let res = match cli::parser().get_matches().subcommand() {
|
|
||||||
None | Some(("run", _)) => {
|
|
||||||
app::run().error_popup("Creddy failed to start");
|
|
||||||
Ok(())
|
|
||||||
},
|
|
||||||
Some(("show", m)) => cli::show(m),
|
|
||||||
Some(("exec", m)) => cli::exec(m),
|
|
||||||
_ => unreachable!(),
|
|
||||||
};
|
|
||||||
|
|
||||||
if let Err(e) = res {
|
|
||||||
eprintln!("Error: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,275 +0,0 @@
|
|||||||
use core::time::Duration;
|
|
||||||
use std::io;
|
|
||||||
use std::net::{
|
|
||||||
Ipv4Addr,
|
|
||||||
SocketAddr,
|
|
||||||
SocketAddrV4,
|
|
||||||
};
|
|
||||||
use tokio::net::{
|
|
||||||
TcpListener,
|
|
||||||
TcpStream,
|
|
||||||
};
|
|
||||||
use tokio::io::{AsyncReadExt, AsyncWriteExt};
|
|
||||||
use tokio::sync::oneshot::{self, Sender, Receiver};
|
|
||||||
use tokio::time::sleep;
|
|
||||||
|
|
||||||
use tauri::{AppHandle, Manager};
|
|
||||||
use tauri::async_runtime as rt;
|
|
||||||
use tauri::async_runtime::JoinHandle;
|
|
||||||
|
|
||||||
use crate::{clientinfo, clientinfo::Client};
|
|
||||||
use crate::errors::*;
|
|
||||||
use crate::ipc::{Request, Approval};
|
|
||||||
use crate::state::AppState;
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct RequestWaiter {
|
|
||||||
pub rehide_after: bool,
|
|
||||||
pub sender: Option<Sender<Approval>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl RequestWaiter {
|
|
||||||
pub fn notify(&mut self, approval: Approval) -> Result<(), SendResponseError> {
|
|
||||||
let chan = self.sender
|
|
||||||
.take()
|
|
||||||
.ok_or(SendResponseError::Fulfilled)?;
|
|
||||||
|
|
||||||
chan.send(approval)
|
|
||||||
.map_err(|_| SendResponseError::Abandoned)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
struct Handler {
|
|
||||||
request_id: u64,
|
|
||||||
stream: TcpStream,
|
|
||||||
rehide_after: bool,
|
|
||||||
receiver: Option<Receiver<Approval>>,
|
|
||||||
app: AppHandle,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Handler {
|
|
||||||
async fn new(stream: TcpStream, app: AppHandle) -> Result<Self, HandlerError> {
|
|
||||||
let state = app.state::<AppState>();
|
|
||||||
|
|
||||||
// determine whether we should re-hide the window after handling this request
|
|
||||||
let is_currently_visible = app.get_window("main")
|
|
||||||
.ok_or(HandlerError::NoMainWindow)?
|
|
||||||
.is_visible()?;
|
|
||||||
let rehide_after = state.current_rehide_status()
|
|
||||||
.await
|
|
||||||
.unwrap_or(!is_currently_visible);
|
|
||||||
|
|
||||||
let (chan_send, chan_recv) = oneshot::channel();
|
|
||||||
let waiter = RequestWaiter {rehide_after, sender: Some(chan_send)};
|
|
||||||
let request_id = state.register_request(waiter).await;
|
|
||||||
let handler = Handler {
|
|
||||||
request_id,
|
|
||||||
stream,
|
|
||||||
rehide_after,
|
|
||||||
receiver: Some(chan_recv),
|
|
||||||
app
|
|
||||||
};
|
|
||||||
Ok(handler)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn handle(mut self) {
|
|
||||||
if let Err(e) = self.try_handle().await {
|
|
||||||
eprintln!("{e}");
|
|
||||||
}
|
|
||||||
let state = self.app.state::<AppState>();
|
|
||||||
state.unregister_request(self.request_id).await;
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn try_handle(&mut self) -> Result<(), HandlerError> {
|
|
||||||
let req_path = self.recv_request().await?;
|
|
||||||
let clients = self.get_clients().await?;
|
|
||||||
if self.includes_banned(&clients).await {
|
|
||||||
self.stream.write(b"HTTP/1.0 403 Access Denied\r\n\r\n").await?;
|
|
||||||
return Ok(())
|
|
||||||
}
|
|
||||||
let base = req_path == b"/creddy/base-credentials";
|
|
||||||
|
|
||||||
let req = Request {id: self.request_id, clients, base};
|
|
||||||
self.app.emit_all("credentials-request", &req)?;
|
|
||||||
self.show_window()?;
|
|
||||||
|
|
||||||
match self.wait_for_response().await? {
|
|
||||||
Approval::Approved => {
|
|
||||||
let state = self.app.state::<AppState>();
|
|
||||||
let creds = if base {
|
|
||||||
state.serialize_base_creds().await?
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
state.serialize_session_creds().await?
|
|
||||||
};
|
|
||||||
self.send_body(creds.as_bytes()).await?;
|
|
||||||
},
|
|
||||||
Approval::Denied => {
|
|
||||||
let state = self.app.state::<AppState>();
|
|
||||||
for client in req.clients {
|
|
||||||
state.add_ban(client).await;
|
|
||||||
}
|
|
||||||
self.send_body(b"Denied!").await?;
|
|
||||||
self.stream.shutdown().await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// only hide the window if a) it was hidden to start with
|
|
||||||
// and b) there are no other pending requests
|
|
||||||
let state = self.app.state::<AppState>();
|
|
||||||
let delay = {
|
|
||||||
let config = state.config.read().await;
|
|
||||||
Duration::from_millis(config.rehide_ms)
|
|
||||||
};
|
|
||||||
sleep(delay).await;
|
|
||||||
|
|
||||||
if self.rehide_after && state.req_count().await == 1 {
|
|
||||||
self.app
|
|
||||||
.get_window("main")
|
|
||||||
.ok_or(HandlerError::NoMainWindow)?
|
|
||||||
.hide()?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn recv_request(&mut self) -> Result<Vec<u8>, HandlerError> {
|
|
||||||
let mut buf = vec![0; 8192]; // it's what tokio's BufReader uses
|
|
||||||
let mut n = 0;
|
|
||||||
loop {
|
|
||||||
n += self.stream.read(&mut buf[n..]).await?;
|
|
||||||
if n >= 4 && &buf[(n - 4)..n] == b"\r\n\r\n" {break;}
|
|
||||||
if n == buf.len() {return Err(HandlerError::RequestTooLarge);}
|
|
||||||
}
|
|
||||||
|
|
||||||
let path = buf.split(|&c| &[c] == b" ")
|
|
||||||
.skip(1)
|
|
||||||
.next()
|
|
||||||
.ok_or(HandlerError::BadRequest(buf.clone()))?;
|
|
||||||
|
|
||||||
#[cfg(debug_assertions)] {
|
|
||||||
println!("Path: {}", std::str::from_utf8(&path).unwrap());
|
|
||||||
println!("{}", std::str::from_utf8(&buf).unwrap());
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(path.into())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_clients(&self) -> Result<Vec<Option<Client>>, HandlerError> {
|
|
||||||
let peer_addr = match self.stream.peer_addr()? {
|
|
||||||
SocketAddr::V4(addr) => addr,
|
|
||||||
_ => unreachable!(), // we only listen on IPv4
|
|
||||||
};
|
|
||||||
let clients = clientinfo::get_clients(peer_addr.port()).await?;
|
|
||||||
Ok(clients)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn includes_banned(&self, clients: &Vec<Option<Client>>) -> bool {
|
|
||||||
let state = self.app.state::<AppState>();
|
|
||||||
for client in clients {
|
|
||||||
if state.is_banned(client).await {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
fn show_window(&self) -> Result<(), HandlerError> {
|
|
||||||
let window = self.app.get_window("main").ok_or(HandlerError::NoMainWindow)?;
|
|
||||||
if !window.is_visible()? {
|
|
||||||
window.unminimize()?;
|
|
||||||
window.show()?;
|
|
||||||
}
|
|
||||||
window.set_focus()?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn wait_for_response(&mut self) -> Result<Approval, HandlerError> {
|
|
||||||
self.stream.write(b"HTTP/1.0 200 OK\r\n").await?;
|
|
||||||
self.stream.write(b"Content-Type: application/json\r\n").await?;
|
|
||||||
self.stream.write(b"X-Creddy-delaying-tactic: ").await?;
|
|
||||||
|
|
||||||
#[allow(unreachable_code)] // seems necessary for type inference
|
|
||||||
let stall = async {
|
|
||||||
let delay = std::time::Duration::from_secs(1);
|
|
||||||
loop {
|
|
||||||
tokio::time::sleep(delay).await;
|
|
||||||
self.stream.write(b"x").await?;
|
|
||||||
}
|
|
||||||
Ok(Approval::Denied)
|
|
||||||
};
|
|
||||||
|
|
||||||
// this is the only place we even read this field, so it's safe to unwrap
|
|
||||||
let receiver = self.receiver.take().unwrap();
|
|
||||||
tokio::select!{
|
|
||||||
r = receiver => Ok(r.unwrap()), // only panics if the sender is dropped without sending, which shouldn't be possible
|
|
||||||
e = stall => e,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn send_body(&mut self, body: &[u8]) -> Result<(), HandlerError> {
|
|
||||||
self.stream.write(b"\r\nContent-Length: ").await?;
|
|
||||||
self.stream.write(body.len().to_string().as_bytes()).await?;
|
|
||||||
self.stream.write(b"\r\n\r\n").await?;
|
|
||||||
self.stream.write(body).await?;
|
|
||||||
self.stream.shutdown().await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Server {
|
|
||||||
addr: Ipv4Addr,
|
|
||||||
port: u16,
|
|
||||||
app_handle: AppHandle,
|
|
||||||
task: JoinHandle<()>,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
impl Server {
|
|
||||||
pub async fn new(addr: Ipv4Addr, port: u16, app_handle: AppHandle) -> io::Result<Server> {
|
|
||||||
let task = Self::start_server(addr, port, app_handle.app_handle()).await?;
|
|
||||||
Ok(Server { addr, port, app_handle, task})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn rebind(&mut self, addr: Ipv4Addr, port: u16) -> io::Result<()> {
|
|
||||||
if addr == self.addr && port == self.port {
|
|
||||||
return Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
let new_task = Self::start_server(addr, port, self.app_handle.app_handle()).await?;
|
|
||||||
self.task.abort();
|
|
||||||
|
|
||||||
self.addr = addr;
|
|
||||||
self.port = port;
|
|
||||||
self.task = new_task;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
// construct the listener before spawning the task so that we can return early if it fails
|
|
||||||
async fn start_server(addr: Ipv4Addr, port: u16, app_handle: AppHandle) -> io::Result<JoinHandle<()>> {
|
|
||||||
let sock_addr = SocketAddrV4::new(addr, port);
|
|
||||||
let listener = TcpListener::bind(&sock_addr).await?;
|
|
||||||
let task = rt::spawn(
|
|
||||||
Self::serve(listener, app_handle.app_handle())
|
|
||||||
);
|
|
||||||
Ok(task)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn serve(listener: TcpListener, app_handle: AppHandle) {
|
|
||||||
loop {
|
|
||||||
match listener.accept().await {
|
|
||||||
Ok((stream, _)) => {
|
|
||||||
match Handler::new(stream, app_handle.app_handle()).await {
|
|
||||||
Ok(handler) => { rt::spawn(handler.handle()); }
|
|
||||||
Err(e) => { eprintln!("Error handling request: {e}"); }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Err(e) => { eprintln!("Error accepting connection: {e}"); }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,197 +0,0 @@
|
|||||||
use std::collections::{HashMap, HashSet};
|
|
||||||
use std::time::Duration;
|
|
||||||
|
|
||||||
use tokio::{
|
|
||||||
sync::RwLock,
|
|
||||||
time::sleep,
|
|
||||||
};
|
|
||||||
use sqlx::SqlitePool;
|
|
||||||
use tauri::async_runtime as runtime;
|
|
||||||
use tauri::Manager;
|
|
||||||
|
|
||||||
use crate::app::APP;
|
|
||||||
use crate::credentials::{
|
|
||||||
Session,
|
|
||||||
BaseCredentials,
|
|
||||||
SessionCredentials,
|
|
||||||
};
|
|
||||||
use crate::{config, config::AppConfig};
|
|
||||||
use crate::ipc::{self, Approval};
|
|
||||||
use crate::clientinfo::Client;
|
|
||||||
use crate::errors::*;
|
|
||||||
use crate::server::{Server, RequestWaiter};
|
|
||||||
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct AppState {
|
|
||||||
pub config: RwLock<AppConfig>,
|
|
||||||
pub session: RwLock<Session>,
|
|
||||||
pub request_count: RwLock<u64>,
|
|
||||||
pub waiting_requests: RwLock<HashMap<u64, RequestWaiter>>,
|
|
||||||
pub pending_terminal_request: RwLock<bool>,
|
|
||||||
pub bans: RwLock<std::collections::HashSet<Option<Client>>>,
|
|
||||||
server: RwLock<Server>,
|
|
||||||
pool: sqlx::SqlitePool,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AppState {
|
|
||||||
pub fn new(config: AppConfig, session: Session, server: Server, pool: SqlitePool) -> AppState {
|
|
||||||
AppState {
|
|
||||||
config: RwLock::new(config),
|
|
||||||
session: RwLock::new(session),
|
|
||||||
request_count: RwLock::new(0),
|
|
||||||
waiting_requests: RwLock::new(HashMap::new()),
|
|
||||||
pending_terminal_request: RwLock::new(false),
|
|
||||||
bans: RwLock::new(HashSet::new()),
|
|
||||||
server: RwLock::new(server),
|
|
||||||
pool,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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)?;
|
|
||||||
}
|
|
||||||
// rebind socket if necessary
|
|
||||||
if new_config.listen_addr != live_config.listen_addr
|
|
||||||
|| new_config.listen_port != live_config.listen_port
|
|
||||||
{
|
|
||||||
let mut sv = self.server.write().await;
|
|
||||||
sv.rebind(new_config.listen_addr, new_config.listen_port).await?;
|
|
||||||
}
|
|
||||||
// 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
|
|
||||||
{
|
|
||||||
config::register_hotkeys(&new_config.hotkeys)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
new_config.save(&self.pool).await?;
|
|
||||||
*live_config = new_config;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn register_request(&self, waiter: RequestWaiter) -> 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, waiter); // `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 req_count(&self) -> usize {
|
|
||||||
let waiting_requests = self.waiting_requests.read().await;
|
|
||||||
waiting_requests.len()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn current_rehide_status(&self) -> Option<bool> {
|
|
||||||
// since all requests that are pending at a given time should have the same
|
|
||||||
// value for rehide_after, it doesn't matter which one we use
|
|
||||||
let waiting_requests = self.waiting_requests.read().await;
|
|
||||||
waiting_requests.iter().next().map(|(_id, w)| w.rehide_after)
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
.get_mut(&response.id)
|
|
||||||
.ok_or(SendResponseError::NotFound)?
|
|
||||||
.notify(response.approval)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn add_ban(&self, client: Option<Client>) {
|
|
||||||
let mut bans = self.bans.write().await;
|
|
||||||
bans.insert(client.clone());
|
|
||||||
|
|
||||||
runtime::spawn(async move {
|
|
||||||
sleep(Duration::from_secs(5)).await;
|
|
||||||
let app = APP.get().unwrap();
|
|
||||||
let state = app.state::<AppState>();
|
|
||||||
let mut bans = state.bans.write().await;
|
|
||||||
bans.remove(&client);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn is_banned(&self, client: &Option<Client>) -> bool {
|
|
||||||
self.bans.read().await.contains(&client)
|
|
||||||
}
|
|
||||||
|
|
||||||
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 is_unlocked(&self) -> bool {
|
|
||||||
let session = self.session.read().await;
|
|
||||||
matches!(*session, Session::Unlocked{..})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn serialize_base_creds(&self) -> Result<String, GetCredentialsError> {
|
|
||||||
let app_session = self.session.read().await;
|
|
||||||
let (base, _session) = app_session.try_get()?;
|
|
||||||
Ok(serde_json::to_string(base).unwrap())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn serialize_session_creds(&self) -> Result<String, GetCredentialsError> {
|
|
||||||
let app_session = self.session.read().await;
|
|
||||||
let (_bsae, session) = app_session.try_get()?;
|
|
||||||
Ok(serde_json::to_string(session).unwrap())
|
|
||||||
}
|
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,82 +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 window = app.get_window("main")
|
|
||||||
.ok_or(LaunchTerminalError::NoMainWindow)?;
|
|
||||||
if !window.is_visible()? {
|
|
||||||
window.unminimize()?;
|
|
||||||
window.show()?;
|
|
||||||
}
|
|
||||||
window.set_focus()?;
|
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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.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(())
|
|
||||||
}
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
use tauri::{
|
|
||||||
AppHandle,
|
|
||||||
Manager,
|
|
||||||
SystemTray,
|
|
||||||
SystemTrayEvent,
|
|
||||||
SystemTrayMenu,
|
|
||||||
CustomMenuItem,
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
pub fn create() -> SystemTray {
|
|
||||||
let show = CustomMenuItem::new("show".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: &AppHandle, event: SystemTrayEvent) {
|
|
||||||
match event {
|
|
||||||
SystemTrayEvent::MenuItemClick{ id, .. } => {
|
|
||||||
match id.as_str() {
|
|
||||||
"exit" => app.exit(0),
|
|
||||||
"show" => {
|
|
||||||
let _ = app.get_window("main").map(|w| w.show());
|
|
||||||
}
|
|
||||||
_ => (),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => (),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,80 +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.3.1"
|
|
||||||
},
|
|
||||||
"tauri": {
|
|
||||||
"allowlist": {
|
|
||||||
"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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
<script>
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { listen } from '@tauri-apps/api/event';
|
|
||||||
import { invoke } from '@tauri-apps/api/tauri';
|
|
||||||
|
|
||||||
import { appState, acceptRequest } 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('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)
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
acceptRequest();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<svelte:component this="{$currentView}" />
|
|
||||||
@@ -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 |
@@ -0,0 +1,3 @@
|
|||||||
|
mod passphrase_input;
|
||||||
|
|
||||||
|
pub use passphrase_input::{PassphraseInput, PassphraseInputEvent};
|
||||||
@@ -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))),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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),
|
||||||
|
}
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
export function getRootCause(error) {
|
|
||||||
if (error.source) {
|
|
||||||
return getRootCause(error.source);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +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();
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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)
|
|
||||||
}
|
|
||||||
@@ -1,33 +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',
|
|
||||||
});
|
|
||||||
|
|
||||||
|
|
||||||
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 completeRequest() {
|
|
||||||
appState.update($appState => {
|
|
||||||
$appState.currentRequest = null;
|
|
||||||
return $appState;
|
|
||||||
});
|
|
||||||
currentView.set(get(previousView));
|
|
||||||
previousView.set(null);
|
|
||||||
acceptRequest();
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
import './style.css';
|
|
||||||
import App from './App.svelte';
|
|
||||||
|
|
||||||
const app = new App({
|
|
||||||
target: document.getElementById('app')
|
|
||||||
})
|
|
||||||
|
|
||||||
export default app;
|
|
||||||
@@ -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);
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -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")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
mod home;
|
||||||
|
mod unlock;
|
||||||
|
mod welcome;
|
||||||
|
|
||||||
|
pub use home::HomeScreen;
|
||||||
|
pub use unlock::UnlockScreen;
|
||||||
|
pub use welcome::WelcomeScreen;
|
||||||
@@ -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))),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
|
})),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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"),
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
@tailwind base;
|
|
||||||
@tailwind components;
|
|
||||||
@tailwind utilities;
|
|
||||||
|
|
||||||
.btn-alert-error {
|
|
||||||
@apply bg-transparent hover:bg-[#cd5a5a] border border-error-content text-error-content
|
|
||||||
}
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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} />
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
<script>
|
|
||||||
export let keys;
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="flex gap-x-[0.2em] items-center">
|
|
||||||
{#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}
|
|
||||||
</div>
|
|
||||||
@@ -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) return;
|
|
||||||
if (ctrl && !event.ctrlKey) return;
|
|
||||||
if (alt && !event.altKey) return;
|
|
||||||
if (shift && !event.shiftKey) return;
|
|
||||||
|
|
||||||
if (event.key === hotkey) {
|
|
||||||
click();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<svelte:window on:keydown={handleHotkey} />
|
|
||||||
|
|
||||||
<a href="/{target}" on:click|preventDefault="{click}" class={classes}>
|
|
||||||
<slot></slot>
|
|
||||||
</a>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -1,65 +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 modifierKeys = new Set(['Alt', 'AltGraph', 'Control', 'Fn', 'FnLock', 'Meta', 'Shift', 'Super', ]);
|
|
||||||
let listening = false;
|
|
||||||
|
|
||||||
function listen() {
|
|
||||||
// don't re-listen if we already are
|
|
||||||
if (listening) return;
|
|
||||||
|
|
||||||
listening = true;
|
|
||||||
window.addEventListener('keyup', setKeybind, {once: true});
|
|
||||||
// setTimeout avoids reacting to the click event that we are currently processing
|
|
||||||
setTimeout(() => window.addEventListener('click', cancel, {once: true}), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
function setKeybind(event) {
|
|
||||||
// separate events fire for modifier keys, even when they are combined with a regular key
|
|
||||||
if (modifierKeys.has(event.key)) return;
|
|
||||||
|
|
||||||
let keys = [];
|
|
||||||
if (event.ctrlKey) keys.push('Ctrl');
|
|
||||||
if (event.altKey) keys.push('Alt');
|
|
||||||
if (event.metaKey) keys.push('Meta');
|
|
||||||
if (event.shiftKey) keys.push('Shift');
|
|
||||||
// capitalize
|
|
||||||
keys.push(event.key);
|
|
||||||
|
|
||||||
value.keys = keys.join('+');
|
|
||||||
dispatch('update', {value});
|
|
||||||
listening = false;
|
|
||||||
window.removeEventListener('click', cancel, {once: true});
|
|
||||||
event.preventDefault();
|
|
||||||
event.stopPropagation();
|
|
||||||
}
|
|
||||||
|
|
||||||
function cancel() {
|
|
||||||
listening = false;
|
|
||||||
window.removeEventListener('keyup', setKeybind, {once: true});
|
|
||||||
}
|
|
||||||
</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>
|
|
||||||
@@ -1,81 +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;
|
|
||||||
|
|
||||||
const dispatch = createEventDispatcher();
|
|
||||||
|
|
||||||
$: localValue = value.toString();
|
|
||||||
let lastInputTime = null;
|
|
||||||
function debounce(event) {
|
|
||||||
lastInputTime = Date.now();
|
|
||||||
localValue = localValue.replace(/[^-0-9.]/g, '');
|
|
||||||
|
|
||||||
const eventTime = lastInputTime;
|
|
||||||
const pendingValue = localValue;
|
|
||||||
window.setTimeout(
|
|
||||||
() => {
|
|
||||||
// if no other inputs have occured since then
|
|
||||||
if (eventTime === lastInputTime) {
|
|
||||||
updateValue(pendingValue);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
500
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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>
|
|
||||||
@@ -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';
|
|
||||||
@@ -1,125 +0,0 @@
|
|||||||
<script>
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { invoke } from '@tauri-apps/api/tauri';
|
|
||||||
|
|
||||||
import { navigate } from '../lib/routing.js';
|
|
||||||
import { appState, completeRequest } 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() {
|
|
||||||
let {id, approval} = $appState.currentRequest;
|
|
||||||
try {
|
|
||||||
await invoke('respond', {response: {id, approval}});
|
|
||||||
navigate('ShowResponse');
|
|
||||||
}
|
|
||||||
catch (e) {
|
|
||||||
if (error) {
|
|
||||||
alert.shake();
|
|
||||||
}
|
|
||||||
error = e;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Approval has one of several outcomes depending on current credential state
|
|
||||||
async function approve() {
|
|
||||||
$appState.currentRequest.approval = 'Approved';
|
|
||||||
let status = await invoke('get_session_status');
|
|
||||||
if (status === 'unlocked') {
|
|
||||||
await respond();
|
|
||||||
}
|
|
||||||
else if (status === 'locked') {
|
|
||||||
navigate('Unlock');
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
navigate('EnterCredentials');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Denial has only one
|
|
||||||
async function deny() {
|
|
||||||
$appState.currentRequest.approval = 'Denied';
|
|
||||||
await respond();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Extract executable name from full path
|
|
||||||
let appName = null;
|
|
||||||
if ($appState.currentRequest.clients.length === 1) {
|
|
||||||
let path = $appState.currentRequest.clients[0].exe;
|
|
||||||
let m = path.match(/\/([^/]+?$)|\\([^\\]+?$)/);
|
|
||||||
appName = m[1] || m[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
// Executable paths can be long, so ensure they only break on \ or /
|
|
||||||
function breakPath(client) {
|
|
||||||
return client.exe.replace(/(\\|\/)/g, '$1<wbr>');
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the request has already been approved/denied, send response immediately
|
|
||||||
onMount(async () => {
|
|
||||||
if ($appState.currentRequest.approval) {
|
|
||||||
await respond();
|
|
||||||
}
|
|
||||||
})
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Don't render at all if we're just going to immediately proceed to the next screen -->
|
|
||||||
{#if error || !$appState.currentRequest.approval}
|
|
||||||
<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}
|
|
||||||
<svelte:fragment slot="buttons">
|
|
||||||
<button class="btn btn-sm btn-alert-error" on:click={completeRequest}>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 (long-lived) 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">
|
|
||||||
{#each $appState.currentRequest.clients as client}
|
|
||||||
<div class="text-right">Path:</div>
|
|
||||||
<code class="">{@html client ? breakPath(client) : 'Unknown'}</code>
|
|
||||||
<div class="text-right">PID:</div>
|
|
||||||
<code>{client ? client.pid : 'Unknown'}</code>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="w-full flex justify-between">
|
|
||||||
<Link target={deny} hotkey="Escape">
|
|
||||||
<button class="btn btn-error justify-self-start">
|
|
||||||
<span class="mr-2">Deny</span>
|
|
||||||
<KeyCombo keys={['Esc']} />
|
|
||||||
</button>
|
|
||||||
</Link>
|
|
||||||
|
|
||||||
<Link target={approve} hotkey="Enter" shift="{true}">
|
|
||||||
<button class="btn btn-success justify-self-end">
|
|
||||||
<span class="mr-2">Approve</span>
|
|
||||||
<KeyCombo keys={['Shift', 'Enter']} />
|
|
||||||
</button>
|
|
||||||
</Link>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
<script>
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { invoke } from '@tauri-apps/api/tauri';
|
|
||||||
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>
|
|
||||||
@@ -1,54 +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">
|
|
||||||
<input type="checkbox" class="checkbox checkbox-sm" bind:checked={launchBase}>
|
|
||||||
<span class="label-text">Launch with base credentials</span>
|
|
||||||
</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>
|
|
||||||
@@ -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';
|
|
||||||
|
|
||||||
|
|
||||||
let error = null;
|
|
||||||
async function save() {
|
|
||||||
console.log('updating config');
|
|
||||||
try {
|
|
||||||
await invoke('save_config', {config: $appState.config});
|
|
||||||
}
|
|
||||||
catch (e) {
|
|
||||||
error = e;
|
|
||||||
$appState.config = await invoke('get_config');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let osType = null;
|
|
||||||
type().then(t => osType = t);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
|
|
||||||
<Nav>
|
|
||||||
<h1 slot="title" class="text-2xl font-bold">Settings</h1>
|
|
||||||
</Nav>
|
|
||||||
|
|
||||||
{#await invoke('get_config') then config}
|
|
||||||
<div class="max-w-lg mx-auto mt-1.5 p-4 space-y-16">
|
|
||||||
<SettingsGroup name="General">
|
|
||||||
<ToggleSetting title="Start on login" bind:value={$appState.config.start_on_login} on:update={save}>
|
|
||||||
<svelte:fragment slot="description">
|
|
||||||
Start Creddy when you log in to your computer.
|
|
||||||
</svelte:fragment>
|
|
||||||
</ToggleSetting>
|
|
||||||
|
|
||||||
<ToggleSetting title="Start minimized" bind:value={$appState.config.start_minimized} on:update={save}>
|
|
||||||
<svelte:fragment slot="description">
|
|
||||||
Minimize to the system tray at startup.
|
|
||||||
</svelte:fragment>
|
|
||||||
</ToggleSetting>
|
|
||||||
|
|
||||||
<NumericSetting title="Re-hide delay" bind:value={$appState.config.rehide_ms} min={0} unit="Milliseconds" on:update={save}>
|
|
||||||
<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>
|
|
||||||
|
|
||||||
<NumericSetting
|
|
||||||
title="Listen port"
|
|
||||||
bind:value={$appState.config.listen_port}
|
|
||||||
min={osType === 'Windows_NT' ? 1 : 0}
|
|
||||||
on:update={save}
|
|
||||||
>
|
|
||||||
<svelte:fragment slot="description">
|
|
||||||
Listen for credentials requests on this port.
|
|
||||||
(Should be used with <code>$AWS_CONTAINER_CREDENTIALS_FULL_URI</code>)
|
|
||||||
</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={$appState.config.terminal.exec}
|
|
||||||
on:update={save}
|
|
||||||
>
|
|
||||||
<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" value={$appState.config.hotkeys.show_window} on:update={save} />
|
|
||||||
<Keybind description="Launch terminal" value={$appState.config.hotkeys.launch_terminal} on:update={save} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</SettingsGroup>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
{/await}
|
|
||||||
|
|
||||||
{#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>
|
|
||||||
{/if}
|
|
||||||
@@ -1,38 +0,0 @@
|
|||||||
<script>
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { draw, fade } from 'svelte/transition';
|
|
||||||
|
|
||||||
import { appState, completeRequest } 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(
|
|
||||||
completeRequest,
|
|
||||||
// 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.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.approval}!
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -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>
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
/** @type {import('tailwindcss').Config} */
|
|
||||||
module.exports = {
|
|
||||||
content: [
|
|
||||||
"./index.html",
|
|
||||||
"./src/**/*.{svelte,html}",
|
|
||||||
],
|
|
||||||
theme: {
|
|
||||||
extend: {},
|
|
||||||
},
|
|
||||||
plugins: [
|
|
||||||
require('daisyui'),
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
## Definitely
|
|
||||||
|
|
||||||
* Switch to "process" provider for AWS credentials (much less hacky)
|
|
||||||
* Session timeout (plain duration, or activity-based?)
|
|
||||||
* Fix rehide behavior when new request comes in while old one is still being resolved
|
|
||||||
* Additional hotkey configuration (approve/deny at the very least)
|
|
||||||
* Logging
|
|
||||||
* Icon
|
|
||||||
* Auto-updates
|
|
||||||
* SSH key handling
|
|
||||||
|
|
||||||
## Maybe
|
|
||||||
|
|
||||||
* Flatten error type hierarchy
|
|
||||||
* Rehide after terminal launch from locked
|
|
||||||
* Generalize Request across both credentials and terminal launch?
|
|
||||||
* 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)
|
|
||||||