Merge branch 'friendsfix' into 'v0'

Friendsfix

See merge request spfn/rust-nex!6

rnex-core/src/executables/friends_backend.rs

@@ -56,9 +56,11 @@ pub async fn start_friends_backend() {
                 })
             });
         } else {
-            Arc::new_cyclic(move |this| FriendsGuest {
-                fm,
-                addr: c.prudpsock_addr,
+            new_rmc_gateway_connection(stream.into(), move |r| {
+                Arc::new_cyclic(move |this| FriendsGuest {
+                    fm,
+                    addr: c.prudpsock_addr,
+                })
             });
         }
     }

rnex-core/src/grpc/account.rs

@@ -103,6 +103,42 @@ impl Client {
         Ok(val.as_bytes().try_into().map_err(|_| SomethingHappened)?)
     }
 
+    pub async fn get_pid_from_token(&mut self, token: String) -> Result<PID> {
+        let req = self
+            .do_request(object! {
+                "query":
+                r"query($token: String!){
+                    token(tokenData: $token){
+                        pid
+                    }
+                }",
+                "variables": {
+                    "token": token
+                }
+            })
+            .await?;
+        // this breaks switch nex servers and should be fixed eventually
+        let Some(val) = req
+            .entries()
+            .find(|v| v.0 == "data")
+            .ok_or(SomethingHappened)?
+            .1
+            .entries()
+            .find(|v| v.0 == "token")
+            .ok_or(SomethingHappened)?
+            .1
+            .entries()
+            .find(|v| v.0 == "pid")
+            .ok_or(SomethingHappened)?
+            .1
+            .as_u32()
+        else {
+            return Err(SomethingHappened);
+        };
+
+        Ok(val)
+    }
+
     /*pub async fn get_user_data(&mut self , pid: u32) -> Result<GetUserDataResponse>{
         let req = Request::new(GetUserDataRequest{
             pid

rnex-core/src/nex/friends_handler.rs

@@ -1,7 +1,13 @@
+use std::io::{Cursor, Write};
 use std::sync::{Arc, atomic::AtomicU32};
 
+use bytemuck::bytes_of;
+use hmac::Mac;
 use log::info;
 use macros::rmc_struct;
+use rnex_core::rmc::protocols::account_management::{
+    AccountManagement, RawAccountManagement, RawAccountManagementInfo, RemoteAccountManagement,
+};
 use rnex_core::rmc::protocols::friends::{Friends, RawFriends, RawFriendsInfo, RemoteFriends};
 use rnex_core::rmc::protocols::secure::{RawSecure, RawSecureInfo, RemoteSecure, Secure};
 use rnex_core::{
@@ -24,6 +30,9 @@ use rnex_core::rmc::protocols::friends::{GameKey, MiiV2, PrincipalBasicInfo};
 
 use rnex_core::PID;
 
+use crate::rmc::protocols::account_management::NintendoCreateAccountData;
+use rnex_core::rmc::structures::RmcSerialize;
+
 define_rmc_proto!(
     proto FriendsUser{
         Secure,
@@ -32,7 +41,8 @@ define_rmc_proto!(
 );
 define_rmc_proto!(
     proto FriendsGuest{
-        Secure
+        Secure,
+        AccountManagement
     }
 );
 #[rmc_struct(FriendsUser)]
@@ -143,8 +153,14 @@ impl Friends for FriendsUser {
             false,
         ))
     }
+
+    async fn check_setting_status(&self) -> Result<u8, ErrorCode> {
+        Ok(0xFF)
+    }
 }
 
+type HMacMd5 = hmac::Hmac<md5::Md5>;
+
 impl Secure for FriendsUser {
     async fn register(
         &self,
@@ -194,3 +210,39 @@ impl Secure for FriendsGuest {
         Err(ErrorCode::Core_NotImplemented)
     }
 }
+
+impl AccountManagement for FriendsGuest {
+    async fn nintendo_create_account(
+        &self,
+        principal_name: String,
+        key: String,
+        groups: u32,
+        email: String,
+        auth_data: Any,
+    ) -> Result<(PID, String), ErrorCode> {
+        println!("{}, {}, {}, {}", principal_name, key, groups, email);
+        if auth_data.name == "NintendoCreateAccountData" {
+            let Ok(data) =
+                NintendoCreateAccountData::deserialize(&mut Cursor::new(&auth_data.data))
+            else {
+                return Err(ErrorCode::Authentication_InvalidParam);
+            };
+
+            let pid = data.nna_info.principal_basic_info.pid;
+            info!("create account: {}", pid);
+
+            let Ok(mut mac) = HMacMd5::new_from_slice(key.as_bytes()) else {
+                return Err(ErrorCode::Authentication_InvalidParam);
+            };
+
+            mac.write_all(bytes_of(&pid))
+                .expect("failed to write to hmac???");
+            let mac = mac.finalize().into_bytes();
+
+            let hex_str = hex::encode(mac);
+
+            return Ok((pid, hex_str));
+        }
+        Err(ErrorCode::Core_NotImplemented)
+    }
+}

rnex-core/src/rmc/protocols/account_management.rs

@@ -1,4 +1,30 @@
-use macros::rmc_proto;
+use macros::{RmcSerialize, method_id, rmc_proto};
+
+use rnex_core::{
+    PID,
+    rmc::{response::ErrorCode, structures::any::Any},
+};
+
+use crate::{kerberos::KerberosDateTime, rmc::protocols::friends::NNAInfo};
+
+#[derive(RmcSerialize, Debug, Clone)]
+#[rmc_struct(0)]
+pub struct NintendoCreateAccountData {
+    pub nna_info: NNAInfo,
+    pub nex_token: String,
+    pub birthday: KerberosDateTime,
+    pub unk: u64,
+}
 
 #[rmc_proto(25)]
-pub trait AccountManagement {}
+pub trait AccountManagement {
+    #[method_id(27)]
+    async fn nintendo_create_account(
+        &self,
+        principal_name: String,
+        key: String,
+        groups: u32,
+        email: String,
+        auth_data: Any,
+    ) -> Result<(PID, String), ErrorCode>;
+}

rnex-core/src/rmc/protocols/friends.rs

@@ -2,7 +2,7 @@ use macros::{RmcSerialize, method_id, rmc_proto};
 
 use rnex_core::{kerberos::KerberosDateTime, rmc::response::ErrorCode};
 
-#[derive(RmcSerialize)]
+#[derive(RmcSerialize, Debug, Clone)]
 #[rmc_struct(0)]
 pub struct MiiV2 {
     pub name: String,
@@ -12,7 +12,7 @@ pub struct MiiV2 {
     pub date_time: KerberosDateTime,
 }
 
-#[derive(RmcSerialize)]
+#[derive(RmcSerialize, Debug, Clone)]
 #[rmc_struct(0)]
 pub struct PrincipalBasicInfo {
     pub pid: u32,
@@ -21,7 +21,7 @@ pub struct PrincipalBasicInfo {
     pub unk: u8,
 }
 
-#[derive(RmcSerialize)]
+#[derive(RmcSerialize, Debug, Clone)]
 #[rmc_struct(0)]
 pub struct NNAInfo {
     pub principal_basic_info: PrincipalBasicInfo,
@@ -143,4 +143,6 @@ pub trait Friends {
         ),
         ErrorCode,
     >;
+    #[method_id(19)]
+    async fn check_setting_status(&self) -> Result<u8, ErrorCode>;
 }