diff --git a/.env.example b/.env.example index 7da8a9bd..8e0bcb93 100644 --- a/.env.example +++ b/.env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.3.1 +OSCTRL_VERSION=0.3.2 OSQUERY_VERSION=5.8.2 NGINX_VERSION=1.21.6-alpine POSTGRES_VERSION=13.5-alpine diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d9352c1..fa858637 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # osctrl Changelog -## 🔖 Release [0.3.1](https://github.com/jmpsec/osctrl/releases/tag/v0.3.1) +## 🔖 Release [0.3.2](https://github.com/jmpsec/osctrl/releases/tag/v0.3.2) ### 🚨 Breaking Changes diff --git a/admin/auth/go.mod b/admin/auth/go.mod index 0cbb7f1d..342d2b0f 100644 --- a/admin/auth/go.mod +++ b/admin/auth/go.mod @@ -21,9 +21,9 @@ replace github.com/jmpsec/osctrl/utils => ../../utils replace github.com/jmpsec/osctrl/version => ../../version require ( - github.com/jmpsec/osctrl/admin/sessions v0.3.1 - github.com/jmpsec/osctrl/settings v0.3.1 - github.com/jmpsec/osctrl/users v0.3.1 + github.com/jmpsec/osctrl/admin/sessions v0.3.2 + github.com/jmpsec/osctrl/settings v0.3.2 + github.com/jmpsec/osctrl/users v0.3.2 ) require ( @@ -34,12 +34,12 @@ require ( 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/environments v0.0.0-20231103085153-d61207d0ce25 // indirect - github.com/jmpsec/osctrl/nodes v0.3.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect - github.com/jmpsec/osctrl/types v0.3.1 // indirect - github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect - github.com/jmpsec/osctrl/version v0.3.1 // indirect + github.com/jmpsec/osctrl/environments v0.3.2 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect + github.com/jmpsec/osctrl/types v0.3.2 // indirect + github.com/jmpsec/osctrl/utils v0.3.2 // indirect + github.com/jmpsec/osctrl/version v0.3.2 // indirect github.com/lib/pq v1.10.4 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/crypto v0.14.0 // indirect diff --git a/admin/handlers/go.mod b/admin/handlers/go.mod index 2b0ff9a3..c704ffc9 100644 --- a/admin/handlers/go.mod +++ b/admin/handlers/go.mod @@ -34,19 +34,19 @@ replace github.com/jmpsec/osctrl/version => ../../version require ( github.com/gorilla/mux v1.8.0 - github.com/jmpsec/osctrl/admin/sessions v0.0.0-20231103085153-d61207d0ce25 - github.com/jmpsec/osctrl/backend v0.3.1 // indirect - github.com/jmpsec/osctrl/carves v0.0.0-20231103085153-d61207d0ce25 + github.com/jmpsec/osctrl/admin/sessions v0.3.2 + github.com/jmpsec/osctrl/backend v0.3.2 // indirect + github.com/jmpsec/osctrl/carves v0.3.2 github.com/jmpsec/osctrl/environments v0.0.0-20231103085153-d61207d0ce25 github.com/jmpsec/osctrl/logging v0.0.0-20220120232002-31ecf3b9f264 github.com/jmpsec/osctrl/metrics v0.0.0-20231103085153-d61207d0ce25 - github.com/jmpsec/osctrl/nodes v0.3.1 - github.com/jmpsec/osctrl/queries v0.3.1 - github.com/jmpsec/osctrl/settings v0.3.1 + github.com/jmpsec/osctrl/nodes v0.3.2 + github.com/jmpsec/osctrl/queries v0.3.2 + github.com/jmpsec/osctrl/settings v0.3.2 github.com/jmpsec/osctrl/tags v0.0.0-20231103085153-d61207d0ce25 - github.com/jmpsec/osctrl/types v0.3.1 - github.com/jmpsec/osctrl/users v0.3.1 - github.com/jmpsec/osctrl/utils v0.3.1 + github.com/jmpsec/osctrl/types v0.3.2 + github.com/jmpsec/osctrl/users v0.3.2 + github.com/jmpsec/osctrl/utils v0.3.2 ) require ( @@ -86,7 +86,7 @@ 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/version v0.3.1 // indirect + github.com/jmpsec/osctrl/version v0.3.2 // indirect github.com/lib/pq v1.10.4 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/admin/sessions/go.mod b/admin/sessions/go.mod index 0a7592e9..01a9c93c 100644 --- a/admin/sessions/go.mod +++ b/admin/sessions/go.mod @@ -22,10 +22,10 @@ require ( github.com/gorilla/securecookie v1.1.1 github.com/gorilla/sessions v1.2.1 github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/nodes v0.3.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect - github.com/jmpsec/osctrl/types v0.3.1 // indirect - github.com/jmpsec/osctrl/users v0.3.1 + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect + github.com/jmpsec/osctrl/types v0.3.2 // indirect + github.com/jmpsec/osctrl/users v0.3.2 ) require ( @@ -39,8 +39,8 @@ require ( github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect github.com/jmpsec/osctrl/environments v0.0.0-20231103085153-d61207d0ce25 // indirect - github.com/jmpsec/osctrl/settings v0.3.1 // indirect - github.com/jmpsec/osctrl/version v0.3.1 // indirect + github.com/jmpsec/osctrl/settings v0.3.2 // indirect + github.com/jmpsec/osctrl/version v0.3.2 // indirect github.com/lib/pq v1.10.4 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/crypto v0.14.0 // indirect diff --git a/cache/go.mod b/cache/go.mod index 3192b172..45517073 100644 --- a/cache/go.mod +++ b/cache/go.mod @@ -24,8 +24,8 @@ 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.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/carves/go.mod b/carves/go.mod index 79f58aa1..1ba4162e 100644 --- a/carves/go.mod +++ b/carves/go.mod @@ -14,8 +14,8 @@ replace github.com/jmpsec/osctrl/utils => ../utils require ( github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/nodes v0.3.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect github.com/jmpsec/osctrl/types v0.0.0-20231103085153-d61207d0ce25 ) diff --git a/deploy/docker/README.md b/deploy/docker/README.md index 839078c4..b5dba05c 100644 --- a/deploy/docker/README.md +++ b/deploy/docker/README.md @@ -59,7 +59,7 @@ You can generate a random enough JWT secret to be used with the `osctrl-api` and ### osctrl * [What is osctrl?](https://osctrl.net/) -* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.1#/) +* [osctrl-api](https://app.swaggerhub.com/apis-docs/jmpsec/osctrl-api/0.3.2#/) ### Docker diff --git a/deploy/docker/env.example b/deploy/docker/env.example index e26485b0..838e92b3 100644 --- a/deploy/docker/env.example +++ b/deploy/docker/env.example @@ -1,4 +1,4 @@ -OSCTRL_VERSION=0.3.1 +OSCTRL_VERSION=0.3.2 OSQUERY_VERSION=5.8.2 NGINX_VERSION=1.21.1-alpine POSTGRES_VERSION=10-alpine diff --git a/environments/go.mod b/environments/go.mod index 9e0306a4..9792f1eb 100644 --- a/environments/go.mod +++ b/environments/go.mod @@ -28,8 +28,8 @@ 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.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect github.com/jmpsec/osctrl/types v0.0.0-20231103085153-d61207d0ce25 // 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 58545287..b6a778fd 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.0 - github.com/jmpsec/osctrl/admin/handlers v0.3.1 - github.com/jmpsec/osctrl/admin/sessions v0.3.1 - github.com/jmpsec/osctrl/backend v0.3.1 - github.com/jmpsec/osctrl/cache v0.3.1 - github.com/jmpsec/osctrl/carves v0.3.1 - github.com/jmpsec/osctrl/environments v0.3.1 - github.com/jmpsec/osctrl/logging v0.3.1 - github.com/jmpsec/osctrl/metrics v0.3.1 - github.com/jmpsec/osctrl/nodes v0.3.1 - github.com/jmpsec/osctrl/queries v0.3.1 - github.com/jmpsec/osctrl/settings v0.3.1 - github.com/jmpsec/osctrl/tags v0.3.1 - github.com/jmpsec/osctrl/tls/handlers v0.3.1 - github.com/jmpsec/osctrl/types v0.3.1 - github.com/jmpsec/osctrl/users v0.3.1 - github.com/jmpsec/osctrl/utils v0.3.1 - github.com/jmpsec/osctrl/version v0.3.1 + github.com/jmpsec/osctrl/admin/handlers v0.3.2 + github.com/jmpsec/osctrl/admin/sessions v0.3.2 + github.com/jmpsec/osctrl/backend v0.3.2 + github.com/jmpsec/osctrl/cache v0.3.2 + github.com/jmpsec/osctrl/carves v0.3.2 + github.com/jmpsec/osctrl/environments v0.3.2 + github.com/jmpsec/osctrl/logging v0.3.2 + github.com/jmpsec/osctrl/metrics v0.3.2 + github.com/jmpsec/osctrl/nodes v0.3.2 + github.com/jmpsec/osctrl/queries v0.3.2 + github.com/jmpsec/osctrl/settings v0.3.2 + github.com/jmpsec/osctrl/tags v0.3.2 + github.com/jmpsec/osctrl/tls/handlers v0.3.2 + github.com/jmpsec/osctrl/types v0.3.2 + github.com/jmpsec/osctrl/users v0.3.2 + github.com/jmpsec/osctrl/utils v0.3.2 + github.com/jmpsec/osctrl/version v0.3.2 github.com/olekukonko/tablewriter v0.0.5 github.com/spf13/viper v1.17.0 github.com/urfave/cli/v2 v2.25.7 diff --git a/logging/go.mod b/logging/go.mod index 07af46e3..20cc742f 100644 --- a/logging/go.mod +++ b/logging/go.mod @@ -24,13 +24,13 @@ require ( github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.13.1 github.com/aws/aws-sdk-go-v2/service/s3 v1.42.0 github.com/jinzhu/gorm v1.9.16 - github.com/jmpsec/osctrl/backend v0.3.1 + github.com/jmpsec/osctrl/backend v0.3.2 github.com/jmpsec/osctrl/cache v0.0.0-20231103085153-d61207d0ce25 - github.com/jmpsec/osctrl/nodes v0.3.1 - github.com/jmpsec/osctrl/queries v0.3.1 - github.com/jmpsec/osctrl/settings v0.3.1 - github.com/jmpsec/osctrl/types v0.3.1 - github.com/jmpsec/osctrl/utils v0.3.1 + github.com/jmpsec/osctrl/nodes v0.3.2 + github.com/jmpsec/osctrl/queries v0.3.2 + github.com/jmpsec/osctrl/settings v0.3.2 + github.com/jmpsec/osctrl/types v0.3.2 + github.com/jmpsec/osctrl/utils v0.3.2 github.com/rs/zerolog v1.31.0 github.com/spf13/viper v1.17.0 gopkg.in/natefinch/lumberjack.v2 v2.2.1 diff --git a/metrics/go.mod b/metrics/go.mod index d44f65dd..573fc4d3 100644 --- a/metrics/go.mod +++ b/metrics/go.mod @@ -20,7 +20,7 @@ require ( require ( github.com/google/uuid v1.4.0 // indirect - github.com/jmpsec/osctrl/nodes v0.3.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect github.com/pelletier/go-toml/v2 v2.1.0 // indirect github.com/sagikazarmark/locafero v0.3.0 // indirect @@ -42,7 +42,7 @@ require ( github.com/jackc/pgx/v5 v5.2.0 // indirect github.com/jinzhu/inflection v1.0.0 // indirect github.com/jinzhu/now v1.1.5 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect github.com/jmpsec/osctrl/types v0.0.0-20231103085153-d61207d0ce25 github.com/magiconair/properties v1.8.7 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/osctrl-api.yaml b/osctrl-api.yaml index 02bce657..d750fa9e 100644 --- a/osctrl-api.yaml +++ b/osctrl-api.yaml @@ -1,52 +1,52 @@ openapi: 3.0.1 servers: - - url: '{server}/api/v1' + - url: "{server}/api/v1" variables: server: default: https://osctrl.net info: title: osctrl-api - description: 'This the API for osctrl, a fast and efficient osquery management solution.' - version: 0.3.1 + description: "This the API for osctrl, a fast and efficient osquery management solution." + version: 0.3.2 externalDocs: description: osctrl documentation url: https://osctrl.net tags: -- name: nodes - description: Enrolled nodes in osctrl - externalDocs: - description: osctrl nodes - url: https://github.com/jmpsec/osctrl/tree/master/nodes -- name: queries - description: On-demand queries in osctrl - externalDocs: - description: on-demand queries - url: https://github.com/jmpsec/osctrl/tree/master/queries -- name: platforms - description: Platforms of enrolled nodes in osctrl - externalDocs: - description: osctrl platforms - url: https://github.com/jmpsec/osctrl/tree/master/queries -- name: environments - description: Environments within osctrl - externalDocs: - description: osctrl environments - url: https://github.com/jmpsec/osctrl/tree/master/environments -- name: tags - description: Tags for enrolled nodes in osctrl - externalDocs: - description: osctrl tags - url: https://github.com/jmpsec/osctrl/tree/master/tags -- name: settings - description: Settings for all osctrl components - externalDocs: - description: osctrl settings - url: https://github.com/jmpsec/osctrl/tree/master/settings + - name: nodes + description: Enrolled nodes in osctrl + externalDocs: + description: osctrl nodes + url: https://github.com/jmpsec/osctrl/tree/master/nodes + - name: queries + description: On-demand queries in osctrl + externalDocs: + description: on-demand queries + url: https://github.com/jmpsec/osctrl/tree/master/queries + - name: platforms + description: Platforms of enrolled nodes in osctrl + externalDocs: + description: osctrl platforms + url: https://github.com/jmpsec/osctrl/tree/master/queries + - name: environments + description: Environments within osctrl + externalDocs: + description: osctrl environments + url: https://github.com/jmpsec/osctrl/tree/master/environments + - name: tags + description: Tags for enrolled nodes in osctrl + externalDocs: + description: osctrl tags + url: https://github.com/jmpsec/osctrl/tree/master/tags + - name: settings + description: Settings for all osctrl components + externalDocs: + description: osctrl settings + url: https://github.com/jmpsec/osctrl/tree/master/settings paths: /nodes: get: tags: - - nodes + - nodes summary: Get a single node by UUID description: Returns the osctrl node by the provided UUID operationId: apiNodesHandler @@ -58,76 +58,76 @@ paths: schema: type: array items: - $ref: '#/components/schemas/OsqueryNode' + $ref: "#/components/schemas/OsqueryNode" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: no nodes content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting nodes content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /nodes/{uuid}: get: tags: - - nodes + - nodes summary: Get node description: Returns all enrolled osctrl nodes operationId: apiNodeHandler parameters: - - name: uuid - in: path - description: UUID of the requested enrolled node - required: true - schema: - type: string + - name: uuid + in: path + description: UUID of the requested enrolled node + required: true + schema: + type: string responses: 200: description: successful operation content: application/json: schema: - $ref: '#/components/schemas/OsqueryNode' + $ref: "#/components/schemas/OsqueryNode" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: node not found content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting node content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /queries: get: tags: - - queries + - queries summary: Get on-demand queries description: Returns all hidden osctrl on-demand queries operationId: apiHiddenQueriesShowHandler @@ -139,32 +139,32 @@ paths: schema: type: array items: - $ref: '#/components/schemas/DistributedQuery' + $ref: "#/components/schemas/DistributedQuery" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: no queries content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting queries content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write post: tags: - - queries + - queries summary: Run new query description: Creates a new on-demand query to run operationId: apiQueriesRunHandler @@ -172,14 +172,14 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/DistributedQueryRequest' + $ref: "#/components/schemas/DistributedQueryRequest" responses: 200: description: successful operation content: application/json: schema: - $ref: '#/components/schemas/ApiQueriesResponse' + $ref: "#/components/schemas/ApiQueriesResponse" 403: description: no access content: {} @@ -190,99 +190,99 @@ paths: description: error getting queries content: {} security: - - Authorization: - - read - - write + - Authorization: + - read + - write /queries/{name}: get: tags: - - queries + - queries summary: Get on-demand query description: Returns the requested on-demand query by name operationId: apiQueryShowHandler parameters: - - name: name - in: path - description: Name of the requested on-demand query - required: true - schema: - type: string + - name: name + in: path + description: Name of the requested on-demand query + required: true + schema: + type: string responses: 200: description: successful operation content: application/json: schema: - $ref: '#/components/schemas/DistributedQuery' + $ref: "#/components/schemas/DistributedQuery" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: query not found content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting query content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /queries/results/{name}: get: tags: - - queries + - queries summary: Get on-demand query results description: Returns the requested on-demand query results by name operationId: apiQueryResultsHandler parameters: - - name: name - in: path - description: Name of the requested on-demand query - required: true - schema: - type: string + - name: name + in: path + description: Name of the requested on-demand query + required: true + schema: + type: string responses: 200: description: successful operation content: application/json: schema: - $ref: '#/components/schemas/APIQueryData' + $ref: "#/components/schemas/APIQueryData" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: query not found content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting results content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /all-queries: get: tags: - - queries + - queries summary: Get on-demand queries description: Returns all osctrl on-demand queries operationId: apiAllQueriesShowHandler @@ -294,33 +294,33 @@ paths: schema: type: array items: - $ref: '#/components/schemas/DistributedQuery' + $ref: "#/components/schemas/DistributedQuery" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: no queries content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting queries content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /platforms: get: tags: - - platforms + - platforms summary: Get platforms description: Returns all osctrl platforms of enrolled nodes operationId: apiPlatformsHandler @@ -338,27 +338,27 @@ paths: content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: no queries content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting queries content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /environments: get: tags: - - environments + - environments summary: Get environments description: Returns all osctrl environments to enroll nodes operationId: apiEnvironmentsHandler @@ -370,70 +370,70 @@ paths: schema: type: array items: - $ref: '#/components/schemas/TLSEnvironment' + $ref: "#/components/schemas/TLSEnvironment" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 404: description: no environments content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting environments content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /environments/{environment}: get: tags: - - environments + - environments summary: Get environment description: Returns the requested osctrl environment to enroll nodes operationId: apiEnvironmentHandler parameters: - - name: environment - in: path - description: Name of the requested osctrl environment to enroll nodes - required: true - schema: - type: string + - name: environment + in: path + description: Name of the requested osctrl environment to enroll nodes + required: true + schema: + type: string responses: 200: description: successful operation content: application/json: schema: - $ref: '#/components/schemas/TLSEnvironment' + $ref: "#/components/schemas/TLSEnvironment" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting environment content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /tags: get: tags: - - tags + - tags summary: Get tags description: Returns all osctrl environments to enroll nodes operationId: apiTagsHandler @@ -445,27 +445,27 @@ paths: schema: type: array items: - $ref: '#/components/schemas/AdminTag' + $ref: "#/components/schemas/AdminTag" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting tags content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /settings: get: tags: - - settings + - settings summary: Get settings description: Returns all osctrl services settings operationId: apiSettingsHandler @@ -477,37 +477,37 @@ paths: schema: type: array items: - $ref: '#/components/schemas/SettingValue' + $ref: "#/components/schemas/SettingValue" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting settings content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /settings/{service}: get: tags: - - settings + - settings summary: Get settings description: Returns all osctrl settings per service operationId: apiSettingsServiceHandler parameters: - - name: service - in: path - description: Name of the service to retrieve settings, including JSON - required: true - schema: - type: string + - name: service + in: path + description: Name of the service to retrieve settings, including JSON + required: true + schema: + type: string responses: 200: description: successful operation @@ -516,37 +516,37 @@ paths: schema: type: array items: - $ref: '#/components/schemas/SettingValue' + $ref: "#/components/schemas/SettingValue" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting settings content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write /settings/{service}/json: get: tags: - - settings + - settings summary: Get JSON settings description: Returns JSON osctrl settings per service operationId: apiSettingsServiceJSONHandler parameters: - - name: service - in: path - description: Name of the service to retrieve JSON only settings - required: true - schema: - type: string + - name: service + in: path + description: Name of the service to retrieve JSON only settings + required: true + schema: + type: string responses: 200: description: successful operation @@ -555,23 +555,23 @@ paths: schema: type: array items: - $ref: '#/components/schemas/SettingValue' + $ref: "#/components/schemas/SettingValue" 403: description: no access content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" 500: description: error getting settings content: application/json: schema: - $ref: '#/components/schemas/ApiErrorResponse' + $ref: "#/components/schemas/ApiErrorResponse" security: - - Authorization: - - read - - write + - Authorization: + - read + - write components: schemas: OsqueryNode: diff --git a/settings/go.mod b/settings/go.mod index 1600d07c..3449156c 100644 --- a/settings/go.mod +++ b/settings/go.mod @@ -20,8 +20,8 @@ require ( github.com/google/uuid v1.4.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.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect github.com/segmentio/ksuid v1.0.4 // indirect ) diff --git a/tls/handlers/go.mod b/tls/handlers/go.mod index bd3802c8..c27fca9e 100644 --- a/tls/handlers/go.mod +++ b/tls/handlers/go.mod @@ -32,17 +32,17 @@ replace github.com/jmpsec/osctrl/tls/handlers => ../handlers require ( github.com/gorilla/mux v1.8.0 - github.com/jmpsec/osctrl/backend v0.3.1 // indirect + github.com/jmpsec/osctrl/backend v0.3.2 // indirect github.com/jmpsec/osctrl/carves v0.0.0-20231103085153-d61207d0ce25 github.com/jmpsec/osctrl/environments v0.0.0-20231103085153-d61207d0ce25 github.com/jmpsec/osctrl/logging v0.0.0-20231103085153-d61207d0ce25 github.com/jmpsec/osctrl/metrics v0.0.0-20231103085153-d61207d0ce25 - github.com/jmpsec/osctrl/nodes v0.3.1 - github.com/jmpsec/osctrl/queries v0.3.1 - github.com/jmpsec/osctrl/settings v0.3.1 + github.com/jmpsec/osctrl/nodes v0.3.2 + github.com/jmpsec/osctrl/queries v0.3.2 + github.com/jmpsec/osctrl/settings v0.3.2 github.com/jmpsec/osctrl/tags v0.0.0-20231103085153-d61207d0ce25 - github.com/jmpsec/osctrl/types v0.3.1 - github.com/jmpsec/osctrl/utils v0.3.1 + github.com/jmpsec/osctrl/types v0.3.2 + github.com/jmpsec/osctrl/utils v0.3.2 github.com/segmentio/ksuid v1.0.4 github.com/stretchr/testify v1.8.4 ) diff --git a/types/go.mod b/types/go.mod index 911e2121..4c6452dd 100644 --- a/types/go.mod +++ b/types/go.mod @@ -8,14 +8,14 @@ replace github.com/jmpsec/osctrl/queries => ../queries replace github.com/jmpsec/osctrl/utils => ../utils -require github.com/jmpsec/osctrl/queries v0.3.1 +require github.com/jmpsec/osctrl/queries v0.3.2 require ( github.com/google/uuid v1.4.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.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect github.com/jmpsec/osctrl/utils v0.0.0-20231103085153-d61207d0ce25 // indirect github.com/segmentio/ksuid v1.0.4 // indirect gorm.io/gorm v1.25.5 // indirect diff --git a/users/go.mod b/users/go.mod index dbe65953..671efcd3 100644 --- a/users/go.mod +++ b/users/go.mod @@ -43,10 +43,10 @@ require ( github.com/jackc/pgx/v4 v4.17.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.1 // indirect - github.com/jmpsec/osctrl/queries v0.3.1 // indirect - github.com/jmpsec/osctrl/settings v0.3.1 // indirect - github.com/jmpsec/osctrl/version v0.3.1 // indirect + github.com/jmpsec/osctrl/nodes v0.3.2 // indirect + github.com/jmpsec/osctrl/queries v0.3.2 // indirect + github.com/jmpsec/osctrl/settings v0.3.2 // indirect + github.com/jmpsec/osctrl/version v0.3.2 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/segmentio/ksuid v1.0.4 // indirect golang.org/x/text v0.13.0 // indirect diff --git a/version/version.go b/version/version.go index 30be9041..ffd4dc86 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.1" + OsctrlVersion = "0.3.2" // OsqueryVersion to have the version for osquery defined OsqueryVersion = "5.8.2" ) diff --git a/version/version_test.go b/version/version_test.go index 4c17a456..715a34ec 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.1", OsctrlVersion) + assert.Equal(t, "0.3.2", OsctrlVersion) }