stevenbuehner / HtpasswdManager

config/module.config.php

Indentation +49 added lines, -49 removed lines

@@ -1,55 +1,55 @@
 <?php
 use HtpasswdManager\Service\Factory\UserServiceFactory;
 return array( 
-		'controllers' => array( 
-				'invokables' => array( 
-						'HtpasswdManager\Controller\User' => 'HtpasswdManager\Controller\UserController' 
-				) 
-		),
-		'service_manager' => array( 
-				'factories' => array( 
-						'HtpasswdManager\Service\UserService' => 'HtpasswdManager\Service\Factory\UserServiceFactory' 
-				) 
-		),
-		'router' => array( 
-				'routes' => array( 
-						'htpasswdmanager' => array( 
-								'type' => 'Segment',
-								'options' => array( 
-										// Change this to something specific to your module
-										'route' => '/usermanagement[/:action][/:user]',
-										'constraints' => array( 
-												'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
-												'user' => '[a-zA-Z0-9.!?_-]+' 
-										),
-										'defaults' => array( 
-												// Change this value to reflect the namespace in which
-												// the controllers for your module are found
-												'__NAMESPACE__' => 'HtpasswdManager\Controller',
-												'controller' => 'User',
-												'action' => 'index' 
-										) 
-								),
-								'may_terminate' => true 
-						) 
-				) 
-		),
-		'view_manager' => array( 
-				'template_path_stack' => array( 
-						'HtpasswdManager' => __DIR__ . '/../view' 
-				) 
-		),
-		'HtpasswdManager' => array( 
-				// Carefull! File needs to be writeable by apache-user (www-data)
-				// The .htaccess file needs to be set to use this .htpasswd file for authentication
-				'htpasswd' => 'path/to/.htpasswd',
+        'controllers' => array( 
+                'invokables' => array( 
+                        'HtpasswdManager\Controller\User' => 'HtpasswdManager\Controller\UserController' 
+                ) 
+        ),
+        'service_manager' => array( 
+                'factories' => array( 
+                        'HtpasswdManager\Service\UserService' => 'HtpasswdManager\Service\Factory\UserServiceFactory' 
+                ) 
+        ),
+        'router' => array( 
+                'routes' => array( 
+                        'htpasswdmanager' => array( 
+                                'type' => 'Segment',
+                                'options' => array( 
+                                        // Change this to something specific to your module
+                                        'route' => '/usermanagement[/:action][/:user]',
+                                        'constraints' => array( 
+                                                'action' => '[a-zA-Z][a-zA-Z0-9_-]*',
+                                                'user' => '[a-zA-Z0-9.!?_-]+' 
+                                        ),
+                                        'defaults' => array( 
+                                                // Change this value to reflect the namespace in which
+                                                // the controllers for your module are found
+                                                '__NAMESPACE__' => 'HtpasswdManager\Controller',
+                                                'controller' => 'User',
+                                                'action' => 'index' 
+                                        ) 
+                                ),
+                                'may_terminate' => true 
+                        ) 
+                ) 
+        ),
+        'view_manager' => array( 
+                'template_path_stack' => array( 
+                        'HtpasswdManager' => __DIR__ . '/../view' 
+                ) 
+        ),
+        'HtpasswdManager' => array( 
+                // Carefull! File needs to be writeable by apache-user (www-data)
+                // The .htaccess file needs to be set to use this .htpasswd file for authentication
+                'htpasswd' => 'path/to/.htpasswd',
 				
-				// Users, that can't be deleted with the GUI
-				'not_deletable_users' => array( 
-						'admin' 
-				),
+                // Users, that can't be deleted with the GUI
+                'not_deletable_users' => array( 
+                        'admin' 
+                ),
 				
-				// May be an array (for specific users) or boolean for general true / false
-				'usermanagement_users' => true 
-		) 
+                // May be an array (for specific users) or boolean for general true / false
+                'usermanagement_users' => true 
+        ) 
 );

Module.php

Indentation +38 added lines, -38 removed lines

