Automatic user registration (#6978)

Benjamin Renard
1 parent 4d9ee90d
Showing 15 changed files with 546 additions and 288 deletions Show diff stats
CMakeLists.txt
CMakeLists.txt.All
CMakeLists.txt.DDServerOnly
CMakeLists.txt.ServicesOnly
CMakeLists.txt.TOOLS
scripts/DDServer.env.in
scripts/GenerateNewPubPrivKeys.sh
scripts/ShowPubPrivKeys.sh
src/DDADMIN/MANAGER/GenerateNewPubPrivKeys.php
src/DDADMIN/MANAGER/ShowPubPrivKeys.php
src/DDADMIN/MANAGER/UserManager.php
src/DDADMIN/MANAGER/UserManagerClass.php
src/DDSERVICES/SOAP/DDserverWeb.php
src/DDSERVICES/SOAP/DDserverWeb_ini.php.in
src/DDSERVICES/SOAP/dd.wsdl.in
@@ -39,8 +39,10 @@ get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
 get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
 set(DDSERVICE_URL $ENV{DDSERVICE_URL})
 set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEPATH "$ENV{DDBASEPATH}")
 set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
 set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(USERMANAGER "$ENV{INSTALL_DIR}/bin/USERMANAGER")
 set(PROXY_HOST $ENV{PROXY_HOST})
 set(PROXY_USERPWD $ENV{PROXY_USERPWD})
@@ -42,8 +42,10 @@ get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
 get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
 set(DDSERVICE_URL $ENV{DDSERVICE_URL})
 set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEPATH "$ENV{DDBASEPATH}")
 set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
 set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(USERMANAGER "$ENV{INSTALL_DIR}/bin/USERMANAGER")
 set(PROXY_HOST $ENV{PROXY_HOST})
 set(PROXY_USERPWD $ENV{PROXY_USERPWD})
@@ -36,8 +36,10 @@ find_package( DDClient REQUIRED )
 get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
 get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
 set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEPATH "$ENV{DDBASEPATH}")
 set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
 set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(USERMANAGER "$ENV{INSTALL_DIR}/bin/USERMANAGER")
 set(PROXY_HOST $ENV{PROXY_HOST})
 set(PROXY_USERPWD $ENV{PROXY_USERPWD})
@@ -39,8 +39,10 @@ get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
 get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
 set(DDSERVICE_URL $ENV{DDSERVICE_URL})
 set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEPATH "$ENV{DDBASEPATH}")
 set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
 set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(USERMANAGER "$ENV{INSTALL_DIR}/bin/USERMANAGER")
 set(PROXY_HOST $ENV{PROXY_HOST})
 set(PROXY_USERPWD $ENV{PROXY_USERPWD})
@@ -42,8 +42,10 @@ get_filename_component(NETCDFLIB_DIR ${NETCDFLIBRARIES} PATH)
 get_filename_component(DDCLIENTLIB_DIR ${DDCLIENTLIBRARIES} PATH)
 set(DDSERVICE_URL $ENV{DDSERVICE_URL})
 set(DDRESPATH $ENV{DDRESPATH})
+set(DDBASEPATH "$ENV{DDBASEPATH}")
 set(DDBASEDATA "$ENV{DDBASEPATH}/DATA")
 set(DDBASEINFO "$ENV{DDBASEPATH}/INFO")
+set(USERMANAGER "$ENV{INSTALL_DIR}/bin/USERMANAGER")
 set(PROXY_HOST $ENV{PROXY_HOST})
 set(PROXY_USERPWD $ENV{PROXY_USERPWD})
 #!/bin/bash
+DDBASEROOT=@DDBASEPATH@
 DDBASE=@DDBASEDATA@
 DDINFO=@DDBASEINFO@
 DDPATH=@DDRESPATH@
@@ -13,8 +14,8 @@ USERMANAGER=@CMAKE_INSTALL_PREFIX@/bin/USERMANAGER
 PROXY_HOST="@PROXY_HOST@"
 PROXY_USERPWD="@PROXY_USERPWD@"
