Changeset 10579 for freepbx/trunk

Timestamp:

11/19/10 16:33:24 (3 years ago)

Author:

p_lindheimer

Message:

closes #4644 make database mode authentication the defaut if not chnanged

Files:

• freepbx/trunk/amp_conf/htdocs/admin/header_auth.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/libraries/framework_view.functions.php (modified) (2 diffs)
• freepbx/trunk/amportal.conf (modified) (1 diff)
• freepbx/trunk/upgrades/2.9.0alpha1/migrate_ampconf.php (modified) (1 diff)

freepbx/trunk/amp_conf/htdocs/admin/header_auth.php

@@ -13 +13 @@
-
-switch (strtolower($amp_conf['AUTHTYPE'])) {
+  case 'webserver':
+    // handler for apache doing authentication
+    if ((!isset($_SESSION['AMP_user']) || ($_SESSION['AMP_user']->username != $_SERVER['PHP_AUTH_USER'])) && !isset($_REQUEST['logout'])) {
+      // not logged in, or username has changed;  and not trying to log out
+      
+      if (isset($_SESSION['logout']) && $_SESSION['logout']) {
+        // workaround for HTTP-auth - just tried to logout, don't allow a log in (with the same credentials)
+        unset($_SESSION['logout']);
+        // afterwards, this falls through to the !AMP_user check below, and sends 401 header, which causes the browser to re-prompt the user
+      } else {
+        $_SESSION['AMP_user'] = new ampuser($_SERVER['PHP_AUTH_USER']);
+        
+        if ($_SESSION['AMP_user']->username == $amp_conf['AMPDBUSER']) {
+          // admin user, grant full access
+          $_SESSION['AMP_user']->setAdmin();
+        }
+      }
+    }
+
+    if (!isset($_SESSION['AMP_user'])) {
+      // not logged in, send headers
+      @header('WWW-Authenticate: Basic realm="FreePBX '._('Administration').'"');
+      @header('HTTP/1.0 401 Unauthorized');
+      showview("unauthorized");
+      exit;
+    }
+  case 'none':
+    if (!isset($_SESSION['AMP_user'])) {
+      $_SESSION['AMP_user'] = new ampuser($amp_conf['AMPDBUSER']);
+      $_SESSION['AMP_user']->setAdmin();
+    }
+  break;
-  case 'database':
+  default:
-    if (!isset($_SESSION['AMP_user']) && isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) && !isset($_REQUEST['logout'])) {
-      if (isset($_SESSION['logout']) && $_SESSION['logout']) {
@@ -47 +80 @@
-    }
-  break;
-  case 'webserver':
-    // handler for apache doing authentication
-    if ((!isset($_SESSION['AMP_user']) || ($_SESSION['AMP_user']->username != $_SERVER['PHP_AUTH_USER'])) && !isset($_REQUEST['logout'])) {
-      // not logged in, or username has changed;  and not trying to log out
-      
-      if (isset($_SESSION['logout']) && $_SESSION['logout']) {
-        // workaround for HTTP-auth - just tried to logout, don't allow a log in (with the same credentials)
-        unset($_SESSION['logout']);
-        // afterwards, this falls through to the !AMP_user check below, and sends 401 header, which causes the browser to re-prompt the user
-      } else {
-        $_SESSION['AMP_user'] = new ampuser($_SERVER['PHP_AUTH_USER']);
-        
-        if ($_SESSION['AMP_user']->username == $amp_conf['AMPDBUSER']) {
-          // admin user, grant full access
-          $_SESSION['AMP_user']->setAdmin();
-        }
-      }
-    }
-
-    if (!isset($_SESSION['AMP_user'])) {
-      // not logged in, send headers
-      @header('WWW-Authenticate: Basic realm="FreePBX '._('Administration').'"');
-      @header('HTTP/1.0 401 Unauthorized');
-      showview("unauthorized");
-      exit;
-    }
-  case 'none':
-  default:
-    if (!isset($_SESSION['AMP_user'])) {
-      $_SESSION['AMP_user'] = new ampuser($amp_conf['AMPDBUSER']);
-      $_SESSION['AMP_user']->setAdmin();
-    }
-  break;
-}
-

freepbx/trunk/amp_conf/htdocs/admin/libraries/framework_view.functions.php

