Merge pull request #47 from shaarli/ssl-insecure-option

add '--insecure' command line flag, release v0.4.0

Author: nodiscc

docs/changelog.rst

@@ -9,6 +9,16 @@ The format is based on `Keep a Changelog`_ and this project adheres to
 .. _Keep A Changelog: http://keepachangelog.com/
 .. _Semantic Versioning: http://semver.org/
 
+`v0.4.0 <https://github.com/shaarli/python-shaarli-client/releases/tag/v0.3.0>`_ - 2020-01-09
+---------------------------------------------------------------------------------------------
+
+**Added:**
+
+* CLI:
+
+  * Add support for ``--insecure`` option (bypass SSL certificate verification)
+
+
 `v0.3.0 <https://github.com/shaarli/python-shaarli-client/releases/tag/v0.3.0>`_ - 2019-02-23
 ---------------------------------------------------------------------------------------------
 

docs/user/usage.rst

@@ -43,6 +43,7 @@ The ``-h`` and ``--help`` flags allow to display help for any command or sub-com
                            Output formatting
      -o --outfile FILENAME
                            File to save the program output to
+     --insecure            Bypass API SSL/TLS certificate verification
 
 
 .. code-block:: bash

shaarli_client/__init__.py

@@ -1,5 +1,5 @@
 """shaarli-client"""
 __title__ = 'shaarli_client'
 __brief__ = 'CLI to interact with a Shaarli instance'
-__version__ = '0.3.0'
+__version__ = '0.4.0'
 __author__ = 'The Shaarli Community'

shaarli_client/client/v1.py

@@ -246,7 +246,7 @@ def _retrieve_http_params(cls, args):
 
         return (endpoint['method'], path, params)
 
-    def _request(self, method, endpoint, params):
+    def _request(self, method, endpoint, params, verify_certs):
         """Send an HTTP request to this instance"""
         auth = JWTAuth(self.secret, alg='HS512', header_format='Bearer %s')
         auth.add_field('iat', lambda req: calendar.timegm(time.gmtime()))
@@ -258,13 +258,15 @@ def _request(self, method, endpoint, params):
                 method,
                 endpoint_uri,
                 auth=auth,
-                params=params
+                params=params,
+                verify=verify_certs
             )
         return requests.request(method, endpoint_uri, auth=auth, json=params)
 
     def request(self, args):
         """Send a parameterized request to this instance"""
-        return self._request(* self._retrieve_http_params(args))
+        verify_certs = False if args.insecure else True
+        return self._request(* self._retrieve_http_params(args), verify_certs)
 
     def get_info(self):
         """Get information about this instance"""

shaarli_client/main.py

@@ -43,6 +43,11 @@ def main():
         '--outfile',
         help="File to save the program output to"
     )
+    parser.add_argument(
+        '--insecure',
+        action='store_true',
+        help="Bypass API SSL/TLS certificate verification"
+    )
 
     subparsers = parser.add_subparsers(
         dest='endpoint_name',