Vendor temporarily
This commit is contained in:
1 parent
dd8e532d18
commit
1c02ed9115
4708 files changed
+1226392
-12
No files matched your search
+363
@@ -0,0 +1,363 @@
|
||||
Mozilla Public License, version 2.0
|
||||
|
||||
1. Definitions
|
||||
|
||||
1.1. "Contributor"
|
||||
|
||||
means each individual or legal entity that creates, contributes to the
|
||||
creation of, or owns Covered Software.
|
||||
|
||||
1.2. "Contributor Version"
|
||||
|
||||
means the combination of the Contributions of others (if any) used by a
|
||||
Contributor and that particular Contributor's Contribution.
|
||||
|
||||
1.3. "Contribution"
|
||||
|
||||
means Covered Software of a particular Contributor.
|
||||
|
||||
1.4. "Covered Software"
|
||||
|
||||
means Source Code Form to which the initial Contributor has attached the
|
||||
notice in Exhibit A, the Executable Form of such Source Code Form, and
|
||||
Modifications of such Source Code Form, in each case including portions
|
||||
thereof.
|
||||
|
||||
1.5. "Incompatible With Secondary Licenses"
|
||||
means
|
||||
|
||||
a. that the initial Contributor has attached the notice described in
|
||||
Exhibit B to the Covered Software; or
|
||||
|
||||
b. that the Covered Software was made available under the terms of
|
||||
version 1.1 or earlier of the License, but not also under the terms of
|
||||
a Secondary License.
|
||||
|
||||
1.6. "Executable Form"
|
||||
|
||||
means any form of the work other than Source Code Form.
|
||||
|
||||
1.7. "Larger Work"
|
||||
|
||||
means a work that combines Covered Software with other material, in a
|
||||
separate file or files, that is not Covered Software.
|
||||
|
||||
1.8. "License"
|
||||
|
||||
means this document.
|
||||
|
||||
1.9. "Licensable"
|
||||
|
||||
means having the right to grant, to the maximum extent possible, whether
|
||||
at the time of the initial grant or subsequently, any and all of the
|
||||
rights conveyed by this License.
|
||||
|
||||
1.10. "Modifications"
|
||||
|
||||
means any of the following:
|
||||
|
||||
a. any file in Source Code Form that results from an addition to,
|
||||
deletion from, or modification of the contents of Covered Software; or
|
||||
|
||||
b. any new file in Source Code Form that contains any Covered Software.
|
||||
|
||||
1.11. "Patent Claims" of a Contributor
|
||||
|
||||
means any patent claim(s), including without limitation, method,
|
||||
process, and apparatus claims, in any patent Licensable by such
|
||||
Contributor that would be infringed, but for the grant of the License,
|
||||
by the making, using, selling, offering for sale, having made, import,
|
||||
or transfer of either its Contributions or its Contributor Version.
|
||||
|
||||
1.12. "Secondary License"
|
||||
|
||||
means either the GNU General Public License, Version 2.0, the GNU Lesser
|
||||
General Public License, Version 2.1, the GNU Affero General Public
|
||||
License, Version 3.0, or any later versions of those licenses.
|
||||
|
||||
1.13. "Source Code Form"
|
||||
|
||||
means the form of the work preferred for making modifications.
|
||||
|
||||
1.14. "You" (or "Your")
|
||||
|
||||
means an individual or a legal entity exercising rights under this
|
||||
License. For legal entities, "You" includes any entity that controls, is
|
||||
controlled by, or is under common control with You. For purposes of this
|
||||
definition, "control" means (a) the power, direct or indirect, to cause
|
||||
the direction or management of such entity, whether by contract or
|
||||
otherwise, or (b) ownership of more than fifty percent (50%) of the
|
||||
outstanding shares or beneficial ownership of such entity.
|
||||
|
||||
|
||||
2. License Grants and Conditions
|
||||
|
||||
2.1. Grants
|
||||
|
||||
Each Contributor hereby grants You a world-wide, royalty-free,
|
||||
non-exclusive license:
|
||||
|
||||
a. under intellectual property rights (other than patent or trademark)
|
||||
Licensable by such Contributor to use, reproduce, make available,
|
||||
modify, display, perform, distribute, and otherwise exploit its
|
||||
Contributions, either on an unmodified basis, with Modifications, or
|
||||
as part of a Larger Work; and
|
||||
|
||||
b. under Patent Claims of such Contributor to make, use, sell, offer for
|
||||
sale, have made, import, and otherwise transfer either its
|
||||
Contributions or its Contributor Version.
|
||||
|
||||
2.2. Effective Date
|
||||
|
||||
The licenses granted in Section 2.1 with respect to any Contribution
|
||||
become effective for each Contribution on the date the Contributor first
|
||||
distributes such Contribution.
|
||||
|
||||
2.3. Limitations on Grant Scope
|
||||
|
||||
The licenses granted in this Section 2 are the only rights granted under
|
||||
this License. No additional rights or licenses will be implied from the
|
||||
distribution or licensing of Covered Software under this License.
|
||||
Notwithstanding Section 2.1(b) above, no patent license is granted by a
|
||||
Contributor:
|
||||
|
||||
a. for any code that a Contributor has removed from Covered Software; or
|
||||
|
||||
b. for infringements caused by: (i) Your and any other third party's
|
||||
modifications of Covered Software, or (ii) the combination of its
|
||||
Contributions with other software (except as part of its Contributor
|
||||
Version); or
|
||||
|
||||
c. under Patent Claims infringed by Covered Software in the absence of
|
||||
its Contributions.
|
||||
|
||||
This License does not grant any rights in the trademarks, service marks,
|
||||
or logos of any Contributor (except as may be necessary to comply with
|
||||
the notice requirements in Section 3.4).
|
||||
|
||||
2.4. Subsequent Licenses
|
||||
|
||||
No Contributor makes additional grants as a result of Your choice to
|
||||
distribute the Covered Software under a subsequent version of this
|
||||
License (see Section 10.2) or under the terms of a Secondary License (if
|
||||
permitted under the terms of Section 3.3).
|
||||
|
||||
2.5. Representation
|
||||
|
||||
Each Contributor represents that the Contributor believes its
|
||||
Contributions are its original creation(s) or it has sufficient rights to
|
||||
grant the rights to its Contributions conveyed by this License.
|
||||
|
||||
2.6. Fair Use
|
||||
|
||||
This License is not intended to limit any rights You have under
|
||||
applicable copyright doctrines of fair use, fair dealing, or other
|
||||
equivalents.
|
||||
|
||||
2.7. Conditions
|
||||
|
||||
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in
|
||||
Section 2.1.
|
||||
|
||||
|
||||
3. Responsibilities
|
||||
|
||||
3.1. Distribution of Source Form
|
||||
|
||||
All distribution of Covered Software in Source Code Form, including any
|
||||
Modifications that You create or to which You contribute, must be under
|
||||
the terms of this License. You must inform recipients that the Source
|
||||
Code Form of the Covered Software is governed by the terms of this
|
||||
License, and how they can obtain a copy of this License. You may not
|
||||
attempt to alter or restrict the recipients' rights in the Source Code
|
||||
Form.
|
||||
|
||||
3.2. Distribution of Executable Form
|
||||
|
||||
If You distribute Covered Software in Executable Form then:
|
||||
|
||||
a. such Covered Software must also be made available in Source Code Form,
|
||||
as described in Section 3.1, and You must inform recipients of the
|
||||
Executable Form how they can obtain a copy of such Source Code Form by
|
||||
reasonable means in a timely manner, at a charge no more than the cost
|
||||
of distribution to the recipient; and
|
||||
|
||||
b. You may distribute such Executable Form under the terms of this
|
||||
License, or sublicense it under different terms, provided that the
|
||||
license for the Executable Form does not attempt to limit or alter the
|
||||
recipients' rights in the Source Code Form under this License.
|
||||
|
||||
3.3. Distribution of a Larger Work
|
||||
|
||||
You may create and distribute a Larger Work under terms of Your choice,
|
||||
provided that You also comply with the requirements of this License for
|
||||
the Covered Software. If the Larger Work is a combination of Covered
|
||||
Software with a work governed by one or more Secondary Licenses, and the
|
||||
Covered Software is not Incompatible With Secondary Licenses, this
|
||||
License permits You to additionally distribute such Covered Software
|
||||
under the terms of such Secondary License(s), so that the recipient of
|
||||
the Larger Work may, at their option, further distribute the Covered
|
||||
Software under the terms of either this License or such Secondary
|
||||
License(s).
|
||||
|
||||
3.4. Notices
|
||||
|
||||
You may not remove or alter the substance of any license notices
|
||||
(including copyright notices, patent notices, disclaimers of warranty, or
|
||||
limitations of liability) contained within the Source Code Form of the
|
||||
Covered Software, except that You may alter any license notices to the
|
||||
extent required to remedy known factual inaccuracies.
|
||||
|
||||
3.5. Application of Additional Terms
|
||||
|
||||
You may choose to offer, and to charge a fee for, warranty, support,
|
||||
indemnity or liability obligations to one or more recipients of Covered
|
||||
Software. However, You may do so only on Your own behalf, and not on
|
||||
behalf of any Contributor. You must make it absolutely clear that any
|
||||
such warranty, support, indemnity, or liability obligation is offered by
|
||||
You alone, and You hereby agree to indemnify every Contributor for any
|
||||
liability incurred by such Contributor as a result of warranty, support,
|
||||
indemnity or liability terms You offer. You may include additional
|
||||
disclaimers of warranty and limitations of liability specific to any
|
||||
jurisdiction.
|
||||
|
||||
4. Inability to Comply Due to Statute or Regulation
|
||||
|
||||
If it is impossible for You to comply with any of the terms of this License
|
||||
with respect to some or all of the Covered Software due to statute,
|
||||
judicial order, or regulation then You must: (a) comply with the terms of
|
||||
this License to the maximum extent possible; and (b) describe the
|
||||
limitations and the code they affect. Such description must be placed in a
|
||||
text file included with all distributions of the Covered Software under
|
||||
this License. Except to the extent prohibited by statute or regulation,
|
||||
such description must be sufficiently detailed for a recipient of ordinary
|
||||
skill to be able to understand it.
|
||||
|
||||
5. Termination
|
||||
|
||||
5.1. The rights granted under this License will terminate automatically if You
|
||||
fail to comply with any of its terms. However, if You become compliant,
|
||||
then the rights granted under this License from a particular Contributor
|
||||
are reinstated (a) provisionally, unless and until such Contributor
|
||||
explicitly and finally terminates Your grants, and (b) on an ongoing
|
||||
basis, if such Contributor fails to notify You of the non-compliance by
|
||||
some reasonable means prior to 60 days after You have come back into
|
||||
compliance. Moreover, Your grants from a particular Contributor are
|
||||
reinstated on an ongoing basis if such Contributor notifies You of the
|
||||
non-compliance by some reasonable means, this is the first time You have
|
||||
received notice of non-compliance with this License from such
|
||||
Contributor, and You become compliant prior to 30 days after Your receipt
|
||||
of the notice.
|
||||
|
||||
5.2. If You initiate litigation against any entity by asserting a patent
|
||||
infringement claim (excluding declaratory judgment actions,
|
||||
counter-claims, and cross-claims) alleging that a Contributor Version
|
||||
directly or indirectly infringes any patent, then the rights granted to
|
||||
You by any and all Contributors for the Covered Software under Section
|
||||
2.1 of this License shall terminate.
|
||||
|
||||
5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user
|
||||
license agreements (excluding distributors and resellers) which have been
|
||||
validly granted by You or Your distributors under this License prior to
|
||||
termination shall survive termination.
|
||||
|
||||
6. Disclaimer of Warranty
|
||||
|
||||
Covered Software is provided under this License on an "as is" basis,
|
||||
without warranty of any kind, either expressed, implied, or statutory,
|
||||
including, without limitation, warranties that the Covered Software is free
|
||||
of defects, merchantable, fit for a particular purpose or non-infringing.
|
||||
The entire risk as to the quality and performance of the Covered Software
|
||||
is with You. Should any Covered Software prove defective in any respect,
|
||||
You (not any Contributor) assume the cost of any necessary servicing,
|
||||
repair, or correction. This disclaimer of warranty constitutes an essential
|
||||
part of this License. No use of any Covered Software is authorized under
|
||||
this License except under this disclaimer.
|
||||
|
||||
7. Limitation of Liability
|
||||
|
||||
Under no circumstances and under no legal theory, whether tort (including
|
||||
negligence), contract, or otherwise, shall any Contributor, or anyone who
|
||||
distributes Covered Software as permitted above, be liable to You for any
|
||||
direct, indirect, special, incidental, or consequential damages of any
|
||||
character including, without limitation, damages for lost profits, loss of
|
||||
goodwill, work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses, even if such party shall have been
|
||||
informed of the possibility of such damages. This limitation of liability
|
||||
shall not apply to liability for death or personal injury resulting from
|
||||
such party's negligence to the extent applicable law prohibits such
|
||||
limitation. Some jurisdictions do not allow the exclusion or limitation of
|
||||
incidental or consequential damages, so this exclusion and limitation may
|
||||
not apply to You.
|
||||
|
||||
8. Litigation
|
||||
|
||||
Any litigation relating to this License may be brought only in the courts
|
||||
of a jurisdiction where the defendant maintains its principal place of
|
||||
business and such litigation shall be governed by laws of that
|
||||
jurisdiction, without reference to its conflict-of-law provisions. Nothing
|
||||
in this Section shall prevent a party's ability to bring cross-claims or
|
||||
counter-claims.
|
||||
|
||||
9. Miscellaneous
|
||||
|
||||
This License represents the complete agreement concerning the subject
|
||||
matter hereof. If any provision of this License is held to be
|
||||
unenforceable, such provision shall be reformed only to the extent
|
||||
necessary to make it enforceable. Any law or regulation which provides that
|
||||
the language of a contract shall be construed against the drafter shall not
|
||||
be used to construe this License against a Contributor.
|
||||
|
||||
|
||||
10. Versions of the License
|
||||
|
||||
10.1. New Versions
|
||||
|
||||
Mozilla Foundation is the license steward. Except as provided in Section
|
||||
10.3, no one other than the license steward has the right to modify or
|
||||
publish new versions of this License. Each version will be given a
|
||||
distinguishing version number.
|
||||
|
||||
10.2. Effect of New Versions
|
||||
|
||||
You may distribute the Covered Software under the terms of the version
|
||||
of the License under which You originally received the Covered Software,
|
||||
or under the terms of any subsequent version published by the license
|
||||
steward.
|
||||
|
||||
10.3. Modified Versions
|
||||
|
||||
If you create software not governed by this License, and you want to
|
||||
create a new license for such software, you may create and use a
|
||||
modified version of this License if you rename the license and remove
|
||||
any references to the name of the license steward (except to note that
|
||||
such modified license differs from this License).
|
||||
|
||||
10.4. Distributing Source Code Form that is Incompatible With Secondary
|
||||
Licenses If You choose to distribute Source Code Form that is
|
||||
Incompatible With Secondary Licenses under the terms of this version of
|
||||
the License, the notice described in Exhibit B of this License must be
|
||||
attached.
|
||||
|
||||
Exhibit A - Source Code Form License Notice
|
||||
|
||||
This Source Code Form is subject to the
|
||||
terms of the Mozilla Public License, v.
|
||||
2.0. If a copy of the MPL was not
|
||||
distributed with this file, You can
|
||||
obtain one at
|
||||
http://mozilla.org/MPL/2.0/.
|
||||
|
||||
If it is not possible or desirable to put the notice in a particular file,
|
||||
then You may include the notice in a location (such as a LICENSE file in a
|
||||
relevant directory) where a recipient would be likely to look for such a
|
||||
notice.
|
||||
|
||||
You may add additional accurate notices of copyright ownership.
|
||||
|
||||
Exhibit B - "Incompatible With Secondary Licenses" Notice
|
||||
|
||||
This Source Code Form is "Incompatible
|
||||
With Secondary Licenses", as defined by
|
||||
the Mozilla Public License, v. 2.0.
|
||||
|
||||
+222
@@ -0,0 +1,222 @@
|
||||
package configutil
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/hcl"
|
||||
"github.com/hashicorp/hcl/hcl/ast"
|
||||
"github.com/hashicorp/vault/sdk/helper/parseutil"
|
||||
)
|
||||
|
||||
// SharedConfig contains some shared values
|
||||
type SharedConfig struct {
|
||||
EntSharedConfig
|
||||
|
||||
Listeners []*Listener `hcl:"-"`
|
||||
|
||||
Seals []*KMS `hcl:"-"`
|
||||
Entropy *Entropy `hcl:"-"`
|
||||
|
||||
DisableMlock bool `hcl:"-"`
|
||||
DisableMlockRaw interface{} `hcl:"disable_mlock"`
|
||||
|
||||
Telemetry *Telemetry `hcl:"telemetry"`
|
||||
|
||||
DefaultMaxRequestDuration time.Duration `hcl:"-"`
|
||||
DefaultMaxRequestDurationRaw interface{} `hcl:"default_max_request_duration"`
|
||||
|
||||
// LogFormat specifies the log format. Valid values are "standard" and
|
||||
// "json". The values are case-insenstive. If no log format is specified,
|
||||
// then standard format will be used.
|
||||
LogFormat string `hcl:"log_format"`
|
||||
LogLevel string `hcl:"log_level"`
|
||||
|
||||
PidFile string `hcl:"pid_file"`
|
||||
|
||||
ClusterName string `hcl:"cluster_name"`
|
||||
}
|
||||
|
||||
// LoadConfigFile loads the configuration from the given file.
|
||||
func LoadConfigFile(path string) (*SharedConfig, error) {
|
||||
// Read the file
|
||||
d, err := ioutil.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ParseConfig(string(d))
|
||||
}
|
||||
|
||||
func LoadConfigKMSes(path string) ([]*KMS, error) {
|
||||
// Read the file
|
||||
d, err := ioutil.ReadFile(path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return ParseKMSes(string(d))
|
||||
}
|
||||
|
||||
func ParseConfig(d string) (*SharedConfig, error) {
|
||||
// Parse!
|
||||
obj, err := hcl.Parse(d)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Start building the result
|
||||
var result SharedConfig
|
||||
if err := hcl.DecodeObject(&result, obj); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if result.DefaultMaxRequestDurationRaw != nil {
|
||||
if result.DefaultMaxRequestDuration, err = parseutil.ParseDurationSecond(result.DefaultMaxRequestDurationRaw); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result.DefaultMaxRequestDurationRaw = nil
|
||||
}
|
||||
|
||||
if result.DisableMlockRaw != nil {
|
||||
if result.DisableMlock, err = parseutil.ParseBool(result.DisableMlockRaw); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
result.DisableMlockRaw = nil
|
||||
}
|
||||
|
||||
list, ok := obj.Node.(*ast.ObjectList)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("error parsing: file doesn't contain a root object")
|
||||
}
|
||||
|
||||
if o := list.Filter("hsm"); len(o.Items) > 0 {
|
||||
if err := parseKMS(&result.Seals, o, "hsm", 2); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'hsm': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
if o := list.Filter("seal"); len(o.Items) > 0 {
|
||||
if err := parseKMS(&result.Seals, o, "seal", 3); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'seal': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
if o := list.Filter("kms"); len(o.Items) > 0 {
|
||||
if err := parseKMS(&result.Seals, o, "kms", 3); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'kms': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
if o := list.Filter("entropy"); len(o.Items) > 0 {
|
||||
if err := ParseEntropy(&result, o, "entropy"); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'entropy': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
if o := list.Filter("listener"); len(o.Items) > 0 {
|
||||
if err := ParseListeners(&result, o); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'listener': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
if o := list.Filter("telemetry"); len(o.Items) > 0 {
|
||||
if err := parseTelemetry(&result, o); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'telemetry': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
entConfig := &(result.EntSharedConfig)
|
||||
if err := entConfig.ParseConfig(list); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing enterprise config: {{err}}", err)
|
||||
}
|
||||
|
||||
return &result, nil
|
||||
}
|
||||
|
||||
// Sanitized returns a copy of the config with all values that are considered
|
||||
// sensitive stripped. It also strips all `*Raw` values that are mainly
|
||||
// used for parsing.
|
||||
//
|
||||
// Specifically, the fields that this method strips are:
|
||||
// - KMS.Config
|
||||
// - Telemetry.CirconusAPIToken
|
||||
func (c *SharedConfig) Sanitized() map[string]interface{} {
|
||||
if c == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
result := map[string]interface{}{
|
||||
"disable_mlock": c.DisableMlock,
|
||||
|
||||
"default_max_request_duration": c.DefaultMaxRequestDuration,
|
||||
|
||||
"log_level": c.LogLevel,
|
||||
"log_format": c.LogFormat,
|
||||
|
||||
"pid_file": c.PidFile,
|
||||
|
||||
"cluster_name": c.ClusterName,
|
||||
}
|
||||
|
||||
// Sanitize listeners
|
||||
if len(c.Listeners) != 0 {
|
||||
var sanitizedListeners []interface{}
|
||||
for _, ln := range c.Listeners {
|
||||
cleanLn := map[string]interface{}{
|
||||
"type": ln.Type,
|
||||
"config": ln.RawConfig,
|
||||
}
|
||||
sanitizedListeners = append(sanitizedListeners, cleanLn)
|
||||
}
|
||||
result["listeners"] = sanitizedListeners
|
||||
}
|
||||
|
||||
// Sanitize seals stanza
|
||||
if len(c.Seals) != 0 {
|
||||
var sanitizedSeals []interface{}
|
||||
for _, s := range c.Seals {
|
||||
cleanSeal := map[string]interface{}{
|
||||
"type": s.Type,
|
||||
"disabled": s.Disabled,
|
||||
}
|
||||
sanitizedSeals = append(sanitizedSeals, cleanSeal)
|
||||
}
|
||||
result["seals"] = sanitizedSeals
|
||||
}
|
||||
|
||||
// Sanitize telemetry stanza
|
||||
if c.Telemetry != nil {
|
||||
sanitizedTelemetry := map[string]interface{}{
|
||||
"statsite_address": c.Telemetry.StatsiteAddr,
|
||||
"statsd_address": c.Telemetry.StatsdAddr,
|
||||
"disable_hostname": c.Telemetry.DisableHostname,
|
||||
"metrics_prefix": c.Telemetry.MetricsPrefix,
|
||||
"usage_gauge_period": c.Telemetry.UsageGaugePeriod,
|
||||
"maximum_gauge_cardinality": c.Telemetry.MaximumGaugeCardinality,
|
||||
"circonus_api_token": "",
|
||||
"circonus_api_app": c.Telemetry.CirconusAPIApp,
|
||||
"circonus_api_url": c.Telemetry.CirconusAPIURL,
|
||||
"circonus_submission_interval": c.Telemetry.CirconusSubmissionInterval,
|
||||
"circonus_submission_url": c.Telemetry.CirconusCheckSubmissionURL,
|
||||
"circonus_check_id": c.Telemetry.CirconusCheckID,
|
||||
"circonus_check_force_metric_activation": c.Telemetry.CirconusCheckForceMetricActivation,
|
||||
"circonus_check_instance_id": c.Telemetry.CirconusCheckInstanceID,
|
||||
"circonus_check_search_tag": c.Telemetry.CirconusCheckSearchTag,
|
||||
"circonus_check_tags": c.Telemetry.CirconusCheckTags,
|
||||
"circonus_check_display_name": c.Telemetry.CirconusCheckDisplayName,
|
||||
"circonus_broker_id": c.Telemetry.CirconusBrokerID,
|
||||
"circonus_broker_select_tag": c.Telemetry.CirconusBrokerSelectTag,
|
||||
"dogstatsd_addr": c.Telemetry.DogStatsDAddr,
|
||||
"dogstatsd_tags": c.Telemetry.DogStatsDTags,
|
||||
"prometheus_retention_time": c.Telemetry.PrometheusRetentionTime,
|
||||
"stackdriver_project_id": c.Telemetry.StackdriverProjectID,
|
||||
"stackdriver_location": c.Telemetry.StackdriverLocation,
|
||||
"stackdriver_namespace": c.Telemetry.StackdriverNamespace,
|
||||
"stackdriver_debug_logs": c.Telemetry.StackdriverDebugLogs,
|
||||
}
|
||||
result["telemetry"] = sanitizedTelemetry
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
// +build !enterprise
|
||||
|
||||
package configutil
|
||||
|
||||
import (
|
||||
"github.com/hashicorp/hcl/hcl/ast"
|
||||
)
|
||||
|
||||
type EntSharedConfig struct {
|
||||
}
|
||||
|
||||
func (ec *EntSharedConfig) ParseConfig(list *ast.ObjectList) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func ParseEntropy(result *SharedConfig, list *ast.ObjectList, blockName string) error {
|
||||
return nil
|
||||
}
|
||||
+92
@@ -0,0 +1,92 @@
|
||||
package configutil
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
|
||||
wrapping "github.com/hashicorp/go-kms-wrapping"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
var (
|
||||
encryptRegex = regexp.MustCompile(`{{encrypt\(.*\)}}`)
|
||||
decryptRegex = regexp.MustCompile(`{{decrypt\(.*\)}}`)
|
||||
)
|
||||
|
||||
func EncryptDecrypt(rawStr string, decrypt, strip bool, wrapper wrapping.Wrapper) (string, error) {
|
||||
var locs [][]int
|
||||
raw := []byte(rawStr)
|
||||
searchVal := "{{encrypt("
|
||||
replaceVal := "{{decrypt("
|
||||
suffixVal := ")}}"
|
||||
if decrypt {
|
||||
searchVal = "{{decrypt("
|
||||
replaceVal = "{{encrypt("
|
||||
locs = decryptRegex.FindAllIndex(raw, -1)
|
||||
} else {
|
||||
locs = encryptRegex.FindAllIndex(raw, -1)
|
||||
}
|
||||
if strip {
|
||||
replaceVal = ""
|
||||
suffixVal = ""
|
||||
}
|
||||
|
||||
out := make([]byte, 0, len(rawStr)*2)
|
||||
var prevMaxLoc int
|
||||
for _, match := range locs {
|
||||
if len(match) != 2 {
|
||||
return "", fmt.Errorf("expected two values for match, got %d", len(match))
|
||||
}
|
||||
|
||||
// Append everything from the end of the last match to the beginning of this one
|
||||
out = append(out, raw[prevMaxLoc:match[0]]...)
|
||||
|
||||
// Transform. First pull off the suffix/prefix
|
||||
matchBytes := raw[match[0]:match[1]]
|
||||
matchBytes = bytes.TrimSuffix(bytes.TrimPrefix(matchBytes, []byte(searchVal)), []byte(")}}"))
|
||||
var finalVal string
|
||||
|
||||
// Now encrypt or decrypt
|
||||
switch decrypt {
|
||||
case false:
|
||||
outBlob, err := wrapper.Encrypt(context.Background(), matchBytes, nil)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("error encrypting parameter: %w", err)
|
||||
}
|
||||
if outBlob == nil {
|
||||
return "", errors.New("nil value returned from encrypting parameter")
|
||||
}
|
||||
outMsg, err := proto.Marshal(outBlob)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("error marshaling encrypted parameter: %w", err)
|
||||
}
|
||||
finalVal = base64.RawURLEncoding.EncodeToString(outMsg)
|
||||
|
||||
default:
|
||||
inMsg, err := base64.RawURLEncoding.DecodeString(string(matchBytes))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("error decoding encrypted parameter: %w", err)
|
||||
}
|
||||
inBlob := new(wrapping.EncryptedBlobInfo)
|
||||
if err := proto.Unmarshal(inMsg, inBlob); err != nil {
|
||||
return "", fmt.Errorf("error unmarshaling encrypted parameter: %w", err)
|
||||
}
|
||||
dec, err := wrapper.Decrypt(context.Background(), inBlob, nil)
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("error decrypting encrypted parameter: %w", err)
|
||||
}
|
||||
finalVal = string(dec)
|
||||
}
|
||||
|
||||
// Append new value
|
||||
out = append(out, []byte(fmt.Sprintf("%s%s%s", replaceVal, finalVal, suffixVal))...)
|
||||
prevMaxLoc = match[1]
|
||||
}
|
||||
// At the end, append the rest
|
||||
out = append(out, raw[prevMaxLoc:len(raw)]...)
|
||||
return string(out), nil
|
||||
}
|
||||
+349
@@ -0,0 +1,349 @@
|
||||
package configutil
|
||||
|
||||
import (
|
||||
"crypto/rand"
|
||||
"fmt"
|
||||
"io"
|
||||
"strings"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/go-hclog"
|
||||
wrapping "github.com/hashicorp/go-kms-wrapping"
|
||||
aeadwrapper "github.com/hashicorp/go-kms-wrapping/wrappers/aead"
|
||||
"github.com/hashicorp/go-kms-wrapping/wrappers/alicloudkms"
|
||||
"github.com/hashicorp/go-kms-wrapping/wrappers/awskms"
|
||||
"github.com/hashicorp/go-kms-wrapping/wrappers/azurekeyvault"
|
||||
"github.com/hashicorp/go-kms-wrapping/wrappers/gcpckms"
|
||||
"github.com/hashicorp/go-kms-wrapping/wrappers/ocikms"
|
||||
"github.com/hashicorp/go-kms-wrapping/wrappers/transit"
|
||||
"github.com/hashicorp/go-multierror"
|
||||
"github.com/hashicorp/hcl"
|
||||
"github.com/hashicorp/hcl/hcl/ast"
|
||||
"github.com/hashicorp/vault/sdk/helper/parseutil"
|
||||
"github.com/hashicorp/vault/sdk/logical"
|
||||
)
|
||||
|
||||
var (
|
||||
ConfigureWrapper = configureWrapper
|
||||
CreateSecureRandomReaderFunc = createSecureRandomReader
|
||||
)
|
||||
|
||||
// Entropy contains Entropy configuration for the server
|
||||
type EntropyMode int
|
||||
|
||||
const (
|
||||
EntropyUnknown EntropyMode = iota
|
||||
EntropyAugmentation
|
||||
)
|
||||
|
||||
type Entropy struct {
|
||||
Mode EntropyMode
|
||||
}
|
||||
|
||||
// KMS contains KMS configuration for the server
|
||||
type KMS struct {
|
||||
Type string
|
||||
// Purpose can be used to allow a string-based specification of what this
|
||||
// KMS is designated for, in situations where we want to allow more than
|
||||
// one KMS to be specified
|
||||
Purpose []string `hcl:"-"`
|
||||
|
||||
Disabled bool
|
||||
Config map[string]string
|
||||
}
|
||||
|
||||
func (k *KMS) GoString() string {
|
||||
return fmt.Sprintf("*%#v", *k)
|
||||
}
|
||||
|
||||
func parseKMS(result *[]*KMS, list *ast.ObjectList, blockName string, maxKMS int) error {
|
||||
if len(list.Items) > maxKMS {
|
||||
return fmt.Errorf("only two or less %q blocks are permitted", blockName)
|
||||
}
|
||||
|
||||
seals := make([]*KMS, 0, len(list.Items))
|
||||
for _, item := range list.Items {
|
||||
key := blockName
|
||||
if len(item.Keys) > 0 {
|
||||
key = item.Keys[0].Token.Value().(string)
|
||||
}
|
||||
|
||||
// We first decode into a map[string]interface{} because purpose isn't
|
||||
// necessarily a string. Then we migrate everything else over to
|
||||
// map[string]string and error if it doesn't work.
|
||||
var m map[string]interface{}
|
||||
if err := hcl.DecodeObject(&m, item.Val); err != nil {
|
||||
return multierror.Prefix(err, fmt.Sprintf("%s.%s:", blockName, key))
|
||||
}
|
||||
|
||||
var purpose []string
|
||||
var err error
|
||||
if v, ok := m["purpose"]; ok {
|
||||
if purpose, err = parseutil.ParseCommaStringSlice(v); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("unable to parse 'purpose' in kms type %q: %w", key, err), fmt.Sprintf("%s.%s:", blockName, key))
|
||||
}
|
||||
for i, p := range purpose {
|
||||
purpose[i] = strings.ToLower(p)
|
||||
}
|
||||
delete(m, "purpose")
|
||||
}
|
||||
|
||||
var disabled bool
|
||||
if v, ok := m["disabled"]; ok {
|
||||
disabled, err = parseutil.ParseBool(v)
|
||||
if err != nil {
|
||||
return multierror.Prefix(err, fmt.Sprintf("%s.%s:", blockName, key))
|
||||
}
|
||||
delete(m, "disabled")
|
||||
}
|
||||
|
||||
strMap := make(map[string]string, len(m))
|
||||
for k, v := range m {
|
||||
s, err := parseutil.ParseString(v)
|
||||
if err != nil {
|
||||
return multierror.Prefix(err, fmt.Sprintf("%s.%s:", blockName, key))
|
||||
}
|
||||
strMap[k] = s
|
||||
}
|
||||
|
||||
seal := &KMS{
|
||||
Type: strings.ToLower(key),
|
||||
Purpose: purpose,
|
||||
Disabled: disabled,
|
||||
}
|
||||
if len(strMap) > 0 {
|
||||
seal.Config = strMap
|
||||
}
|
||||
seals = append(seals, seal)
|
||||
}
|
||||
|
||||
*result = append(*result, seals...)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func ParseKMSes(d string) ([]*KMS, error) {
|
||||
// Parse!
|
||||
obj, err := hcl.Parse(d)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Start building the result
|
||||
var result struct {
|
||||
Seals []*KMS `hcl:"-"`
|
||||
}
|
||||
|
||||
if err := hcl.DecodeObject(&result, obj); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
list, ok := obj.Node.(*ast.ObjectList)
|
||||
if !ok {
|
||||
return nil, fmt.Errorf("error parsing: file doesn't contain a root object")
|
||||
}
|
||||
|
||||
if o := list.Filter("seal"); len(o.Items) > 0 {
|
||||
if err := parseKMS(&result.Seals, o, "seal", 3); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'seal': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
if o := list.Filter("kms"); len(o.Items) > 0 {
|
||||
if err := parseKMS(&result.Seals, o, "kms", 3); err != nil {
|
||||
return nil, errwrap.Wrapf("error parsing 'kms': {{err}}", err)
|
||||
}
|
||||
}
|
||||
|
||||
return result.Seals, nil
|
||||
}
|
||||
|
||||
func configureWrapper(configKMS *KMS, infoKeys *[]string, info *map[string]string, logger hclog.Logger) (wrapping.Wrapper, error) {
|
||||
var wrapper wrapping.Wrapper
|
||||
var kmsInfo map[string]string
|
||||
var err error
|
||||
|
||||
opts := &wrapping.WrapperOptions{
|
||||
Logger: logger,
|
||||
}
|
||||
|
||||
switch configKMS.Type {
|
||||
case wrapping.Shamir:
|
||||
return nil, nil
|
||||
|
||||
case wrapping.AEAD:
|
||||
wrapper, kmsInfo, err = GetAEADKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.AliCloudKMS:
|
||||
wrapper, kmsInfo, err = GetAliCloudKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.AWSKMS:
|
||||
wrapper, kmsInfo, err = GetAWSKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.AzureKeyVault:
|
||||
wrapper, kmsInfo, err = GetAzureKeyVaultKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.GCPCKMS:
|
||||
wrapper, kmsInfo, err = GetGCPCKMSKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.OCIKMS:
|
||||
wrapper, kmsInfo, err = GetOCIKMSKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.Transit:
|
||||
wrapper, kmsInfo, err = GetTransitKMSFunc(opts, configKMS)
|
||||
|
||||
case wrapping.PKCS11:
|
||||
return nil, fmt.Errorf("KMS type 'pkcs11' requires the Vault Enterprise HSM binary")
|
||||
|
||||
default:
|
||||
return nil, fmt.Errorf("Unknown KMS type %q", configKMS.Type)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if infoKeys != nil && info != nil {
|
||||
for k, v := range kmsInfo {
|
||||
*infoKeys = append(*infoKeys, k)
|
||||
(*info)[k] = v
|
||||
}
|
||||
}
|
||||
|
||||
return wrapper, nil
|
||||
}
|
||||
|
||||
func GetAEADKMSFunc(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := aeadwrapper.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
str := "AEAD Type"
|
||||
if len(kms.Purpose) > 0 {
|
||||
str = fmt.Sprintf("%v %s", kms.Purpose, str)
|
||||
}
|
||||
info[str] = wrapperInfo["aead_type"]
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
func GetAliCloudKMSFunc(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := alicloudkms.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
// If the error is any other than logical.KeyNotFoundError, return the error
|
||||
if !errwrap.ContainsType(err, new(logical.KeyNotFoundError)) {
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
info["AliCloud KMS Region"] = wrapperInfo["region"]
|
||||
info["AliCloud KMS KeyID"] = wrapperInfo["kms_key_id"]
|
||||
if domain, ok := wrapperInfo["domain"]; ok {
|
||||
info["AliCloud KMS Domain"] = domain
|
||||
}
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
var GetAWSKMSFunc = func(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := awskms.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
// If the error is any other than logical.KeyNotFoundError, return the error
|
||||
if !errwrap.ContainsType(err, new(logical.KeyNotFoundError)) {
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
info["AWS KMS Region"] = wrapperInfo["region"]
|
||||
info["AWS KMS KeyID"] = wrapperInfo["kms_key_id"]
|
||||
if endpoint, ok := wrapperInfo["endpoint"]; ok {
|
||||
info["AWS KMS Endpoint"] = endpoint
|
||||
}
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
func GetAzureKeyVaultKMSFunc(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := azurekeyvault.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
// If the error is any other than logical.KeyNotFoundError, return the error
|
||||
if !errwrap.ContainsType(err, new(logical.KeyNotFoundError)) {
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
info["Azure Environment"] = wrapperInfo["environment"]
|
||||
info["Azure Vault Name"] = wrapperInfo["vault_name"]
|
||||
info["Azure Key Name"] = wrapperInfo["key_name"]
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
func GetGCPCKMSKMSFunc(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := gcpckms.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
// If the error is any other than logical.KeyNotFoundError, return the error
|
||||
if !errwrap.ContainsType(err, new(logical.KeyNotFoundError)) {
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
info["GCP KMS Project"] = wrapperInfo["project"]
|
||||
info["GCP KMS Region"] = wrapperInfo["region"]
|
||||
info["GCP KMS Key Ring"] = wrapperInfo["key_ring"]
|
||||
info["GCP KMS Crypto Key"] = wrapperInfo["crypto_key"]
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
func GetOCIKMSKMSFunc(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := ocikms.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
return nil, nil, err
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
info["OCI KMS KeyID"] = wrapperInfo[ocikms.KMSConfigKeyID]
|
||||
info["OCI KMS Crypto Endpoint"] = wrapperInfo[ocikms.KMSConfigCryptoEndpoint]
|
||||
info["OCI KMS Management Endpoint"] = wrapperInfo[ocikms.KMSConfigManagementEndpoint]
|
||||
info["OCI KMS Principal Type"] = wrapperInfo["principal_type"]
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
var GetTransitKMSFunc = func(opts *wrapping.WrapperOptions, kms *KMS) (wrapping.Wrapper, map[string]string, error) {
|
||||
wrapper := transit.NewWrapper(opts)
|
||||
wrapperInfo, err := wrapper.SetConfig(kms.Config)
|
||||
if err != nil {
|
||||
// If the error is any other than logical.KeyNotFoundError, return the error
|
||||
if !errwrap.ContainsType(err, new(logical.KeyNotFoundError)) {
|
||||
return nil, nil, err
|
||||
}
|
||||
}
|
||||
info := make(map[string]string)
|
||||
if wrapperInfo != nil {
|
||||
info["Transit Address"] = wrapperInfo["address"]
|
||||
info["Transit Mount Path"] = wrapperInfo["mount_path"]
|
||||
info["Transit Key Name"] = wrapperInfo["key_name"]
|
||||
if namespace, ok := wrapperInfo["namespace"]; ok {
|
||||
info["Transit Namespace"] = namespace
|
||||
}
|
||||
}
|
||||
return wrapper, info, nil
|
||||
}
|
||||
|
||||
func createSecureRandomReader(conf *SharedConfig, wrapper wrapping.Wrapper) (io.Reader, error) {
|
||||
return rand.Reader, nil
|
||||
}
|
||||
+346
@@ -0,0 +1,346 @@
|
||||
package configutil
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/textproto"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/hashicorp/go-multierror"
|
||||
"github.com/hashicorp/go-sockaddr"
|
||||
"github.com/hashicorp/hcl"
|
||||
"github.com/hashicorp/hcl/hcl/ast"
|
||||
"github.com/hashicorp/vault/sdk/helper/parseutil"
|
||||
"github.com/hashicorp/vault/sdk/helper/strutil"
|
||||
"github.com/hashicorp/vault/sdk/helper/tlsutil"
|
||||
)
|
||||
|
||||
type ListenerTelemetry struct {
|
||||
UnauthenticatedMetricsAccess bool `hcl:"-"`
|
||||
UnauthenticatedMetricsAccessRaw interface{} `hcl:"unauthenticated_metrics_access"`
|
||||
}
|
||||
|
||||
// Listener is the listener configuration for the server.
|
||||
type Listener struct {
|
||||
RawConfig map[string]interface{}
|
||||
|
||||
Type string
|
||||
Purpose []string `hcl:"-"`
|
||||
PurposeRaw interface{} `hcl:"purpose"`
|
||||
|
||||
Address string `hcl:"address"`
|
||||
ClusterAddress string `hcl:"cluster_address"`
|
||||
MaxRequestSize int64 `hcl:"-"`
|
||||
MaxRequestSizeRaw interface{} `hcl:"max_request_size"`
|
||||
MaxRequestDuration time.Duration `hcl:"-"`
|
||||
MaxRequestDurationRaw interface{} `hcl:"max_request_duration"`
|
||||
RequireRequestHeader bool `hcl:"-"`
|
||||
RequireRequestHeaderRaw interface{} `hcl:"require_request_header"`
|
||||
|
||||
TLSDisable bool `hcl:"-"`
|
||||
TLSDisableRaw interface{} `hcl:"tls_disable"`
|
||||
TLSCertFile string `hcl:"tls_cert_file"`
|
||||
TLSKeyFile string `hcl:"tls_key_file"`
|
||||
TLSMinVersion string `hcl:"tls_min_version"`
|
||||
TLSCipherSuites []uint16 `hcl:"-"`
|
||||
TLSCipherSuitesRaw string `hcl:"tls_cipher_suites"`
|
||||
TLSPreferServerCipherSuites bool `hcl:"-"`
|
||||
TLSPreferServerCipherSuitesRaw interface{} `hcl:"tls_prefer_server_cipher_suites"`
|
||||
TLSRequireAndVerifyClientCert bool `hcl:"-"`
|
||||
TLSRequireAndVerifyClientCertRaw interface{} `hcl:"tls_require_and_verify_client_cert"`
|
||||
TLSClientCAFile string `hcl:"tls_client_ca_file"`
|
||||
TLSDisableClientCerts bool `hcl:"-"`
|
||||
TLSDisableClientCertsRaw interface{} `hcl:"tls_disable_client_certs"`
|
||||
|
||||
HTTPReadTimeout time.Duration `hcl:"-"`
|
||||
HTTPReadTimeoutRaw interface{} `hcl:"http_read_timeout"`
|
||||
HTTPReadHeaderTimeout time.Duration `hcl:"-"`
|
||||
HTTPReadHeaderTimeoutRaw interface{} `hcl:"http_read_header_timeout"`
|
||||
HTTPWriteTimeout time.Duration `hcl:"-"`
|
||||
HTTPWriteTimeoutRaw interface{} `hcl:"http_write_timeout"`
|
||||
HTTPIdleTimeout time.Duration `hcl:"-"`
|
||||
HTTPIdleTimeoutRaw interface{} `hcl:"http_idle_timeout"`
|
||||
|
||||
ProxyProtocolBehavior string `hcl:"proxy_protocol_behavior"`
|
||||
ProxyProtocolAuthorizedAddrs []*sockaddr.SockAddrMarshaler `hcl:"-"`
|
||||
ProxyProtocolAuthorizedAddrsRaw interface{} `hcl:"proxy_protocol_authorized_addrs"`
|
||||
|
||||
XForwardedForAuthorizedAddrs []*sockaddr.SockAddrMarshaler `hcl:"-"`
|
||||
XForwardedForAuthorizedAddrsRaw interface{} `hcl:"x_forwarded_for_authorized_addrs"`
|
||||
XForwardedForHopSkips int64 `hcl:"-"`
|
||||
XForwardedForHopSkipsRaw interface{} `hcl:"x_forwarded_for_hop_skips"`
|
||||
XForwardedForRejectNotPresent bool `hcl:"-"`
|
||||
XForwardedForRejectNotPresentRaw interface{} `hcl:"x_forwarded_for_reject_not_present"`
|
||||
XForwardedForRejectNotAuthorized bool `hcl:"-"`
|
||||
XForwardedForRejectNotAuthorizedRaw interface{} `hcl:"x_forwarded_for_reject_not_authorized"`
|
||||
|
||||
SocketMode string `hcl:"socket_mode"`
|
||||
SocketUser string `hcl:"socket_user"`
|
||||
SocketGroup string `hcl:"socket_group"`
|
||||
|
||||
Telemetry ListenerTelemetry `hcl:"telemetry"`
|
||||
|
||||
// RandomPort is used only for some testing purposes
|
||||
RandomPort bool `hcl:"-"`
|
||||
|
||||
CorsEnabledRaw interface{} `hcl:"cors_enabled"`
|
||||
CorsEnabled bool `hcl:"-"`
|
||||
CorsAllowedOrigins []string `hcl:"cors_allowed_origins"`
|
||||
CorsAllowedHeaders []string `hcl:"-"`
|
||||
CorsAllowedHeadersRaw []string `hcl:"cors_allowed_headers"`
|
||||
}
|
||||
|
||||
func (l *Listener) GoString() string {
|
||||
return fmt.Sprintf("*%#v", *l)
|
||||
}
|
||||
|
||||
func ParseListeners(result *SharedConfig, list *ast.ObjectList) error {
|
||||
var err error
|
||||
result.Listeners = make([]*Listener, 0, len(list.Items))
|
||||
for i, item := range list.Items {
|
||||
var l Listener
|
||||
if err := hcl.DecodeObject(&l, item.Val); err != nil {
|
||||
return multierror.Prefix(err, fmt.Sprintf("listeners.%d:", i))
|
||||
}
|
||||
|
||||
// Hacky way, for now, to get the values we want for sanitizing
|
||||
var m map[string]interface{}
|
||||
if err := hcl.DecodeObject(&m, item.Val); err != nil {
|
||||
return multierror.Prefix(err, fmt.Sprintf("listeners.%d:", i))
|
||||
}
|
||||
l.RawConfig = m
|
||||
|
||||
// Base values
|
||||
{
|
||||
switch {
|
||||
case l.Type != "":
|
||||
case len(item.Keys) == 1:
|
||||
l.Type = strings.ToLower(item.Keys[0].Token.Value().(string))
|
||||
default:
|
||||
return multierror.Prefix(errors.New("listener type must be specified"), fmt.Sprintf("listeners.%d:", i))
|
||||
}
|
||||
|
||||
l.Type = strings.ToLower(l.Type)
|
||||
switch l.Type {
|
||||
case "tcp", "unix":
|
||||
default:
|
||||
return multierror.Prefix(fmt.Errorf("unsupported listener type %q", l.Type), fmt.Sprintf("listeners.%d:", i))
|
||||
}
|
||||
|
||||
if l.PurposeRaw != nil {
|
||||
if l.Purpose, err = parseutil.ParseCommaStringSlice(l.PurposeRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("unable to parse 'purpose' in listener type %q: %w", l.Type, err), fmt.Sprintf("listeners.%d:", i))
|
||||
}
|
||||
for i, v := range l.Purpose {
|
||||
l.Purpose[i] = strings.ToLower(v)
|
||||
}
|
||||
|
||||
l.PurposeRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// Request Parameters
|
||||
{
|
||||
if l.MaxRequestSizeRaw != nil {
|
||||
if l.MaxRequestSize, err = parseutil.ParseInt(l.MaxRequestSizeRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing max_request_size: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
if l.MaxRequestSize < 0 {
|
||||
return multierror.Prefix(errors.New("max_request_size cannot be negative"), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.MaxRequestSizeRaw = nil
|
||||
}
|
||||
|
||||
if l.MaxRequestDurationRaw != nil {
|
||||
if l.MaxRequestDuration, err = parseutil.ParseDurationSecond(l.MaxRequestDurationRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing max_request_duration: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
if l.MaxRequestDuration < 0 {
|
||||
return multierror.Prefix(errors.New("max_request_duration cannot be negative"), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.MaxRequestDurationRaw = nil
|
||||
}
|
||||
|
||||
if l.RequireRequestHeaderRaw != nil {
|
||||
if l.RequireRequestHeader, err = parseutil.ParseBool(l.RequireRequestHeaderRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for require_request_header: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.RequireRequestHeaderRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// TLS Parameters
|
||||
{
|
||||
if l.TLSDisableRaw != nil {
|
||||
if l.TLSDisable, err = parseutil.ParseBool(l.TLSDisableRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for tls_disable: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.TLSDisableRaw = nil
|
||||
}
|
||||
|
||||
if l.TLSCipherSuitesRaw != "" {
|
||||
if l.TLSCipherSuites, err = tlsutil.ParseCiphers(l.TLSCipherSuitesRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for tls_cipher_suites: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
}
|
||||
|
||||
if l.TLSPreferServerCipherSuitesRaw != nil {
|
||||
if l.TLSPreferServerCipherSuites, err = parseutil.ParseBool(l.TLSPreferServerCipherSuitesRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for tls_prefer_server_cipher_suites: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.TLSPreferServerCipherSuitesRaw = nil
|
||||
}
|
||||
|
||||
if l.TLSRequireAndVerifyClientCertRaw != nil {
|
||||
if l.TLSRequireAndVerifyClientCert, err = parseutil.ParseBool(l.TLSRequireAndVerifyClientCertRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for tls_require_and_verify_client_cert: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.TLSRequireAndVerifyClientCertRaw = nil
|
||||
}
|
||||
|
||||
if l.TLSDisableClientCertsRaw != nil {
|
||||
if l.TLSDisableClientCerts, err = parseutil.ParseBool(l.TLSDisableClientCertsRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for tls_disable_client_certs: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.TLSDisableClientCertsRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// HTTP timeouts
|
||||
{
|
||||
if l.HTTPReadTimeoutRaw != nil {
|
||||
if l.HTTPReadTimeout, err = parseutil.ParseDurationSecond(l.HTTPReadTimeoutRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing http_read_timeout: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.HTTPReadTimeoutRaw = nil
|
||||
}
|
||||
|
||||
if l.HTTPReadHeaderTimeoutRaw != nil {
|
||||
if l.HTTPReadHeaderTimeout, err = parseutil.ParseDurationSecond(l.HTTPReadHeaderTimeoutRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing http_read_header_timeout: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.HTTPReadHeaderTimeoutRaw = nil
|
||||
}
|
||||
|
||||
if l.HTTPWriteTimeoutRaw != nil {
|
||||
if l.HTTPWriteTimeout, err = parseutil.ParseDurationSecond(l.HTTPWriteTimeoutRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing http_write_timeout: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.HTTPWriteTimeoutRaw = nil
|
||||
}
|
||||
|
||||
if l.HTTPIdleTimeoutRaw != nil {
|
||||
if l.HTTPIdleTimeout, err = parseutil.ParseDurationSecond(l.HTTPIdleTimeoutRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing http_idle_timeout: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.HTTPIdleTimeoutRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// Proxy Protocol config
|
||||
{
|
||||
if l.ProxyProtocolAuthorizedAddrsRaw != nil {
|
||||
if l.ProxyProtocolAuthorizedAddrs, err = parseutil.ParseAddrs(l.ProxyProtocolAuthorizedAddrsRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing proxy_protocol_authorized_addrs: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
switch l.ProxyProtocolBehavior {
|
||||
case "allow_authorized", "deny_authorized":
|
||||
if len(l.ProxyProtocolAuthorizedAddrs) == 0 {
|
||||
return multierror.Prefix(errors.New("proxy_protocol_behavior set to allow or deny only authorized addresses but no proxy_protocol_authorized_addrs value"), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
}
|
||||
|
||||
l.ProxyProtocolAuthorizedAddrsRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// X-Forwarded-For config
|
||||
{
|
||||
if l.XForwardedForAuthorizedAddrsRaw != nil {
|
||||
if l.XForwardedForAuthorizedAddrs, err = parseutil.ParseAddrs(l.XForwardedForAuthorizedAddrsRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing x_forwarded_for_authorized_addrs: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.XForwardedForAuthorizedAddrsRaw = nil
|
||||
}
|
||||
|
||||
if l.XForwardedForHopSkipsRaw != nil {
|
||||
if l.XForwardedForHopSkips, err = parseutil.ParseInt(l.XForwardedForHopSkipsRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("error parsing x_forwarded_for_hop_skips: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
if l.XForwardedForHopSkips < 0 {
|
||||
return multierror.Prefix(fmt.Errorf("x_forwarded_for_hop_skips cannot be negative but set to %d", l.XForwardedForHopSkips), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.XForwardedForHopSkipsRaw = nil
|
||||
}
|
||||
|
||||
if l.XForwardedForRejectNotAuthorizedRaw != nil {
|
||||
if l.XForwardedForRejectNotAuthorized, err = parseutil.ParseBool(l.XForwardedForRejectNotAuthorizedRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for x_forwarded_for_reject_not_authorized: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.XForwardedForRejectNotAuthorizedRaw = nil
|
||||
}
|
||||
|
||||
if l.XForwardedForRejectNotPresentRaw != nil {
|
||||
if l.XForwardedForRejectNotPresent, err = parseutil.ParseBool(l.XForwardedForRejectNotPresentRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for x_forwarded_for_reject_not_present: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.XForwardedForRejectNotPresentRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// Telemetry
|
||||
{
|
||||
if l.Telemetry.UnauthenticatedMetricsAccessRaw != nil {
|
||||
if l.Telemetry.UnauthenticatedMetricsAccess, err = parseutil.ParseBool(l.Telemetry.UnauthenticatedMetricsAccessRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for telemetry.unauthenticated_metrics_access: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.Telemetry.UnauthenticatedMetricsAccessRaw = nil
|
||||
}
|
||||
}
|
||||
|
||||
// CORS
|
||||
{
|
||||
if l.CorsEnabledRaw != nil {
|
||||
if l.CorsEnabled, err = parseutil.ParseBool(l.CorsEnabledRaw); err != nil {
|
||||
return multierror.Prefix(fmt.Errorf("invalid value for cors_enabled: %w", err), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
l.CorsEnabledRaw = nil
|
||||
}
|
||||
|
||||
if strutil.StrListContains(l.CorsAllowedOrigins, "*") && len(l.CorsAllowedOrigins) > 1 {
|
||||
return multierror.Prefix(errors.New("cors_allowed_origins must only contain a wildcard or only non-wildcard values"), fmt.Sprintf("listeners.%d", i))
|
||||
}
|
||||
|
||||
if len(l.CorsAllowedHeadersRaw) > 0 {
|
||||
for _, header := range l.CorsAllowedHeadersRaw {
|
||||
l.CorsAllowedHeaders = append(l.CorsAllowedHeaders, textproto.CanonicalMIMEHeaderKey(header))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
result.Listeners = append(result.Listeners, &l)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
+65
@@ -0,0 +1,65 @@
|
||||
package configutil
|
||||
|
||||
func (c *SharedConfig) Merge(c2 *SharedConfig) *SharedConfig {
|
||||
if c2 == nil {
|
||||
return c
|
||||
}
|
||||
|
||||
result := new(SharedConfig)
|
||||
|
||||
for _, l := range c.Listeners {
|
||||
result.Listeners = append(result.Listeners, l)
|
||||
}
|
||||
for _, l := range c2.Listeners {
|
||||
result.Listeners = append(result.Listeners, l)
|
||||
}
|
||||
|
||||
result.Entropy = c.Entropy
|
||||
if c2.Entropy != nil {
|
||||
result.Entropy = c2.Entropy
|
||||
}
|
||||
|
||||
for _, s := range c.Seals {
|
||||
result.Seals = append(result.Seals, s)
|
||||
}
|
||||
for _, s := range c2.Seals {
|
||||
result.Seals = append(result.Seals, s)
|
||||
}
|
||||
|
||||
result.Telemetry = c.Telemetry
|
||||
if c2.Telemetry != nil {
|
||||
result.Telemetry = c2.Telemetry
|
||||
}
|
||||
|
||||
result.DisableMlock = c.DisableMlock
|
||||
if c2.DisableMlock {
|
||||
result.DisableMlock = c2.DisableMlock
|
||||
}
|
||||
|
||||
result.DefaultMaxRequestDuration = c.DefaultMaxRequestDuration
|
||||
if c2.DefaultMaxRequestDuration > result.DefaultMaxRequestDuration {
|
||||
result.DefaultMaxRequestDuration = c2.DefaultMaxRequestDuration
|
||||
}
|
||||
|
||||
result.LogLevel = c.LogLevel
|
||||
if c2.LogLevel != "" {
|
||||
result.LogLevel = c2.LogLevel
|
||||
}
|
||||
|
||||
result.LogFormat = c.LogFormat
|
||||
if c2.LogFormat != "" {
|
||||
result.LogFormat = c2.LogFormat
|
||||
}
|
||||
|
||||
result.PidFile = c.PidFile
|
||||
if c2.PidFile != "" {
|
||||
result.PidFile = c2.PidFile
|
||||
}
|
||||
|
||||
result.ClusterName = c.ClusterName
|
||||
if c2.ClusterName != "" {
|
||||
result.ClusterName = c2.ClusterName
|
||||
}
|
||||
|
||||
return result
|
||||
}
|
||||
+360
@@ -0,0 +1,360 @@
|
||||
package configutil
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
monitoring "cloud.google.com/go/monitoring/apiv3"
|
||||
"github.com/armon/go-metrics"
|
||||
"github.com/armon/go-metrics/circonus"
|
||||
"github.com/armon/go-metrics/datadog"
|
||||
"github.com/armon/go-metrics/prometheus"
|
||||
stackdriver "github.com/google/go-metrics-stackdriver"
|
||||
stackdrivervault "github.com/google/go-metrics-stackdriver/vault"
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/go-multierror"
|
||||
"github.com/hashicorp/hcl"
|
||||
"github.com/hashicorp/hcl/hcl/ast"
|
||||
"github.com/hashicorp/shared-secure-libs/metricsutil"
|
||||
"github.com/hashicorp/vault/sdk/helper/parseutil"
|
||||
"github.com/mitchellh/cli"
|
||||
"google.golang.org/api/option"
|
||||
)
|
||||
|
||||
const (
|
||||
PrometheusDefaultRetentionTime = 24 * time.Hour
|
||||
UsageGaugeDefaultPeriod = 10 * time.Minute
|
||||
MaximumGaugeCardinalityDefault = 500
|
||||
)
|
||||
|
||||
// Telemetry is the telemetry configuration for the server
|
||||
type Telemetry struct {
|
||||
StatsiteAddr string `hcl:"statsite_address"`
|
||||
StatsdAddr string `hcl:"statsd_address"`
|
||||
|
||||
DisableHostname bool `hcl:"disable_hostname"`
|
||||
EnableHostnameLabel bool `hcl:"enable_hostname_label"`
|
||||
MetricsPrefix string `hcl:"metrics_prefix"`
|
||||
UsageGaugePeriod time.Duration
|
||||
UsageGaugePeriodRaw interface{} `hcl:"usage_gauge_period"`
|
||||
|
||||
MaximumGaugeCardinality int `hcl:"maximum_gauge_cardinality"`
|
||||
|
||||
// Circonus: see https://github.com/circonus-labs/circonus-gometrics
|
||||
// for more details on the various configuration options.
|
||||
// Valid configuration combinations:
|
||||
// - CirconusAPIToken
|
||||
// metric management enabled (search for existing check or create a new one)
|
||||
// - CirconusSubmissionUrl
|
||||
// metric management disabled (use check with specified submission_url,
|
||||
// broker must be using a public SSL certificate)
|
||||
// - CirconusAPIToken + CirconusCheckSubmissionURL
|
||||
// metric management enabled (use check with specified submission_url)
|
||||
// - CirconusAPIToken + CirconusCheckID
|
||||
// metric management enabled (use check with specified id)
|
||||
|
||||
// CirconusAPIToken is a valid API Token used to create/manage check. If provided,
|
||||
// metric management is enabled.
|
||||
// Default: none
|
||||
CirconusAPIToken string `hcl:"circonus_api_token"`
|
||||
// CirconusAPIApp is an app name associated with API token.
|
||||
// Default: "consul"
|
||||
CirconusAPIApp string `hcl:"circonus_api_app"`
|
||||
// CirconusAPIURL is the base URL to use for contacting the Circonus API.
|
||||
// Default: "https://api.circonus.com/v2"
|
||||
CirconusAPIURL string `hcl:"circonus_api_url"`
|
||||
// CirconusSubmissionInterval is the interval at which metrics are submitted to Circonus.
|
||||
// Default: 10s
|
||||
CirconusSubmissionInterval string `hcl:"circonus_submission_interval"`
|
||||
// CirconusCheckSubmissionURL is the check.config.submission_url field from a
|
||||
// previously created HTTPTRAP check.
|
||||
// Default: none
|
||||
CirconusCheckSubmissionURL string `hcl:"circonus_submission_url"`
|
||||
// CirconusCheckID is the check id (not check bundle id) from a previously created
|
||||
// HTTPTRAP check. The numeric portion of the check._cid field.
|
||||
// Default: none
|
||||
CirconusCheckID string `hcl:"circonus_check_id"`
|
||||
// CirconusCheckForceMetricActivation will force enabling metrics, as they are encountered,
|
||||
// if the metric already exists and is NOT active. If check management is enabled, the default
|
||||
// behavior is to add new metrics as they are encountered. If the metric already exists in the
|
||||
// check, it will *NOT* be activated. This setting overrides that behavior.
|
||||
// Default: "false"
|
||||
CirconusCheckForceMetricActivation string `hcl:"circonus_check_force_metric_activation"`
|
||||
// CirconusCheckInstanceID serves to uniquely identify the metrics coming from this "instance".
|
||||
// It can be used to maintain metric continuity with transient or ephemeral instances as
|
||||
// they move around within an infrastructure.
|
||||
// Default: hostname:app
|
||||
CirconusCheckInstanceID string `hcl:"circonus_check_instance_id"`
|
||||
// CirconusCheckSearchTag is a special tag which, when coupled with the instance id, helps to
|
||||
// narrow down the search results when neither a Submission URL or Check ID is provided.
|
||||
// Default: service:app (e.g. service:consul)
|
||||
CirconusCheckSearchTag string `hcl:"circonus_check_search_tag"`
|
||||
// CirconusCheckTags is a comma separated list of tags to apply to the check. Note that
|
||||
// the value of CirconusCheckSearchTag will always be added to the check.
|
||||
// Default: none
|
||||
CirconusCheckTags string `hcl:"circonus_check_tags"`
|
||||
// CirconusCheckDisplayName is the name for the check which will be displayed in the Circonus UI.
|
||||
// Default: value of CirconusCheckInstanceID
|
||||
CirconusCheckDisplayName string `hcl:"circonus_check_display_name"`
|
||||
// CirconusBrokerID is an explicit broker to use when creating a new check. The numeric portion
|
||||
// of broker._cid. If metric management is enabled and neither a Submission URL nor Check ID
|
||||
// is provided, an attempt will be made to search for an existing check using Instance ID and
|
||||
// Search Tag. If one is not found, a new HTTPTRAP check will be created.
|
||||
// Default: use Select Tag if provided, otherwise, a random Enterprise Broker associated
|
||||
// with the specified API token or the default Circonus Broker.
|
||||
// Default: none
|
||||
CirconusBrokerID string `hcl:"circonus_broker_id"`
|
||||
// CirconusBrokerSelectTag is a special tag which will be used to select a broker when
|
||||
// a Broker ID is not provided. The best use of this is to as a hint for which broker
|
||||
// should be used based on *where* this particular instance is running.
|
||||
// (e.g. a specific geo location or datacenter, dc:sfo)
|
||||
// Default: none
|
||||
CirconusBrokerSelectTag string `hcl:"circonus_broker_select_tag"`
|
||||
|
||||
// Dogstats:
|
||||
// DogStatsdAddr is the address of a dogstatsd instance. If provided,
|
||||
// metrics will be sent to that instance
|
||||
DogStatsDAddr string `hcl:"dogstatsd_addr"`
|
||||
|
||||
// DogStatsdTags are the global tags that should be sent with each packet to dogstatsd
|
||||
// It is a list of strings, where each string looks like "my_tag_name:my_tag_value"
|
||||
DogStatsDTags []string `hcl:"dogstatsd_tags"`
|
||||
|
||||
// Prometheus:
|
||||
// PrometheusRetentionTime is the retention time for prometheus metrics if greater than 0.
|
||||
// Default: 24h
|
||||
PrometheusRetentionTime time.Duration `hcl:"-"`
|
||||
PrometheusRetentionTimeRaw interface{} `hcl:"prometheus_retention_time"`
|
||||
|
||||
// Stackdriver:
|
||||
// StackdriverProjectID is the project to publish stackdriver metrics to.
|
||||
StackdriverProjectID string `hcl:"stackdriver_project_id"`
|
||||
// StackdriverLocation is the GCP or AWS region of the monitored resource.
|
||||
StackdriverLocation string `hcl:"stackdriver_location"`
|
||||
// StackdriverNamespace is the namespace identifier, such as a cluster name.
|
||||
StackdriverNamespace string `hcl:"stackdriver_namespace"`
|
||||
// StackdriverDebugLogs will write additional stackdriver related debug logs to stderr.
|
||||
StackdriverDebugLogs bool `hcl:"stackdriver_debug_logs"`
|
||||
}
|
||||
|
||||
func (t *Telemetry) GoString() string {
|
||||
return fmt.Sprintf("*%#v", *t)
|
||||
}
|
||||
|
||||
func parseTelemetry(result *SharedConfig, list *ast.ObjectList) error {
|
||||
if len(list.Items) > 1 {
|
||||
return fmt.Errorf("only one 'telemetry' block is permitted")
|
||||
}
|
||||
|
||||
// Get our one item
|
||||
item := list.Items[0]
|
||||
|
||||
var t Telemetry
|
||||
if err := hcl.DecodeObject(&t, item.Val); err != nil {
|
||||
return multierror.Prefix(err, "telemetry:")
|
||||
}
|
||||
|
||||
if result.Telemetry == nil {
|
||||
result.Telemetry = &Telemetry{}
|
||||
}
|
||||
|
||||
if err := hcl.DecodeObject(&result.Telemetry, item.Val); err != nil {
|
||||
return multierror.Prefix(err, "telemetry:")
|
||||
}
|
||||
|
||||
if result.Telemetry.PrometheusRetentionTimeRaw != nil {
|
||||
var err error
|
||||
if result.Telemetry.PrometheusRetentionTime, err = parseutil.ParseDurationSecond(result.Telemetry.PrometheusRetentionTimeRaw); err != nil {
|
||||
return err
|
||||
}
|
||||
result.Telemetry.PrometheusRetentionTimeRaw = nil
|
||||
} else {
|
||||
result.Telemetry.PrometheusRetentionTime = PrometheusDefaultRetentionTime
|
||||
}
|
||||
|
||||
if result.Telemetry.UsageGaugePeriodRaw != nil {
|
||||
if result.Telemetry.UsageGaugePeriodRaw == "none" {
|
||||
result.Telemetry.UsageGaugePeriod = 0
|
||||
} else {
|
||||
var err error
|
||||
if result.Telemetry.UsageGaugePeriod, err = parseutil.ParseDurationSecond(result.Telemetry.UsageGaugePeriodRaw); err != nil {
|
||||
return err
|
||||
}
|
||||
result.Telemetry.UsageGaugePeriodRaw = nil
|
||||
}
|
||||
} else {
|
||||
result.Telemetry.UsageGaugePeriod = UsageGaugeDefaultPeriod
|
||||
}
|
||||
|
||||
if result.Telemetry.MaximumGaugeCardinality == 0 {
|
||||
result.Telemetry.MaximumGaugeCardinality = MaximumGaugeCardinalityDefault
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
type SetupTelemetryOpts struct {
|
||||
Config *Telemetry
|
||||
Ui cli.Ui
|
||||
ServiceName string
|
||||
DisplayName string
|
||||
UserAgent string
|
||||
ClusterName string
|
||||
}
|
||||
|
||||
// SetupTelemetry is used to setup the telemetry sub-systems and returns the
|
||||
// in-memory sink to be used in http configuration
|
||||
func SetupTelemetry(opts *SetupTelemetryOpts) (*metrics.InmemSink, *metricsutil.ClusterMetricSink, bool, error) {
|
||||
if opts == nil {
|
||||
return nil, nil, false, errors.New("nil opts passed into SetupTelemetry")
|
||||
}
|
||||
|
||||
if opts.Config == nil {
|
||||
opts.Config = &Telemetry{}
|
||||
}
|
||||
|
||||
/* Setup telemetry
|
||||
Aggregate on 10 second intervals for 1 minute. Expose the
|
||||
metrics over stderr when there is a SIGUSR1 received.
|
||||
*/
|
||||
inm := metrics.NewInmemSink(10*time.Second, time.Minute)
|
||||
metrics.DefaultInmemSignal(inm)
|
||||
|
||||
if opts.Config.MetricsPrefix != "" {
|
||||
opts.ServiceName = opts.Config.MetricsPrefix
|
||||
}
|
||||
|
||||
metricsConf := metrics.DefaultConfig(opts.ServiceName)
|
||||
metricsConf.EnableHostname = !opts.Config.DisableHostname
|
||||
metricsConf.EnableHostnameLabel = opts.Config.EnableHostnameLabel
|
||||
|
||||
// Configure the statsite sink
|
||||
var fanout metrics.FanoutSink
|
||||
var prometheusEnabled bool
|
||||
|
||||
// Configure the Prometheus sink
|
||||
if opts.Config.PrometheusRetentionTime != 0 {
|
||||
prometheusEnabled = true
|
||||
prometheusOpts := prometheus.PrometheusOpts{
|
||||
Expiration: opts.Config.PrometheusRetentionTime,
|
||||
}
|
||||
|
||||
sink, err := prometheus.NewPrometheusSinkFrom(prometheusOpts)
|
||||
if err != nil {
|
||||
return nil, nil, false, err
|
||||
}
|
||||
fanout = append(fanout, sink)
|
||||
}
|
||||
|
||||
if opts.Config.StatsiteAddr != "" {
|
||||
sink, err := metrics.NewStatsiteSink(opts.Config.StatsiteAddr)
|
||||
if err != nil {
|
||||
return nil, nil, false, err
|
||||
}
|
||||
fanout = append(fanout, sink)
|
||||
}
|
||||
|
||||
// Configure the statsd sink
|
||||
if opts.Config.StatsdAddr != "" {
|
||||
sink, err := metrics.NewStatsdSink(opts.Config.StatsdAddr)
|
||||
if err != nil {
|
||||
return nil, nil, false, err
|
||||
}
|
||||
fanout = append(fanout, sink)
|
||||
}
|
||||
|
||||
// Configure the Circonus sink
|
||||
if opts.Config.CirconusAPIToken != "" || opts.Config.CirconusCheckSubmissionURL != "" {
|
||||
cfg := &circonus.Config{}
|
||||
cfg.Interval = opts.Config.CirconusSubmissionInterval
|
||||
cfg.CheckManager.API.TokenKey = opts.Config.CirconusAPIToken
|
||||
cfg.CheckManager.API.TokenApp = opts.Config.CirconusAPIApp
|
||||
cfg.CheckManager.API.URL = opts.Config.CirconusAPIURL
|
||||
cfg.CheckManager.Check.SubmissionURL = opts.Config.CirconusCheckSubmissionURL
|
||||
cfg.CheckManager.Check.ID = opts.Config.CirconusCheckID
|
||||
cfg.CheckManager.Check.ForceMetricActivation = opts.Config.CirconusCheckForceMetricActivation
|
||||
cfg.CheckManager.Check.InstanceID = opts.Config.CirconusCheckInstanceID
|
||||
cfg.CheckManager.Check.SearchTag = opts.Config.CirconusCheckSearchTag
|
||||
cfg.CheckManager.Check.DisplayName = opts.Config.CirconusCheckDisplayName
|
||||
cfg.CheckManager.Check.Tags = opts.Config.CirconusCheckTags
|
||||
cfg.CheckManager.Broker.ID = opts.Config.CirconusBrokerID
|
||||
cfg.CheckManager.Broker.SelectTag = opts.Config.CirconusBrokerSelectTag
|
||||
|
||||
if cfg.CheckManager.API.TokenApp == "" {
|
||||
cfg.CheckManager.API.TokenApp = opts.ServiceName
|
||||
}
|
||||
|
||||
if cfg.CheckManager.Check.DisplayName == "" {
|
||||
cfg.CheckManager.Check.DisplayName = opts.DisplayName
|
||||
}
|
||||
|
||||
if cfg.CheckManager.Check.SearchTag == "" {
|
||||
cfg.CheckManager.Check.SearchTag = fmt.Sprintf("service:%s", opts.ServiceName)
|
||||
}
|
||||
|
||||
sink, err := circonus.NewCirconusSink(cfg)
|
||||
if err != nil {
|
||||
return nil, nil, false, err
|
||||
}
|
||||
sink.Start()
|
||||
fanout = append(fanout, sink)
|
||||
}
|
||||
|
||||
if opts.Config.DogStatsDAddr != "" {
|
||||
var tags []string
|
||||
|
||||
if opts.Config.DogStatsDTags != nil {
|
||||
tags = opts.Config.DogStatsDTags
|
||||
}
|
||||
|
||||
sink, err := datadog.NewDogStatsdSink(opts.Config.DogStatsDAddr, metricsConf.HostName)
|
||||
if err != nil {
|
||||
return nil, nil, false, errwrap.Wrapf("failed to start DogStatsD sink: {{err}}", err)
|
||||
}
|
||||
sink.SetTags(tags)
|
||||
fanout = append(fanout, sink)
|
||||
}
|
||||
|
||||
// Configure the stackdriver sink
|
||||
if opts.Config.StackdriverProjectID != "" {
|
||||
client, err := monitoring.NewMetricClient(context.Background(), option.WithUserAgent(opts.UserAgent))
|
||||
if err != nil {
|
||||
return nil, nil, false, fmt.Errorf("Failed to create stackdriver client: %v", err)
|
||||
}
|
||||
sink := stackdriver.NewSink(client, &stackdriver.Config{
|
||||
LabelExtractor: stackdrivervault.Extractor,
|
||||
Bucketer: stackdrivervault.Bucketer,
|
||||
ProjectID: opts.Config.StackdriverProjectID,
|
||||
Location: opts.Config.StackdriverLocation,
|
||||
Namespace: opts.Config.StackdriverNamespace,
|
||||
DebugLogs: opts.Config.StackdriverDebugLogs,
|
||||
})
|
||||
fanout = append(fanout, sink)
|
||||
}
|
||||
|
||||
// Initialize the global sink
|
||||
if len(fanout) > 1 {
|
||||
// Hostname enabled will create poor quality metrics name for prometheus
|
||||
if !opts.Config.DisableHostname {
|
||||
opts.Ui.Warn("telemetry.disable_hostname has been set to false. Recommended setting is true for Prometheus to avoid poorly named metrics.")
|
||||
}
|
||||
} else {
|
||||
metricsConf.EnableHostname = false
|
||||
}
|
||||
fanout = append(fanout, inm)
|
||||
globalMetrics, err := metrics.NewGlobal(metricsConf, fanout)
|
||||
|
||||
if err != nil {
|
||||
return nil, nil, false, err
|
||||
}
|
||||
|
||||
// Intialize a wrapper around the global sink; this will be passed to Core
|
||||
// and to any backend.
|
||||
wrapper := metricsutil.NewClusterMetricSink(opts.ClusterName, globalMetrics)
|
||||
wrapper.MaxGaugeCardinality = opts.Config.MaximumGaugeCardinality
|
||||
wrapper.GaugeInterval = opts.Config.UsageGaugePeriod
|
||||
|
||||
return inm, wrapper, prometheusEnabled, nil
|
||||
}
|
||||
+43
@@ -0,0 +1,43 @@
|
||||
package gatedwriter
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"io"
|
||||
"sync"
|
||||
)
|
||||
|
||||
// Writer is an io.Writer implementation that buffers all of its
|
||||
// data into an internal buffer until it is told to let data through.
|
||||
type Writer struct {
|
||||
writer io.Writer
|
||||
|
||||
buf bytes.Buffer
|
||||
flush bool
|
||||
lock sync.Mutex
|
||||
}
|
||||
|
||||
func NewWriter(underlying io.Writer) *Writer {
|
||||
return &Writer{writer: underlying}
|
||||
}
|
||||
|
||||
// Flush tells the Writer to flush any buffered data and to stop
|
||||
// buffering.
|
||||
func (w *Writer) Flush() error {
|
||||
w.lock.Lock()
|
||||
defer w.lock.Unlock()
|
||||
|
||||
w.flush = true
|
||||
_, err := w.buf.WriteTo(w.writer)
|
||||
return err
|
||||
}
|
||||
|
||||
func (w *Writer) Write(p []byte) (n int, err error) {
|
||||
w.lock.Lock()
|
||||
defer w.lock.Unlock()
|
||||
|
||||
if w.flush {
|
||||
return w.writer.Write(p)
|
||||
}
|
||||
|
||||
return w.buf.Write(p)
|
||||
}
|
||||
+233
@@ -0,0 +1,233 @@
|
||||
package listenerutil
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"net"
|
||||
"os"
|
||||
osuser "os/user"
|
||||
"strconv"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
"github.com/hashicorp/shared-secure-libs/configutil"
|
||||
"github.com/hashicorp/shared-secure-libs/reloadutil"
|
||||
"github.com/hashicorp/vault/sdk/helper/tlsutil"
|
||||
"github.com/jefferai/isbadcipher"
|
||||
"github.com/mitchellh/cli"
|
||||
)
|
||||
|
||||
type Listener struct {
|
||||
net.Listener
|
||||
Config *configutil.Listener
|
||||
}
|
||||
|
||||
type UnixSocketsConfig struct {
|
||||
User string `hcl:"user"`
|
||||
Mode string `hcl:"mode"`
|
||||
Group string `hcl:"group"`
|
||||
}
|
||||
|
||||
// rmListener is an implementation of net.Listener that forwards most
|
||||
// calls to the listener but also removes a file as part of the close. We
|
||||
// use this to cleanup the unix domain socket on close.
|
||||
type rmListener struct {
|
||||
net.Listener
|
||||
Path string
|
||||
}
|
||||
|
||||
func (l *rmListener) Close() error {
|
||||
// Close the listener itself
|
||||
if err := l.Listener.Close(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Remove the file
|
||||
return os.Remove(l.Path)
|
||||
}
|
||||
|
||||
func UnixSocketListener(path string, unixSocketsConfig *UnixSocketsConfig) (net.Listener, error) {
|
||||
if err := os.Remove(path); err != nil && !os.IsNotExist(err) {
|
||||
return nil, fmt.Errorf("failed to remove socket file: %v", err)
|
||||
}
|
||||
|
||||
ln, err := net.Listen("unix", path)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if unixSocketsConfig != nil {
|
||||
err = setFilePermissions(path, unixSocketsConfig.User, unixSocketsConfig.Group, unixSocketsConfig.Mode)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("failed to set file system permissions on the socket file: %s", err)
|
||||
}
|
||||
}
|
||||
|
||||
// Wrap the listener in rmListener so that the Unix domain socket file is
|
||||
// removed on close.
|
||||
return &rmListener{
|
||||
Listener: ln,
|
||||
Path: path,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func TLSConfig(
|
||||
l *configutil.Listener,
|
||||
props map[string]string,
|
||||
ui cli.Ui) (*tls.Config, reloadutil.ReloadFunc, error) {
|
||||
props["tls"] = "disabled"
|
||||
|
||||
if l.TLSDisable {
|
||||
return nil, nil, nil
|
||||
}
|
||||
|
||||
cg := reloadutil.NewCertificateGetter(l.TLSCertFile, l.TLSKeyFile, "")
|
||||
if err := cg.Reload(); err != nil {
|
||||
// We try the key without a passphrase first and if we get an incorrect
|
||||
// passphrase response, try again after prompting for a passphrase
|
||||
if errwrap.Contains(err, x509.IncorrectPasswordError.Error()) {
|
||||
var passphrase string
|
||||
passphrase, err = ui.AskSecret(fmt.Sprintf("Enter passphrase for %s:", l.TLSKeyFile))
|
||||
if err == nil {
|
||||
cg = reloadutil.NewCertificateGetter(l.TLSCertFile, l.TLSKeyFile, passphrase)
|
||||
if err = cg.Reload(); err == nil {
|
||||
goto PASSPHRASECORRECT
|
||||
}
|
||||
}
|
||||
}
|
||||
return nil, nil, errwrap.Wrapf("error loading TLS cert: {{err}}", err)
|
||||
}
|
||||
|
||||
PASSPHRASECORRECT:
|
||||
tlsConf := &tls.Config{
|
||||
GetCertificate: cg.GetCertificate,
|
||||
NextProtos: []string{"h2", "http/1.1"},
|
||||
ClientAuth: tls.RequestClientCert,
|
||||
PreferServerCipherSuites: l.TLSPreferServerCipherSuites,
|
||||
}
|
||||
|
||||
if l.TLSMinVersion == "" {
|
||||
l.TLSMinVersion = "tls12"
|
||||
}
|
||||
|
||||
var ok bool
|
||||
tlsConf.MinVersion, ok = tlsutil.TLSLookup[l.TLSMinVersion]
|
||||
if !ok {
|
||||
return nil, nil, fmt.Errorf("'tls_min_version' value %q not supported, please specify one of [tls10,tls11,tls12,tls13]", l.TLSMinVersion)
|
||||
}
|
||||
|
||||
if len(l.TLSCipherSuites) > 0 {
|
||||
// HTTP/2 with TLS 1.2 blacklists several cipher suites.
|
||||
// https://tools.ietf.org/html/rfc7540#appendix-A
|
||||
//
|
||||
// Since the CLI (net/http) automatically uses HTTP/2 with TLS 1.2,
|
||||
// we check here if all or some specified cipher suites are blacklisted.
|
||||
badCiphers := []string{}
|
||||
for _, cipher := range l.TLSCipherSuites {
|
||||
if isbadcipher.IsBadCipher(cipher) {
|
||||
// Get the name of the current cipher.
|
||||
cipherStr, err := tlsutil.GetCipherName(cipher)
|
||||
if err != nil {
|
||||
return nil, nil, errwrap.Wrapf("invalid value for 'tls_cipher_suites': {{err}}", err)
|
||||
}
|
||||
badCiphers = append(badCiphers, cipherStr)
|
||||
}
|
||||
}
|
||||
if len(badCiphers) == len(l.TLSCipherSuites) {
|
||||
ui.Warn(`WARNING! All cipher suites defined by 'tls_cipher_suites' are blacklisted by the
|
||||
HTTP/2 specification. HTTP/2 communication with TLS 1.2 will not work as intended
|
||||
and Vault will be unavailable via the CLI.
|
||||
Please see https://tools.ietf.org/html/rfc7540#appendix-A for further information.`)
|
||||
} else if len(badCiphers) > 0 {
|
||||
ui.Warn(fmt.Sprintf(`WARNING! The following cipher suites defined by 'tls_cipher_suites' are
|
||||
blacklisted by the HTTP/2 specification:
|
||||
%v
|
||||
Please see https://tools.ietf.org/html/rfc7540#appendix-A for further information.`, badCiphers))
|
||||
}
|
||||
tlsConf.CipherSuites = l.TLSCipherSuites
|
||||
}
|
||||
|
||||
if l.TLSRequireAndVerifyClientCert {
|
||||
tlsConf.ClientAuth = tls.RequireAndVerifyClientCert
|
||||
if l.TLSClientCAFile != "" {
|
||||
caPool := x509.NewCertPool()
|
||||
data, err := ioutil.ReadFile(l.TLSClientCAFile)
|
||||
if err != nil {
|
||||
return nil, nil, errwrap.Wrapf("failed to read tls_client_ca_file: {{err}}", err)
|
||||
}
|
||||
|
||||
if !caPool.AppendCertsFromPEM(data) {
|
||||
return nil, nil, fmt.Errorf("failed to parse CA certificate in tls_client_ca_file")
|
||||
}
|
||||
tlsConf.ClientCAs = caPool
|
||||
}
|
||||
}
|
||||
|
||||
if l.TLSDisableClientCerts {
|
||||
if l.TLSRequireAndVerifyClientCert {
|
||||
return nil, nil, fmt.Errorf("'tls_disable_client_certs' and 'tls_require_and_verify_client_cert' are mutually exclusive")
|
||||
}
|
||||
tlsConf.ClientAuth = tls.NoClientCert
|
||||
}
|
||||
|
||||
props["tls"] = "enabled"
|
||||
return tlsConf, cg.Reload, nil
|
||||
}
|
||||
|
||||
// setFilePermissions handles configuring ownership and permissions
|
||||
// settings on a given file. All permission/ownership settings are
|
||||
// optional. If no user or group is specified, the current user/group
|
||||
// will be used. Mode is optional, and has no default (the operation is
|
||||
// not performed if absent). User may be specified by name or ID, but
|
||||
// group may only be specified by ID.
|
||||
func setFilePermissions(path string, user, group, mode string) error {
|
||||
var err error
|
||||
uid, gid := os.Getuid(), os.Getgid()
|
||||
|
||||
if user != "" {
|
||||
if uid, err = strconv.Atoi(user); err == nil {
|
||||
goto GROUP
|
||||
}
|
||||
|
||||
// Try looking up the user by name
|
||||
u, err := osuser.Lookup(user)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to look up user %q: %v", user, err)
|
||||
}
|
||||
uid, _ = strconv.Atoi(u.Uid)
|
||||
}
|
||||
|
||||
GROUP:
|
||||
if group != "" {
|
||||
if gid, err = strconv.Atoi(group); err == nil {
|
||||
goto OWN
|
||||
}
|
||||
|
||||
// Try looking up the user by name
|
||||
g, err := osuser.LookupGroup(group)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to look up group %q: %v", user, err)
|
||||
}
|
||||
gid, _ = strconv.Atoi(g.Gid)
|
||||
}
|
||||
|
||||
OWN:
|
||||
if err := os.Chown(path, uid, gid); err != nil {
|
||||
return fmt.Errorf("failed setting ownership to %d:%d on %q: %v",
|
||||
uid, gid, path, err)
|
||||
}
|
||||
|
||||
if mode != "" {
|
||||
mode, err := strconv.ParseUint(mode, 8, 32)
|
||||
if err != nil {
|
||||
return fmt.Errorf("invalid mode specified: %v", mode)
|
||||
}
|
||||
if err := os.Chmod(path, os.FileMode(mode)); err != nil {
|
||||
return fmt.Errorf("failed setting permissions to %d on %q: %v",
|
||||
mode, path, err)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
+39
@@ -0,0 +1,39 @@
|
||||
package metricsutil
|
||||
|
||||
import (
|
||||
"sort"
|
||||
"time"
|
||||
)
|
||||
|
||||
var bucketBoundaries = []struct {
|
||||
Value time.Duration
|
||||
Label string
|
||||
}{
|
||||
{1 * time.Minute, "1m"},
|
||||
{10 * time.Minute, "10m"},
|
||||
{20 * time.Minute, "20m"},
|
||||
{1 * time.Hour, "1h"},
|
||||
{2 * time.Hour, "2h"},
|
||||
{24 * time.Hour, "1d"},
|
||||
{2 * 24 * time.Hour, "2d"},
|
||||
{7 * 24 * time.Hour, "7d"},
|
||||
{30 * 24 * time.Hour, "30d"},
|
||||
}
|
||||
|
||||
const OverflowBucket = "+Inf"
|
||||
|
||||
// TTLBucket computes the label to apply for a token TTL.
|
||||
func TTLBucket(ttl time.Duration) string {
|
||||
upperBound := sort.Search(
|
||||
len(bucketBoundaries),
|
||||
func(i int) bool {
|
||||
return ttl <= bucketBoundaries[i].Value
|
||||
},
|
||||
)
|
||||
if upperBound >= len(bucketBoundaries) {
|
||||
return OverflowBucket
|
||||
} else {
|
||||
return bucketBoundaries[upperBound].Label
|
||||
}
|
||||
|
||||
}
|
||||
+257
@@ -0,0 +1,257 @@
|
||||
package metricsutil
|
||||
|
||||
import (
|
||||
"context"
|
||||
"math/rand"
|
||||
"sort"
|
||||
"time"
|
||||
|
||||
log "github.com/hashicorp/go-hclog"
|
||||
)
|
||||
|
||||
// This interface allows unit tests to substitute in a simulated clock.
|
||||
type clock interface {
|
||||
Now() time.Time
|
||||
NewTicker(time.Duration) *time.Ticker
|
||||
}
|
||||
|
||||
type defaultClock struct {
|
||||
}
|
||||
|
||||
func (_ defaultClock) Now() time.Time {
|
||||
return time.Now()
|
||||
}
|
||||
|
||||
func (_ defaultClock) NewTicker(d time.Duration) *time.Ticker {
|
||||
return time.NewTicker(d)
|
||||
}
|
||||
|
||||
// GaugeLabelValues is one gauge in a set sharing a single key, that
|
||||
// are measured in a batch.
|
||||
type GaugeLabelValues struct {
|
||||
Labels []Label
|
||||
Value float32
|
||||
}
|
||||
|
||||
// GaugeCollector is a callback function that returns an unfiltered
|
||||
// set of label-value pairs. It may be cancelled if it takes too long.
|
||||
type GaugeCollector = func(context.Context) ([]GaugeLabelValues, error)
|
||||
|
||||
// collectionBound is a hard limit on how long a collection process
|
||||
// may take, as a fraction of the current interval.
|
||||
const collectionBound = 0.02
|
||||
|
||||
// collectionTarget is a soft limit; if exceeded, the collection interval
|
||||
// will be doubled.
|
||||
const collectionTarget = 0.01
|
||||
|
||||
// A GaugeCollectionProcess is responsible for one particular gauge metric.
|
||||
// It handles a delay on initial startup; limiting the cardinality; and
|
||||
// exponential backoff on the requested interval.
|
||||
type GaugeCollectionProcess struct {
|
||||
stop chan struct{}
|
||||
stopped chan struct{}
|
||||
|
||||
// gauge name
|
||||
key []string
|
||||
// labels to use when reporting
|
||||
labels []Label
|
||||
|
||||
// callback function
|
||||
collector GaugeCollector
|
||||
|
||||
// destination for metrics
|
||||
sink *ClusterMetricSink
|
||||
logger log.Logger
|
||||
|
||||
// time between collections
|
||||
originalInterval time.Duration
|
||||
currentInterval time.Duration
|
||||
ticker *time.Ticker
|
||||
|
||||
// time source
|
||||
clock clock
|
||||
}
|
||||
|
||||
// NewGaugeCollectionProcess creates a new collection process for the callback
|
||||
// function given as an argument, and starts it running.
|
||||
// A label should be provided for metrics *about* this collection process.
|
||||
//
|
||||
// The Run() method must be called to start the process.
|
||||
func (m *ClusterMetricSink) NewGaugeCollectionProcess(
|
||||
key []string,
|
||||
id []Label,
|
||||
collector GaugeCollector,
|
||||
logger log.Logger,
|
||||
) (*GaugeCollectionProcess, error) {
|
||||
return m.newGaugeCollectionProcessWithClock(
|
||||
key,
|
||||
id,
|
||||
collector,
|
||||
logger,
|
||||
defaultClock{},
|
||||
)
|
||||
}
|
||||
|
||||
// test version allows an alternative clock implementation
|
||||
func (m *ClusterMetricSink) newGaugeCollectionProcessWithClock(
|
||||
key []string,
|
||||
id []Label,
|
||||
collector GaugeCollector,
|
||||
logger log.Logger,
|
||||
clock clock,
|
||||
) (*GaugeCollectionProcess, error) {
|
||||
process := &GaugeCollectionProcess{
|
||||
stop: make(chan struct{}, 1),
|
||||
stopped: make(chan struct{}, 1),
|
||||
key: key,
|
||||
labels: id,
|
||||
collector: collector,
|
||||
sink: m,
|
||||
originalInterval: m.GaugeInterval,
|
||||
currentInterval: m.GaugeInterval,
|
||||
logger: logger,
|
||||
clock: clock,
|
||||
}
|
||||
return process, nil
|
||||
}
|
||||
|
||||
// delayStart randomly delays by up to one extra interval
|
||||
// so that collection processes do not all run at the time time.
|
||||
// If we knew all the procsses in advance, we could just schedule them
|
||||
// evenly, but a new one could be added per secret engine.
|
||||
func (p *GaugeCollectionProcess) delayStart() bool {
|
||||
randomDelay := time.Duration(rand.Int63n(int64(p.currentInterval)))
|
||||
// A Timer might be better, but then we'd have to simulate
|
||||
// one of those too?
|
||||
delayTick := p.clock.NewTicker(randomDelay)
|
||||
defer delayTick.Stop()
|
||||
|
||||
select {
|
||||
case <-p.stop:
|
||||
return true
|
||||
case <-delayTick.C:
|
||||
break
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// resetTicker stops the old ticker and starts a new one at the current
|
||||
// interval setting.
|
||||
func (p *GaugeCollectionProcess) resetTicker() {
|
||||
if p.ticker != nil {
|
||||
p.ticker.Stop()
|
||||
}
|
||||
p.ticker = p.clock.NewTicker(p.currentInterval)
|
||||
}
|
||||
|
||||
// collectAndFilterGauges executes the callback function,
|
||||
// limits the cardinality, and streams the results to the metrics sink.
|
||||
func (p *GaugeCollectionProcess) collectAndFilterGauges() {
|
||||
// Run for only an allotted amount of time.
|
||||
timeout := time.Duration(collectionBound * float64(p.currentInterval))
|
||||
ctx, cancel := context.WithTimeout(context.Background(),
|
||||
timeout)
|
||||
defer cancel()
|
||||
|
||||
p.sink.AddDurationWithLabels([]string{"metrics", "collection", "interval"},
|
||||
p.currentInterval,
|
||||
p.labels)
|
||||
|
||||
start := p.clock.Now()
|
||||
values, err := p.collector(ctx)
|
||||
end := p.clock.Now()
|
||||
duration := end.Sub(start)
|
||||
|
||||
// Report how long it took to perform the operation.
|
||||
p.sink.AddDurationWithLabels([]string{"metrics", "collection"},
|
||||
duration,
|
||||
p.labels)
|
||||
|
||||
// If over threshold, back off by doubling the measurement interval.
|
||||
// Currently a restart is the only way to bring it back down.
|
||||
threshold := time.Duration(collectionTarget * float64(p.currentInterval))
|
||||
if duration > threshold {
|
||||
p.logger.Warn("gauge collection time exceeded target", "target", threshold, "actual", duration, "id", p.labels)
|
||||
p.currentInterval *= 2
|
||||
p.resetTicker()
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
p.logger.Error("error collecting gauge", "id", p.labels, "error", err)
|
||||
p.sink.IncrCounterWithLabels([]string{"metrics", "collection", "error"},
|
||||
1,
|
||||
p.labels)
|
||||
return
|
||||
}
|
||||
|
||||
// Filter to top N.
|
||||
// This does not guarantee total cardinality is <= N, but it does slow things down
|
||||
// a little if the cardinality *is* too high and the gauge needs to be disabled.
|
||||
if len(values) > p.sink.MaxGaugeCardinality {
|
||||
sort.Slice(values, func(a, b int) bool {
|
||||
return values[a].Value > values[b].Value
|
||||
})
|
||||
values = values[:p.sink.MaxGaugeCardinality]
|
||||
}
|
||||
|
||||
p.streamGaugesToSink(values)
|
||||
}
|
||||
|
||||
func (p *GaugeCollectionProcess) streamGaugesToSink(values []GaugeLabelValues) {
|
||||
// Dumping 500 metrics in one big chunk is somewhat unfriendly to UDP-based
|
||||
// transport, and to the rest of the metrics trying to get through.
|
||||
// Let's smooth things out over the course of a second.
|
||||
// 1 second / 500 = 2 ms each, so we can send 25 per 50 milliseconds.
|
||||
// That should be one or two packets.
|
||||
sendTick := p.clock.NewTicker(50 * time.Millisecond)
|
||||
batchSize := 25
|
||||
for i, lv := range values {
|
||||
if i > 0 && i%batchSize == 0 {
|
||||
select {
|
||||
case <-p.stop:
|
||||
// because the channel is closed,
|
||||
// the main loop will successfully
|
||||
// read from p.stop too, and exit.
|
||||
return
|
||||
case <-sendTick.C:
|
||||
break
|
||||
}
|
||||
|
||||
}
|
||||
p.sink.SetGaugeWithLabels(p.key, lv.Value, lv.Labels)
|
||||
}
|
||||
sendTick.Stop()
|
||||
}
|
||||
|
||||
// Run should be called as a goroutine.
|
||||
func (p *GaugeCollectionProcess) Run() {
|
||||
defer close(p.stopped)
|
||||
|
||||
// Wait a random amount of time
|
||||
stopReceived := p.delayStart()
|
||||
if stopReceived {
|
||||
return
|
||||
}
|
||||
|
||||
// Create a ticker to start each cycle
|
||||
p.resetTicker()
|
||||
|
||||
// Loop until we get a signal to stop
|
||||
for {
|
||||
select {
|
||||
case <-p.ticker.C:
|
||||
p.collectAndFilterGauges()
|
||||
case <-p.stop:
|
||||
// Can't use defer because this might
|
||||
// not be the original ticker.
|
||||
p.ticker.Stop()
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Stop the collection process
|
||||
func (p *GaugeCollectionProcess) Stop() {
|
||||
close(p.stop)
|
||||
}
|
||||
+131
@@ -0,0 +1,131 @@
|
||||
package metricsutil
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"strings"
|
||||
|
||||
"github.com/armon/go-metrics"
|
||||
"github.com/hashicorp/vault/sdk/logical"
|
||||
"github.com/prometheus/client_golang/prometheus"
|
||||
"github.com/prometheus/common/expfmt"
|
||||
)
|
||||
|
||||
const (
|
||||
OpenMetricsMIMEType = "application/openmetrics-text"
|
||||
|
||||
PrometheusSchemaMIMEType = "prometheus/telemetry"
|
||||
|
||||
// ErrorContentType is the content type returned by an error response.
|
||||
ErrorContentType = "text/plain"
|
||||
)
|
||||
|
||||
const (
|
||||
PrometheusMetricFormat = "prometheus"
|
||||
)
|
||||
|
||||
type MetricsHelper struct {
|
||||
inMemSink *metrics.InmemSink
|
||||
PrometheusEnabled bool
|
||||
}
|
||||
|
||||
func NewMetricsHelper(inMem *metrics.InmemSink, enablePrometheus bool) *MetricsHelper {
|
||||
return &MetricsHelper{inMem, enablePrometheus}
|
||||
}
|
||||
|
||||
func FormatFromRequest(req *logical.Request) string {
|
||||
acceptHeaders := req.Headers["Accept"]
|
||||
if len(acceptHeaders) > 0 {
|
||||
acceptHeader := acceptHeaders[0]
|
||||
if strings.HasPrefix(acceptHeader, OpenMetricsMIMEType) {
|
||||
return PrometheusMetricFormat
|
||||
}
|
||||
|
||||
// Look for prometheus accept header
|
||||
for _, header := range acceptHeaders {
|
||||
if strings.Contains(header, PrometheusSchemaMIMEType) {
|
||||
return PrometheusMetricFormat
|
||||
}
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (m *MetricsHelper) ResponseForFormat(format string) *logical.Response {
|
||||
switch format {
|
||||
case PrometheusMetricFormat:
|
||||
return m.PrometheusResponse()
|
||||
case "":
|
||||
return m.GenericResponse()
|
||||
default:
|
||||
return &logical.Response{
|
||||
Data: map[string]interface{}{
|
||||
logical.HTTPContentType: ErrorContentType,
|
||||
logical.HTTPRawBody: fmt.Sprintf("metric response format \"%s\" unknown", format),
|
||||
logical.HTTPStatusCode: http.StatusBadRequest,
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (m *MetricsHelper) PrometheusResponse() *logical.Response {
|
||||
resp := &logical.Response{
|
||||
Data: map[string]interface{}{
|
||||
logical.HTTPContentType: ErrorContentType,
|
||||
logical.HTTPStatusCode: http.StatusBadRequest,
|
||||
},
|
||||
}
|
||||
|
||||
if !m.PrometheusEnabled {
|
||||
resp.Data[logical.HTTPRawBody] = "prometheus is not enabled"
|
||||
return resp
|
||||
}
|
||||
metricsFamilies, err := prometheus.DefaultGatherer.Gather()
|
||||
if err != nil && len(metricsFamilies) == 0 {
|
||||
resp.Data[logical.HTTPRawBody] = fmt.Sprintf("no prometheus metrics could be decoded: %s", err)
|
||||
return resp
|
||||
}
|
||||
|
||||
// Initialize a byte buffer.
|
||||
buf := &bytes.Buffer{}
|
||||
defer buf.Reset()
|
||||
|
||||
e := expfmt.NewEncoder(buf, expfmt.FmtText)
|
||||
for _, mf := range metricsFamilies {
|
||||
err := e.Encode(mf)
|
||||
if err != nil {
|
||||
resp.Data[logical.HTTPRawBody] = fmt.Sprintf("error during the encoding of metrics: %s", err)
|
||||
return resp
|
||||
}
|
||||
}
|
||||
resp.Data[logical.HTTPContentType] = string(expfmt.FmtText)
|
||||
resp.Data[logical.HTTPRawBody] = buf.Bytes()
|
||||
resp.Data[logical.HTTPStatusCode] = http.StatusOK
|
||||
return resp
|
||||
}
|
||||
|
||||
func (m *MetricsHelper) GenericResponse() *logical.Response {
|
||||
resp := &logical.Response{
|
||||
Data: map[string]interface{}{
|
||||
logical.HTTPContentType: ErrorContentType,
|
||||
logical.HTTPStatusCode: http.StatusBadRequest,
|
||||
},
|
||||
}
|
||||
|
||||
summary, err := m.inMemSink.DisplayMetrics(nil, nil)
|
||||
if err != nil {
|
||||
resp.Data[logical.HTTPRawBody] = fmt.Sprintf("error while fetching the in-memory metrics: %s", err)
|
||||
return resp
|
||||
}
|
||||
content, err := json.Marshal(summary)
|
||||
if err != nil {
|
||||
resp.Data[logical.HTTPRawBody] = fmt.Sprintf("error while marshalling the in-memory metrics: %s", err)
|
||||
return resp
|
||||
}
|
||||
resp.Data[logical.HTTPContentType] = "application/json"
|
||||
resp.Data[logical.HTTPRawBody] = content
|
||||
resp.Data[logical.HTTPStatusCode] = http.StatusOK
|
||||
return resp
|
||||
}
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
package metricsutil
|
||||
|
||||
import (
|
||||
"sync/atomic"
|
||||
"time"
|
||||
|
||||
metrics "github.com/armon/go-metrics"
|
||||
)
|
||||
|
||||
// ClusterMetricSink serves as a shim around go-metrics
|
||||
// and inserts a "cluster" label.
|
||||
//
|
||||
// It also provides a mechanism to limit the cardinality of the labels on a gauge
|
||||
// (at each reporting interval, which isn't sufficient if there is variability in which
|
||||
// labels are the top N) and a backoff mechanism for gauge computation.
|
||||
type ClusterMetricSink struct {
|
||||
// ClusterName is either the cluster ID, or a name provided
|
||||
// in the telemetry configuration stanza.
|
||||
//
|
||||
// Because it may be set after the Core is initialized, we need
|
||||
// to protect against concurrent access.
|
||||
ClusterName atomic.Value
|
||||
|
||||
MaxGaugeCardinality int
|
||||
GaugeInterval time.Duration
|
||||
|
||||
// Sink is the go-metrics instance to send to.
|
||||
Sink metrics.MetricSink
|
||||
}
|
||||
|
||||
// Convenience alias
|
||||
type Label = metrics.Label
|
||||
|
||||
func (m *ClusterMetricSink) SetGaugeWithLabels(key []string, val float32, labels []Label) {
|
||||
m.Sink.SetGaugeWithLabels(key, val,
|
||||
append(labels, Label{"cluster", m.ClusterName.Load().(string)}))
|
||||
}
|
||||
|
||||
func (m *ClusterMetricSink) IncrCounterWithLabels(key []string, val float32, labels []Label) {
|
||||
m.Sink.IncrCounterWithLabels(key, val,
|
||||
append(labels, Label{"cluster", m.ClusterName.Load().(string)}))
|
||||
}
|
||||
|
||||
func (m *ClusterMetricSink) AddSampleWithLabels(key []string, val float32, labels []Label) {
|
||||
m.Sink.AddSampleWithLabels(key, val,
|
||||
append(labels, Label{"cluster", m.ClusterName.Load().(string)}))
|
||||
}
|
||||
|
||||
func (m *ClusterMetricSink) AddDurationWithLabels(key []string, d time.Duration, labels []Label) {
|
||||
val := float32(d) / float32(time.Millisecond)
|
||||
m.AddSampleWithLabels(key, val, labels)
|
||||
}
|
||||
|
||||
func (m *ClusterMetricSink) MeasureSinceWithLabels(key []string, start time.Time, labels []Label) {
|
||||
elapsed := time.Now().Sub(start)
|
||||
val := float32(elapsed) / float32(time.Millisecond)
|
||||
m.AddSampleWithLabels(key, val, labels)
|
||||
}
|
||||
|
||||
// BlackholeSink is a default suitable for use in unit tests.
|
||||
func BlackholeSink() *ClusterMetricSink {
|
||||
sink, _ := metrics.New(metrics.DefaultConfig(""),
|
||||
&metrics.BlackholeSink{})
|
||||
cms := &ClusterMetricSink{
|
||||
ClusterName: atomic.Value{},
|
||||
Sink: sink,
|
||||
}
|
||||
cms.ClusterName.Store("")
|
||||
return cms
|
||||
}
|
||||
|
||||
func NewClusterMetricSink(clusterName string, sink metrics.MetricSink) *ClusterMetricSink {
|
||||
cms := &ClusterMetricSink{
|
||||
ClusterName: atomic.Value{},
|
||||
Sink: sink,
|
||||
}
|
||||
cms.ClusterName.Store(clusterName)
|
||||
return cms
|
||||
}
|
||||
|
||||
// SetDefaultClusterName changes the cluster name from its default value,
|
||||
// if it has not previously been configured.
|
||||
func (m *ClusterMetricSink) SetDefaultClusterName(clusterName string) {
|
||||
// This is not a true compare-and-swap, but it should be
|
||||
// consistent enough for normal uses
|
||||
if m.ClusterName.Load().(string) == "" {
|
||||
m.ClusterName.Store(clusterName)
|
||||
}
|
||||
}
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package reloadutil
|
||||
|
||||
import (
|
||||
"crypto/tls"
|
||||
"crypto/x509"
|
||||
"encoding/pem"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"sync"
|
||||
|
||||
"github.com/hashicorp/errwrap"
|
||||
)
|
||||
|
||||
// ReloadFunc are functions that are called when a reload is requested
|
||||
type ReloadFunc func() error
|
||||
|
||||
// CertificateGetter satisfies ReloadFunc and its GetCertificate method
|
||||
// satisfies the tls.GetCertificate function signature. Currently it does not
|
||||
// allow changing paths after the fact.
|
||||
type CertificateGetter struct {
|
||||
sync.RWMutex
|
||||
|
||||
cert *tls.Certificate
|
||||
|
||||
certFile string
|
||||
keyFile string
|
||||
passphrase string
|
||||
}
|
||||
|
||||
func NewCertificateGetter(certFile, keyFile, passphrase string) *CertificateGetter {
|
||||
return &CertificateGetter{
|
||||
certFile: certFile,
|
||||
keyFile: keyFile,
|
||||
passphrase: passphrase,
|
||||
}
|
||||
}
|
||||
|
||||
func (cg *CertificateGetter) Reload() error {
|
||||
certPEMBlock, err := ioutil.ReadFile(cg.certFile)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
keyPEMBlock, err := ioutil.ReadFile(cg.keyFile)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// Check for encrypted pem block
|
||||
keyBlock, _ := pem.Decode(keyPEMBlock)
|
||||
if keyBlock == nil {
|
||||
return errors.New("decoded PEM is blank")
|
||||
}
|
||||
|
||||
if x509.IsEncryptedPEMBlock(keyBlock) {
|
||||
keyBlock.Bytes, err = x509.DecryptPEMBlock(keyBlock, []byte(cg.passphrase))
|
||||
if err != nil {
|
||||
return errwrap.Wrapf("Decrypting PEM block failed {{err}}", err)
|
||||
}
|
||||
keyPEMBlock = pem.EncodeToMemory(keyBlock)
|
||||
}
|
||||
|
||||
cert, err := tls.X509KeyPair(certPEMBlock, keyPEMBlock)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
cg.Lock()
|
||||
defer cg.Unlock()
|
||||
|
||||
cg.cert = &cert
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cg *CertificateGetter) GetCertificate(clientHello *tls.ClientHelloInfo) (*tls.Certificate, error) {
|
||||
cg.RLock()
|
||||
defer cg.RUnlock()
|
||||
|
||||
if cg.cert == nil {
|
||||
return nil, fmt.Errorf("nil certificate")
|
||||
}
|
||||
|
||||
return cg.cert, nil
|
||||
}
|
||||
Reference in new issue
Block a user