DevoInc · Worvast · Apr 3, 2020 · Apr 2, 2020 · Apr 2, 2020 · Apr 2, 2020
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.3] - 2020-04-02
+### Added
+ * Added new security flags to Sender SSL Sender
+
+### Changed
+ * Changed API processors to be able to add custom processors
+
+#### Fixed
+ * Documentation
+ * Sender CLI missing options
+
 ## [3.2.2] - 2020-03-23
 #### Fixed
  * wrongly assigned timeout from configuration

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 [![master Build Status](https://travis-ci.com/DevoInc/python-sdk.svg?branch=master)](https://travis-ci.com/DevoInc/python-sdk) [![LICENSE](https://img.shields.io/dub/l/vibe-d.svg)](https://github.com/DevoInc/python-sdk/blob/master/LICENSE)
 
-[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-3.2.2-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-3.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
+[![wheel](https://img.shields.io/badge/wheel-yes-brightgreen.svg)](https://pypi.org/project/devo-sdk/) [![version](https://img.shields.io/badge/version-3.2.3-blue.svg)](https://pypi.org/project/devo-sdk/) [![python](https://img.shields.io/badge/python-3.5%20%7C%203.6%20%7C%203.7-blue.svg)](https://pypi.org/project/devo-sdk/)
 
 
 # Devo Python SDK

diff --git a/devo/__version__.py b/devo/__version__.py
@@ -1,6 +1,6 @@
 __description__ = 'Devo Python Library.'
 __url__ = 'http://www.devo.com'
-__version__ = "3.2.2"
+__version__ = "3.2.3"
 __author__ = 'Devo'
 __author_email__ = 'support@devo.com'
 __license__ = 'MIT'

diff --git a/devo/api/client.py b/devo/api/client.py
@@ -76,8 +76,10 @@ def __init__(self, processor=DEFAULT, response="json/simple/compact",
         self.stream = stream
         self.response = response
         self.destination = destination
-        self.proc = processor
-        self.processor = processors()[self.proc]()
+        self.proc = None
+        self.processor = None
+        self.set_processor(processor)
+
         if pragmas:
             self.pragmas = pragmas
             if "user" not in self.pragmas.keys():
@@ -94,9 +96,18 @@ def set_processor(self, processor=None):
         :param processor: lambda function
         :return:
         """
-        if processor:
+        if isinstance(processor, (str, bytes)):
             self.proc = processor
-            self.processor = processors()[self.proc]()
+            try:
+                self.processor = processors()[self.proc]()
+            except KeyError:
+                raise_exception("Processor not found")
+        elif isinstance(processor, (type(lambda x: 0))):
+            self.proc = "CUSTOM"
+            self.processor = processor
+        else:
+            raise_exception("processor must be lambda/function or one of"
+                            "the defaults API processors.")
         return True
 
     def set_user(self, user=CLIENT_DEFAULT_USER):

diff --git a/devo/sender/data.py b/devo/sender/data.py
@@ -47,7 +47,8 @@ class SenderConfigSSL:
 
     """
     def __init__(self, address=None, key=None, cert=None, chain=None,
-                 pkcs=None, sec_level=None):
+                 pkcs=None, sec_level=None, check_hostname=True,
+                 verify_mode=None):
         if not isinstance(address, tuple):
             raise DevoSenderException(
                 "Devo-SenderConfigSSL| address must be a tuple "
@@ -60,6 +61,8 @@ def __init__(self, address=None, key=None, cert=None, chain=None,
             self.pkcs = pkcs
             self.hostname = socket.gethostname()
             self.sec_level = sec_level
+            self.check_hostname = check_hostname
+            self.verify_mode = verify_mode
         except Exception as error:
             raise DevoSenderException(
                 "Devo-SenderConfigSSL|Can't create SSL config: "
@@ -206,6 +209,11 @@ def __connect_ssl(self):
                             "DEFAULT@SECLEVEL={!s}"
                             .format(self._sender_config.sec_level))
 
+                    context.check_hostname = self._sender_config.check_hostname
+
+                    if self._sender_config.verify_mode is not None:
+                        context.verify_mode = self._sender_config.verify_mode
+
                     context.load_cert_chain(keyfile=self._sender_config.key,
                                             certfile=self._sender_config.cert)
                     self.socket = \
@@ -242,6 +250,37 @@ def info(self, msg):
         """
         self.send(tag=self.logging.get("tag"), msg=msg)
 
+    def set_sec_level(self, sec_level=None):
+        """
+        Set sec_level of SSL Context:
+
+        :param sec_level: sec_level value
+        :return
+        """
+        self._sender_config.sec_level = sec_level
+
+    def set_verify_mode(self, verify_mode=None):
+        """
+        Set verify_mode of SSL Context:
+
+        sss.CERT_NONE = 0
+        sss.CERT_OPTIONAL = 1
+        sss.CERT_REQUIRED = 2
+
+        :param verify_mode: verify mode value
+        :return
+        """
+        self._sender_config.verify_mode = verify_mode
+
+    def set_check_hostname(self, check_hostname=True):
+        """
+        Set check_hostname of SSL Context:
+
+        :param check_hostname: check_hostname value. Default True
+        :return
+        """
+        self._sender_config.verify_mode = check_hostname
+
     def __status(self):
         """
         View Socket status, check if it's open
@@ -507,7 +546,10 @@ def _from_dict(config=None, con_type=None):
                                    cert=config.get("cert", None),
                                    chain=config.get("chain", None),
                                    pkcs=config.get("pkcs", None),
-                                   sec_level=config.get("sec_level", None))
+                                   sec_level=config.get("sec_level", None),
+                                   verify_mode=config.get("verify_mode", None),
+                                   check_hostname=config.get("check_hostname",
+                                                             True))
 
         return SenderConfigTCP(address=address)
 

diff --git a/devo/sender/scripts/sender_cli.py b/devo/sender/scripts/sender_cli.py
@@ -41,7 +41,15 @@ def cli(version):
 @click.option('--cert', help='Devo user cert file.')
 @click.option('--chain', help='Devo chain.crt file.')
 @click.option('--sec_level', help='Sec level for opensslsocket. Default: None',
-              default=None)
+              default=None, type=int)
+@click.option('--verify_mode', help='Verify mode for SSL Socket. '
+                                    'Default: SSL default.'
+                                    'You need use int "0" (CERT_NONE), '
+                                    '"1" (CERT_OPTIONAL) or '
+                                    '"2" (CERT_REQUIRED)',
+              default=None, type=int)
+@click.option('--check_hostname', help='Verify cert hostname. Default: True',
+              default=True, type=bool)
 @click.option('--multiline/--no-multiline', help='Flag for multiline (With '
                                                  'break-line in msg). '
                                                  'Default False', default=False)
@@ -56,10 +64,14 @@ def cli(version):
               default="")
 @click.option('--header', '-h', help='This option is used to indicate if the'
                                      ' file has headers or not, not to send '
-                                     'them.', default=False)
+                                     'them.', default=False, type=bool)
 @click.option('--raw', is_flag=True, help='Send raw events from a '
                                           'file when using --file')
 @click.option('--debug/--no-debug', help='For testing purposes', default=False)
+@click.option('--env', '-e', help='Use env vars for configuration',
+              default=False, type=bool)
+@click.option('--default', '-d', help='Use default file for configuration',
+              default=False, type=bool)
 def data(**kwargs):
     """Send data to devo"""
     config = configure(kwargs)
@@ -107,16 +119,24 @@ def data(**kwargs):
 @click.option('--config', '-c', type=click.Path(exists=True),
               help='Optional JSON/Yaml File with configuration info.')
 @click.option('--env', '-e', help='Use env vars for configuration',
-              default=False)
+              default=False, type=bool)
 @click.option('--default', '-d', help='Use default file for configuration',
-              default=False)
+              default=False, type=bool)
 @click.option('--url', '--address', '-a', help='Devo relay address')
 @click.option('--port', '-p', default=443, help='Devo relay address port')
 @click.option('--key', help='Devo user key cert file.')
 @click.option('--cert', help='Devo user cert file.')
 @click.option('--chain', help='Devo chain.crt file.')
 @click.option('--sec_level', help='Sec level for opensslsocket. Default: None',
-              default=None)
+              default=None, type=int)
+@click.option('--verify_mode', help='Verify mode for SSL Socket. '
+                                    'Default: SSL default.'
+                                    'You need use int "0" (CERT_NONE), '
+                                    '"1" (CERT_OPTIONAL) or '
+                                    '"2" (CERT_REQUIRED)',
+              default=None, type=int)
+@click.option('--check_hostname', help='Verify cert hostname. Default: True',
+              default=True, type=bool)
 @click.option('--type', help='Connection type: SSL or TCP', default="SSL")
 @click.option('--name', '-n', help='Name for Lookup.')
 @click.option('--action', '-ac', help='INC or FULL.', default="FULL")

