Merge pull request #3 from mat-1/auth

Auth

2 files changed, 20 insertions, 1 deletions

diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml
index 7e22f727..5769f289 100755
--- a/azalea-client/Cargo.toml
+++ b/azalea-client/Cargo.toml
@@ -6,4 +6,5 @@ version = "0.1.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+azalea-auth = {path = "../azalea-auth"}
 azalea-protocol = {path = "../azalea-protocol"}
diff --git a/azalea-client/src/connect.rs b/azalea-client/src/connect.rs
index 6e58bee6..44eff33f 100755
--- a/azalea-client/src/connect.rs
+++ b/azalea-client/src/connect.rs
@@ -4,7 +4,10 @@ use azalea_protocol::{
     packets::{
         game::GamePacket,
         handshake::client_intention_packet::ClientIntentionPacket,
-        login::{serverbound_hello_packet::ServerboundHelloPacket, LoginPacket},
+        login::{
+            serverbound_hello_packet::ServerboundHelloPacket,
+            serverbound_key_packet::ServerboundKeyPacket, LoginPacket,
+        },
         ConnectionProtocol, PROTOCOL_VERSION,
     },
     resolver, ServerAddress,
@@ -39,6 +42,20 @@ pub async fn join_server(address: &ServerAddress) -> Result<(), String> {
             Ok(packet) => match packet {
                 LoginPacket::ClientboundHelloPacket(p) => {
                     println!("Got encryption request {:?} {:?}", p.nonce, p.public_key);
+                    let e = azalea_auth::encryption::encrypt(&p.public_key, &p.nonce).unwrap();
+
+                    // TODO: authenticate with the server here (authenticateServer)
+                    println!("Sending encryption response {:?}", e);
+
+                    conn.write(
+                        ServerboundKeyPacket {
+                            nonce: e.encrypted_nonce.into(),
+                            shared_secret: e.encrypted_public_key.into(),
+                        }
+                        .get(),
+                    )
+                    .await;
+                    conn.set_encryption_key(e.secret_key);
                 }
                 LoginPacket::ClientboundLoginCompressionPacket(p) => {
                     println!("Got compression request {:?}", p.compression_threshold);
@@ -57,6 +74,7 @@ pub async fn join_server(address: &ServerAddress) -> Result<(), String> {
                 LoginPacket::ClientboundCustomQueryPacket(p) => {
                     println!("Got custom query {:?}", p);
                 }
+                LoginPacket::ServerboundKeyPacket(_) => todo!(),
             },
             Err(e) => {
                 panic!("Error: {:?}", e);