Merge lp:~ansharyan015/drizzle/auth_http_dynamic into lp:drizzle

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve (code review)

=== modified file 'plugin/auth_http/auth_http.cc'
--- plugin/auth_http/auth_http.cc	2012-01-15 20:54:59 +0000
+++ plugin/auth_http/auth_http.cc	2012-07-09 19:53:20 +0000
@@ -24,6 +24,8 @@
 #include <string>
 #include <cassert>
 #include <boost/program_options.hpp>
+
+#include <drizzled/item.h>
 #include <drizzled/module/option_map.h>
 #include <drizzled/identifier.h>
 #include <drizzled/plugin/authentication.h>
@@ -32,6 +34,9 @@
 using namespace drizzled;
 using namespace std;
 
+namespace auth_http {
+bool updateAuthURL(Session *, set_var *);
+
 static size_t curl_cb_read(void *ptr, size_t size, size_t nmemb, void *stream)
 {
   (void) ptr;
@@ -44,11 +49,11 @@
 {
   CURLcode rv;
   CURL *curl_handle;
-  const std::string auth_url;
+  std::string sysvar_auth_url;
 public:
   Auth_http(std::string name_arg, const std::string &url_arg) :
     drizzled::plugin::Authentication(name_arg),
-    auth_url(url_arg)
+    sysvar_auth_url(url_arg)
   {
     // we are trusting that plugin initializers are called singlethreaded at startup
     // if something else also calls curl_global_init() in a threadrace while we are here,
@@ -66,6 +71,22 @@
     // set the read callback.  this shouldnt get called, because we are doing a HEAD
     rv= curl_easy_setopt(curl_handle, CURLOPT_READFUNCTION, curl_cb_read);
   }
+  
+  std::string& getAuthURL()
+  {
+    return sysvar_auth_url;
+  }
+
+  bool setAuthURL(std::string& new_auth_url)
+  {
+    if (new_auth_url.empty())
+    {
+      errmsg_printf(error::ERROR, _("auth url cannot be an empty string"));
+      return false;  // error
+    }
+    sysvar_auth_url= new_auth_url;
+    return true;
+  }
 
   ~Auth_http()
   {
@@ -80,7 +101,7 @@
     assert(sctx.username().c_str());
 
     // set the parameters: url, username, password
-    rv= curl_easy_setopt(curl_handle, CURLOPT_URL, auth_url.c_str());
+    rv= curl_easy_setopt(curl_handle, CURLOPT_URL, sysvar_auth_url.c_str());
 #if defined(HAVE_CURLOPT_USERNAME)
 
     rv= curl_easy_setopt(curl_handle, CURLOPT_USERNAME,
@@ -116,6 +137,26 @@
 
 Auth_http* auth= NULL;
 
+/**
+ * This function is called when the value of auth_http_url is changed in the system.
+ *
+ * @return False on success, True on error.
+ */
+bool updateAuthURL(Session *, set_var* var)
+{
+  if (not var->value->str_value.empty())
+  {
+    std::string new_auth_url(var->value->str_value.data());
+    if (auth->setAuthURL(new_auth_url))
+      return false; //success
+    else
+      return true; // error
+  }
+  errmsg_printf(error::ERROR, _("auth_http url cannot be NULL"));
+  return true; // error
+}
+
+
 static int initialize(drizzled::module::Context &context)
 {
   const module::option_map &vm= context.getOptions();
@@ -140,7 +181,7 @@
 
   auth= new Auth_http("auth_http", auth_url);
   context.add(auth);
-  context.registerVariable(new sys_var_const_string_val("url", auth_url));
+  context.registerVariable(new sys_var_std_string("url", auth->getAuthURL(), NULL, &updateAuthURL));
 
   return 0;
 }
@@ -151,6 +192,7 @@
           N_("URL for HTTP Auth check"));
 } 
 
+} /* namespace auth_http */
 
 DRIZZLE_DECLARE_PLUGIN
 {
@@ -160,8 +202,8 @@
   "Mark Atwood",
   N_("Authenication against a web server using HTTP"),
   PLUGIN_LICENSE_GPL,
-  initialize,
+  auth_http::initialize,
   NULL,
-  init_options
+  auth_http::init_options
 }
 DRIZZLE_DECLARE_PLUGIN_END;
 
=== modified file 'plugin/auth_http/docs/index.rst'
--- plugin/auth_http/docs/index.rst	2011-11-06 00:00:03 +0000
+++ plugin/auth_http/docs/index.rst	2012-07-09 19:53:20 +0000
@@ -3,9 +3,9 @@
 HTTP Authentication
 ===================
 
-:program:`auth_http` is an authentication plugin that authenticates connections
-using web-based HTTP authentication through a URL.  A web server is required
-to provide authentication.  For example, see Apache's documentation
+:program:`auth_http` is an :doc:`/administration/authorization` plugin that authenticates connections using web-based HTTP authentication through a URL. 
+When :program:`drizzled` is started with  ``--plugin-add=auth_http``, the http based authorization plugin is loaded. To enable the plugin, it is required to provide the server url against which the authentication is being made using ``--auth-http.url=<server url>``. The authetication server url can be dynamically changed using ``SET GLOBAL auth_http_url="<new server url>"``.
+A web server is required to provide authentication.  For example, see Apache's documentation
 for `Authentication, Authorization and Access Control <http://httpd.apache.org/docs/2.0/howto/auth.html>`_.
 Currently, SSL connections are not supported.
 
@@ -62,7 +62,7 @@
 * ``auth_http_url``
 
    :Scope: Global
-   :Dynamic: No
+   :Dynamic: Yes
    :Option: :option:`--auth-http.url`
 
    URL for HTTP authentication.