Changeset 4467:74702c84db56 in roaraudio

Timestamp:

10/10/10 17:18:48 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

implement acclevs like rpld does, check them on command proc however still need to set them correctly.

Location:

roard

Files:

• clients.c (modified) (1 diff)
• commands.c (modified) (2 diffs)
• include/client.h (modified) (2 diffs)
• include/commands.h (modified) (1 diff)

roard/clients.c

@@ -86 +86 @@
     ns->blockc   = 0;
     ns->waits    = NULL;
+    ns->acclev   = ACCLEV_ALL;
 
     g_clients[i] = ns;

roard/commands.c

@@ -33 +33 @@
 
 struct roar_command g_commands[COMMAND_MAX_COMMANDS] = {
-  {ROAR_CMD_NOOP,         _NAME("NOOP"),         req_on_noop},
-  {ROAR_CMD_IDENTIFY,     _NAME("IDENTIFY"),     req_on_identify},
-  {ROAR_CMD_AUTH,         _NAME("AUTH"),         req_on_auth},
-  {ROAR_CMD_WHOAMI,       _NAME("WHOAMI"),       req_on_whoami},
+  {ROAR_CMD_NOOP,         _NAME("NOOP"),         req_on_noop,         ACCLEV_NONE},
+  {ROAR_CMD_IDENTIFY,     _NAME("IDENTIFY"),     req_on_identify,     ACCLEV_NONE},
+  {ROAR_CMD_AUTH,         _NAME("AUTH"),         req_on_auth,         ACCLEV_IDENTED},
+  {ROAR_CMD_WHOAMI,       _NAME("WHOAMI"),       req_on_whoami,       ACCLEV_NONE},
 
 
-  {ROAR_CMD_NEW_STREAM,   _NAME("NEW_STREAM"),   req_on_new_stream},
+  {ROAR_CMD_NEW_STREAM,   _NAME("NEW_STREAM"),   req_on_new_stream,   ACCLEV_USER},
 
 #ifdef ROAR_SUPPORT_META
-  {ROAR_CMD_SET_META,     _NAME("SET_META"),     req_on_set_meta},
-  {ROAR_CMD_GET_META,     _NAME("GET_META"),     req_on_get_meta},
-  {ROAR_CMD_LIST_META,    _NAME("LIST_META"),    req_on_list_meta},
+  {ROAR_CMD_SET_META,     _NAME("SET_META"),     req_on_set_meta,     ACCLEV_PWRUSER},
+  {ROAR_CMD_GET_META,     _NAME("GET_META"),     req_on_get_meta,     ACCLEV_GUEST},
+  {ROAR_CMD_LIST_META,    _NAME("LIST_META"),    req_on_list_meta,    ACCLEV_GUEST},
 #endif
 
-  {ROAR_CMD_EXEC_STREAM,  _NAME("EXEC_STREAM"),  req_on_exec_stream},
-  {ROAR_CMD_QUIT,         _NAME("QUIT"),         (int(*)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]))clients_delete},
+  {ROAR_CMD_EXEC_STREAM,  _NAME("EXEC_STREAM"),  req_on_exec_stream,  ACCLEV_PWRUSER},
+  {ROAR_CMD_QUIT,         _NAME("QUIT"),         (int(*)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]))clients_delete, ACCLEV_NONE},
 
-  {ROAR_CMD_CON_STREAM,   _NAME("CON_STREAM"),   req_on_con_stream},
-  {ROAR_CMD_PASSFH,       _NAME("PASSFH"),       req_on_passfh},
+  {ROAR_CMD_CON_STREAM,   _NAME("CON_STREAM"),   req_on_con_stream,   ACCLEV_PWRUSER},
+  {ROAR_CMD_PASSFH,       _NAME("PASSFH"),       req_on_passfh,       ACCLEV_PWRUSER},
 
-  {ROAR_CMD_SERVER_INFO,  _NAME("SERVER_INFO"),  req_on_server_info},
-  {ROAR_CMD_SERVER_OINFO, _NAME("SERVER_OINFO"), req_on_server_oinfo},
-  {ROAR_CMD_GET_STANDBY,  _NAME("GET_STANDBY"),  req_on_get_standby},
-  {ROAR_CMD_SET_STANDBY,  _NAME("SET_STANDBY"),  req_on_set_standby},
-  {ROAR_CMD_EXIT,         _NAME("EXIT"),         req_on_exit},
+  {ROAR_CMD_SERVER_INFO,  _NAME("SERVER_INFO"),  req_on_server_info,  ACCLEV_IDENTED}, // allow this early so the client
+                                                                                       // can device ealry if this server
+                                                                                       // provieds all needed features
+  {ROAR_CMD_SERVER_OINFO, _NAME("SERVER_OINFO"), req_on_server_oinfo, ACCLEV_IDENTED}, // same as above
+  {ROAR_CMD_GET_STANDBY,  _NAME("GET_STANDBY"),  req_on_get_standby,  ACCLEV_GUEST},
+  {ROAR_CMD_SET_STANDBY,  _NAME("SET_STANDBY"),  req_on_set_standby,  ACCLEV_PWRUSER}, // should this be set to ACCLEV_ALL?
+  {ROAR_CMD_EXIT,         _NAME("EXIT"),         req_on_exit,         ACCLEV_ALL},
 
