X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/ae1479386628436613a664b6601f6ca833dd6b2d..1b1021cb38f85f638ec5b2141075e99c7b5f0fdd:/src/plugins/mysql.sml

diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml
index a273875..3cfa94f 100644
--- a/src/plugins/mysql.sml
+++ b/src/plugins/mysql.sml
@@ -20,19 +20,46 @@
 
 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
+	    Option.map (fn s => "Error executing CREATE USER script:\n" ^ s)
+		       (Slave.shellOutput [Config.MySQL.adduser, user, " ", passwd])
+	else
+	    SOME "Password contains characters besides letters, digits, and !.-_"
+
+fun passwd {user, passwd} =
+    if validPasswd passwd then
+	Option.map (fn s => "Error executing SET PASSWORD script:\n" ^ s)
+		   (Slave.shellOutput [Config.MySQL.passwd, user, " ", passwd])
     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
-	NONE
-    else
-	SOME "Error executing CREATE DATABASE script"
+    Option.map (fn s => "Error executing CREATE DATABASE script:\n" ^ s)
+	       (Slave.shellOutput [Config.MySQL.createdb, user, " ", dbname])
+
+fun dropdb {user, dbname} =
+    Option.map (fn s => "Error executing DROP DATABASE script:\n" ^ s)
+	       (Slave.shellOutput [Config.MySQL.dropdb, user, " ", dbname])
+
+fun grant {user, dbname} =
+    Option.map (fn s => "Error executing GRANT script:\n" ^ s)
+	       (Slave.shellOutput [Config.MySQL.grant, user, " ", dbname])
 
-val _ = Dbms.register ("mysql", {adduser = adduser,
-				 createdb = createdb})
+val _ = Dbms.register ("mysql", {getpass = SOME Client.getpass,
+				 adduser = adduser,
+				 passwd = passwd,
+				 createdb = createdb,
+				 dropdb = dropdb,
+				 grant = grant})
 
 end