Skip to content

Commit

Permalink
Feat name constraints (#7400) (#13969)
Browse files Browse the repository at this point in the history
Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
modular-magician authored Mar 10, 2023
1 parent 13a76f0 commit dde4080
Show file tree
Hide file tree
Showing 10 changed files with 900 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .changelog/7400.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
privateca: added support for X.509 name constraints
```
51 changes: 51 additions & 0 deletions google/privateca_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,37 @@ func expandPrivatecaCertificateConfigX509ConfigAiaOcspServers(v interface{}, d T
return v, nil
}

func expandPrivatecaCertificateConfigX509ConfigNameConstraints(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
if v == nil {
return nil, nil
}

l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
return nil, nil
}

raw := l[0]
original := raw.(map[string]interface{})
if len(original) == 0 {
// Ignore empty name constraints
return nil, nil
}

transformed := make(map[string]interface{})
transformed["critical"] = original["critical"]
transformed["permittedDnsNames"] = original["permitted_dns_names"]
transformed["excludedDnsNames"] = original["excluded_dns_names"]
transformed["permittedIpRanges"] = original["permitted_ip_ranges"]
transformed["excludedIpRanges"] = original["excluded_ip_ranges"]
transformed["permittedEmailAddresses"] = original["permitted_email_addresses"]
transformed["excludedEmailAddresses"] = original["excluded_email_addresses"]
transformed["permittedUris"] = original["permitted_uris"]
transformed["excludedUris"] = original["excluded_uris"]

return transformed, nil
}

// Flattener utilities

func flattenPrivatecaCertificateConfigX509ConfigAdditionalExtensions(v interface{}, d *schema.ResourceData, config *Config) interface{} {
Expand Down Expand Up @@ -490,3 +521,23 @@ func flattenPrivatecaCertificateConfigX509ConfigKeyUsageUnknownExtendedKeyUsages
func flattenPrivatecaCertificateConfigX509ConfigKeyUsageUnknownExtendedKeyUsagesObjectIdPath(v interface{}, d *schema.ResourceData, config *Config) interface{} {
return v
}

func flattenPrivatecaCertificateConfigX509ConfigNameConstraints(v interface{}, d *schema.ResourceData, config *Config) interface{} {
if v == nil {
return nil
}
original := v.(map[string]interface{})
transformed := make(map[string]interface{})

transformed["critical"] = original["critical"]
transformed["permitted_dns_names"] = original["permittedDnsNames"]
transformed["excluded_dns_names"] = original["excludedDnsNames"]
transformed["permitted_ip_ranges"] = original["permittedIpRanges"]
transformed["excluded_ip_ranges"] = original["excludedIpRanges"]
transformed["permitted_email_addresses"] = original["permittedEmailAddresses"]
transformed["excluded_email_addresses"] = original["excludedEmailAddresses"]
transformed["permitted_uris"] = original["permittedUris"]
transformed["excluded_uris"] = original["excludedUris"]

return []interface{}{transformed}
}
110 changes: 110 additions & 0 deletions google/resource_privateca_ca_pool.go
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,109 @@ handle this extension, the client should consider this to be an error).`,
Type: schema.TypeString,
},
},
"name_constraints": {
Type: schema.TypeList,
Optional: true,
Description: `Describes the X.509 name constraints extension.`,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"critical": {
Type: schema.TypeBool,
Required: true,
Description: `Indicates whether or not the name constraints are marked critical.`,
},
"excluded_dns_names": {
Type: schema.TypeList,
Optional: true,
Description: `Contains excluded DNS names. Any DNS name that can be
constructed by simply adding zero or more labels to
the left-hand side of the name satisfies the name constraint.
For example, 'example.com', 'www.example.com', 'www.sub.example.com'
would satisfy 'example.com' while 'example1.com' does not.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"excluded_email_addresses": {
Type: schema.TypeList,
Optional: true,
Description: `Contains the excluded email addresses. The value can be a particular
email address, a hostname to indicate all email addresses on that host or
a domain with a leading period (e.g. '.example.com') to indicate
all email addresses in that domain.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"excluded_ip_ranges": {
Type: schema.TypeList,
Optional: true,
Description: `Contains the excluded IP ranges. For IPv4 addresses, the ranges
are expressed using CIDR notation as specified in RFC 4632.
For IPv6 addresses, the ranges are expressed in similar encoding as IPv4
addresses.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"excluded_uris": {
Type: schema.TypeList,
Optional: true,
Description: `Contains the excluded URIs that apply to the host part of the name.
The value can be a hostname or a domain with a
leading period (like '.example.com')`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"permitted_dns_names": {
Type: schema.TypeList,
Optional: true,
Description: `Contains permitted DNS names. Any DNS name that can be
constructed by simply adding zero or more labels to
the left-hand side of the name satisfies the name constraint.
For example, 'example.com', 'www.example.com', 'www.sub.example.com'
would satisfy 'example.com' while 'example1.com' does not.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"permitted_email_addresses": {
Type: schema.TypeList,
Optional: true,
Description: `Contains the permitted email addresses. The value can be a particular
email address, a hostname to indicate all email addresses on that host or
a domain with a leading period (e.g. '.example.com') to indicate
all email addresses in that domain.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"permitted_ip_ranges": {
Type: schema.TypeList,
Optional: true,
Description: `Contains the permitted IP ranges. For IPv4 addresses, the ranges
are expressed using CIDR notation as specified in RFC 4632.
For IPv6 addresses, the ranges are expressed in similar encoding as IPv4
addresses.`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"permitted_uris": {
Type: schema.TypeList,
Optional: true,
Description: `Contains the permitted URIs that apply to the host part of the name.
The value can be a hostname or a domain with a
leading period (like '.example.com')`,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
},
},
"policy_ids": {
Type: schema.TypeList,
Optional: true,
Expand Down Expand Up @@ -955,6 +1058,8 @@ func flattenPrivatecaCaPoolIssuancePolicyBaselineValues(v interface{}, d *schema
flattenPrivatecaCertificateConfigX509ConfigCaOptions(original["caOptions"], d, config)
transformed["key_usage"] =
flattenPrivatecaCertificateConfigX509ConfigKeyUsage(original["keyUsage"], d, config)
transformed["name_constraints"] =
flattenPrivatecaCertificateConfigX509ConfigNameConstraints(original["nameConstraints"], d, config)
return []interface{}{transformed}
}

Expand Down Expand Up @@ -1302,6 +1407,11 @@ func expandPrivatecaCaPoolIssuancePolicyBaselineValues(v interface{}, d Terrafor
}
transformed["additionalExtensions"] = addExts

nameConstraints, err := expandPrivatecaCertificateConfigX509ConfigNameConstraints(original["name_constraints"], d, config)
if err != nil {
return nil, err
}
transformed["nameConstraints"] = nameConstraints
return transformed, nil
}

Expand Down
11 changes: 11 additions & 0 deletions google/resource_privateca_ca_pool_generated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,17 @@ resource "google_privateca_ca_pool" "default" {
time_stamping = true
}
}
name_constraints {
critical = true
permitted_dns_names = ["*.example1.com", "*.example2.com"]
excluded_dns_names = ["*.deny.example1.com", "*.deny.example2.com"]
permitted_ip_ranges = ["10.0.0.0/8", "11.0.0.0/8"]
excluded_ip_ranges = ["10.1.1.0/24", "11.1.1.0/24"]
permitted_email_addresses = [".example1.com", ".example2.com"]
excluded_email_addresses = [".deny.example1.com", ".deny.example2.com"]
permitted_uris = [".example1.com", ".example2.com"]
excluded_uris = [".deny.example1.com", ".deny.example2.com"]
}
}
}
}
Expand Down
Loading

0 comments on commit dde4080

Please sign in to comment.