diff --git a/module/sso/control.php b/module/sso/control.php index 63f509eabc..8d56f6aa80 100644 --- a/module/sso/control.php +++ b/module/sso/control.php @@ -26,7 +26,7 @@ class sso extends control $this->app->loadConfig('sso'); if(!$this->config->sso->turnon) return print($this->locate($locate)); - if($type != 'return') return $this->ssoZen->locateNotifyLink($locate, $referer); + if($type != 'return') return $this->ssoZen->locateNotifyLink($this->config->sso->addr, $referer); $this->ssoZen->idenfyFromSSO($locate); return $this->locate($this->createLink('user', 'login', empty($referer) ? '' : "referer=$referer")); diff --git a/module/sso/zen.php b/module/sso/zen.php index bfeee6677c..55e15bd51e 100644 --- a/module/sso/zen.php +++ b/module/sso/zen.php @@ -104,8 +104,9 @@ class ssoZen extends sso { if($this->get->status != 'success' || md5($this->get->data) != $this->get->md5) return false; - $last = $this->server->request_time; - $data = json_decode(base64_decode($this->get->data)); + $userIP = helper::getRemoteIp(); + $last = $this->server->request_time; + $data = json_decode(base64_decode($this->get->data)); if($data->auth != $this->computeAuth($data->token)) return false; @@ -224,4 +225,3 @@ class ssoZen extends sso return md5($code . $userIP . $token . $key); } } -