From 6b312ba65b146788555005ab2de1094d37b6beed Mon Sep 17 00:00:00 2001
From: mokaddem <sami.mokaddem@circl.lu>
Date: Mon, 28 Jun 2021 08:52:39 +0200
Subject: [PATCH] fix: [localTool:MISP] Effectively enable user on connection
 request finalisation

---
 .../local_tool_connectors/MispConnector.php   | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/Lib/default/local_tool_connectors/MispConnector.php b/src/Lib/default/local_tool_connectors/MispConnector.php
index 19af9dd..c087691 100644
--- a/src/Lib/default/local_tool_connectors/MispConnector.php
+++ b/src/Lib/default/local_tool_connectors/MispConnector.php
@@ -696,7 +696,7 @@ class MispConnector extends CommonConnectorTools
     {
         $params['connection_settings'] = json_decode($params['connection']['settings'], true);
         $params['misp_organisation'] = $this->getSetOrg($params);
-        $params['sync_user'] = $this->createSyncUser($params);
+        $params['sync_user'] = $this->createSyncUser($params, true);
         return [
             'email' => $params['sync_user']['email'],
             'user_id' => $params['sync_user']['id'],
@@ -710,7 +710,7 @@ class MispConnector extends CommonConnectorTools
         $params['sync_user_enabled'] = true;
         $params['connection_settings'] = json_decode($params['connection']['settings'], true);
         $params['misp_organisation'] = $this->getSetOrg($params);
-        $params['sync_user'] = $this->createSyncUser($params);
+        $params['sync_user'] = $this->createSyncUser($params, false);
         $serverParams = $params;
         $serverParams['body'] = [
             'authkey' => $params['remote_tool_data']['authkey'],
@@ -730,6 +730,7 @@ class MispConnector extends CommonConnectorTools
     public function finaliseConnection(array $params): bool
     {
         $params['misp_organisation'] = $this->getSetOrg($params);
+        $user = $this->enableUser($params, intval($params['remote_tool_data']['reflected_user_id']));
         $serverParams = $params;
         $serverParams['body'] = [
             'authkey' => $params['remote_tool_data']['authkey'],
@@ -771,20 +772,29 @@ class MispConnector extends CommonConnectorTools
         return $organisation;
     }
 
-    private function createSyncUser(array $params): array
+    private function createSyncUser(array $params, $disabled=true): array
     {
         $params['softError'] = 1;
         $user = [
             'email' => 'sync_%s@' . parse_url($params['remote_cerebrate']['url'])['host'],
             'org_id' => $params['misp_organisation']['id'],
             'role_id' => empty($params['connection_settings']['role_id']) ? 5 : $params['connection_settings']['role_id'],
-            'disabled' => 1,
+            'disabled' => $disabled,
             'change_pw' => 0,
             'termsaccepted' => 1
         ];
         return $this->createUser($user, $params);
     }
 
+    private function enableUser(array $params, int $userID): array
+    {
+        $params['softError'] = 1;
+        $user = [
+            'disabled' => false,
+        ];
+        return $this->updateUser($userID, $user, $params);
+    }
+
     private function addServer(array $params): array
     {
         if (
@@ -817,6 +827,16 @@ class MispConnector extends CommonConnectorTools
         }
         return $response->getJson()['User'];
     }
+
+    private function updateUser(int $userID, array $user, array $params): array
+    {
+        $params['body'] = $user;
+        $response = $this->postData(sprintf('/admin/users/edit/%s', $userID), $params);
+        if (!$response->isOk()) {
+            throw new MethodNotAllowedException(__('Could not edit the user in MISP.'));
+        }
+        return $response->getJson()['User'];
+    }
 }
 
  ?>