-export DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH DDINFO
+export DDBASEROOT DDBASE DDPATH DDBASEBIN DDLIB LD_LIBRARY_PATH DDINFO
 export DATAMANAGER REMOTEDATA CALLEXT USERMANAGER
 export PROXY_HOST PROXY_USERPWD
 export AMDA_USERS_INFO=AMDA_Users_Info.xml
-export AMDA_GROUPS_INFO=AMDA_Users.xml
 \ No newline at end of file
+export AMDA_GROUPS_INFO=AMDA_Users.xml
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+usage="
+    \n ### Generate new public / private keys for DDService###
+    \n
+    \n    Usage : $0 -d <Client description>
+    \n
+    \n            $0 -d \"AMDA Dev instance\"
+    \n
+    \n
+    \n ###"
+
+while getopts "d:h" options; do
+    case $options in
+        d ) CLIENT_DESCRIPTION=`echo $OPTARG`;;
+        h ) echo -e $usage
+            exit 1;;
+        \? ) echo -e $usage
+            exit 1;;
+        * ) echo -e $usage
+            exit 1;;
+    esac
+done
+
+if [ "$CLIENT_DESCRIPTION" = "" ]
+then
+    echo "[ERROR] Missing client description"
+    echo -e $usage
+    exit 1
+fi
+
+BASEDIR=$(dirname "$0")
+
+. ${BASEDIR}/DDServer.env
+
+php ${USERMANAGER}/GenerateNewPubPrivKeys.php --description "$CLIENT_DESCRIPTION"
+
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+BASEDIR=$(dirname "$0")
+
+. ${BASEDIR}/DDServer.env
+
+php ${USERMANAGER}/ShowPubPrivKeys.php
+
@@ -0,0 +1,58 @@
+<?php
+
+$shortopts  = "d:";
+$longopts  = array("description:");
+$options = getopt($shortopts, $longopts);
+$client_description = "";
+if (array_key_exists("description",$options)) {
+	$client_description = $options["description"];
+}
+else if (array_key_exists("d",$options)) {
+	$client_description = $options["d"];
+}
+
+if (empty($client_description)) {
+	echo "[ERROR] Missing client description".PHP_EOL;
+	exit(1);
+}
+
+$keys_file = getenv("DDBASEROOT")."/ddservice_clients_keys.json";
+
+$existing_keys = array();
+if (file_exists($keys_file)) {
+	$keys_content = file_get_contents($keys_file);
+	if (empty($keys_content)) {
+		echo "[ERROR] Cannot load DDService clients keys file: $keys_file".PHP_EOL;
+		exit(1);
+	}
+	$existing_keys = json_decode($keys_content, TRUE);
+	if ($existing_keys == NULL) {
+		echo "[ERROR] DDService clients keys file seems to be corrupted: $keys_file".PHP_EOL;
+		exit(1);
+	}
+}
+
+$public_key=md5(microtime());
+
+sleep(1);
+
+$private_key=md5(microtime());
+
+$existing_keys[] = array(
+	"public"  => $public_key,
+	"private" => $private_key,
+	"description" => $client_description,
+);
+
+if (!file_put_contents($keys_file, json_encode($existing_keys))) {
+	echo "[ERROR] Cannot write clients keys file: $keys_file".PHP_EOL;
+	exit(1);
+}
+
+echo "DESCRIPTION: $client_description".PHP_EOL;
+echo "PUBLIC_KEY: $public_key".PHP_EOL;
+echo "PRIVATE_KEY: $private_key".PHP_EOL;
+
+exit(0);
+
+?>
@@ -0,0 +1,30 @@
+<?php
+
+$keys_file = getenv("DDBASEROOT")."/ddservice_clients_keys.json";
+
+if (!file_exists($keys_file)) {
+	echo "[ERROR] DDService clients keys file not exists: $keys_file".PHP_EOL;
+	exit(1);
+}
+
+$keys_content = file_get_contents($keys_file);
+if (empty($keys_content)) {
+	echo "[ERROR] Cannot load DDService clients keys file: $keys_file".PHP_EOL;
+	exit(1);
+}
+$existing_keys = json_decode($keys_content, TRUE);
+if ($existing_keys == NULL) {
+	echo "[ERROR] DDService clients keys file seems to be corrupted: $keys_file".PHP_EOL;
+	exit(1);
+}
+
+foreach ($existing_keys as $key_info) {
+	echo "DESCRIPTION: ".$key_info['description'].PHP_EOL;
+	echo "PUBLIC_KEY: ".$key_info['public'].PHP_EOL;
+	echo "PRIVATE_KEY: ".$key_info['private'].PHP_EOL;
+	echo "".PHP_EOL;
+}
+
+exit(0);
+
+?>
 <?php
