X-Git-Url: https://git.hcoop.net/hcoop/domtool2.git/blobdiff_plain/ae1479386628436613a664b6601f6ca833dd6b2d..86aa5de7d9f2754d50489432ffaa43cba3fa170f:/src/plugins/mysql.sml?ds=sidebyside

diff --git a/src/plugins/mysql.sml b/src/plugins/mysql.sml
index a273875..dae75cc 100644
--- 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