- mysql_load_plugin_v supports now the environment variable MARIADB_PLUGIN_DIR

  to load plugins from a different destination than PLUGINDIR.

- added dialog plugin for authentication (e.g. PAM). If an application provides
  it's own dialog function, the name must be mariadb_auth_dialog (or for libmysql
  compatibility mysql_authentication_dialog_ask).
  Windows-Todo: 
  1. provide a simple GUI dialog on windows, in case opening the console failed.
  2. convert data from console code page to character set of current connection

Author: 9EOR9

cmake/install.cmake

@@ -76,7 +76,7 @@ SET(BIN_INSTALL_DIR_DEFAULT "bin")
 SET(LIB_INSTALL_DIR_DEFAULT "lib")
 SET(INCLUDE_INSTALL_DIR_DEFAULT "include")
 SET(DOCS_INSTALL_DIR_DEFAULT "docs")
-SET(LIB_INSTALL_PLUGIN_DIR_DEFAULT "lib/plugins")
+SET(PLUGIN_INSTALL_DIR_DEFAULT "lib/plugin")
 
 #
 # RPM layout
@@ -85,15 +85,15 @@ SET(SUFFIX_INSTALL_DIR_RPM "mariadb")
 SET(BIN_INSTALL_DIR_RPM "bin")
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
   SET(LIB_INSTALL_DIR_RPM "lib64")
-  SET(LIB_INSTALL_PLUGINDIR_RPM "lib64/plugins")
+  SET(PLUGIN_INSTALL_DIRDIR_RPM "lib64/plugin")
 ELSE()
   SET(LIB_INSTALL_DIR_RPM "lib")
-  SET(LIB_INSTALL_PLUGINDIR_RPM "lib/plugins")
+  SET(PLUGIN_INSTALL_DIRDIR_RPM "lib/plugin")
 ENDIF()
 
 SET(INCLUDE_INSTALL_DIR_RPM "include")
 SET(DOCS_INSTALL_DIR_RPM "docs")
-SET(LIB_INSTALL_PLUGIN_DIR_RPM "lib/plugins")
+SET(PLUGIN_INSTALL_DIR_RPM "lib/plugin")
 
 #
 # Overwrite defaults
@@ -102,6 +102,10 @@ IF(LIB_INSTALL_DIR)
   SET(LIB_INSTALL_DIR_${INSTALL_LAYOUT} ${LIB_INSTALL_DIR})
 ENDIF()
 
+IF(PLUGIN_INSTALL_DIR)
+  SET(PLUGIN_INSTALL_DIR_${INSTALL_LAYOUT} ${PLUGIN_INSTALL_DIR})
+ENDIF()
+
 IF(INCLUDE_INSTALL_DIR)
   SET(INCLUDE_INSTALL_DIR_${INSTALL_LAYOUT} ${INCLUDE_INSTALL_DIR})
 ENDIF()
@@ -118,7 +122,7 @@ IF(NOT SUFFIX_INSTALL_DIR)
   SET(SUFFIX_INSTALL_DIR_${INSTALL_LAYOUT} "mariadb")
 ENDIF()
 
-FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX")
+FOREACH(dir "BIN" "LIB" "INCLUDE" "DOCS" "PREFIX" "SUFFIX" "PLUGIN")
   SET(${dir}_INSTALL_DIR ${${dir}_INSTALL_DIR_${INSTALL_LAYOUT}})
   MARK_AS_ADVANCED(${dir}_INSTALL_DIR)
 ENDFOREACH()

include/my_config.h.in

@@ -274,5 +274,5 @@
 #cmakedefine HAVE_THREADS 1
 #cmakedefine SHAREDIR "@SHAREDIR@"
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
-#cmakedefine PLUGINDIR "@PLUGINDIR@"
+#cmakedefine PLUGINDIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
 

include/mysql/client_plugin.h

@@ -1,4 +1,5 @@
 /* Copyright (C) 2010 - 2012 Sergei Golubchik and Monty Program Ab
+                 2014 MariaDB Corporation AB
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public

include/mysql_com.h

@@ -173,8 +173,9 @@ enum enum_server_command
                                  CLIENT_MULTI_STATEMENTS |\
                                  CLIENT_MULTI_RESULTS |\
                                  CLIENT_PROGRESS |\
-		                             CLIENT_SSL_VERIFY_SERVER_CERT |\
+		                 CLIENT_SSL_VERIFY_SERVER_CERT |\
                                  CLIENT_REMEMBER_OPTIONS |\
+                                 CLIENT_PLUGIN_AUTH |\
                                  CLIENT_CONNECT_ATTRS)
 
 #define CLIENT_CAPABILITIES	(CLIENT_LONG_PASSWORD |\
@@ -384,7 +385,6 @@ char *scramble_323(char *to,const char *message,const char *password);
 void my_scramble_41(const unsigned char *buffer, const char *scramble, const char *password);
 my_bool check_scramble(const char *, const char *message,
 		       unsigned long *salt,my_bool old_ver);
-char *get_tty_password(char *opt_message);
 void hash_password(unsigned long *result, const char *password, size_t len);
 
 /* Some other useful functions */