+	require_once(dirname(__FILE__) . '/UserManagerClass.php');
-class UserManagerClass
-{
-	protected $infoXml;
-	protected $stderr;
-	protected $rootElement;
-
-	function __construct($stderr)
-	{
-		$this->stderr = $stderr;
-
-		$this->infoXml = new DomDocument("1.0","UTF-8");
-		$this->infoXml->preserveWhiteSpace = false;
-		$this->infoXml->formatOutput = true;
- 
-	}
-
-	function GetInfoXmlFilePath()
-	{
-		return getenv("DDINFO")."/".getenv("AMDA_USERS_INFO");
-	}
-
-	function GetGroupsXmlFilePath()
-	{
-		return getenv("DDINFO")."/".getenv("AMDA_GROUPS_INFO");
-	}
-
-	function LoadInfoXmlFile()
-	{
-		if (file_exists($this->GetInfoXmlFilePath())) 
-		{
-			$this->infoXml->load($this->GetInfoXmlFilePath());
-			$this->rootElement = $this->infoXml->documentElement;
-		}
-		else
-		{
-			$this->rootElement = $this->infoXml->createElement("users");
-			$this->infoXml->appendChild($this->rootElement);
-		}
-
-		return 1;
-	}
-
-	function AddUser($login, $pwd_hash, $first_name, $last_name, $email, $news, $groups)
-	{
-		if (!$this->LoadInfoXmlFile())
-		return 0;
-
-		$users = $this->infoXml->getElementsByTagName("user");
-
-		//test if login is already used
-		for ($i = 0; $i < $users->length; $i++)
-		{
-			$crtLogin = $users->item($i)->getAttribute("login");
-			if ($crtLogin == $login)
-				{
-					fprintf($this->stderr,"Login already exist on users info file\n");
-					return 0;
-				}
-		}
-
-		date_default_timezone_set('UTC');
-		$user = $this->infoXml->createElement("user");
-		$user->setAttribute("login",$login);
-		$user->setAttribute("name",$last_name);
-		$user->setAttribute("first_name",$first_name);
-		$user->setAttribute("group",$groups);
-		$user->setAttribute("email",$email);
-		$user->setAttribute("date",date('j/m/y'));
-		$user->setAttribute("news",$news);
-
-		$this->rootElement->appendChild($user);
-  
-
-		exec('DDadmin -a '.$login.' '.$pwd_hash,$output,$return);
-
-		if ($return != 0)
-		{
-			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
-			return 0;
-		}
-		else
-			$this->infoXml->save($this->GetInfoXmlFilePath());
-
-		return 1;
-	}
-
-	function ModifyUserPwd($login, $pwd_hash, $pwd_hash_new)
-	{
-		exec('DDadmin -m '.$login.' '.$pwd_hash.' '.$pwd_hash_new,$output,$return);
-
-		if ($return != 0)
-		{
-			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
-			return 0;
-		}
-		
-		return 1;
-	}
-
-	function ModifyUserGroup($login,$groups)
-	{
-		if (!$this->LoadInfoXmlFile())
-		return 0;
-
-		$users = $this->infoXml->getElementsByTagName("user");
-
-		for ($i = 0; $i < $users->length; $i++)
-		{
-			$crtLogin = $users->item($i)->getAttribute("login");
-			if ($crtLogin == $login)
-				{
-					$users->item($i)->setAttribute("group",$groups);
-					$this->infoXml->save($this->GetInfoXmlFilePath());
-					return 1;
-				}
-		}
-
-		fprintf($this->stderr,"Cannot found user\n");
-		return 0;
-	}
-
-	function ResetUserPwd($login)
-	{
-		exec('DDadmin -r '.$login,$output,$return);
-
-		if ($return != 0)
-		{
-			fprintf($this->stderr,"DDadmin error : ".$output."\n");
-			return 0;
-		}
-		else
-			fprintf($this->stderr,"New password is  : ".$output[0]."\n");
-		
-		return 1;
-	}
-
-	function DeleteUser($login)
-	{
-		if (!$this->LoadInfoXmlFile())
-				return 0;
-		
-		$users = $this->infoXml->getElementsByTagName("user");
-
-		for ($i = 0; $i < $users->length; $i++)
-		{
-			$crtLogin = $users->item($i)->getAttribute("login");
-			if ($crtLogin == $login)
-			{
-				$this->rootElement->removeChild($users->item($i));
-				break;
-			}
-		}
-
-		exec('DDadmin -d '.$login,$output,$return);
-
-		if ($return != 0)
-		{
-			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
-			return 0;
-		}
-
-		$this->infoXml->save($this->GetInfoXmlFilePath());
-		
-		return 1;
-	}
-
-	//This function will be deprecated for AMDA-NG
-	function GenerateGroupsXmlFile()
-	{
-		if (!$this->LoadInfoXmlFile())
-			return 0;
-
-		$users = $this->infoXml->getElementsByTagName("user");
-
-		$groupsXml = new DomDocument("1.0","UTF-8");
-		$groupsXml->preserveWhiteSpace = false;
-		$groupsXml->formatOutput = true;
-		$rootGroupsElement = $groupsXml->createElement("AMDA_USERS");
-		$groupsXml->appendChild($rootGroupsElement);
-			
-		for ($i = 0; $i < $users->length; $i++)
-		{
-			if (strcmp($users->item($i)->getAttribute("group"),"") == 0)
-					continue;
-			$u = $groupsXml->createElement("user",$users->item($i)->getAttribute("login"));
-			$u->setAttribute("group",$users->item($i)->getAttribute("group"));
-			$rootGroupsElement->appendChild($u);
-		}
-
-		$groupsXml->save($this->GetGroupsXmlFilePath());
-
-		return 1;
-	}
-
-	function SendRegistrationMail($login,$pwd,$first_name, $last_name, $email)
-	{
-		$subject = 'AMDA registration';
-
-		$msg  = "Dear $first_name $last_name, \r\n\r\n";
-		$msg .= "Thanks for your interest in AMDA\r\n\r\n";
-		$msg .= "Your login: $login \r\n";
-		$msg .= "  password: $pwd \r\n\r\n";
-		$msg .= "at http://amda.cdpp.eu \r\n\r\n";
-		$msg .= "Please contact us in case of any problems or questions.\r\n\r\n";
-		$msg .= "Best regards,\r\n\r\n";
-		$msg .= "CDPP-AMDA Team";
-	
-		$headers = "From: amda@irap.omp.eu " . "\r\n".
-						"Reply-To: amda@irap.omp.eu " . "\r\n".
-						"Cc: amda@irap.omp.eu" . "\r\n".
-						"Content-type: text/plain; charset=utf-8\r\n";
-		mail($email, $subject, $msg, $headers);
-
-	}
-
-	function Check()
-	{
-		if (!$this->LoadInfoXmlFile())
-			return 0;
-
-		$users = $this->infoXml->getElementsByTagName("user");
-
-		exec('DDadmin -l',$output,$return);
-
-		if ($return != 0)
-			{
-			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
-			return 0;
-			}
-			
-		$ddAdminUsers = explode(',',$output[0]);
-
-		for ($i = 0; $i < $users->length; $i++)
-		{
-			$found = false;
-			for ($j = 0; $j < count($ddAdminUsers); $j++)
-				if (strcmp($users->item($i)->getAttribute("login"),$ddAdminUsers[$j]) == 0)
-				{ 
-					$found = true;
-					break;
-				}
-			if (!$found)
-				fprintf($this->stderr,"User ".$users->item($i)->getAttribute("login")." not found on nc file\n");
-		}
-
-		for ($i = 0; $i < count($ddAdminUsers); $i++)
-		{
-			$found = false;
-			for ($j = 0; $j < $users->length; $j++)
-				if (strcmp($users->item($j)->getAttribute("login"),$ddAdminUsers[$i]) == 0)
-				{    
-					$found = true;
-					break;
-				}
-			if (!$found)
-				fprintf($this->stderr,"User ".$ddAdminUsers[$i]." not found on info file\n");
-		}
-
-		return 1;
-	}
-}
-
-//-----------------------------------------------------------------------------------------------------
-	//crypt the password with the salt corresponding to the login
-	function cryptPwd($login,$pwd)
-	{
-	exec('DDadmin -s '.$login,$output,$return);
-
-	if ($return != 0)
-			{
-		fprintf($this->stderr,"DDadmin error : ".$output."\n");
-		return '';
-			}
-
-	$salt = $output[0];
-
-	return crypt($pwd,$salt);
-	}
-
-//----------------------------------------------------------------------------------------------------
 	putenv("LD_LIBRARY_PATH=".getenv("LD_LIBRARY_PATH"));
 	putenv("PATH=./:".getenv("DDBASEBIN").":/bin:/usr/bin");
