From 28a1b864972e1f93aa57c88c0cce9ea97e61bea2 Mon Sep 17 00:00:00 2001 From: laking <laking@ispconfig3> Date: Mon, 04 Apr 2011 21:33:44 -0400 Subject: [PATCH] Update on certificte ssh-rsa authentication. Under construction are the shell plugins. --- interface/web/client/client_edit.php | 13 +++++-------- 1 files changed, 5 insertions(+), 8 deletions(-) diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php index a42be33..4514b5c 100644 --- a/interface/web/client/client_edit.php +++ b/interface/web/client/client_edit.php @@ -152,15 +152,12 @@ //Generate ssh-rsa-keys exec('ssh-keygen -t rsa -C '.$username.'-rsa-key-'.time().' -f /tmp/id_rsa -N ""'); - - $privatekey = file_get_contents('/tmp/id_rsa'); - $publickey = file_get_contents('/tmp/id_rsa.pub'); - + $app->db->query("UPDATE client SET created_at = ".time().", id_rsa = '".file_get_contents('/tmp/id_rsa')."', ssh_rsa = '".file_get_contents('/tmp/id_rsa.pub')."' WHERE client_id = ".$this->id; exec('rm -f /tmp/id_rsa /tmp/id_rsa.pub'); - + // Create the controlpaneluser for the client - $sql = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id,id_rsa,ssh_rsa) - VALUES ('$username',md5('$password'),'$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,".$this->id.",'$privatekey','$publickey')"; + $sql = "INSERT INTO sys_user (username,passwort,modules,startmodule,app_theme,typ,active,language,groups,default_group,client_id) + VALUES ('$username',md5('$password'),'$modules','$startmodule','$usertheme','$type','$active','$language',$groups,$groupid,".$this->id.")"; $app->db->query($sql); //* If the user who inserted the client is a reseller (not admin), we will have to add this new client group @@ -170,7 +167,7 @@ $app->db->query("UPDATE client SET parent_client_id = ".intval($_SESSION['s']['user']['client_id'])." WHERE client_id = ".$this->id); } - $app->db->query("UPDATE client SET created_at = ".time()." WHERE client_id = ".$this->id); + /* If there is a client-template, process it */ applyClientTemplates($this->id); -- Gitblit v1.9.1