@@ -16,46 +16,46 @@
 
 class Module implements AutoloaderProviderInterface {
 
-	public function getAutoloaderConfig() {
-		return array( 
-				'Zend\Loader\StandardAutoloader' => array( 
-						'namespaces' => array( 
-								// if we're in a namespace deeper than one level we need to fix the \ in the path
-								__NAMESPACE__ => __DIR__ . '/src/' . str_replace ( '\\', '/', __NAMESPACE__ ) 
-						) 
-				) 
-		);
-	}
-
-	public function getConfig() {
-		return include __DIR__ . '/config/module.config.php';
-	}
-
-	public function onBootstrap(MvcEvent $e) {
-		// You may not need to do this if you're doing it elsewhere in your
-		// application
-		$eventManager = $e->getApplication ()->getEventManager ();
-		$moduleRouteListener = new ModuleRouteListener ();
-		$moduleRouteListener->attach ( $eventManager );
-	}
-
-	public function getServiceConfig() {
-		return array( 
-				'factories' => array( 
-						'HtpasswdManager\Service\HtpasswdService' => function ($sm) {
-							$config = $sm->get ( 'Config' );
+    public function getAutoloaderConfig() {
+        return array( 
+                'Zend\Loader\StandardAutoloader' => array( 
+                        'namespaces' => array( 
+                                // if we're in a namespace deeper than one level we need to fix the \ in the path
+                                __NAMESPACE__ => __DIR__ . '/src/' . str_replace ( '\\', '/', __NAMESPACE__ ) 
+                        ) 
+                ) 
+        );
+    }
+
+    public function getConfig() {
+        return include __DIR__ . '/config/module.config.php';
+    }
+
+    public function onBootstrap(MvcEvent $e) {
+        // You may not need to do this if you're doing it elsewhere in your
+        // application
+        $eventManager = $e->getApplication ()->getEventManager ();
+        $moduleRouteListener = new ModuleRouteListener ();
+        $moduleRouteListener->attach ( $eventManager );
+    }
+
+    public function getServiceConfig() {
+        return array( 
+                'factories' => array( 
+                        'HtpasswdManager\Service\HtpasswdService' => function ($sm) {
+                            $config = $sm->get ( 'Config' );
 							
-							if (! isset ( $config ['HtpasswdManager'] ) || ! is_array ( $config ['HtpasswdManager'] ) || ! isset ( $config ['HtpasswdManager'] ['htpasswd'] ) || empty ( $config ['HtpasswdManager'] ['htpasswd'] )) {
-								throw new \Exception ( 'HtpasswdManager Config not found' );
-							}
+                            if (! isset ( $config ['HtpasswdManager'] ) || ! is_array ( $config ['HtpasswdManager'] ) || ! isset ( $config ['HtpasswdManager'] ['htpasswd'] ) || empty ( $config ['HtpasswdManager'] ['htpasswd'] )) {
+                                throw new \Exception ( 'HtpasswdManager Config not found' );
+                            }
 							
-							$htpasswd_filename = $config ['HtpasswdManager'] ['htpasswd'];
-							$service = new HtpasswdService ( $htpasswd_filename );
+                            $htpasswd_filename = $config ['HtpasswdManager'] ['htpasswd'];
+                            $service = new HtpasswdService ( $htpasswd_filename );
 							
-							return $service;
-						} 
-				) 
-		);
-	}
+                            return $service;
+                        } 
+                ) 
+        );
+    }
 
 }
\ No newline at end of file

src/HtpasswdManager/Test/HtpasswdServiceTest.php

Indentation +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $userList = $service->getUserList();
         $this->assertEquals(
             $expected = [ 'steven' => '$apr1$UF1l/6iv$tT3IJUH.QL82HAraXetNo0',
-                          'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
+                            'blub'   => '$apr1$jVosh5nC$q6KJ5EZNU6thOPETMQw8O/'
             ], $userList, "UserList");
     }
 

src/HtpasswdManager/Service/HtpasswdService.php

Indentation +87 added lines, -87 removed lines