@@ -378,7 +99,7 @@ class UserManagerClass
 			}
 			if (isset($args->pwd_hashed) && !($args->pwd_hashed))
-				$pwd_hash = cryptPwd($args->login,$args->pwd);
+				$pwd_hash = $userManager->cryptPwd($args->login,$args->pwd);
 			else
 				$pwd_hash = $args->pwd;
@@ -0,0 +1,281 @@
+<?php
+
+class UserManagerClass
+{
+	protected $infoXml;
+	protected $stderr;
+	protected $rootElement;
+
+	function __construct($stderr)
+	{
+		$this->stderr = $stderr;
+
+		$this->infoXml = new DomDocument("1.0","UTF-8");
+		$this->infoXml->preserveWhiteSpace = false;
+		$this->infoXml->formatOutput = true;
+ 
+	}
+
+	function GetInfoXmlFilePath()
+	{
+		return getenv("DDINFO")."/".getenv("AMDA_USERS_INFO");
+	}
+
+	function GetGroupsXmlFilePath()
+	{
+		return getenv("DDINFO")."/".getenv("AMDA_GROUPS_INFO");
+	}
+
+	function LoadInfoXmlFile()
+	{
+		if (file_exists($this->GetInfoXmlFilePath())) 
+		{
+			$this->infoXml->load($this->GetInfoXmlFilePath());
+			$this->rootElement = $this->infoXml->documentElement;
+		}
+		else
+		{
+			$this->rootElement = $this->infoXml->createElement("users");
+			$this->infoXml->appendChild($this->rootElement);
+		}
+
+		return 1;
+	}
+
+	function AddUser($login, $pwd_hash, $first_name, $last_name, $email, $news, $groups)
+	{
+		if (!$this->LoadInfoXmlFile())
+		return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		//test if login is already used
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$crtLogin = $users->item($i)->getAttribute("login");
+			if ($crtLogin == $login)
+				{
+					fprintf($this->stderr,"Login already exist on users info file\n");
+					return 0;
+				}
+		}
+
+		date_default_timezone_set('UTC');
+		$user = $this->infoXml->createElement("user");
+		$user->setAttribute("login",$login);
+		$user->setAttribute("name",$last_name);
+		$user->setAttribute("first_name",$first_name);
+		$user->setAttribute("group",$groups);
+		$user->setAttribute("email",$email);
+		$user->setAttribute("date",date('j/m/y'));
+		$user->setAttribute("news",$news);
+
+		$this->rootElement->appendChild($user);
+  
+
+		exec('DDadmin -a '.$login.' '.$pwd_hash,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+		}
+		else
+			$this->infoXml->save($this->GetInfoXmlFilePath());
+
+		return 1;
+	}
+
+	function ModifyUserPwd($login, $pwd_hash, $pwd_hash_new)
+	{
+		exec('DDadmin -m '.$login.' '.$pwd_hash.' '.$pwd_hash_new,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+		}
+		
+		return 1;
+	}
+
+	function ModifyUserGroup($login,$groups)
+	{
+		if (!$this->LoadInfoXmlFile())
+		return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$crtLogin = $users->item($i)->getAttribute("login");
+			if ($crtLogin == $login)
+				{
+					$users->item($i)->setAttribute("group",$groups);
+					$this->infoXml->save($this->GetInfoXmlFilePath());
+					return 1;
+				}
+		}
+
+		fprintf($this->stderr,"Cannot found user\n");
+		return 0;
+	}
+
+	function ResetUserPwd($login)
+	{
+		exec('DDadmin -r '.$login,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output."\n");
+			return 0;
+		}
+		else
+			fprintf($this->stderr,"New password is  : ".$output[0]."\n");
+		
+		return 1;
+	}
+
+	function DeleteUser($login)
+	{
+		if (!$this->LoadInfoXmlFile())
+				return 0;
+		
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$crtLogin = $users->item($i)->getAttribute("login");
+			if ($crtLogin == $login)
+			{
+				$this->rootElement->removeChild($users->item($i));
+				break;
+			}
+		}
+
+		exec('DDadmin -d '.$login,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+		}
+
+		$this->infoXml->save($this->GetInfoXmlFilePath());
+		
+		return 1;
+	}
+
+	//This function will be deprecated for AMDA-NG
+	function GenerateGroupsXmlFile()
+	{
+		if (!$this->LoadInfoXmlFile())
+			return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		$groupsXml = new DomDocument("1.0","UTF-8");
+		$groupsXml->preserveWhiteSpace = false;
+		$groupsXml->formatOutput = true;
+		$rootGroupsElement = $groupsXml->createElement("AMDA_USERS");
+		$groupsXml->appendChild($rootGroupsElement);
+			
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			if (strcmp($users->item($i)->getAttribute("group"),"") == 0)
+					continue;
+			$u = $groupsXml->createElement("user",$users->item($i)->getAttribute("login"));
+			$u->setAttribute("group",$users->item($i)->getAttribute("group"));
+			$rootGroupsElement->appendChild($u);
+		}
+
+		$groupsXml->save($this->GetGroupsXmlFilePath());
+
+		return 1;
+	}
+
+	function SendRegistrationMail($login,$pwd,$first_name, $last_name, $email)
+	{
+		$subject = 'AMDA registration';
+
+		$msg  = "Dear $first_name $last_name, \r\n\r\n";
+		$msg .= "Thanks for your interest in AMDA\r\n\r\n";
+		$msg .= "Your login: $login \r\n";
+		$msg .= "  password: $pwd \r\n\r\n";
+		$msg .= "at http://amda.cdpp.eu \r\n\r\n";
+		$msg .= "Please contact us in case of any problems or questions.\r\n\r\n";
+		$msg .= "Best regards,\r\n\r\n";
+		$msg .= "CDPP-AMDA Team";
+	
+		$headers = "From: amda@irap.omp.eu " . "\r\n".
+						"Reply-To: amda@irap.omp.eu " . "\r\n".
+						"Cc: amda@irap.omp.eu" . "\r\n".
+						"Content-type: text/plain; charset=utf-8\r\n";
+		mail($email, $subject, $msg, $headers);
+
+	}
+
+	function Check()
+	{
+		if (!$this->LoadInfoXmlFile())
+			return 0;
+
+		$users = $this->infoXml->getElementsByTagName("user");
+
+		exec('DDadmin -l',$output,$return);
+
+		if ($return != 0)
+			{
+			fprintf($this->stderr,"DDadmin error : ".$output[0]."\n");
+			return 0;
+			}
+			
+		$ddAdminUsers = explode(',',$output[0]);
+
+		for ($i = 0; $i < $users->length; $i++)
+		{
+			$found = false;
+			for ($j = 0; $j < count($ddAdminUsers); $j++)
+				if (strcmp($users->item($i)->getAttribute("login"),$ddAdminUsers[$j]) == 0)
+				{ 
+					$found = true;
+					break;
+				}
+			if (!$found)
+				fprintf($this->stderr,"User ".$users->item($i)->getAttribute("login")." not found on nc file\n");
+		}
+
+		for ($i = 0; $i < count($ddAdminUsers); $i++)
+		{
+			$found = false;
+			for ($j = 0; $j < $users->length; $j++)
+				if (strcmp($users->item($j)->getAttribute("login"),$ddAdminUsers[$i]) == 0)
+				{    
+					$found = true;
+					break;
+				}
+			if (!$found)
+				fprintf($this->stderr,"User ".$ddAdminUsers[$i]." not found on info file\n");
+		}
+
+		return 1;
+	}
+
+	//crypt the password with the salt corresponding to the login
+	function cryptPwd($login,$pwd)
+	{
+		exec('DDadmin -s '.$login,$output,$return);
+
+		if ($return != 0)
+		{
+			fprintf($this->stderr,"DDadmin error : ".$output."\n");
+			return '';
+		}
+
+		$salt = $output[0];
+
+		return crypt($pwd,$salt);
+        }
+}
+
+?>
@@ -14,6 +14,10 @@
      private $alias = array(baseDir => webAlias); 
      private $extAlias = array(extBaseDir => extWebAlias);
