Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Change for Xuanxuan entry sso.

Browse Source
This commit is contained in:
滔哥
2018-07-23 13:30:15 +08:00
parent 087cb53536
commit 1eaaf24db6
2 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/filter.php
+2 -1
View File
@@ -13,7 +13,7 @@ $filter->rules->word = '/^\w+$/';
$filter->rules->paramName = '/^[a-zA-Z0-9_\.]+$/';
$filter->rules->paramValue = '/^[a-zA-Z0-9=_,`#+\^\/\.%\|\x7f-\xff]+$/';
$filter->default = new stdclass();
$filter->default = new stdclass();
$filter->default->moduleName = 'code';
$filter->default->methodName = 'code';
$filter->default->paramName = 'reg::paramName';
@@ -194,6 +194,7 @@ $filter->sso->login->get['md5'] = 'reg::md5';
$filter->sso->login->get['referer'] = 'reg::base64';
$filter->sso->login->get['status'] = 'code';
$filter->sso->login->get['token'] = 'reg::md5';
$filter->sso->login->get['sessionid'] = 'reg::base64';
$filter->sso->logout->get['status'] = 'code';
$filter->sso->logout->get['token'] = 'reg::md5';
module/sso/control.php
+21 -16
View File
@@ -13,8 +13,8 @@ class sso extends control
{
/**
* SSO login.
*
* @param string $type
*
* @param string $type
* @access public
* @return void
*/
@@ -44,6 +44,11 @@ class sso extends control
{
$location = rtrim($location, '?') . "?token=$token&auth=$auth&userIP=$userIP&callback=$callback&referer=$referer";
}
if(!empty($_GET['sessionid']))
{
$sessionConfig = json_decode(base64_decode($this->get->sessionid), false);
$location .= '&' . $sessionConfig->session_name . '=' . $sessionConfig->session_id;
}
$this->locate($location);
}
@@ -95,8 +100,8 @@ class sso extends control
/**
* SSO logout.
*
* @param string $type
*
* @param string $type
* @access public
* @return void
*/
@@ -115,9 +120,9 @@ class sso extends control
if(strpos($location, '&') !== false)
{
$location = rtrim($location, '&') . "&token=$token&auth=$auth&userIP=$userIP&callback=$callback";
}
}
else
{
{
$location = rtrim($location, '?') . "?token=$token&auth=$auth&userIP=$userIP&callback=$callback";
}
$this->locate($location);
@@ -135,7 +140,7 @@ class sso extends control
/**
* Ajax set config.
*
*
* @access public
* @return void
*/
@@ -158,9 +163,9 @@ class sso extends control
}
/**
* Bind user.
*
* @param string $referer
* Bind user.
*
* @param string $referer
* @access public
* @return void
*/
@@ -199,7 +204,7 @@ class sso extends control
/**
* Get pairs of user.
*
*
* @access public
* @return void
*/
@@ -212,7 +217,7 @@ class sso extends control
/**
* Get bind users with ranzhi.
*
*
* @access public
* @return void
*/
@@ -225,7 +230,7 @@ class sso extends control
/**
* Bind user from ranzhi.
*
*
* @access public
* @return void
*/
@@ -242,7 +247,7 @@ class sso extends control
/**
* Create user from ranzhi.
*
*
* @access public
* @return void
*/
@@ -258,8 +263,8 @@ class sso extends control
/**
* Get todo list for ranzhi.
*
* @param string $account
*
* @param string $account
* @access public
* @return void
*/