Working on server side

diff --git a/client-cli/client-cli b/client-cli/client-cli
index f2552d029036fb66a90fd960b5d4da44e12e3640..07388ad0ecf78951996783ec5e1e644210420e74 100755 (executable)
Binary files a/client-cli/client-cli and b/client-cli/client-cli differ

diff --git a/client-cli/command.odin b/client-cli/command.odin
index 5e6aa75afc51e58d1425eccdb7cbe420043a5755..71ed5eebf7c632ededb623969194361b522dfe09 100644 (file)
--- a/client-cli/command.odin
+++ b/client-cli/command.odin
@@ -1,5 +1,6 @@
 package main
 
+import "core:encoding/base64"
 import "core:log"
 import "core:math/rand"
 import "core:os"
@@ -82,20 +83,25 @@ handle_command :: proc(app: ^App, command: string) -> Maybe(Handle_Command_Error
                 return .Invalid_Arguments
             }
 
-            room, ok := room_init(room_details[0], room_details[1])
+            room, ok := room_init_with_key_string(room_details[0], room_details[1])
 
             if !ok {
                 app_set_info_bar(app, "Invalid room.")
                 return .Invalid_Arguments
             }
 
-            ok = app_add_room(app, room)
+            if app_room_key_exists(app, room.key) {
+                app_set_info_bar(app, "A room with this key already exists, are you sure you want to create another one? (yes/no)")
 
-            if !ok {
-                app_set_info_bar(app, "A room with this name already exists.")
-                return .Command_Failed
+                answer := app_get_input(app, allocator = context.temp_allocator)
+
+                if answer != "yes" {
+                    app_set_info_bar(app, "Opperation cancelled.")
+                    return nil
+                }
             }
 
+            app_add_room(app, room)
             app_set_info_bar(app, "Room added.")
 
             return nil
@@ -111,39 +117,49 @@ handle_command :: proc(app: ^App, command: string) -> Maybe(Handle_Command_Error
             key: [ROOM_KEY_SIZE]u8
             _ = rand.read(key[:])
 
-            room, ok := room_init(room_name, string(key[:]))
+            room, ok := room_init(room_name, key)
 
             if !ok {
                 app_set_info_bar(app, "Invalid name.")
                 return .Invalid_Arguments
             }
 
-            ok = app_add_room(app, room)
+            app_add_room(app, room)
+            app_set_info_bar(app, "Room generated.")
 
-            if !ok {
-                app_set_info_bar(app, "A room with this name already exists.")
-                return .Command_Failed
+            return nil
+
+        case ":k",   ":key":
+            selected_room := &app.profile.rooms[app.selected_room]
+
+            key_string_buffer: [44]u8
+            key_string_builder := strings.builder_from_bytes(key_string_buffer[:])
+            key_string_stream := strings.to_stream(&key_string_builder)
+
+            err := base64.encode_into(key_string_stream, selected_room.key[:])
+
+            if err != nil {
+                app_set_info_bar(app, "Failed to encode key")
+                return nil
             }
 
-            app_set_info_bar(app, "Room generated.")
+            key_string := strings.to_string(key_string_builder)
+
+            app_set_info_bar(app, "%v", key_string)
 
             return nil
 
         case ":rm",  ":remove":
-            if len(args) == 0 {
-                app_set_info_bar(app, "No room name provided.")
-                return .Invalid_Arguments
-            }
-
-            room_name := args[0]
+            app_set_info_bar(app, "Are you sure you want to remove this room? (yes/no)")
 
-            ok := app_remove_room(app, room_name)
+            answer := app_get_input(app, allocator = context.temp_allocator)
 
-            if !ok {
-                app_set_info_bar(app, "No room with that name.")
-                return .Command_Failed
+            if answer != "yes" {
+                app_set_info_bar(app, "Opperation cancelled.")
+                return nil
             }
 
+            app_remove_room(app, app.selected_room)
             app_set_info_bar(app, "Room removed.")
 
             return nil

diff --git a/client-cli/main.odin b/client-cli/main.odin
index c4f70c74aa6647755a08ee0766eb18d4f530d5fa..0ec2f98c13a98f38bf64aed6ea38f9f97349ddb7 100644 (file)
--- a/client-cli/main.odin
+++ b/client-cli/main.odin
@@ -593,43 +593,29 @@ app_reset_seed_phrase :: proc(app: ^App) {
     app.seed_phrase_checksum = entropy_hash[0] & 0b1111
 }
 
-app_get_room_index :: proc(app: ^App, name: string) -> Maybe(int) {
-    for &room, i in app.profile.rooms {
-        if room_get_name(&room) != name {
-            continue
-        }
+app_room_key_exists :: proc(app: ^App, key: [ROOM_KEY_SIZE]u8) -> bool {
+    key := key
 
-        return i
+    for &room in app.profile.rooms {
+        if slice.equal(room.key[:], key[:]) {
+            return true
+        }
     }
 
-    return nil
+    return false
 }
 
-app_add_room :: proc(app: ^App, room: Room) -> bool {
+app_add_room :: proc(app: ^App, room: Room) {
     room := room
 
-    for &profile_room in app.profile.rooms {
-        if room_get_name(&profile_room) == room_get_name(&room) {
-            return false
-        }
-    }
-
     append(&app.profile.rooms, room)
 
     profile_update(app.profile, app)
     app_update_room_list_window(app)
-
-    return true
 }
 
-app_remove_room :: proc(app: ^App, name: string) -> bool {
-    room_index, ok := app_get_room_index(app, name).?
-
-    if !ok {
-        return false
-    }
-
-    ordered_remove(&app.profile.rooms, room_index)
+app_remove_room :: proc(app: ^App, index: int) {
+    ordered_remove(&app.profile.rooms, index)
     profile_update(app.profile, app)
 
     if app.selected_room >= len(app.profile.rooms) {
@@ -637,8 +623,6 @@ app_remove_room :: proc(app: ^App, name: string) -> bool {
     }
 
     app_update_room_list_window(app)
-
-    return true
 }
 
 handle_state :: proc(app: ^App) {

diff --git a/client-cli/profile.odin b/client-cli/profile.odin
index 68f5c69c316a01ddcf0261befc7e5163a83e23f8..11a169784915a8b0f522e060f8f3b5a30ddf1d41 100644 (file)
--- a/client-cli/profile.odin
+++ b/client-cli/profile.odin
@@ -1,8 +1,10 @@
 package main
 
+import "core:bytes"
 import "core:container/small_array"
 import "core:crypto/ed25519"
 import "core:crypto/sha3"
+import "core:encoding/base64"
 import "core:encoding/json"
 import "core:log"
 import "core:math/rand"
@@ -27,29 +29,44 @@ Room :: struct {
     key: [ROOM_KEY_SIZE]u8,
 }
 
-room_init :: proc(name: string, key: string) -> (Room, bool) {
+room_init :: proc(name: string, key: [ROOM_KEY_SIZE]u8) -> (Room, bool) {
     _, name_len, _ := utf8.grapheme_count(name)
 
-    if name_len > ROOM_NAME_MAX_LEN || len(key) != ROOM_KEY_SIZE {
+    if name_len > ROOM_NAME_MAX_LEN {
         return {}, false
     }
 
     name_bytes := transmute([]u8)name
-    key_bytes := transmute([]u8)key
 
     room_name: Room_Name
     small_array.append_elems(&room_name, ..name_bytes)
 
-    room_key: [ROOM_KEY_SIZE]u8
-    mem.copy_non_overlapping(raw_data(room_key[:]), raw_data(key_bytes), ROOM_KEY_SIZE)
-
     return {
         name = room_name,
-        key = room_key,
+        key = key,
     },
         true
 }
 
+room_init_with_key_string :: proc(name: string, key_string: string) -> (Room, bool) {
+    if len(key_string) != 44 {
+        return {}, false
+    }
+
+    key_bytes: [ROOM_KEY_SIZE]u8
+
+    key_bytes_buffer := bytes.Buffer{ buf = mem.buffer_from_slice(key_bytes[:]) }
+    key_bytes_stream := bytes.buffer_to_stream(&key_bytes_buffer)
+
+    err := base64.decode_into(key_bytes_stream, key_string)
+
+    if err != nil {
+        return {}, false
+    }
+
+    return room_init(name, key_bytes)
+}
+
 room_get_name :: proc(room: ^Room) -> string {
     bytes := small_array.slice(&room.name)
     return string(bytes)
@@ -274,13 +291,8 @@ profile_set_private_key_from_seed_phrase :: proc(profile: ^Profile, app: ^App, s
     private_key_bytes: [sha3.DIGEST_SIZE_256]u8
     sha3.final(&sha_context, private_key_bytes[:])
 
-    {
-        sync.mutex_lock(&app.mutex)
-        defer sync.mutex_unlock(&app.mutex)
-
-        if !ed25519.private_key_set_bytes(&profile.private_key, private_key_bytes[:]) {
-            log.errorf("Failed to set private key bytes.")
-        }
+    if !ed25519.private_key_set_bytes(&profile.private_key, private_key_bytes[:]) {
+        log.errorf("Failed to set private key bytes.")
     }
 
     return nil