Changeset 4745:1e974ec321bd in roaraudio

Timestamp:

01/31/11 15:16:14 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Better auth type oder support (Closes: #6)

Files:

• ChangeLog (modified) (1 diff)
• libroar/auth.c (modified) (5 diffs)
• roard/auth.c (modified) (3 diffs)
• roard/include/auth.h (modified) (1 diff)
• roard/req.c (modified) (2 diffs)

ChangeLog

@@ -1 +1 @@
 v. 0.4beta4 - ?
         * Added support for UNMAPPED volume control (Closes: #55)
+        * Better auth type oder support (Closes: #6)
 
 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET

libroar/auth.c

@@ -129 +129 @@
 
 static int roar_auth_ask_server (struct roar_connection * con, struct roar_auth_message * authmes) {
- struct roar_message   mes;
- char                * header = mes.data;
- int                   ret;
+ struct roar_error_frame error_frame;
+ struct roar_message     mes;
+ char                  * header = mes.data;
+ int                     ret;
 
  memset(&mes, 0, sizeof(struct roar_message)); // make valgrind happy!
@@ -143 +144 @@
  header[3] = authmes->reserved.c[1];
 
- if ( (ret = roar_req(con, &mes, NULL)) == -1 )
-  return -1;
-
- if ( mes.cmd != ROAR_CMD_OK )
-  return -1;
+ if ( (ret = roar_req(con, &mes, NULL)) == -1 ) {
+  authmes->type = -1;
+  return -1;
+ }
+
+ if ( mes.cmd != ROAR_CMD_OK ) {
+  ret = -1;
+  if ( roar_err_parsemsg(&mes, &error_frame) == -1 ) {
+   authmes->type = -1;
+   return -1;
+  }
+
+  header = error_frame.data;
+  mes.datalen = error_frame.datalen;
+ }
 
  if ( mes.datalen < 4 ) {
   memset(header+mes.datalen, 0, 4-mes.datalen);
- }
-
- authmes->type          = header[0];
+  authmes->type          = -1;
+ } else {
+  authmes->type          = header[0];
+ }
+
  authmes->stage         = header[1];
  authmes->reserved.c[0] = header[2];
  authmes->reserved.c[1] = header[3];
 
- return 0;
+ return ret;
 }
 
@@ -171 +184 @@
 
 
-static int try_password (struct roar_connection * con) {
+static int try_password (struct roar_connection * con, int * next) {
  struct roar_message mes;
  struct roar_auth_message authmes;
  char * pw;
+
+ // TODO: add support for *next.
 
  roar_auth_mes_init(&authmes, ROAR_AUTH_T_PASSWORD);
@@ -214 +229 @@
  int ret;
  int i;
+ int cur, next;
+ int done;
  int ltt[] = {
               ROAR_AUTH_T_TRUST,
@@ -224 +241 @@
 
  for (i = 0; ltt[i] != _EOL; i++) {
-  switch (ltt[i]) {
-    case ROAR_AUTH_T_PASSWORD:
-     if ( (ret = try_password(con)) == -1 )
-      continue;
+  next = ltt[i];
+  while (next != -1) {
+   done = 1;
+
+   cur  = next;
+   next = -1;
+
+   switch (cur) {
+     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:
+      roar_auth_mes_init(&authmes, ltt[i]);
+      if ( (ret = roar_auth_ask_server(con, &authmes)) == -1 )
+       done = 0;
+
+      next = authmes.type;
      break;
-    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 )
-      continue;
-    break;
-   default: /* Bad error! */
-     return -1;
-    break;
+    default: /* Bad error! */
+      return -1;
+     break;
+   }
+
+   if ( authmes.stage != 0 )
+    done = 0;
+
+   if ( done )
+    return 0;
   }
-
-  if ( authmes.stage != 0 )
-   continue;
-
-  return 0;
  }
 

roard/auth.c

@@ -115 +115 @@
 }
 
-int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes) {
+int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes, int * next) {
  struct auth_key * key;
  int i;
  int ret;
 
- if ( cs == NULL || authmes == NULL )
-  return -1;
+ if ( cs == NULL || authmes == NULL || next == NULL )
+  return -1;
+
+ *next = -1;
 
  for (i = 0; i < AUTH_KEYRING_LEN; i++) {
@@ -150 +152 @@
       /* ignore this case and continue */
      break;
-    case 0:
+    case 0: // fatal auth error (server side auth cancel)
       return 0;
      break;
@@ -163 +165 @@
   }
  }
+
+ // make a better guess:
+/*
+ if ( authmes->type == ROAR_AUTH_T_PASSWORD ) {
+  *next = -1;
+ } else {
+  *next = ROAR_AUTH_T_PASSWORD;
+ }
+*/
 
  return -1;

roard/include/auth.h

@@ -72 +72 @@
 union auth_typeunion * auth_regkey_simple(int type, enum roard_client_acclev acclev);
 
-int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes);
-
+int auth_client_ckeck(struct roar_client_server * cs, struct roar_auth_message * authmes, int * next);
 
 int auth_addkey_anonymous(enum roard_client_acclev acclev);

roard/req.c

@@ -100 +100 @@
 
 int req_on_auth        (int client, struct roar_message * mes, char ** data, uint32_t flags[2]) {
+ struct roar_error_frame   error_frame;
+ void                    * error_data;
+ struct roar_message       error_mes;
  struct roar_client_server * cs;
  struct roar_auth_message    authmes;
+ int next = -1;
  int ret;
 
@@ -114 +118 @@
                            client, roar_autht2str(authmes.type), authmes.type);
 
- ret = auth_client_ckeck(cs, &authmes);
-
- if ( ret != 1 )
-  return -1;
+ ret = auth_client_ckeck(cs, &authmes, &next);
+
+ if ( ret != 1 ) {
+  if ( next != -1 ) {
+   memset(&authmes, 0, sizeof(authmes));
+
+   authmes.type = next;
+
+   if ( roar_auth_to_mes(&error_mes, NULL, &authmes) == -1 )
+    return -1;
+
+   if ( roar_err_int(&error_frame) == -1 )
+    return -1;
+
+   error_frame.ra_errno = ROAR_ERROR_PERM;
+   error_frame.datalen  = error_mes.datalen;
+
+   error_data   = roar_err_buildmsg(mes, &error_frame);
+
+   memcpy(error_data, error_mes.data, error_mes.datalen);
+
+   mes->cmd     = ROAR_CMD_ERROR;
+   mes->pos     = g_pos;
+   return 0;
+  }
+
+  return -1;
+ }
 
  mes->cmd     = ROAR_CMD_OK;