+    function base64url_decode($data) {
+        return base64_decode(str_pad(strtr($data, '-_', '+/'), strlen($data) % 4, '=', STR_PAD_RIGHT));
+    } 
+
 /**     
 *  Checks if Remote Data Set has been already added
 */
@@ -158,13 +162,70 @@
               else return NOUSERGROUPSSPECIFIED;     
           }
+	function checkProtectedAPI($data, $key, $check)
+	{
+	  $data_decoded = $this->base64url_decode($data);
+          if (empty($data_decoded)) {
+              return array(
+                  "valid" => FALSE,
+              );
+          }
+
+          $data_array = json_decode($data_decoded, TRUE);
+          if (empty($data_array) || empty($data_array["timestamp"])) {
+              return array(
+                  "valid" => FALSE,
+              );
+          }
+
+          if (time() - intval($data_array["timestamp"]) > 30) {
+              return $data_array + array("valid" => FALSE);
+          }
+
+          $keys_file = rootDir."/ddservice_clients_keys.json";
+          if (!file_exists($keys_file)) {
+              return $data_array + array("valid" => FALSE);
+          }
+
+          $keys_content = file_get_contents($keys_file);
+          if (empty($keys_content)) {
+              return $data_array + array("valid" => FALSE);
+          }
+
+          $existing_keys = json_decode($keys_content, TRUE);
+          if (empty($existing_keys)) {
+              return $data_array + array("valid" => FALSE);
+          }
+
+          $private = "";
+          foreach ($existing_keys as $keys) {
+              if ($keys["public"] == $key) {
+                  $private = $keys["private"];
+                  break;
+              }
+          }
+
+          if (empty($private)) {
+              return $data_array + array("valid" => FALSE);
+          }
+
+          $computed_check = md5($data.$key.$private);
+          if ($computed_check != $check) {
+              return $data_array + array("valid" => FALSE);
+          }
+
+          return $data_array + array("valid" => TRUE);
+	}
+
 /*
 *       Return info about a user
 */
