From 18a14e743662de38455e0338481add4e64cf3ee0 Mon Sep 17 00:00:00 2001
From: "NTEN\\Nenninger" <dirk@n-tools.de>
Date: Mon, 24 Jul 2023 12:22:05 +0200
Subject: [PATCH] V1.8 20.06.2023 -> neue Parameter und devid darf keine
 Zeichen sondern nur Buchstaben und Zahlen enthalten

---
 hermineConnect.php |  64 ++++++++++++++++++++++++++++++++++++++-------
 hermineConnect.zip | Bin 5025 -> 0 bytes
 2 files changed, 54 insertions(+), 10 deletions(-)
 delete mode 100644 hermineConnect.zip

diff --git a/hermineConnect.php b/hermineConnect.php
index efc9e5d..2f46e65 100644
--- a/hermineConnect.php
+++ b/hermineConnect.php
@@ -1,7 +1,9 @@
 <?php
   /*
     Nenninger N-Tools.de
-    Version 1.7
+    Version 1.8
+	
+	*20.06.2023 -> neue Parameter und devid darf keine Zeichen sondern nur Buchstaben und Zahlen enthalten
     
     hermine@THW PHPConnector
     inspiriert von https://gitlab.com/aeberhardt/stashcat-api-client
@@ -167,7 +169,7 @@ class UUID {
 
   
 class hermineConnect{
-  private $VERSION = '1.3';
+  private $VERSION = '1.8';
   private $hermineServer = 'https://api.thw-messenger.de';
   private $connectorID = "";
   private $user = "";
@@ -190,7 +192,11 @@ class hermineConnect{
     $data = '';
     $eol = "\r\n";
     $delimiter = '-------------' . $boundary;
+	  
     foreach ($fields as $name => $content) {
+		/*echo "@@\n";
+		print_r($content);
+		echo "@@\n";*/
       $data .= "--" . $delimiter . $eol
           . 'Content-Disposition: form-data; name="' . $name . "\"".$eol.$eol
           . $content . $eol
@@ -221,7 +227,7 @@ class hermineConnect{
     }
     $cID = array_map('hexdec', str_split('deadbeef'.sha1($_SERVER['SERVER_NAME']), 2));
     $cID = intArrayToString($cID);
-    $this->connectorID = base64_encode($cID);
+    $this->connectorID =str_replace(['+','/','='], ['','',''],base64_encode($cID));
     $this->user = $user;
     $this->password = $password;
     $this->passphrase = $passphrase;
@@ -254,7 +260,6 @@ class hermineConnect{
                                                        "Content-Length: " . strlen($_data),
                                                        'Expect:'
                                                        ));
-    
     curl_setopt( $this->cURL, CURLOPT_COOKIESESSION, true );
     curl_setopt( $this->cURL, CURLOPT_COOKIEJAR, './hermineConnectCookie.txt' );
     curl_setopt( $this->cURL, CURLOPT_COOKIEFILE, './hermineConnectCookie.txt' );
@@ -278,15 +283,32 @@ class hermineConnect{
         return false;
       }
     } else {
-      $this->lasterror = 'Curl error: ' . curl_error($cURL);
+      $this->lasterror = 'Curl error: ' . curl_error($this->cURL);
       return false;
     }
     
     
   }
+	
+  function _check(){
+    //Nenninger ab 20.06.2023 neue
+	$data = [
+          "app_name" => 'hermine@thw-PHP:'.$this->VERSION,
+          "encrypted" => true,
+          "callable" => false,
+		  "key_transfer_support" => false
+      ];
+    $response = $this->request($this->hermineServer."/auth/check",$data);
+    if($response !== false){
+      return true;
+    }else{
+      return false;
+    }
+  }
 
   function _open_private_key(){
-    $data = [];
+    //Nenninger ab 20.06.2023 neue Parameter format=pem&type=encryption
+	$data = ['format'=>'pem','type'=>'encryption'];
     $response = $this->request($this->hermineServer."/security/get_private_key",$data);
     $private_key = json_decode($response->keys->private_key);
     $privkey_decoded = openssl_pkey_get_private($private_key->private, $this->passphrase);
@@ -496,6 +518,21 @@ class hermineConnect{
       return false;
     }
   }
+	
+	function _get_channel_infos($_id){
+		$data = [
+			"channel_id" => $_id,
+			"without_members" => false
+			];
+		
+		$response = $this->request($this->hermineServer."/channels/info",$data);
+		    
+    	if($response !== false){
+			return $response->channels;
+		}else{
+			return false;
+		}
+	}
 
 /*  
    Öffentliche Funktionen
@@ -525,6 +562,7 @@ class hermineConnect{
         $this->client_key = $savelogin->ClientKey;
         $this->connectorID = $savelogin->DeviceId;
         $this->user_id = $savelogin->UserID;
+		$this->_check();
         if($this->_open_private_key()){
           $this->companies = $this->get_companies();
           $this->channels = $this->get_channels($this->companies->companies[0]->id);
@@ -538,13 +576,15 @@ class hermineConnect{
           "password" => $this->password,
           "app_name" => 'hermine@thw-PHP:'.$this->VERSION,
           "encrypted" => true,
-          "callable" => false
+          "callable" => false,
+		  "key_transfer_support" => false
       ];
 
     $response = $this->request($this->hermineServer."/auth/login",$data);
     if($response !== false){
       $this->client_key = $response->client_key;
       $this->user_id = $response->userinfo->id;
+	  $this->_check();
       if($this->_open_private_key()){
         $this->companies = $this->get_companies();
         $this->channels = $this->get_channels($this->companies->companies[0]->id);
@@ -610,6 +650,10 @@ class hermineConnect{
   public function get_channel_messages($_channel_id){
     return $this->get_messages(array('channel',$_channel_id),$_limit,$_offset);
   }
+	
+  public function get_channel_infos($_channel_id){
+    return $this->_get_channel_infos($_channel_id);
+  }
   
   public function search_user($_searchby, $_limit=50, $_offset=0){
     $data = [
@@ -617,9 +661,9 @@ class hermineConnect{
           "offset" => $_offset,
           "key_hashes" => false,
           "search" => $_searchby,
-          "sorting" => ["first_name_asc", "last_name_asc"],
-          "exclude_user_ids" => [],
-          "group_ids" => [],
+          "sorting" => '["first_name_asc", "last_name_asc"]',
+          "exclude_user_ids" => '[]',
+          "group_ids" => '[]',
       ];
 
     $response = $this->request($this->hermineServer."/users/listing",$data);
diff --git a/hermineConnect.zip b/hermineConnect.zip
deleted file mode 100644
index dce72b7b74597e350878d40856caea61cc210667..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5025
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