libmariadb/client_plugin.c

@@ -346,6 +346,7 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
   char dlpath[FN_REFLEN+1];
   void *sym, *dlhandle;
   struct st_mysql_client_plugin *plugin;
+  char *env_plugin_dir= getenv("MARIADB_PLUGIN_DIR");
 
   if (is_not_initialized(mysql, name))
     return NULL;
@@ -362,7 +363,8 @@ mysql_load_plugin_v(MYSQL *mysql, const char *name, int type,
   /* Compile dll path */
   strxnmov(dlpath, sizeof(dlpath) - 1,
            mysql->options.extension && mysql->options.extension->plugin_dir ?
-           mysql->options.extension->plugin_dir : PLUGINDIR, "/",
+           mysql->options.extension->plugin_dir : (env_plugin_dir) ? env_plugin_dir :
+           PLUGINDIR, "/",
            name, SO_EXT, NullS);
 
   /* Open new dll handle */

libmariadb/get_password.c

@@ -63,43 +63,83 @@
 #endif
 
 #if defined( _WIN32) || defined(OS2)
-/* were just going to fake it here and get input from the keyboard */
+/* {{{ statuc char* get_password */
+/*
+   reads password from tty/console
+
+   SYNOPSIS
+     get_password()
+     buffer           input buffer
+     length           length of input buffer
 
-char *get_tty_password(char *opt_message)
+   DESCRIPTION
+     reads a password from console (Windows) or tty without echoing
+     it's characters. Input buffer must be allocated by calling function.
+
+   RETURNS
+     buffer           pointer to input buffer
+*/
+char* get_tty_password(char *prompt, char *buffer, int length)
 {
-  char to[80];
-  char *pos=to,*end=to+sizeof(to)-1;
-  int i=0;
-  DBUG_ENTER("get_tty_password");
-  fprintf(stdout,opt_message ? opt_message : "Enter password: ");
-  for (;;)
+#ifdef _WIN32
+  DWORD  SaveState;
+  HANDLE Hdl;
+  int    Offset= 0;
+  DWORD  CharsProcessed=  0;
+  char   inChar;
+
+  ZeroMemory(buffer, length);
+
+  if (!(Hdl= CreateFile("CONIN$", 
+                        GENERIC_READ | GENERIC_WRITE,
+                        FILE_SHARE_READ,
+                        NULL,
+                        OPEN_EXISTING, 0, NULL)))
   {
-    char tmp;
-    tmp=_getch();
-    if (tmp == '\b' || (int) tmp == 127)
-    {
-      if (pos != to)
+    /* todo: provide a graphical dialog */
+    return buffer;
+  }
+  /* Save ConsoleMode and set ENABLE_PROCESSED_INPUT:
+     CTRL+C is processed by the system and is not placed in the input buffer */
+  GetConsoleMode(Hdl, &SaveState);
+  SetConsoleMode(Hdl, ENABLE_PROCESSED_INPUT);
+
+  do
+  {
+    if (!ReadConsole(Hdl, &inChar, 1, &CharsProcessed, NULL) ||
+        !CharsProcessed)
+      break;
+
+    switch(inChar) {
+    case '\b': /* backslash */
+      if (Offset)
       {
-	_cputs("\b \b");
-	pos--;
-	continue;
+        /* cursor is always at the end */
+        Offset--;
+        buffer[Offset]= 0;
+        _cputs("\b \b");
       }
-    }
-    if (tmp == '\n' || tmp == '\r' || tmp == 3)
       break;
-    if (iscntrl(tmp) || pos == end)
-      continue;
-    _cputs("*");
-    *(pos++) = tmp;
-  }
-  while (pos != to && isspace(pos[-1]) == ' ')
-    pos--;					/* Allow dummy space at end */
-  *pos=0;
-  _cputs("\n");
-  DBUG_RETURN(my_strdup(to,MYF(MY_FAE)));
-}
+    case '\n':
+    case '\r':
+      break;
+    default:
+      buffer[Offset]= inChar;
+      if (Offset < length - 2)
+        Offset++;
+      _cputs("*");
+      break;
+    }  
+  } while (CharsProcessed && inChar != '\n' && inChar != '\r');
+  SetConsoleMode(Hdl, SaveState);
+  CloseHandle(Hdl);
+  return buffer;
 
 #else
+#endif
+}
+/* }}} */
+#else
 
 
 #ifndef HAVE_GETPASS
@@ -150,22 +190,21 @@ static void get_password(char *to,uint length,int fd,bool echo)
 #endif /* ! HAVE_GETPASS */
 
 
