From c972e67aa186537d3a7248c618b8329997a81650 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 26 Apr 2011 11:58:34 +0200 Subject: ressource --- application/controllers/ResourceController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application/controllers/ResourceController.php') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 9d7af7f..153c234 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -436,7 +436,7 @@ class ResourceController extends Zend_Controller_Action if($loginname != '' && $password != ''){ if($user->getHometypeID() == 1) - exec("echo 'if [ -d /media/openslx-stick ] then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ] then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s /bin/bash -p \"".$password."\" ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); + exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s /bin/bash -p \"".$password."\" ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); else exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); } -- cgit v1.2.3-55-g7522 From 0f8a1210c45980a54020bf90c673ae65d183f667 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 26 Apr 2011 12:15:02 +0200 Subject: ressource fix --- application/controllers/ResourceController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/controllers/ResourceController.php') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 153c234..5bd3d97 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -436,9 +436,9 @@ class ResourceController extends Zend_Controller_Action if($loginname != '' && $password != ''){ if($user->getHometypeID() == 1) - exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s /bin/bash -p \"".$password."\" ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s /bin/bash -p \"".$password."\" ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); + exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s \"/bin/bash\" -p \"".$password."\" ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s \"/bin/bash\" -p \"".$password."\" ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s \"/bin/bash\" -p \"".$password."\" ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); else - exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); + exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s \"/bin/bash\" -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); } } -- cgit v1.2.3-55-g7522 From 293c5366f3a7ec17608517f6967a726b8579414b Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 26 Apr 2011 12:25:24 +0200 Subject: ressource fix --- application/controllers/ResourceController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'application/controllers/ResourceController.php') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 5bd3d97..3599ecc 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -436,9 +436,9 @@ class ResourceController extends Zend_Controller_Action if($loginname != '' && $password != ''){ if($user->getHometypeID() == 1) - exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s \"/bin/bash\" -p \"".$password."\" ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s \"/bin/bash\" -p \"".$password."\" ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s \"/bin/bash\" -p \"".$password."\" ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); + exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".$password."' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); else - exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s \"/bin/bash\" -p \"".$password."\" ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); + exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".$password."' ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); } } -- cgit v1.2.3-55-g7522 From 8034194329d4eaaf2d526dfb81e4ce19b3dca81f Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 26 Apr 2011 12:50:33 +0200 Subject: config fix --- application/controllers/ResourceController.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'application/controllers/ResourceController.php') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 3599ecc..8d52348 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -435,10 +435,10 @@ class ResourceController extends Zend_Controller_Action } if($loginname != '' && $password != ''){ - if($user->getHometypeID() == 1) - exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".$password."' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); - else - exec("echo 'chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".$password."' ".$loginname."' >> $tmp_conf/initramfs/postinit.local",$restul); +// if($user->getHometypeID() == 1) +// //exec("echo 'if [ -d /media/openslx-stick ]; then \n\t if [ ! -d /media/openslx-stick/home/".$loginname." ]; then \n\t\t chroot /mnt useradd -d ".$homepath." -m -s /bin/bash -p '".escapeshellarg("'".$password."'").' ".$loginname." \n\t else \n\t\t chroot /mnt useradd -d ".$homepath." -s '/bin/bash' -p '".$password."' ".$loginname." \n\t fi \n else \n\t chroot /mnt useradd -d /home/".$loginname." -m -s '/bin/bash' -p '".$password."' ".$loginname." \n fi' >> $tmp_conf/initramfs/postinit.local"); +// else + exec("echo 'chroot /mnt useradd -d '".escapeshellarg("'".$homepath."'")."' -m -s /bin/bash -p '".escapeshellarg("'".$password."'")."' '".escapeshellarg("'".$loginname."'")."'' >> $tmp_conf/initramfs/postinit.local",$restul); } } -- cgit v1.2.3-55-g7522 From dccf01a783638c8dd7881ce3408a1197e1988878 Mon Sep 17 00:00:00 2001 From: michael pereira Date: Tue, 26 Apr 2011 13:15:38 +0200 Subject: crypt --- application/controllers/ResourceController.php | 2 +- application/modules/user/controllers/ConfigController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'application/controllers/ResourceController.php') diff --git a/application/controllers/ResourceController.php b/application/controllers/ResourceController.php index 8d52348..aad9ab8 100644 --- a/application/controllers/ResourceController.php +++ b/application/controllers/ResourceController.php @@ -396,7 +396,7 @@ class ResourceController extends Zend_Controller_Action $tmp_conf = "../resources/config/$hash"; mkdir($tmp_conf ,0777, true); exec("tar -C $tmp_conf -xf ../resources/bootos/$bootosID/config/default.tgz",$restul); - exec("tar -C $tmp_conf/rootfs/ -xf ../resources/config/etc.tgz"); + //exec("tar -C $tmp_conf/rootfs/ -xf ../resources/config/etc.tgz"); $username = ''; $userpassword = ''; diff --git a/application/modules/user/controllers/ConfigController.php b/application/modules/user/controllers/ConfigController.php index eca5d54..a1b83ed 100644 --- a/application/modules/user/controllers/ConfigController.php +++ b/application/modules/user/controllers/ConfigController.php @@ -286,7 +286,7 @@ class user_ConfigController extends Zend_Controller_Action $bootosuser->setConfigID($configID); $bootosuser->setHomepath(str_replace("%login-name%", $bootosuser->getLogin(), $bootosuser->getHomepath())); if($bootosuser->getPassword() != '%password%') - $bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$'.randomString(8).'$')); + $bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$')); try { $this->bootosuserMapper->save($bootosuser); @@ -365,7 +365,7 @@ class user_ConfigController extends Zend_Controller_Action $bootosuser->setConfigID($configID); $bootosuser->setHomepath(str_replace("%login-name%", $bootosuser->getLogin(), $bootosuser->getHomepath())); if($bootosuser->getPassword() != '%password%') - $bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$'.randomString(8).'$')); + $bootosuser->setPassword(crypt($bootosuser->getPassword(), '$6$')); try { $this->bootosuserMapper->save($bootosuser); -- cgit v1.2.3-55-g7522