fix logout

[GitHub/Stricted/speedport-hybrid-php-api.git] / SpeedportHybrid.class.php

diff --git a/SpeedportHybrid.class.php b/SpeedportHybrid.class.php
index 319b97d13172b6717a8b4463af0a384c722c80f5..c255ed6ac310d2b37695719e923d9b8f5032245e 100644 (file)
--- a/SpeedportHybrid.class.php
+++ b/SpeedportHybrid.class.php
@@ -41,25 +41,14 @@ class SpeedportHybrid {
         */
        private $derivedk = '';
        
-       public function __construct ($password, $url = 'http://speedport.ip/') {
+       public function __construct ($url = 'http://speedport.ip/') {
                $this->url = $url;
-               $this->getChallenge();
-               
-               if (empty($this->challenge)) {
-                       throw new Exception('unable to get the challenge from the router');
-               }
-               
-               $login = $this->login($password);
-               
-               if ($login === false) {
-                       throw new Exception('unable to login');
-               }
        }
        
        /**
         * Requests the password-challenge from the router.
         */
-       public function getChallenge () {
+       private function getChallenge () {
                $path = 'data/Login.json';
                $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'challengev' => 'null');
                $data = $this->sentRequest($path, $fields);
@@ -78,6 +67,12 @@ class SpeedportHybrid {
         * @return      boolean
         */
        public function login ($password) {
+               $this->getChallenge();
+               
+               if (empty($this->challenge)) {
+                       throw new Exception('unable to get the challenge from the router');
+               }
+               
                $path = 'data/Login.json';
                $this->hash = hash('sha256', $this->challenge.':'.$password);
                $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'password' => $this->hash);
@@ -95,10 +90,11 @@ class SpeedportHybrid {
                                }
                                
                                // calculate derivedk
-                               if (version_compare(phpversion(), '5.5.0', '<')) {
+                               if (!function_exists("hash_pbkdf2")) {
                                        require_once 'CryptLib/CryptLib.php';
-                                       $pbkdf2 = new CryptLib\Key\Derivation\PBKDF\PBKDF2();
-                                       $this->derivedk = $pbkdf2->derive(hash('sha256', $password), substr($this->challenge, 0, 16), 1000, 32);
+                                       $pbkdf2 = new CryptLib\Key\Derivation\PBKDF\PBKDF2(array('hash' => 'sha1'));
+                                       $this->derivedk = bin2hex($pbkdf2->derive(hash('sha256', $password), substr($this->challenge, 0, 16), 1000, 32));
+                                       $this->derivedk = substr($this->derivedk, 0, 32);
                                }
                                else {
                                        $this->derivedk = hash_pbkdf2('sha1', hash('sha256', $password), substr($this->challenge, 0, 16), 1000, 32);
@@ -107,30 +103,65 @@ class SpeedportHybrid {
                                // get the csrf_token
                                $this->token = $this->getToken();
                                
-                               return true;
+                               if ($this->checkLogin() === true) {
+                                       return true;
+                               }
                        }
                }
                
                return false;
        }
        
+       /**
+        * check if we are logged in
+        *
+        * @return boolean
+        */
+       public function checkLogin () {
+               $path = 'data/SecureStatus.json';
+               $fields = array();
+               $cookie = 'challengev='.$this->challenge.'; '.$this->session;
+               $data = $this->sentRequest($path, $fields, $cookie);
+               
+               if (empty($data['body'])) {
+                       throw new Exception('unable to get '.$file.' data');
+               }
+               
+               $json = json_decode($data['body'], true);
+               $json = $this->getValues($json);
+               
+               if ($json['loginstate'] != 1) {
+                       return false;
+               }
+               
+               return true;
+       }
+       
        /**
         * logout
         * 
         * @return      array
         */
        public function logout () {
-               $path = 'data/Login.json';
-               $fields = array('logout' => 'byby');
-               $data = $this->sentRequest($path, $fields);
-               // reset challenge and session
-               $this->challenge = '';
-               $this->session = '';
-               $this->token = "";
-               
-               $json = json_decode($data['body'], true);
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
                
-               return $json;
+               $path = 'data/Login.json';
+               $fields = array('csrf_token' =>  $this->token, 'logout' => 'byby');
+               $cookie = 'challengev='.$this->challenge.'; '.$this->session;
+               $data = $this->sentRequest($path, $fields, $cookie);
+               if ($this->checkLogin() === false) {
+                       // reset challenge and session
+                       $this->challenge = '';
+                       $this->session = '';
+                       $this->token = "";
+                       
+                       $json = json_decode($data['body'], true);
+                       
+                       return $json;
+               }
+               else {
+                       throw new Exception('logout failed');
+               }
        }
        
        /**
@@ -139,6 +170,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function reboot () {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/Reboot.json';
                $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'password' => $this->hash, 'reboot_device' => 'true');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -155,6 +188,8 @@ class SpeedportHybrid {
         * @param       string  $status
         */
        public function changeConnectionStatus ($status) {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/Connect.json';
                
                if ($status == 'online' || $status == 'offline') {
@@ -178,6 +213,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function getData ($file) {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/'.$file.'.json';
                $fields = array();
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -198,6 +235,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function getSyslog() {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/Syslog.json';
                $fields = array('exporttype' => '0');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -216,6 +255,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function getMissedCalls() {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/ExportMissedCalls.json';
                $fields = array('exporttype' => '1');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -234,6 +275,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function getTakenCalls() {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/ExportTakenCalls.json';
                $fields = array('exporttype' => '2');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -252,6 +295,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function getDialedCalls() {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/ExportDialedCalls.json';
                $fields = array('exporttype' => '3');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -270,6 +315,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function reconnectLte () {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/modules.json';
                $fields = array('csrf_token' => $this->token, 'lte_reconn' => '1');
                $fields = $this->encrypt($fields);
@@ -287,6 +334,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function resetToFactoryDefault () {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/resetAllSetting.json';
                $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'password' => $this->hash, 'reset_all' => 'true');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -303,6 +352,8 @@ class SpeedportHybrid {
         * @return      array
         */
        public function checkFirmware () {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'data/checkfirmware.json';
                $fields = array('checkfirmware' => 'true');
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
@@ -437,6 +488,8 @@ class SpeedportHybrid {
         * @return      string
         */
        private function getToken () {
+               if ($this->checkLogin() !== true) throw new Exception('you musst be logged in to use this method');
+               
                $path = 'html/content/overview/index.html?lang=de';
                $fields = array();
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;