Merge branch 'verify-ssl' of 'https://github.com/jjmerchante/grimoire…

…lab-sortinghat'

Merges #737
Closes #737

NEWS

@@ -1,5 +1,9 @@
 # Releases
 
+  ## sortinghat 0.8.1 - (2023-02-03)
+
+  * Update Poetry's package dependencies
+
 ## sortinghat 0.8.0 - (2023-02-01)
 
 **New features:**

README.md

@@ -62,7 +62,7 @@ $ apt install libmysqlclient-dev
 * **MariaDB**
 
 ```
-$ apt install libmariadbclient-dev
+$ apt install libmariadbclient-dev-compat
 ```
 
 #### Installation and configuration
@@ -128,7 +128,7 @@ $ yarn install
 
 Run SortingHat frontend Vue app:
 ```
-$ yarn serve
+$ yarn serve --api_url=http://localhost:8000/api/
 ```
 
 
@@ -155,6 +155,12 @@ In order to run the service for the first time, you need to execute the next com
 Build the UI interface:
 ```
 $ cd ui
+$ yarn install
+$ yarn build --mode development
+```
+If you want to run the UI at `/identities` run (you need to use the server 
+behind a proxy server):
+```
 $ yarn build
 ```
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sortinghat"
-version = "0.8.0"
+version = "0.8.1"
 description = "A tool to manage identities."
 authors = [
     "GrimoireLab Developers"
@@ -54,7 +54,7 @@ click = "7.1.1"
 Django = "^3.2"
 django-graphql-jwt = "^0.3.0"
 graphene-django = "^2.15"
-sgqlc = "^10.1"
+sgqlc = "^16.1"
 mysqlclient = "2.0.3"
 python-dateutil = "^2.8.2"
 requests = "^2.7.0"

releases/0.8.1.md

@@ -0,0 +1,3 @@
+  ## sortinghat 0.8.1 - (2023-02-03)
+
+  * Update Poetry's package dependencies

releases/unreleased/verify-ssl-option-for-client.yml

@@ -0,0 +1,8 @@
+---
+title: Verify SSL option for client
+category: added
+author: Jose Javier Merchante <[email protected]>
+issue: null
+notes: |
+  Include an option for the client to verify if the certificate is
+  valid. By default it is verified.

sortinghat/_version.py

@@ -1,2 +1,2 @@
-# File auto-generated by semverup on 2023-02-01 10:59:30.391457
-__version__ = "0.8.0"
+# File auto-generated by semverup on 2023-02-03 08:30:48.949189
+__version__ = "0.8.1"

sortinghat/cli/client/client.py

@@ -22,7 +22,7 @@
 import requests
 import urllib.parse
 
-from sgqlc.endpoint.http import HTTPEndpoint
+from sgqlc.endpoint.requests import RequestsEndpoint
 from sgqlc.operation import Operation
 from sgqlc.types import Scalar
 
@@ -70,10 +70,11 @@ class SortingHatClient:
 
     :raises ValueError: when any of the given parameters is invalid
     """
-    def __init__(self, host, port=9314, path=None, user=None, password=None, ssl=True):
+    def __init__(self, host, port=9314, path=None, user=None, password=None, ssl=True, verify_ssl=True):
         self.gqlc = None
         self.host = host
         self.port = port
+        self.verify_ssl = verify_ssl
 
         scheme = 'https' if ssl else 'http'
         netloc = self.host + ':' + str(self.port) if self.port else self.host
@@ -101,8 +102,11 @@ def __init__(self, host, port=9314, path=None, user=None, password=None, ssl=Tru
     def connect(self):
         """Establish a connection to the server."""
 
+        session = requests.Session()
+        session.verify = self.verify_ssl
+
         try:
-            result = requests.get(self.url, headers={'Accept': 'text/html'})
+            result = session.get(self.url, headers={'Accept': 'text/html'})
             result.raise_for_status()
         except requests.exceptions.RequestException as exc:
             if result.status_code != 400:
@@ -116,7 +120,7 @@ def connect(self):
             'Referer': self.url
         }
 
-        self.gqlc = HTTPEndpoint(self.url, headers)
+        self.gqlc = RequestsEndpoint(self.url, headers, session=session)
 
         if self.user and self.password:
             op = Operation(sh_schema.SortingHatMutation)

tests/test_client.py

@@ -24,7 +24,7 @@
 import unittest
 
 import httpretty
-import sgqlc.endpoint.http
+import sgqlc.endpoint.requests
 
 from sgqlc.operation import Operation
 
@@ -135,7 +135,7 @@ def test_connect(self):
         client = SortingHatClient('localhost', ssl=False)
         client.connect()
 
-        self.assertIsInstance(client.gqlc, sgqlc.endpoint.http.HTTPEndpoint)
+        self.assertIsInstance(client.gqlc, sgqlc.endpoint.requests.RequestsEndpoint)
 
         latest_requests = httpretty.latest_requests()
         self.assertEqual(len(latest_requests), 1)
@@ -186,7 +186,7 @@ def test_authentication(self):
         client = SortingHatClient('localhost', user='admin', password='admin', ssl=False)
         client.connect()
 
-        self.assertIsInstance(client.gqlc, sgqlc.endpoint.http.HTTPEndpoint)
+        self.assertIsInstance(client.gqlc, sgqlc.endpoint.requests.RequestsEndpoint)
 
         latest_requests = httpretty.latest_requests()
         self.assertEqual(len(latest_requests), 3)