Changeset 4756:bc0883202f16 in roaraudio

Timestamp:

02/06/11 01:15:32 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added support to roarshout to read password form user or file (Closes: #101)

Files:

• ChangeLog (modified) (1 diff)
• doc/man1/roarshout.1 (modified) (1 diff)
• roarclients/roarshout.c (modified) (5 diffs)

ChangeLog

@@ -5 +5 @@
         * Disable more stuff in minimal build (Closes: #104)
         * Added time display to roarvorbis (Closes: #102)
+        * Added support to roarshout to read password form user or file (Closes: #101)
 
 v. 0.4beta3 - Wed Jan 26 2011 23:26 CET

doc/man1/roarshout.1

@@ -43 +43 @@
 Show this help
 
+.TP
+\fB\-\-pw\-arg\fR
+Password is supplied as argument (default).
+
+.TP
+\fB\-\-pw\-ask\fR
+Ask user for password interactively.
+
+.TP
+\fB\-\-pw\-dstr\fR
+Read password from file. Filename is supplied as normal password argument.
+
 .SH "LIBSHOUT OPTIONS"
 

roarclients/roarshout.c

@@ -42 +42 @@
         "    --codec  CODEC     - Set the codec\n"
         " -h --help             - Show this help\n"
+        "    --pw-arg           - Password is supplied as argument (default).\n"
+        "    --pw-ask           - Ask user for password interactively.\n"
+        "    --pw-dstr          - Read password from file. Filename is supplied\n"
+        "                         as normal password argument.\n"
        );
 
@@ -55 +59 @@
 }
 
+char * read_pw_from_file(char * filename, char * buffer, size_t bufferlen) {
+ struct roar_vio_defaults def;
+ struct roar_vio_calls file;
+ ssize_t len;
+
+ if (filename == NULL || buffer == NULL)
+  return NULL;
+
+ if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, O_RDONLY, 0644) == -1 )
+  return NULL;
+
+ if ( roar_vio_open_dstr(&file, filename, &def, 1) == -1 )
+  return NULL;
+
+ len = roar_vio_read(&file, buffer, bufferlen - 1);
+
+ if ( len == -1 )
+  return NULL;
+
+ // strip newlions.
+ for (; buffer[len-1] == '\r' || buffer[len-1] == '\n'; len--);
+
+ buffer[len] = 0;
+
+ roar_vio_close(&file);
+
+ return buffer;
+}
+
 int main (int argc, char * argv[]) {
+ enum { ARG, ASK, DSTR } pw_source = ARG;
  int    rate     = 44100;
  int    bits     = 16;
@@ -75 +109 @@
  char buf[BUFSIZE];
  shout_t * shout;
+ char password_buf[128];
 
  for (i = 1; i < argc; i++) {
@@ -89 +124 @@
   } else if ( strcmp(k, "--codec") == 0 ) {
    codec = roar_str2codec(argv[++i]);
+  } else if ( strcmp(k, "--pw-arg") == 0 ) {
+   pw_source = ARG;
+  } else if ( strcmp(k, "--pw-ask") == 0 ) {
+   pw_source = ASK;
+  } else if ( strcmp(k, "--pw-dstr") == 0 ) {
+   pw_source = DSTR;
   } else if ( strcmp(k, "-p") == 0 || strcmp(k, "--public") == 0 ) {
    s_public = 1;
@@ -117 +158 @@
  }
 
+ switch (pw_source) {
+  case ARG:
+    // nothing to do
+   break;
+  case ASK:
+    if ( roar_passwd_simple_ask_pw(&s_pw, "Password for icecast server?", NULL) == -1 ) {
+     fprintf(stderr, "Error: unabled to read password from user.\n");
+     return 1;
+    }
+    strncpy(password_buf, s_pw, sizeof(password_buf)-1);
+    roar_mm_free(s_pw);
+    password_buf[sizeof(password_buf)-2] = 0;
+    s_pw = password_buf;
+   break;
+  case DSTR:
+    if ( (s_pw = read_pw_from_file(s_pw, password_buf, sizeof(password_buf))) == NULL ) {
+     fprintf(stderr, "Error: unabled to read password from file.\n");
+     return 1;
+    }
+   break;
+ }
+
  if ( s_server == NULL )
   s_server = "localhost";