@@ -7,120 +7,120 @@
 namespace HtpasswdManager\Service;
 
 class HtpasswdService {
-	private $filename;
+    private $filename;
 	
-	// Caching of htpasswd-file
-	private $userListCache = null;
-	private $htpasswdCache = null;
+    // Caching of htpasswd-file
+    private $userListCache = null;
+    private $htpasswdCache = null;
 	
-	// Static Variables
-	protected static $REGULAR_USER_PASSWORD = '~^([^:]+):(.+)$~im';
+    // Static Variables
+    protected static $REGULAR_USER_PASSWORD = '~^([^:]+):(.+)$~im';
 
-	public function __construct($htpasswd_filename) {
-		$this->filename = $htpasswd_filename;
-		$this->createFileIfNotExistant ();
-	}
+    public function __construct($htpasswd_filename) {
+        $this->filename = $htpasswd_filename;
+        $this->createFileIfNotExistant ();
+    }
 
-	private function createFileIfNotExistant() {
-		if (true === file_exists ( $this->filename )) {
-		} else {
-			touch ( $this->filename );
-		}
-	}
+    private function createFileIfNotExistant() {
+        if (true === file_exists ( $this->filename )) {
+        } else {
+            touch ( $this->filename );
+        }
+    }
 
-	private function getHtpasswdContent() {
-		if ($this->htpasswdCache === null) {
+    private function getHtpasswdContent() {
+        if ($this->htpasswdCache === null) {
 			
-			$this->htpasswdCache = file_get_contents ( $this->filename );
-		}
+            $this->htpasswdCache = file_get_contents ( $this->filename );
+        }
 		
-		return $this->htpasswdCache;
-	}
+        return $this->htpasswdCache;
+    }
 
-	private function updateHtpasswdContent() {
-		$this->htpasswdCache = null;
-		$this->userListCache = null;
-		$this->getUserList ();
-	}
+    private function updateHtpasswdContent() {
+        $this->htpasswdCache = null;
+        $this->userListCache = null;
+        $this->getUserList ();
+    }
 
-	public function getUserList() {
-		if ($this->userListCache === null) {
-			$result = array();
+    public function getUserList() {
+        if ($this->userListCache === null) {
+            $result = array();
 			
-			$content = $this->getHtpasswdContent ();
+            $content = $this->getHtpasswdContent ();
 			
-			if (preg_match_all ( $this::$REGULAR_USER_PASSWORD, $content, $matches, PREG_PATTERN_ORDER ) !== false) {
-				foreach ( $matches [1] as $i => $user ) {
-					$result [$user] = $matches [2] [$i];
-				}
-			}
+            if (preg_match_all ( $this::$REGULAR_USER_PASSWORD, $content, $matches, PREG_PATTERN_ORDER ) !== false) {
+                foreach ( $matches [1] as $i => $user ) {
+                    $result [$user] = $matches [2] [$i];
+                }
+            }
 			
-			$this->userListCache = $result;
-		}
+            $this->userListCache = $result;
+        }
 		
-		return $this->userListCache;
-	}
+        return $this->userListCache;
+    }
 
-	private function encodePassword($password) {
-		return crypt ( $password, substr ( str_replace ( '+', '.', base64_encode ( pack ( 'N4', mt_rand (), mt_rand (), mt_rand (), mt_rand () ) ) ), 0, 22 ) );
-	}
+    private function encodePassword($password) {
+        return crypt ( $password, substr ( str_replace ( '+', '.', base64_encode ( pack ( 'N4', mt_rand (), mt_rand (), mt_rand (), mt_rand () ) ) ), 0, 22 ) );
+    }
 
-	private function getNewUserEncodedString($username, $password) {
-		return $username . ':' . $this->encodePassword ( $password ) . "\n";
-	}
+    private function getNewUserEncodedString($username, $password) {
+        return $username . ':' . $this->encodePassword ( $password ) . "\n";
+    }
 
-	public function addUser($username, $password) {
-		$newContent = $this->getHtpasswdContent ();
-		$newContent .= $this->getNewUserEncodedString ( $username, $password );
+    public function addUser($username, $password) {
+        $newContent = $this->getHtpasswdContent ();
+        $newContent .= $this->getNewUserEncodedString ( $username, $password );
 		
-		$this->replaceHtPasswdContent ( $newContent );
-	}
+        $this->replaceHtPasswdContent ( $newContent );
+    }
 
-	public function updateUser($username, $password) {
-		if ($this->userExists ( $username )) {
-			$this->deleteUser ( $username );
-		}
+    public function updateUser($username, $password) {
+        if ($this->userExists ( $username )) {
+            $this->deleteUser ( $username );
+        }
 		
-		$this->addUser ( $username, $password );
-	}
+        $this->addUser ( $username, $password );
+    }
 
-	public function deleteUser($username) {
-		$newContent = '';
-		$usernameDeleted = false;
+    public function deleteUser($username) {
+        $newContent = '';
+        $usernameDeleted = false;
 		
-		if (preg_match_all ( $this::$REGULAR_USER_PASSWORD, $this->getHtpasswdContent (), $match ) > 0) {
-			foreach ( $match [1] as $i => $user ) {
-				if ($user == $username) {
-					$usernameDeleted = true;
-				} else {
-					$newContent .= $match [0] [$i] . "\n";
-				}
-			}
+        if (preg_match_all ( $this::$REGULAR_USER_PASSWORD, $this->getHtpasswdContent (), $match ) > 0) {
+            foreach ( $match [1] as $i => $user ) {
+                if ($user == $username) {
+                    $usernameDeleted = true;
+                } else {
+                    $newContent .= $match [0] [$i] . "\n";
+                }
+            }
 			
-			if (true === $usernameDeleted) {
-				$this->replaceHtPasswdContent ( $newContent );
-			}
-		}
+            if (true === $usernameDeleted) {
+                $this->replaceHtPasswdContent ( $newContent );
+            }
+        }
 		
-		return $usernameDeleted;
-	}
+        return $usernameDeleted;
+    }
 
-	private function replaceHtPasswdContent($newContent) {
-		// Alternative: file_put_contents ( $this->filename, $newContent );
-		$fp = fopen ( $this->filename, 'w' );
-		fwrite ( $fp, $newContent );
-		fclose ( $fp );
+    private function replaceHtPasswdContent($newContent) {
+        // Alternative: file_put_contents ( $this->filename, $newContent );
+        $fp = fopen ( $this->filename, 'w' );
+        fwrite ( $fp, $newContent );
+        fclose ( $fp );
 		
-		$this->updateHtpasswdContent ();
-	}
+        $this->updateHtpasswdContent ();
+    }
 
-	public function userExists($username) {
-		$userList = $this->getUserList ();
+    public function userExists($username) {
+        $userList = $this->getUserList ();
 		
-		if (isset ( $userList [$username] ))
-			return true;
+        if (isset ( $userList [$username] ))
+            return true;
 		
-		return false;
-	}
+        return false;
+    }
 
 }

