diff --git a/.env.example b/.env.example index 527a988a..5e5970de 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.3.6 +OSCTRL_VERSION=0.3.7 OSQUERY_VERSION=5.12.1 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine @@ -7,6 +7,7 @@ POSTGRES_DB_USERNAME=osctrl POSTGRES_DB_PASSWORD=osctrl REDIS_VERSION=6.2.6-alpine3.15 JWT_SECRET=0000000000000000000000000000000000000000000000000000000000000000 +SESSION_KEY=sessionkey OSCTRL_USER=admin OSCTRL_PASS=Changeme123! GOLANG_VERSION=1.21.3 diff --git a/CHANGELOG.md b/CHANGELOG.md index e715ba39..8508771f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # osctrl Changelog -## 🔖 Release [0.3.6](https://github.com/jmpsec/osctrl/releases/tag/v0.3.6) +## 🔖 Release [0.3.7](https://github.com/jmpsec/osctrl/releases/tag/v0.3.7) ### 🚨 Breaking Changes diff --git a/admin/handlers/go.mod b/admin/handlers/go.mod index 1c78465d..a85d7619 100644 --- a/admin/handlers/go.mod +++ b/admin/handlers/go.mod @@ -34,30 +34,30 @@ replace github.com/jmpsec/osctrl/version => ../../version require ( github.com/gorilla/mux v1.8.1 - github.com/jmpsec/osctrl/admin/sessions v0.3.6 - github.com/jmpsec/osctrl/carves v0.3.6 - github.com/jmpsec/osctrl/environments v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/metrics v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/nodes v0.3.6 - github.com/jmpsec/osctrl/queries v0.3.6 - github.com/jmpsec/osctrl/settings v0.3.6 - github.com/jmpsec/osctrl/tags v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/types v0.3.6 - github.com/jmpsec/osctrl/users v0.3.6 - github.com/jmpsec/osctrl/utils v0.3.6 + github.com/jmpsec/osctrl/admin/sessions v0.3.7 + github.com/jmpsec/osctrl/carves v0.3.7 + github.com/jmpsec/osctrl/environments v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/metrics v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/nodes v0.3.7 + github.com/jmpsec/osctrl/queries v0.3.7 + github.com/jmpsec/osctrl/settings v0.3.7 + github.com/jmpsec/osctrl/tags v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/types v0.3.7 + github.com/jmpsec/osctrl/users v0.3.7 + github.com/jmpsec/osctrl/utils v0.3.7 ) require ( - github.com/jmpsec/osctrl/cache v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/cache v0.0.0-20240710135334-c020425d8ffe gorm.io/gorm v1.25.10 ) require ( - github.com/aws/aws-sdk-go v1.54.14 // indirect + github.com/aws/aws-sdk-go v1.54.17 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect - github.com/jmpsec/osctrl/backend v0.3.6 // indirect + github.com/jmpsec/osctrl/backend v0.3.7 github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/rs/zerolog v1.33.0 // indirect @@ -98,8 +98,8 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect - github.com/jmpsec/osctrl/logging v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/version v0.3.6 // indirect + github.com/jmpsec/osctrl/logging v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/version v0.3.7 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect @@ -113,8 +113,8 @@ require ( github.com/spf13/viper v1.19.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect diff --git a/admin/handlers/go.sum b/admin/handlers/go.sum index e482c43d..b2f71b6a 100644 --- a/admin/handlers/go.sum +++ b/admin/handlers/go.sum @@ -4,6 +4,8 @@ github.com/aws/aws-sdk-go v1.51.16 h1:vnWKK8KjbftEkuPX8bRj3WHsLy1uhotn0eXptpvrxJ github.com/aws/aws-sdk-go v1.51.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.54.14 h1:llJ60MzLzovyDE/rEDbUjS1cICh7krk1PwQwNlKRoeQ= github.com/aws/aws-sdk-go v1.54.14/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.54.17 h1:ZV/qwcCIhMHgsJ6iXXPVYI0s1MdLT+5LW28ClzCUPeI= +github.com/aws/aws-sdk-go v1.54.17/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.26.0 h1:/Ce4OCiM3EkpW7Y+xUnfAFpchU78K7/Ug01sZni9PgA= github.com/aws/aws-sdk-go-v2 v1.26.0/go.mod h1:35hUlJVYd+M++iLI3ALmVwMOyRYMmRqUXpTtRGW+K9I= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= @@ -251,12 +253,16 @@ golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8= golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE= diff --git a/admin/handlers/handlers.go b/admin/handlers/handlers.go index 001bef8e..ce460b6d 100644 --- a/admin/handlers/handlers.go +++ b/admin/handlers/handlers.go @@ -4,6 +4,7 @@ import ( "log" "github.com/jmpsec/osctrl/admin/sessions" + "github.com/jmpsec/osctrl/backend" "github.com/jmpsec/osctrl/cache" "github.com/jmpsec/osctrl/carves" "github.com/jmpsec/osctrl/environments" @@ -172,10 +173,20 @@ func WithAdminConfig(config *types.JSONConfigurationAdmin) HandlersOption { } } -func WithDBLogger(dbfile string) HandlersOption { +func WithDBLogger(dbfile string, config *backend.JSONConfigurationDB) HandlersOption { return func(h *HandlersAdmin) { if dbfile == "" { - h.DBLogger = nil + if config == nil { + h.DBLogger = nil + return + } + logger, err := logging.CreateLoggerDBConfig(*config) + if err != nil { + log.Printf("error creating DB logger %v", err) + logger.Enabled = false + logger.Database = nil + } + h.DBLogger = logger return } logger, err := logging.CreateLoggerDBFile(dbfile) diff --git a/admin/handlers/json-logs.go b/admin/handlers/json-logs.go index c1a93ca7..6090c5fb 100644 --- a/admin/handlers/json-logs.go +++ b/admin/handlers/json-logs.go @@ -108,18 +108,28 @@ func (h *HandlersAdmin) JSONLogsHandler(w http.ResponseWriter, r *http.Request) } // Extract parameter for seconds // If parameter is not present or invalid, it defaults to 6 hours back - secondsBack := int64(utils.SixHours) - seconds, ok := r.URL.Query()["seconds"] + // secondsBack := int64(utils.SixHours) + // seconds, ok := r.URL.Query()["seconds"] + // if ok { + // s, err := strconv.ParseInt(seconds[0], 10, 64) + // if err == nil { + // secondsBack = s + // } + // } + // Extract parameter for limit + // If parameter is not present or invalid, it defaults to 100 items + limitItems := int(100) + limit, ok := r.URL.Query()["limit"] if ok { - s, err := strconv.ParseInt(seconds[0], 10, 64) + l, err := strconv.ParseInt(limit[0], 10, 32) if err == nil { - secondsBack = s + limitItems = int(l) } } // Get logs logJSON := []LogJSON{} if logType == types.StatusLog && h.AdminConfig.Logger == settings.LoggingDB { - statusLogs, err := h.DBLogger.StatusLogs(UUID, env.Name, secondsBack) + statusLogs, err := h.DBLogger.StatusLogsLimit(UUID, env.Name, int(limitItems)) if err != nil { log.Printf("error getting logs %v", err) h.Inc(metricJSONErr) @@ -138,8 +148,8 @@ func (h *HandlersAdmin) JSONLogsHandler(w http.ResponseWriter, r *http.Request) } logJSON = append(logJSON, _l) } - } else if logType == types.ResultLog && h.RedisCache != nil { - resultLogs, err := h.RedisCache.ResultLogs(UUID, env.Name, secondsBack) + } else if logType == types.ResultLog && h.AdminConfig.Logger == settings.LoggingDB { + resultLogs, err := h.DBLogger.ResultLogsLimit(UUID, env.Name, int(limitItems)) if err != nil { log.Printf("error getting logs %v", err) h.Inc(metricJSONErr) @@ -149,8 +159,8 @@ func (h *HandlersAdmin) JSONLogsHandler(w http.ResponseWriter, r *http.Request) for _, r := range resultLogs { _l := LogJSON{ Created: CreationTimes{ - Display: utils.PastFutureTimesEpoch(int64(r.UnixTime)), - Timestamp: strconv.Itoa(int(r.UnixTime)), + Display: utils.PastFutureTimes(r.CreatedAt), + Timestamp: strconv.Itoa(int(r.CreatedAt.Unix())), }, First: r.Name, Second: string(r.Columns), diff --git a/admin/main.go b/admin/main.go index 211873fc..7571e5f1 100644 --- a/admin/main.go +++ b/admin/main.go @@ -154,6 +154,7 @@ var ( osqueryTablesFile string osqueryTablesVersion string loggerFile string + loggerDbSame bool staticFilesFolder string staticOffline bool carvedFilesFolder string @@ -522,6 +523,13 @@ func init() { EnvVars: []string{"LOGGER_FILE"}, Destination: &loggerFile, }, + &cli.BoolFlag{ + Name: "logger-db-same", + Value: false, + Usage: "Use the same DB configuration for the logger", + EnvVars: []string{"LOGGER_DB_SAME"}, + Destination: &loggerDbSame, + }, &cli.StringFlag{ Name: "static", Aliases: []string{"s"}, @@ -728,9 +736,13 @@ func osctrlAdminService() { } }() - // Set the logger configuration file to empty if we are logging to anything but the DB - if adminConfig.Logger != settings.LoggingDB { - loggerFile = "" + var loggerDBConfig *backend.JSONConfigurationDB + loggerFile = "" + // Set the logger configuration file if we have a DB logger + if adminConfig.Logger == settings.LoggingDB { + if loggerDbSame { + loggerDBConfig = &dbConfig + } } // Initialize Admin handlers before router @@ -753,7 +765,7 @@ func osctrlAdminService() { handlers.WithOsqueryTables(osqueryTables), handlers.WithCarvesFolder(carvedFilesFolder), handlers.WithAdminConfig(&adminConfig), - handlers.WithDBLogger(loggerFile), + handlers.WithDBLogger(loggerFile, loggerDBConfig), ) // ////////////////////////// ADMIN diff --git a/admin/sessions/go.mod b/admin/sessions/go.mod index 839a5a55..8f06a7a0 100644 --- a/admin/sessions/go.mod +++ b/admin/sessions/go.mod @@ -21,14 +21,14 @@ replace github.com/jmpsec/osctrl/version => ../../version require ( github.com/gorilla/securecookie v1.1.2 github.com/gorilla/sessions v1.3.0 - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/types v0.3.6 // indirect - github.com/jmpsec/osctrl/users v0.3.6 + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/types v0.3.7 // indirect + github.com/jmpsec/osctrl/users v0.3.7 ) require ( - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe gorm.io/gorm v1.25.10 ) @@ -37,9 +37,9 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/environments v0.0.0-20240704175315-b3e7d3dd0a86 // indirect - github.com/jmpsec/osctrl/settings v0.3.6 // indirect - github.com/jmpsec/osctrl/version v0.3.6 // indirect + github.com/jmpsec/osctrl/environments v0.0.0-20240710135334-c020425d8ffe // indirect + github.com/jmpsec/osctrl/settings v0.3.7 // indirect + github.com/jmpsec/osctrl/version v0.3.7 // indirect github.com/segmentio/ksuid v1.0.4 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.25.0 // indirect ) diff --git a/admin/sessions/go.sum b/admin/sessions/go.sum index 8825b8c7..093ace36 100644 --- a/admin/sessions/go.sum +++ b/admin/sessions/go.sum @@ -39,6 +39,8 @@ golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gorm.io/driver/postgres v1.4.5 h1:mTeXTTtHAgnS9PgmhN2YeUbazYpLhUI1doLnw42XUZc= diff --git a/admin/templates/node.html b/admin/templates/node.html index e19bd712..28c5fb8b 100644 --- a/admin/templates/node.html +++ b/admin/templates/node.html @@ -371,7 +371,8 @@
- + + @@ -416,7 +417,8 @@
- + + diff --git a/backend/go.mod b/backend/go.mod index f7bb00b7..1b767611 100644 --- a/backend/go.mod +++ b/backend/go.mod @@ -28,8 +28,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/backend/go.sum b/backend/go.sum index f02099ea..9448d105 100644 --- a/backend/go.sum +++ b/backend/go.sum @@ -82,12 +82,16 @@ golang.org/x/crypto v0.22.0 h1:g1v0xeRhjcugydODzvb3mEM9SQ0HGp9s/nh3COQ/C30= golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 h1:aAcj0Da7eBAtrTp03QXWvm88pSyOt+UgdZw2BFZ+lEw= golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8/go.mod h1:CQ1k9gNrJ50XIzaKCRR2hssIjF07kZFEiieALBM/ARQ= golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8= golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= diff --git a/cache/go.mod b/cache/go.mod index 4945eed1..50a5e393 100644 --- a/cache/go.mod +++ b/cache/go.mod @@ -12,7 +12,7 @@ replace github.com/jmpsec/osctrl/utils => ../utils require ( github.com/go-redis/redis/v8 v8.11.5 - github.com/jmpsec/osctrl/types v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/types v0.0.0-20240710135334-c020425d8ffe github.com/spf13/viper v1.19.0 ) @@ -24,9 +24,9 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 // indirect + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect @@ -40,7 +40,7 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/cache/go.sum b/cache/go.sum index 33392183..8be7f49f 100644 --- a/cache/go.sum +++ b/cache/go.sum @@ -244,6 +244,8 @@ golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOe golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -372,7 +374,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= diff --git a/carves/go.mod b/carves/go.mod index 5372534e..b7cb86e1 100644 --- a/carves/go.mod +++ b/carves/go.mod @@ -14,9 +14,9 @@ replace github.com/jmpsec/osctrl/utils => ../utils require ( github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/types v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/types v0.0.0-20240710135334-c020425d8ffe ) require ( @@ -25,8 +25,8 @@ require ( github.com/aws/aws-sdk-go-v2/credentials v1.17.24 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.5 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0 - github.com/jmpsec/osctrl/settings v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/settings v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe github.com/spf13/viper v1.19.0 gorm.io/gorm v1.25.10 ) @@ -65,7 +65,7 @@ require ( github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/atomic v1.11.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect diff --git a/carves/go.sum b/carves/go.sum index 29060369..9829fcc4 100644 --- a/carves/go.sum +++ b/carves/go.sum @@ -505,6 +505,8 @@ golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOe golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -634,7 +636,7 @@ golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 8a9f5eab..56fcfa80 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -1,6 +1,6 @@ # osctrl Docker dev environment -This directory contains all the necessary configs to setup the osctrl Docker dev environment. There a couple of manual steps that are required before having a fully functional deployment: +This directory contains all the necessary configs to setup the osctrl Docker dev environment. There a couple of manual steps that are required before having a fully functional deployment: 1. Generate TLS/SSL termination certificate and private key 2. Generate JWT secret for API tokens @@ -11,61 +11,61 @@ Follow these steps to generate a self-signed certificate that is going to be use 1. `cp conf/tls/openssl.cnf.example conf/tls/openssl.cnf` 2. `BASE_DOMAIN= openssl req -x509 -new -nodes -days ` with an a domain like `osctrl.example.com` - 2. ![docker_openssl_generate](../../.img/docker_openssl_generate.png) + 1. Replace `` with an a domain like `osctrl.example.com` + 2. ![docker_openssl_generate](../../.img/docker_openssl_generate.png) ## Generate JWT secret You can generate a random enough JWT secret to be used with the `osctrl-api` and `osctrl-admin` components using one of the following commands: 1. `uuidgen | shasum -a 256 | awk '{print $1}'` - 1. ![docker_uuid_gen](../../.img/docker_uuid_gen.png) + 1. ![docker_uuid_gen](../../.img/docker_uuid_gen.png) 2. `vim .env` and set `JWT_SECRET` ## Set .env 1. `cp .env.example .env` 2. `vim .env` and set: - 1. osctrl - 1. `OSCTRL_VERSION` - define the version of osctrl to use - 2. `JWT_SECRET` - define the JWT secret (see instructions above) - 3. `OSCTRL_USER` - define username for osctrl admin user - 4. `OSCTRL_PASS` - define password for osctrl admin user - 2. osquery - 1. `OSQUERY_VERSION` - define the version of Osquery for test instance - 3. NGINX - 1. `NGINX_VERSION` - define the version of NGINX to use - 4. Postgres - 1. `POSTGRES_VERSION` - define the version of Postgres to use - 2. `POSTGRES_DB_NAME` - define the name of the database for osctrl - 3. `POSTGRES_DB_USERNAME` - define the username to conenct to osctrl database - 4. `POSTGRES_DB_PASSWORD` - define the password to conenct to osctrl database - 5. Save and exit + 1. osctrl + 1. `OSCTRL_VERSION` - define the version of osctrl to use + 2. `JWT_SECRET` - define the JWT secret (see instructions above) + 3. `OSCTRL_USER` - define username for osctrl admin user + 4. `OSCTRL_PASS` - define password for osctrl admin user + 2. osquery + 1. `OSQUERY_VERSION` - define the version of Osquery for test instance + 3. NGINX + 1. `NGINX_VERSION` - define the version of NGINX to use + 4. Postgres + 1. `POSTGRES_VERSION` - define the version of Postgres to use + 2. `POSTGRES_DB_NAME` - define the name of the database for osctrl + 3. `POSTGRES_DB_USERNAME` - define the username to conenct to osctrl database + 4. `POSTGRES_DB_PASSWORD` - define the password to conenct to osctrl database + 5. Save and exit 3. `docker-compose build` - 1. Build Docker images + 1. Build Docker images 4. `docker-compose up` - 1. Spin up osctrl Docker stack + 1. Spin up osctrl Docker stack ## Login into osctrl 1. Open a browser to `https://127.0.0.1:8443/login` 2. Login - 1. Enter `` for username - 2. Enter `` for password + 1. Enter `` for username + 2. Enter `` for password ## References -* [What is osctrl?](https://osctrl.net/) -* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.6#/) +- [What is osctrl?](https://osctrl.net/) +- [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.7#/) ### Docker -* [How to create new users in a Docker container?](https://net2.com/how-to-create-new-users-in-docker-container/) -* [Is mkdir -p totally safe when creating folder already exists](https://unix.stackexchange.com/questions/242995/is-mkdir-p-totally-safe-when-creating-folder-already-exists) -* [Meaning of ampersand (&) in docker-compose.yml file](https://stackoverflow.com/questions/45805380/meaning-of-ampersand-in-docker-compose-yml-file) -* [ChooseYourSIEMAdventure/docker-compose-splunk.yml](https://github.com/CptOfEvilMinions/ChooseYourSIEMAdventure/blob/main/docker-compose-splunk.yml) -* [Interactive shell using Docker Compose](https://stackoverflow.com/questions/36249744/interactive-shell-using-docker-compose) -* [Advanced Dockerfiles: Faster Builds and Smaller Images Using BuildKit and Multistage Builds](https://www.docker.com/blog/advanced-dockerfiles-faster-builds-and-smaller-images-using-buildkit-and-multistage-builds/) -* [Using openssl to get the certificate from a server](https://stackoverflow.com/questions/7885785/using-openssl-to-get-the-certificate-from-a-server) -* [osquery flags](https://osquery.readthedocs.io/en/stable/installation/cli-flags/) -* [mkcert is a simple tool for making locally-trusted development certificates](https://github.com/FiloSottile/mkcert) +- [How to create new users in a Docker container?](https://net2.com/how-to-create-new-users-in-docker-container/) +- [Is mkdir -p totally safe when creating folder already exists](https://unix.stackexchange.com/questions/242995/is-mkdir-p-totally-safe-when-creating-folder-already-exists) +- [Meaning of ampersand (&) in docker-compose.yml file](https://stackoverflow.com/questions/45805380/meaning-of-ampersand-in-docker-compose-yml-file) +- [ChooseYourSIEMAdventure/docker-compose-splunk.yml](https://github.com/CptOfEvilMinions/ChooseYourSIEMAdventure/blob/main/docker-compose-splunk.yml) +- [Interactive shell using Docker Compose](https://stackoverflow.com/questions/36249744/interactive-shell-using-docker-compose) +- [Advanced Dockerfiles: Faster Builds and Smaller Images Using BuildKit and Multistage Builds](https://www.docker.com/blog/advanced-dockerfiles-faster-builds-and-smaller-images-using-buildkit-and-multistage-builds/) +- [Using openssl to get the certificate from a server](https://stackoverflow.com/questions/7885785/using-openssl-to-get-the-certificate-from-a-server) +- [osquery flags](https://osquery.readthedocs.io/en/stable/installation/cli-flags/) +- [mkcert is a simple tool for making locally-trusted development certificates](https://github.com/FiloSottile/mkcert) diff --git a/deploy/docker/conf/dev/.env.example b/deploy/docker/conf/dev/.env.example index 6823eff6..9e05d8a4 100644 --- a/deploy/docker/conf/dev/.env.example +++ b/deploy/docker/conf/dev/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.3.6 +OSCTRL_VERSION=0.3.7 OSQUERY_VERSION=5.12.1 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-admin b/deploy/docker/dockerfiles/Dockerfile-dev-admin index 1bd7b662..bcba8300 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-admin +++ b/deploy/docker/dockerfiles/Dockerfile-dev-admin @@ -23,7 +23,6 @@ RUN go mod verify ### Copy osctrl-admin bin and configs ### RUN mkdir -p /opt/osctrl/bin RUN mkdir -p /opt/osctrl/config -RUN mkdir -p /opt/osctrl/script RUN mkdir -p /opt/osctrl/carved_files ### Copy osctrl-admin web templates ### diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-api b/deploy/docker/dockerfiles/Dockerfile-dev-api index 4812550f..bf1eb814 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-api +++ b/deploy/docker/dockerfiles/Dockerfile-dev-api @@ -8,7 +8,7 @@ ENV GOOS="linux" ENV CGO_ENABLED=0 # Hot reloading mod -RUN go install github.com/cosmtrek/air@v1.41.0 +RUN go install github.com/cosmtrek/air@v1.41.0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.20.1 # Copy code @@ -21,7 +21,6 @@ RUN go mod verify ### Copy osctrl-api bin and configs ### RUN mkdir -p /opt/osctrl/bin RUN mkdir -p /opt/osctrl/config -RUN mkdir -p /opt/osctrl/script RUN go build -o /opt/osctrl/bin/osctrl-api api/*.go EXPOSE 9002 diff --git a/deploy/docker/dockerfiles/Dockerfile-dev-tls b/deploy/docker/dockerfiles/Dockerfile-dev-tls index be19696e..dc99a020 100644 --- a/deploy/docker/dockerfiles/Dockerfile-dev-tls +++ b/deploy/docker/dockerfiles/Dockerfile-dev-tls @@ -8,7 +8,7 @@ ENV GOOS="linux" ENV CGO_ENABLED=0 # Hot reloading mod -RUN go install github.com/cosmtrek/air@v1.41.0 +RUN go install github.com/cosmtrek/air@v1.41.0 RUN go install github.com/go-delve/delve/cmd/dlv@v1.20.1 # Copy code @@ -21,7 +21,6 @@ RUN go mod verify ### Copy osctrl-api bin and configs ### RUN mkdir -p /opt/osctrl/bin RUN mkdir -p /opt/osctrl/config -RUN mkdir -p /opt/osctrl/script RUN go build -o /opt/osctrl/bin/osctrl-tls tls/*.go EXPOSE 9000 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 607b6ae7..8dbbc9d6 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -32,7 +32,7 @@ services: ######################################### osctrl-tls ######################################### osctrl-tls: container_name: 'osctrl-tls-dev' - image: 'osctrl-tls-dev:v${OSCTRL_VERSION}' + image: 'osctrl-tls-dev:${OSCTRL_VERSION}' restart: unless-stopped build: context: . @@ -40,12 +40,13 @@ services: args: GOLANG_VERSION: ${GOLANG_VERSION} environment: - #### TLS settings #### + #### osctrl-tls configuration settings #### - SERVICE_LISTENER=0.0.0.0 - SERVICE_PORT=9000 - SERVICE_HOST=0.0.0.0 - SERVICE_AUTH=none - - SERVICE_LOGGER=stdout + - SERVICE_LOGGER=db + - LOGGER_DB_SAME=true #### Database settings #### - DB_HOST=osctrl-postgres - DB_NAME=${POSTGRES_DB_NAME} @@ -67,7 +68,7 @@ services: ######################################### osctrl-admin ######################################### osctrl-admin: container_name: 'osctrl-admin-dev' - image: 'osctrl-admin-dev:v${OSCTRL_VERSION}' + image: 'osctrl-admin-dev:${OSCTRL_VERSION}' restart: unless-stopped build: context: . @@ -76,13 +77,15 @@ services: GOLANG_VERSION: ${GOLANG_VERSION} OSQUERY_VERSION: ${OSQUERY_VERSION} environment: - #### TLS settings #### + #### osctrl-admin configuration settings #### - SERVICE_LISTENER=0.0.0.0 - SERVICE_PORT=9001 - SERVICE_HOST=0.0.0.0 - SERVICE_AUTH=db - JWT_SECRET=${JWT_SECRET} - - SERVICE_LOGGER=stdout + - SERVICE_LOGGER=db + - LOGGER_DB_SAME=true + - SESSION_KEY=${SESSION_KEY} #### Database settings #### - DB_HOST=osctrl-postgres - DB_NAME=${POSTGRES_DB_NAME} @@ -104,7 +107,7 @@ services: ######################################### osctrl-api ######################################### osctrl-api: container_name: 'osctrl-api-dev' - image: 'osctrl-api-dev:v${OSCTRL_VERSION}' + image: 'osctrl-api-dev:${OSCTRL_VERSION}' restart: unless-stopped build: context: . @@ -113,13 +116,13 @@ services: GOLANG_VERSION: ${GOLANG_VERSION} OSQUERY_VERSION: ${OSQUERY_VERSION} environment: - #### TLS settings #### + #### osctrl-api configuration settings #### - SERVICE_LISTENER=0.0.0.0 - SERVICE_PORT=9002 - SERVICE_HOST=0.0.0.0 - SERVICE_AUTH=jwt - JWT_SECRET=${JWT_SECRET} - - SERVICE_LOGGER=stdout + - SERVICE_LOGGER=db #### Database settings #### - DB_HOST=osctrl-postgres - DB_NAME=${POSTGRES_DB_NAME} @@ -183,7 +186,7 @@ services: ############################################################################################## osctrl-cli: container_name: 'osctrl-cli-dev' - image: 'osctrl-cli-dev:v${OSCTRL_VERSION}' + image: 'osctrl-cli-dev:${OSCTRL_VERSION}' restart: unless-stopped build: context: . @@ -221,7 +224,7 @@ services: ######################################### osquery ######################################### osquery: container_name: 'osctrl-osquery-dev' - image: 'osctrl-osquery-dev:v${OSCTRL_VERSION}' + image: 'osctrl-osquery-dev:${OSCTRL_VERSION}' restart: unless-stopped build: context: . diff --git a/environments/go.mod b/environments/go.mod index facd7d21..b0f3bd7d 100644 --- a/environments/go.mod +++ b/environments/go.mod @@ -16,9 +16,9 @@ replace github.com/jmpsec/osctrl/version => ../version require ( github.com/google/uuid v1.6.0 - github.com/jmpsec/osctrl/settings v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/version v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/settings v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/version v0.0.0-20240710135334-c020425d8ffe github.com/segmentio/ksuid v1.0.4 github.com/stretchr/testify v1.9.0 gorm.io/gorm v1.25.10 @@ -28,9 +28,9 @@ require ( github.com/davecgh/go-spew v1.1.1 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/types v0.0.0-20240704175315-b3e7d3dd0a86 // indirect + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/types v0.0.0-20240710135334-c020425d8ffe // indirect github.com/pmezard/go-difflib v1.0.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.mod b/go.mod index f4fe9bf8..14806cee 100644 --- a/go.mod +++ b/go.mod @@ -44,23 +44,23 @@ require ( github.com/crewjam/saml v0.4.14 github.com/golang-jwt/jwt/v4 v4.5.0 github.com/gorilla/mux v1.8.1 - github.com/jmpsec/osctrl/admin/handlers v0.3.6 - github.com/jmpsec/osctrl/admin/sessions v0.3.6 - github.com/jmpsec/osctrl/backend v0.3.6 - github.com/jmpsec/osctrl/cache v0.3.6 - github.com/jmpsec/osctrl/carves v0.3.6 - github.com/jmpsec/osctrl/environments v0.3.6 - github.com/jmpsec/osctrl/logging v0.3.6 - github.com/jmpsec/osctrl/metrics v0.3.6 - github.com/jmpsec/osctrl/nodes v0.3.6 - github.com/jmpsec/osctrl/queries v0.3.6 - github.com/jmpsec/osctrl/settings v0.3.6 - github.com/jmpsec/osctrl/tags v0.3.6 - github.com/jmpsec/osctrl/tls/handlers v0.3.6 - github.com/jmpsec/osctrl/types v0.3.6 - github.com/jmpsec/osctrl/users v0.3.6 - github.com/jmpsec/osctrl/utils v0.3.6 - github.com/jmpsec/osctrl/version v0.3.6 + github.com/jmpsec/osctrl/admin/handlers v0.3.7 + github.com/jmpsec/osctrl/admin/sessions v0.3.7 + github.com/jmpsec/osctrl/backend v0.3.7 + github.com/jmpsec/osctrl/cache v0.3.7 + github.com/jmpsec/osctrl/carves v0.3.7 + github.com/jmpsec/osctrl/environments v0.3.7 + github.com/jmpsec/osctrl/logging v0.3.7 + github.com/jmpsec/osctrl/metrics v0.3.7 + github.com/jmpsec/osctrl/nodes v0.3.7 + github.com/jmpsec/osctrl/queries v0.3.7 + github.com/jmpsec/osctrl/settings v0.3.7 + github.com/jmpsec/osctrl/tags v0.3.7 + github.com/jmpsec/osctrl/tls/handlers v0.3.7 + github.com/jmpsec/osctrl/types v0.3.7 + github.com/jmpsec/osctrl/users v0.3.7 + github.com/jmpsec/osctrl/utils v0.3.7 + github.com/jmpsec/osctrl/version v0.3.7 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/viper v1.19.0 github.com/urfave/cli/v2 v2.25.7 @@ -77,12 +77,12 @@ require ( github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/sourcegraph/conc v0.3.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sync v0.7.0 // indirect ) require ( - github.com/aws/aws-sdk-go v1.54.14 // indirect + github.com/aws/aws-sdk-go v1.54.17 // indirect github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect github.com/aws/aws-sdk-go-v2/config v1.27.24 // indirect @@ -134,9 +134,9 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect - golang.org/x/crypto v0.24.0 // indirect + golang.org/x/crypto v0.25.0 // indirect golang.org/x/sys v0.22.0 // indirect - golang.org/x/term v0.21.0 + golang.org/x/term v0.22.0 golang.org/x/text v0.16.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/go.sum b/go.sum index e6e7b78b..92763768 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60= github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= -github.com/aws/aws-sdk-go v1.54.14 h1:llJ60MzLzovyDE/rEDbUjS1cICh7krk1PwQwNlKRoeQ= -github.com/aws/aws-sdk-go v1.54.14/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.54.17 h1:ZV/qwcCIhMHgsJ6iXXPVYI0s1MdLT+5LW28ClzCUPeI= +github.com/aws/aws-sdk-go v1.54.17/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o= github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= @@ -193,10 +193,10 @@ github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRT github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= -golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= -golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= -golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= @@ -206,8 +206,8 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.21.0 h1:WVXCp+/EBEHOj53Rvu+7KiT/iElMrO8ACK16SMZ3jaA= -golang.org/x/term v0.21.0/go.mod h1:ooXLefLobQVslOqselCNF4SxFAaoS6KujMbsGzSDmX0= +golang.org/x/term v0.22.0 h1:BbsgPEJULsl2fV/AT3v15Mjva5yXKQDyKf+TbDz7QJk= +golang.org/x/term v0.22.0/go.mod h1:F3qCibpT5AMpCRfhfT53vVJwhLtIVHhB9XDjfFvnMI4= golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/logging/db.go b/logging/db.go index 8c1c06dc..87a720cb 100644 --- a/logging/db.go +++ b/logging/db.go @@ -197,7 +197,16 @@ func (logDB *LoggerDB) QueryLogs(name string) ([]OsqueryQueryData, error) { func (logDB *LoggerDB) StatusLogs(uuid, environment string, seconds int64) ([]OsqueryStatusData, error) { var logs []OsqueryStatusData minusSeconds := time.Now().Add(time.Duration(-seconds) * time.Second) - if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at > ?", minusSeconds).Find(&logs).Error; err != nil { + if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at < ?", minusSeconds).Find(&logs).Error; err != nil { + return logs, err + } + return logs, nil +} + +// StatusLogsLimit will retrieve a limited number of status logs +func (logDB *LoggerDB) StatusLogsLimit(uuid, environment string, limit int) ([]OsqueryStatusData, error) { + var logs []OsqueryStatusData + if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Order("created_at desc").Limit(limit).Find(&logs).Error; err != nil { return logs, err } return logs, nil @@ -207,7 +216,16 @@ func (logDB *LoggerDB) StatusLogs(uuid, environment string, seconds int64) ([]Os func (logDB *LoggerDB) ResultLogs(uuid, environment string, seconds int64) ([]OsqueryResultData, error) { var logs []OsqueryResultData minusSeconds := time.Now().Add(time.Duration(-seconds) * time.Second) - if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at > ?", minusSeconds).Find(&logs).Error; err != nil { + if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Where("created_at < ?", minusSeconds).Find(&logs).Error; err != nil { + return logs, err + } + return logs, nil +} + +// ResultLogsLimit will retrieve a limited number of result logs +func (logDB *LoggerDB) ResultLogsLimit(uuid, environment string, limit int) ([]OsqueryResultData, error) { + var logs []OsqueryResultData + if err := logDB.Database.Conn.Where("uuid = ? AND environment = ?", strings.ToUpper(uuid), environment).Order("created_at").Limit(limit).Find(&logs).Error; err != nil { return logs, err } return logs, nil diff --git a/logging/go.mod b/logging/go.mod index 11f9129c..f6ade591 100644 --- a/logging/go.mod +++ b/logging/go.mod @@ -17,18 +17,18 @@ replace github.com/jmpsec/osctrl/utils => ../utils replace github.com/jmpsec/osctrl/cache => ../cache require ( - github.com/aws/aws-sdk-go v1.54.14 + github.com/aws/aws-sdk-go v1.54.17 github.com/aws/aws-sdk-go-v2 v1.30.1 github.com/aws/aws-sdk-go-v2/config v1.27.24 github.com/aws/aws-sdk-go-v2/credentials v1.17.24 github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.5 github.com/aws/aws-sdk-go-v2/service/s3 v1.58.0 - github.com/jmpsec/osctrl/backend v0.3.6 - github.com/jmpsec/osctrl/nodes v0.3.6 - github.com/jmpsec/osctrl/queries v0.3.6 - github.com/jmpsec/osctrl/settings v0.3.6 - github.com/jmpsec/osctrl/types v0.3.6 - github.com/jmpsec/osctrl/utils v0.3.6 + github.com/jmpsec/osctrl/backend v0.3.7 + github.com/jmpsec/osctrl/nodes v0.3.7 + github.com/jmpsec/osctrl/queries v0.3.7 + github.com/jmpsec/osctrl/settings v0.3.7 + github.com/jmpsec/osctrl/types v0.3.7 + github.com/jmpsec/osctrl/utils v0.3.7 github.com/rs/zerolog v1.33.0 github.com/spf13/viper v1.19.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -74,8 +74,8 @@ require ( github.com/spf13/pflag v1.0.5 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/logging/go.sum b/logging/go.sum index 430cbbab..bf774d8d 100644 --- a/logging/go.sum +++ b/logging/go.sum @@ -2,6 +2,8 @@ github.com/aws/aws-sdk-go v1.51.16 h1:vnWKK8KjbftEkuPX8bRj3WHsLy1uhotn0eXptpvrxJ github.com/aws/aws-sdk-go v1.51.16/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/aws/aws-sdk-go v1.54.14 h1:llJ60MzLzovyDE/rEDbUjS1cICh7krk1PwQwNlKRoeQ= github.com/aws/aws-sdk-go v1.54.14/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.54.17 h1:ZV/qwcCIhMHgsJ6iXXPVYI0s1MdLT+5LW28ClzCUPeI= +github.com/aws/aws-sdk-go v1.54.17/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.26.1 h1:5554eUqIYVWpU0YmeeYZ0wU64H2VLBs8TlhRB2L+EkA= github.com/aws/aws-sdk-go-v2 v1.26.1/go.mod h1:ffIFB97e2yNsv4aTSGkqtHnppsIJzw7G7BReUZ3jCXM= github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o= @@ -168,8 +170,12 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= diff --git a/logging/logging.go b/logging/logging.go index eb1bdb22..4964784c 100644 --- a/logging/logging.go +++ b/logging/logging.go @@ -25,7 +25,7 @@ type LoggerTLS struct { } // CreateLoggerTLS to instantiate a new logger for the TLS endpoint -func CreateLoggerTLS(logging, loggingFile string, s3Conf types.S3Configuration, alwaysLog bool, dbConf backend.JSONConfigurationDB, mgr *settings.Settings, nodes *nodes.NodeManager, queries *queries.Queries) (*LoggerTLS, error) { +func CreateLoggerTLS(logging, loggingFile string, s3Conf types.S3Configuration, loggerSame, alwaysLog bool, dbConf backend.JSONConfigurationDB, mgr *settings.Settings, nodes *nodes.NodeManager, queries *queries.Queries) (*LoggerTLS, error) { l := &LoggerTLS{ Logging: logging, Nodes: nodes, @@ -47,12 +47,21 @@ func CreateLoggerTLS(logging, loggingFile string, s3Conf types.S3Configuration, g.Settings(mgr) l.Logger = g case settings.LoggingDB: - d, err := CreateLoggerDBFile(loggingFile) - if err != nil { - return nil, err + if loggerSame { + d, err := CreateLoggerDBConfig(dbConf) + if err != nil { + return nil, err + } + d.Settings(mgr) + l.Logger = d + } else { + d, err := CreateLoggerDBFile(loggingFile) + if err != nil { + return nil, err + } + d.Settings(mgr) + l.Logger = d } - d.Settings(mgr) - l.Logger = d case settings.LoggingStdout: d, err := CreateLoggerStdout() if err != nil { diff --git a/metrics/go.mod b/metrics/go.mod index fbe93f1c..c2632d0e 100644 --- a/metrics/go.mod +++ b/metrics/go.mod @@ -21,15 +21,15 @@ require ( require ( github.com/google/uuid v1.6.0 // indirect github.com/jackc/puddle/v2 v2.2.1 // indirect - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 // indirect + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe // indirect github.com/pelletier/go-toml/v2 v2.2.2 // indirect github.com/sagikazarmark/locafero v0.6.0 // indirect github.com/sagikazarmark/slog-shim v0.1.0 // indirect github.com/segmentio/ksuid v1.0.4 // indirect github.com/sourcegraph/conc v0.3.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sync v0.7.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) @@ -43,8 +43,8 @@ require ( github.com/jackc/pgx/v5 v5.5.5 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/types v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/types v0.0.0-20240710135334-c020425d8ffe github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect diff --git a/metrics/go.sum b/metrics/go.sum index 94d2e3f1..6d659ce1 100644 --- a/metrics/go.sum +++ b/metrics/go.sum @@ -115,6 +115,8 @@ golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOe golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= @@ -150,7 +152,7 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.3.0/go.mod h1:q750SLmJuPmVoN1blW3UFBPREJfb1KmY3vwxfr+nFDA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= diff --git a/osctrl-api.yaml b/osctrl-api.yaml index 17b44598..9b5f63d7 100644 --- a/osctrl-api.yaml +++ b/osctrl-api.yaml @@ -7,7 +7,7 @@ servers: info: title: osctrl-api description: "This the API for osctrl, a fast and efficient osquery management solution." - version: 0.3.6 + version: 0.3.7 externalDocs: description: osctrl documentation url: https://osctrl.net diff --git a/queries/go.mod b/queries/go.mod index d886fbbd..19aca9e8 100644 --- a/queries/go.mod +++ b/queries/go.mod @@ -8,8 +8,8 @@ replace github.com/jmpsec/osctrl/utils => ../utils require ( github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/nodes v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/nodes v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe gorm.io/gorm v1.25.10 ) diff --git a/settings/go.mod b/settings/go.mod index 75ee1fc7..005d7e84 100644 --- a/settings/go.mod +++ b/settings/go.mod @@ -12,7 +12,7 @@ replace github.com/jmpsec/osctrl/utils => ../utils require ( github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/types v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/types v0.0.0-20240710135334-c020425d8ffe gorm.io/gorm v1.25.10 ) @@ -20,8 +20,8 @@ require ( github.com/google/uuid v1.6.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 // indirect + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe // indirect github.com/segmentio/ksuid v1.0.4 // indirect ) diff --git a/tags/go.mod b/tags/go.mod index 657ca560..1439fcc2 100644 --- a/tags/go.mod +++ b/tags/go.mod @@ -6,7 +6,7 @@ replace github.com/jmpsec/osctrl/nodes => ../nodes require ( github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/nodes v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/nodes v0.0.0-20240710135334-c020425d8ffe gorm.io/gorm v1.25.10 ) diff --git a/tls/handlers/go.mod b/tls/handlers/go.mod index 112f4cac..7b881305 100644 --- a/tls/handlers/go.mod +++ b/tls/handlers/go.mod @@ -32,27 +32,27 @@ replace github.com/jmpsec/osctrl/tls/handlers => ../handlers require ( github.com/gorilla/mux v1.8.1 - github.com/jmpsec/osctrl/backend v0.3.6 // indirect - github.com/jmpsec/osctrl/carves v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/environments v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/metrics v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/nodes v0.3.6 - github.com/jmpsec/osctrl/queries v0.3.6 - github.com/jmpsec/osctrl/settings v0.3.6 - github.com/jmpsec/osctrl/tags v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/types v0.3.6 - github.com/jmpsec/osctrl/utils v0.3.6 + github.com/jmpsec/osctrl/backend v0.3.7 // indirect + github.com/jmpsec/osctrl/carves v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/environments v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/metrics v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/nodes v0.3.7 + github.com/jmpsec/osctrl/queries v0.3.7 + github.com/jmpsec/osctrl/settings v0.3.7 + github.com/jmpsec/osctrl/tags v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/types v0.3.7 + github.com/jmpsec/osctrl/utils v0.3.7 github.com/segmentio/ksuid v1.0.4 github.com/stretchr/testify v1.9.0 ) require ( - github.com/jmpsec/osctrl/logging v0.0.0-20240704175315-b3e7d3dd0a86 - github.com/jmpsec/osctrl/version v0.0.0-20240704175315-b3e7d3dd0a86 + github.com/jmpsec/osctrl/logging v0.0.0-20240710135334-c020425d8ffe + github.com/jmpsec/osctrl/version v0.0.0-20240710135334-c020425d8ffe ) require ( - github.com/aws/aws-sdk-go v1.54.14 // indirect + github.com/aws/aws-sdk-go v1.54.17 // indirect github.com/aws/aws-sdk-go-v2 v1.30.1 // indirect github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect github.com/aws/aws-sdk-go-v2/config v1.27.24 // indirect @@ -99,8 +99,8 @@ require ( github.com/spf13/viper v1.19.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.24.0 // indirect - golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/exp v0.0.0-20240707233637-46b078467d37 // indirect golang.org/x/sync v0.7.0 // indirect golang.org/x/sys v0.22.0 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/tls/handlers/go.sum b/tls/handlers/go.sum index 4d79e592..6ec8c0e9 100644 --- a/tls/handlers/go.sum +++ b/tls/handlers/go.sum @@ -2,6 +2,8 @@ github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20O github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/aws/aws-sdk-go v1.54.14 h1:llJ60MzLzovyDE/rEDbUjS1cICh7krk1PwQwNlKRoeQ= github.com/aws/aws-sdk-go v1.54.14/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= +github.com/aws/aws-sdk-go v1.54.17 h1:ZV/qwcCIhMHgsJ6iXXPVYI0s1MdLT+5LW28ClzCUPeI= +github.com/aws/aws-sdk-go v1.54.17/go.mod h1:eRwEWoyTWFMVYVQzKMNHWP5/RV4xIUGMQfXQHfHkpNU= github.com/aws/aws-sdk-go-v2 v1.30.1 h1:4y/5Dvfrhd1MxRDD77SrfsDaj8kUkkljU7XE83NPV+o= github.com/aws/aws-sdk-go-v2 v1.30.1/go.mod h1:nIQjQVp5sfpQcTc9mPSr1B0PaWK5ByX9MOoDadSN4lc= github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 h1:tW1/Rkad38LA15X4UQtjXZXNKsCgkshC3EbmcUmghTg= @@ -132,8 +134,12 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI= golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 h1:yixxcjnhBmY0nkL253HFVIm0JsFHwrHdT3Yh6szTnfY= golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8/go.mod h1:jj3sYF3dwk5D+ghuXyeI3r5MFf+NT2An6/9dOA95KSI= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37 h1:uLDX+AfeFCct3a2C7uIWBKMJIR3CJMhcgfrUAqjRK6w= +golang.org/x/exp v0.0.0-20240707233637-46b078467d37/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY= golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/tls/main.go b/tls/main.go index c03b7e09..0f2b9d16 100644 --- a/tls/main.go +++ b/tls/main.go @@ -111,6 +111,7 @@ var ( tlsKeyFile string loggerFlag bool loggerFile string + loggerDbSame bool alwaysLog bool carverConfigFile string ) @@ -421,6 +422,13 @@ func init() { EnvVars: []string{"LOGGER_FILE"}, Destination: &loggerFile, }, + &cli.BoolFlag{ + Name: "logger-db-same", + Value: false, + Usage: "Use the same DB configuration for the logger", + EnvVars: []string{"LOGGER_DB_SAME"}, + Destination: &loggerDbSame, + }, &cli.BoolFlag{ Name: "always-log", Aliases: []string{"a", "always"}, @@ -569,11 +577,11 @@ func osctrlService() { ingestedMetrics = metrics.CreateIngested(db.Conn) // Initialize TLS logger log.Println("Loading TLS logger") - loggerTLS, err = logging.CreateLoggerTLS(tlsConfig.Logger, loggerFile, s3LogConfig, alwaysLog, dbConfig, settingsmgr, nodesmgr, queriesmgr) + loggerTLS, err = logging.CreateLoggerTLS( + tlsConfig.Logger, loggerFile, s3LogConfig, loggerDbSame, alwaysLog, dbConfig, settingsmgr, nodesmgr, queriesmgr) if err != nil { log.Fatalf("Error loading logger - %s: %v", tlsConfig.Logger, err) } - // Sleep to reload environments // FIXME Implement Redis cache // FIXME splay this? diff --git a/types/go.mod b/types/go.mod index aa724bba..4f97766f 100644 --- a/types/go.mod +++ b/types/go.mod @@ -8,15 +8,15 @@ replace github.com/jmpsec/osctrl/queries => ../queries replace github.com/jmpsec/osctrl/utils => ../utils -require github.com/jmpsec/osctrl/queries v0.3.6 +require github.com/jmpsec/osctrl/queries v0.3.7 require ( github.com/google/uuid v1.6.0 // indirect github.com/jinzhu/gorm v1.9.16 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/utils v0.0.0-20240704175315-b3e7d3dd0a86 // indirect + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/utils v0.0.0-20240710135334-c020425d8ffe // indirect github.com/segmentio/ksuid v1.0.4 // indirect gorm.io/gorm v1.25.10 // indirect ) diff --git a/users/go.mod b/users/go.mod index 2e537209..6e23418f 100644 --- a/users/go.mod +++ b/users/go.mod @@ -43,10 +43,10 @@ require ( github.com/jackc/pgx/v4 v4.18.2 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/nodes v0.3.6 // indirect - github.com/jmpsec/osctrl/queries v0.3.6 // indirect - github.com/jmpsec/osctrl/settings v0.3.6 // indirect - github.com/jmpsec/osctrl/version v0.3.6 // indirect + github.com/jmpsec/osctrl/nodes v0.3.7 // indirect + github.com/jmpsec/osctrl/queries v0.3.7 // indirect + github.com/jmpsec/osctrl/settings v0.3.7 // indirect + github.com/jmpsec/osctrl/version v0.3.7 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/text v0.16.0 // indirect diff --git a/users/go.sum b/users/go.sum index b9483b33..3757a3e6 100644 --- a/users/go.sum +++ b/users/go.sum @@ -189,7 +189,7 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= diff --git a/version/version.go b/version/version.go index 760718d8..12ddea0e 100644 --- a/version/version.go +++ b/version/version.go @@ -2,7 +2,7 @@ package version const ( // OsctrlVersion to have the version for all components - OsctrlVersion = "0.3.6" + OsctrlVersion = "0.3.7" // OsqueryVersion to have the version for osquery defined OsqueryVersion = "5.12.1" ) diff --git a/version/version_test.go b/version/version_test.go index 00469382..e55920a6 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -11,5 +11,5 @@ func TestOsqueryVersion(t *testing.T) { } func TestOsctrlVersion(t *testing.T) { - assert.Equal(t, "0.3.6", OsctrlVersion) + assert.Equal(t, "0.3.7", OsctrlVersion) }