Changeset 2213

Timestamp:

09/10/2007 09:09:27 PM

Author:

xue

Message:

Fixed #692, #700.

Files:

• trunk/HISTORY (modified) (1 diff)
• trunk/demos/quickstart/protected/pages/Advanced/Auth.page (modified) (1 diff)
• trunk/demos/quickstart/protected/pages/Configurations/PageConfig.page (modified) (1 diff)
• trunk/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page (modified) (1 diff)
• trunk/framework/Exceptions/TErrorHandler.php (modified) (1 diff)
• trunk/framework/Security/TAuthorizationRule.php (modified) (9 diffs)
• trunk/framework/Web/Services/TPageService.php (modified) (13 diffs)
• trunk/tests/FunctionalTests/tickets/index700.php (added)
• trunk/tests/FunctionalTests/tickets/protected700 (added)
• trunk/tests/FunctionalTests/tickets/protected700/application.xml (added)
• trunk/tests/FunctionalTests/tickets/protected700/common (added)
• trunk/tests/FunctionalTests/tickets/protected700/common/BasePage.php (added)
• trunk/tests/FunctionalTests/tickets/protected700/layout (added)
• trunk/tests/FunctionalTests/tickets/protected700/layout/MainLayout.php (added)
• trunk/tests/FunctionalTests/tickets/protected700/layout/MainLayout.tpl (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/Home.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/UserLogin.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/UserLogin.php (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/Home.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/Home2.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/config.xml (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/users (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/users/Home.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/users/Home2.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/admin/users/config.xml (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/config.xml (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/content (added)
• trunk/tests/FunctionalTests/tickets/protected700/pages/content/Home.page (added)
• trunk/tests/FunctionalTests/tickets/protected700/runtime (added)
• trunk/tests/FunctionalTests/tickets/tests/Ticket700TestCase.php (added)

trunk/HISTORY

@@ -19 +19 @@
-ENH: Ticket#678 - Improved DateTimeFormatInfo performance (Stever)
-ENH: Ticket#681 - TUrlMapping can construct custom URLs now (Qiang)
+ENH: Ticket#692,700 - Added support to wildcard in pages configuration; added IP filters in auth rules. (Qiang)
-ENH: Added THead requirement check (Qiang)
-ENH: Added TOutputCache.CacheTime (Qiang)

trunk/demos/quickstart/protected/pages/Advanced/Auth.page

@@ -75 +75 @@
-In the above example, anonymous users will be denied from posting to <tt>PageID1</tt> and <tt>PageID2</tt>, while <tt>User1</tt> and <tt>User2</tt> and all users of role <tt>Role1</tt> can access the two pages (in both <tt>get</tt> and <tt>post</tt> methods).
-</p>
+<com:SinceVersion Version="3.1.1" />
+<p class="block-content">
+Since version 3.1.1, the <tt>pages</tt> attribute in the authorization rules can take relative page paths with wildcard '*'. For example, <tt>pages="admin.Home"</tt> refers to the <tt>Home</tt> page under the <tt>admin</tt> directory, and <tt>pages="admin.*"</tt> would refer to all pages under the <tt>admin</tt> directory and subdirectories.
+</p>
+
+<p class="block-content">
+Also introduced in version 3.1.1 are IP rules. They are specified by a new attribute <tt>ip</tt> in authorization rules. The IP rules are used to determine if an authorization rule aplies to an end-user according to his IP address. One can list a few IPs together, separated by comma ','. Wildcard '*' can be used in the rules. For example, <tt>ip="192.168.0.2, 192.168.1.*"</tt> means the rule applies to users whose IP address is 192.168.0.2 or 192.168.1.*. The latter matches any host in the subnet 192.168.1.
+</p>
-
-<h2 id="5504">Using <tt>TUserManager</tt></h2>

trunk/demos/quickstart/protected/pages/Configurations/PageConfig.page

@@ -40 +40 @@
-</p>
-
+<com:SinceVersion Version="3.1.1" />
+<p class="block-content">
+Since version 3.1.1, the <tt>id</tt> attribute in the &lt;page&gt; element can be a relative page path pointing to a page in the subdirectory of the directory containing the page configuration. For example, <tt>id="admin.Home"</tt> refers to the <tt>Home</tt> page under the <tt>admin</tt> directory. This enhancement allows developers to centralize their page configurations (e.g. put all page initializations in the aplication configuration or the root page configuration.)
+</p>
+
-<div class="last-modified">$Id$</div></com:TContent>

trunk/demos/quickstart/protected/pages/GettingStarted/NewFeatures.page

@@ -14 +14 @@
-<li>Added a new control <a href="?page=Controls.Slider">TSlider</a> that displays a slider which can be used for numeric input.</li>
-<li>Added Oracle DB support to Active Record.</li>
-
+
+
-</ul>
-

trunk/framework/Exceptions/TErrorHandler.php

@@ -301 +301 @@
-                // because the 1st stack level is of little use (it's in error handler)
-                if($exception instanceof TPhpErrorException)
-
+isset($trace[0]['file'])?$trace[0]:
-                else if($exception instanceof TInvalidOperationException)
-                {

trunk/framework/Security/TAuthorizationRule.php

@@ -15 +15 @@
- * TAuthorizationRule represents a single authorization rule.
- * A rule is specified by an action (required), a list of users (optional),
-nd a verb
+ verb (optional), and a list of IP rules
- * Action can be either 'allow' or 'deny'.
- * Guest (anonymous, unauthenticated) users are represented by question mark '?'.
@@ -23 +23 @@
- * Different users/roles are separated by comma ','.
- * Verb can be either 'get' or 'post'. If it is absent, it means both.
+ * IP rules are separated by comma ',' and can contain wild card in the rules (e.g. '192.132.23.33, 192.122.*.*')
- *
- * @author Qiang Xue <qiang.xue@gmail.com>
@@ -48 +49 @@
-        private $_verb;
-        /**
+         * @var string IP patterns
+         */
+        private $_ipRules;
+        /**
-         * @var boolean if this rule applies to everyone
-         */
@@ -66 +71 @@
-         * @param string a comma separated role list
-         * @param string verb, can be empty, 'get', or 'post'
-
-
+
+
+
-        {
-                $action=strtolower(trim($action));
@@ -76 +82 @@
-                $this->_users=array();
-                $this->_roles=array();
+                $this->_ipRules=array();
-                $this->_everyone=false;
-                $this->_guest=false;
@@ -106 +113 @@
-                else
-                        throw new TInvalidDataValueException('authorizationrule_verb_invalid',$verb);
+                foreach(explode(',',$ipRules) as $ipRule)
+                {
+                        if(($ipRule=trim($ipRule))!=='')
+                                $this->_ipRules[]=$ipRule;
+                }
-        }
-
@@ -138 +150 @@
-        {
-                return $this->_verb;
+        }
+
+        /**
+         * @return array list of IP rules.
+         * @since 3.1.1
+         */
+        public function getIPRules()
+        {
+                return $this->_ipRules;
-        }
-
@@ -172 +193 @@
-                if($this->_verb==='' || strcasecmp($verb,$this->_verb)===0)
-                {
+                        if(!$this->isHostAddressMatched())
+                                return 0;
-                        if($this->_everyone || ($this->_guest && $user->getIsGuest()) || ($this->_authenticated && !$user->getIsGuest()))
-                                return $decision;
@@ -182 +205 @@
-                return 0;
-        }
+
+        private function isHostAddressMatched()
+        {
+                if(empty($this->_ipRules))
+                        return 1;
+                $ip=Prado::getApplication()->getRequest()->getUserHostAddress();
+                foreach($this->_ipRules as $rule)
+                {
+                        if($rule===$ip)
+                                return 1;
+                        if(strpos($rule,'*')!==false)
+                        {
+                                $a=explode('.',$rule);
+                                $b=explode('.',$ip);
+                                if(isset($a[3]) && isset($b[3]))
+                                {
+                                        $matched=true;
+                                        for($i=0;$i<4;++$i)
+                                        {
+                                                if($a[$i]!==$b[i] && $a[$i]!=='*')
+                                                {
+                                                        $matched=false;
+                                                        break;
+                                                }
+                                        }
+                                        if($matched)
+                                                return 1;
+                                }
+                        }
+                }
+                return 0;
+        }
-}
-

trunk/framework/Web/Services/TPageService.php

@@ -138 +138 @@
-                Prado::trace("Initializing TPageService",'System.Web.Services.TPageService');
-
-this->getRequestedPagePath(),$
+
-
-                $this->initPageContext($pageConfig);
@@ -170 +170 @@
-                $this->_properties=$config->getProperties();
-                $this->getApplication()->getAuthorizationRules()->mergeWith($config->getRules());
+                $pagePath=$this->getRequestedPagePath();
-                // external configurations
-
-
+
+
+
-                        if($condition!==true)
-                                $condition=$this->evaluateExpression($condition);
@@ -179 +181 @@
-                                if(($path=Prado::getPathOfNamespace($filePath,TApplication::CONFIG_FILE_EXT))===null || !is_file($path))
-                                        throw new TConfigurationException('pageservice_includefile_invalid',$filePath);
-
-null
+($pagePath)
+$configPagePath
-                                $this->applyConfiguration($c);
-                        }
@@ -201 +203 @@
-        /**
-         * Collects configuration for a page.
-
-
+
-         * @return TPageConfiguration
-         */
-pagePath,$config=null
+config
-        {
-                $application=$this->getApplication();
+                $pagePath=$this->getRequestedPagePath();
-                if(($cache=$application->getCache())===null)
-                {
-
+($pagePath)
-                        if($config!==null)
-
-pagePath,$
+,''
+
-                }
-                else
@@ -259 +261 @@
-                        if(!$configCached)
-                        {
-
+($pagePath)
-                                if($config!==null)
-
-pagePath,$
+,''
+
-                                $cache->set(self::CONFIG_CACHE_PREFIX.$this->getID().$pagePath,array($pageConfig,$currentTimestamp));
-                        }
@@ -518 +520 @@
-         */
-        private $_includes=array();
+        /**
+         * @var string the currently request page in the format of Path.To.PageName
+         */
+        private $_pagePath='';
+
+        /**
+         * Constructor.
+         * @param string the currently request page in the format of Path.To.PageName
+         */
+        public function __construct($pagePath)
+        {
+                $this->_pagePath=$pagePath;
+        }
-
-        /**
@@ -559 +574 @@
-        /**
-         * Loads configuration for a page specified in a path format.
-         * @param string path to the page (dot-connected format)
-         * @param string root path for pages
-         */
-pagePath,$
-
-
+
+
+this->_
-                $page=array_pop($paths);
-                $path=$basePath;
+                $configPagePath='';
-                foreach($paths as $p)
-                {
-null
+$configPagePath
-                        $path.=DIRECTORY_SEPARATOR.$p;
-
-
+
+
+
+
+
+
-                $this->_rules=new TAuthorizationRuleCollection($this->_rules);
-        }
@@ -579 +598 @@
-         * Loads a specific config file.
-         * @param string config file name
-page name, null if page is not required
-
-page
-
-$page with
+the page path that the config file is associated with. The page path doesn't include the page name.
+
+configPagePath
+
+page configuration
-                if(empty($fname) || !is_file($fname))
-                        return;
-                $dom=new TXmlDocument;
-                if($dom->loadFromFile($fname))
-page
+configPagePath
-                else
-                        throw new TConfigurationException('pageserviceconf_file_invalid',$fname);
@@ -598 +617 @@
-         * and page service.
-         * @param TXmlElement config xml element
-base path corresponding to this xml element
-page name, null if page is not required
-
-page=null
+the directory containing this configuration
+the page path that the config XML is associated with. The page path doesn't include the page name.
+
+configPagePath
-        {
-                $this->loadApplicationConfigurationFromXml($dom,$configPath);
-page
+configPagePath
-        }
-
@@ -623 +642 @@
-         * @param TXmlElement config xml element
-         * @param string base path corresponding to this xml element
-page name, null if page is not required
-
-page=null
+the page path that the config XML is associated with. The page path doesn't include the page name.
+
+configPagePath
-        {
-                // authorization
@@ -633 +652 @@
-                        foreach($authorizationNode->getElements() as $node)
-                        {
-ge
+ttern
-                                $ruleApplies=false;
-ges))
+tterns)) // null or empty string
-                                        $ruleApplies=true;
- if($page!==null)
+
-                                {
-
-
+
-                                        {
-strcasecmp($page,trim($p))===0
+($pattern=trim($pattern))!==''
-                                                {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                                }
-                                        }
-                                }
-                                if($ruleApplies)
-
+,$node->getAttribute('ip')
-                        }
-                        $this->_rules=array_merge($rules,$this->_rules);
@@ -659 +692 @@
-                {
-                        $this->_properties=array_merge($this->_properties,$pagesNode->getAttributes()->toArray());
-
+
+
-                        {
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        }
-                }
@@ -680 +711 @@
-                                throw new TConfigurationException('pageserviceconf_includefile_required');
-                        if(isset($this->_includes[$filePath]))
-'('.$this->_includes[$filePath].') || ('.$when.')'
+array($configPagePath,'('.$this->_includes[$filePath][1].') || ('.$when.')')
-                        else
-$when
+array($configPagePath,$when)
-                }
-        }