diff --git a/docs/api/api.md b/docs/api/api.md
@@ -200,6 +200,19 @@ except Exception as error:
 - SIMPLECOMPACT_TO_ARRAY: Use it if you want json objects, when ask for json/simple/compact responses, instead of str/bytes. Ignored when response=csv
 
 
+You can change the processor in any moment with one default processor or custom with the function:
+
+```python
+from devo.api import Client, ClientConfig, JSON_SIMPLE
+
+config = ClientConfig(response="json/simple", processor=JSON_SIMPLE, stream=True)
+
+api = Client(auth={"key":"myapikey", "secret":"myapisecret"},
+             address="https://apiv2-eu.devo.com/search/query",
+             config=config)
+api.config.set_processor(processor)
+```
+
 ######- DEFAULT example in Python 3, response csv: 
 ```python
 b'18/Jan/2019:09:58:51 +0000,/category.screen?category_id=BEDROOM&JSESSIONID=SD10SL6FF10ADFF7,404,http://www.bing.com/,Googlebot/2.1 ( http://www.googlebot.com/bot.html),gaqfse5dpcm690jdh5ho1f00o2:-'

diff --git a/docs/sender/sender.md b/docs/sender/sender.md
@@ -43,25 +43,35 @@ Usage: devo-sender data [OPTIONS]
   Send to devo
 
 Options:
-  -c, --config PATH   Optional JSON File with configuration info.
-  -a, --address TEXT  Devo relay address
-  -p, --port TEXT     Devo relay address port
-  --key TEXT          Devo user key cert file.
-  --cert TEXT         Devo user cert file.
-  --chain TEXT        Devo chain.crt file.
-  --multiline/
-  --no-multiline BOOL Flag for multiline (With break-line in msg). Default is False.
-  --type TEXT         Connection type: SSL or TCP
-  -t, --tag TEXT      Tag / Table to which the data will be sent in Devo.
-  -l, --line TEXT     For shipments of only one line, the text you want to
-                      send.
-  -f, --file TEXT     The file that you want to send to Devo, which will
-                      be sent line by line.
-  -h, --header TEXT   This option is used to indicate if the file has headers
-                      or not, they will not be send.
-  --raw               Send raw events from file when using --file
-  --debug/--no-debug  For testing purposes
-  --help              Show help message and exit.
+  -c, --config PATH             Optional JSON/Yaml File with configuration
+                                info.
+  -a, --address TEXT            Devo relay address
+  -p, --port TEXT               Devo relay address port
+  --key TEXT                    Devo user key cert file.
+  --cert TEXT                   Devo user cert file.
+  --chain TEXT                  Devo chain.crt file.
+  --sec_level INTEGER           Sec level for opensslsocket. Default: None
+  --verify_mode INTEGER         Verify mode for SSL Socket. Default: SSL
+                                default.You need use int "0" (CERT_NONE), "1"
+                                (CERT_OPTIONAL) or "2" (CERT_REQUIRED)
+  --check_hostname BOOLEAN      Verify cert hostname. Default: True
+  --multiline / --no-multiline  Flag for multiline (With break-line in msg).
+                                Default False
+  --type TEXT                   Connection type: SSL or TCP
+  -t, --tag TEXT                Tag / Table to which the data will be sent in
+                                Devo.
+  -l, --line TEXT               For shipments of only one line, the text you
+                                want to send.
+  -f, --file TEXT               The file that you want to send to Devo, which
+                                will be sent line by line.
+  -h, --header BOOLEAN          This option is used to indicate if the file
+                                has headers or not, not to send them.
+  --raw                         Send raw events from a file when using --file
+  --debug / --no-debug          For testing purposes
+  -e, --env BOOLEAN             Use env vars for configuration
+  -d, --default BOOLEAN         Use default file for configuration
+  --help                        Show this message and exit.
+
 ```
 
 Examples
