Merge pull request #109 from Venafi/sans_vaas_updates

Sans support for VaaS

Author: rvelaVenafi

tests/test_pm.py

@@ -26,7 +26,7 @@
 from vcert.policy import (Policy, Subject, KeyPair, SubjectAltNames, Defaults, DefaultSubject, DefaultKeyPair,
                           PolicySpecification)
 from vcert.policy.pm_cloud import (CA_TYPE_DIGICERT, CA_TYPE_ENTRUST, validate_policy_spec as validate_ps_vaas,
-                                   get_ca_info, default_error_msg)
+                                   get_ca_info, default_error_msg, ipv4, ipv6)
 from vcert.policy.pm_tpp import (is_service_generated_csr, validate_policy_spec as validate_ps_tpp, no_match_error_msg,
                                  too_many_error_msg, unsupported_error_msg, supported_key_types,
                                  supported_rsa_key_sizes, supported_elliptic_curves)
@@ -204,6 +204,20 @@ def test_ec_key_pair(self):
         self.assertIn('P521', ['P521', 'P384'], "[P521] is not in the allowed Elliptic Curves list")
         self.assertIn('P384', ['P521', 'P384'], "[P384] is not in the allowed Elliptic Curves list")
 
+    def test_create_policy_uri_ip_email(self):
+        policy = get_policy_obj()
+        policy.subject_alt_names.email_allowed = True
+        policy.subject_alt_names.uri_allowed = True
+        policy.subject_alt_names.ip_allowed = True
+        uri_protocols = ["https", "ldaps", "spiffe"]
+        policy.subject_alt_names.uri_protocols = uri_protocols
+        ps = self._create_policy_cloud(policy=policy, defaults=get_defaults_obj())
+        self.assertListEqual(ps.policy.subject_alt_names.ip_constraints, [ipv4, ipv6])
+        self.assertListEqual(ps.policy.subject_alt_names.uri_protocols, uri_protocols)
+        self.assertTrue(ps.policy.subject_alt_names.email_allowed)
+        self.assertTrue(ps.policy.subject_alt_names.uri_allowed)
+        self.assertTrue(ps.policy.subject_alt_names.ip_allowed)
+
     def _create_policy_cloud(self, policy_spec=None, policy=None, defaults=None):
         zone = get_vaas_zone()
         response = create_policy(self.cloud_conn, zone, policy_spec, policy, defaults)

vcert/common.py

