mirror of
https://github.com/openziti/ziti.git
synced 2026-10-12 15:28:05 +00:00
Merge pull request #358 from openziti/update-deps
Update deps and changelog
This commit is contained in:
Paul Lorenz
@@ -2,6 +2,9 @@
|
||||
|
||||
## What's New
|
||||
|
||||
* Add workaround for bbolt bug which caused some data to get left behind when deleting identities, seen when turning off tunneler capability on edge routers
|
||||
* Remove deprecated ziti-enroller command. Enrollement can be done using the ziti-tunnel, ziti-router and ziti commands
|
||||
* Fix UDP intercept handling
|
||||
* The host.v1 service configuration type has been changed as follows:
|
||||
* Rename `dialIntercepted*` properties to `forwardProtocol`, `forwardAddress`, `forwardPort` for better consistency with non-tunneler client applications.
|
||||
* Add `allowedProtocols`, `allowedAddresses`, and `allowedPortRanges` properties to whitelist destinations that are dialed via `forward*`. The `allowed*` properties are required for any corresponding `forward*` property that is `true`.
|
||||
|
||||
@@ -27,10 +27,10 @@ require (
|
||||
github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d
|
||||
github.com/keybase/go-ps v0.0.0-20190827175125-91aafc93ba19
|
||||
github.com/michaelquigley/pfxlog v0.3.7
|
||||
github.com/openziti/edge v0.19.78
|
||||
github.com/openziti/fabric v0.16.53
|
||||
github.com/openziti/edge v0.19.83
|
||||
github.com/openziti/fabric v0.16.54
|
||||
github.com/openziti/foundation v0.15.48
|
||||
github.com/openziti/sdk-golang v0.15.39
|
||||
github.com/openziti/sdk-golang v0.15.40
|
||||
github.com/pborman/uuid v1.2.0
|
||||
github.com/pkg/errors v0.9.1
|
||||
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
|
||||
|
||||
@@ -376,6 +376,7 @@ github.com/gophercloud/utils v0.0.0-20200508015959-b0167b94122c/go.mod h1:ehWUbL
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
|
||||
github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
|
||||
github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
|
||||
github.com/gorilla/handlers v1.5.0/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
|
||||
github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4=
|
||||
github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
|
||||
github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
|
||||
@@ -613,15 +614,14 @@ github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e h1:ST9+54UtCr96S5
|
||||
github.com/openziti/bbolt v1.3.6-0.20210317142109-547da822475e/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
|
||||
github.com/openziti/dilithium v0.3.3 h1:PLgQ6PMNLSTzCFbX/h98cmudgz/cU6TmjdSv5NAPD8k=
|
||||
github.com/openziti/dilithium v0.3.3/go.mod h1:vsCjI2AU/hon9e+dLhUFbCNGesJDj2ASgkySOcpmvjo=
|
||||
github.com/openziti/edge v0.19.78 h1:Fd970IKzVagHz4qjYEB9obfQTYtsqE1BEoaf3j9tHHM=
|
||||
github.com/openziti/edge v0.19.78/go.mod h1:dsgO/Ccd2EzKxPcagS84CQeVBO2tFRs5M2BVQs1SDYk=
|
||||
github.com/openziti/fabric v0.16.53 h1:euH/rzJ7yTpUIFF5gRECVoPrUWGyoQYf2frdotcQBjk=
|
||||
github.com/openziti/fabric v0.16.53/go.mod h1:bmbQB2A2ZgGbSxUT5dXYhgvD/hfpQQfrEq9ibj6x4LI=
|
||||
github.com/openziti/foundation v0.15.47/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw=
|
||||
github.com/openziti/edge v0.19.83 h1:+DgptVlQIN9j95uX2LmUBgJmCS7qnBEKVCTeirNT/Vw=
|
||||
github.com/openziti/edge v0.19.83/go.mod h1:atmbRzo8tAXatznFhQaM3BZlFJZxTq12OIGZazKz7J8=
|
||||
github.com/openziti/fabric v0.16.54 h1:jfuAv5p73Uu7E2L26TBFoO+ZF5mzeAHgA9CSU8d+rfE=
|
||||
github.com/openziti/fabric v0.16.54/go.mod h1:fb5zFkB3YQxusAmsQLKKzEk7MmPodqDkqmOVTB+J3eE=
|
||||
github.com/openziti/foundation v0.15.48 h1:NnL/xY684XeFiLBi5z0+uKf2tpPhlClbMeVmUQPF8Jo=
|
||||
github.com/openziti/foundation v0.15.48/go.mod h1:NnSBTp9ZkcYsv6nYxZR0/NzoHfkIo6tjpBHDvBsPFqw=
|
||||
github.com/openziti/sdk-golang v0.15.39 h1:xHv9tgfkkj1IQOFlztAMNsgd7Opa5hFrz2Zu6aPzKtw=
|
||||
github.com/openziti/sdk-golang v0.15.39/go.mod h1:gNQRosz6RU80GmGNbXjGO6HKUtSlSOTEL2oTL2HLNwU=
|
||||
github.com/openziti/sdk-golang v0.15.40 h1:AXAE4qeWf5TLO1ZCamaTTOdfCmWITWyeM4g+RVZDO5U=
|
||||
github.com/openziti/sdk-golang v0.15.40/go.mod h1:yo85e6HhAL1+PrRjgrsL/ZgkyAcdqVxy4Ws1UMrogss=
|
||||
github.com/oracle/oci-go-sdk v24.2.0+incompatible/go.mod h1:VQb79nF8Z2cwLkLS35ukwStZIg5F66tcBccjip/j888=
|
||||
github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
|
||||
github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU=
|
||||
|
||||
@@ -1,32 +0,0 @@
|
||||
/*
|
||||
Copyright NetFoundry, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
https://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package main
|
||||
|
||||
import (
|
||||
"github.com/openziti/ziti/ziti-enroller/subcmd"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
func main() {
|
||||
logrus.SetFormatter(&logrus.TextFormatter{
|
||||
ForceColors: true,
|
||||
DisableTimestamp: true,
|
||||
TimestampFormat: "",
|
||||
PadLevelText: true,
|
||||
})
|
||||
subcmd.Execute()
|
||||
}
|
||||
@@ -1,164 +0,0 @@
|
||||
/*
|
||||
Copyright NetFoundry, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
https://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package subcmd
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"github.com/michaelquigley/pfxlog"
|
||||
"github.com/openziti/foundation/identity/certtools"
|
||||
"github.com/openziti/sdk-golang/ziti/enroll"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cobra"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// global state used by all subcommands are located here for easy discovery
|
||||
var verbose bool
|
||||
var jwtpath, outpath, keyPath, certPath, idname, caOverride string
|
||||
|
||||
const verboseDesc = "Enable verbose logging."
|
||||
const outpathDesc = "Output configuration file."
|
||||
const jwtpathDesc = "Enrollment token (JWT file). Required"
|
||||
const certDesc = "The certificate to present when establishing a connection."
|
||||
const idnameDesc = "Names the identity. Ignored if not 3rd party auto enrollment"
|
||||
|
||||
const outFlag = "out"
|
||||
|
||||
func init() {
|
||||
rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, verboseDesc)
|
||||
rootCmd.Flags().StringVarP(&jwtpath, "jwt", "j", "", jwtpathDesc)
|
||||
rootCmd.Flags().StringVarP(&outpath, outFlag, "o", "", outpathDesc)
|
||||
rootCmd.Flags().StringVarP(&idname, "idname", "n", "", idnameDesc)
|
||||
rootCmd.Flags().StringVarP(&certPath, "cert", "c", "", certDesc)
|
||||
rootCmd.Flags().StringVarP(&caOverride, "ca", "", "", "Additional trusted certificates")
|
||||
|
||||
var keyDesc = ""
|
||||
engines := certtools.ListEngines()
|
||||
if len(engines) > 0 {
|
||||
keyDesc = fmt.Sprintf("The key to use with the certificate. Optionally specify the engine to use. supported engines: %v", engines)
|
||||
} else {
|
||||
keyDesc = fmt.Sprintf("The key to use with the certificate.")
|
||||
}
|
||||
|
||||
rootCmd.Flags().StringVarP(&keyPath, "key", "k", "", keyDesc)
|
||||
|
||||
_ = rootCmd.MarkFlagRequired("jwt")
|
||||
}
|
||||
|
||||
var rootCmd = &cobra.Command{
|
||||
Use: "ziti-enroller",
|
||||
Short: "Ziti Enroller",
|
||||
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
||||
logrus.Warnf("ziti-enroller is DEPRECATED and will soon be removed. Please use 'ziti edge enroll' or 'ziti-tunnel enroll' instead.")
|
||||
if verbose {
|
||||
logrus.SetLevel(logrus.DebugLevel)
|
||||
}
|
||||
},
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
return processEnrollment()
|
||||
},
|
||||
}
|
||||
|
||||
func Execute() {
|
||||
rootCmd.SilenceUsage = true
|
||||
rootCmd.SilenceErrors = true
|
||||
if err := rootCmd.Execute(); err != nil {
|
||||
pfxlog.Logger().Errorf("%s\n", err)
|
||||
}
|
||||
}
|
||||
|
||||
func processEnrollment() error {
|
||||
if strings.TrimSpace(outpath) == "" {
|
||||
out, outErr := outPathFromJwt(jwtpath)
|
||||
if outErr != nil {
|
||||
return fmt.Errorf("could not set the output path: %s", outErr)
|
||||
}
|
||||
outpath = out
|
||||
}
|
||||
|
||||
if jwtpath != "" {
|
||||
if _, err := os.Stat(jwtpath); os.IsNotExist(err) {
|
||||
return fmt.Errorf("the provided jwt file does not exist: %s", jwtpath)
|
||||
}
|
||||
}
|
||||
|
||||
if caOverride != "" {
|
||||
if _, err := os.Stat(caOverride); os.IsNotExist(err) {
|
||||
return fmt.Errorf("the provided ca file does not exist: %s", caOverride)
|
||||
}
|
||||
}
|
||||
|
||||
if strings.TrimSpace(outpath) == strings.TrimSpace(jwtpath) {
|
||||
return fmt.Errorf("the output path must not be the same as the jwt path")
|
||||
}
|
||||
|
||||
tokenStr, _ := ioutil.ReadFile(jwtpath)
|
||||
|
||||
pfxlog.Logger().Debugf("jwt to parse: %s", tokenStr)
|
||||
tkn, _, err := enroll.ParseToken(string(tokenStr))
|
||||
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to parse JWT: %s", err.Error())
|
||||
}
|
||||
|
||||
flags := enroll.EnrollmentFlags{
|
||||
CertFile: certPath,
|
||||
KeyFile: keyPath,
|
||||
Token: tkn,
|
||||
IDName: idname,
|
||||
AdditionalCAs: caOverride,
|
||||
KeyAlg: "RSA",
|
||||
}
|
||||
conf, err := enroll.Enroll(flags)
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to enroll: %v", err)
|
||||
}
|
||||
|
||||
output, err := os.Create(outpath)
|
||||
defer output.Close()
|
||||
if err != nil {
|
||||
return fmt.Errorf("failed to open file '%s': %s", outpath, err.Error())
|
||||
}
|
||||
|
||||
enc := json.NewEncoder(output)
|
||||
enc.SetEscapeHTML(false)
|
||||
encErr := enc.Encode(&conf)
|
||||
|
||||
if encErr == nil {
|
||||
pfxlog.Logger().Infof("enrolled successfully. identity file written to: %s", outpath)
|
||||
return nil
|
||||
} else {
|
||||
return fmt.Errorf("enrollment successful but the identity file was not able to be written to: %s [%s]", outpath, encErr)
|
||||
}
|
||||
}
|
||||
|
||||
func outPathFromJwt(jwt string) (string, error) {
|
||||
if strings.HasSuffix(jwt, ".jwt") {
|
||||
return jwt[:len(jwt)-len(".jwt")] + ".json", nil
|
||||
} else if strings.HasSuffix(jwt, ".json") {
|
||||
//ugh - so that makes things a bit uglier but ok fine. we'll return an error in this situation
|
||||
return "", errors.Errorf("unexpected configuration. cannot infer '%s' flag if the jwt file "+
|
||||
"ends in .json. rename jwt file or provide the '%s' flag", outFlag, outFlag)
|
||||
} else {
|
||||
//doesn't end with .jwt - so just slap a .json on the end and call it a day
|
||||
return jwt + ".json", nil
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
/*
|
||||
Copyright NetFoundry, Inc.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
https://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
package subcmd
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"github.com/openziti/ziti/common/version"
|
||||
"github.com/spf13/cobra"
|
||||
)
|
||||
|
||||
func init() {
|
||||
rootCmd.AddCommand(versionCmd)
|
||||
}
|
||||
|
||||
var versionCmd = &cobra.Command{
|
||||
Use: "version",
|
||||
Short: "Show component version",
|
||||
Run: func(cmd *cobra.Command, args []string) {
|
||||
fmt.Println(version.GetBuildMetadata(verbose))
|
||||
},
|
||||
}
|
||||
@@ -36,6 +36,7 @@ type updateEdgeRouterOptions struct {
|
||||
roleAttributes []string
|
||||
tags map[string]string
|
||||
appData map[string]string
|
||||
usePut bool
|
||||
}
|
||||
|
||||
func newUpdateEdgeRouterCmd(f cmdutil.Factory, out io.Writer, errOut io.Writer) *cobra.Command {
|
||||
@@ -67,6 +68,7 @@ func newUpdateEdgeRouterCmd(f cmdutil.Factory, out io.Writer, errOut io.Writer)
|
||||
"Set role attributes of the edge router. Use --role-attributes '' to set an empty list")
|
||||
cmd.Flags().StringToStringVar(&options.tags, "tags", nil, "Custom management tags")
|
||||
cmd.Flags().StringToStringVar(&options.appData, "app-data", nil, "Custom application data")
|
||||
cmd.Flags().BoolVar(&options.usePut, "use-put", false, "Use PUT to when making the request")
|
||||
|
||||
options.AddCommonFlags(cmd)
|
||||
|
||||
@@ -111,6 +113,10 @@ func runUpdateEdgeRouter(o *updateEdgeRouterOptions) error {
|
||||
return errors.New("no change specified. must specify at least one attribute to change")
|
||||
}
|
||||
|
||||
_, err = patchEntityOfType(fmt.Sprintf("edge-routers/%v", id), entityData.String(), &o.edgeOptions)
|
||||
if o.usePut {
|
||||
_, err = putEntityOfType(fmt.Sprintf("edge-routers/%v", id), entityData.String(), &o.edgeOptions)
|
||||
} else {
|
||||
_, err = patchEntityOfType(fmt.Sprintf("edge-routers/%v", id), entityData.String(), &o.edgeOptions)
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user