Changeset 155

Timestamp:

11/02/07 00:46:27 (14 months ago)

Author:

chris

Message:

Added multiple authentication modes with IP based permissions

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• README (modified) (1 diff)
• config-sample.php (modified) (2 diffs)
• index.php (modified) (3 diffs)

trunk/CHANGELOG

@@ -23 +23 @@
 
 * Tidied up the appearance of HellaWorld when javascript is disabled.
+
+* Altered the current, somewhat confusing, authentication system to a more
+  intuitive configuration, also allowing for IP based authentication. This
+  change has added options to the configuration file, please see the
+  README for details
 
 1.8

trunk/README

@@ -2 +2 @@
 ---------------------
 
-*General Use*
+*General Intall*
 
-General usage is pretty simple, copy config-sample.php to config.php
-then change the settings to match your HellaNZB install.
-Then upload and view the site within your web browser. That should
-be all that's necessary.
+The installation is as simple as these 4 steps:
+
+1) Copy config-sample.php to config.php
+2) Open config.php in your favorite text editor
+3) Edit the settings as you wish
+4) Save and close your text editor
+5) Upload the files to your webserver and view in your browser of choice
+
+For more detailed configuration information, please read on.
+
+*Authentication*
+
+HellaWorld supports 4 authentication modes.
+
+Open: Open to everyone without a password (Default)
+Closed: Login required every time you visit
+Hybrid: Open for specified IP ranges (defaults to the 3 standard private
+        address ranges) login is required for all others
+Exclusive: Closed for all addresses except those in the specified IP
+           range
 
 *Supported Languages*

trunk/config-sample.php

@@ -2 +2 @@
 
 // Change these settings to match your desired configuration.
-
-// Setting the password to an empty string '' will result in
-// you being asked to enter the username and password
-// when you view the site in your browser
 
 // The default settings correspond to an unaltered installation
@@ -13 +9 @@
                 'host'                  =>      'localhost',    // The address HellaNZB is running on.
                 'port'                  =>      '8760',                 // The port HellaNZB is listening on.
+                'auth'                  =>      'open',                 // Can be open, closed, exclusive or hybrid, see readme for details
+
+                // username and password required for open and hybrid authentication
                 'username'              =>      'hellanzb',             // This is usually hardcoded as hellanzb and shouldnt need changing
                 'password'              =>      'changeme',             // The password specified in hellanzb.conf
+
                 'showfinished'  =>      true,                   // Show finished items, see README for details
                 'language'              =>      'en_GB',                // The language code HellaWorld should use
+
+                // this is a range of allowed IP addresses for hybrid and exclusive authentication,
+                // address ranges must be comma seperated, use xxx.xxx.xxx.xxx/32 to limit it to a single
+                // address, where xxx.xxx.xxx.xxx is the address you wish to limit it to.
+                'iprange'               =>      '192.168.0.0/16,10.0.0.0/8,172.168.0.0/12'
         );
 

trunk/index.php

@@ -37 +37 @@
 $Id$
 
-*/
-
+ */
+
+        function ipInRange($range, $address) {
+                $range = str_replace(array(' ', "\r", "\n"), '', $range);
+                foreach(explode(',', $range) as $ip) {
+                        list($base, $bits) = explode('/', $ip);
+                        list($a, $b, $c, $d) = explode('.', $base);
+
+                        $i = ($a << 24) + ($b << 16) + ($c << 8) + $d;
+                        $mask = $bits == 0 ? 0 : (~0 << (32 - $bits));
+
+                        $low = $i & $mask;
+                        $high = $i | (~$mask & 0xFFFFFFFF);
+
+                        list($a, $b, $c, $d) = explode('.', $address);
+                        $check = ($a << 24) + ($b << 16) + ($c << 8) + $d;
+                        if ($check >= $low && $check <= $high) {
+                                return true;
+                        }
+                }
+                return false;
+        }
 
         try {
@@ -46 +66 @@
                 } else {
                         throw new Exception('config.php not found, please configure HellaWorld');
+                }
+
+                if (isset($config['auth']) && !empty($config['auth'])) {
+                        $auth = strtolower($config['auth']);
+                        if ($auth == 'open' || $auth == 'hybrid') {
+                                if (!isset($config['username']) || !isset($config['password']) || empty($config['username']) || empty($config['password'])) {
+                                        throw new Exception('Authentication types open and hybrid require a password to be set');
+                                }
+                        }
+                } else {
+                        $auth = 'open';
                 }
 
@@ -60 +91 @@
 
                 $hellaworldversion = "1.9-SVN";
+                if (!isset($config['iprange'])) {
+                        $iprange = '192.168.0.0/16,10.0.0.0/8,172.168.0.0/12';
+                } else {
+                        $iprange = $config['iprange'];
+                }
                 $protocol = (($_SERVER['SERVER_PORT'] == 443) ? 'https' : 'http');
 
                 require_once 'classes/HellaController.php';
 
-                if (!array_key_exists('password', $config) || empty($config['password'])) {
+                if ($auth == 'exclusive' && !ipInRange($iprange, $_SERVER['REMOTE_ADDR'])) {
+                        throw new Exception('IP Address is not in an allowed range');
+                } elseif ($auth == 'closed' || ($auth == 'hybrid' && !ipInRange($iprange, $_SERVER['REMOTE_ADDR']))) {
                         session_start();
                         if (!array_key_exists('PHP_AUTH_USER', $_SERVER) || empty($_SERVER['PHP_AUTH_USER'])) {