-	function getUserInfo($login,$hash)
+	function getUserInfo($data, $key, $check)
 	{
-	  if (md5(PRIVATEKEY.$login.__FUNCTION__) != $hash)
+          $data_array = $this->checkProtectedAPI($data, $key, $check);
+          if ($data_array['valid'] == FALSE) {
+            $login = array_key_exists("login", $data_array) ? $data_array["login"] : "undefined";
 	    return array("success"     => FALSE,
 			 "login"       => $login,
 			 "name"        => "undefined",
@@ -173,11 +234,13 @@
 			 "email"       => "undefined",
 			 "date"        => "undefined",
 			 "news"        => "0");
+          }
 	  $UsrDom = new DomDocument("1.0");
 	  $UsrDom->load(extWebAlias."AMDA_Users_Info.xml");
 	  $xp = new domxpath($UsrDom);                                                                             
-	  $theUser = $xp->query("//user[@login='".$login."']");
+	  $theUser = $xp->query("//user[@login='".$data_array["login"]."']");
+          $login = array_key_exists("login", $data_array) ? $data_array["login"] : "undefined";
 	  return array("success"     => TRUE,
 		       "login"       => $login,
@@ -189,6 +252,29 @@
 		       "news"        => ($theUser->length > 0) ? $theUser->item(0)->getAttribute("news")  : "0");
 	}
