Changeset 4788:482fc1a96c7a in roaraudio for libroar

Timestamp:

03/11/11 04:10:22 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added simple authfile support to roard (pr1)

File:

• libroar/auth.c (modified) (6 diffs)

libroar/auth.c

@@ -137 +137 @@
 
  mes.cmd     = ROAR_CMD_AUTH;
- mes.datalen = 4;
+ mes.datalen = 4 + authmes->len;
+
+ if ( mes.datalen > sizeof(mes.data) )
+  return -1;
 
  header[0] = authmes->type;
@@ -143 +146 @@
  header[2] = authmes->reserved.c[0];
  header[3] = authmes->reserved.c[1];
+
+ if ( authmes->len ) {
+  memcpy(mes.data + 4, authmes->data, authmes->len);
+ }
 
  if ( (ret = roar_req(con, &mes, NULL)) == -1 ) {
@@ -222 +229 @@
 
  return -1;
+}
+
+static int try_cookie (struct roar_connection * con, int * next) {
+ struct roar_libroar_config * config = roar_libroar_get_config();
+ struct roar_auth_message authmes;
+ struct roar_authfile * authfile;
+ struct roar_authfile_key * key;
+ int idx;
+ int done = 0;
+
+ roar_auth_mes_init(&authmes, ROAR_AUTH_T_COOKIE);
+
+ if ( (authfile = roar_authfile_open(ROAR_AUTHFILE_TYPE_AUTO, config->authfile, 0, ROAR_AUTHFILE_VERSION_AUTO)) == NULL )
+  return -1;
+
+ for (idx = 0; !done; idx++) {
+  if ( (key = roar_authfile_lookup_key(authfile, ROAR_AUTH_T_COOKIE, idx, NULL)) == NULL )
+   break;
+
+  authmes.data = key->data;
+  authmes.len  = key->len;
+
+  if ( roar_auth_ask_server(con, &authmes) != -1 )
+   done = 1;
+
+  roar_authfile_key_unref(key);
+ }
+
+ roar_authfile_close(authfile);
+
+ return done ? 0 : -1;
 }
 
@@ -236 +274 @@
               ROAR_AUTH_T_RHOST,
 //              ROAR_AUTH_T_PASSWORD,
+              ROAR_AUTH_T_COOKIE,
               ROAR_AUTH_T_NONE,
               _EOL
@@ -249 +288 @@
 
    switch (cur) {
-     case ROAR_AUTH_T_PASSWORD:
+    case ROAR_AUTH_T_PASSWORD:
       if ( (ret = try_password(con, &next)) == -1 )
        done = 0;
       break;
-     case ROAR_AUTH_T_TRUST:
-     case ROAR_AUTH_T_IDENT:
-     case ROAR_AUTH_T_RHOST:
-     case ROAR_AUTH_T_NONE:
+    case ROAR_AUTH_T_TRUST:
+    case ROAR_AUTH_T_IDENT:
+    case ROAR_AUTH_T_RHOST:
+    case ROAR_AUTH_T_NONE:
       roar_auth_mes_init(&authmes, ltt[i]);
       if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
@@ -262 +301 @@
 
       next = authmes.type;
+     break;
+    case ROAR_AUTH_T_COOKIE:
+      if ( (ret = try_cookie(con, &next)) == -1 )
+       done = 0;
+      break;
      break;
     default: /* Bad error! */