remove PSK in RDV point

Author: Tathar

README.md

@@ -1,6 +1,6 @@
 # wg-turn
 
-wg-turn is just a [turn](https://en.wikipedia.org/wiki/Traversal_Using_Relays_around_NAT) daemon for wireguard.If you need more functionality, you can look at [cunīcu](https://cunicu.li/), [netbird](https://netbird.io/), [TailScale](https://tailscale.com/) or other 
+wg-turn is just a [turn](https://en.wikipedia.org/wiki/Traversal_Using_Relays_around_NAT) daemon for wireguard. If you need more functionality, you can look at [cunīcu](https://cunicu.li/), [netbird](https://netbird.io/), [TailScale](https://tailscale.com/) or other 
 
 wg-turn use the mainline DHT to discover the peers endpoint
 

src/dht.rs

@@ -24,7 +24,7 @@ use tokio::{sync::mpsc, sync::RwLock};
 
 pub struct DHT {
     dht4: Arc<MainlineDht>,
-    dht6: Arc<MainlineDht>, //todo: test IPv6
+    dht6: Arc<MainlineDht>,
     pub_key: Option<PublicKey>,
     tasks: RwLock<Vec<Abort<()>>>,
 }
@@ -81,16 +81,8 @@ impl DHT {
         }
     }
 
-    pub async fn register(
-        &mut self,
-        pub_key: &PublicKey,
-        psk: &PublicKey,
-    ) -> mpsc::Receiver<SocketAddr> {
-        let key_array: [u8; 64] = utils::calc_id(
-            &pub_key.array(),
-            &self.pub_key.clone().unwrap().array(),
-            &psk.array(),
-        );
+    pub async fn register(&mut self, pub_key: &PublicKey) -> mpsc::Receiver<SocketAddr> {
+        let key_array = utils::calc_id(&pub_key.array(), &self.pub_key.clone().unwrap().array());
         let id = InfoHash::sha1(&key_array);
 
         let (snd1, rcv) = mpsc::channel(1);

src/main.rs

@@ -21,10 +21,9 @@ use tokio::signal::unix::{signal, SignalKind};
 use tokio::task::JoinSet;
 use wg::WgDevice;
 
-// #[async_std::main]
 #[tokio::main]
 async fn main() {
-    println!("wg-turn v1.0.0");
+    println!("wg-turn v1.1");
     let mut tasks = JoinSet::new();
 
     let mut route = wireguard_uapi::linux::RouteSocket::connect().unwrap();

src/task.rs

@@ -29,9 +29,7 @@ pub async fn peer_task(mut peer: wg::WgPeer, dht: Arc<RwLock<dht::DHT>>) -> Resu
     let mut rx_dht: mpsc::Receiver<SocketAddr>;
 
     let mut w_dht = dht.write().await;
-    rx_dht = w_dht
-        .register(&peer.public_key(), &peer.preshared_key())
-        .await;
+    rx_dht = w_dht.register(&peer.public_key()).await;
     drop(w_dht);
 
     let rx_wg = peer.check_input();

src/utils.rs

@@ -15,7 +15,6 @@ use anyhow::anyhow;
 use anyhow::Result;
 use base64::prelude::*;
 use blake3::Hash;
-use concat_arrays::concat_arrays;
 use crypto_box::aead::{Aead, AeadCore, OsRng};
 use crypto_box::{ChaChaBox, Nonce, SecretKey};
 use rand::prelude::*;
@@ -285,21 +284,12 @@ impl fmt::Display for PublicKey {
     }
 }
 
-pub fn calc_id(pub_key1: &[u8; 32], pub_key2: &[u8; 32], psk: &[u8; 32]) -> [u8; 64] {
-    // let psk_sha: [u8; 20] = Sha1::digest(psk).into();
-    // let mut add_array = [0u8; 32];
-    // for ((add_val, l_val), r_val) in add_array.iter_mut().zip(pub_key1).zip(pub_key2) {
-    //     *add_val = u8::wrapping_add(*l_val, *r_val);
-    // }
-    // concat_arrays!(add_array, psk_sha)
-
-    let psk_hash = *blake3::hash(psk).as_bytes();
+pub fn calc_id(pub_key1: &[u8; 32], pub_key2: &[u8; 32]) -> [u8; 32] {
     let pub_key1_hash = *blake3::hash(pub_key1).as_bytes();
     let pub_key2_hash = *blake3::hash(pub_key2).as_bytes();
     let mut add_array = [0u8; 32];
     for ((add_val, l_val), r_val) in add_array.iter_mut().zip(pub_key1_hash).zip(pub_key2_hash) {
         *add_val = u8::wrapping_add(l_val, r_val);
     }
-
-    concat_arrays!(add_array, psk_hash)
+    add_array
 }

src/wg.rs

@@ -1071,10 +1071,6 @@ impl WgPeer {
         return PublicKey::new(self.wg_peer.public_key);
     }
 
-    pub fn preshared_key(&self) -> PublicKey {
-        return PublicKey::new(self.wg_peer.preshared_key);
-    }
-
     pub async fn clean(&mut self) {
         // println!("WgPeer::clean() for {} with {:?}",self.public_key(), self.inet_endpoint);
         let mut w_test = self.tests.write().await;