@@ -13 +13 @@
-
-switch (strtolower($amp_conf['AUTHTYPE'])) {
-  case 'database':
-    if (!isset($_SESSION['AMP_user']) && isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) && !isset($_REQUEST['logout'])) {
-      if (isset($_SESSION['logout']) && $_SESSION['logout']) {
-        // workaround for HTTP-auth - just tried to logout, don't allow a log in (with the same credentials)
-        unset($_SESSION['logout']);
-        // afterwards, this falls through to the !AMP_user check below, and sends 401 header, which causes the browser to re-prompt the user
-      } else {
-        // not logged in, and have provided a user/pass
-        $_SESSION['AMP_user'] = new ampuser($_SERVER['PHP_AUTH_USER']);
-        
-        if (!$_SESSION['AMP_user']->checkPassword(sha1($_SERVER['PHP_AUTH_PW']))) {
-          // failed, one last chance -- fallback to amportal.conf db admin user
-          if (($_SERVER['PHP_AUTH_USER'] == $amp_conf['AMPDBUSER']) && ($_SERVER['PHP_AUTH_PW'] == $amp_conf['AMPDBPASS'])) {
-  
-            // password succesfully matched amportal.conf db admin user 
-  
-            // set admin access
-            $_SESSION['AMP_user']->setAdmin();
-          } else {
-            // password failed and admin user fall-back failed
-            unset($_SESSION['AMP_user']);
-          }
-        } // else, succesfully logged in
-      } 
-    }
-
-    if (!isset($_SESSION['AMP_user'])) {
-      // not logged in, send headers
-      @header('WWW-Authenticate: Basic realm="FreePBX '._('Administration').'"');
-      @header('HTTP/1.0 401 Unauthorized');
-      showview("unauthorized");
-      exit;
-    }
-  break;
-  case 'webserver':
-    // handler for apache doing authentication
@@ -74 +40 @@
-    }
-  case 'none':
-  default:
-    if (!isset($_SESSION['AMP_user'])) {
-      $_SESSION['AMP_user'] = new ampuser($amp_conf['AMPDBUSER']);
-      $_SESSION['AMP_user']->setAdmin();
+    }
+  break;
+  case 'database':
+  default:
+    if (!isset($_SESSION['AMP_user']) && isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) && !isset($_REQUEST['logout'])) {
+      if (isset($_SESSION['logout']) && $_SESSION['logout']) {
+        // workaround for HTTP-auth - just tried to logout, don't allow a log in (with the same credentials)
+        unset($_SESSION['logout']);
+        // afterwards, this falls through to the !AMP_user check below, and sends 401 header, which causes the browser to re-prompt the user
+      } else {
+        // not logged in, and have provided a user/pass
+        $_SESSION['AMP_user'] = new ampuser($_SERVER['PHP_AUTH_USER']);
+        
+        if (!$_SESSION['AMP_user']->checkPassword(sha1($_SERVER['PHP_AUTH_PW']))) {
+          // failed, one last chance -- fallback to amportal.conf db admin user
+          if (($_SERVER['PHP_AUTH_USER'] == $amp_conf['AMPDBUSER']) && ($_SERVER['PHP_AUTH_PW'] == $amp_conf['AMPDBPASS'])) {
+  
+            // password succesfully matched amportal.conf db admin user 
+  
+            // set admin access
+            $_SESSION['AMP_user']->setAdmin();
+          } else {
+            // password failed and admin user fall-back failed
+            unset($_SESSION['AMP_user']);
+          }
+        } // else, succesfully logged in
+      } 
+    }
+
+    if (!isset($_SESSION['AMP_user'])) {
+      // not logged in, send headers
+      @header('WWW-Authenticate: Basic realm="FreePBX '._('Administration').'"');
+      @header('HTTP/1.0 401 Unauthorized');
+      showview("unauthorized");
+      exit;
-    }
-  break;

freepbx/trunk/amportal.conf

@@ -74 +74 @@
-
-# AUTHTYPE=database|none
+# DEFAULT VALUE: database
-# Authentication type to use for web admininstration. If type set to 'database', the primary
-# AMP admin credentials will be the AMPDBUSER/AMPDBPASS above.
-non
+databas
-
-# AMPADMINLOGO=filename

freepbx/trunk/upgrades/2.9.0alpha1/migrate_ampconf.php

@@ -46 +46 @@
-    ('ASTMANAGER','',0,'Port for the Asterisk Manager<br>Default = 5028','text',NULL,'5038',NULL,NULL),
-    ('ASTMANAGERHOST','localhost',0,'Hostname for the Asterisk Manager<br>Default = localhost','text',NULL,'localhost',NULL,NULL),
-none','select','none,database','non
+database','select','none,database','databas
-    ('BADDESTABORT','FALSE',0,'Setting either of these to true will result in retrieve_conf aborting during a reload if an extension conflict is detected or a destination is detected. It is usually better to allow the reload to go through and then correct the problem but these can be set if a more strict behavior is desired<br>Default = false','select','TRUE,FALSE','FALSE',NULL,NULL),
-    ('CDRDBHOST','',0,'Only used if you dont use the default values provided by FreePBX.<br>Hostname of db server if not the same as AMPDBHOST.','text',NULL,NULL,NULL,NULL),