+        function createUser($data, $key, $check)
+        {
+          $data_array = $this->checkProtectedAPI($data, $key, $check);
+          if ($data_array['valid'] == FALSE) {
+              return FALSE;
+          }
+
+          if (empty($data_array['pwd']) || empty($data_array['login']) || empty($data_array['first_name']) || empty($data_array['last_name']) || empty($data_array['email'])) {
+              return FALSE;
+          }
+
+          require_once userMgrDir."/UserManagerClass.php";
+          putenv("PATH=./:".DDBASEBIN.":/bin:/usr/bin");
+          putenv("DDINFO=".extBaseDir);
+          putenv("DDBASE=".baseDir);
+          putenv("AMDA_USERS_INFO=AMDA_Users_Info.xml");
+          putenv("AMDA_GROUPS_INFO=AMDA_Users.xml");
+          $stderr = fopen("php://stderr","w");
+          $userManager = new UserManagerClass($stderr);
+          $pwd_hash = crypt($data_array['pwd'],chr(rand(97,122)).chr(rand(97,122)));
+          return ($userManager->AddUser($data_array['login'], $pwd_hash, $data_array['first_name'], $data_array['last_name'], $data_array['email'], 1, '') == 1);
+        }
+
 /*
 *       Return a list of group for which a user is a member
 */