-  {ROAR_CMD_LIST_CLIENTS, _NAME("LIST_CLIENTS"), req_on_list_clients},
-  {ROAR_CMD_LIST_STREAMS, _NAME("LIST_STREAMS"), req_on_list_streams},
-  {ROAR_CMD_GET_CLIENT,   _NAME("GET_CLIENT"),   req_on_get_client},
-  {ROAR_CMD_GET_STREAM,   _NAME("GET_STREAM"),   req_on_get_stream},
-  {ROAR_CMD_KICK,         _NAME("KICK"),         req_on_kick},
-  {ROAR_CMD_ATTACH,       _NAME("ATTACH"),       req_on_attach},
-  {ROAR_CMD_SET_VOL,      _NAME("SET_VOL"),      req_on_set_vol},
-  {ROAR_CMD_GET_VOL,      _NAME("GET_VOL"),      req_on_get_vol},
-  {ROAR_CMD_GET_STREAM_PARA, _NAME("GET_STREAM_PARA"), req_on_get_stream_para},
-  {ROAR_CMD_SET_STREAM_PARA, _NAME("SET_STREAM_PARA"), req_on_set_stream_para},
+  {ROAR_CMD_LIST_CLIENTS, _NAME("LIST_CLIENTS"), req_on_list_clients, ACCLEV_GUEST},
+  {ROAR_CMD_LIST_STREAMS, _NAME("LIST_STREAMS"), req_on_list_streams, ACCLEV_GUEST},
+  {ROAR_CMD_GET_CLIENT,   _NAME("GET_CLIENT"),   req_on_get_client,   ACCLEV_GUEST},
+  {ROAR_CMD_GET_STREAM,   _NAME("GET_STREAM"),   req_on_get_stream,   ACCLEV_GUEST},
+  {ROAR_CMD_KICK,         _NAME("KICK"),         req_on_kick,         ACCLEV_PWRUSER},
+  {ROAR_CMD_ATTACH,       _NAME("ATTACH"),       req_on_attach,       ACCLEV_PWRUSER},
+  {ROAR_CMD_SET_VOL,      _NAME("SET_VOL"),      req_on_set_vol,      ACCLEV_PWRUSER},
+  {ROAR_CMD_GET_VOL,      _NAME("GET_VOL"),      req_on_get_vol,      ACCLEV_GUEST},
+  {ROAR_CMD_GET_STREAM_PARA, _NAME("GET_STREAM_PARA"), req_on_get_stream_para, ACCLEV_GUEST},
+  {ROAR_CMD_SET_STREAM_PARA, _NAME("SET_STREAM_PARA"), req_on_set_stream_para, ACCLEV_PWRUSER},
 
-  {ROAR_CMD_ADD_DATA,     _NAME("ADD_DATA"),     req_on_add_data},
+  {ROAR_CMD_ADD_DATA,     _NAME("ADD_DATA"),     req_on_add_data,     ACCLEV_PWRUSER},
 
-  {ROAR_CMD_BEEP,         _NAME("BEEP"),         req_on_beep},
+  {ROAR_CMD_BEEP,         _NAME("BEEP"),         req_on_beep,         ACCLEV_USER},
 
-  {ROAR_CMD_WAIT,         _NAME("WAIT"),         req_on_wait},
+  {ROAR_CMD_WAIT,         _NAME("WAIT"),         req_on_wait,         ACCLEV_USER},
 
-  {ROAR_CMD_EOL,          _NAME("END OF LIST"),  NULL}
+  {ROAR_CMD_EOL,          _NAME("END OF LIST"),  NULL,                ACCLEV_NONE}
  };
 
@@ -103 +105 @@
  if ( cmd == -1 )
   return -1;
+
+ // NOTE: This is optimized for speed here, so we do notc al clients_get().
+ // we maybe should do but current just don't. /client/ must be valid anyway.
+ if ( g_commands[cmd].minacclev > g_clients[client]->acclev ) {
+  ROAR_WARN("command_exec(client=%i, mes=%p{.cmd=%i,...}, data=%p, flags=%p) = -1 // client not allowed to use command %s", client, mes, (int)mes->cmd, data, flags, g_commands[cmd].name);
+  return -1;
+ }
 
  if ( (func = g_commands[cmd].handler) == NULL ) {

roard/include/client.h

@@ -47 +47 @@
 */
 
+// access level:
+enum roard_client_acclev {
+ ACCLEV_NONE     = 0, // only very basic commands like NOOP and IDENTIFY
+ ACCLEV_IDENTED,      // same as NONE but INDENTIFY worked.
+ ACCLEV_CONCTL,       // only allowed to do basic connection things.
+ ACCLEV_GUEST,        // guest connection (read only)
+ ACCLEV_USER,         // normal user connect (read write)
+ ACCLEV_PWRUSER,      // power user, may access other user's clients
+ ACCLEV_ALL           // full (admin) access (read write ctl)
+};
+
 struct roar_client_nsubscribe {
  struct roar_subscriber * sub;
@@ -55 +66 @@
  size_t blockc;
  struct roar_subscriber ** waits;
+ enum roard_client_acclev acclev;
 } * g_clients[ROAR_CLIENTS_MAX];
 

roard/include/commands.h

@@ -45 +45 @@
 #endif
  int (*handler)(int client, struct roar_message * mes, char ** data, uint32_t flags[2]);
+ enum roard_client_acclev minacclev;
 };