@@ -234,6 +234,9 @@ def __init__(self, policy_id=None, company_id=None, name=None, system_generated=
         self.recommended_settings = recommended_settings
         self.csr_upload_allowed = csr_upload_allowed
         self.key_generated_by_venafi_allowed = key_generated_by_venafi_allowed
+        self.email_regexes = None  # type: list[str]
+        self.ip_constraints_regexes = None  # type: list[str]
+        self.uri_regexes = None  # type: list[str]
 
     def __repr__(self):
         return "Policy:\n" + "\n".join([f"  {k}: {v}" for k, v in (

vcert/connection_cloud.py

@@ -50,6 +50,9 @@
 CSR_ATTR_COUNTRY = 'country'
 CSR_ATTR_SANS_BY_TYPE = 'subjectAlternativeNamesByType'
 CSR_ATTR_SANS_DNS = 'dnsNames'
+CSR_ATTR_SANS_IP_ADDR = 'ipAddresses'
+CSR_ATTR_SANS_EMAIL_ADDR = 'rfc822Names'
+CSR_ATTR_SANS_URIS = 'uniformResourceIdentifiers'
 CSR_ATTR_KEY_TYPE_PARAMS = 'keyTypeParameters'
 CSR_ATTR_KEY_TYPE = 'keyType'
 CSR_ATTR_KEY_LENGTH = 'keyLength'
@@ -255,6 +258,11 @@ def _parse_policy_response_to_object(d):
             d['csrUploadAllowed'] if 'csrUploadAllowed' in d else None,
             d['keyGeneratedByVenafiAllowed'] if 'keyGeneratedByVenafiAllowed' in d else None
         )
+        policy.email_regexes = d['sanRfc822NameRegexes'] if 'sanRfc822NameRegexes' in d else None
+        policy.ip_constraints_regexes = d['sanIpAddressRegexes'] if 'sanIpAddressRegexes' in d else None
+        policy.uri_regexes = d['sanUniformResourceIdentifierRegexes'] if 'sanUniformResourceIdentifierRegexes' in d \
+            else None
+
         for kt in d.get('keyTypes', []):
             key_type = kt['keyType'].lower()
             if key_type == KeyType.RSA:
@@ -814,8 +822,10 @@ def _get_service_generated_csr_attr(self, request, zone):
 
         if len(request.san_dns) > 0:
             sans = {
-                CSR_ATTR_SANS_DNS: request.san_dns
-                # TODO: Other sans should be added here
+                CSR_ATTR_SANS_DNS: request.san_dns,
+                CSR_ATTR_SANS_IP_ADDR: request.ip_addresses,
+                CSR_ATTR_SANS_EMAIL_ADDR: request.email_addresses,
+                CSR_ATTR_SANS_URIS: request.uniform_resource_identifiers
             }
             csr_attr_map[CSR_ATTR_SANS_BY_TYPE] = sans
 

vcert/parser/__init__.py

@@ -46,6 +46,8 @@
 FIELD_EMAIL_ALLOWED = 'emailAllowed'
 FIELD_URI_ALLOWED = 'uriAllowed'
 FIELD_UPN_ALLOWED = 'upnAllowed'
+FIELD_URI_PROTOCOLS = 'uriProtocols'
+FIELD_IP_CONSTRAINTS = 'ipConstraints'
 
 FIELD_DEFAULTS = 'defaults'
 FIELD_DEFAULT_DOMAIN = 'domain'

vcert/parser/utils.py

@@ -79,6 +79,8 @@ def parse_data(data):
             subject_alt_names.ip_allowed = sans[FIELD_IP_ALLOWED] if FIELD_IP_ALLOWED in sans else None
             subject_alt_names.upn_allowed = sans[FIELD_UPN_ALLOWED] if FIELD_UPN_ALLOWED in sans else None
             subject_alt_names.uri_allowed = sans[FIELD_URI_ALLOWED] if FIELD_URI_ALLOWED in sans else None
+            subject_alt_names.uri_protocols = sans[FIELD_URI_PROTOCOLS] if FIELD_URI_PROTOCOLS in sans else []
+            subject_alt_names.ip_constraints = sans[FIELD_IP_CONSTRAINTS] if FIELD_IP_CONSTRAINTS in sans else []
 
     policy.subject = subject
     policy.key_pair = key_pair
@@ -176,7 +178,9 @@ def parse_policy_spec(policy_spec):
                 FIELD_EMAIL_ALLOWED: sans.email_allowed,
                 FIELD_IP_ALLOWED: sans.ip_allowed,
                 FIELD_UPN_ALLOWED: sans.upn_allowed,
-                FIELD_URI_ALLOWED: sans.uri_allowed
+                FIELD_URI_ALLOWED: sans.uri_allowed,
+                FIELD_IP_CONSTRAINTS: sans.ip_constraints,
+                FIELD_URI_PROTOCOLS: sans.uri_protocols
             }
 
     ds_data = dict()

vcert/policy/pm_cloud.py

@@ -27,7 +27,28 @@
 REQUESTER_NAME = 'Venafi Cloud Service'
 REQUESTER_EMAIL = 'no-reply@venafi.cloud'
 REQUESTER_PHONE = '801-555-0123'
-ALLOW_ALL = '.*'
+ipv4 = "v4"
+ipv6 = "v6"
+ipv4_private = "v4private"
+ipv6_private = "v6private"
+re_allow_all = '.*'
+re_allow_all_email = '.*@.*'
+re_ipv4 = "\\b((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(\\.|$)){4}\\b"
+re_ipv6 = "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]" \
+          "{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|" \
+          "([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|" \
+          "[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%" \
+          "[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|" \
+          "(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.)" \
+          "{3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))"
+re_ipv4_private = "^(172\\.(1[6-9]\\.|2[0-9]\\.|3[0-1]\\.)|192\\.168\\.|10\\.).*"
+re_ipv6_private = "^(::1$)|([fF][cCdD]).*"
+supported_ip_protocols = {
+    ipv4: re_ipv4,
+    ipv6: re_ipv6,
+    ipv4_private: re_ipv4_private,
+    ipv6_private: re_ipv6_private
+}
 DEFAULT_MAX_VALID_DAYS = 365
 DEFAULT_HASH_ALGORITHM = 'SHA256'
 
@@ -119,9 +140,26 @@ def build_policy_spec(cit, ca_info, subject_cn_to_str=True):
     p.key_pair = kp if create_kp else None
 
     sans = SubjectAltNames(False, False, False, False, False)
+    create_sans = False
     if cit.SANRegexes:
         sans.dns_allowed = True
-    p.subject_alt_names = sans
+        create_sans = True
+
+    if cit.email_regexes and len(cit.email_regexes) > 0:
+        sans.email_allowed = True
+        create_sans = True
+
+    if cit.ip_constraints_regexes and len(cit.ip_constraints_regexes) > 0:
+        sans.ip_allowed = True
+        create_sans = True
+        sans.ip_constraints = resolve_ip_constraints(cit.ip_constraints_regexes)
+
+    if cit.uri_regexes and len(cit.uri_regexes) > 0:
+        sans.uri_allowed = True
+        create_sans = True
+        sans.uri_protocols = resolve_uri_protocols(cit.uri_regexes)
+
+    p.subject_alt_names = sans if create_sans else None
 
     ps.policy = p
 
@@ -201,8 +239,17 @@ def validate_policy_spec(policy_spec):
             sans = get_sans(policy_spec.policy.subject_alt_names)
             if len(sans) > 0:
                 for k, v in sans.items():
-                    if v is True and not (k == RPA.TPP_DNS_ALLOWED):
+                    if v is True and (k == RPA.TPP_UPN_ALLOWED):
                         raise VenafiError(f"Subject Alt name [{k}] is not allowed by VaaS")
+                    if v is True and (k == RPA.TPP_URI_ALLOWED):
+                        if len(p.subject_alt_names.uri_protocols) == 0:
+                            raise VenafiError(f"'uriAllowed' attribute is True but 'uriProtocols' list is empty")
+                    if v is True and (k == RPA.TPP_IP_ALLOWED):
+                        ip_constraints = p.subject_alt_names.ip_constraints
+                        if ip_constraints and len(ip_constraints) > 0:
+                            invalid_value = get_invalid_ip_constraint(ip_constraints)
+                            if invalid_value:
+                                raise VenafiError(f"The IP constraint [{invalid_value}] is not supported by VaaS")
 
         # validate default subject values against policy values
         if policy_spec.defaults and policy_spec.defaults.subject and policy_spec.policy.subject:
@@ -325,13 +372,26 @@ def get_sans(names):
     return sans
 
 
+def get_invalid_ip_constraint(ip_list):
+    """
+
+    :param list[str] ip_list:
+    :rtype: str
+    """
+    for ip_value in ip_list:
+        if ip_value not in supported_ip_protocols.keys():
+            return ip_value
+
+    return None
+
+
 def is_valid_policy_value(policy_values, default_value):
     """
     :param list[str] policy_values:
     :param str default_value:
     :rtype: bool
     """
-    if len(policy_values) == 1 and policy_values[0] == ALLOW_ALL:
+    if len(policy_values) == 1 and policy_values[0] == re_allow_all:
         return True
     return True if default_value in policy_values else False
 
@@ -344,7 +404,7 @@ def member_of(sub_list, collection):
     :param list[str] collection:
     :rtype: bool
     """
-    if len(sub_list) == 1 and sub_list[0] == ALLOW_ALL:
+    if len(sub_list) == 1 and sub_list[0] == re_allow_all:
         return True
     return all(x in collection for x in sub_list)
 
@@ -408,39 +468,66 @@ def build_cit_request(ps, ca_details):
     if ps.policy and len(ps.policy.domains) > 0:
         regex_value = convert_to_regex(ps.policy.domains, ps.policy.wildcard_allowed)
         request['subjectCNRegexes'] = regex_value
-        if ps.policy.subject_alt_names and ps.policy.subject_alt_names.dns_allowed is not None:
-            if ps.policy.subject_alt_names.dns_allowed:
+        sans = ps.policy.subject_alt_names
+        if sans and sans.dns_allowed is not None:
+            if sans.dns_allowed:
                 request['sanRegexes'] = regex_value
         else:
             request['sanRegexes'] = regex_value
+
+        if sans and sans.email_allowed:
+            email_regex_list = convert_to_email_regex(ps.policy.domains)
+            request['sanRfc822NameRegexes'] = email_regex_list
+
+        if sans and sans.uri_allowed:
+            uri_regex_list = convert_to_uri_regex(sans.uri_protocols, ps.policy.domains)
+            request['sanUniformResourceIdentifierRegexes'] = uri_regex_list
+
+    # sanIpAddressRegexes
+
     else:
-        request['subjectCNRegexes'] = [ALLOW_ALL]
-        request['sanRegexes'] = [ALLOW_ALL]
+        request['subjectCNRegexes'] = [re_allow_all]
+        request['sanRegexes'] = [re_allow_all]
+        if ps.policy:
+            sans = ps.policy.subject_alt_names
+            if sans and sans.email_allowed:
+                request['sanRfc822NameRegexes'] = [re_allow_all_email]
+            if sans and sans.uri_allowed:
+                uri_regex_list = convert_to_uri_regex(sans.uri_protocols, [re_allow_all])
+                request['sanUniformResourceIdentifierRegexes'] = uri_regex_list
+            if sans and sans.ip_allowed:
+                request['sanIpAddressRegexes'] = []
+
+    if ps.policy and ps.policy.subject_alt_names and ps.policy.subject_alt_names.ip_allowed:
+        if ps.policy.subject_alt_names.ip_constraints and len(ps.policy.subject_alt_names.ip_constraints) > 0:
+            request['sanIpAddressRegexes'] = resolve_ip_regexes(ps.policy.subject_alt_names.ip_constraints)
+        else:
+            request['sanIpAddressRegexes'] = [re_ipv4, re_ipv6]
 
     if ps.policy and ps.policy.subject and len(ps.policy.subject.orgs) > 0:
         request['subjectORegexes'] = ps.policy.subject.orgs
     else:
-        request['subjectORegexes'] = [ALLOW_ALL]
+        request['subjectORegexes'] = [re_allow_all]
 
     if ps.policy and ps.policy.subject and len(ps.policy.subject.org_units) > 0:
         request['subjectOURegexes'] = ps.policy.subject.org_units
     else:
-        request['subjectOURegexes'] = [ALLOW_ALL]
+        request['subjectOURegexes'] = [re_allow_all]
 
     if ps.policy and ps.policy.subject and len(ps.policy.subject.localities) > 0:
         request['subjectLRegexes'] = ps.policy.subject.localities
     else:
-        request['subjectLRegexes'] = [ALLOW_ALL]
+        request['subjectLRegexes'] = [re_allow_all]
 
     if ps.policy and ps.policy.subject and len(ps.policy.subject.states) > 0:
         request['subjectSTRegexes'] = ps.policy.subject.states
     else:
-        request['subjectSTRegexes'] = [ALLOW_ALL]
+        request['subjectSTRegexes'] = [re_allow_all]
 
     if ps.policy and ps.policy.subject and len(ps.policy.subject.countries) > 0:
         request['subjectCValues'] = ps.policy.subject.countries
     else:
-        request['subjectCValues'] = [ALLOW_ALL]
+        request['subjectCValues'] = [re_allow_all]
 
     key_types = []
     if ps.policy and ps.policy.key_pair and len(ps.policy.key_pair.key_types) > 0:
@@ -529,13 +616,15 @@ def build_cit_request(ps, ca_details):
 
 domain_regex = '[a-z]{1}[a-z0-9.-]*\\.'
 domain_regex_wildcard = '[*a-z]{1}[a-z0-9.-]*\\.'
+email_prefix_regex = '.*@{}'
+uri_protocols_regex = "({})://.*\\."
 
 
 def convert_to_regex(domains, wildcard_allowed):
     """
     :param list[str] domains:
     :param bool wildcard_allowed:
-    :rtype: dict
+    :rtype: list[str]
     """
     regex_list = []
     for d in domains:
@@ -548,6 +637,88 @@ def convert_to_regex(domains, wildcard_allowed):
     return regex_list
 
 
+def convert_to_email_regex(emails_list):
+    """
+
+    :param list[str] emails_list:
+    :rtype: list[str]
+    """
+    regex_list = []
+    for email in emails_list:
+        current = email.replace('.', '\\.')
+        current = email_prefix_regex.format(current)
+        regex_list.append(current)
+
+    return regex_list
+
+
+def convert_to_uri_regex(uri_protocols, domains_list):
+    """
+
+    :param list[str] uri_protocols:
+    :param list[str] domains_list:
+    :rtype: list[str]
+    """
+    protocol_expr = "|".join(uri_protocols)
+    protocol_expr = uri_protocols_regex.format(protocol_expr)
+
+    regex_list = []
+    for d in domains_list:
+        current = d.replace('.', '\\.')
+        current = f"{protocol_expr}{current}"
+        regex_list.append(current)
+
+    return regex_list
+
+
+def resolve_ip_regexes(ip_protocols):
+    """
+
+    :param list[str] ip_protocols:
+    :rtype: list[str]
+    """
+    ip_regexes = list()
+    for ip_str in ip_protocols:
+        regex = supported_ip_protocols.get(ip_str)
+        if regex:
+            ip_regexes.append(regex)
+
+    return ip_regexes
+
+
+def resolve_ip_constraints(ip_constraints_list):
+    """
+
+    :param list[str] ip_constraints_list:
+    :rtype: list[str]
+    """
+    ip_list = list()
+    for ip_regex in ip_constraints_list:
+        for k, v in supported_ip_protocols.items():
+            if ip_regex == v:
+                ip_list.append(k)
+                break
+    return ip_list
+
+
+def resolve_uri_protocols(uri_regexes_list):
+    """
+
+    :param list[str] uri_regexes_list:
+    :rtype: list[str]
+    """
+    protocols_list = list()
+    for uri_regex in uri_regexes_list:
+        index = uri_regex.index(')://')
+        sub_str = uri_regex[1:index]
+        current_protocols = sub_str.split("|")
+        for p in current_protocols:
+            if p not in protocols_list:
+                protocols_list.append(p)
+
+    return protocols_list
+
+
 def convert_to_string(regexes, wildcard_allowed):
     """
     :param list[str] regexes: