KTS-1117: Don't allow login if the database isn't at the required

version. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5704 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-1117: Don't allow login if the database isn't at the required
version. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5704 c91229c3-7414-0410-bfa2-8a42b809f60b
nbm
1 parent 9ce80041
Showing 2 changed files with 63 additions and 59 deletions
lib/dispatcher.inc.php
lib/session/Session.inc
@@ -200,43 +200,44 @@ class KTStandardDispatcher extends KTDispatcher {
             $GLOBALS['main'] =& new KTPage;
         }
         $this->oPage =& $GLOBALS['main'];
-	parent::KTDispatcher();
+        parent::KTDispatcher();
     }
     function permissionDenied () {
-	    global $default;
-		
-		$msg = '<h2>' . _kt('Permission Denied') . '</h2>';
-		$msg .= '<p>' . _kt('If you feel that this is incorrect, please report both the action and your username to a system administrator.') . '</p>';
-		
+        global $default;
+            
+        $msg = '<h2>' . _kt('Permission Denied') . '</h2>';
+        $msg .= '<p>' . _kt('If you feel that this is incorrect, please report both the action and your username to a system administrator.') . '</p>';
+            
         $this->oPage->setPageContents($msg);
         $this->oPage->setUser($this->oUser);
-		$this->oPage->hideSection();
+        $this->oPage->hideSection();
         $this->oPage->render();
         exit(0);
     }
     function loginRequired() {
-		$oKTConfig =& KTConfig::getSingleton();
-	    if ($oKTConfig->get('allowAnonymousLogin', false)) {
-		    // anonymous logins are now allowed.
-			// the anonymous user is -1.
-			// 
-			// we short-circuit the login mechanisms, setup the session, and go.
-			
-			$oUser =& User::get(-2);
-			if (PEAR::isError($oUser) || ($oUser->getName() != 'Anonymous')) { 
-			    ; // do nothing - the database integrity would break if we log the user in now.
-			} else {
-			    $session = new Session();
+        $oKTConfig =& KTConfig::getSingleton();
+        if ($oKTConfig->get('allowAnonymousLogin', false)) {
+            // anonymous logins are now allowed.
+            // the anonymous user is -1.
+            // 
+            // we short-circuit the login mechanisms, setup the session, and go.
+                    
+            $oUser =& User::get(-2);
+            if (PEAR::isError($oUser) || ($oUser->getName() != 'Anonymous')) { 
+                ; // do nothing - the database integrity would break if we log the user in now.
+            } else {
+                $session = new Session();
                 $sessionID = $session->create($oUser);
-				
-				return ;
-			}
-		}	
-	
-	
+                $this->sessionStatus = $this->session->verify();
+                if ($this->sessionStatus === true) {
+                    return ;
+                }
+            }
+        }
+    
         $sErrorMessage = "";
         if (PEAR::isError($this->sessionStatus)) {
             $sErrorMessage = $this->sessionStatus->getMessage();
@@ -268,9 +269,9 @@ class KTStandardDispatcher extends KTDispatcher {
             $this->session = new Session();
             $this->sessionStatus = $this->session->verify();
             if ($this->sessionStatus !== true) {
-                $this->loginRequired();	
+                $this->loginRequired();
             }
-			//var_dump($this->sessionStatus);
+            //var_dump($this->sessionStatus);
             $this->oUser =& User::get($_SESSION['userID']);
             $oProvider =& KTAuthenticationUtil::getAuthenticationProviderForUser($this->oUser);
             $oProvider->verify($this->oUser);
@@ -295,37 +296,37 @@ class KTStandardDispatcher extends KTDispatcher {
         return true;
     }
-	function addInfoMessage($sMessage) { $_SESSION['KTInfoMessage'][] = $sMessage; }
-	
-	function addErrorMessage($sMessage) { $_SESSION['KTErrorMessage'][] = $sMessage; }	
-	
+    function addInfoMessage($sMessage) { $_SESSION['KTInfoMessage'][] = $sMessage; }
+
+    function addErrorMessage($sMessage) { $_SESSION['KTErrorMessage'][] = $sMessage; }
+
     function handleOutput($data) {
-	    global $default;
-		global $sectionName;
+        global $default;
+        global $sectionName;
         $this->oPage->setSection($this->sSection);
         $this->oPage->setBreadcrumbs($this->aBreadcrumbs);
         $this->oPage->setPageContents($data);
         $this->oPage->setUser($this->oUser);
-		$this->oPage->setHelp($this->sHelpPage);
-		
-		// handle errors that were set using KTErrorMessage.
-		$errors = KTUtil::arrayGet($_SESSION, 'KTErrorMessage', array());
-		if (!empty($errors)) {
+        $this->oPage->setHelp($this->sHelpPage);
+        
+        // handle errors that were set using KTErrorMessage.
+        $errors = KTUtil::arrayGet($_SESSION, 'KTErrorMessage', array());
+        if (!empty($errors)) {
             foreach ($errors as $sError) {
-		        $this->oPage->addError($sError);
-			}
-			$_SESSION['KTErrorMessage'] = array(); // clean it out.
-		}
-
-		// handle notices that were set using KTInfoMessage.
-		$info = KTUtil::arrayGet($_SESSION, 'KTInfoMessage', array());
-		
-		if (!empty($info)) {
+                $this->oPage->addError($sError);
+            }
+            $_SESSION['KTErrorMessage'] = array(); // clean it out.
+        }
+
+        // handle notices that were set using KTInfoMessage.
+        $info = KTUtil::arrayGet($_SESSION, 'KTInfoMessage', array());
+        
+        if (!empty($info)) {
             foreach ($info as $sInfo) {
-		        $this->oPage->addInfo($sInfo);
-			}
-			$_SESSION['KTInfoMessage'] = array(); // clean it out.
-		}
+                $this->oPage->addInfo($sInfo);
+            }
+            $_SESSION['KTInfoMessage'] = array(); // clean it out.
+        }
         // Get the portlets to display from the portlet registry
         $oPRegistry =& KTPortletRegistry::getSingleton();
@@ -152,9 +152,6 @@ class Session {
     /**
      * Used to verify the current user's session.
-     *
-	 * @param boolean optional parameter set if we're downloading a file     
-     * @return int session verification status
      */
     function verify() {
         global $default;
@@ -165,6 +162,12 @@ class Session {
         header("Cache-Control: must-revalidate");
         header("Expires: " . gmdate("D, d M Y H:i:s", time() - 3600) . " GMT");
         $sessionID = session_id();
+        $version = KTUtil::getSystemSetting('knowledgeTreeVersion');
+
+        if ($default->systemVersion != $version) {
+            $default->log->info("Session::verify : Database not upgraded");
+            return PEAR::raiseError(sprintf(_kt('Incompatible database version (%s, expected version %s) - contact the administrator'), $version, $default->systemVersion));
+        }
         if (empty($sessionID)) {
             $default->log->info("Session::verify session not in db");
@@ -190,13 +193,13 @@ class Session {
         $iUserID = $aRow["user_id"];
         $oKTConfig = KTConfig::getSingleton();	
-		$allowAnon = $oKTConfig->get('session/allowAnonymousLogin', false);
+        $allowAnon = $oKTConfig->get('session/allowAnonymousLogin', false);
-		$ANON = -2;
+        $ANON = -2;
         if ((!$allowAnon) && ($iUserID == $ANON)) { 
-		    Session::destroy();   // delete the anonymous session - config.ini has changed under this session.
-		    return PEAR::raiseError(_kt("Anonymous logins are no longer allowed by the system administrator.  Please login."));
-		}
+            Session::destroy();   // delete the anonymous session - config.ini has changed under this session.
+            return PEAR::raiseError(_kt("Anonymous logins are no longer allowed by the system administrator.  Please login."));
+        }
         $ipTracking = $oKTConfig->get('session/ipTracking', false);
         // check that ip matches