add reconnectLte method

diff --git a/.gitignore b/.gitignore
index 4c32ee7d6fc372e7547d0abfa51afe94cf536abb..d13167d6bee02dd656690bfeeff18aa84f969e66 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tests/config.php
 /tests/config.php

+/tests/test.php

diff --git a/speedport.class.php b/speedport.class.php
index 7bc5e8b2d246ddbf046bb5d9600745f9ffcb3219..39f26a9d2709b13f47ea84471293038d0c3d4449 100644 (file)
--- a/speedport.class.php
+++ b/speedport.class.php
@@ -11,6 +11,12 @@ class speedport {
         */
        private $challenge = '';
        
         */
        private $challenge = '';
        

+       /**
+        * csrf_token
+        * @var string
+        */
+       private $token = '';
+       

        /**
         * hashed password
         * @var string
        /**
         * hashed password
         * @var string


@@ -88,6 +94,9 @@ class speedport {
                                // calculate derivedk
                                $this->derivedk = hash_pbkdf2('sha1', hash('sha256', $password), substr($this->challenge, 0, 16), 1000, 32);
                                
                                // calculate derivedk
                                $this->derivedk = hash_pbkdf2('sha1', hash('sha256', $password), substr($this->challenge, 0, 16), 1000, 32);
                                

+                               // get the csrf_token
+                               $this->token = $this->getToken();
+                               

                                return true;
                        }
                }
                                return true;
                        }
                }


@@ -265,20 +274,24 @@ class speedport {
                return explode("\n", $data['body']);
        }
        
                return explode("\n", $data['body']);
        }
        

-       /*
-       // we cant encrypt and decrypt AES with mode CCM, we need AES with CCM mode for the commands
-       // (stupid, all other data are send as plaintext and some 'normal' data are encrypted...)
+       /**
+        * reconnect LTE
+        *
+        * @return      array
+        */

        public function reconnectLte () {
                $path = 'data/modules.json';
        public function reconnectLte () {
                $path = 'data/modules.json';

-               $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'password' => $this->hash, 'lte_reconn' => 'true');
+               $fields = array('csrf_token' => $this->token, 'lte_reconn' => '1');
+               $fields = $this->encrypt($fields);

                $cookie = 'challengev='.$this->challenge.'; '.$this->session;
                $cookie = 'challengev='.$this->challenge.'; '.$this->session;

-               $data = $this->sentRequest($path, $fields, $cookie);
+               $data = $this->sentRequest($path, $fields, $cookie, 2);

                $json = json_decode($data['body'], true);
                
                return $json;
        }
                $json = json_decode($data['body'], true);
                
                return $json;
        }

-       */
+       

        /*
        /*

+       // i dont want test this :D, feel free to test it and report if it works or not

        public function resetToFactoryDefault () {
                $path = 'data/resetAllSetting.json';
                $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'password' => $this->hash, 'reset_all' => 'true');
        public function resetToFactoryDefault () {
                $path = 'data/resetAllSetting.json';
                $fields = array('csrf_token' => 'nulltoken', 'showpw' => 0, 'password' => $this->hash, 'reset_all' => 'true');


@@ -353,25 +366,32 @@ class speedport {
                $mode = $factory->getMode('ccm', $aes, $iv, [ 'adata' => $adata, 'lSize' => 7]);
                $mode->encrypt(http_build_query($data));
                
                $mode = $factory->getMode('ccm', $aes, $iv, [ 'adata' => $adata, 'lSize' => 7]);
                $mode->encrypt(http_build_query($data));
                

-               return $mode->finish();
+               return bin2hex($mode->finish());

        }
        
        /**
         * sends the request to router
         * 
         * @param       string  $path
        }
        
        /**
         * sends the request to router
         * 
         * @param       string  $path

-        * @param       array   $fields
+        * @param       mixed   $fields

         * @param       string  $cookie
         * @param       string  $cookie

+        * @param       integer $count

         * @return      array
         */
         * @return      array
         */

-       private function sentRequest ($path, $fields = array(), $cookie = '') {
+       private function sentRequest ($path, $fields, $cookie = '', $count = 0) {

                $url = $this->url.$path;
                $ch = curl_init();
                curl_setopt($ch, CURLOPT_URL, $url);
                
                if (!empty($fields)) {
                $url = $this->url.$path;
                $ch = curl_init();
                curl_setopt($ch, CURLOPT_URL, $url);
                
                if (!empty($fields)) {

-                       curl_setopt($ch, CURLOPT_POST, count($fields));
-                       curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($fields));
+                       if (is_array($fields)) {
+                               curl_setopt($ch, CURLOPT_POST, count($fields));
+                               curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($fields));
+                       }
+                       else {
+                               curl_setopt($ch, CURLOPT_POST, $count);
+                               curl_setopt($ch, CURLOPT_POSTFIELDS, $fields);
+                       }

                }
                
                if (!empty($cookie)) {
                }
                
                if (!empty($cookie)) {


@@ -403,6 +423,32 @@ class speedport {
                return array('header' => $this->parse_headers($header), 'body' => $body);
        }
        
                return array('header' => $this->parse_headers($header), 'body' => $body);
        }
        

+       /**
+        * get the csrf_token
+        * 
+        * @return      string
+        */
+       private function getToken () {
+               $path = 'html/content/overview/index.html?lang=de';
+               $fields = array();
+               $cookie = 'challengev='.$this->challenge.'; '.$this->session;
+               $data = $this->sentRequest($path, $fields, $cookie);
+               
+               if (empty($data['body'])) {
+                       throw new Exception('unable to get csrf_token');
+               }
+               
+               $a = explode('csrf_token = "', $data['body']);
+               $a = explode('";', $a[1]);
+               
+               if (isset($a[0]) && !empty($a[0])) {
+                       return $a[0];
+               }
+               else {
+                       throw new Exception('unable to get csrf_token');
+               }
+       }
+       

        /**
         * parse the curl return header into an array
         * 
        /**
         * parse the curl return header into an array
         *