Merge pull request #83 from Shopify/fix_trust

Lisa Ugray · web-flow · commit e23e5ba53ff0 · 2021-09-02T14:35:38.000-04:00
Fix trust
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "shadowenv"
-version = "2.0.4"
+version = "2.0.5"
 authors = ["Burke Libbey <burke@libbey.me>", "Lisa Ugray <lisa.ugray@shopify.com>", "Aaron Olson <aaron.olson@shopify.com>"]
 edition = "2018"
 
diff --git a/default.nix b/default.nix
@@ -7,7 +7,7 @@ rustPlatform.buildRustPackage rec {
     (lib.findFirst (line: lib.hasPrefix ''version = "'' line) ''version = ""''
       (lib.splitString "\n" (builtins.readFile (./. + "/Cargo.toml")))));
   src = builtins.fetchGit { url = "file://${builtins.toString ./.}"; };
-  cargoSha256 = "09lyyvcn2x5f386sipimrdkhd2vgysfmh44r2vb3hrbwnscnibsz";
+  cargoSha256 = "1ksrqyb88z0sav0hg2asly5my7zgqvjla22a47wb0sppj9f0z70b";
   nativeBuildInputs = [ installShellFiles ];
   buildInputs =
     lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
diff --git a/src/trust.rs b/src/trust.rs
@@ -52,7 +52,7 @@ pub fn is_dir_trusted(dir: &PathBuf) -> Result<bool, Error> {
 }
 
 fn load_or_generate_signer() -> Result<Keypair, Error> {
-    let path = format!("{}/.config/shadowenv/trust-key", std::env::var("HOME")?);
+    let path = format!("{}/.config/shadowenv/trust-key-v2", std::env::var("HOME")?);
 
     let r_o_bytes: Result<Option<Vec<u8>>, Error> = match fs::read(Path::new(&path)) {
         Ok(bytes) => Ok(Some(bytes)),

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ pub fn is_dir_trusted(dir: &PathBuf) -> Result<bool, Error> {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`fn load_or_generate_signer() -> Result<Keypair, Error> {`
`55`		`- let path = format!("{}/.config/shadowenv/trust-key", std::env::var("HOME")?);`
	`55`	`+ let path = format!("{}/.config/shadowenv/trust-key-v2", std::env::var("HOME")?);`
`56`	`56`
`57`	`57`	`let r_o_bytes: Result<Option<Vec<u8>>, Error> = match fs::read(Path::new(&path)) {`
`58`	`58`	`Ok(bytes) => Ok(Some(bytes)),`