src/HtpasswdManager/Service/Factory/UserServiceFactory.php

Indentation +17 added lines, -17 removed lines

@@ -6,26 +6,26 @@
 
 class UserServiceFactory {
 
-	public function __invoke($sm) {
-		$config = $sm->get ( 'Config' );
+    public function __invoke($sm) {
+        $config = $sm->get ( 'Config' );
 		
-		// Default
-		$not_deletable_users = array();
-		if (isset ( $config ['HtpasswdManager'] ['not_deletable_users'] ) && is_array ( $config ['HtpasswdManager'] ['not_deletable_users'] )) {
-			$not_deletable_users = $config ['HtpasswdManager'] ['not_deletable_users'];
-		}
+        // Default
+        $not_deletable_users = array();
+        if (isset ( $config ['HtpasswdManager'] ['not_deletable_users'] ) && is_array ( $config ['HtpasswdManager'] ['not_deletable_users'] )) {
+            $not_deletable_users = $config ['HtpasswdManager'] ['not_deletable_users'];
+        }
 		
-		// Default
-		$user_with_management_permission = true;
-		if (isset ( $config ['HtpasswdManager'] ['usermanagement_users'] ) && is_array ( $config ['HtpasswdManager'] ['usermanagement_users'] )) {
-			$user_with_management_permission = $config ['HtpasswdManager'] ['usermanagement_users'];
-		} else if ($config ['HtpasswdManager'] ['usermanagement_users'] === false) {
-			$user_with_management_permission = false;
-		}
+        // Default
+        $user_with_management_permission = true;
+        if (isset ( $config ['HtpasswdManager'] ['usermanagement_users'] ) && is_array ( $config ['HtpasswdManager'] ['usermanagement_users'] )) {
+            $user_with_management_permission = $config ['HtpasswdManager'] ['usermanagement_users'];
+        } else if ($config ['HtpasswdManager'] ['usermanagement_users'] === false) {
+            $user_with_management_permission = false;
+        }
 		
-		$request = $sm->get ( 'Request' );
+        $request = $sm->get ( 'Request' );
 		
-		return new UserService ( $request, $not_deletable_users, $user_with_management_permission );
-	}
+        return new UserService ( $request, $not_deletable_users, $user_with_management_permission );
+    }
 
 }