-char *get_tty_password(char *opt_message)
+char *get_tty_password(char *opt_message, char *buff, int bufflen)
 {
 #ifdef HAVE_GETPASS
   char *passbuff;
 #else /* ! HAVE_GETPASS */
   TERMIO org,tmp;
 #endif /* HAVE_GETPASS */
-  char buff[80];
 
   DBUG_ENTER("get_tty_password");
 
 #ifdef HAVE_GETPASS
   passbuff = getpass(opt_message ? opt_message : "Enter password: ");
 
   /* copy the password to buff and clear original (static) buffer */
-  strnmov(buff, passbuff, sizeof(buff) - 1);
+  strnmov(buff, passbuff, bufflen - 1);
 #ifdef _PASSWORD_LEN
   memset(passbuff, 0, _PASSWORD_LEN);
 #endif
@@ -182,7 +221,7 @@ char *get_tty_password(char *opt_message)
   tmp.c_cc[VMIN] = 1;
   tmp.c_cc[VTIME] = 0;
   tcsetattr(fileno(stdin), TCSADRAIN, &tmp);
-  get_password(buff, sizeof(buff)-1, fileno(stdin), isatty(fileno(stdout)));
+  get_password(buff, bufflen-1, fileno(stdin), isatty(fileno(stdout)));
   tcsetattr(fileno(stdin), TCSADRAIN, &org);
 #elif defined(HAVE_TERMIO_H)
   ioctl(fileno(stdin), (int) TCGETA, &org);
@@ -191,21 +230,21 @@ char *get_tty_password(char *opt_message)
   tmp.c_cc[VMIN] = 1;
   tmp.c_cc[VTIME]= 0;
   ioctl(fileno(stdin),(int) TCSETA, &tmp);
-  get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
+  get_password(buff,bufflen-1,fileno(stdin),isatty(fileno(stdout)));
   ioctl(fileno(stdin),(int) TCSETA, &org);
 #else
   gtty(fileno(stdin), &org);
   tmp=org;
   tmp.sg_flags &= ~ECHO;
   tmp.sg_flags |= RAW;
   stty(fileno(stdin), &tmp);
-  get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
+  get_password(buff,bufflen-1,fileno(stdin),isatty(fileno(stdout)));
   stty(fileno(stdin), &org);
 #endif
   if (isatty(fileno(stdout)))
     fputc('\n',stdout);
 #endif /* HAVE_GETPASS */
 
-  DBUG_RETURN(my_strdup(buff,MYF(MY_FAE)));
+  DBUG_RETURN(buff);
 }
 #endif /*_WIN32*/

mariadb_config/mariadb_config.c.in

@@ -8,6 +8,7 @@
                 "@extra_dynamic_LDFLAGS@"
 #define CFLAGS  INCLUDE " @CMAKE_C_FLAGS@"
 #define VERSION "@MYSQL_CLIENT_VERSION@"
+#define PLUGIN_DIR "@PREFIX_INSTALL_DIR@/@PLUGIN_INSTALL_DIR@"
 #define SOCKET  "@MYSQL_UNIX_ADDR@"
 #define PORT "@MYSQL_PORT@"
 
@@ -21,6 +22,7 @@ static struct option long_options[]=
   {"version", no_argument, 0, 'f'},
   {"socket", no_argument, 0, 'g'},
   {"port", no_argument, 0, 'h'},
+  {"plugindir", no_argument, 0, 'p'},
   {NULL, 0, 0, 0}
 };
 
@@ -33,7 +35,8 @@ static char *values[]=
   LIBS,
   VERSION,
   SOCKET,
-  PORT
+  PORT,
+  PLUGIN_DIR
 };
 
 void usage(void)
@@ -90,6 +93,9 @@ int main(int argc, char **argv)
     case 'h':
       puts(PORT);
       break;
+    case 'p':
+      puts(PLUGINDIR);
+      break;
     default:
       exit(0);
     }

plugins/auth/CMakeLists.txt

@@ -0,0 +1,13 @@
+# Dialog plugin
+SET(DIALOG_SOURCES dialog.c ${CMAKE_SOURCE_DIR}/libmariadb/get_password.c)
+IF(WIN32)
+  SET(DIALOG_SOURCES ${DIALOG_SOURCES} ${CMAKE_SOURCE_DIR}/plugins/plugin.def)
+ENDIF()
+ADD_LIBRARY(dialog SHARED ${DIALOG_SOURCES})
+SET_TARGET_PROPERTIES(dialog PROPERTIES PREFIX "")
+
+INSTALL(TARGETS
+          dialog
+          RUNTIME DESTINATION "${PLUGIN_INSTALL_DIR}"
+          LIBRARY DESTINATION "${PLUGIN_INSTALL_DIR}"
+          ARCHIVE DESTINATION "${PLUGIN_INSTALL_DIR}")