@@ -96,14 +106,18 @@ Usage: devo-sender lookup [OPTIONS]
 Options:
   -c, --config PATH               Optional JSON/Yaml File with configuration
                                   info.
-  -e, --env TEXT                  Use env vars for configuration
-  -d, --default TEXT              Use default file for configuration
+  -e, --env BOOLEAN               Use env vars for configuration
+  -d, --default BOOLEAN           Use default file for configuration
   -a, --url, --address TEXT       Devo relay address
   -p, --port INTEGER              Devo relay address port
   --key TEXT                      Devo user key cert file.
   --cert TEXT                     Devo user cert file.
   --chain TEXT                    Devo chain.crt file.
-  --sec_level TEXT                Sec level for opensslsocket. Default: None
+  --sec_level INTEGER             Sec level for opensslsocket. Default: None
+  --verify_mode INTEGER           Verify mode for SSL Socket. Default: SSL
+                                  default.You need use int "0" (CERT_NONE),
+                                  "1" (CERT_OPTIONAL) or "2" (CERT_REQUIRED)
+  --check_hostname BOOLEAN        Verify cert hostname. Default: True
   --type TEXT                     Connection type: SSL or TCP
   -n, --name TEXT                 Name for Lookup.
   -ac, --action TEXT              INC or FULL.
@@ -113,11 +127,11 @@ Options:
                                   key. It has to be the exact name that
                                   appears in the header.
   -dk, --dkey TEXT                Name of the column that contains the
-                                  action/delete key with "add" or "delete". It
+                                  action/delete key with "add" or "delete".It
                                   has to be the exact name that appears in the
                                   header.
   -dt, --detect-types / -ndt, --no-detect-types
-                                  Detect types of fields. . Default: False
+                                  Detect types of fields. Default: False
   -d, --delimiter TEXT            CSV Delimiter char.
   -qc, --quotechar TEXT           CSV Quote char.
   --debug / --no-debug            For testing purposes