src/HtpasswdManager/Service/UserService.php

Indentation +49 added lines, -49 removed lines

@@ -11,65 +11,65 @@
 use Zend\EventManager\EventManagerInterface;
 
 class UserService implements EventManagerAwareInterface {
-	protected $request;
-	protected $not_deletable_users;
-	protected $user_with_management_permission;
-	protected $eventManager;
+    protected $request;
+    protected $not_deletable_users;
+    protected $user_with_management_permission;
+    protected $eventManager;
 
-	public function __construct(Request $request, $not_deletable_users, $user_with_management_permission) {
-		$this->request = $request;
-		$this->not_deletable_users = $not_deletable_users;
-		$this->user_with_management_permission = $user_with_management_permission;
-	}
+    public function __construct(Request $request, $not_deletable_users, $user_with_management_permission) {
+        $this->request = $request;
+        $this->not_deletable_users = $not_deletable_users;
+        $this->user_with_management_permission = $user_with_management_permission;
+    }
 
-	/**
-	 * Return the current used user
-	 *
-	 * @return string
-	 */
-	public function getCurrentUser() {
-		return $this->request->getServer ()->get ( 'REMOTE_USER', null );
-	}
+    /**
+     * Return the current used user
+     *
+     * @return string
+     */
+    public function getCurrentUser() {
+        return $this->request->getServer ()->get ( 'REMOTE_USER', null );
+    }
 
-	public function isUserDeleteable($username) {
-		$eResult = $this->getEventManager ()->trigger ( 'pre_' . __FUNCTION__, $this, array( 
-				$username 
-		) );
+    public function isUserDeleteable($username) {
+        $eResult = $this->getEventManager ()->trigger ( 'pre_' . __FUNCTION__, $this, array( 
+                $username 
+        ) );
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+        if ($eResult->stopped ())
+            return $eResult->last ();
 		
-		return ! in_array ( $username, $this->not_deletable_users );
-	}
+        return ! in_array ( $username, $this->not_deletable_users );
+    }
 
-	public function isUserAllowedToManageUsers($username) {
-		$eResult = $this->getEventManager ()->trigger ( 'pre_' . __FUNCTION__, $this, array( 
-				'user' => $username 
-		) );
+    public function isUserAllowedToManageUsers($username) {
+        $eResult = $this->getEventManager ()->trigger ( 'pre_' . __FUNCTION__, $this, array( 
+                'user' => $username 
+        ) );
 		
-		if ($eResult->stopped ())
-			return $eResult->last ();
+        if ($eResult->stopped ())
+            return $eResult->last ();
 			
-			/* If parameter is an array => allow only users in list. IF parameter is boolean, return boolean value */
-		if (is_array ( $this->user_with_management_permission )) {
-			$accessAllowed = in_array ( $username, $this->user_with_management_permission );
-		} else {
-			$accessAllowed = ($this->user_with_management_permission === true);
-		}
+            /* If parameter is an array => allow only users in list. IF parameter is boolean, return boolean value */
+        if (is_array ( $this->user_with_management_permission )) {
+            $accessAllowed = in_array ( $username, $this->user_with_management_permission );
+        } else {
+            $accessAllowed = ($this->user_with_management_permission === true);
+        }
 		
-		return $accessAllowed;
-	}
+        return $accessAllowed;
+    }
 
-	public function setEventManager(EventManagerInterface $eventManager) {
-		$eventManager->setIdentifiers ( array( 
-				__CLASS__,
-				get_class ( $this ) 
-		) );
-		$this->eventManager = $eventManager;
-	}
+    public function setEventManager(EventManagerInterface $eventManager) {
+        $eventManager->setIdentifiers ( array( 
+                __CLASS__,
+                get_class ( $this ) 
+        ) );
+        $this->eventManager = $eventManager;
+    }
 
-	public function getEventManager() {
-		return $this->eventManager;
-	}
+    public function getEventManager() {
+        return $this->eventManager;
+    }
 
 }