feat(IPC) - Parse credentials

Author: protocolstardust

core/ipc.c

@@ -229,7 +229,8 @@ i64_t ipc_open(poll_p poll, sock_addr_t *addr, i64_t timeout) {
     selector_p selector;
     struct poll_registry_t registry = ZERO_INIT_STRUCT;
     ipc_ctx_p ctx;
-    u8_t buf[2] = {RAYFORCE_VERSION, 0x00};
+    u8_t handshake[258]; // max creds (255) + null + version
+    i64_t handshake_len;
 
     LOG_DEBUG("Opening connection to %s:%lld", addr->ip, addr->port);
 
@@ -239,10 +240,25 @@ i64_t ipc_open(poll_p poll, sock_addr_t *addr, i64_t timeout) {
     if (fd == -1)
         return -1;
 
-    if (sock_send(fd, buf, 2) == -1)
+    // Build handshake: [version][creds\0] or [version\0] if no creds
+    // Server reads until \0, then responds with version
+    if (addr->creds_len > 0) {
+        handshake[0] = RAYFORCE_VERSION;
+        memcpy(&handshake[1], addr->creds, addr->creds_len);
+        handshake[1 + addr->creds_len] = '\0';
+        handshake_len = 2 + addr->creds_len;
+        LOG_DEBUG("Sending handshake with credentials (len=%lld)", addr->creds_len);
+    } else {
+        handshake[0] = RAYFORCE_VERSION;
+        handshake[1] = '\0';
+        handshake_len = 2;
+        LOG_DEBUG("Sending handshake without credentials");
+    }
+
+    if (sock_send(fd, handshake, handshake_len) == -1)
         return -1;
 
-    if (sock_recv(fd, buf, 1) == -1)
+    if (sock_recv(fd, handshake, 1) == -1)
         return -1;
 
     LOG_TRACE("Setting socket to non-blocking mode");

core/sock.c

@@ -41,14 +41,18 @@
 #include "ops.h"
 
 i64_t sock_addr_from_str(str_p str, i64_t len, sock_addr_t *addr) {
-    i64_t r;
-    str_p tok;
+    i64_t r, port_len;
+    str_p tok, port_end;
 
     // Check for NULL pointers
     if (str == NULL || addr == NULL)
         return -1;
 
-    // Get host part
+    // Initialize creds to empty
+    addr->creds[0] = '\0';
+    addr->creds_len = 0;
+
+    // Get host part (first colon)
     tok = (str_p)memchr(str, ':', len);
     if (tok == NULL)
         return -1;
@@ -60,13 +64,35 @@ i64_t sock_addr_from_str(str_p str, i64_t len, sock_addr_t *addr) {
     addr->ip[tok - str] = '\0';
     tok++;
 
-    // Get port part
+    // Calculate remaining length after host:
     len -= tok - str;
-    r = i64_from_str(tok, len, &addr->port);
 
-    if (r != len)
+    // Find next colon (if any) to separate port from credentials
+    port_end = (str_p)memchr(tok, ':', len);
+    if (port_end != NULL) {
+        // Format: host:port:creds
+        port_len = port_end - tok;
+    } else {
+        // Format: host:port (no creds)
+        port_len = len;
+    }
+
+    // Parse port
+    r = i64_from_str(tok, port_len, &addr->port);
+    if (r != port_len)
         return -1;
 
+    // Extract credentials if present
+    if (port_end != NULL) {
+        port_end++; // skip the colon
+        i64_t creds_len = len - port_len - 1;
+        if (creds_len > 0 && creds_len < ISIZEOF(addr->creds)) {
+            memcpy(addr->creds, port_end, creds_len);
+            addr->creds[creds_len] = '\0';
+            addr->creds_len = creds_len;
+        }
+    }
+
     return 0;
 }
 

core/sock.h

@@ -27,8 +27,10 @@
 #include "rayforce.h"
 
 typedef struct sock_addr_t {
-    c8_t ip[256];  // For IPv4 addresses or hostnames
+    c8_t ip[256];    // For IPv4 addresses or hostnames
     i64_t port;
+    c8_t creds[256]; // Credentials (user:pass or token)
+    i64_t creds_len;
 } sock_addr_t;
 
 i64_t sock_addr_from_str(str_p str, i64_t len, sock_addr_t *addr);