@@ -16,8 +16,10 @@
 /* Compound Definitions: Nothing to modify */
+   define("rootDir", "@DDBASEPATH@");
    define("baseDir", "@DDBASEDATA@");
    define("extBaseDir", "@DDBASEINFO@");
+   define ("userMgrDir", "@USERMANAGER@");
 //   define("extBaseXml", "Bases.xml");
   define("webAlias", rootAlias."/DATA/");
@@ -142,12 +142,21 @@
  <part name='Result' type='xsd:string'/>
 </message>
 <message name='getUserInfoRequest'>
-  <part name='login' type='xsd:string'/>
-  <part name='hash' type='xsd:string'/>
+  <part name='data' type='xsd:string'/>
+  <part name='key' type='xsd:string'/>
+  <part name='check' type='xsd:string'/>
 </message>
 <message name='getUserInfoResponse'>
  <part name='Result' type='tns:UserInfoData'/>
 </message>
+<message name='createUserRequest'>
+  <part name='data' type='xsd:string'/>
+  <part name='key' type='xsd:string'/>
+  <part name='check' type='xsd:string'/>
+</message>
+<message name='createUserResponse'>
+ <part name='Result' type='xsd:boolean'/>
+</message>
 <message name='getTimeRestrictionRequest'>
   <part name='dataSet' type='xsd:string'/>  
 </message>
@@ -224,6 +233,10 @@
   <operation name='getUserInfo'>
     <input message='tns:getUserInfoRequest'/>
     <output message='tns:getUserInfoResponse'/>
+  </operation>
+  <operation name='createUser'>
+    <input message='tns:createUserRequest'/>
+    <output message='tns:createUserResponse'/>
   </operation> 
   <operation name='getTimeRestriction'>
     <input message='tns:getTimeRestrictionRequest'/>
@@ -414,6 +427,17 @@
         encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
     </output>
   </operation>
+  <operation name='createUser'>
+    <soap:operation soapAction='createUser'/>
+    <input>
+      <soap:body use='encoded'
+        encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+    </input>
+    <output>
+      <soap:body use='encoded'
+        encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+    </output>
+  </operation>
     <operation name='getTimeRestriction'>
     <soap:operation soapAction='getTimeRestriction'/>
     <input>