@@ -12,48 +12,48 @@ |
||
| 12 | 12 | * Test bootstrap, for setting up autoloading |
| 13 | 13 | */ |
| 14 | 14 | class Bootstrap { |
| 15 | - protected static $serviceManager; |
|
| 16 | - |
|
| 17 | - public static function init() { |
|
| 18 | - static::initAutoloader(); |
|
| 19 | - } |
|
| 20 | - |
|
| 21 | - protected static function initAutoloader() { |
|
| 22 | - $vendorPath = static::findParentPath('vendor'); |
|
| 23 | - |
|
| 24 | - if (file_exists($vendorPath . '/autoload.php')) { |
|
| 25 | - include $vendorPath . '/autoload.php'; |
|
| 26 | - } |
|
| 27 | - |
|
| 28 | - if (!class_exists('Zend\Loader\AutoloaderFactory')) { |
|
| 29 | - throw new RuntimeException( |
|
| 30 | - 'Unable to load ZF2. Run `php composer.phar install`' |
|
| 31 | - ); |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - AutoloaderFactory::factory(array( |
|
| 35 | - 'Zend\Loader\StandardAutoloader' => array( |
|
| 36 | - 'autoregister_zf' => true, |
|
| 37 | - 'namespaces' => array( |
|
| 38 | - __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__, |
|
| 39 | - ), |
|
| 40 | - ), |
|
| 41 | - )); |
|
| 42 | - } |
|
| 43 | - |
|
| 44 | - protected static function findParentPath($path) { |
|
| 45 | - $dir = __DIR__; |
|
| 46 | - $previousDir = '.'; |
|
| 47 | - while (!is_dir($dir . '/' . $path)) { |
|
| 48 | - $dir = dirname($dir); |
|
| 49 | - if ($previousDir === $dir) { |
|
| 50 | - return false; |
|
| 51 | - } |
|
| 52 | - $previousDir = $dir; |
|
| 53 | - } |
|
| 54 | - |
|
| 55 | - return $dir . '/' . $path; |
|
| 56 | - } |
|
| 15 | + protected static $serviceManager; |
|
| 16 | + |
|
| 17 | + public static function init() { |
|
| 18 | + static::initAutoloader(); |
|
| 19 | + } |
|
| 20 | + |
|
| 21 | + protected static function initAutoloader() { |
|
| 22 | + $vendorPath = static::findParentPath('vendor'); |
|
| 23 | + |
|
| 24 | + if (file_exists($vendorPath . '/autoload.php')) { |
|
| 25 | + include $vendorPath . '/autoload.php'; |
|
| 26 | + } |
|
| 27 | + |
|
| 28 | + if (!class_exists('Zend\Loader\AutoloaderFactory')) { |
|
| 29 | + throw new RuntimeException( |
|
| 30 | + 'Unable to load ZF2. Run `php composer.phar install`' |
|
| 31 | + ); |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + AutoloaderFactory::factory(array( |
|
| 35 | + 'Zend\Loader\StandardAutoloader' => array( |
|
| 36 | + 'autoregister_zf' => true, |
|
| 37 | + 'namespaces' => array( |
|
| 38 | + __NAMESPACE__ => __DIR__ . '/' . __NAMESPACE__, |
|
| 39 | + ), |
|
| 40 | + ), |
|
| 41 | + )); |
|
| 42 | + } |
|
| 43 | + |
|
| 44 | + protected static function findParentPath($path) { |
|
| 45 | + $dir = __DIR__; |
|
| 46 | + $previousDir = '.'; |
|
| 47 | + while (!is_dir($dir . '/' . $path)) { |
|
| 48 | + $dir = dirname($dir); |
|
| 49 | + if ($previousDir === $dir) { |
|
| 50 | + return false; |
|
| 51 | + } |
|
| 52 | + $previousDir = $dir; |
|
| 53 | + } |
|
| 54 | + |
|
| 55 | + return $dir . '/' . $path; |
|
| 56 | + } |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | Bootstrap::init(); |
| 60 | 60 | \ No newline at end of file |
@@ -36,8 +36,9 @@ discard block |
||
| 36 | 36 | $username |
| 37 | 37 | ) ); |
| 38 | 38 | |
| 39 | - if ($eResult->stopped ()) |
|
| 40 | - return $eResult->last (); |
|
| 39 | + if ($eResult->stopped ()) { |
|
| 40 | + return $eResult->last (); |
|
| 41 | + } |
|
| 41 | 42 | |
| 42 | 43 | return ! in_array ( $username, $this->not_deletable_users ); |
| 43 | 44 | } |
@@ -47,8 +48,9 @@ discard block |
||
| 47 | 48 | 'user' => $username |
| 48 | 49 | ) ); |
| 49 | 50 | |
| 50 | - if ($eResult->stopped ()) |
|
| 51 | - return $eResult->last (); |
|
| 51 | + if ($eResult->stopped ()) { |
|
| 52 | + return $eResult->last (); |
|
| 53 | + } |
|
| 52 | 54 | |
| 53 | 55 | /* If parameter is an array => allow only users in list. IF parameter is boolean, return boolean value */ |
| 54 | 56 | if (is_array ( $this->user_with_management_permission )) { |
@@ -120,8 +120,9 @@ |
||
| 120 | 120 | public function userExists($username) { |
| 121 | 121 | $userList = $this->getUserList (); |
| 122 | 122 | |
| 123 | - if (isset ( $userList [$username] )) |
|
| 124 | - return true; |
|
| 123 | + if (isset ( $userList [$username] )) { |
|
| 124 | + return true; |
|
| 125 | + } |
|
| 125 | 126 | |
| 126 | 127 | return false; |
| 127 | 128 | } |
@@ -11,188 +11,188 @@ |
||
| 11 | 11 | use Zend\View\Model\ViewModel; |
| 12 | 12 | |
| 13 | 13 | class UserController extends AbstractActionController { |
| 14 | - private $htpasswdService = NULL; |
|
| 15 | - private $userService = NULL; |
|
| 16 | - |
|
| 17 | - /** |
|
| 18 | - * Check Login |
|
| 19 | - * |
|
| 20 | - * @see \Zend\Mvc\Controller\AbstractActionController::onDispatch() |
|
| 21 | - */ |
|
| 22 | - public function onDispatch(\Zend\Mvc\MvcEvent $e) { |
|
| 23 | - $username = $this->getUserService()->getCurrentUser(); |
|
| 24 | - |
|
| 25 | - if (false === $this->getUserService()->isUserAllowedToManageUsers($username)) { |
|
| 26 | - $this->getResponse()->setStatusCode(401); |
|
| 27 | - |
|
| 28 | - return; |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - return parent::onDispatch($e); |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - public function indexAction() { |
|
| 35 | - $htpasswdService = $this->getHtpasswdService(); |
|
| 36 | - $userList = $htpasswdService->getUserList(); |
|
| 37 | - |
|
| 38 | - $result = array(); |
|
| 39 | - foreach ($userList as $username => $pass) { |
|
| 40 | - |
|
| 41 | - $result [] = array( |
|
| 42 | - 'username' => $username, |
|
| 43 | - 'paswd' => $pass, |
|
| 44 | - 'isAdmin' => $this->getUserService()->isUserAllowedToManageUsers($username), |
|
| 45 | - 'isDeletable' => $this->getUserService()->isUserDeleteable($username) |
|
| 46 | - ); |
|
| 47 | - } |
|
| 48 | - |
|
| 49 | - $userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService'); |
|
| 50 | - |
|
| 51 | - $model = new ViewModel (array( |
|
| 52 | - 'userList' => $result, |
|
| 53 | - 'currentUser' => $userService->getCurrentUser() |
|
| 54 | - )); |
|
| 55 | - |
|
| 56 | - return $model; |
|
| 57 | - } |
|
| 58 | - |
|
| 59 | - public function deleteAction() { |
|
| 60 | - $user = $this->params('user'); |
|
| 61 | - $messages = array(); |
|
| 62 | - |
|
| 63 | - if (true === $this->getUserService()->isUserDeleteable($user)) { |
|
| 64 | - $this->getHtpasswdService()->deleteUser($user); |
|
| 65 | - $messages [] = "Der Benutzer '{$user}' wurde gelöscht."; |
|
| 66 | - } else { |
|
| 67 | - $messages [] = "Der Benutzer '{$user}' steht auf einer Sperrliste und kann nicht gelöscht werden."; |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - $model = $this->indexAction(); |
|
| 71 | - $model->setTemplate('htpasswd-manager/user/index'); |
|
| 72 | - $model->setVariable('messages', $messages); |
|
| 73 | - |
|
| 74 | - return $model; |
|
| 75 | - } |
|
| 76 | - |
|
| 77 | - public function editAction() { |
|
| 78 | - $user = $this->params('user'); |
|
| 79 | - $messages = array(); |
|
| 80 | - $htpasswd = $this->getHtpasswdService(); |
|
| 81 | - |
|
| 82 | - $model = new ViewModel (); |
|
| 83 | - $model->setVariable('user', $user); |
|
| 84 | - |
|
| 85 | - $post = $this->getRequest()->getPost(); |
|
| 86 | - if (!isset ($post ['password'])) { |
|
| 87 | - // Formular initialisieren |
|
| 88 | - if (false === $htpasswd->userExists($user)) { |
|
| 89 | - $this->redirect()->toRoute('htpasswdmanager', array( |
|
| 90 | - 'action' => 'index' |
|
| 91 | - )); |
|
| 92 | - } |
|
| 93 | - } else { |
|
| 94 | - // Formular speichern |
|
| 95 | - $password = $post ['password']; |
|
| 96 | - $htpasswd->updateUser($user, $password); |
|
| 97 | - $messages [] = "Passwort für '{$user}' wurde aktualisiert."; |
|
| 98 | - |
|
| 99 | - $model = $this->indexAction(); |
|
| 100 | - $model->setTemplate('htpasswd-manager/user/index'); |
|
| 101 | - } |
|
| 102 | - |
|
| 103 | - $model->setVariable('messages', $messages); |
|
| 104 | - |
|
| 105 | - return $model; |
|
| 106 | - } |
|
| 107 | - |
|
| 108 | - public function addAction() { |
|
| 109 | - $username = $this->getRequest()->getPost('username', ''); |
|
| 110 | - $password = $this->getRequest()->getPost('password', ''); |
|
| 111 | - $messages = array(); |
|
| 112 | - $model = new ViewModel (); |
|
| 113 | - |
|
| 114 | - $post = $this->getRequest()->getPost(); |
|
| 115 | - if (!isset ($post ['username'])) { |
|
| 116 | - return new ViewModel (array( |
|
| 117 | - 'username' => $username, |
|
| 118 | - 'password' => $password, |
|
| 119 | - 'messages' => $messages |
|
| 120 | - )); |
|
| 121 | - } |
|
| 122 | - |
|
| 123 | - $model->setVariable('username', $username); |
|
| 124 | - $uValid = $this->isUsernameValid($username); |
|
| 125 | - if (true !== $uValid) { |
|
| 126 | - $messages [] = $uValid; |
|
| 127 | - } |
|
| 128 | - |
|
| 129 | - $model->setVariable('password', $password); |
|
| 130 | - $pValid = $this->isPasswordValid($password); |
|
| 131 | - if (true !== $pValid) { |
|
| 132 | - $messages [] = $pValid; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - if (true === $uValid && true === $pValid) { |
|
| 136 | - if (true === $this->getHtpasswdService()->userExists($username)) { |
|
| 137 | - $this->getHtpasswdService()->updateUser($username, $password); |
|
| 138 | - $messages [] = "Benutzer '{$username}' wurde aktualisiert."; |
|
| 139 | - } else { |
|
| 140 | - $this->getHtpasswdService()->addUser($username, $password); |
|
| 141 | - $messages [] = "Benutzer '{$username}' wurde hinzugefügt."; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - $model = $this->indexAction(); |
|
| 145 | - $model->setTemplate('htpasswd-manager/user/index'); |
|
| 146 | - } |
|
| 147 | - |
|
| 148 | - $model->setVariable('messages', $messages); |
|
| 149 | - |
|
| 150 | - return $model; |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - /** |
|
| 154 | - * Returns true if valid, of not it returns a string with information about the reason |
|
| 155 | - * |
|
| 156 | - * @param string $username |
|
| 157 | - * @return boolean string |
|
| 158 | - */ |
|
| 159 | - private function isUsernameValid($username) { |
|
| 160 | - if (strlen($username) <= 2) |
|
| 161 | - return "Benutzername ist zu kurz."; |
|
| 162 | - else if (preg_match('~[a-zäöo][a-zäöu_0-9-]+~i', $username) !== 1) |
|
| 163 | - return "Benutzername enthält ungültige Zeichen"; |
|
| 164 | - else if (strpos($username, ' ') !== false) |
|
| 165 | - return "Leerzeichen sind im Benutzernamen nicht erlaubt"; |
|
| 166 | - |
|
| 167 | - return true; |
|
| 168 | - } |
|
| 169 | - |
|
| 170 | - /** |
|
| 171 | - * Returns true if valid, of not it returns a string with information about the reason |
|
| 172 | - * |
|
| 173 | - * @param string $password |
|
| 174 | - * @return boolean string |
|
| 175 | - */ |
|
| 176 | - private function isPasswordValid($password) { |
|
| 177 | - return true; |
|
| 178 | - } |
|
| 179 | - |
|
| 180 | - private function getHtpasswdService() { |
|
| 181 | - if ($this->htpasswdService === NULL) { |
|
| 182 | - $sl = $this->getServiceLocator(); |
|
| 183 | - $this->htpasswdService = $sl->get('HtpasswdManager\Service\HtpasswdService'); |
|
| 184 | - } |
|
| 185 | - |
|
| 186 | - return $this->htpasswdService; |
|
| 187 | - } |
|
| 188 | - |
|
| 189 | - private function getUserService() { |
|
| 190 | - if ($this->userService === NULL) { |
|
| 191 | - $sl = $this->getServiceLocator(); |
|
| 192 | - $this->userService = $sl->get('HtpasswdManager\Service\UserService'); |
|
| 193 | - } |
|
| 194 | - |
|
| 195 | - return $this->userService; |
|
| 196 | - } |
|
| 14 | + private $htpasswdService = NULL; |
|
| 15 | + private $userService = NULL; |
|
| 16 | + |
|
| 17 | + /** |
|
| 18 | + * Check Login |
|
| 19 | + * |
|
| 20 | + * @see \Zend\Mvc\Controller\AbstractActionController::onDispatch() |
|
| 21 | + */ |
|
| 22 | + public function onDispatch(\Zend\Mvc\MvcEvent $e) { |
|
| 23 | + $username = $this->getUserService()->getCurrentUser(); |
|
| 24 | + |
|
| 25 | + if (false === $this->getUserService()->isUserAllowedToManageUsers($username)) { |
|
| 26 | + $this->getResponse()->setStatusCode(401); |
|
| 27 | + |
|
| 28 | + return; |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + return parent::onDispatch($e); |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + public function indexAction() { |
|
| 35 | + $htpasswdService = $this->getHtpasswdService(); |
|
| 36 | + $userList = $htpasswdService->getUserList(); |
|
| 37 | + |
|
| 38 | + $result = array(); |
|
| 39 | + foreach ($userList as $username => $pass) { |
|
| 40 | + |
|
| 41 | + $result [] = array( |
|
| 42 | + 'username' => $username, |
|
| 43 | + 'paswd' => $pass, |
|
| 44 | + 'isAdmin' => $this->getUserService()->isUserAllowedToManageUsers($username), |
|
| 45 | + 'isDeletable' => $this->getUserService()->isUserDeleteable($username) |
|
| 46 | + ); |
|
| 47 | + } |
|
| 48 | + |
|
| 49 | + $userService = $this->getServiceLocator()->get('HtpasswdManager\Service\UserService'); |
|
| 50 | + |
|
| 51 | + $model = new ViewModel (array( |
|
| 52 | + 'userList' => $result, |
|
| 53 | + 'currentUser' => $userService->getCurrentUser() |
|
| 54 | + )); |
|
| 55 | + |
|
| 56 | + return $model; |
|
| 57 | + } |
|
| 58 | + |
|
| 59 | + public function deleteAction() { |
|
| 60 | + $user = $this->params('user'); |
|
| 61 | + $messages = array(); |
|
| 62 | + |
|
| 63 | + if (true === $this->getUserService()->isUserDeleteable($user)) { |
|
| 64 | + $this->getHtpasswdService()->deleteUser($user); |
|
| 65 | + $messages [] = "Der Benutzer '{$user}' wurde gelöscht."; |
|
| 66 | + } else { |
|
| 67 | + $messages [] = "Der Benutzer '{$user}' steht auf einer Sperrliste und kann nicht gelöscht werden."; |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + $model = $this->indexAction(); |
|
| 71 | + $model->setTemplate('htpasswd-manager/user/index'); |
|
| 72 | + $model->setVariable('messages', $messages); |
|
| 73 | + |
|
| 74 | + return $model; |
|
| 75 | + } |
|
| 76 | + |
|
| 77 | + public function editAction() { |
|
| 78 | + $user = $this->params('user'); |
|
| 79 | + $messages = array(); |
|
| 80 | + $htpasswd = $this->getHtpasswdService(); |
|
| 81 | + |
|
| 82 | + $model = new ViewModel (); |
|
| 83 | + $model->setVariable('user', $user); |
|
| 84 | + |
|
| 85 | + $post = $this->getRequest()->getPost(); |
|
| 86 | + if (!isset ($post ['password'])) { |
|
| 87 | + // Formular initialisieren |
|
| 88 | + if (false === $htpasswd->userExists($user)) { |
|
| 89 | + $this->redirect()->toRoute('htpasswdmanager', array( |
|
| 90 | + 'action' => 'index' |
|
| 91 | + )); |
|
| 92 | + } |
|
| 93 | + } else { |
|
| 94 | + // Formular speichern |
|
| 95 | + $password = $post ['password']; |
|
| 96 | + $htpasswd->updateUser($user, $password); |
|
| 97 | + $messages [] = "Passwort für '{$user}' wurde aktualisiert."; |
|
| 98 | + |
|
| 99 | + $model = $this->indexAction(); |
|
| 100 | + $model->setTemplate('htpasswd-manager/user/index'); |
|
| 101 | + } |
|
| 102 | + |
|
| 103 | + $model->setVariable('messages', $messages); |
|
| 104 | + |
|
| 105 | + return $model; |
|
| 106 | + } |
|
| 107 | + |
|
| 108 | + public function addAction() { |
|
| 109 | + $username = $this->getRequest()->getPost('username', ''); |
|
| 110 | + $password = $this->getRequest()->getPost('password', ''); |
|
| 111 | + $messages = array(); |
|
| 112 | + $model = new ViewModel (); |
|
| 113 | + |
|
| 114 | + $post = $this->getRequest()->getPost(); |
|
| 115 | + if (!isset ($post ['username'])) { |
|
| 116 | + return new ViewModel (array( |
|
| 117 | + 'username' => $username, |
|
| 118 | + 'password' => $password, |
|
| 119 | + 'messages' => $messages |
|
| 120 | + )); |
|
| 121 | + } |
|
| 122 | + |
|
| 123 | + $model->setVariable('username', $username); |
|
| 124 | + $uValid = $this->isUsernameValid($username); |
|
| 125 | + if (true !== $uValid) { |
|
| 126 | + $messages [] = $uValid; |
|
| 127 | + } |
|
| 128 | + |
|
| 129 | + $model->setVariable('password', $password); |
|
| 130 | + $pValid = $this->isPasswordValid($password); |
|
| 131 | + if (true !== $pValid) { |
|
| 132 | + $messages [] = $pValid; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + if (true === $uValid && true === $pValid) { |
|
| 136 | + if (true === $this->getHtpasswdService()->userExists($username)) { |
|
| 137 | + $this->getHtpasswdService()->updateUser($username, $password); |
|
| 138 | + $messages [] = "Benutzer '{$username}' wurde aktualisiert."; |
|
| 139 | + } else { |
|
| 140 | + $this->getHtpasswdService()->addUser($username, $password); |
|
| 141 | + $messages [] = "Benutzer '{$username}' wurde hinzugefügt."; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + $model = $this->indexAction(); |
|
| 145 | + $model->setTemplate('htpasswd-manager/user/index'); |
|
| 146 | + } |
|
| 147 | + |
|
| 148 | + $model->setVariable('messages', $messages); |
|
| 149 | + |
|
| 150 | + return $model; |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + /** |
|
| 154 | + * Returns true if valid, of not it returns a string with information about the reason |
|
| 155 | + * |
|
| 156 | + * @param string $username |
|
| 157 | + * @return boolean string |
|
| 158 | + */ |
|
| 159 | + private function isUsernameValid($username) { |
|
| 160 | + if (strlen($username) <= 2) |
|
| 161 | + return "Benutzername ist zu kurz."; |
|
| 162 | + else if (preg_match('~[a-zäöo][a-zäöu_0-9-]+~i', $username) !== 1) |
|
| 163 | + return "Benutzername enthält ungültige Zeichen"; |
|
| 164 | + else if (strpos($username, ' ') !== false) |
|
| 165 | + return "Leerzeichen sind im Benutzernamen nicht erlaubt"; |
|
| 166 | + |
|
| 167 | + return true; |
|
| 168 | + } |
|
| 169 | + |
|
| 170 | + /** |
|
| 171 | + * Returns true if valid, of not it returns a string with information about the reason |
|
| 172 | + * |
|
| 173 | + * @param string $password |
|
| 174 | + * @return boolean string |
|
| 175 | + */ |
|
| 176 | + private function isPasswordValid($password) { |
|
| 177 | + return true; |
|
| 178 | + } |
|
| 179 | + |
|
| 180 | + private function getHtpasswdService() { |
|
| 181 | + if ($this->htpasswdService === NULL) { |
|
| 182 | + $sl = $this->getServiceLocator(); |
|
| 183 | + $this->htpasswdService = $sl->get('HtpasswdManager\Service\HtpasswdService'); |
|
| 184 | + } |
|
| 185 | + |
|
| 186 | + return $this->htpasswdService; |
|
| 187 | + } |
|
| 188 | + |
|
| 189 | + private function getUserService() { |
|
| 190 | + if ($this->userService === NULL) { |
|
| 191 | + $sl = $this->getServiceLocator(); |
|
| 192 | + $this->userService = $sl->get('HtpasswdManager\Service\UserService'); |
|
| 193 | + } |
|
| 194 | + |
|
| 195 | + return $this->userService; |
|
| 196 | + } |
|
| 197 | 197 | |
| 198 | 198 | } |
@@ -157,12 +157,13 @@ |
||
| 157 | 157 | * @return boolean string |
| 158 | 158 | */ |
| 159 | 159 | private function isUsernameValid($username) { |
| 160 | - if (strlen($username) <= 2) |
|
| 161 | - return "Benutzername ist zu kurz."; |
|
| 162 | - else if (preg_match('~[a-zäöo][a-zäöu_0-9-]+~i', $username) !== 1) |
|
| 163 | - return "Benutzername enthält ungültige Zeichen"; |
|
| 164 | - else if (strpos($username, ' ') !== false) |
|
| 165 | - return "Leerzeichen sind im Benutzernamen nicht erlaubt"; |
|
| 160 | + if (strlen($username) <= 2) { |
|
| 161 | + return "Benutzername ist zu kurz."; |
|
| 162 | + } else if (preg_match('~[a-zäöo][a-zäöu_0-9-]+~i', $username) !== 1) { |
|
| 163 | + return "Benutzername enthält ungültige Zeichen"; |
|
| 164 | + } else if (strpos($username, ' ') !== false) { |
|
| 165 | + return "Leerzeichen sind im Benutzernamen nicht erlaubt"; |
|
| 166 | + } |
|
| 166 | 167 | |
| 167 | 168 | return true; |
| 168 | 169 | } |
@@ -5,153 +5,153 @@ |
||
| 5 | 5 | |
| 6 | 6 | class HtpasswdServiceTest extends \PHPUnit_Framework_TestCase { |
| 7 | 7 | |
| 8 | - protected $testDataDir; |
|
| 8 | + protected $testDataDir; |
|
| 9 | 9 | |
| 10 | - public function setUp() { |
|
| 11 | - $this->testDataDir = __DIR__ . '/TestData'; |
|
| 10 | + public function setUp() { |
|
| 11 | + $this->testDataDir = __DIR__ . '/TestData'; |
|
| 12 | 12 | |
| 13 | - parent::setUp(); |
|
| 14 | - } |
|
| 13 | + parent::setUp(); |
|
| 14 | + } |
|
| 15 | 15 | |
| 16 | 16 | |
| 17 | - public function testCreateFileIfNotExistant() { |
|
| 18 | - $testFile = $this->testDataDir . '/notExistant'; |
|
| 17 | + public function testCreateFileIfNotExistant() { |
|
| 18 | + $testFile = $this->testDataDir . '/notExistant'; |
|
| 19 | 19 | |
| 20 | - if (true === file_exists($testFile)) { |
|
| 21 | - unlink($testFile); |
|
| 22 | - } |
|
| 20 | + if (true === file_exists($testFile)) { |
|
| 21 | + unlink($testFile); |
|
| 22 | + } |
|
| 23 | 23 | |
| 24 | - $this->assertFileNotExists($testFile); |
|
| 24 | + $this->assertFileNotExists($testFile); |
|
| 25 | 25 | |
| 26 | - new HtpasswdService($testFile); |
|
| 27 | - $this->assertFileExists($testFile); |
|
| 26 | + new HtpasswdService($testFile); |
|
| 27 | + $this->assertFileExists($testFile); |
|
| 28 | 28 | |
| 29 | - // Cleanup |
|
| 30 | - unlink($testFile); |
|
| 31 | - } |
|
| 29 | + // Cleanup |
|
| 30 | + unlink($testFile); |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - public function testGetUserList_Empty() { |
|
| 34 | - $testFile = $this->testDataDir . '/htaccess_UserServiceTest_empty'; |
|
| 33 | + public function testGetUserList_Empty() { |
|
| 34 | + $testFile = $this->testDataDir . '/htaccess_UserServiceTest_empty'; |
|
| 35 | 35 | |
| 36 | - if (true === file_exists($testFile)) { |
|
| 37 | - unlink($testFile); |
|
| 38 | - } |
|
| 39 | - $this->assertFileNotExists($testFile); |
|
| 40 | - touch($testFile); |
|
| 41 | - $this->assertFileExists($testFile); |
|
| 36 | + if (true === file_exists($testFile)) { |
|
| 37 | + unlink($testFile); |
|
| 38 | + } |
|
| 39 | + $this->assertFileNotExists($testFile); |
|
| 40 | + touch($testFile); |
|
| 41 | + $this->assertFileExists($testFile); |
|
| 42 | 42 | |
| 43 | - $service = new HtpasswdService($testFile); |
|
| 43 | + $service = new HtpasswdService($testFile); |
|
| 44 | 44 | |
| 45 | - $userList = $service->getUserList(); |
|
| 46 | - $this->assertEquals($expected = [ ], $userList, "UserList"); |
|
| 45 | + $userList = $service->getUserList(); |
|
| 46 | + $this->assertEquals($expected = [ ], $userList, "UserList"); |
|
| 47 | 47 | |
| 48 | - // Cleanup |
|
| 49 | - unlink($testFile); |
|
| 50 | - } |
|
| 48 | + // Cleanup |
|
| 49 | + unlink($testFile); |
|
| 50 | + } |
|
| 51 | 51 | |
| 52 | - public function testGetUserList_Filled() { |
|
| 53 | - $testFile = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 54 | - $this->assertFileExists($testFile); |
|
| 52 | + public function testGetUserList_Filled() { |
|
| 53 | + $testFile = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 54 | + $this->assertFileExists($testFile); |
|
| 55 | 55 | |
| 56 | - $service = new HtpasswdService($testFile); |
|
| 56 | + $service = new HtpasswdService($testFile); |
|
| 57 | 57 | |
| 58 | - $userList = $service->getUserList(); |
|
| 59 | - $this->assertEquals( |
|
| 60 | - $expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0', |
|
| 61 | - 'blub' => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/' |
|
| 62 | - ], $userList, "UserList"); |
|
| 63 | - } |
|
| 58 | + $userList = $service->getUserList(); |
|
| 59 | + $this->assertEquals( |
|
| 60 | + $expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0', |
|
| 61 | + 'blub' => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/' |
|
| 62 | + ], $userList, "UserList"); |
|
| 63 | + } |
|
| 64 | 64 | |
| 65 | - public function testAddUser() { |
|
| 66 | - $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 67 | - $testFile = $this->testDataDir . '/htaccess_UserServiceTest_addUser'; |
|
| 68 | - $this->assertFileExists($testFileTemplate); |
|
| 65 | + public function testAddUser() { |
|
| 66 | + $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 67 | + $testFile = $this->testDataDir . '/htaccess_UserServiceTest_addUser'; |
|
| 68 | + $this->assertFileExists($testFileTemplate); |
|
| 69 | 69 | |
| 70 | - if (true === file_exists($testFile)) { |
|
| 71 | - unlink($testFile); |
|
| 72 | - } |
|
| 73 | - $this->assertFileNotExists($testFile); |
|
| 70 | + if (true === file_exists($testFile)) { |
|
| 71 | + unlink($testFile); |
|
| 72 | + } |
|
| 73 | + $this->assertFileNotExists($testFile); |
|
| 74 | 74 | |
| 75 | - copy($testFileTemplate, $testFile); |
|
| 76 | - $this->assertFileExists($testFile); |
|
| 75 | + copy($testFileTemplate, $testFile); |
|
| 76 | + $this->assertFileExists($testFile); |
|
| 77 | 77 | |
| 78 | - $service = new HtpasswdService($testFile); |
|
| 79 | - $userList = $service->getUserList(); |
|
| 80 | - $this->assertCount(2, $userList); |
|
| 81 | - $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 78 | + $service = new HtpasswdService($testFile); |
|
| 79 | + $userList = $service->getUserList(); |
|
| 80 | + $this->assertCount(2, $userList); |
|
| 81 | + $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 82 | 82 | |
| 83 | 83 | |
| 84 | - $service->addUser('test', 'test'); |
|
| 84 | + $service->addUser('test', 'test'); |
|
| 85 | 85 | |
| 86 | - $userList = $service->getUserList(); |
|
| 87 | - $this->assertCount(3, $userList); |
|
| 88 | - $this->assertEquals($expected = [ 'steven', 'blub', 'test' ], |
|
| 89 | - array_keys($userList)); |
|
| 90 | - $this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 86 | + $userList = $service->getUserList(); |
|
| 87 | + $this->assertCount(3, $userList); |
|
| 88 | + $this->assertEquals($expected = [ 'steven', 'blub', 'test' ], |
|
| 89 | + array_keys($userList)); |
|
| 90 | + $this->assertEquals(3, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 91 | 91 | |
| 92 | 92 | |
| 93 | - // Cleanup |
|
| 94 | - unlink($testFile); |
|
| 95 | - } |
|
| 93 | + // Cleanup |
|
| 94 | + unlink($testFile); |
|
| 95 | + } |
|
| 96 | 96 | |
| 97 | 97 | |
| 98 | - public function testdeleteUser() { |
|
| 99 | - $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 100 | - $testFile = $this->testDataDir . '/htaccess_UserServiceTest_addUser'; |
|
| 101 | - $this->assertFileExists($testFileTemplate); |
|
| 98 | + public function testdeleteUser() { |
|
| 99 | + $testFileTemplate = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 100 | + $testFile = $this->testDataDir . '/htaccess_UserServiceTest_addUser'; |
|
| 101 | + $this->assertFileExists($testFileTemplate); |
|
| 102 | 102 | |
| 103 | - if (true === file_exists($testFile)) { |
|
| 104 | - unlink($testFile); |
|
| 105 | - } |
|
| 106 | - $this->assertFileNotExists($testFile); |
|
| 103 | + if (true === file_exists($testFile)) { |
|
| 104 | + unlink($testFile); |
|
| 105 | + } |
|
| 106 | + $this->assertFileNotExists($testFile); |
|
| 107 | 107 | |
| 108 | - copy($testFileTemplate, $testFile); |
|
| 109 | - $this->assertFileExists($testFile); |
|
| 108 | + copy($testFileTemplate, $testFile); |
|
| 109 | + $this->assertFileExists($testFile); |
|
| 110 | 110 | |
| 111 | - $service = new HtpasswdService($testFile); |
|
| 112 | - $userList = $service->getUserList(); |
|
| 113 | - $this->assertCount(2, $userList); |
|
| 114 | - $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 111 | + $service = new HtpasswdService($testFile); |
|
| 112 | + $userList = $service->getUserList(); |
|
| 113 | + $this->assertCount(2, $userList); |
|
| 114 | + $this->assertEquals(2, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 115 | 115 | |
| 116 | 116 | |
| 117 | - $service->deleteUser('steven'); |
|
| 118 | - $userList = $service->getUserList(); |
|
| 119 | - $this->assertCount(1, $userList); |
|
| 120 | - $this->assertEquals($expected = [ 'blub' ], |
|
| 121 | - array_keys($userList)); |
|
| 122 | - $this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 117 | + $service->deleteUser('steven'); |
|
| 118 | + $userList = $service->getUserList(); |
|
| 119 | + $this->assertCount(1, $userList); |
|
| 120 | + $this->assertEquals($expected = [ 'blub' ], |
|
| 121 | + array_keys($userList)); |
|
| 122 | + $this->assertEquals(1, $this->getNumberOfLines($testFile), "Number of Lines"); |
|
| 123 | 123 | |
| 124 | 124 | |
| 125 | - // Cleanup |
|
| 126 | - unlink($testFile); |
|
| 127 | - } |
|
| 125 | + // Cleanup |
|
| 126 | + unlink($testFile); |
|
| 127 | + } |
|
| 128 | 128 | |
| 129 | - public function testUserExists() { |
|
| 130 | - $testFile = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 131 | - $this->assertFileExists($testFile); |
|
| 129 | + public function testUserExists() { |
|
| 130 | + $testFile = $this->testDataDir . '/htaccess_UserServiceTest'; |
|
| 131 | + $this->assertFileExists($testFile); |
|
| 132 | 132 | |
| 133 | - $service = new HtpasswdService($testFile); |
|
| 134 | - $service->getUserList(); |
|
| 133 | + $service = new HtpasswdService($testFile); |
|
| 134 | + $service->getUserList(); |
|
| 135 | 135 | |
| 136 | - $this->assertTrue($service->userExists('steven'), 'User should exist'); |
|
| 137 | - $this->assertTrue($service->userExists('blub'), 'User should exist'); |
|
| 138 | - $this->assertFalse($service->userExists(''), "User '' should not exist"); |
|
| 139 | - $this->assertFalse($service->userExists('notExistant'), "User 'notExistant' should not exist"); |
|
| 140 | - $this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist"); |
|
| 141 | - } |
|
| 136 | + $this->assertTrue($service->userExists('steven'), 'User should exist'); |
|
| 137 | + $this->assertTrue($service->userExists('blub'), 'User should exist'); |
|
| 138 | + $this->assertFalse($service->userExists(''), "User '' should not exist"); |
|
| 139 | + $this->assertFalse($service->userExists('notExistant'), "User 'notExistant' should not exist"); |
|
| 140 | + $this->assertFalse($service->userExists('not Existant'), "User 'not Existant' should not exist"); |
|
| 141 | + } |
|
| 142 | 142 | |
| 143 | - protected function getNumberOfLines($filename) { |
|
| 144 | - $cont = file_get_contents($filename); |
|
| 145 | - $lines = explode("\n", $cont); |
|
| 143 | + protected function getNumberOfLines($filename) { |
|
| 144 | + $cont = file_get_contents($filename); |
|
| 145 | + $lines = explode("\n", $cont); |
|
| 146 | 146 | |
| 147 | - // Remove emtpy lines |
|
| 148 | - foreach ($lines as $i => $line) { |
|
| 149 | - if (empty(trim($line))) { |
|
| 150 | - unset($lines[$i]); |
|
| 151 | - } |
|
| 152 | - } |
|
| 147 | + // Remove emtpy lines |
|
| 148 | + foreach ($lines as $i => $line) { |
|
| 149 | + if (empty(trim($line))) { |
|
| 150 | + unset($lines[$i]); |
|
| 151 | + } |
|
| 152 | + } |
|
| 153 | 153 | |
| 154 | - return count($lines); |
|
| 155 | - } |
|
| 154 | + return count($lines); |
|
| 155 | + } |
|
| 156 | 156 | |
| 157 | 157 | } |
| 158 | 158 | \ No newline at end of file |