mirror of
https://github.com/Start9Labs/start-os.git
synced 2026-04-02 05:23:14 +00:00
* wip: static-server errors * wip: fix wifi * wip: Fix the service_effects * wip: Fix cors in the middleware * wip(chore): Auth clean up the lint. * wip(fix): Vhost * wip: continue manager refactor Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: service manager refactor * wip: Some fixes * wip(fix): Fix the lib.rs * wip * wip(fix): Logs * wip: bins * wip(innspect): Add in the inspect * wip: config * wip(fix): Diagnostic * wip(fix): Dependencies * wip: context * wip(fix) Sorta auth * wip: warnings * wip(fix): registry/admin * wip(fix) marketplace * wip(fix) Some more converted and fixed with the linter and config * wip: Working on the static server * wip(fix)static server * wip: Remove some asynnc * wip: Something about the request and regular rpc * wip: gut install Co-authored-by: J H <Blu-J@users.noreply.github.com> * wip: Convert the static server into the new system * wip delete file * test * wip(fix) vhost does not need the with safe defaults * wip: Adding in the wifi * wip: Fix the developer and the verify * wip: new install flow Co-authored-by: J H <Blu-J@users.noreply.github.com> * fix middleware * wip * wip: Fix the auth * wip * continue service refactor * feature: Service get_config * feat: Action * wip: Fighting the great fight against the borrow checker * wip: Remove an error in a file that I just need to deel with later * chore: Add in some more lifetime stuff to the services * wip: Install fix on lifetime * cleanup * wip: Deal with the borrow later * more cleanup * resolve borrowchecker errors * wip(feat): add in the handler for the socket, for now * wip(feat): Update the service_effect_handler::action * chore: Add in the changes to make sure the from_service goes to context * chore: Change the * refactor service map * fix references to service map * fill out restore * wip: Before I work on the store stuff * fix backup module * handle some warnings * feat: add in the ui components on the rust side * feature: Update the procedures * chore: Update the js side of the main and a few of the others * chore: Update the rpc listener to match the persistant container * wip: Working on updating some things to have a better name * wip(feat): Try and get the rpc to return the correct shape? * lxc wip * wip(feat): Try and get the rpc to return the correct shape? * build for container runtime wip * remove container-init * fix build * fix error * chore: Update to work I suppose * lxc wip * remove docker module and feature * download alpine squashfs automatically * overlays effect Co-authored-by: Jade <Blu-J@users.noreply.github.com> * chore: Add the overlay effect * feat: Add the mounter in the main * chore: Convert to use the mounts, still need to work with the sandbox * install fixes * fix ssl * fixes from testing * implement tmpfile for upload * wip * misc fixes * cleanup * cleanup * better progress reporting * progress for sideload * return real guid * add devmode script * fix lxc rootfs path * fix percentage bar * fix progress bar styling * fix build for unstable * tweaks * label progress * tweaks * update progress more often * make symlink in rpc_client * make socket dir * fix parent path * add start-cli to container * add echo and gitInfo commands * wip: Add the init + errors * chore: Add in the exit effect for the system * chore: Change the type to null for failure to parse * move sigterm timeout to stopping status * update order * chore: Update the return type * remove dbg * change the map error * chore: Update the thing to capture id * chore add some life changes * chore: Update the loging * chore: Update the package to run module * us From for RpcError * chore: Update to use import instead * chore: update * chore: Use require for the backup * fix a default * update the type that is wrong * chore: Update the type of the manifest * chore: Update to make null * only symlink if not exists * get rid of double result * better debug info for ErrorCollection * chore: Update effects * chore: fix * mount assets and volumes * add exec instead of spawn * fix mounting in image * fix overlay mounts Co-authored-by: Jade <Blu-J@users.noreply.github.com> * misc fixes * feat: Fix two * fix: systemForEmbassy main * chore: Fix small part of main loop * chore: Modify the bundle * merge * fixMain loop" * move tsc to makefile * chore: Update the return types of the health check * fix client * chore: Convert the todo to use tsmatches * add in the fixes for the seen and create the hack to allow demo * chore: Update to include the systemForStartOs * chore UPdate to the latest types from the expected outout * fixes * fix typo * Don't emit if failure on tsc * wip Co-authored-by: Jade <Blu-J@users.noreply.github.com> * add s9pk api * add inspection * add inspect manifest * newline after display serializable * fix squashfs in image name * edit manifest Co-authored-by: Jade <Blu-J@users.noreply.github.com> * wait for response on repl * ignore sig for now * ignore sig for now * re-enable sig verification * fix * wip * env and chroot * add profiling logs * set uid & gid in squashfs to 100000 * set uid of sqfs to 100000 * fix mksquashfs args * add env to compat * fix * re-add docker feature flag * fix docker output format being stupid * here be dragons * chore: Add in the cross compiling for something * fix npm link * extract logs from container on exit * chore: Update for testing * add log capture to drop trait * chore: add in the modifications that I make * chore: Update small things for no updates * chore: Update the types of something * chore: Make main not complain * idmapped mounts * idmapped volumes * re-enable kiosk * chore: Add in some logging for the new system * bring in start-sdk * remove avahi * chore: Update the deps * switch to musl * chore: Update the version of prettier * chore: Organize' * chore: Update some of the headers back to the standard of fetch * fix musl build * fix idmapped mounts * fix cross build * use cross compiler for correct arch * feat: Add in the faked ssl stuff for the effects * @dr_bonez Did a solution here * chore: Something that DrBonez * chore: up * wip: We have a working server!!! * wip * uninstall * wip * tes --------- Co-authored-by: J H <dragondef@gmail.com> Co-authored-by: J H <Blu-J@users.noreply.github.com> Co-authored-by: J H <2364004+Blu-J@users.noreply.github.com>
126 lines
4.4 KiB
Rust
126 lines
4.4 KiB
Rust
use ed25519_dalek::{SecretKey, EXPANDED_SECRET_KEY_LENGTH};
|
|
|
|
#[inline]
|
|
pub fn ed25519_expand_key(key: &SecretKey) -> [u8; EXPANDED_SECRET_KEY_LENGTH] {
|
|
ed25519_dalek_v1::ExpandedSecretKey::from(
|
|
&ed25519_dalek_v1::SecretKey::from_bytes(key).unwrap(),
|
|
)
|
|
.to_bytes()
|
|
}
|
|
|
|
use aes::cipher::{CipherKey, NewCipher, Nonce, StreamCipher};
|
|
use aes::Aes256Ctr;
|
|
use hmac::Hmac;
|
|
use josekit::jwk::Jwk;
|
|
use serde::{Deserialize, Serialize};
|
|
use sha2::Sha256;
|
|
use tracing::instrument;
|
|
|
|
pub fn pbkdf2(password: impl AsRef<[u8]>, salt: impl AsRef<[u8]>) -> CipherKey<Aes256Ctr> {
|
|
let mut aeskey = CipherKey::<Aes256Ctr>::default();
|
|
pbkdf2::pbkdf2::<Hmac<Sha256>>(
|
|
password.as_ref(),
|
|
salt.as_ref(),
|
|
1000,
|
|
aeskey.as_mut_slice(),
|
|
)
|
|
.unwrap();
|
|
aeskey
|
|
}
|
|
|
|
pub fn encrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec<u8> {
|
|
let prefix: [u8; 32] = rand::random();
|
|
let aeskey = pbkdf2(password.as_ref(), &prefix[16..]);
|
|
let ctr = Nonce::<Aes256Ctr>::from_slice(&prefix[..16]);
|
|
let mut aes = Aes256Ctr::new(&aeskey, ctr);
|
|
let mut res = Vec::with_capacity(32 + input.as_ref().len());
|
|
res.extend_from_slice(&prefix[..]);
|
|
res.extend_from_slice(input.as_ref());
|
|
aes.apply_keystream(&mut res[32..]);
|
|
res
|
|
}
|
|
|
|
pub fn decrypt_slice(input: impl AsRef<[u8]>, password: impl AsRef<[u8]>) -> Vec<u8> {
|
|
if input.as_ref().len() < 32 {
|
|
return Vec::new();
|
|
}
|
|
let (prefix, rest) = input.as_ref().split_at(32);
|
|
let aeskey = pbkdf2(password.as_ref(), &prefix[16..]);
|
|
let ctr = Nonce::<Aes256Ctr>::from_slice(&prefix[..16]);
|
|
let mut aes = Aes256Ctr::new(&aeskey, ctr);
|
|
let mut res = rest.to_vec();
|
|
aes.apply_keystream(&mut res);
|
|
res
|
|
}
|
|
|
|
#[derive(Debug, Clone, Deserialize, Serialize)]
|
|
pub struct EncryptedWire {
|
|
encrypted: serde_json::Value,
|
|
}
|
|
impl EncryptedWire {
|
|
#[instrument(skip_all)]
|
|
pub fn decrypt(self, current_secret: impl AsRef<Jwk>) -> Option<String> {
|
|
let current_secret = current_secret.as_ref();
|
|
|
|
let decrypter = match josekit::jwe::alg::ecdh_es::EcdhEsJweAlgorithm::EcdhEs
|
|
.decrypter_from_jwk(current_secret)
|
|
{
|
|
Ok(a) => a,
|
|
Err(e) => {
|
|
tracing::warn!("Could not setup awk");
|
|
tracing::debug!("{:?}", e);
|
|
return None;
|
|
}
|
|
};
|
|
let encrypted = match serde_json::to_string(&self.encrypted) {
|
|
Ok(a) => a,
|
|
Err(e) => {
|
|
tracing::warn!("Could not deserialize");
|
|
tracing::debug!("{:?}", e);
|
|
|
|
return None;
|
|
}
|
|
};
|
|
let (decoded, _) = match josekit::jwe::deserialize_json(&encrypted, &decrypter) {
|
|
Ok(a) => a,
|
|
Err(e) => {
|
|
tracing::warn!("Could not decrypt");
|
|
tracing::debug!("{:?}", e);
|
|
return None;
|
|
}
|
|
};
|
|
match String::from_utf8(decoded) {
|
|
Ok(a) => Some(a),
|
|
Err(e) => {
|
|
tracing::warn!("Could not decrypt into utf8");
|
|
tracing::debug!("{:?}", e);
|
|
return None;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// We created this test by first making the private key, then restoring from this private key for recreatability.
|
|
/// After this the frontend then encoded an password, then we are testing that the output that we got (hand coded)
|
|
/// will be the shape we want.
|
|
#[test]
|
|
fn test_gen_awk() {
|
|
let private_key: Jwk = serde_json::from_str(
|
|
r#"{
|
|
"kty": "EC",
|
|
"crv": "P-256",
|
|
"d": "3P-MxbUJtEhdGGpBCRFXkUneGgdyz_DGZWfIAGSCHOU",
|
|
"x": "yHTDYSfjU809fkSv9MmN4wuojf5c3cnD7ZDN13n-jz4",
|
|
"y": "8Mpkn744A5KDag0DmX2YivB63srjbugYZzWc3JOpQXI"
|
|
}"#,
|
|
)
|
|
.unwrap();
|
|
let encrypted: EncryptedWire = serde_json::from_str(r#"{
|
|
"encrypted": { "protected": "eyJlbmMiOiJBMTI4Q0JDLUhTMjU2IiwiYWxnIjoiRUNESC1FUyIsImtpZCI6ImgtZnNXUVh2Tm95dmJEazM5dUNsQ0NUdWc5N3MyZnJockJnWUVBUWVtclUiLCJlcGsiOnsia3R5IjoiRUMiLCJjcnYiOiJQLTI1NiIsIngiOiJmRkF0LXNWYWU2aGNkdWZJeUlmVVdUd3ZvWExaTkdKRHZIWVhIckxwOXNNIiwieSI6IjFvVFN6b00teHlFZC1SLUlBaUFHdXgzS1dJZmNYZHRMQ0JHLUh6MVkzY2sifX0", "iv": "NbwvfvWOdLpZfYRIZUrkcw", "ciphertext": "Zc5Br5kYOlhPkIjQKOLMJw", "tag": "EPoch52lDuCsbUUulzZGfg" }
|
|
}"#).unwrap();
|
|
assert_eq!(
|
|
"testing12345",
|
|
&encrypted.decrypt(std::sync::Arc::new(private_key)).unwrap()
|
|
);
|
|
}
|