Bump to versions

CHANGELOG.md

@@ -5,7 +5,6 @@
 
 [Git Commits](https://github.com/jmpsec/osctrl/compare/0.2.5...v0.2.6)
 
-
 ### New Features
 
 None

admin/handlers/go.mod

@@ -6,18 +6,18 @@ require (
 	github.com/gorilla/mux v1.7.4
 	github.com/gorilla/sessions v1.2.0 // indirect
 	github.com/jinzhu/gorm v1.9.12
-	github.com/jmpsec/osctrl/admin/sessions v0.2.5
-	github.com/jmpsec/osctrl/carves v0.2.5
-	github.com/jmpsec/osctrl/environments v0.2.5
-	github.com/jmpsec/osctrl/logging v0.2.5
-	github.com/jmpsec/osctrl/metrics v0.2.5
-	github.com/jmpsec/osctrl/nodes v0.2.5
-	github.com/jmpsec/osctrl/queries v0.2.5
-	github.com/jmpsec/osctrl/settings v0.2.5
-	github.com/jmpsec/osctrl/tags v0.2.5
-	github.com/jmpsec/osctrl/types v0.2.5
-	github.com/jmpsec/osctrl/users v0.2.5
-	github.com/jmpsec/osctrl/utils v0.2.5
+	github.com/jmpsec/osctrl/admin/sessions v0.2.6
+	github.com/jmpsec/osctrl/carves v0.2.6
+	github.com/jmpsec/osctrl/environments v0.2.6
+	github.com/jmpsec/osctrl/logging v0.2.6
+	github.com/jmpsec/osctrl/metrics v0.2.6
+	github.com/jmpsec/osctrl/nodes v0.2.6
+	github.com/jmpsec/osctrl/queries v0.2.6
+	github.com/jmpsec/osctrl/settings v0.2.6
+	github.com/jmpsec/osctrl/tags v0.2.6
+	github.com/jmpsec/osctrl/types v0.2.6
+	github.com/jmpsec/osctrl/users v0.2.6
+	github.com/jmpsec/osctrl/utils v0.2.6
 )
 
 replace github.com/jmpsec/osctrl/carves => ../../carves

admin/main.go

@@ -34,7 +34,7 @@ const (
 	// Service name
 	serviceName string = projectName + "-" + settings.ServiceAdmin
 	// Service version
-	serviceVersion string = "0.2.5"
+	serviceVersion string = "0.2.6"
 	// Service description
 	serviceDescription string = "Admin service for osctrl"
 	// Application description
@@ -310,7 +310,6 @@ func main() {
 			URL:               *samlData.RootURL,
 			Key:               samlData.KeyPair.PrivateKey.(*rsa.PrivateKey),
 			Certificate:       samlData.KeyPair.Leaf,
-			IDPMetadataURL:    samlData.IdpMetadataURL,
 			AllowIDPInitiated: true,
 		})
 		if err != nil {

api/main.go

@@ -29,7 +29,7 @@ const (
 	// Service name
 	serviceName string = projectName + "-" + settings.ServiceAPI
 	// Service version
-	serviceVersion string = "0.2.5"
+	serviceVersion string = "0.2.6"
 	// Service description
 	serviceDescription string = "API service for osctrl"
 	// Application description

cli/main.go

@@ -25,7 +25,7 @@ const (
 	// Application name
 	appName string = projectName + "-cli"
 	// Application version
-	appVersion string = "0.2.5"
+	appVersion string = "0.2.6"
 	// Application usage
 	appUsage string = "CLI for " + projectName
 	// Application description

deploy/docker/README.md

@@ -44,7 +44,7 @@ Some links as reference for the topics in this README:
 ### osctrl
 
 * [What is osctrl?](https://osctrl.net/)
-* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.2.5#/)
+* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.2.6#/)
 
 ### Docker
 

deploy/docker/env.example

@@ -1,4 +1,4 @@
-OSCTRL_VERSION=0.2.5
+OSCTRL_VERSION=0.2.6
 OSQUERY_VERSION=5.0.1
 NGINX_VERSION=1.21.1-alpine
 POSTGRES_VERSION=10-alpine

go.mod

@@ -3,28 +3,45 @@ module osctrl
 go 1.15
 
 require (
-	github.com/crewjam/saml v0.4.5
-	github.com/golang-jwt/jwt/v4 v4.0.0
+	github.com/bketelsen/crypt v0.0.5 // indirect
+	github.com/coreos/etcd v3.3.13+incompatible // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.1 // indirect
+	github.com/crewjam/saml v0.4.6
+	github.com/golang-jwt/jwt/v4 v4.2.0
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/gorilla/mux v1.8.0
+	github.com/gorilla/sessions v1.2.1 // indirect
+	github.com/gorilla/websocket v1.4.2 // indirect
+	github.com/hashicorp/go.net v0.0.1 // indirect
 	github.com/jinzhu/gorm v1.9.16
-	github.com/jmpsec/osctrl/admin/handlers v0.2.5
-	github.com/jmpsec/osctrl/admin/sessions v0.2.5
-	github.com/jmpsec/osctrl/backend v0.2.5
-	github.com/jmpsec/osctrl/carves v0.2.5
-	github.com/jmpsec/osctrl/environments v0.2.5
-	github.com/jmpsec/osctrl/logging v0.2.5
-	github.com/jmpsec/osctrl/metrics v0.2.5
-	github.com/jmpsec/osctrl/nodes v0.2.5
-	github.com/jmpsec/osctrl/queries v0.2.5
-	github.com/jmpsec/osctrl/settings v0.2.5
-	github.com/jmpsec/osctrl/tags v0.2.5
-	github.com/jmpsec/osctrl/tls/handlers v0.2.5
-	github.com/jmpsec/osctrl/types v0.2.5
-	github.com/jmpsec/osctrl/users v0.2.5
-	github.com/jmpsec/osctrl/utils v0.2.5
-	github.com/olekukonko/tablewriter v0.0.4
-	github.com/spf13/viper v1.7.1
+	github.com/jmpsec/osctrl/admin/handlers v0.2.6
+	github.com/jmpsec/osctrl/admin/sessions v0.2.6
+	github.com/jmpsec/osctrl/backend v0.2.6
+	github.com/jmpsec/osctrl/carves v0.2.6
+	github.com/jmpsec/osctrl/environments v0.2.6
+	github.com/jmpsec/osctrl/logging v0.2.6
+	github.com/jmpsec/osctrl/metrics v0.2.6
+	github.com/jmpsec/osctrl/nodes v0.2.6
+	github.com/jmpsec/osctrl/queries v0.2.6
+	github.com/jmpsec/osctrl/settings v0.2.6
+	github.com/jmpsec/osctrl/tags v0.2.6
+	github.com/jmpsec/osctrl/tls/handlers v0.2.6
+	github.com/jmpsec/osctrl/types v0.2.6
+	github.com/jmpsec/osctrl/users v0.2.6
+	github.com/jmpsec/osctrl/utils v0.2.6
+	github.com/lib/pq v1.10.4 // indirect
+	github.com/mattn/go-runewidth v0.0.13 // indirect
+	github.com/mitchellh/gox v0.4.0 // indirect
+	github.com/mitchellh/iochan v1.0.0 // indirect
+	github.com/olekukonko/tablewriter v0.0.5
+	github.com/segmentio/ksuid v1.0.4 // indirect
+	github.com/spf13/afero v1.7.1 // indirect
+	github.com/spf13/viper v1.10.1
+	github.com/stretchr/objx v0.3.0 // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
 	github.com/urfave/cli v1.22.5
+	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
 )
 
 replace github.com/jmpsec/osctrl/backend => ./backend