Merge lp:~ovais-tariq/twindb-agent/bug-1407376 into lp:twindb-agent

[Ovais Tariq]

[Ovais Tariq (ovais-tariq)]

Test results:

       Command "whoami"
         stdout
           should match /root/

       twindb package is installed
         Package "twindb"
           should be installed

       twindb service is configured and running
         Service "twindb"
           should be enabled
           should be enabled
           should be running

       twindb agent is initially unregistered
         Command "sudo -i /usr/bin/twindb --user root --password root --dispatcher dispatcher.twindb.com --is-registered"
           stdout
             should match /NO/

       twindb agent is able to register
         Command "sudo -i /usr/bin/twindb --user root --password root --dispatcher dispatcher.twindb.com --register 0f6714f735a06a488ec9279f59d0a3f2"
           exit_status
             should eq 0
         Command "sudo -i /usr/bin/twindb --user root --password root --dispatcher dispatcher.twindb.com --is-registered"
           stdout
             should match /YES/

       twindb agent is able to do backup
         Command "sudo -i /usr/bin/twindb --user root --password root --dispatcher dispatcher.twindb.com --backup"
           exit_status
             should eq 0
           stdout
             should match /Backup job is complete/

       twindb agent is able to unregister
         Command "sudo -i /usr/bin/twindb --user root --password root --dispatcher dispatcher.twindb.com --unregister --delete-backups"
           exit_status
             should eq 0
         Command "sudo -i /usr/bin/twindb --user root --password root --dispatcher dispatcher.twindb.com --is-registered"
           stdout
             should match /NO/

       Finished in 39.24 seconds (files took 0.55168 seconds to load)
       12 examples, 0 failures

=== added file '.bzrignore'
--- .bzrignore	1970-01-01 00:00:00 +0000
+++ .bzrignore	2015-02-22 02:25:57 +0000
@@ -0,0 +1,1 @@
+.idea

=== modified file 'twindb.py'
--- twindb.py	2015-01-24 21:00:01 +0000
+++ twindb.py	2015-02-22 02:25:57 +0000
@@ -183,6 +183,7 @@
         logger.error("Unexpected error: %s,%s" % sys.exc_info()[:2]);
         return None
     return conn
+
 # Checks if TwinDB API public key is installed
 # Returns
 #   True    - if the key is installed
@@ -1017,13 +1018,48 @@
         return None
     return result
 
+
+def has_mysql_access():
+    has_required_grants = False
+
+    try:
+        conn = get_mysql_connection()
+        if conn:
+            cursor = conn.cursor(dictionary=True)
+        else:
+            return False
+
+        # Fetch the current user and matching host part as it could either be
+        # connecting using localhost or using '%'
+        cursor.execute("SELECT CURRENT_USER() as curr_user")
+        row = cursor.fetchone()
+        username, hostname = row['curr_user'].split('@')
+
+        sql = ("SELECT * FROM mysql.user WHERE user='%s' "
+               "AND host='%s'" % (username, hostname))
+        cursor.execute(sql)
+        user_info = cursor.fetchone()
+
+        has_required_grants = True
+        for privilege in ['Reload_priv', 'Lock_tables_priv',
+                          'Repl_client_priv', 'Super_priv',
+                          'Create_tablespace_priv', 'Grant_priv']:
+            if user_info[privilege] != 'Y':
+                has_required_grants = False
+                break
+    except:
+        logger.error("Could not read the grants information from MySQL")
+        logger.error(u"Unexpected error: {0:s},{1:s}".format(sys.exc_info()[:2]))
+
+    return has_required_grants
+
+
 # Registers this server in TwinDB dispatcher
 # Inputs
 #   code    - string with secret registration code
 # Returns
 #   True    - if server was successfully registered
 # Exits if error happened
-
 def action_handler_register(code):
     global logger
     global init_config
@@ -1035,6 +1071,13 @@
     global mysql_password
 
     check_env()
+
+    # Check early to see that the MySQL user passed to the agent has enough
+    # privileges to create a separate MySQL user needed by TwinDB
+    if not has_mysql_access():
+        logger.error("The MySQL user %s does not have enough privileges" % mysql_user)
+        return False
+
     logger.info("Registering TwinDB agent with code %s" % code)
     logger.info("The agent needs to generate cryptographically strong keys.")
     logger.info("It may take really, really long time. Please be patient.")