MySQL password changing

[hcoop/domtool2.git] / src / plugins / mysql.sml

diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml
index a273875..dae75cc 100644 (file)
--- a/src/plugins/mysql.sml
+++ b/src/plugins/mysql.sml
@@ -20,11 +20,32 @@
 
 structure MySQL :> MYSQL = struct
 
-fun adduser user =
-    if Slave.shell [Config.MySQL.adduser, user] then
-       NONE
+val validPasswd = CharVector.all (fn ch => Char.isAlphaNum ch
+                                          orelse ch = #"!"
+                                          orelse ch = #"."
+                                          orelse ch = #"-"
+                                          orelse ch = #"_")
+
+fun adduser {user, passwd} =
+    case passwd of
+       NONE => SOME "No password given"
+      | SOME passwd =>
+       if validPasswd passwd then
+           if Slave.shell [Config.MySQL.adduser, user, " ", passwd] then
+               NONE
+           else
+               SOME "Error executing CREATE USER script"
+       else
+           SOME "Password contains characters besides letters, digits, and !.-_"
+
+fun passwd {user, passwd} =
+    if validPasswd passwd then
+       if Slave.shell [Config.MySQL.passwd, user, " ", passwd] then
+           NONE
+       else
+           SOME "Error executing SET PASSWORD script"
     else
-       SOME "Error executing CREATE USER script"
+       SOME "Password contains characters besides letters, digits, and !.-_"
 
 fun createdb {user, dbname} =
     if Slave.shell [Config.MySQL.createdb, user, " ", dbname] then
@@ -32,7 +53,9 @@ fun createdb {user, dbname} =
     else
        SOME "Error executing CREATE DATABASE script"
 
-val _ = Dbms.register ("mysql", {adduser = adduser,
+val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
+                                adduser = adduser,
+                                passwd = passwd,
                                 createdb = createdb})
 
 end